Author: nash
Date: Wed Jan 16 09:37:16 2008
New Revision: 612527

URL: http://svn.apache.org/viewvc?rev=612527&view=rev
Log:
Apply fix for TUSCANY-1963 to trunk

Added:
    incubator/tuscany/java/sca/samples/calculator-rmi-reference/build.xml
    incubator/tuscany/java/sca/samples/callback-ws-client/build.xml
Modified:
    incubator/tuscany/java/sca/samples/calculator-rmi-reference/pom.xml
    incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml
    incubator/tuscany/java/sca/samples/helloworld-bpel/README
    incubator/tuscany/java/sca/samples/helloworld-bpel/build.xml

Added: incubator/tuscany/java/sca/samples/calculator-rmi-reference/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-rmi-reference/build.xml?rev=612527&view=auto
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-rmi-reference/build.xml 
(added)
+++ incubator/tuscany/java/sca/samples/calculator-rmi-reference/build.xml Wed 
Jan 16 09:37:16 2008
@@ -0,0 +1,73 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project name="calculator-rmi-reference" default="compile">
+    <property name="test.class"   value="calculator.CalculatorClient" />
+    <property name="test.jar"     value="sample-calculator-rmi-reference.jar" 
/>
+    <property name="manifest.jar" value="../../lib/tuscany-sca-manifest.jar" />
+       
+    <target name="init">
+        <mkdir dir="target/classes"/>
+    </target>
+       
+    <target name="compile" depends="init">
+        <javac srcdir="src/main/java"
+               destdir="target/classes"
+               debug="on"
+               source="1.5"
+               target="1.5">
+            <classpath>
+               <pathelement location="${manifest.jar}"/>
+            </classpath>
+        </javac> 
+        <copy todir="target/classes">
+            <fileset dir="src/main/resources"/>
+        </copy>
+        <jar destfile="target/${test.jar}" basedir="target/classes">
+            <manifest>
+                <attribute name="Main-Class" value="${test.class}" /> 
+            </manifest>
+        </jar>         
+    </target>  
+       
+    <target name="run-classes">
+        <java classname="${test.class}"
+              fork="true">
+            <classpath>
+                <pathelement path="target/classes"/>
+               <pathelement location="${manifest.jar}"/>
+            </classpath>
+        </java>
+    </target>
+       
+    <target name="run">
+        <java classname="${test.class}"
+              fork="true">
+            <classpath>
+                <pathelement path="target/${test.jar}"/>
+               <pathelement location="${manifest.jar}"/>
+            </classpath>
+        </java>        
+    </target>
+       
+    <target name="clean">
+        <delete quiet="true" includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+</project>

Modified: incubator/tuscany/java/sca/samples/calculator-rmi-reference/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-rmi-reference/pom.xml?rev=612527&r1=612526&r2=612527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-rmi-reference/pom.xml 
(original)
+++ incubator/tuscany/java/sca/samples/calculator-rmi-reference/pom.xml Wed Jan 
16 09:37:16 2008
@@ -63,23 +63,6 @@
 
     <build>
        <finalName>${artifactId}</finalName>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.2-incubating-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>calculator.CalculatorClient</mainClass>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>       
     </build>
 
 </project>

