diff options
Diffstat (limited to 'branches')
17 files changed, 53 insertions, 6 deletions
diff --git a/branches/sca-java-1.x/samples/pom.xml b/branches/sca-java-1.x/samples/pom.xml index 7c7cd70a27..20ccb937b0 100644 --- a/branches/sca-java-1.x/samples/pom.xml +++ b/branches/sca-java-1.x/samples/pom.xml @@ -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> diff --git a/branches/sca-java-1.x/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/branches/sca-java-1.x/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java index d7b80bd67c..b44dd16a91 100644 --- a/branches/sca-java-1.x/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java +++ b/branches/sca-java-1.x/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java @@ -124,7 +124,14 @@ public class AntGeneratorMojo extends AbstractMojo { * 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 @@ public class AntGeneratorMojo extends AbstractMojo { 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 +"\"/>"); } diff --git a/branches/sca-java-1.x/tutorials/store/assets/pom.xml b/branches/sca-java-1.x/tutorials/store/assets/pom.xml index 60589e3090..dd2bdada40 100644 --- a/branches/sca-java-1.x/tutorials/store/assets/pom.xml +++ b/branches/sca-java-1.x/tutorials/store/assets/pom.xml @@ -77,6 +77,9 @@ <version>1.5-SNAPSHOT</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.x/tutorials/store/catalog-mediation/pom.xml b/branches/sca-java-1.x/tutorials/store/catalog-mediation/pom.xml index 062013c663..58c61fe9f8 100644 --- a/branches/sca-java-1.x/tutorials/store/catalog-mediation/pom.xml +++ b/branches/sca-java-1.x/tutorials/store/catalog-mediation/pom.xml @@ -79,6 +79,9 @@ <version>1.5-SNAPSHOT</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.x/tutorials/store/catalog-webapp/pom.xml b/branches/sca-java-1.x/tutorials/store/catalog-webapp/pom.xml index 26ab8725a0..3cbcc1982e 100644 --- a/branches/sca-java-1.x/tutorials/store/catalog-webapp/pom.xml +++ b/branches/sca-java-1.x/tutorials/store/catalog-webapp/pom.xml @@ -98,6 +98,9 @@ <version>1.5-SNAPSHOT</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.x/tutorials/store/domain/pom.xml b/branches/sca-java-1.x/tutorials/store/domain/pom.xml index 2b3f3ec919..12014dfcc9 100644 --- a/branches/sca-java-1.x/tutorials/store/domain/pom.xml +++ b/branches/sca-java-1.x/tutorials/store/domain/pom.xml @@ -159,6 +159,7 @@ <execution> <configuration> <mainClass>launch.LaunchTutorialAdmin</mainClass> + <pathToRootDir>../../..</pathToRootDir> </configuration> <goals> <goal>generate</goal> diff --git a/branches/sca-java-1.x/tutorials/store/store-client/pom.xml b/branches/sca-java-1.x/tutorials/store/store-client/pom.xml index 7c02681280..d313bb1fdf 100644 --- a/branches/sca-java-1.x/tutorials/store/store-client/pom.xml +++ b/branches/sca-java-1.x/tutorials/store/store-client/pom.xml @@ -111,6 +111,9 @@ <version>1.5-SNAPSHOT</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.x/tutorials/store/store-db/pom.xml b/branches/sca-java-1.x/tutorials/store/store-db/pom.xml index 58acdfa466..88441bc868 100644 --- a/branches/sca-java-1.x/tutorials/store/store-db/pom.xml +++ b/branches/sca-java-1.x/tutorials/store/store-db/pom.xml @@ -65,6 +65,9 @@ <version>1.5-SNAPSHOT</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.x/tutorials/store/store-eu/pom.xml b/branches/sca-java-1.x/tutorials/store/store-eu/pom.xml index 187d991156..602a5bddb1 100644 --- a/branches/sca-java-1.x/tutorials/store/store-eu/pom.xml +++ b/branches/sca-java-1.x/tutorials/store/store-eu/pom.xml @@ -65,6 +65,9 @@ <version>1.5-SNAPSHOT</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.x/tutorials/store/store-market/build.xml b/branches/sca-java-1.x/tutorials/store/store-market/build.xml index 09ae4f460c..dff5241cb6 100644 --- a/branches/sca-java-1.x/tutorials/store/store-market/build.xml +++ b/branches/sca-java-1.x/tutorials/store/store-market/build.xml @@ -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> diff --git a/branches/sca-java-1.x/tutorials/store/store-market/pom.xml b/branches/sca-java-1.x/tutorials/store/store-market/pom.xml index 9da1a461a6..9e8e66605b 100644 --- a/branches/sca-java-1.x/tutorials/store/store-market/pom.xml +++ b/branches/sca-java-1.x/tutorials/store/store-market/pom.xml @@ -65,6 +65,9 @@ <version>1.5-SNAPSHOT</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.x/tutorials/store/store-mashup/pom.xml b/branches/sca-java-1.x/tutorials/store/store-mashup/pom.xml index cd7a6486a5..91f68117ac 100644 --- a/branches/sca-java-1.x/tutorials/store/store-mashup/pom.xml +++ b/branches/sca-java-1.x/tutorials/store/store-mashup/pom.xml @@ -65,6 +65,9 @@ <version>1.5-SNAPSHOT</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.x/tutorials/store/store-merger/pom.xml b/branches/sca-java-1.x/tutorials/store/store-merger/pom.xml index 6f71a43a1f..5e827614a7 100644 --- a/branches/sca-java-1.x/tutorials/store/store-merger/pom.xml +++ b/branches/sca-java-1.x/tutorials/store/store-merger/pom.xml @@ -65,6 +65,9 @@ <version>1.5-SNAPSHOT</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.x/tutorials/store/store-supplier/pom.xml b/branches/sca-java-1.x/tutorials/store/store-supplier/pom.xml index dd425976c9..7fa433df82 100644 --- a/branches/sca-java-1.x/tutorials/store/store-supplier/pom.xml +++ b/branches/sca-java-1.x/tutorials/store/store-supplier/pom.xml @@ -65,6 +65,9 @@ <version>1.5-SNAPSHOT</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.x/tutorials/store/store-test/pom.xml b/branches/sca-java-1.x/tutorials/store/store-test/pom.xml index 3ae314d141..8fe1f05ded 100644 --- a/branches/sca-java-1.x/tutorials/store/store-test/pom.xml +++ b/branches/sca-java-1.x/tutorials/store/store-test/pom.xml @@ -189,6 +189,9 @@ <version>1.5-SNAPSHOT</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.x/tutorials/store/store/pom.xml b/branches/sca-java-1.x/tutorials/store/store/pom.xml index 7e3a9cfb7d..603b5ad01f 100644 --- a/branches/sca-java-1.x/tutorials/store/store/pom.xml +++ b/branches/sca-java-1.x/tutorials/store/store/pom.xml @@ -65,6 +65,9 @@ <version>1.5-SNAPSHOT</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.x/tutorials/store/web-services/pom.xml b/branches/sca-java-1.x/tutorials/store/web-services/pom.xml index d6a8f6b166..538efaeb2e 100644 --- a/branches/sca-java-1.x/tutorials/store/web-services/pom.xml +++ b/branches/sca-java-1.x/tutorials/store/web-services/pom.xml @@ -65,6 +65,9 @@ <version>1.5-SNAPSHOT</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> |