Fixes for TUSCANY-2696

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@722054 13f79535-47bb-0310-9956-ffa450edef68

16 files changed, 83 insertions, 15 deletions

diff --git a/branches/sca-java-1.x/samples/callbacks-jms/pom.xml b/branches/sca-java-1.x/samples/callbacks-jms/pom.xml
index 5d7b1453b4..18ca8668fc 100644
--- a/branches/sca-java-1.x/samples/callbacks-jms/pom.xml
+++ b/branches/sca-java-1.x/samples/callbacks-jms/pom.xml
@@ -69,6 +69,11 @@
             <version>5.1.0</version>

             <scope>test</scope>

         </dependency>

+        <dependency>

+            <groupId>backport-util-concurrent</groupId>

+            <artifactId>backport-util-concurrent</artifactId>

+            <version>3.1</version>

+        </dependency>

 <!-- 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

diff --git a/branches/sca-java-1.x/samples/helloworld-bpel-ws/build.xml b/branches/sca-java-1.x/samples/helloworld-bpel-ws/build.xml
index c8917007f1..3ad74393c9 100644
--- a/branches/sca-java-1.x/samples/helloworld-bpel-ws/build.xml
+++ b/branches/sca-java-1.x/samples/helloworld-bpel-ws/build.xml
@@ -53,7 +53,7 @@
     </target>

 

     <target name="unzip-ode-db" depends="init">

-        <unzip src="../../lib/ode-dao-jpa-ojpa-derby-1.1.zip" dest="target/database"/>

+        <unzip src="../../lib/ode-dao-jpa-ojpa-derby-1.1.1.zip" dest="target/database"/>

     </target> 

 

     <target name="compile" depends="init,generate-wsdl,unzip-ode-db">

diff --git a/branches/sca-java-1.x/samples/helloworld-bpel/build.xml b/branches/sca-java-1.x/samples/helloworld-bpel/build.xml
index 890a6427b8..4f944dafdb 100644
--- a/branches/sca-java-1.x/samples/helloworld-bpel/build.xml
+++ b/branches/sca-java-1.x/samples/helloworld-bpel/build.xml
@@ -53,7 +53,7 @@
     </target>
 
     <target name="unzip-ode-db" depends="init">
-        <unzip src="../../lib/ode-dao-jpa-ojpa-derby-1.1.zip" dest="target/database"/>
+        <unzip src="../../lib/ode-dao-jpa-ojpa-derby-1.1.1.zip" dest="target/database"/>
     </target> 
 
     <target name="compile" depends="init,generate-wsdl,unzip-ode-db">
diff --git a/branches/sca-java-1.x/samples/helloworld-bpel/pom.xml b/branches/sca-java-1.x/samples/helloworld-bpel/pom.xml
index 4d6857ea0d..1e63fa2cd0 100644
--- a/branches/sca-java-1.x/samples/helloworld-bpel/pom.xml
+++ b/branches/sca-java-1.x/samples/helloworld-bpel/pom.xml
@@ -60,6 +60,17 @@
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
             <version>1.1.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>backport-util-concurrent</groupId>
+                    <artifactId>backport-util-concurrent</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>3.1</version>
         </dependency>
 
 		<dependency>
diff --git a/branches/sca-java-1.x/samples/helloworld-jms-webapp/pom.xml b/branches/sca-java-1.x/samples/helloworld-jms-webapp/pom.xml
index 164cade9f4..6e12e5334a 100644
--- a/branches/sca-java-1.x/samples/helloworld-jms-webapp/pom.xml
+++ b/branches/sca-java-1.x/samples/helloworld-jms-webapp/pom.xml
@@ -62,6 +62,11 @@
             <version>5.1.0</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>3.1</version>
+        </dependency>
 
     </dependencies>
 
diff --git a/branches/sca-java-1.x/samples/helloworld-reference-jms/pom.xml b/branches/sca-java-1.x/samples/helloworld-reference-jms/pom.xml
index 1345497313..c257983416 100644
--- a/branches/sca-java-1.x/samples/helloworld-reference-jms/pom.xml
+++ b/branches/sca-java-1.x/samples/helloworld-reference-jms/pom.xml
@@ -81,7 +81,12 @@
                     <artifactId>activemq-web-demo</artifactId>

                 </exclusion>

             </exclusions>

-        </dependency>     

+        </dependency>

+        <dependency>

+            <groupId>backport-util-concurrent</groupId>

+            <artifactId>backport-util-concurrent</artifactId>

+            <version>3.1</version>