Added: incubator/tuscany/java/sca/samples/callback-ws-client/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-client/build.xml?rev=612527&view=auto
==============================================================================
--- incubator/tuscany/java/sca/samples/callback-ws-client/build.xml (added)
+++ incubator/tuscany/java/sca/samples/callback-ws-client/build.xml Wed Jan 16 
09:37:16 2008
@@ -0,0 +1,73 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<project name="callback-ws-client" default="compile">
+    <property name="test.class"   value="myapp.MyClientImpl" />
+    <property name="test.jar"     value="sample-callback-ws-client.jar" />
+    <property name="manifest.jar" value="../../lib/tuscany-sca-manifest.jar" />
+       
+    <target name="init">
+        <mkdir dir="target/classes"/>
+    </target>
+       
+    <target name="compile" depends="init">
+        <javac srcdir="src/main/java"
+               destdir="target/classes"
+               debug="on"
+               source="1.5"
+               target="1.5">
+            <classpath>
+               <pathelement location="${manifest.jar}"/>
+            </classpath>
+        </javac> 
+        <copy todir="target/classes">
+            <fileset dir="src/main/resources"/>
+        </copy>
+        <jar destfile="target/${test.jar}" basedir="target/classes">
+            <manifest>
+                <attribute name="Main-Class" value="${test.class}" /> 
+            </manifest>
+        </jar>         
+    </target>  
+       
+    <target name="run-classes">
+        <java classname="${test.class}"
+              fork="true">
+            <classpath>
+                <pathelement path="target/classes"/>
+               <pathelement location="${manifest.jar}"/>
+            </classpath>
+        </java>
+    </target>
+       
+    <target name="run">
+        <java classname="${test.class}"
+              fork="true">
+            <classpath>
+                <pathelement path="target/${test.jar}"/>
+               <pathelement location="${manifest.jar}"/>
+            </classpath>
+        </java>        
+    </target>
+       
+    <target name="clean">
+        <delete quiet="true" includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+</project>

Modified: incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml?rev=612527&r1=612526&r2=612527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/callback-ws-client/pom.xml Wed Jan 16 
09:37:16 2008
@@ -88,23 +88,6 @@
 
     <build>
        <finalName>${artifactId}</finalName>
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.2-incubating-SNAPSHOT</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>myapp.MyClientImpl</mainClass>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>         
     </build>
 
 </project>

Modified: incubator/tuscany/java/sca/samples/helloworld-bpel/README
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-bpel/README?rev=612527&r1=612526&r2=612527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-bpel/README (original)
+++ incubator/tuscany/java/sca/samples/helloworld-bpel/README Wed Jan 16 
09:37:16 2008
@@ -13,13 +13,27 @@
 
 OR if you don't have ant, on Windows do
 
-java -cp 
..\..\modules\tuscany-assembly-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-assembly-xml-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-assembly-xsd-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-binding-sca-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-binding-sca-xml-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-contribution-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-contribution-impl-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-contribution-namespace-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-core-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-core-databinding-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-core-spi-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-databinding-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-databinding-jaxb-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-databinding-sdo-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-definitions-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-def
 
initions-xml-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-domain-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-domain-api-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-host-embedded-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-implementation-bpel-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-implementation-java-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-implementation-java-runtime-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-implementation-java-xml-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-interface-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-interface-java-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-interface-java-xml-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-interface-wsdl-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-interface-wsdl-xml-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-node-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-node-api-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-policy-1.1
 
-incubating-SNAPSHOT.jar;..\..\modules\tuscany-policy-logging-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-policy-xml-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-sca-api-1.1-incubating-SNAPSHOT.jar;..\..\modules\tuscany-wsdl2java-1.1-incubating-SNAPSHOT.jar;..\..\lib\XmlSchema-1.3.2.jar;..\..\lib\activation-1.1.jar;..\..\lib\activeio-2.0-r118.jar;..\..\lib\annogen-0.1.0.jar;..\..\lib\axiom-api-1.2.5.jar;..\..\lib\axiom-dom-1.2.5.jar;..\..\lib\axiom-impl-1.2.5.jar;..\..\lib\axion-1.0-M3-dev.jar;..\..\lib\axis2-adb-1.3.jar;..\..\lib\axis2-codegen-1.3.jar;..\..\lib\axis2-java2wsdl-1.3.jar;..\..\lib\axis2-kernel-1.3.jar;..\..\lib\backport-util-concurrent-2.2.jar;..\..\lib\cglib-nodep-2.1_3.jar;..\..\lib\codegen-2.2.3.jar;..\..\lib\codegen-ecore-2.2.3.jar;..\..\lib\common-2.2.3.jar;..\..\lib\commons-codec-1.3.jar;..\..\lib\commons-collections-3.1.jar;..\..\lib\commons-fileupload-1.1.1.jar;..\..\lib\commons-httpclient-3.0.1.jar;..\..\lib\commons-io-1.2.jar;..\..\lib\com
 
