diff options
5 files changed, 30 insertions, 7 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/distribution/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/distribution/pom.xml index e85611b07f..371e68324f 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/distribution/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.6.1/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.6.1-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/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/assembly/bin.xml b/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/assembly/bin.xml index 02f382a35c..a81eb26131 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/distribution/src/main/assembly/bin.xml +++ b/sca-java-1.x/branches/sca-java-1.6.1/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/sca-java-1.x/branches/sca-java-1.6.1/samples/build.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/build.xml index be9c338f52..dfb23f7d75 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/samples/build.xml +++ b/sca-java-1.x/branches/sca-java-1.6.1/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/sca-java-1.x/branches/sca-java-1.6.1/samples/pom-distribution.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/pom-distribution.xml index 2034f3a77e..12609a0d19 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/samples/pom-distribution.xml +++ b/sca-java-1.x/branches/sca-java-1.6.1/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/sca-java-1.x/branches/sca-java-1.6.1/samples/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/samples/pom.xml index 6478db2541..b081e6c9f0 100644 --- a/sca-java-1.x/branches/sca-java-1.6.1/samples/pom.xml +++ b/sca-java-1.x/branches/sca-java-1.6.1/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> |