From e8c75e10dc8a49aa11da021eda4045e6d341e018 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 20 Nov 2009 18:02:08 +0000
Subject: the maven-antrun-plugin was causing the itest/distribution tests to
 fail when run from the top level. The symptom as reported was inability to
 find javac as though JAVA-HOME was incorrectly set. I don't know what the
 actual problem is but replacing the maven-antrun-plugin with the
 exec-maven-plugin seems to improve matters

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@882662 13f79535-47bb-0310-9956-ffa450edef68
---
 .../distribution/binding-ws-calculator/pom.xml     | 61 ++++++++--------------
 java/sca/itest/distribution/calculator-rmi/pom.xml | 60 ++++++++-------------
 .../implementation-java-calculator/pom.xml         | 61 ++++++++--------------
 3 files changed, 69 insertions(+), 113 deletions(-)

(limited to 'java')

diff --git a/java/sca/itest/distribution/binding-ws-calculator/pom.xml b/java/sca/itest/distribution/binding-ws-calculator/pom.xml
index 26d18d0b4a..7dd57f7dbd 100644
--- a/java/sca/itest/distribution/binding-ws-calculator/pom.xml
+++ b/java/sca/itest/distribution/binding-ws-calculator/pom.xml
@@ -39,44 +39,29 @@
     
     <build>
         <plugins>
-            <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>
+	      <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>
         </plugins>
     </build>
 </project>
diff --git a/java/sca/itest/distribution/calculator-rmi/pom.xml b/java/sca/itest/distribution/calculator-rmi/pom.xml
index f002994692..049510f3af 100644
--- a/java/sca/itest/distribution/calculator-rmi/pom.xml
+++ b/java/sca/itest/distribution/calculator-rmi/pom.xml
@@ -39,43 +39,29 @@
     
     <build>
         <plugins>
-            <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>
+	      <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>        
         </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 584b7ca5e9..37b811ee8a 100644
--- a/java/sca/itest/distribution/implementation-java-calculator/pom.xml
+++ b/java/sca/itest/distribution/implementation-java-calculator/pom.xml
@@ -39,44 +39,29 @@
     
     <build>
         <plugins>
-            <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>
+	      <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>
         </plugins>
     </build>
 </project>
-- 
cgit v1.2.3