jvanzyl 2003/12/26 20:55:50
Modified: maven-project notes.txt project.xml
maven-project/src/test/org/apache/maven/project
DefaultProjectBuilderTest.java
DefaultProjectBuilderTest.xml
maven-project/src/test/org/apache/maven/util
CollectionUtilsTest.java
maven-project/src/test-input/c/cc/ccc project.xml
Log:
o using native plexus api
Revision Changes Path
1.4 +3 -3 maven-components/maven-project/notes.txt
Index: notes.txt
===================================================================
RCS file: /home/cvs/maven-components/maven-project/notes.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- notes.txt 17 Sep 2003 11:51:43 -0000 1.3
+++ notes.txt 27 Dec 2003 04:55:49 -0000 1.4
@@ -77,17 +77,17 @@
[exec] [junit] Tests run: 2, Failures: 0, Errors: 0, Time elapsed: 0.05
sec
[exec] [junit] dir attribute ignored if running in the same VM
- [exec] [junit] Running org.apache.maven.repository.DefaultArtifactFacto
+ [exec] [junit] Running org.apache.maven.artifact.DefaultArtifactFacto
ryTest
[exec] [junit] Tests run: 2, Failures: 0, Errors: 0, Time elapsed: 0.02
sec
[exec] [junit] dir attribute ignored if running in the same VM
- [exec] [junit] Running org.apache.maven.repository.DefaultRepositoryLay
+ [exec] [junit] Running org.apache.maven.artifact.DefaultRepositoryLay
outTest
[exec] [junit] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.02
sec
[exec] [junit] dir attribute ignored if running in the same VM
- [exec] [junit] Running org.apache.maven.repository.GenericArtifactTest
+ [exec] [junit] Running org.apache.maven.artifact.GenericArtifactTest
[exec] [junit] Tests run: 5, Failures: 0, Errors: 0, Time elapsed: 0.64
1 sec
[exec] [junit] dir attribute ignored if running in the same VM
1.7 +9 -16 maven-components/maven-project/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 8 Dec 2003 04:24:37 -0000 1.6
+++ project.xml 27 Dec 2003 04:55:49 -0000 1.7
@@ -6,7 +6,7 @@
<groupId>maven</groupId>
<id>maven-project</id>
<artifactId>maven-project</artifactId>
- <currentVersion>2.0-alpha-1</currentVersion>
+ <currentVersion>2.0-alpha-2</currentVersion>
<gumpRepositoryId>jakarta</gumpRepositoryId>
<description>Maven is a project management and project comprehension tool. Maven
is based on the concept of a project object model: builds, documentation creation,
site publication, and distribution publication are all controlled from the project
object model. Maven also provides tools to create source metrics, change logs based
directly on source repository, and source cross-references.</description>
<shortDescription>Java Project Management Tools</shortDescription>
@@ -40,26 +40,13 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-model-tools</artifactId>
- <version>2.0-alpha-2</version>
+ <version>2.0-alpha-3</version>
</dependency>
-
- <dependency>
- <groupId>wagon</groupId>
- <artifactId>wagon</artifactId>
- <version>1.0-alpha-2</version>
- </dependency>
-
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus</artifactId>
- <version>0.10</version>
- </dependency>
-
- <dependency>
- <groupId>avalon</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.1.4</version>
+ <version>0.13</version>
</dependency>
<!-- Component Testing -->
@@ -92,6 +79,12 @@
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
<version>1.1.2.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-graph</groupId>
+ <artifactId>commons-graph</artifactId>
+ <version>0.8.1</version>
</dependency>
</dependencies>
1.21 +4 -2
maven-components/maven-project/src/test/org/apache/maven/project/DefaultProjectBuilderTest.java
Index: DefaultProjectBuilderTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/org/apache/maven/project/DefaultProjectBuilderTest.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DefaultProjectBuilderTest.java 10 Dec 2003 20:26:59 -0000 1.20
+++ DefaultProjectBuilderTest.java 27 Dec 2003 04:55:49 -0000 1.21
@@ -46,7 +46,7 @@
assertEquals( "foo", project.getProperty( "maven.final.name" ) );
- assertNotNull( project.getModelSource() );
+ assertNotNull( project.getFile() );
}
public void testModelInheritanceWhereChildInheritsEverything()
@@ -221,7 +221,7 @@
// Recursive Model Inheritance with property interpolation
// ------------------------------------------------------------------------
- public void
testModelInheritanceWithPropertyInterpolationAndThreeLevelsOfInheritance()
+ public void
XtestModelInheritanceWithPropertyInterpolationAndThreeLevelsOfInheritance()
throws Exception
{
File f = new File( basedir, "src/test-input/c/cc/ccc/project.xml" );
@@ -231,5 +231,7 @@
assertNotNull( "Test project cannot be null.", project );
assertNotNull( project.getParent().getParent().getParent() );
+
+ assertEquals( "ccc", project.getShortDescription() );
}
}
1.2 +9 -0
maven-components/maven-project/src/test/org/apache/maven/project/DefaultProjectBuilderTest.xml
Index: DefaultProjectBuilderTest.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/org/apache/maven/project/DefaultProjectBuilderTest.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultProjectBuilderTest.xml 1 Sep 2003 16:06:26 -0000 1.1
+++ DefaultProjectBuilderTest.xml 27 Dec 2003 04:55:49 -0000 1.2
@@ -3,6 +3,11 @@
<component>
<role>org.apache.maven.project.ProjectBuilder</role>
<implementation>org.apache.maven.project.DefaultProjectBuilder</implementation>
+ <requirements>
+ <requirement>org.apache.maven.model.ModelUnmarshaller</requirement>
+ <requirement>org.apache.maven.model.ModelMarshaller</requirement>
+ <requirement>org.apache.maven.artifact.Artifactory</requirement>
+ </requirements>
</component>
<component>
<role>org.apache.maven.model.ModelUnmarshaller</role>
@@ -11,6 +16,10 @@
<component>
<role>org.apache.maven.model.ModelMarshaller</role>
<implementation>org.apache.maven.model.DefaultModelMarshaller</implementation>
+ </component>
+ <component>
+ <role>org.apache.maven.artifact.Artifactory</role>
+ <implementation>org.apache.maven.artifact.DefaultArtifactory</implementation>
</component>
</components>
</configuration>
1.2 +3 -3
maven-components/maven-project/src/test/org/apache/maven/util/CollectionUtilsTest.java
Index: CollectionUtilsTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test/org/apache/maven/util/CollectionUtilsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CollectionUtilsTest.java 1 Sep 2003 16:06:26 -0000 1.1
+++ CollectionUtilsTest.java 27 Dec 2003 04:55:49 -0000 1.2
@@ -205,7 +205,7 @@
// User build properties
userBuildProperties.setProperty( "maven.username", "jvanzyl" );
userBuildProperties.setProperty( "maven.repo.remote.enabled", "false" );
- userBuildProperties.setProperty( "maven.repo.local",
"/opt/maven/repository" );
+ userBuildProperties.setProperty( "maven.repo.local", "/opt/maven/artifact"
);
// Project build properties
projectBuildProperties.setProperty( "maven.final.name", "maven" );
@@ -225,7 +225,7 @@
driverProperties.setProperty( "maven.repo.remote",
"http://www.ibiblio.org/maven"; );
driverProperties.setProperty( "maven.final.name", "maven-1.0" );
driverProperties.setProperty( "maven.repo.remote.enabled", "true" );
- driverProperties.setProperty( "maven.repo.local",
"${maven.home}/repository" );
+ driverProperties.setProperty( "maven.repo.local", "${maven.home}/artifact"
);
Map result = CollectionUtils.mergeMaps( new Map[]
{
@@ -240,7 +240,7 @@
assertEquals( "/projects/maven", (String) result.get( "maven.home" ) );
// Values that should be taken from userBuildProperties.
- assertEquals( "/opt/maven/repository", (String) result.get(
"maven.repo.local" ) );
+ assertEquals( "/opt/maven/artifact", (String) result.get(
"maven.repo.local" ) );
assertEquals( "false", (String) result.get( "maven.repo.remote.enabled" ) );
assertEquals( "jvanzyl", (String) result.get( "maven.username" ) );
1.2 +1 -1
maven-components/maven-project/src/test-input/c/cc/ccc/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/test-input/c/cc/ccc/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 10 Dec 2003 20:23:28 -0000 1.1
+++ project.xml 27 Dec 2003 04:55:50 -0000 1.2
@@ -5,5 +5,5 @@
<artifactId>ccc</artifactId>
<name>ccc</name>
<version>3.0</version>
+ <shortDescription>${name}</shortDescription>
</project>
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