mons-jexl-1.1.jar;..\..\lib\commons-lang-2.1.jar;..\..\lib\commons-logging-1.1.jar;..\..\lib\commons-primitives-1.0.jar;..\..\lib\derby-10.1.3.1.jar;..\..\lib\ecore-2.2.3.jar;..\..\lib\ecore-change-2.2.3.jar;..\..\lib\ecore-xmi-2.2.3.jar;..\..\lib\geronimo-activation_1.1_spec-1.0-M1.jar;..\..\lib\geronimo-common-1.2-beta.jar;..\..\lib\geronimo-commonj_1.1_spec-1.0.jar;..\..\lib\geronimo-connector-1.2-beta.jar;..\..\lib\geronimo-core-1.2-beta.jar;..\..\lib\geronimo-deployment-1.2-beta.jar;..\..\lib\geronimo-ejb_3.0_spec-1.0.jar;..\..\lib\geronimo-interceptor-1.2-beta.jar;..\..\lib\geronimo-j2ee-1.2-beta.jar;..\..\lib\geronimo-j2ee-connector_1.5_spec-1.1.jar;..\..\lib\geronimo-j2ee-jacc_1.0_spec-1.1.jar;..\..\lib\geronimo-j2ee-management_1.0_spec-1.1.jar;..\..\lib\geronimo-javamail_1.4_spec-1.0-M1.jar;..\..\lib\geronimo-jms_1.1_spec-1.1.jar;..\..\lib\geronimo-jpa_3.0_spec-1.0.jar;..\..\lib\geronimo-jta_1.0.1B_spec-1.0.jar;..\..\lib\geronimo-kernel-1.2-beta.jar;..\..\lib\geroni
 
mo-management-1.2-beta.jar;..\..\lib\geronimo-naming-1.2-beta.jar;..\..\lib\geronimo-spec-j2ee-connector-1.5-rc4.jar;..\..\lib\geronimo-spec-jta-1.0.1B-rc4.jar;..\..\lib\geronimo-system-1.2-beta.jar;..\..\lib\geronimo-transaction-1.2-beta.jar;..\..\lib\geronimo-util-1.2-beta.jar;..\..\lib\howl-1.0.1-1.jar;..\..\lib\httpcore-4.0-alpha5.jar;..\..\lib\httpcore-nio-4.0-alpha5.jar;..\..\lib\httpcore-niossl-4.0-alpha5.jar;..\..\lib\javacc-3.2.jar;..\..\lib\jaxb-api-2.1.jar;..\..\lib\jaxb-impl-2.1.5.jar;..\..\lib\jaxb-xjc-2.1.4.jar;..\..\lib\jaxb2-reflection-2.1.4.jar;..\..\lib\jaxen-1.1-beta-9.jar;..\..\lib\jaxws-api-2.1.jar;..\..\lib\jsr181-api-1.0-MR1.jar;..\..\lib\jsr250-api-1.0.jar;..\..\lib\log4j-1.2.12.jar;..\..\lib\logkit-1.0.1.jar;..\..\lib\mail-1.4.jar;..\..\lib\neethi-2.0.2.jar;..\..\lib\ode-bpel-api-1.1.jar;..\..\lib\ode-bpel-compiler-1.1.jar;..\..\lib\ode-bpel-dao-1.1.jar;..\..\lib\ode-bpel-epr-1.1.jar;..\..\lib\ode-bpel-obj-1.1.jar;..\..\lib\ode-bpel-runtime-1.1.jar;.
 
