You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ra...@apache.org on 2008/12/01 13:02:03 UTC
svn commit: r722054 - in /tuscany/branches/sca-java-1.x/samples: ./
callbacks-jms/ helloworld-bpel-ws/ helloworld-bpel/ helloworld-jms-webapp/
helloworld-reference-jms/ helloworld-service-jms/ helloworld-ws-sdo/
helloworld-ws-service-jms/ photo-gallery...
Author: ramkumar
Date: Mon Dec 1 04:01:57 2008
New Revision: 722054
URL: http://svn.apache.org/viewvc?rev=722054&view=rev
Log:
Fixes for TUSCANY-2696
Modified:
tuscany/branches/sca-java-1.x/samples/callbacks-jms/pom.xml
tuscany/branches/sca-java-1.x/samples/helloworld-bpel-ws/build.xml
tuscany/branches/sca-java-1.x/samples/helloworld-bpel/build.xml
tuscany/branches/sca-java-1.x/samples/helloworld-bpel/pom.xml
tuscany/branches/sca-java-1.x/samples/helloworld-jms-webapp/pom.xml
tuscany/branches/sca-java-1.x/samples/helloworld-reference-jms/pom.xml
tuscany/branches/sca-java-1.x/samples/helloworld-service-jms/pom.xml
tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/pom.xml
tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/pom.xml
tuscany/branches/sca-java-1.x/samples/photo-gallery/build.xml
tuscany/branches/sca-java-1.x/samples/pom.xml
tuscany/branches/sca-java-1.x/samples/quote-xquery/pom.xml
tuscany/branches/sca-java-1.x/samples/spring-bigbank-checkaccount/pom.xml
tuscany/branches/sca-java-1.x/samples/store-distributed/build.xml
tuscany/branches/sca-java-1.x/samples/store/build.xml
tuscany/branches/sca-java-1.x/samples/zipcode-jaxws/build.xml
Modified: tuscany/branches/sca-java-1.x/samples/callbacks-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/callbacks-jms/pom.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/callbacks-jms/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/callbacks-jms/pom.xml Mon Dec 1 04:01:57 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/samples/helloworld-bpel-ws/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-bpel-ws/build.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-bpel-ws/build.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-bpel-ws/build.xml Mon Dec 1 04:01:57 2008
@@ -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">
Modified: tuscany/branches/sca-java-1.x/samples/helloworld-bpel/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-bpel/build.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-bpel/build.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-bpel/build.xml Mon Dec 1 04:01:57 2008
@@ -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">
Modified: tuscany/branches/sca-java-1.x/samples/helloworld-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-bpel/pom.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-bpel/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-bpel/pom.xml Mon Dec 1 04:01:57 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/samples/helloworld-jms-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-jms-webapp/pom.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-jms-webapp/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-jms-webapp/pom.xml Mon Dec 1 04:01:57 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/samples/helloworld-reference-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-reference-jms/pom.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-reference-jms/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-reference-jms/pom.xml Mon Dec 1 04:01:57 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/samples/helloworld-service-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-service-jms/pom.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-service-jms/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-service-jms/pom.xml Mon Dec 1 04:01:57 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/pom.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/pom.xml Mon Dec 1 04:01:57 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/pom.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/pom.xml Mon Dec 1 04:01:57 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/samples/photo-gallery/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/photo-gallery/build.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/photo-gallery/build.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/photo-gallery/build.xml Mon Dec 1 04:01:57 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/samples/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/pom.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/pom.xml Mon Dec 1 04:01:57 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/samples/quote-xquery/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/quote-xquery/pom.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/quote-xquery/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/quote-xquery/pom.xml Mon Dec 1 04:01:57 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/samples/spring-bigbank-checkaccount/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/spring-bigbank-checkaccount/pom.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/spring-bigbank-checkaccount/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/spring-bigbank-checkaccount/pom.xml Mon Dec 1 04:01:57 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/samples/store-distributed/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/store-distributed/build.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/store-distributed/build.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/store-distributed/build.xml Mon Dec 1 04:01:57 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/samples/store/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/store/build.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/store/build.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/store/build.xml Mon Dec 1 04:01:57 2008
@@ -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>
Modified: tuscany/branches/sca-java-1.x/samples/zipcode-jaxws/build.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/zipcode-jaxws/build.xml?rev=722054&r1=722053&r2=722054&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/zipcode-jaxws/build.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/zipcode-jaxws/build.xml Mon Dec 1 04:01:57 2008
@@ -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>