jvanzyl 2004/02/14 20:16:46
Modified: maven-model-xpp3/src/java/org/apache/maven/model
DefaultModelMarshaller.java
DefaultModelUnmarshaller.java
maven-model-xpp3/src/test/org/apache/maven/model
DefaultModelMarshallingTest.java
Log:
o many projects have roles for contributors so we need to marshall/unmarshal
those.
Revision Changes Path
1.7 +3 -1
maven-components/maven-model-xpp3/src/java/org/apache/maven/model/DefaultModelMarshaller.java
Index: DefaultModelMarshaller.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-model-xpp3/src/java/org/apache/maven/model/DefaultModelMarshaller.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultModelMarshaller.java 28 Dec 2003 16:52:49 -0000 1.6
+++ DefaultModelMarshaller.java 15 Feb 2004 04:16:45 -0000 1.7
@@ -313,6 +313,8 @@
marshallRequiredString( contributor.getEmail(), "email" );
+ marshallRoles( contributor.getRoles() );
+
serializer.endTag( NAMESPACE, "contributor" );
}
1.12 +15 -1
maven-components/maven-model-xpp3/src/java/org/apache/maven/model/DefaultModelUnmarshaller.java
Index: DefaultModelUnmarshaller.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-model-xpp3/src/java/org/apache/maven/model/DefaultModelUnmarshaller.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultModelUnmarshaller.java 2 Feb 2004 01:53:17 -0000 1.11
+++ DefaultModelUnmarshaller.java 15 Feb 2004 04:16:45 -0000 1.12
@@ -378,6 +378,20 @@
{
c.setEmail( parser.nextText() );
}
+ else if ( parser.getName().equals( "roles" ) )
+ {
+ while ( parser.nextTag() ==
XmlPullParser.START_TAG )
+ {
+ if ( parser.getName().equals( "role" ) )
+ {
+ c.addRole( parser.nextText() );
+ }
+ else
+ {
+ parser.nextText();
+ }
+ }
+ }
else
{
parser.nextText();
1.7 +6 -0
maven-components/maven-model-xpp3/src/test/org/apache/maven/model/DefaultModelMarshallingTest.java
Index: DefaultModelMarshallingTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-model-xpp3/src/test/org/apache/maven/model/DefaultModelMarshallingTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultModelMarshallingTest.java 7 Dec 2003 15:42:35 -0000 1.6
+++ DefaultModelMarshallingTest.java 15 Feb 2004 04:16:46 -0000 1.7
@@ -105,6 +105,11 @@
" <name>Martin van dem Bemt</name>" +
" <email>[EMAIL PROTECTED]</email>" +
" <bogus>bogus</bogus>" +
+ " <roles>" +
+ " <bogus>bogus</bogus>" +
+ " <role>Guru</role>" +
+ " <role>Klompen Finder</role>" +
+ " </roles>" +
" </contributor>" +
" </contributors>" +
" <dependencies>" +
@@ -307,6 +312,7 @@
assertEquals( "Martin van dem Bemt", c.getName() );
assertEquals( "[EMAIL PROTECTED]", c.getEmail() );
+ assertEquals( "Guru", (String) c.getRoles().first() );
// ----------------------------------------------------------------------
// Dependencies
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
