jvanzyl 2003/07/30 20:00:34
Modified: src/test/touchstone-build maven.xml
Log:
o Use the ${plugins} property map to retrieve values that have been set
in preGoals. Fixing the failure of the pre/postGoal processing in the
touchstone build.
Revision Changes Path
1.38 +11 -30 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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- maven.xml 27 Jul 2003 23:34:01 -0000 1.37
+++ maven.xml 31 Jul 2003 03:00:34 -0000 1.38
@@ -78,17 +78,10 @@
</j:if>
<attainGoal name="test-addPath"/>
- <j:choose>
- <j:when test="${systemScope['os.name'].startsWith('Windows')}">
- <property name="testPath1Prop" refid="testPath1" />
- <property name="testPath2Prop" refid="testPath2" />
- <j:set var="resultantPath"
value="${testPath1Prop}${systemScope['path.separator']}${testPath2Prop}"/>
- </j:when>
- <j:otherwise>
- <j:set var="resultantPath" value="/path1:/path2"/>
- </j:otherwise>
- </j:choose>
-
+
+ <echo>pom.compileSourceRoots = ${pom.compileSourceRoots}</echo>
+
+ <!--
<j:if test="${context.antProject.getReferences().get('testPath') !=
resultantPath}">
<property name="testPathProp" refid="testPath" />
<property name="testPath1Prop" refid="testPath1" />
@@ -101,6 +94,7 @@
testPath2 = ${testPath2Prop}
</fail>
</j:if>
+ -->
<attainGoal name="test-plugin-property-override"/>
@@ -139,14 +133,12 @@
|
-->
<attainGoal name="touchstone-goal-C"/>
- <j:set var="checkValue"
value="${pluginContexts.get('touchstone-partner').getVariable('touchstone_partner_preGoal_C')}"/>
- <echo>pluginContexts.touchstone-partner =
${pluginContexts.get('touchstone-partner')}</echo>
- <echo>pluginContexts.touchstone = ${pluginContexts.get('touchstone')}</echo>
- <echo>checkValue = ${checkValue}</echo>
+ <j:set var="checkValue"
value="${plugins.get('touchstone-partner').get('touchstone_partner_preGoal_C')}"/>
+ <echo>checkValue = ${checkValue}</echo>
<maven:display var="checkValue"/>
<j:if test="${!checkValue}">
<fail message="">
-
+
Inter-plugin preGoals are not being dealt with correctly.
</fail>
@@ -158,7 +150,7 @@
|
-->
<attainGoal name="touchstone-goal-D"/>
- <j:set var="checkValue"
value="${pluginContexts.get('touchstone-partner').getVariable('touchstone_partner_preGoal_D')}"/>
+ <j:set var="checkValue"
value="${plugins.get('touchstone-partner').get('touchstone_partner_preGoal_D')}"/>
<echo>checkValue = ${checkValue}</echo>
<maven:display var="checkValue"/>
<j:if test="${!checkValue}">
@@ -240,19 +232,8 @@
-->
<goal name="test-addPath">
- <path id="testPath1">
- <pathelement location="/path1"/>
- </path>
-
- <path id="testPath2">
- <pathelement location="/path2"/>
- </path>
-
- <path id="testPath">
- </path>
-
- <maven:addPath id="testPath" refid="testPath1"/>
- <maven:addPath id="testPath" refid="testPath2"/>
+ <maven:addPath id="maven.compile.src.set" path="/path1"/>
+ <maven:addPath id="maven.compile.src.set" path="/path2"/>
</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
