You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/10/15 14:34:21 UTC

svn commit: r1022891 - in /tuscany/sca-java-2.x/trunk: distribution/aggregations/base-runtime/ distribution/tomcat/tomcat-war/src/main/webapp/ features/base-runtime/ modules/binding-comet-runtime/ samples/learning-more/binding-comet/weather-webapp/ sam...

Author: antelder
Date: Fri Oct 15 12:34:21 2010
New Revision: 1022891

URL: http://svn.apache.org/viewvc?rev=1022891&view=rev
Log:
Update base-runtime to more closely match old shades/base, and all the scdl models to base, associated test updates to match that, and change the comet binding to use base + extension approach. Still need to look at whats in core-runtime  vs base-runtime and still need to work out what really should/shouldn't be in base but at least its all consistent to start with now

Modified:
    tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml
    tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
    tuscany/sca-java-2.x/trunk/features/base-runtime/pom.xml
    tuscany/sca-java-2.x/trunk/modules/binding-comet-runtime/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
    tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml
    tuscany/sca-java-2.x/trunk/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java

Modified: tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml?rev=1022891&r1=1022890&r2=1022891&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/distribution/aggregations/base-runtime/pom.xml Fri Oct 15 12:34:21 2010
@@ -49,21 +49,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-endpoint-hazelcast</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-endpoint-hazelcast-client</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <!-- dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-client-javascript</artifactId>
-            <version>${pom.version}</version>
-        </dependency -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-client-impl</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -93,12 +78,6 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-hazelcast-runtime</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-shell</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -135,88 +114,100 @@
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rmi-runtime</artifactId>
+            <artifactId>tuscany-policy-security</artifactId>
             <version>${pom.version}</version>
         </dependency>
+
+<!-- All the scdl modules  -->
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-rmi</artifactId>
+            <artifactId>tuscany-binding-atom</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-osgi</artifactId>
+            <artifactId>tuscany-binding-comet</artifactId>
             <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse</groupId>
-                    <artifactId>osgi</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-osgi-runtime</artifactId>
+            <artifactId>tuscany-binding-corba</artifactId>
             <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse</groupId>
-                    <artifactId>osgi</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl-osgi</artifactId>
+            <artifactId>tuscany-binding-ejb</artifactId>
             <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse</groupId>
-                    <artifactId>osgi</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.osgi</groupId>
-                    <artifactId>services</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility-equinox</artifactId>
+            <artifactId>tuscany-binding-http</artifactId>
             <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse</groupId>
-                    <artifactId>osgi</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher-equinox</artifactId>
+            <artifactId>tuscany-binding-jms</artifactId>
             <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse</groupId>
-                    <artifactId>osgi</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-cli</groupId>
-                    <artifactId>commons-cli</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
-
-<!-- All the scdl modules  -->
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms</artifactId>
+            <artifactId>tuscany-binding-jsonp</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rest</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-bpel</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-jaxrs</artifactId>
+            <version>${pom.version}</version>
+        </dependency -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-script</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-web</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-widget</artifactId>
             <version>${pom.version}</version>
         </dependency>
 

Modified: tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE?rev=1022891&r1=1022890&r2=1022891&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE (original)
+++ tuscany/sca-java-2.x/trunk/distribution/tomcat/tomcat-war/src/main/webapp/LICENSE Fri Oct 15 12:34:21 2010
@@ -216,8 +216,6 @@ conditions of the following licenses.   
 The following components come under Apache Software License 2.0
 
  cglib-2.2.jar
- hazelcast-1.8.3.jar
- hazelcast-client-1.8.3.jar
  swizzle-stream-1.0.2.jar
  XmlSchema-1.4.3.jar
 

Modified: tuscany/sca-java-2.x/trunk/features/base-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/features/base-runtime/pom.xml?rev=1022891&r1=1022890&r2=1022891&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/features/base-runtime/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/features/base-runtime/pom.xml Fri Oct 15 12:34:21 2010
@@ -39,50 +39,81 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-runtime</artifactId>
+            <artifactId>tuscany-domain-node</artifactId>
             <version>${pom.version}</version>
