Author: slaws
Date: Fri Nov 20 18:02:08 2009
New Revision: 882662
URL: http://svn.apache.org/viewvc?rev=882662&view=rev
Log:
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
Modified:
tuscany/java/sca/itest/distribution/binding-ws-calculator/pom.xml
tuscany/java/sca/itest/distribution/calculator-rmi/pom.xml
tuscany/java/sca/itest/distribution/implementation-java-calculator/pom.xml
Modified: tuscany/java/sca/itest/distribution/binding-ws-calculator/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/distribution/binding-ws-calculator/pom.xml?rev=882662&r1=882661&r2=882662&view=diff
==============================================================================
--- tuscany/java/sca/itest/distribution/binding-ws-calculator/pom.xml (original)
+++ tuscany/java/sca/itest/distribution/binding-ws-calculator/pom.xml Fri Nov
20 18:02:08 2009
@@ -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>
Modified: tuscany/java/sca/itest/distribution/calculator-rmi/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/distribution/calculator-rmi/pom.xml?rev=882662&r1=882661&r2=882662&view=diff
==============================================================================
--- tuscany/java/sca/itest/distribution/calculator-rmi/pom.xml (original)
+++ tuscany/java/sca/itest/distribution/calculator-rmi/pom.xml Fri Nov 20
18:02:08 2009
@@ -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>
Modified:
tuscany/java/sca/itest/distribution/implementation-java-calculator/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/distribution/implementation-java-calculator/pom.xml?rev=882662&r1=882661&r2=882662&view=diff
==============================================================================
--- tuscany/java/sca/itest/distribution/implementation-java-calculator/pom.xml
(original)
+++ tuscany/java/sca/itest/distribution/implementation-java-calculator/pom.xml
Fri Nov 20 18:02:08 2009
@@ -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>
