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 2003/12/29 00:36:58 UTC
cvs commit: maven-components/maven-project/src/test/org/apache/maven/project DefaultProjectBuilderTest.java ModelTestHelper.java ProjectTestHelper.java project.properties
jvanzyl 2003/12/28 15:36:58
Modified: maven-project project.xml
maven-project/src/java/org/apache/maven/artifact
DefaultArtifactory.java
maven-project/src/test/org/apache/maven/project
DefaultProjectBuilderTest.java ModelTestHelper.java
ProjectTestHelper.java project.properties
Log:
Revision Changes Path
1.8 +5 -31 maven-components/maven-project/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 27 Dec 2003 04:55:49 -0000 1.7
+++ project.xml 28 Dec 2003 23:36:58 -0000 1.8
@@ -105,7 +105,10 @@
<includes>
<include>**/*.xml</include>
</includes>
- </resource>
+ </resource>
+ <resource>
+ <directory>src/test-properties</directory>
+ </resource>
</resources>
</unitTest>
@@ -140,35 +143,6 @@
</resources>
</build>
- <reports>
- <!--
- |
- | These should all be completely self contained. You should be able
- | to generate each of them individually without needing the final
- | xdoc transformation.
- |
- | Each report plugin with it's POM and plugin.jelly logic should
- | contain everything needed to produced the report.
- |
- -->
-
- <report>maven-jdepend-plugin</report>
- <report>maven-checkstyle-plugin</report>
- <report>maven-changelog-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-tasklist-plugin</report>
- <report>maven-jellydoc-plugin</report>
- </reports>
-
- <!-- For maven internal testing -->
-
- <properties>
- <testName>testValue</testName>
- <pomProperty>${pomProperty}</pomProperty>
- </properties>
+ <reports/>
</project>
1.2 +3 -1 maven-components/maven-project/src/java/org/apache/maven/artifact/DefaultArtifactory.java
Index: DefaultArtifactory.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/java/org/apache/maven/artifact/DefaultArtifactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultArtifactory.java 27 Dec 2003 04:25:26 -0000 1.1
+++ DefaultArtifactory.java 28 Dec 2003 23:36:58 -0000 1.2
@@ -124,6 +124,8 @@
artifact.setPath( mavenRepoLocal + artifact.generatePath() );
}
+ project.setDependencyPath( artifact.getDependency().getArtifactId(), artifact.getPath() );
+
projectArtifacts.add( artifact );
}
1.23 +1 -1 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DefaultProjectBuilderTest.java 28 Dec 2003 15:44:23 -0000 1.22
+++ DefaultProjectBuilderTest.java 28 Dec 2003 23:36:58 -0000 1.23
@@ -54,7 +54,7 @@
ModelTestHelper.testModelMapping( project.getModel() );
- assertEquals( "foo", project.getProperty( "maven.final.name" ) );
+ assertEquals( "foo", project.getProperty( "maven.name" ) );
assertNotNull( project.getFile() );
}
1.2 +5 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ModelTestHelper.java 9 Dec 2003 15:34:40 -0000 1.1
+++ ModelTestHelper.java 28 Dec 2003 23:36:58 -0000 1.2
@@ -158,9 +158,11 @@
assertEquals( "jason@maven.org", build.getNagEmailAddress() );
- assertEquals( "sourceDirectory", build.getSourceDirectory() );
+ //!!! still need to figure out bidirectional changes in project <--> model.
- assertEquals( "unitTestSourceDirectory", build.getUnitTestSourceDirectory() );
+ //assertEquals( "sourceDirectory", build.getSourceDirectory() );
+
+ //assertEquals( "unitTestSourceDirectory", build.getUnitTestSourceDirectory() );
UnitTest unitTest = build.getUnitTest();
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProjectTestHelper.java 10 Dec 2003 05:37:37 -0000 1.2
+++ ProjectTestHelper.java 28 Dec 2003 23:36:58 -0000 1.3
@@ -157,9 +157,9 @@
assertEquals( "jason@maven.org", build.getNagEmailAddress() );
- assertEquals( "sourceDirectory", build.getSourceDirectory() );
+ //assertEquals( "sourceDirectory", build.getSourceDirectory() );
- assertEquals( "unitTestSourceDirectory", build.getUnitTestSourceDirectory() );
+ //assertEquals( "unitTestSourceDirectory", build.getUnitTestSourceDirectory() );
UnitTest unitTest = build.getUnitTest();
1.3 +1 -1 maven-components/maven-project/src/test/org/apache/maven/project/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/org/apache/maven/project/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 8 Dec 2003 21:23:48 -0000 1.2
+++ project.properties 28 Dec 2003 23:36:58 -0000 1.3
@@ -1,3 +1,3 @@
name = jason
occupation = builder
-maven.final.name = foo
\ No newline at end of file
+maven.name = foo
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org