diff options
16 files changed, 52 insertions, 5 deletions
diff --git a/branches/sca-java-1.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java b/branches/sca-java-1.4/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.4/tools/maven/maven-ant-generator/src/main/java/org/apache/tuscany/sca/tools/ant/generator/plugin/AntGeneratorMojo.java +++ b/branches/sca-java-1.4/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.4/tutorials/store/assets/pom.xml b/branches/sca-java-1.4/tutorials/store/assets/pom.xml index 3e1af7934b..fc52ee15b9 100644 --- a/branches/sca-java-1.4/tutorials/store/assets/pom.xml +++ b/branches/sca-java-1.4/tutorials/store/assets/pom.xml @@ -77,6 +77,9 @@ <version>1.4</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.4/tutorials/store/catalog-mediation/pom.xml b/branches/sca-java-1.4/tutorials/store/catalog-mediation/pom.xml index 2792a3c790..57f17e9de8 100644 --- a/branches/sca-java-1.4/tutorials/store/catalog-mediation/pom.xml +++ b/branches/sca-java-1.4/tutorials/store/catalog-mediation/pom.xml @@ -79,6 +79,9 @@ <version>1.4</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.4/tutorials/store/catalog-webapp/pom.xml b/branches/sca-java-1.4/tutorials/store/catalog-webapp/pom.xml index dc6dbc53ab..0bb69bd4e5 100644 --- a/branches/sca-java-1.4/tutorials/store/catalog-webapp/pom.xml +++ b/branches/sca-java-1.4/tutorials/store/catalog-webapp/pom.xml @@ -98,6 +98,9 @@ <version>1.4</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.4/tutorials/store/domain/pom.xml b/branches/sca-java-1.4/tutorials/store/domain/pom.xml index a45cdadd09..c46eb7a116 100644 --- a/branches/sca-java-1.4/tutorials/store/domain/pom.xml +++ b/branches/sca-java-1.4/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.4/tutorials/store/store-client/pom.xml b/branches/sca-java-1.4/tutorials/store/store-client/pom.xml index 0283cc0e51..1f15bb2621 100644 --- a/branches/sca-java-1.4/tutorials/store/store-client/pom.xml +++ b/branches/sca-java-1.4/tutorials/store/store-client/pom.xml @@ -111,6 +111,9 @@ <version>1.4</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.4/tutorials/store/store-db/pom.xml b/branches/sca-java-1.4/tutorials/store/store-db/pom.xml index 7d32760d44..331174461c 100644 --- a/branches/sca-java-1.4/tutorials/store/store-db/pom.xml +++ b/branches/sca-java-1.4/tutorials/store/store-db/pom.xml @@ -65,6 +65,9 @@ <version>1.4</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.4/tutorials/store/store-eu/pom.xml b/branches/sca-java-1.4/tutorials/store/store-eu/pom.xml index e1817f831c..e33754578f 100644 --- a/branches/sca-java-1.4/tutorials/store/store-eu/pom.xml +++ b/branches/sca-java-1.4/tutorials/store/store-eu/pom.xml @@ -65,6 +65,9 @@ <version>1.4</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.4/tutorials/store/store-market/build.xml b/branches/sca-java-1.4/tutorials/store/store-market/build.xml index a45411b94a..08327d774b 100644 --- a/branches/sca-java-1.4/tutorials/store/store-market/build.xml +++ b/branches/sca-java-1.4/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.4.jar"/> </fileset> - <fileset id="3rdparty.jars" dir="../../lib"> + <fileset id="3rdparty.jars" dir="../../../lib"> </fileset> </project> diff --git a/branches/sca-java-1.4/tutorials/store/store-market/pom.xml b/branches/sca-java-1.4/tutorials/store/store-market/pom.xml index c302915ead..a7b21765aa 100644 --- a/branches/sca-java-1.4/tutorials/store/store-market/pom.xml +++ b/branches/sca-java-1.4/tutorials/store/store-market/pom.xml @@ -65,6 +65,9 @@ <version>1.4</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.4/tutorials/store/store-mashup/pom.xml b/branches/sca-java-1.4/tutorials/store/store-mashup/pom.xml index a8d271d849..7cdd182253 100644 --- a/branches/sca-java-1.4/tutorials/store/store-mashup/pom.xml +++ b/branches/sca-java-1.4/tutorials/store/store-mashup/pom.xml @@ -65,6 +65,9 @@ <version>1.4</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.4/tutorials/store/store-merger/pom.xml b/branches/sca-java-1.4/tutorials/store/store-merger/pom.xml index 1491a2d135..fd0e7a93b9 100644 --- a/branches/sca-java-1.4/tutorials/store/store-merger/pom.xml +++ b/branches/sca-java-1.4/tutorials/store/store-merger/pom.xml @@ -65,6 +65,9 @@ <version>1.4</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.4/tutorials/store/store-supplier/pom.xml b/branches/sca-java-1.4/tutorials/store/store-supplier/pom.xml index 2f8769589f..e932d88e77 100644 --- a/branches/sca-java-1.4/tutorials/store/store-supplier/pom.xml +++ b/branches/sca-java-1.4/tutorials/store/store-supplier/pom.xml @@ -65,6 +65,9 @@ <version>1.4</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.4/tutorials/store/store-test/pom.xml b/branches/sca-java-1.4/tutorials/store/store-test/pom.xml index b0317d2402..5e2fa51a67 100644 --- a/branches/sca-java-1.4/tutorials/store/store-test/pom.xml +++ b/branches/sca-java-1.4/tutorials/store/store-test/pom.xml @@ -189,6 +189,9 @@ <version>1.4</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.4/tutorials/store/store/pom.xml b/branches/sca-java-1.4/tutorials/store/store/pom.xml index e3569fda34..70e00b5681 100644 --- a/branches/sca-java-1.4/tutorials/store/store/pom.xml +++ b/branches/sca-java-1.4/tutorials/store/store/pom.xml @@ -65,6 +65,9 @@ <version>1.4</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> diff --git a/branches/sca-java-1.4/tutorials/store/web-services/pom.xml b/branches/sca-java-1.4/tutorials/store/web-services/pom.xml index b3abb93a8b..18341e9bc5 100644 --- a/branches/sca-java-1.4/tutorials/store/web-services/pom.xml +++ b/branches/sca-java-1.4/tutorials/store/web-services/pom.xml @@ -65,6 +65,9 @@ <version>1.4</version> <executions> <execution> + <configuration> + <pathToRootDir>../../..</pathToRootDir> + </configuration> <goals> <goal>generate</goal> </goals> |