jvanzyl 2004/04/08 20:47:12
Modified: maven-project/src/main/java/org/apache/maven/project
DefaultMavenProjectBuilder.java
maven-project/src/main/resources/META-INF/plexus
components.xml
Log:
o use the generated reader and writer directly
Revision Changes Path
1.10 +4 -0
maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Index: DefaultMavenProjectBuilder.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultMavenProjectBuilder.java 5 Apr 2004 17:18:44 -0000 1.9
+++ DefaultMavenProjectBuilder.java 9 Apr 2004 03:47:11 -0000 1.10
@@ -62,6 +62,10 @@
public void initialize()
throws Exception
{
+ modelWriter = new MavenXpp3Writer();
+
+ modelReader = new MavenXpp3Reader();
+
superModel = modelReader.read( new InputStreamReader(
DefaultMavenProjectBuilder.class.getResourceAsStream( "super-model.xml" ) ) );
}
1.5 +0 -6
maven-components/maven-project/src/main/resources/META-INF/plexus/components.xml
Index: components.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/main/resources/META-INF/plexus/components.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- components.xml 5 Apr 2004 17:18:45 -0000 1.4
+++ components.xml 9 Apr 2004 03:47:11 -0000 1.5
@@ -5,12 +5,6 @@
<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.project.ModelInheritanceAssembler</role>
</requirement>
<requirement>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