.\..\lib\ode-bpel-schemas-1.1.jar;..\..\lib\ode-bpel-store-1.1.jar;..\..\lib\ode-dao-jpa-1.1.jar;..\..\lib\ode-jacob-1.1.jar;..\..\lib\ode-jacob-ap-1.1.jar;..\..\lib\ode-scheduler-simple-1.1.jar;..\..\lib\ode-utils-1.1.jar;..\..\lib\openjpa-all-0.9.7-incubating.jar;..\..\lib\openjpa-persistence-0.9.7-incubating.jar;..\..\lib\regexp-1.3.jar;..\..\lib\saaj-api-1.3.jar;..\..\lib\saxon-8.7.jar;..\..\lib\saxon-dom-8.7.jar;..\..\lib\saxon-xpath-8.7.jar;..\..\lib\serp-1.12.0.jar;..\..\lib\stax-api-1.0-2.jar;..\..\lib\tranql-connector-1.1.jar;..\..\lib\tuscany-sdo-api-r2.1-1.0-incubating.jar;..\..\lib\tuscany-sdo-impl-1.0-incubating.jar;..\..\lib\tuscany-sdo-lib-1.0-incubating.jar;..\..\lib\tuscany-sdo-tools-1.0-incubating.jar;..\..\lib\woden-1.0-incubating-M7b.jar;..\..\lib\wsdl4j-1.6.2.jar;..\..\lib\wstx-asl-3.2.1.jar;..\..\lib\xalan-2.7.0.jar;..\..\lib\xbean-naming-2.7.jar;..\..\lib\xercesImpl-2.8.1.jar;..\..\lib\xml-apis-1.3.03.jar;..\..\lib\xml-resolver-1.1.jar;..\..\lib\xmlbea
 ns-2.3.0.jar;..\..\lib\xsd-2.2.3.jar;target\classes;target\database 
helloworld.BPELClient
+mkdir target\classes
+mkdir target\wsdl2java-source
+java -cp ..\..\lib\tuscany-sca-manifest.jar 
org.apache.tuscany.sdo.generate.XSD2JavaGenerator -targetDirectory 
target/wsdl2java-source -prefix HelloWorld -noContainment -noUnsettable 
src/main/resources/helloworld.wsdl
+java -cp ..\..\lib\tuscany-sca-manifest.jar 
org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator -targetDirectory 
target/wsdl2java-source src/main/resources/helloworld.wsdl
+unzip ..\..\lib\ode-dao-jpa-ojpa-derby-1.1.zip -d target\database
+javac -d target\classes -cp target\classes;..\..\lib\tuscany-sca-manifest.jar 
-sourcepath src\main\java;target\wsdl2java-source -target 1.5 -g -source 1.5 
src\main\java\helloworld\BPELClient.java
+copy src\main\resources\* target\classes
+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\classes;target\database 
helloworld.BPELClient
 
 and on *nix do
 
-java -cp 
../../modules/tuscany-assembly-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-assembly-xml-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-assembly-xsd-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-binding-sca-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-binding-sca-xml-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-contribution-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-contribution-impl-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-contribution-namespace-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-core-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-core-databinding-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-core-spi-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-databinding-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-databinding-jaxb-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-databinding-sdo-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-definitions-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-def
 
initions-xml-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-domain-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-domain-api-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-host-embedded-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-implementation-bpel-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-implementation-java-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-implementation-java-runtime-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-implementation-java-xml-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-interface-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-interface-java-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-interface-java-xml-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-interface-wsdl-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-interface-wsdl-xml-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-node-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-node-api-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-policy-1.1
 
-incubating-SNAPSHOT.jar:../../modules/tuscany-policy-logging-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-policy-xml-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-sca-api-1.1-incubating-SNAPSHOT.jar:../../modules/tuscany-wsdl2java-1.1-incubating-SNAPSHOT.jar:../../lib/XmlSchema-1.3.2.jar:../../lib/activation-1.1.jar:../../lib/activeio-2.0-r118.jar:../../lib/annogen-0.1.0.jar:../../lib/axiom-api-1.2.5.jar:../../lib/axiom-dom-1.2.5.jar:../../lib/axiom-impl-1.2.5.jar:../../lib/axion-1.0-M3-dev.jar:../../lib/axis2-adb-1.3.jar:../../lib/axis2-codegen-1.3.jar:../../lib/axis2-java2wsdl-1.3.jar:../../lib/axis2-kernel-1.3.jar:../../lib/backport-util-concurrent-2.2.jar:../../lib/cglib-nodep-2.1_3.jar:../../lib/codegen-2.2.3.jar:../../lib/codegen-ecore-2.2.3.jar:../../lib/common-2.2.3.jar:../../lib/commons-codec-1.3.jar:../../lib/commons-collections-3.1.jar:../../lib/commons-fileupload-1.1.1.jar:../../lib/commons-httpclient-3.0.1.jar:../../lib/commons-io-1.2.jar:../../lib/com
 