+        </dependency>  

         

     </dependencies>

     

diff --git a/branches/sca-java-1.x/samples/helloworld-service-jms/pom.xml b/branches/sca-java-1.x/samples/helloworld-service-jms/pom.xml
index af62dae591..b685c7c851 100644
--- a/branches/sca-java-1.x/samples/helloworld-service-jms/pom.xml
+++ b/branches/sca-java-1.x/samples/helloworld-service-jms/pom.xml
@@ -74,6 +74,11 @@
                     <artifactId>activemq-web-demo</artifactId>

                 </exclusion>

             </exclusions>

+        </dependency>

+        <dependency>

+            <groupId>backport-util-concurrent</groupId>

+            <artifactId>backport-util-concurrent</artifactId>

+            <version>3.1</version>

         </dependency>           

        

     </dependencies>

diff --git a/branches/sca-java-1.x/samples/helloworld-ws-sdo/pom.xml b/branches/sca-java-1.x/samples/helloworld-ws-sdo/pom.xml
index 82b5baba05..f9b85a4c03 100644
--- a/branches/sca-java-1.x/samples/helloworld-ws-sdo/pom.xml
+++ b/branches/sca-java-1.x/samples/helloworld-ws-sdo/pom.xml
@@ -65,6 +65,17 @@
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
             <version>1.1.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>backport-util-concurrent</groupId>
+                    <artifactId>backport-util-concurrent</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>3.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
diff --git a/branches/sca-java-1.x/samples/helloworld-ws-service-jms/pom.xml b/branches/sca-java-1.x/samples/helloworld-ws-service-jms/pom.xml
index f2249f0fa4..2b0d8a6556 100644
--- a/branches/sca-java-1.x/samples/helloworld-ws-service-jms/pom.xml
+++ b/branches/sca-java-1.x/samples/helloworld-ws-service-jms/pom.xml
@@ -56,6 +56,11 @@
             <version>4.1.1</version>

             <scope>compile</scope>            

         </dependency>

+        <dependency>

+            <groupId>backport-util-concurrent</groupId>

+            <artifactId>backport-util-concurrent</artifactId>

+            <version>3.1</version>

+        </dependency>

 

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

diff --git a/branches/sca-java-1.x/samples/photo-gallery/build.xml b/branches/sca-java-1.x/samples/photo-gallery/build.xml
index f7bf61d1b8..c07cd7ba07 100644
--- a/branches/sca-java-1.x/samples/photo-gallery/build.xml
+++ b/branches/sca-java-1.x/samples/photo-gallery/build.xml
@@ -74,6 +74,6 @@
     </target>
     
     <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="saxon-9.0.0.2.jar"/>
+        <include name="saxon-8.7.jar"/>
     </fileset>
 </project>
diff --git a/branches/sca-java-1.x/samples/pom.xml b/branches/sca-java-1.x/samples/pom.xml
index 71bea58888..c149f8470b 100644
--- a/branches/sca-java-1.x/samples/pom.xml
+++ b/branches/sca-java-1.x/samples/pom.xml
@@ -53,7 +53,7 @@
                 <module>calculator-corba-service</module>
                 <module>calculator-lean</module>
                 <module>calculator-distributed</module>
-		<module>calculator-implementation-policies</module>
+		    <module>calculator-implementation-policies</module>
                 <module>calculator-rmi-reference</module>
                 <module>calculator-rmi-service</module>
                 <module>calculator-script</module>
@@ -62,6 +62,7 @@
                 <module>calculator-ws-webapp</module>
                 <module>callback-ws-client</module>
                 <module>callback-ws-service</module>
+                <module>callbacks-jms</module>
                 <module>chat-webapp</module>
                 <module>customer-dojo</module>
                 <module>customer-dojo-webapp</module>
diff --git a/branches/sca-java-1.x/samples/quote-xquery/pom.xml b/branches/sca-java-1.x/samples/quote-xquery/pom.xml
index 3909f32482..189674de65 100644
--- a/branches/sca-java-1.x/samples/quote-xquery/pom.xml
+++ b/branches/sca-java-1.x/samples/quote-xquery/pom.xml
@@ -73,6 +73,17 @@
             <groupId>org.apache.tuscany.sdo</groupId>
             <artifactId>tuscany-sdo-impl</artifactId>
             <version>1.1.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>backport-util-concurrent</groupId>
+                    <artifactId>backport-util-concurrent</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>3.1</version>
         </dependency>
 
         <!--dependency>
