brett 2004/02/29 17:43:23
Modified: src/test/touchstone-build Tag: MAVEN-1_0-BRANCH maven.xml
Added: src/test/touchstone-build/src/reactor-build/default Tag:
MAVEN-1_0-BRANCH maven.xml project.xml
src/test/touchstone-build/src/reactor-build/default/subproject
Tag: MAVEN-1_0-BRANCH .cvsignore maven.xml
project.xml
Log:
test default goal handling
Revision Changes Path
No revision
No revision
1.43.4.9 +12 -14 maven/src/test/touchstone-build/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/maven/src/test/touchstone-build/maven.xml,v
retrieving revision 1.43.4.8
retrieving revision 1.43.4.9
diff -u -r1.43.4.8 -r1.43.4.9
--- maven.xml 13 Feb 2004 02:35:01 -0000 1.43.4.8
+++ maven.xml 1 Mar 2004 01:43:23 -0000 1.43.4.9
@@ -5,7 +5,6 @@
xmlns:u="jelly:util"
xmlns:maven="jelly:maven"
xmlns:define="jelly:define"
- xmlns:sea="sea"
xmlns:i="jelly:interaction"
xmlns:deploy="deploy">
@@ -196,6 +195,7 @@
<attainGoal name="test-plugin-attainment-reactor-two-goals" />
<attainGoal name="test-reactor-run-twice" />
<attainGoal name="test-context-switch" />
+ <attainGoal name="test-defaults" />
<!-- TODO - this is still broken (as in RC1)
<attainGoal name="test-reactor-maven-username" />
@@ -450,19 +450,6 @@
<!--
|
- | <sea:create/> test.
- | @todo sea plugin-test
- |
- -->
- <goal name="test-sea">
- <sea:create
- sourceDirectory="${maven.src.dir}"
- seaName="test-sea"
- />
- </goal>
-
- <!--
- |
| Tests for the MavenTagLibrary.
|
-->
@@ -761,6 +748,17 @@
goals="run_twice"
ignoreFailures="false"
/>
+ </goal>
+
+ <goal name="test-defaults">
+ <maven:maven
+ descriptor="${basedir}/src/reactor-build/default/subproject/project.xml"
+ goals=""
+ ignoreFailures="false"
+ />
+ <j:if test="${ranDefault != 'subproject-default'}">
+ <ant:fail>Default goal in subproject is not overriding parent
project</ant:fail>
+ </j:if>
</goal>
</project>
No revision
No revision
1.1.2.1 +9 -0
maven/src/test/touchstone-build/src/reactor-build/default/Attic/maven.xml
1.1.2.1 +24 -0
maven/src/test/touchstone-build/src/reactor-build/default/Attic/project.xml
No revision
No revision
1.1.2.1 +1 -0
maven/src/test/touchstone-build/src/reactor-build/default/subproject/Attic/.cvsignore
1.1.2.1 +9 -0
maven/src/test/touchstone-build/src/reactor-build/default/subproject/Attic/maven.xml
1.1.2.1 +25 -0
maven/src/test/touchstone-build/src/reactor-build/default/subproject/Attic/project.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
