You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/12/12 12:55:30 UTC
svn commit: r725975 - in /tuscany/branches/sca-java-1.x: samples/
tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/
tutorials/store/assets/ tutorials/store/catalog-mediation/
tutorials/store/catalog-webapp...
Author: slaws
Date: Fri Dec 12 03:55:29 2008
New Revision: 725975
URL: http://svn.apache.org/viewvc?rev=725975&view=rev
Log:
TUSCANY-2739 - fix ant generator to allow the path to the distribution root directory to be specified
Modified:
tuscany/branches/sca-java-1.x/samples/pom.xml
tuscany/branches/sca-java-1.x/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
tuscany/branches/sca-java-1.x/tutorials/store/assets/pom.xml
tuscany/branches/sca-java-1.x/tutorials/store/catalog-mediation/pom.xml
tuscany/branches/sca-java-1.x/tutorials/store/catalog-webapp/pom.xml
tuscany/branches/sca-java-1.x/tutorials/store/domain/pom.xml
tuscany/branches/sca-java-1.x/tutorials/store/store-client/pom.xml
tuscany/branches/sca-java-1.x/tutorials/store/store-db/pom.xml
tuscany/branches/sca-java-1.x/tutorials/store/store-eu/pom.xml
tuscany/branches/sca-java-1.x/tutorials/store/store-market/build.xml
tuscany/branches/sca-java-1.x/tutorials/store/store-market/pom.xml
tuscany/branches/sca-java-1.x/tutorials/store/store-mashup/pom.xml
tuscany/branches/sca-java-1.x/tutorials/store/store-merger/pom.xml
tuscany/branches/sca-java-1.x/tutorials/store/store-supplier/pom.xml
tuscany/branches/sca-java-1.x/tutorials/store/store-test/pom.xml
tuscany/branches/sca-java-1.x/tutorials/store/store/pom.xml
tuscany/branches/sca-java-1.x/tutorials/store/web-services/pom.xml
Modified: tuscany/branches/sca-java-1.x/samples/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/pom.xml Fri Dec 12 03:55:29 2008
@@ -106,7 +106,7 @@
<module>store-distributed</module>
<module>supplychain</module>
<module>web-resource</module>
- <module>zipcode-jaxws</module>
+ <!--module>zipcode-jaxws</module-->
</modules>
</profile>
</profiles>
Modified: tuscany/branches/sca-java-1.x/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java (original)
+++ tuscany/branches/sca-java-1.x/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java Fri Dec 12 03:55:29 2008
@@ -124,7 +124,14 @@
* The build-dependency.xml file to generate.
* @parameter expression="${basedir}/build-dependency.xml"
*/
- private String buildDependencyFile;
+ private String buildDependencyFile;
+
+ /**
+ * The path to the root dir so that build.xml files can be generated at any level
+ * in the distribution hierarchy
+ * @parameter expression="../.."
+ */
+ private String pathToRootDir;
public void execute() throws MojoExecutionException {
if ((buildDependencyFileOnly != null) &&
@@ -309,12 +316,12 @@
Collections.sort(otherModules);
// Generate filesets for the tuscany and 3rd party dependencies
- pw.println(" <fileset id=\"tuscany.jars\" dir=\"../../modules\">");
+ pw.println(" <fileset id=\"tuscany.jars\" dir=\"" + pathToRootDir + "/modules\">");
for (String name: tuscanyModules) {
pw.println(" <include name=\"" + name +"\"/>");
}
pw.println(" </fileset>");
- pw.println(" <fileset id=\"3rdparty.jars\" dir=\"../../lib\">");
+ pw.println(" <fileset id=\"3rdparty.jars\" dir=\"" + pathToRootDir + "/lib\">");
for (String name: otherModules) {
pw.println(" <include name=\"" + name +"\"/>");
}
Modified: tuscany/branches/sca-java-1.x/tutorials/store/assets/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/assets/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/assets/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/assets/pom.xml Fri Dec 12 03:55:29 2008
@@ -77,6 +77,9 @@
<version>1.5-SNAPSHOT</version>
<executions>
<execution>
+ <configuration>
+ <pathToRootDir>../../..</pathToRootDir>
+ </configuration>
<goals>
<goal>generate</goal>
</goals>
Modified: tuscany/branches/sca-java-1.x/tutorials/store/catalog-mediation/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/catalog-mediation/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/catalog-mediation/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/catalog-mediation/pom.xml Fri Dec 12 03:55:29 2008
@@ -79,6 +79,9 @@
<version>1.5-SNAPSHOT</version>
<executions>
<execution>
+ <configuration>
+ <pathToRootDir>../../..</pathToRootDir>
+ </configuration>
<goals>
<goal>generate</goal>
</goals>
Modified: tuscany/branches/sca-java-1.x/tutorials/store/catalog-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/catalog-webapp/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/catalog-webapp/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/catalog-webapp/pom.xml Fri Dec 12 03:55:29 2008
@@ -98,6 +98,9 @@
<version>1.5-SNAPSHOT</version>
<executions>
<execution>
+ <configuration>
+ <pathToRootDir>../../..</pathToRootDir>
+ </configuration>
<goals>
<goal>generate</goal>
</goals>
Modified: tuscany/branches/sca-java-1.x/tutorials/store/domain/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/domain/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/domain/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/domain/pom.xml Fri Dec 12 03:55:29 2008
@@ -159,6 +159,7 @@
<execution>
<configuration>
<mainClass>launch.LaunchTutorialAdmin</mainClass>
+ <pathToRootDir>../../..</pathToRootDir>
</configuration>
<goals>
<goal>generate</goal>
Modified: tuscany/branches/sca-java-1.x/tutorials/store/store-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/store-client/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/store-client/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/store-client/pom.xml Fri Dec 12 03:55:29 2008
@@ -111,6 +111,9 @@
<version>1.5-SNAPSHOT</version>
<executions>
<execution>
+ <configuration>
+ <pathToRootDir>../../..</pathToRootDir>
+ </configuration>
<goals>
<goal>generate</goal>
</goals>
Modified: tuscany/branches/sca-java-1.x/tutorials/store/store-db/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/store-db/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/store-db/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/store-db/pom.xml Fri Dec 12 03:55:29 2008
@@ -65,6 +65,9 @@
<version>1.5-SNAPSHOT</version>
<executions>
<execution>
+ <configuration>
+ <pathToRootDir>../../..</pathToRootDir>
+ </configuration>
<goals>
<goal>generate</goal>
</goals>
Modified: tuscany/branches/sca-java-1.x/tutorials/store/store-eu/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/store-eu/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/store-eu/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/store-eu/pom.xml Fri Dec 12 03:55:29 2008
@@ -65,6 +65,9 @@
<version>1.5-SNAPSHOT</version>
<executions>
<execution>
+ <configuration>
+ <pathToRootDir>../../..</pathToRootDir>
+ </configuration>
<goals>
<goal>generate</goal>
</goals>
Modified: tuscany/branches/sca-java-1.x/tutorials/store/store-market/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/store-market/build.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/store-market/build.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/store-market/build.xml Fri Dec 12 03:55:29 2008
@@ -45,10 +45,10 @@
</delete>
</target>
- <fileset id="tuscany.jars" dir="../../modules">
+ <fileset id="tuscany.jars" dir="../../../modules">
<include name="tuscany-sca-api-1.5-SNAPSHOT.jar"/>
</fileset>
- <fileset id="3rdparty.jars" dir="../../lib">
+ <fileset id="3rdparty.jars" dir="../../../lib">
</fileset>
</project>
Modified: tuscany/branches/sca-java-1.x/tutorials/store/store-market/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/store-market/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/store-market/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/store-market/pom.xml Fri Dec 12 03:55:29 2008
@@ -65,6 +65,9 @@
<version>1.5-SNAPSHOT</version>
<executions>
<execution>
+ <configuration>
+ <pathToRootDir>../../..</pathToRootDir>
+ </configuration>
<goals>
<goal>generate</goal>
</goals>
Modified: tuscany/branches/sca-java-1.x/tutorials/store/store-mashup/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/store-mashup/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/store-mashup/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/store-mashup/pom.xml Fri Dec 12 03:55:29 2008
@@ -65,6 +65,9 @@
<version>1.5-SNAPSHOT</version>
<executions>
<execution>
+ <configuration>
+ <pathToRootDir>../../..</pathToRootDir>
+ </configuration>
<goals>
<goal>generate</goal>
</goals>
Modified: tuscany/branches/sca-java-1.x/tutorials/store/store-merger/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/store-merger/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/store-merger/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/store-merger/pom.xml Fri Dec 12 03:55:29 2008
@@ -65,6 +65,9 @@
<version>1.5-SNAPSHOT</version>
<executions>
<execution>
+ <configuration>
+ <pathToRootDir>../../..</pathToRootDir>
+ </configuration>
<goals>
<goal>generate</goal>
</goals>
Modified: tuscany/branches/sca-java-1.x/tutorials/store/store-supplier/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/store-supplier/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/store-supplier/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/store-supplier/pom.xml Fri Dec 12 03:55:29 2008
@@ -65,6 +65,9 @@
<version>1.5-SNAPSHOT</version>
<executions>
<execution>
+ <configuration>
+ <pathToRootDir>../../..</pathToRootDir>
+ </configuration>
<goals>
<goal>generate</goal>
</goals>
Modified: tuscany/branches/sca-java-1.x/tutorials/store/store-test/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/store-test/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/store-test/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/store-test/pom.xml Fri Dec 12 03:55:29 2008
@@ -189,6 +189,9 @@
<version>1.5-SNAPSHOT</version>
<executions>
<execution>
+ <configuration>
+ <pathToRootDir>../../..</pathToRootDir>
+ </configuration>
<goals>
<goal>generate</goal>
</goals>
Modified: tuscany/branches/sca-java-1.x/tutorials/store/store/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/store/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/store/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/store/pom.xml Fri Dec 12 03:55:29 2008
@@ -65,6 +65,9 @@
<version>1.5-SNAPSHOT</version>
<executions>
<execution>
+ <configuration>
+ <pathToRootDir>../../..</pathToRootDir>
+ </configuration>
<goals>
<goal>generate</goal>
</goals>
Modified: tuscany/branches/sca-java-1.x/tutorials/store/web-services/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/tutorials/store/web-services/pom.xml?rev=725975&r1=725974&r2=725975&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/tutorials/store/web-services/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/tutorials/store/web-services/pom.xml Fri Dec 12 03:55:29 2008
@@ -65,6 +65,9 @@
<version>1.5-SNAPSHOT</version>
<executions>
<execution>
+ <configuration>
+ <pathToRootDir>../../..</pathToRootDir>
+ </configuration>
<goals>
<goal>generate</goal>
</goals>