mons-jexl-1.1.jar:../../lib/commons-lang-2.1.jar:../../lib/commons-logging-1.1.jar:../../lib/commons-primitives-1.0.jar:../../lib/derby-10.1.3.1.jar:../../lib/ecore-2.2.3.jar:../../lib/ecore-change-2.2.3.jar:../../lib/ecore-xmi-2.2.3.jar:../../lib/geronimo-activation_1.1_spec-1.0-M1.jar:../../lib/geronimo-common-1.2-beta.jar:../../lib/geronimo-commonj_1.1_spec-1.0.jar:../../lib/geronimo-connector-1.2-beta.jar:../../lib/geronimo-core-1.2-beta.jar:../../lib/geronimo-deployment-1.2-beta.jar:../../lib/geronimo-ejb_3.0_spec-1.0.jar:../../lib/geronimo-interceptor-1.2-beta.jar:../../lib/geronimo-j2ee-1.2-beta.jar:../../lib/geronimo-j2ee-connector_1.5_spec-1.1.jar:../../lib/geronimo-j2ee-jacc_1.0_spec-1.1.jar:../../lib/geronimo-j2ee-management_1.0_spec-1.1.jar:../../lib/geronimo-javamail_1.4_spec-1.0-M1.jar:../../lib/geronimo-jms_1.1_spec-1.1.jar:../../lib/geronimo-jpa_3.0_spec-1.0.jar:../../lib/geronimo-jta_1.0.1B_spec-1.0.jar:../../lib/geronimo-kernel-1.2-beta.jar:../../lib/geroni
 
mo-management-1.2-beta.jar:../../lib/geronimo-naming-1.2-beta.jar:../../lib/geronimo-spec-j2ee-connector-1.5-rc4.jar:../../lib/geronimo-spec-jta-1.0.1B-rc4.jar:../../lib/geronimo-system-1.2-beta.jar:../../lib/geronimo-transaction-1.2-beta.jar:../../lib/geronimo-util-1.2-beta.jar:../../lib/howl-1.0.1-1.jar:../../lib/httpcore-4.0-alpha5.jar:../../lib/httpcore-nio-4.0-alpha5.jar:../../lib/httpcore-niossl-4.0-alpha5.jar:../../lib/javacc-3.2.jar:../../lib/jaxb-api-2.1.jar:../../lib/jaxb-impl-2.1.5.jar:../../lib/jaxb-xjc-2.1.4.jar:../../lib/jaxb2-reflection-2.1.4.jar:../../lib/jaxen-1.1-beta-9.jar:../../lib/jaxws-api-2.1.jar:../../lib/jsr181-api-1.0-MR1.jar:../../lib/jsr250-api-1.0.jar:../../lib/log4j-1.2.12.jar:../../lib/logkit-1.0.1.jar:../../lib/mail-1.4.jar:../../lib/neethi-2.0.2.jar:../../lib/ode-bpel-api-1.1.jar:../../lib/ode-bpel-compiler-1.1.jar:../../lib/ode-bpel-dao-1.1.jar:../../lib/ode-bpel-epr-1.1.jar:../../lib/ode-bpel-obj-1.1.jar:../../lib/ode-bpel-runtime-1.1.jar:.
 