diff --git a/branches/sca-java-1.x/samples/spring-bigbank-checkaccount/pom.xml b/branches/sca-java-1.x/samples/spring-bigbank-checkaccount/pom.xml
index 85b734d2b0..7cbe62c670 100644
--- a/branches/sca-java-1.x/samples/spring-bigbank-checkaccount/pom.xml
+++ b/branches/sca-java-1.x/samples/spring-bigbank-checkaccount/pom.xml
@@ -125,6 +125,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>3.1</version>
+        </dependency>
     </dependencies>  
 
     <build>
diff --git a/branches/sca-java-1.x/samples/store-distributed/build.xml b/branches/sca-java-1.x/samples/store-distributed/build.xml
index f0563c26ca..04ba1c7752 100644
--- a/branches/sca-java-1.x/samples/store-distributed/build.xml
+++ b/branches/sca-java-1.x/samples/store-distributed/build.xml
@@ -17,7 +17,7 @@
  * under the License.    
 -->
 <project name="store-distributed" default="compile">
-    <property name="test.class" value="launch.Launch" />
+    <property name="test.class" value="node.LaunchDomain" />
 	<property name="test.jar"   value="sample-store-distributed.jar" />
 	
     <target name="init">
@@ -60,7 +60,7 @@
         <java classname="${test.class}"
               fork="true">
             <classpath>
-                <pathelement path="target/classes"/>
+            	<pathelement path="target/${test.jar}"/>
             	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
             	<fileset refid="3rdparty.jars"/>
             </classpath>
@@ -74,6 +74,6 @@
     </target>
     
     <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="saxon-9.0.0.2.jar"/>
+        <include name="saxon-8.7.jar"/>
     </fileset>
 </project>
diff --git a/branches/sca-java-1.x/samples/store/build.xml b/branches/sca-java-1.x/samples/store/build.xml
index 652afc3570..dec09d5dc2 100644
--- a/branches/sca-java-1.x/samples/store/build.xml
+++ b/branches/sca-java-1.x/samples/store/build.xml
@@ -60,7 +60,7 @@
         <java classname="${test.class}"
               fork="true">
             <classpath>
-                <pathelement path="target/classes"/>
+            	<pathelement path="target/${test.jar}"/>
             	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
             	<fileset refid="3rdparty.jars"/>
             </classpath>
@@ -74,6 +74,6 @@
     </target>
     
     <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="saxon-9.0.0.2.jar"/>
+        <include name="saxon-8.7.jar"/>
     </fileset>
 </project>
diff --git a/branches/sca-java-1.x/samples/zipcode-jaxws/build.xml b/branches/sca-java-1.x/samples/zipcode-jaxws/build.xml
index 85caf5954e..20f2cd8f67 100644
--- a/branches/sca-java-1.x/samples/zipcode-jaxws/build.xml
+++ b/branches/sca-java-1.x/samples/zipcode-jaxws/build.xml
@@ -20,8 +20,12 @@
 <!ENTITY buildDependency SYSTEM "build-dependency.xml">
 ]>    
 
-<project name="sample-jaxws" default="compile">
+<project name="zipcode-jaxws" default="compile">
 	&buildDependency;
+	
+	<property name="test.class" value="zipcode.ZipCodeClient" />
+	<property name="test.jar"   value="sample-zipcode-jaxws.jar" />
+	
     <target name="compile" depends="download-wsdl">
 		<mkdir dir="target/classes"/>
 		<javac destdir="target/classes" debug="on" source="1.5" target="1.5">
@@ -34,9 +38,9 @@
 		<copy todir="target/classes">
 			<fileset dir="src/main/resources"/>
 		</copy>
-		<jar destfile="target/sample-zipcode-jaxws.jar" basedir="target/classes">
+		<jar destfile="target/${test.jar}" basedir="target/classes">
 			<manifest>
-				<attribute name="Main-Class" value="zipcode.ZipCodeClient"/>
+				<attribute name="Main-Class" value="${test.class}"/>
 			</manifest>
 		</jar>
 	</target>
@@ -50,9 +54,9 @@
 	<target name="package" depends="compile" />
 
 	<target name="run">
-		<java classname="zipcode.ZipCodeClient" fork="true">
+		<java classname="${test.class}" fork="true">
 			<classpath>
-				<pathelement location="target/sample-zipcode-jaxws.jar"/>
+				<pathelement location="target/${test.jar}"/>
 				<fileset refid="tuscany.jars"/>
 				<fileset refid="3rdparty.jars"/>
 			</classpath>