brett 2003/10/30 03:39:41
Modified: src/plugins-build/touchstone-partner Tag: MAVEN_RC2_UNSTABLE
plugin.jelly
src/test/touchstone-build Tag: MAVEN_RC2_UNSTABLE maven.xml
Log:
check postgoals to, clean up, use new call to get ant project
Revision Changes Path
No revision
No revision
1.4.2.1 +14 -0 maven/src/plugins-build/touchstone-partner/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/touchstone-partner/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- plugin.jelly 19 Aug 2003 04:45:07 -0000 1.4
+++ plugin.jelly 30 Oct 2003 11:39:41 -0000 1.4.2.1
@@ -13,8 +13,22 @@
<attainGoal name="touchstone-partner-goal-A"/>
</preGoal>
+ <postGoal name="touchstone-goal-C">
+ <echo>postGoal for touchstone-goal-C is running ...</echo>
+ <j:set var="touchstone_partner_postGoal_C" value="true"/>
+ </postGoal>
+
+ <postGoal name="touchstone-goal-D">
+ <echo>postGoal for touchstone-goal-D is running ...</echo>
+ <attainGoal name="touchstone-partner-goal-B"/>
+ </postGoal>
+
<goal name="touchstone-partner-goal-A">
<j:set var="touchstone_partner_preGoal_D" value="true"/>
+ </goal>
+
+ <goal name="touchstone-partner-goal-B">
+ <j:set var="touchstone_partner_postGoal_D" value="true"/>
</goal>
</project>
No revision
No revision
1.43.2.1 +32 -19 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
retrieving revision 1.43.2.1
diff -u -r1.43 -r1.43.2.1
--- maven.xml 28 Oct 2003 18:13:57 -0000 1.43
+++ maven.xml 30 Oct 2003 11:39:41 -0000 1.43.2.1
@@ -43,6 +43,8 @@
| will always work. As we find solutions, the tests that originally
| displayed problems can be moved into the 'touchstone-tests' goal to
| make sure they don't crop up again.
+ |
+ | TODO - uncalled goals should be added or documented as broken, including goals
not called here
-->
<!--
@@ -52,17 +54,11 @@
-->
<goal name="touchstone-tests">
-
- <attainGoal name="test-reactor-failure-property"/>
- <attainGoal name="test-maven-failure-property"/>
- <attainGoal name="test-maven-unknown-failure-property"/>
-
<attainGoal name="touchstone-goal-A"/>
<maven:pluginVar var="checkValue" plugin="maven-touchstone-plugin"
property="touchstone_goal_A_from_plugin"/>
<j:if test="${checkValue == 'true'}">
<fail message="">
- Goal should have been overriden. We have an internal error
- processing goals.
+ Goal should have been overridden. We have an internal error processing
goals.
</fail>
</j:if>
@@ -87,28 +83,26 @@
</j:otherwise>
</j:choose>
- <j:if test="${pom.antProject.getReferences().get('testPath') != resultantPath}">
+ <j:if test="${context.getAntProject().getReferences().get('testPath') !=
resultantPath}">
<property name="testPathProp" refid="testPath" />
<property name="testPath1Prop" refid="testPath1" />
<property name="testPath2Prop" refid="testPath2" />
<fail message="">
Paths were not correctly appended. Internal error in the maven:addPath tag.
- testPath = ${pom.antProject.getReferences().get('testPath')}
+ testPath = ${context.getAntProject().getReferences().get('testPath')}
resultantPath = ${resultantPath}
testPath1 = ${testPath1Prop}
testPath2 = ${testPath2Prop}
</fail>
</j:if>
- <attainGoal name="test-make-absolute-path" />
- <attainGoal name="test-make-relative-path" />
-
<attainGoal name="test-plugin-property-override"/>
<j:set var="mavenTouchstoneA" value="${maven.touchstone.A}"/>
<j:if test="${mavenTouchstoneA != 'override.maven.touchstone.A'}">
+ <echo>mavenTouchstoneA = ${mavenTouchstoneA}, should be
override.maven.touchstone.A</echo>
<fail message="">
- Plugin properties are not being correctly overriden.
+ Plugin properties are not being correctly overridden.
</fail>
</j:if>
@@ -129,13 +123,13 @@
<!--
|
- | Inter-plugin preGoal tests.
+ | Inter-plugin pre/postGoal tests.
|
-->
<!--
|
- | Touchstone partner has a pregoal which sets a variable.
+ | Touchstone partner has a pregoal and postGoal which sets a variable.
|
-->
<attainGoal name="touchstone-goal-C"/>
@@ -148,10 +142,19 @@
</fail>
</j:if>
+ <j:set var="checkValue"
value="${pom.getPluginContext('maven-touchstone-partner-plugin').getVariable('touchstone_partner_postGoal_C')}"/>
+<echo>${checkValue}</echo>
+ <j:if test="${checkValue != 'true'}">
+ <fail message="">
+
+ Inter-plugin postGoals are not being dealt with correctly.
+
+ </fail>
+ </j:if>
<!--
|
- | Touchstone partner has a pregoal which attains a goal which sets a variable.
+ | Touchstone partner has a pregoal ant postGoal which attains a goal which
sets a variable.
|
-->
<attainGoal name="touchstone-goal-D"/>
@@ -164,6 +167,14 @@
</fail>
</j:if>
+ <j:set var="checkValue"
value="${pom.getPluginContext('maven-touchstone-partner-plugin').getVariable('touchstone_partner_postGoal_D')}"/>
+ <j:if test="${checkValue != 'true'}">
+ <fail message="">
+
+ Inter-plugin postGoals are not being dealt with correctly.
+
+ </fail>
+ </j:if>
<attainGoal name="test-mavenjellyscope"/>
<j:if test="${context.findVariable('test-mavenjellyscope') != 'success'}">
@@ -173,10 +184,12 @@
</fail>
</j:if>
- <!--
- <attainGoal name="test-reactor-maven-username"/>
- -->
+ <attainGoal name="test-reactor-failure-property"/>
+ <attainGoal name="test-maven-failure-property"/>
+ <attainGoal name="test-maven-unknown-failure-property"/>
+ <attainGoal name="test-make-absolute-path" />
+ <attainGoal name="test-make-relative-path" />
</goal>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
