From 180bf1f4eb2a4e7579cd6690d39dd533eb949c57 Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 31 Dec 2003 01:20:36 +0000
Subject: [PATCH] changes to touchstone

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114525 13f79535-47bb-0310-9956-ffa450edef68
---
 touchstone-partner/plugin.jelly | 11 +++++++
 touchstone-partner/project.xml  |  2 +-
 touchstone/plugin.jelly         | 54 +++++++++++++++++++++------------
 touchstone/project.xml          |  2 +-
 4 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/touchstone-partner/plugin.jelly b/touchstone-partner/plugin.jelly
index b25d5c78..72a8cec4 100644
--- a/touchstone-partner/plugin.jelly
+++ b/touchstone-partner/plugin.jelly
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 
 <project 
+  xmlns:maven="jelly:maven"
+  xmlns:ant="jelly:ant"
   xmlns:j="jelly:core">
 
   <preGoal name="touchstone-goal-C">
@@ -31,4 +33,13 @@
     <j:set var="touchstone_partner_postGoal_D" value="true"/>
   </goal>
   
+  <goal name="touchstone-partner:test-context-switch">
+    <maven:maven
+      descriptor="${basedir}/src/reactor-build/failProperty/success-1/project.xml"
+      goals="touchstone:test-context-switch-dummy"
+      ignoreFailures="false"
+    />
+    <j:set var="partnerSourceDir" value="${pom.build.sourceDirectory}" />
+    <attainGoal name="touchstone:test-context-switch" />
+  </goal>
 </project>
diff --git a/touchstone-partner/project.xml b/touchstone-partner/project.xml
index 350caa17..2d49d95e 100644
--- a/touchstone-partner/project.xml
+++ b/touchstone-partner/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-touchstone-partner-plugin</id>
   <name>Maven Touchstone Partner Plug-in</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Testing sanity check project</shortDescription>
   <url>http://maven.apache.org/reference/plugins/touchstone-partner/</url>
diff --git a/touchstone/plugin.jelly b/touchstone/plugin.jelly
index ae349cc2..46cb76e7 100644
--- a/touchstone/plugin.jelly
+++ b/touchstone/plugin.jelly
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 
 <project 
+  xmlns:maven="jelly:maven"
+  xmlns:ant="jelly:ant"
   xmlns:j="jelly:core">
 
   <!--
@@ -9,29 +11,41 @@
    |
    -->
    
-   <goal name="touchstone-goal-A">
-     <echo>touchstone-goal-A defined in plugin.</echo>
-     <j:set var="touchstone_goal_A_from_plugin" value="true"/>
-   </goal>
+  <goal name="touchstone-goal-A">
+    <echo>touchstone-goal-A defined in plugin.</echo>
+    <j:set var="touchstone_goal_A_from_plugin" value="true"/>
+  </goal>
 
-   <goal name="touchstone-goal-B">
-     <echo>touchstone-goal-B defined in plugin.</echo>
-     <j:set var="touchstone_goal_B_from_plugin" value="true"/>
-   </goal>
+  <goal name="touchstone-goal-B">
+    <echo>touchstone-goal-B defined in plugin.</echo>
+    <j:set var="touchstone_goal_B_from_plugin" value="true"/>
+  </goal>
 
-   <goal name="touchstone-goal-C">
-     <echo>touchstone-goal-C defined in plugin.</echo>
-     <j:set var="touchstone_goal_C_from_plugin" value="true"/>
-   </goal>
+  <goal name="touchstone-goal-C">
+    <echo>touchstone-goal-C defined in plugin.</echo>
+    <j:set var="touchstone_goal_C_from_plugin" value="true"/>
+  </goal>
 
-   <goal name="touchstone-goal-D">
-     <echo>touchstone-goal-D defined in plugin.</echo>
-     <j:set var="touchstone_goal_D_from_plugin" value="true"/>
-   </goal>
+  <goal name="touchstone-goal-D">
+    <echo>touchstone-goal-D defined in plugin.</echo>
+    <j:set var="touchstone_goal_D_from_plugin" value="true"/>
+  </goal>
 
-   <goal name="touchstone-goal-E">
-     <echo>touchstone-goal-E defined in plugin.</echo>
-     <j:set var="touchstone_goal_E_from_plugin" value="true"/>
-   </goal>
+  <goal name="touchstone-goal-E">
+    <echo>touchstone-goal-E defined in plugin.</echo>
+    <j:set var="touchstone_goal_E_from_plugin" value="true"/>
+  </goal>
+
+  <goal name="touchstone:test-context-switch-dummy">
+    <ant:echo>testing differing plugin contexts</ant:echo>
+  </goal>
+
+  <goal name="touchstone:test-context-switch">
+    <j:set var="touchstoneSourceDir" value="${pom.build.sourceDirectory}" />
+    <maven:pluginVar var="var" plugin="maven-touchstone-partner-plugin" property="partnerSourceDir" />
+    <j:if test="${var != touchstoneSourceDir}">
+      <ant:fail>pom.build.sourceDirectory differs over plugin and partner plugin (touchstone = '${touchstoneSourceDir}'; partner = '${var}')</ant:fail>
+    </j:if>
+  </goal>
    
 </project>
diff --git a/touchstone/project.xml b/touchstone/project.xml
index 388301b7..31cc1c2c 100644
--- a/touchstone/project.xml
+++ b/touchstone/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-touchstone-plugin</id>
   <name>Maven Touchstone Plug-in</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Sanity Check test project</shortDescription>
   <url>http://maven.apache.org/reference/plugins/touchstone/</url>