Revert the workarounds as now the root problem is fixed

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@882687 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 113 insertions, 69 deletions

diff --git a/java/sca/itest/distribution/binding-ws-calculator/pom.xml b/java/sca/itest/distribution/binding-ws-calculator/pom.xml
index 7dd57f7dbd..26d18d0b4a 100644
--- a/java/sca/itest/distribution/binding-ws-calculator/pom.xml
+++ b/java/sca/itest/distribution/binding-ws-calculator/pom.xml
@@ -39,29 +39,44 @@
     
     <build>
         <plugins>
-	      <plugin>
-	        <groupId>org.codehaus.mojo</groupId>
-	        <artifactId>exec-maven-plugin</artifactId>
-	        <executions>
-	          <execution>
-	            <id>run-sample</id>
-	            <phase>test</phase>
-	            <goals>
-	              <goal>exec</goal>
-	            </goals>
-	          </execution>
-	        </executions>
-	        <configuration>
-	          <executable>ant</executable>
-	          <workingDirectory>./</workingDirectory>
-	          <arguments>
-	            <argument>-Djava.home</argument>
-	            <argument>${java.home}</argument>
-	            <argument>-Dtuscany.version</argument>
-	            <argument>${version}</argument>
-	          </arguments>
-	        </configuration>
-	      </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.3</version>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                    <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323  -->
+                    <dependency>
+                        <groupId>sun.jdk</groupId>
+                        <artifactId>tools</artifactId>
+                        <version>1.6</version>
+                        <scope>system</scope>
+                        <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                    </dependency>
+                </dependencies>
+
+                <executions>
+                    <execution>
+                        <id>run-samples</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks> 
+                                <property name="java.home" value="${java.home}"/>
+                                <property name="tuscany.version" value="${version}" />
+                                <ant antfile="./build.xml" target="run"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/java/sca/itest/distribution/calculator-rmi/pom.xml b/java/sca/itest/distribution/calculator-rmi/pom.xml
index 049510f3af..f002994692 100644
--- a/java/sca/itest/distribution/calculator-rmi/pom.xml
+++ b/java/sca/itest/distribution/calculator-rmi/pom.xml
@@ -39,29 +39,43 @@
     
     <build>
         <plugins>
-	      <plugin>
-	        <groupId>org.codehaus.mojo</groupId>
-	        <artifactId>exec-maven-plugin</artifactId>
-	        <executions>
-	          <execution>
-	            <id>run-sample</id>
-	            <phase>test</phase>
-	            <goals>
-	              <goal>exec</goal>
-	            </goals>
-	          </execution>
-	        </executions>
-	        <configuration>
-	          <executable>ant</executable>
-	          <workingDirectory>./</workingDirectory>
-	          <arguments>
-	            <argument>-Djava.home</argument>
-	            <argument>${java.home}</argument>
-	            <argument>-Dtuscany.version</argument>
-	            <argument>${version}</argument>
-	          </arguments>
-	        </configuration>
-	      </plugin>        
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.3</version>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                    <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323  -->
+                    <dependency>
+                        <groupId>sun.jdk</groupId>
+                        <artifactId>tools</artifactId>
+                        <version>1.6</version>
+                        <scope>system</scope>
+                        <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                    </dependency>
+                </dependencies>
+
+                <executions>
+                    <execution>
+                        <id>run-samples</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks> 
+                                <property name="tuscany.version" value="${version}" />
+                                <ant antfile="./build.xml" target="run"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/java/sca/itest/distribution/implementation-java-calculator/pom.xml b/java/sca/itest/distribution/implementation-java-calculator/pom.xml
index 37b811ee8a..584b7ca5e9 100644
--- a/java/sca/itest/distribution/implementation-java-calculator/pom.xml
+++ b/java/sca/itest/distribution/implementation-java-calculator/pom.xml
@@ -39,29 +39,44 @@
     
     <build>
         <plugins>
-	      <plugin>
-	        <groupId>org.codehaus.mojo</groupId>
-	        <artifactId>exec-maven-plugin</artifactId>
-	        <executions>
-	          <execution>
-	            <id>run-sample</id>
-	            <phase>test</phase>
-	            <goals>
-	              <goal>exec</goal>
-	            </goals>
-	          </execution>
-	        </executions>
-	        <configuration>
-	          <executable>ant</executable>
-	          <workingDirectory>./</workingDirectory>
-	          <arguments>
-	            <argument>-Djava.home</argument>
-	            <argument>${java.home}</argument>
-	            <argument>-Dtuscany.version</argument>
-	            <argument>${version}</argument>
-	          </arguments>
-	        </configuration>
-	      </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.3</version>
+
+                <dependencies>
+                    <dependency>
+                        <groupId>ant</groupId>
+                        <artifactId>ant-trax</artifactId>
+                        <version>1.6.5</version>
+                    </dependency>
+                    <!-- this JDk dependency is a workaround for Maven bug - http://jira.codehaus.org/browse/MNG-1323  -->
+                    <dependency>
+                        <groupId>sun.jdk</groupId>
+                        <artifactId>tools</artifactId>
+                        <version>1.6</version>
+                        <scope>system</scope>
+                        <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                    </dependency>
+                </dependencies>
+
+                <executions>
+                    <execution>
+                        <id>run-samples</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks> 
+                                <property name="tuscany.version" value="${version}" />
+                                <property name="java.home" value="${java.home}"/>
+                                <ant antfile="./build.xml" target="run"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>