./../lib/ode-bpel-schemas-1.1.jar:../../lib/ode-bpel-store-1.1.jar:../../lib/ode-dao-jpa-1.1.jar:../../lib/ode-jacob-1.1.jar:../../lib/ode-jacob-ap-1.1.jar:../../lib/ode-scheduler-simple-1.1.jar:../../lib/ode-utils-1.1.jar:../../lib/openjpa-all-0.9.7-incubating.jar:../../lib/openjpa-persistence-0.9.7-incubating.jar:../../lib/regexp-1.3.jar:../../lib/saaj-api-1.3.jar:../../lib/saxon-8.7.jar:../../lib/saxon-dom-8.7.jar:../../lib/saxon-xpath-8.7.jar:../../lib/serp-1.12.0.jar:../../lib/stax-api-1.0-2.jar:../../lib/tranql-connector-1.1.jar:../../lib/tuscany-sdo-api-r2.1-1.0-incubating.jar:../../lib/tuscany-sdo-impl-1.0-incubating.jar:../../lib/tuscany-sdo-lib-1.0-incubating.jar:../../lib/tuscany-sdo-tools-1.0-incubating.jar:../../lib/woden-1.0-incubating-M7b.jar:../../lib/wsdl4j-1.6.2.jar:../../lib/wstx-asl-3.2.1.jar:../../lib/xalan-2.7.0.jar:../../lib/xbean-naming-2.7.jar:../../lib/xercesImpl-2.8.1.jar:../../lib/xml-apis-1.3.03.jar:../../lib/xml-resolver-1.1.jar:../../lib/xmlbea
 ns-2.3.0.jar:../../lib/xsd-2.2.3.jar:target/classes:target/database 
