jvanzyl 2003/12/06 11:52:41
Modified: maven-model-tools/src/java/org/apache/maven/model
DefaultModelUnmarshaller.java
Log:
o catch crap inside <properties/>
Revision Changes Path
1.4 +26 -18
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultModelUnmarshaller.java 6 Dec 2003 19:14:00 -0000 1.3
+++ DefaultModelUnmarshaller.java 6 Dec 2003 19:52:41 -0000 1.4
@@ -79,10 +79,6 @@
{
project.setPackage( parser.nextText() );
}
- else if ( parser.getName().equals( "gumpRepositoryId" ) )
- {
- project.setGumpRepositoryId( parser.nextText() );
- }
else if ( parser.getName().equals( "description" ) )
{
project.setDescription( parser.nextText() );
@@ -402,7 +398,7 @@
else if ( parser.getName().equals( "artifactId" ) )
{
d.setArtifactId( parser.nextText() );
- }
+ }
else if ( parser.getName().equals( "version" ) )
{
d.setVersion( parser.nextText() );
@@ -421,22 +417,34 @@
}
else if ( parser.getName().equals( "jar" ) )
{
- String msg = "You should be using <artifact> tag
" +
- "instead of <jar> for Dependency: " +
- d.getId();
- System.err.println( msg );
- d.setArtifact( parser.nextText() );
+ String msg = "You should be using <artifact>
tag " +
+ "instead of <jar> for Dependency: " +
+ d.getId();
+ System.err.println( msg );
+ d.setArtifact( parser.nextText() );
}
else if ( parser.getName().equals( "properties" ) )
{
- String str = parser.nextText();
- ByteArrayInputStream bais
- = new ByteArrayInputStream( str.getBytes() );
- Properties properties = new Properties();
- properties.load( bais );
- d.setProperties( properties );
- }
+ while ( parser.nextTag() ==
XmlPullParser.START_TAG )
+ {
+ if ( parser.getName().equals( "property" ) )
+ {
+ String str = parser.nextText();
+
+ ByteArrayInputStream bais = new
ByteArrayInputStream( str.getBytes() );
+
+ Properties properties = new
Properties();
+ properties.load( bais );
+
+ d.setProperties( properties );
+ }
+ else
+ {
+ parser.nextText();
+ }
+ }
+ }
else
{
parser.nextText();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
