Author: rfeng
Date: Fri Nov 20 19:18:28 2009
New Revision: 882687
URL: http://svn.apache.org/viewvc?rev=882687&view=rev
Log:
Revert the workarounds as now the root problem is fixed
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=882687&r1=882686&r2=882687&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 19:18:28 2009
@@ -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>
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=882687&r1=882686&r2=882687&view=diff
==============================================================================
--- tuscany/java/sca/itest/distribution/calculator-rmi/pom.xml (original)
+++ tuscany/java/sca/itest/distribution/calculator-rmi/pom.xml Fri Nov 20
19:18:28 2009
@@ -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>
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=882687&r1=882686&r2=882687&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 19:18:28 2009
@@ -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>
