jvanzyl 2003/12/07 06:40:37
Modified: maven-model-tools/src/java/org/apache/maven/model
DefaultModelUnmarshaller.java
maven-model-tools/src/test/org/apache/maven/model
DefaultModelMarshallingTest.java
Log:
o added handling and tests for sourceModification
Revision Changes Path
1.6 +49 -9
maven-components/maven-model-tools/src/java/org/apache/maven/model/DefaultModelUnmarshaller.java
Index: DefaultModelUnmarshaller.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-model-tools/src/java/org/apache/maven/model/DefaultModelUnmarshaller.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultModelUnmarshaller.java 6 Dec 2003 20:11:24 -0000 1.5
+++ DefaultModelUnmarshaller.java 7 Dec 2003 14:40:36 -0000 1.6
@@ -24,8 +24,6 @@
* @author Jason van Zyl
*
* @version $Id$
- *
- * @todo sourceModification
*/
public class DefaultModelUnmarshaller
implements ModelUnmarshaller
@@ -61,11 +59,6 @@
{
project.setArtifactId( parser.nextText() );
}
-// else if ( parser.getName().equals( "id" ) )
-// {
-// System.err.println( "<project/> element: You should be using
groupId / artifactId" );
-// project.setId( parser.nextText() );
-// }
else if ( parser.getName().equals( "name" ) )
{
project.setName( parser.nextText() );
@@ -535,6 +528,52 @@
}
}
}
+ else if ( parser.getName().equals( "sourceModifications" ) )
+ {
+ SourceModification sourceModification = new
SourceModification();
+
+ b.addSourceModification( sourceModification );
+
+ while ( parser.nextTag() == XmlPullParser.START_TAG )
+ {
+ if ( parser.getName().equals( "sourceModification"
) )
+ {
+ while ( parser.nextTag() ==
XmlPullParser.START_TAG )
+ {
+ if ( parser.getName().equals( "className" )
)
+ {
+ sourceModification.setClassName(
parser.nextText() );
+ }
+ else if ( parser.getName().equals(
"property" ) )
+ {
+ sourceModification.setProperty(
parser.nextText() );
+ }
+ else if ( parser.getName().equals(
"excludes" ) )
+ {
+ while ( parser.nextTag() ==
XmlPullParser.START_TAG )
+ {
+ if ( parser.getName().equals(
"exclude" ) )
+ {
+ sourceModification.addExclude(
parser.nextText() );
+ }
+ else
+ {
+ parser.nextText();
+ }
+ }
+ }
+ else
+ {
+ parser.nextText();
+ }
+ }
+ }
+ else
+ {
+ parser.nextText();
+ }
+ }
+ }
else if ( parser.getName().equals( "resources" ) )
{
while ( parser.nextTag() == XmlPullParser.START_TAG )
@@ -578,7 +617,8 @@
return project;
}
- protected Resource unmarshalResource( XmlPullParser parser ) throws
XmlPullParserException, IOException
+ protected Resource unmarshalResource( XmlPullParser parser )
+ throws XmlPullParserException, IOException
{
Resource r = new Resource();
1.5 +12 -0
maven-components/maven-model-tools/src/test/org/apache/maven/model/DefaultModelMarshallingTest.java
Index: DefaultModelMarshallingTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-model-tools/src/test/org/apache/maven/model/DefaultModelMarshallingTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultModelMarshallingTest.java 6 Dec 2003 19:53:02 -0000 1.4
+++ DefaultModelMarshallingTest.java 7 Dec 2003 14:40:37 -0000 1.5
@@ -183,6 +183,18 @@
" </excludes>" +
" </resource>" +
" </resources>" +
+ " <sourceModifications>" +
+ " <bogus>bogus</bogus>" +
+ " <sourceModification>" +
+ " <bogus>bogus</bogus>" +
+ " <className>className</className>" +
+ " <property>propety</property>" +
+ " <excludes>" +
+ " <bogus>bogus</bogus>" +
+ " <exclude>foo</exclude>" +
+ " </excludes>" +
+ " </sourceModification>" +
+ " </sourceModifications>" +
" </build>" +
" <reports>" +
" <bogus>bogus</bogus>" +
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