helloworld.BPELClient 
+mkdir target/classes
+mkdir target/wsdl2java-source
+java -cp ../../lib/tuscany-sca-manifest.jar 
org.apache.tuscany.sdo.generate.XSD2JavaGenerator -targetDirectory 
target/wsdl2java-source -prefix HelloWorld -noContainment -noUnsettable 
src/main/resources/helloworld.wsdl
+java -cp ../../lib/tuscany-sca-manifest.jar 
org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator -targetDirectory 
target/wsdl2java-source src/main/resources/helloworld.wsdl
+unzip ../../lib/ode-dao-jpa-ojpa-derby-1.1.zip -d target/database
+javac -d target/classes -cp target/classes;../../lib/tuscany-sca-manifest.jar 
-sourcepath src/main/java;target/wsdl2java-source -target 1.5 -g -source 1.5 
src/main/java/helloworld/BPELClient.java
+cp src/main/resources/* target/classes
+java -cp ../../lib/tuscany-sca-manifest.jar:target/classes:target/database 
helloworld.BPELClient
 
-The sample will start the an embedded BPEL engine, deploy process and invoke 
it.
+The sample will start an embedded BPEL engine, deploy a process and invoke it.
 
 Sample Overview
 ---------------
@@ -83,7 +97,7 @@
 
 BUILD SUCCESSFUL
 Total time: 36 seconds
-     
+
 
 Building And Running The Sample Using Maven 
 -------------------------------------------
@@ -137,4 +151,4 @@
 
 
 
-This shows that the Junit test cases have run successfully. 
+This shows that the Junit test cases have run successfully.

Modified: incubator/tuscany/java/sca/samples/helloworld-bpel/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-bpel/build.xml?rev=612527&r1=612526&r2=612527&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-bpel/build.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-bpel/build.xml Wed Jan 16 
09:37:16 2008
@@ -17,6 +17,9 @@
  * under the License.    
 -->
 <project name="sample-helloworld-bpel" default="compile">
+    <property name="test.class"   value="helloworld.BPELClient" />
+    <property name="test.jar"     value="sample-helloworld-bpel.jar" />
+    <property name="manifest.jar" value="../../lib/tuscany-sca-manifest.jar" />
 
     <target name="init">
         <mkdir dir="target/classes"/>
@@ -34,8 +37,7 @@
             <arg value="src/main/resources/helloworld.wsdl"/>
 
             <classpath>
-                <fileset refid="tuscany.jars"/>
-                <fileset refid="3rdparty.jars"/>
+                <pathelement location="${manifest.jar}"/>
             </classpath>
         </java>
         
@@ -45,175 +47,49 @@
             <arg value="src/main/resources/helloworld.wsdl"/>
 
             <classpath>
-                <fileset refid="tuscany.jars"/>
-                <fileset refid="3rdparty.jars"/>
+                <pathelement location="${manifest.jar}"/>
             </classpath>
         </java>
     </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.zip" 
dest="target/database"/>
     </target> 
 
     <target name="compile" depends="init,generate-wsdl,unzip-ode-db">
-        <mkdir dir="target/classes"/>
         <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
             <src path="src/main/java"/>
             <src path="target/wsdl2java-source"/>
             <classpath>
-                <fileset refid="tuscany.jars"/>
-                <fileset refid="3rdparty.jars"/>
+                <pathelement location="${manifest.jar}"/>
             </classpath>
         </javac>
         <copy todir="target/classes">
             <fileset dir="src/main/resources"/>
         </copy>
-        <jar destfile="target/sample-helloworld-bpel.jar" 
basedir="target/classes">
+        <jar destfile="target/${test.jar}" basedir="target/classes">
             <manifest>
-                <attribute name="Main-Class" value="helloworld.BPELClient"/>
+                <attribute name="Main-Class" value="${test.class}" /> 
             </manifest>
         </jar>
     </target>
 
     <target name="run">
-        <java classname="helloworld.BPELClient"> <!-- fork="true" -->
+        <java classname="${test.class}"> <!-- fork="true" -->
             <!-- jvmarg value="-Xdebug"/ -->
             <!-- jvmarg 
value="-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"/ -->
             <classpath>
                 <pathelement location="target/classes"/>
                 <pathelement location="target/database"/>
-                <fileset refid="tuscany.jars"/>
-                <fileset refid="3rdparty.jars"/>
+                <pathelement location="${manifest.jar}"/>
             </classpath>
         </java>
     </target>
-
+    
     <target name="clean">
         <delete includeemptydirs="true">
             <fileset dir="target"/>
         </delete>
     </target>
-
-    <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-interface-java-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xsd-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include 
name="tuscany-implementation-java-xml-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include 
name="tuscany-interface-java-xml-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include 
name="tuscany-implementation-java-runtime-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-domain-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include 
name="tuscany-implementation-bpel-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-sca-api-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-host-embedded-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-node-api-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-xml-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-contribution-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-policy-logging-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include 
name="tuscany-implementation-java-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include 
name="tuscany-contribution-impl-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-interface-wsdl-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-domain-api-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-core-spi-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-core-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include 
name="tuscany-contribution-java-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-databinding-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-node-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-xml-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-binding-sca-xml-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include 
name="tuscany-core-databinding-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include 
name="tuscany-interface-wsdl-xml-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include 
name="tuscany-contribution-namespace-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-definitions-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-assembly-xml-1.0.1-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-wsdl2java-1.0.1-incubating-SNAPSHOT.jar"/>
-    </fileset>
-    <fileset id="3rdparty.jars" dir="../../lib">
-        <include name="tuscany-sdo-impl-1.0-incubating-SNAPSHOT.jar"/>
-        <include name="tuscany-sdo-tools-1.0-incubating-SNAPSHOT.jar"/>
-        <include name="geronimo-security-1.2-beta.jar"/>
-        <include name="geronimo-spec-jta-1.0.1B-rc4.jar"/>
-        <include name="saxon-xpath-8.7.jar"/>
-        <include name="log4j-1.2.12.jar"/>
-        <include name="geronimo-interceptor-1.2-beta.jar"/>
-        <include name="geronimo-core-1.2-beta.jar"/>
-        <include name="geronimo-j2ee-jacc_1.0_spec-1.1.jar"/>
-        <include name="ode-bpel-compiler-1.1.jar"/>
-        <include name="ode-bpel-runtime-1.1.jar"/>
-        <include name="geronimo-jpa_3.0_spec-1.0.jar"/>
-        <include name="ode-jacob-1.1.jar"/>
-        <include name="xbean-naming-2.7.jar"/>
-        <include name="axiom-impl-1.2.5.jar"/>
-        <include name="openjpa-all-0.9.7-incubating.jar"/>
-        <include name="xml-resolver-1.1.jar"/>
-        <include name="xalan-2.7.0.jar"/>
-        <include name="ode-bpel-epr-1.1.jar"/>
-        <include name="activeio-2.0-r118.jar"/>
-        <include name="ode-bpel-obj-1.1.jar"/>
-        <include name="geronimo-management-1.2-beta.jar"/>
-        <include name="openjpa-persistence-0.9.7-incubating.jar"/>
-        <include name="ode-jacob-ap-1.1.jar"/>
-        <include name="commons-jexl-1.1.jar"/>
-        <include name="geronimo-ejb_3.0_spec-1.0.jar"/>
-        <include name="ecore-xmi-2.2.3.jar"/>
-        <include name="commons-lang-2.1.jar"/>
-        <include name="serp-1.12.0.jar"/>
-        <include name="neethi-2.0.2.jar"/>
-        <include name="geronimo-j2ee-management_1.0_spec-1.1.jar"/>
-        <include name="geronimo-spec-j2ee-connector-1.5-rc4.jar"/>
-        <include name="derby-10.1.3.1.jar"/>
-        <include name="geronimo-naming-1.2-beta.jar"/>
-        <include name="common-2.2.3.jar"/>
-        <include name="xsd-2.2.3.jar"/>
-        <include name="geronimo-j2ee-1.2-beta.jar"/>
-        <include name="cglib-nodep-2.1_3.jar"/>
-        <include name="geronimo-system-1.2-beta.jar"/>
-        <include name="wsdl4j-1.6.2.jar"/>
-        <include name="xercesImpl-2.8.1.jar"/>
-        <include name="ode-dao-jpa-1.1.jar"/>
-        <include name="geronimo-kernel-1.2-beta.jar"/>
-        <include name="stax-api-1.0-2.jar"/>
-        <include name="commons-collections-3.1.jar"/>
-        <include name="ode-utils-1.1.jar"/>
-        <include name="regexp-1.3.jar"/>
-        <include name="xml-apis-1.3.03.jar"/>
-        <include name="ode-bpel-api-1.1.jar"/>
-        <include name="tuscany-sdo-lib-1.0-incubating-SNAPSHOT.jar"/>
-        <include name="geronimo-common-1.2-beta.jar"/>
-        <include name="ode-bpel-store-1.1.jar"/>
-        <include name="backport-util-concurrent-2.2.jar"/>
-        <include name="geronimo-transaction-1.2-beta.jar"/>
-        <include name="ode-scheduler-simple-1.1.jar"/>
-        <include name="commons-primitives-1.0.jar"/>
-        <include name="geronimo-j2ee-connector_1.5_spec-1.1.jar"/>
-        <include name="tranql-connector-1.1.jar"/>
-        <include name="geronimo-util-1.2-beta.jar"/>
-        <include name="ode-bpel-schemas-1.1.jar"/>
-        <include name="xmlbeans-2.3.0.jar"/>
-        <include name="wstx-asl-3.2.1.jar"/>
-        <include name="geronimo-connector-1.2-beta.jar"/>
-        <include name="geronimo-deployment-1.2-beta.jar"/>
-        <include name="geronimo-jta_1.0.1B_spec-1.0.jar"/>
-        <include name="tuscany-sdo-api-r2.1-1.0-incubating-SNAPSHOT.jar"/>
-        <include name="commons-codec-1.2.jar"/>
-        <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
-        <include name="jaxen-1.1-beta-9.jar"/>
-        <include name="XmlSchema-1.3.2.jar"/>
-        <include name="ode-bpel-dao-1.1.jar"/>
-        <include name="commons-logging-1.0.3.jar"/>
-        <include name="javacc-3.2.jar"/>
-        <include name="ecore-2.2.3.jar"/>
-        <include name="axion-1.0-M3-dev.jar"/>
-        <include name="axiom-api-1.2.5.jar"/>
-        <include name="ecore-change-2.2.3.jar"/>
-        <include name="howl-1.0.1-1.jar"/>
-        <include name="saxon-8.7.jar"/>
-        <include name="saxon-dom-8.7.jar"/>
-        <include name="codegen-2.2.3.jar"/>
-        <include name="codegen-ecore-2.2.3.jar"/>
-        <include name="commons-logging-1.1.jar"/>
-    </fileset>
 
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to