From 71a7cba384b8ae7f4578fb9ab1f725d5ce616074 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 26 Oct 2009 23:44:59 +0000
Subject: Merge all changes from 1.5.2 branch into trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@830026 13f79535-47bb-0310-9956-ffa450edef68
---
 branches/sca-java-1.x/distribution/bundle/pom.xml | 28 +++++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'branches/sca-java-1.x/distribution/bundle')

diff --git a/branches/sca-java-1.x/distribution/bundle/pom.xml b/branches/sca-java-1.x/distribution/bundle/pom.xml
index 4192216436..0292aad046 100644
--- a/branches/sca-java-1.x/distribution/bundle/pom.xml
+++ b/branches/sca-java-1.x/distribution/bundle/pom.xml
@@ -52,6 +52,11 @@
             <artifactId>tuscany-binding-atom-js</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <!--dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-binding-atom-js-dojo</artifactId>
+            <version>${pom.version}</version>
+        </dependency-->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
@@ -107,6 +112,11 @@
             <artifactId>tuscany-binding-jsonrpc-js</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <!--dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-binding-jsonrpc-js-dojo</artifactId>
+            <version>${pom.version}</version>
+        </dependency-->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
@@ -449,6 +459,11 @@
             <artifactId>tuscany-implementation-widget-runtime-tuscany</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <!--dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
+            <version>${pom.version}</version>
+        </dependency-->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-node-api</artifactId>
@@ -520,6 +535,11 @@
             <artifactId>tuscany-web-javascript</artifactId>
             <version>${pom.version}</version>
         </dependency>        
+        <!--dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>tuscany-web-javascript-dojo</artifactId>
+            <version>${pom.version}</version>
+        </dependency-->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>tuscany-workspace</artifactId>
@@ -550,17 +570,13 @@
             <artifactId>tuscany-wsdl2java</artifactId>
             <version>${pom.version}</version>
             <exclusions>
-
                 <exclusion>
                     <groupId>org.apache.geronimo.specs</groupId>
-
                     <artifactId>geronimo-activation_1.1_spec</artifactId>
                 </exclusion>
-
             </exclusions>
         </dependency>
-
-         <dependency>
+        <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
             <version>1.1.1</version>
@@ -577,13 +593,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-tools</artifactId>
             <version>1.1.1</version>
         </dependency>
- 
     </dependencies>
 
     <build>
-- 
cgit v1.2.3