jvanzyl 2003/12/07 07:42:35
Modified: maven-model-tools/src/java/org/apache/maven/model
DefaultModelMarshaller.java
DefaultModelUnmarshaller.java
maven-model-tools/src/test/org/apache/maven/model
DefaultModelMarshallingTest.java
Log:
o we're at 99.5% coverage. that will do for now.
Revision Changes Path
1.5 +112 -106
maven-components/maven-model-tools/src/java/org/apache/maven/model/DefaultModelMarshaller.java
Index: DefaultModelMarshaller.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-model-tools/src/java/org/apache/maven/model/DefaultModelMarshaller.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultModelMarshaller.java 6 Dec 2003 20:10:27 -0000 1.4
+++ DefaultModelMarshaller.java 7 Dec 2003 15:42:35 -0000 1.5
@@ -37,8 +37,7 @@
public DefaultModelMarshaller()
throws Exception
{
- XmlPullParserFactory factory = XmlPullParserFactory.newInstance(
- System.getProperty( XmlPullParserFactory.PROPERTY_NAME ), null );
+ XmlPullParserFactory factory = XmlPullParserFactory.newInstance(
System.getProperty( XmlPullParserFactory.PROPERTY_NAME ), null );
serializer = factory.newSerializer();
}
@@ -70,7 +69,7 @@
marshallString( model.getExtend(), "extend" );
- marshallString( model.getPomVersion(), "pomVersion" );
+ marshallString( model.getModelVersion(), "modelVersion" );
marshallRequiredString( model.getName(), "name" );
@@ -78,7 +77,7 @@
marshallString( model.getArtifactId(), "artifactId" );
- marshallRequiredString( model.getCurrentVersion(), "currentVersion" );
+ marshallRequiredString( model.getVersion(), "version" );
marshallOrganization( model );
@@ -88,8 +87,6 @@
marshallString( model.getLogo(), "logo" );
- marshallString( model.getGumpRepositoryId(), "gumpRepositoryId" );
-
marshallString( model.getDescription(), "description" );
marshallRequiredString( model.getShortDescription(), "shortDescription" );
@@ -124,8 +121,6 @@
marshallReports( model );
- marshallProperties( model.getProperties() );
-
serializer.endTag( NAMESPACE, "model" );
serializer.endDocument();
@@ -139,7 +134,9 @@
serializer.startTag( NAMESPACE, "organization" );
marshallRequiredString( project.getOrganization().getName(), "name" );
+
marshallString( project.getOrganization().getUrl(), "url" );
+
marshallString( project.getOrganization().getLogo(), "logo" );
serializer.endTag( NAMESPACE, "organization" );
@@ -154,7 +151,9 @@
serializer.startTag( NAMESPACE, "repository" );
marshallRequiredString( project.getRepository().getConnection(),
"connection" );
- marshallString(project.getRepository().getDeveloperConnection(),
"developerConnection");
+
+ marshallString( project.getRepository().getDeveloperConnection(),
"developerConnection" );
+
marshallString( project.getRepository().getUrl(), "url" );
serializer.endTag( NAMESPACE, "repository" );
@@ -165,24 +164,28 @@
throws Exception
{
List versions = project.getVersions();
- if ( versions != null )
+
+ if ( versions.size() > 0 )
{
serializer.startTag( NAMESPACE, "versions" );
+
Version version;
+
for ( int i = 0; i < versions.size(); i++ )
{
version = (Version) versions.get( i );
- if ( version != null )
- {
- serializer.startTag( NAMESPACE, "version" );
-
- marshallString( version.getId(), "id" );
- marshallString( version.getName(), "name" );
- marshallString( version.getTag(), "tag" );
- serializer.endTag( NAMESPACE, "version" );
- }
+ serializer.startTag( NAMESPACE, "version" );
+
+ marshallString( version.getId(), "id" );
+
+ marshallString( version.getName(), "name" );
+
+ marshallString( version.getTag(), "tag" );
+
+ serializer.endTag( NAMESPACE, "version" );
}
+
serializer.endTag( NAMESPACE, "versions" );
}
}
@@ -191,21 +194,22 @@
throws Exception
{
List branches = project.getBranches();
- if ( branches != null )
+
+ if ( branches.size() > 0 )
{
serializer.startTag( NAMESPACE, "branches" );
+
Branch branch;
+
for ( int i = 0; i < branches.size(); i++ )
{
branch = (Branch) branches.get( i );
- if ( branch != null )
- {
- serializer.startTag( NAMESPACE, "branch" );
- marshallString( branch.getTag(), "tag" );
+ serializer.startTag( NAMESPACE, "branch" );
+
+ marshallString( branch.getTag(), "tag" );
- serializer.endTag( NAMESPACE, "branch" );
- }
+ serializer.endTag( NAMESPACE, "branch" );
}
serializer.endTag( NAMESPACE, "branches" );
}
@@ -215,25 +219,30 @@
throws Exception
{
List mailingLists = project.getMailingLists();
- if ( mailingLists != null )
+
+ if ( mailingLists.size() > 0 )
{
serializer.startTag( NAMESPACE, "mailingLists" );
+
MailingList mailingList;
+
for ( int i = 0; i < mailingLists.size(); i++ )
{
mailingList = (MailingList) mailingLists.get( i );
- if ( mailingList != null )
- {
- serializer.startTag( NAMESPACE, "mailingList" );
-
- marshallRequiredString( mailingList.getName(), "name" );
- marshallRequiredString( mailingList.getSubscribe(), "subscribe"
);
- marshallRequiredString( mailingList.getUnsubscribe(),
"unsubscribe" );
- marshallString( mailingList.getArchive(), "archive" );
- serializer.endTag( NAMESPACE, "mailingList" );
- }
+ serializer.startTag( NAMESPACE, "mailingList" );
+
+ marshallRequiredString( mailingList.getName(), "name" );
+
+ marshallRequiredString( mailingList.getSubscribe(), "subscribe" );
+
+ marshallRequiredString( mailingList.getUnsubscribe(), "unsubscribe"
);
+
+ marshallString( mailingList.getArchive(), "archive" );
+
+ serializer.endTag( NAMESPACE, "mailingList" );
}
+
serializer.endTag( NAMESPACE, "mailingLists" );
}
}
@@ -242,46 +251,46 @@
throws Exception
{
List developers = project.getDevelopers();
+
serializer.startTag( NAMESPACE, "developers" );
+
Developer developer;
+
for ( int i = 0; i < developers.size(); i++ )
{
developer = (Developer) developers.get( i );
- if ( developer != null )
- {
- serializer.startTag( NAMESPACE, "developer" );
- marshallRequiredString( developer.getName(), "name" );
+ serializer.startTag( NAMESPACE, "developer" );
- marshallRequiredString( developer.getId(), "id" );
+ marshallRequiredString( developer.getName(), "name" );
- marshallString( developer.getEmail(), "email" );
+ marshallRequiredString( developer.getId(), "id" );
- marshallString( developer.getOrganization(), "organization" );
+ marshallString( developer.getEmail(), "email" );
- marshallRoles( developer.getRoles() );
+ marshallString( developer.getOrganization(), "organization" );
- serializer.endTag( NAMESPACE, "developer" );
- }
+ marshallRoles( developer.getRoles() );
+
+ serializer.endTag( NAMESPACE, "developer" );
}
+
serializer.endTag( NAMESPACE, "developers" );
}
private void marshallRoles( SortedSet roles )
throws IOException
{
- if ( roles != null )
- {
- serializer.startTag( NAMESPACE, "roles" );
+ serializer.startTag( NAMESPACE, "roles" );
- Iterator iterator = roles.iterator();
- while ( iterator.hasNext() )
- {
- marshallString( (String) iterator.next(), "role" );
- }
+ Iterator iterator = roles.iterator();
- serializer.endTag( NAMESPACE, "roles" );
+ while ( iterator.hasNext() )
+ {
+ marshallString( (String) iterator.next(), "role" );
}
+
+ serializer.endTag( NAMESPACE, "roles" );
}
private void marshallContributors( Model project )
@@ -291,21 +300,22 @@
if ( contributors != null && contributors.size() > 0 )
{
serializer.startTag( NAMESPACE, "contributors" );
+
Contributor contributor;
+
for ( int i = 0; i < contributors.size(); i++ )
{
contributor = (Contributor) contributors.get( i );
- if ( contributor != null )
- {
- serializer.startTag( NAMESPACE, "contributor" );
- marshallRequiredString( contributor.getName(), "name" );
+ serializer.startTag( NAMESPACE, "contributor" );
+
+ marshallRequiredString( contributor.getName(), "name" );
- marshallRequiredString(contributor.getEmail(), "email");
+ marshallRequiredString( contributor.getEmail(), "email" );
- serializer.endTag( NAMESPACE, "contributor" );
- }
+ serializer.endTag( NAMESPACE, "contributor" );
}
+
serializer.endTag( NAMESPACE, "contributors" );
}
}
@@ -321,19 +331,18 @@
for ( int i = 0; i < licenses.size(); i++ )
{
license = (License) licenses.get( i );
- if ( license != null )
- {
- serializer.startTag( NAMESPACE, "license" );
- marshallString( license.getName(), "name" );
+ serializer.startTag( NAMESPACE, "license" );
+
+ marshallString( license.getName(), "name" );
- marshallString( license.getUrl(), "url" );
+ marshallString( license.getUrl(), "url" );
- marshallString( license.getDistribution(), "distribution" );
+ marshallString( license.getDistribution(), "distribution" );
- serializer.endTag( NAMESPACE, "license" );
- }
+ serializer.endTag( NAMESPACE, "license" );
}
+
serializer.endTag( NAMESPACE, "licenses" );
}
}
@@ -349,27 +358,26 @@
for ( int i = 0; i < dependencies.size(); i++ )
{
dependency = (Dependency) dependencies.get( i );
- if ( dependency != null )
- {
- serializer.startTag( NAMESPACE, "dependency" );
- marshallString( dependency.getGroupId(), "groupId" );
+ serializer.startTag( NAMESPACE, "dependency" );
+
+ marshallString( dependency.getGroupId(), "groupId" );
- marshallString( dependency.getArtifactId(), "artifactId" );
+ marshallString( dependency.getArtifactId(), "artifactId" );
- marshallRequiredString( dependency.getVersion(), "version" );
+ marshallRequiredString( dependency.getVersion(), "version" );
- marshallString( dependency.getArtifact(), "artifact" );
+ marshallString( dependency.getArtifact(), "artifact" );
- marshallString( dependency.getType(), "type" );
+ marshallString( dependency.getType(), "type" );
- marshallString( dependency.getUrl(), "url" );
+ marshallString( dependency.getUrl(), "url" );
- marshallProperties( dependency.getProperties() );
+ marshallProperties( dependency.getProperties() );
- serializer.endTag( NAMESPACE, "dependency" );
- }
+ serializer.endTag( NAMESPACE, "dependency" );
}
+
serializer.endTag( NAMESPACE, "dependencies" );
}
}
@@ -389,8 +397,6 @@
marshallString( build.getUnitTestSourceDirectory(),
"unitTestSourceDirectory" );
- marshallString( build.getIntegrationUnitTestSourceDirectory(),
"integrationUnitTestSourceDirectory" );
-
marshallString( build.getAspectSourceDirectory(),
"aspectSourceDirectory" );
if ( build.getUnitTest() != null )
@@ -406,8 +412,8 @@
serializer.endTag( NAMESPACE, "unitTest" );
}
- //project.build.integrationUnitTest ?
marshallResources( build.getResources() );
+
marshallSourceModifications( build.getSourceModifications() );
serializer.endTag( NAMESPACE, "build" );
@@ -417,7 +423,7 @@
private void marshallSourceModifications( List sourceModifications )
throws Exception
{
- if ( sourceModifications != null && sourceModifications.size() > 0 )
+ if ( sourceModifications.size() > 0 )
{
serializer.startTag( NAMESPACE, "sourceModifications" );
@@ -427,16 +433,15 @@
{
sourceModification = (SourceModification) sourceModifications.get(
i );
- if ( sourceModification != null )
- {
- serializer.startTag( NAMESPACE, "sourceModification" );
-
- marshallString( sourceModification.getClassName(), "className"
);
- //marshallString( sourceModification.getProperty(), "property"
);
- marshallExcludes( sourceModification.getExcludes() );
+ serializer.startTag( NAMESPACE, "sourceModification" );
- serializer.endTag( NAMESPACE, "sourceModification" );
- }
+ marshallString( sourceModification.getClassName(), "className" );
+
+ marshallString( sourceModification.getProperty(), "property" );
+
+ marshallExcludes( sourceModification.getExcludes() );
+
+ serializer.endTag( NAMESPACE, "sourceModification" );
}
serializer.endTag( NAMESPACE, "sourceModifications" );
@@ -451,21 +456,22 @@
serializer.startTag( NAMESPACE, "resources" );
Resource resource;
+
for ( int i = 0; i < resources.size(); i++ )
{
resource = (Resource) resources.get( i );
- if ( resource != null )
- {
- serializer.startTag( NAMESPACE, "resource" );
- marshallString( resource.getDirectory(), "directory" );
- marshallString( resource.getTargetPath(), "targetPath" );
+ serializer.startTag( NAMESPACE, "resource" );
+
+ marshallString( resource.getDirectory(), "directory" );
+
+ marshallString( resource.getTargetPath(), "targetPath" );
+
+ marshallIncludes( resource.getIncludes() );
- marshallIncludes( resource.getIncludes() );
- marshallExcludes( resource.getExcludes() );
+ marshallExcludes( resource.getExcludes() );
- serializer.endTag( NAMESPACE, "resource" );
- }
+ serializer.endTag( NAMESPACE, "resource" );
}
serializer.endTag( NAMESPACE, "resources" );
1.7 +5 -5
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultModelUnmarshaller.java 7 Dec 2003 14:40:36 -0000 1.6
+++ DefaultModelUnmarshaller.java 7 Dec 2003 15:42:35 -0000 1.7
@@ -47,9 +47,9 @@
{
project.setExtend( parser.nextText() );
}
- else if ( parser.getName().equals( "pomVersion" ) )
+ else if ( parser.getName().equals( "modelVersion" ) )
{
- project.setPomVersion( parser.nextText() );
+ project.setModelVersion( parser.nextText() );
}
else if ( parser.getName().equals( "groupId" ) )
{
@@ -63,9 +63,9 @@
{
project.setName( parser.nextText() );
}
- else if ( parser.getName().equals( "currentVersion" ) )
+ else if ( parser.getName().equals( "version" ) )
{
- project.setCurrentVersion( parser.nextText() );
+ project.setVersion( parser.nextText() );
}
else if ( parser.getName().equals( "inceptionYear" ) )
{
1.6 +5 -5
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultModelMarshallingTest.java 7 Dec 2003 14:40:37 -0000 1.5
+++ DefaultModelMarshallingTest.java 7 Dec 2003 15:42:35 -0000 1.6
@@ -22,11 +22,11 @@
String modelXml =
"<project>" +
" <extend>extend</extend>" +
- " <pomVersion>3</pomVersion>" +
+ " <modelVersion>3</modelVersion>" +
" <groupId>maven</groupId>" +
" <artifactId>maven</artifactId>" +
" <name>Maven</name>" +
- " <currentVersion>1.0-beta-9</currentVersion>" +
+ " <version>1.0-beta-9</version>" +
" <inceptionYear>2001</inceptionYear>" +
" <package>org.apache.maven</package>" +
" <description>Description</description>" +
@@ -226,7 +226,7 @@
StringWriter w = new StringWriter();
- modelMarshaller.marshall( writer, model, " ", "" );
+ modelMarshaller.marshall( writer, emptyModel );
}
private void checkModel( Model model )
@@ -235,11 +235,11 @@
// Top-level elements
// ----------------------------------------------------------------------
- assertEquals( "3", model.getPomVersion() );
+ assertEquals( "3", model.getModelVersion() );
assertEquals( "maven", model.getGroupId() );
assertEquals( "Maven", model.getName() );
- assertEquals( "1.0-beta-9", model.getCurrentVersion() );
+ assertEquals( "1.0-beta-9", model.getVersion() );
assertEquals( "2001", model.getInceptionYear() );
assertEquals( "org.apache.maven", model.getPackage() );
assertEquals( "Description", model.getDescription() );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
