Merge r1022646 TUSCANY-3726: Include store-dojo and its runtime dependencies in the binary distribution
git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk@1027556 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 6844eb8..03d0980 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -105,11 +105,37 @@
<!--don't put two servlet hosts in the classpath TUSCANY-1954 -->
<!--include tomcat here so it is shipped in modules/ but not -->
<!--in the all jar -->
- <!-- dependency>
+ <dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tuscany-host-tomcat</artifactId>
<version>1.7-SNAPSHOT</version>
- </dependency -->
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-atom-js-dojo</artifactId>
+ <version>1.6.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-binding-jsonrpc-js-dojo</artifactId>
+ <version>1.6.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
+ <version>1.6.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-web-javascript-dojo</artifactId>
+ <version>1.6.1-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.dojotoolkit</groupId>
+ <artifactId>dojo</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
diff --git a/distribution/src/main/assembly/bin.xml b/distribution/src/main/assembly/bin.xml
index 82c7194..b616731 100644
--- a/distribution/src/main/assembly/bin.xml
+++ b/distribution/src/main/assembly/bin.xml
@@ -186,8 +186,6 @@
<exclude>helloworld-ws-deep-webapp/**/*</exclude>
<exclude>helloworld-ws-service-webapp</exclude>
<exclude>helloworld-ws-service-webapp/**/*</exclude>
- <exclude>store-dojo</exclude>
- <exclude>store-dojo/**/*</exclude>
<exclude>zipcode-jaxws/</exclude>
<exclude>zipcode-jaxws/**/*</exclude>
</excludes>
diff --git a/samples/build.xml b/samples/build.xml
index be9c338..dfb23f7 100644
--- a/samples/build.xml
+++ b/samples/build.xml
@@ -87,6 +87,7 @@
<ant dir="spring-bigbank-checkaccount" target="${target}"/>
<ant dir="spring-bigbank-stockquote" target="${target}"/>
<ant dir="store" target="${target}"/>
+ <ant dir="store-dojo" target="${target}"/>
<ant dir="store-secure" target="${target}"/>
<ant dir="store-webapp" target="${target}"/>
<ant dir="supplychain" target="${target}"/>
diff --git a/samples/pom-distribution.xml b/samples/pom-distribution.xml
index 2034f3a..12609a0 100644
--- a/samples/pom-distribution.xml
+++ b/samples/pom-distribution.xml
@@ -129,8 +129,7 @@
<module>simple-callback</module>
<module>simple-callback-ws</module>
<module>store</module>
- <!-- the following is excluded from pom-distribution.xml
- <module>store-dojo</module -->
+ <module>store-dojo</module>
<module>store-webapp</module>
<module>store-secure</module>
<module>supplychain</module>
diff --git a/samples/pom.xml b/samples/pom.xml
index 8c78ae0..0400bd1 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -129,7 +129,6 @@
<module>simple-callback</module>
<module>simple-callback-ws</module>
<module>store</module>
- <!-- the following is excluded from pom-distribution.xml -->
<module>store-dojo</module>
<module>store-webapp</module>
<module>store-secure</module>