-            <type>pom</type>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-runtime</artifactId>
+            <artifactId>tuscany-implementation-web-runtime</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-launcher</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
+            <artifactId>tuscany-sca-client-impl</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jetty</artifactId>
+            <version>${pom.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.tuscany.sca</groupId>
+                    <artifactId>tuscany-core-spi</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>jetty-util</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
+            <artifactId>tuscany-shell</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <artifactId>tuscany-stripes</artifactId>
             <version>${pom.version}</version>
+            <exclusions>
+                <exclusion>
+                   <groupId>net.sourceforge.stripes</groupId>
+                   <artifactId>stripes</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-web-runtime</artifactId>
+            <artifactId>tuscany-wink</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
+            <artifactId>tuscany-binding-ws-runtime-jaxws-ri</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
+            <artifactId>tuscany-data-api</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
@@ -92,11 +123,177 @@
             <version>${pom.version}</version>
         </dependency>
 
+<!-- All the scdl modules  -->
+
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-client-impl</artifactId>
+            <artifactId>tuscany-binding-atom</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-comet</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-corba</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ejb</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonp</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rest</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-bpel</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-jaxrs</artifactId>
+            <version>${pom.version}</version>
+        </dependency -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-script</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-spring</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-web</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-widget</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+<!-- these remaining dependencies are not required when using JDK6, so use a scope of provided  -->
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <version>1.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.4</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.1.12</version>
+            <scope>provided</scope>
+        </dependency>
+
+
+        <dependency>
+            <groupId>javax.xml.ws</groupId>
+            <artifactId>jaxws-api</artifactId>
+            <version>2.1</version>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>jsr250-api</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.jws</groupId>
+            <artifactId>jsr181-api</artifactId>
+            <version>1.0-MR1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.stream</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0-2</version>
+            <scope>provided</scope>
+        </dependency>
+
 
     </dependencies>
 

Modified: tuscany/sca-java-2.x/trunk/modules/binding-comet-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-comet-runtime/pom.xml?rev=1022891&r1=1022890&r2=1022891&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-comet-runtime/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-comet-runtime/pom.xml Fri Oct 15 12:34:21 2010
@@ -34,8 +34,10 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-comet</artifactId>
+			<artifactId>tuscany-base-runtime-pom</artifactId>
+            <type>pom</type>
 			<version>2.0-SNAPSHOT</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.atmosphere</groupId>
@@ -58,35 +60,14 @@
 			<version>1.0</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-http</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-host-jetty</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-node-impl</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-sca-api</artifactId>
-			<version>2.0-SNAPSHOT</version>
+
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+            <version>6.1.19</version>
 			<scope>test</scope>
-		</dependency>
+        </dependency>
+
 	</dependencies>
 
 	<repositories>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml?rev=1022891&r1=1022890&r2=1022891&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml Fri Oct 15 12:34:21 2010
@@ -35,14 +35,13 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-base-runtime-nodep</artifactId>
+			<artifactId>tuscany-base-runtime</artifactId>
 			<version>2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tuscany.sca</groupId>
 			<artifactId>tuscany-binding-comet-runtime</artifactId>
 			<version>2.0-SNAPSHOT</version>
-			<type>jar</type>
 		</dependency>
 		<dependency>
 			<groupId>javax</groupId>

Modified: tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml?rev=1022891&r1=1022890&r2=1022891&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml Fri Oct 15 12:34:21 2010
@@ -45,7 +45,7 @@
 
         <dependency>
             <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
+            <artifactId>activemq-all</artifactId>
             <version>5.3.0</version>
             <scope>runtime</scope>
         </dependency>

Modified: tuscany/sca-java-2.x/trunk/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java?rev=1022891&r1=1022890&r2=1022891&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/base/dependencies/src/test/java/org/apache/tuscany/sca/itest/base/dependencies/ValidateDependenciesTestCase.java Fri Oct 15 12:34:21 2010
@@ -35,8 +35,6 @@ import org.junit.Test;
  * Current required jars are:
  *    asm-3.1.jar
  *    cglib-2.2.jar
- *    hazelcast-1.8.3.jar
- *    hazelcast-client-1.8.3.jar
  *    tuscany-base-2.0-SNAPSHOT.jar
  *    wsdl4j-1.6.2.jar
  *    XmlSchema-1.4.3.jar  
@@ -53,6 +51,6 @@ public class ValidateDependenciesTestCas
         Assert.assertTrue(dependenciesDir.exists());
         
         File[] dependencyFiles = dependenciesDir.listFiles();
-        Assert.assertEquals(8, dependencyFiles.length);
+        Assert.assertEquals(6, dependencyFiles.length);
     }
 }