You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2004/03/10 22:37:48 UTC
cvs commit: maven-components/maven-project/src/test/org/apache/maven/project ModelTestHelper.java ProjectTestHelper.java
jvanzyl 2004/03/10 13:37:48
Modified: maven-project/src/java/org/apache/maven/project
DefaultMavenProjectBuilder.java MavenProject.java
maven-project/src/meta-inf components.xml
maven-project/src/test/org/apache/maven/project
ModelTestHelper.java ProjectTestHelper.java
Log:
o getting maven-project to work with the generated model reader and writer.
Revision Changes Path
1.4 +7 -7 maven-components/maven-project/src/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Index: DefaultMavenProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultMavenProjectBuilder.java 7 Mar 2004 22:36:57 -0000 1.3
+++ DefaultMavenProjectBuilder.java 10 Mar 2004 21:37:37 -0000 1.4
@@ -3,8 +3,8 @@
import org.apache.maven.artifact.MavenArtifactory;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
-import org.apache.maven.model.ModelMarshaller;
-import org.apache.maven.model.ModelUnmarshaller;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.util.CollectionUtils;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.StringUtils;
@@ -33,9 +33,9 @@
extends AbstractLogEnabled
implements MavenProjectBuilder
{
- private ModelMarshaller marshaller;
+ private MavenXpp3Writer writer;
- private ModelUnmarshaller unmarshaller;
+ private MavenXpp3Reader reader;
private MavenArtifactory artifactory;
@@ -121,7 +121,7 @@
try
{
- model = unmarshaller.parse( reader );
+ model = this.reader.read( reader );
project.setFile( projectDescriptor );
@@ -416,7 +416,7 @@
{
StringWriter writer = new StringWriter();
- marshaller.marshall( writer, project );
+ this.writer.write( writer, project );
return writer.toString();
}
@@ -428,7 +428,7 @@
private Model interpolateModel( Model model, Map map )
throws Exception
{
- return unmarshaller.parse( new StringReader( StringUtils.interpolate( getProjectString( model ), map ) ) );
+ return reader.read( new StringReader( StringUtils.interpolate( getProjectString( model ), map ) ) );
}
/**
1.11 +2 -2 maven-components/maven-project/src/java/org/apache/maven/project/MavenProject.java
Index: MavenProject.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/java/org/apache/maven/project/MavenProject.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MavenProject.java 7 Mar 2004 22:46:25 -0000 1.10
+++ MavenProject.java 10 Mar 2004 21:37:37 -0000 1.11
@@ -341,7 +341,7 @@
int size = getArtifacts().size();
String[] classpathElements = new String[size + 1];
-
+
classpathElements[0] = getProperty("maven.build.dest");
for ( int i = 0; i < size; i++ )
1.4 +21 -21 maven-components/maven-project/src/meta-inf/components.xml
Index: components.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/meta-inf/components.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- components.xml 12 Feb 2004 02:04:00 -0000 1.3
+++ components.xml 10 Mar 2004 21:37:40 -0000 1.4
@@ -1,23 +1,23 @@
<component-set>
-<components>
- <component>
- <role>org.apache.maven.project.MavenProjectBuilder</role>
- <implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.model.ModelUnmarshaller</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.model.ModelMarshaller</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.MavenArtifactory</role>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.apache.maven.artifact.MavenArtifactory</role>
- <implementation>org.apache.maven.artifact.DefaultMavenArtifactory</implementation>
- </component>
-</components>
+ <components>
+ <component>
+ <role>org.apache.maven.project.MavenProjectBuilder</role>
+ <implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
+ <requirements>
+ <requirement>
+ <role>org.apache.maven.model.io.xpp3.MavenXpp3Reader</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.model.io.xpp3.MavenXpp3Writer</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.artifact.MavenArtifactory</role>
+ </requirement>
+ </requirements>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.MavenArtifactory</role>
+ <implementation>org.apache.maven.artifact.DefaultMavenArtifactory</implementation>
+ </component>
+ </components>
</component-set>
1.4 +3 -3 maven-components/maven-project/src/test/org/apache/maven/project/ModelTestHelper.java
Index: ModelTestHelper.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/org/apache/maven/project/ModelTestHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ModelTestHelper.java 29 Dec 2003 17:49:20 -0000 1.3
+++ ModelTestHelper.java 10 Mar 2004 21:37:47 -0000 1.4
@@ -38,7 +38,7 @@
assertEquals( "2001", model.getInceptionYear() );
- assertEquals( "org.apache.maven", model.getPackage() );
+ //assertEquals( "org.apache.maven", model.getPackage() );
assertEquals( "Description", model.getDescription() );
@@ -114,7 +114,7 @@
assertEquals( "Zenplex", d.getOrganization() );
- assertEquals( "Founder", (String) d.getRoles().first() );
+ assertEquals( "Founder", (String) d.getRoles().get( 0 ) );
// ----------------------------------------------------------------------
// Contributors
1.6 +3 -3 maven-components/maven-project/src/test/org/apache/maven/project/ProjectTestHelper.java
Index: ProjectTestHelper.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/org/apache/maven/project/ProjectTestHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProjectTestHelper.java 25 Jan 2004 00:28:20 -0000 1.5
+++ ProjectTestHelper.java 10 Mar 2004 21:37:48 -0000 1.6
@@ -37,7 +37,7 @@
assertEquals( "2001", project.getInceptionYear() );
- assertEquals( "org.apache.maven", project.getPackage() );
+ //assertEquals( "org.apache.maven", project.getPackage() );
assertEquals( "Description", project.getDescription() );
@@ -113,7 +113,7 @@
assertEquals( "Zenplex", d.getOrganization() );
- assertEquals( "Founder", (String) d.getRoles().first() );
+ assertEquals( "Founder", (String) d.getRoles().get( 0 ) );
// ----------------------------------------------------------------------
// Contributors
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org