From 0db41b897a462a0f6612c41c3d88c386bd13b258 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 15 Oct 2010 12:34:21 +0000
Subject: 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

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1022891 13f79535-47bb-0310-9956-ffa450edef68
---
 .../trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml   | 3 +--
 .../samples/learning-more/binding-jms/helloworld-contribution/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'sca-java-2.x/trunk/samples')

diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
index bcd090dad9..0d37ef89aa 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml
@@ -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>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml
index b98f5ac74f..dbc3cd82a0 100644
--- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml
+++ b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-contribution/pom.xml
@@ -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>
-- 
cgit v1.2.3