tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject svn commit: r746503 [1/2] - in /tuscany/sandbox/travelsample: chapter-05/ui-contribution/src/main/resources/ chapter-05/ui-contribution/src/main/resources/META-INF/ chapter-06/node/ chapter-06/node/src/main/java/scatours/ chapter-06/payment-bpel-contri...
Date Sat, 21 Feb 2009 13:31:56 GMT
Author: slaws
Date: Sat Feb 21 13:31:55 2009
New Revision: 746503

URL: http://svn.apache.org/viewvc?rev=746503&view=rev
Log:
Fix up the BPEL payment component to run in the wider application and take advantage of the BPEL resolved fix in 1.x

Added:
    tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java   (with props)
    tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java   (with props)
    tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/
    tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml   (with props)
    tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/
    tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml   (with props)
    tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java   (with props)
    tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/META-INF/
    tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml   (with props)
    tuscany/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/resources/Payment.wsdl   (with props)
Removed:
    tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchNode.java
Modified:
    tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
    tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite
    tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html
    tuscany/sandbox/travelsample/chapter-06/node/build.xml
    tuscany/sandbox/travelsample/chapter-06/node/pom.xml
    tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/pom.xml
    tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl
    tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl
    tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
    tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl
    tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel
    tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
    tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
    tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite
    tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl
    tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
    tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/main/resources/EmailGateway.wsdl
    tuscany/sandbox/travelsample/shared-contributions/scatours-contribution/src/main/java/scatours/SCAToursImpl.java
    tuscany/sandbox/travelsample/shared-contributions/shoppingcart-contribution/src/main/java/scatours/shoppingcart/ShoppingCartImpl.java

Modified: tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/META-INF/sca-contribution.xml Sat Feb 21 13:31:55 2009
@@ -28,7 +28,8 @@
    <import.java package="scatours.trip"/>
    <import.java package="scatours.tripbooking"/>
    <import.java package="scatours.travelcatalog"/>
-   <import.java package="payment.creditcard.ws.impl"/>
+   <import.java package="payment.creditcard"/>
+   <import.java package="payment"/>
    <import.java package="scatours.emailgateway"/>
    <import.java package="scatours.paymentprocess"/>
    <import.java package="scatours.shoppingcart"/>

Modified: tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite (original)
+++ tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.composite Sat Feb 21 13:31:55 2009
@@ -142,37 +142,26 @@
         <implementation.java class="scatours.shoppingcart.ShoppingCartImpl"/>
         <service name="ShoppingCart">
         </service>
-        <!--reference name="paymentProcess">
-            <binding.ws uri="http://localhost:8083/PaymentProcess" />
-        </reference--> 
+        <reference name="payment">
+            <binding.ws uri="http://localhost:8080/Payment" />
+        </reference> 
     </component>   
     
-    <!--component name="PaymentProcessComponent">
-        <implementation.bpel process="pp:PaymentProcess"/>
-        <service name="paymentProcessPartnerLink">
-            <interface.wsdl interface="http://www.example.org/PaymentProcess/#wsdl.interface(PaymentProcess)" />
-            <binding.ws uri="http://localhost:8080/PaymentProcess" wsdlElement="http://www.example.org/PaymentProcess/#wsdl.service(PaymentProcessService)"/>
+    <component name="PaymentComponent">
+        <implementation.java class="payment.PaymentImpl" />
+        <service name="Payment">
+            <binding.ws uri="http://localhost:8080/Payment" />
         </service>
-        <reference name="creditCardPaymentPartnerLink">
-            <binding.ws uri="http://localhost:8081/CreditCardPayment"/>
+        <reference name="creditCardPayment">
+            <binding.ws uri="http://localhost:8080/CreditCardPayment" />
         </reference>
-        <reference name="emailGatewayPartnerLink">
-            <binding.ws uri="http://localhost:8082/EmailGateway"/>
-        </reference>       
-    </component>  
-           
-    <component name="CreditCardPaymentWS">
-        <implementation.java class="payment.creditcard.ws.impl.CreditCardPaymentWSImpl" />
-        <service name="CreditCardPayment">
-            <binding.ws uri="http://localhost:8081/CreditCardPayment" />
-        </service>
-    </component> 
+    </component>
     
-    <component name="EmailGateway">
-        <implementation.java class="scatours.emailgateway.EmailGatewayImpl" />
-        <service name="EmailGateway">
-            <binding.ws uri="http://localhost:8082/EmailGateway" />
+    <component name="CreditCardPaymentComponent">
+        <implementation.java class="payment.creditcard.CreditCardPaymentImpl" />
+        <service name="CreditCardPayment">
+            <binding.ws uri="http://localhost:8080/CreditCardPayment" />
         </service>
-    </component-->  
+    </component>     
 
 </composite>

Modified: tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html (original)
+++ tuscany/sandbox/travelsample/chapter-05/ui-contribution/src/main/resources/scatours.html Sat Feb 21 13:31:55 2009
@@ -322,7 +322,8 @@
     function checkout() {        
         scaToursCart.checkout(cartId);
         
-        document.getElementById('searchResponse').innerHTML = "";
+        document.getElementById('packagedTripItems').innerHTML = "";
+        document.getElementById('bespokeTripItems').innerHTML = "";
         document.getElementById('cartItems').innerHTML = "Thank you for shopping with SCA Tours";
         document.getElementById('cartPrice').innerHTML = "";
         searchResponseItems = null;

Modified: tuscany/sandbox/travelsample/chapter-06/node/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/node/build.xml?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-06/node/build.xml (original)
+++ tuscany/sandbox/travelsample/chapter-06/node/build.xml Sat Feb 21 13:31:55 2009
@@ -22,14 +22,15 @@
     <target name="compile">
         <mkdir dir="target/classes"/>
         <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
-            <src path="src"/>
+            <src path="src\main\java"/>
             <classpath>
                 <fileset refid="tuscany.jars"/>
                 <fileset refid="3rdparty.jars"/>
             </classpath>
         </javac>
         <copy todir="target/classes">
-            <fileset dir="." excludes="**/*.java, pom.xml, build.xml, target"/>
+            <fileset dir="src\main\resources"/>
+            <fileset dir="src\main\resources"/>
         </copy>
         <jar destfile="target/scatours-chapter-06-node.jar" basedir="target/classes">
             <manifest>
@@ -57,83 +58,78 @@
     </target>
 
     <fileset id="tuscany.jars" dir="../../modules">
-        <include name="tuscany-assembly-1.4.jar"/>
-        <include name="tuscany-assembly-xml-1.4.jar"/>
-        <include name="tuscany-assembly-xsd-1.4.jar"/>
-        <include name="tuscany-binding-atom-1.4.jar"/>
-        <include name="tuscany-binding-atom-abdera-1.4.jar"/>
-        <include name="tuscany-binding-ejb-1.4.jar"/>
-        <include name="tuscany-binding-ejb-runtime-1.4.jar"/>
-        <include name="tuscany-binding-http-1.4.jar"/>
-        <include name="tuscany-binding-http-runtime-1.4.jar"/>
-        <include name="tuscany-binding-jsonrpc-1.4.jar"/>
-        <include name="tuscany-binding-jsonrpc-runtime-1.4.jar"/>
-        <include name="tuscany-binding-sca-1.4.jar"/>
-        <include name="tuscany-binding-sca-axis2-1.4.jar"/>
-        <include name="tuscany-binding-sca-xml-1.4.jar"/>
-        <include name="tuscany-binding-ws-1.4.jar"/>
-        <include name="tuscany-binding-ws-axis2-1.4.jar"/>
-        <include name="tuscany-binding-ws-axis2-policy-1.4.jar"/>
-        <include name="tuscany-binding-ws-wsdlgen-1.4.jar"/>
-        <include name="tuscany-binding-ws-xml-1.4.jar"/>
-        <include name="tuscany-contribution-1.4.jar"/>
-        <include name="tuscany-contribution-impl-1.4.jar"/>
-        <include name="tuscany-contribution-java-1.4.jar"/>
-        <include name="tuscany-contribution-namespace-1.4.jar"/>
-        <include name="tuscany-contribution-resource-1.4.jar"/>
-        <include name="tuscany-contribution-xml-1.4.jar"/>
-        <include name="tuscany-core-1.4.jar"/>
-        <include name="tuscany-core-databinding-1.4.jar"/>
-        <include name="tuscany-core-spi-1.4.jar"/>
-        <include name="tuscany-data-api-1.4.jar"/>
-        <include name="tuscany-databinding-1.4.jar"/>
-        <include name="tuscany-databinding-axiom-1.4.jar"/>
-        <include name="tuscany-databinding-jaxb-1.4.jar"/>
-        <include name="tuscany-databinding-jaxb-axiom-1.4.jar"/>
-        <include name="tuscany-databinding-json-1.4.jar"/>
-        <include name="tuscany-databinding-sdo-1.4.jar"/>
-        <include name="tuscany-definitions-1.4.jar"/>
-        <include name="tuscany-definitions-xml-1.4.jar"/>
-        <include name="tuscany-domain-manager-1.4.jar"/>
-        <include name="tuscany-endpoint-1.4.jar"/>
-        <include name="tuscany-extensibility-1.4.jar"/>
-        <include name="tuscany-host-embedded-1.4.jar"/>
-        <include name="tuscany-host-http-1.4.jar"/>
-        <include name="tuscany-host-jetty-1.4.jar"/>
-        <include name="tuscany-implementation-bpel-1.4.jar"/>
-        <include name="tuscany-implementation-bpel-ode-1.4.jar"/>
-        <include name="tuscany-implementation-ejb-1.4.jar"/>
-        <include name="tuscany-implementation-java-1.4.jar"/>
-        <include name="tuscany-implementation-java-runtime-1.4.jar"/>
-        <include name="tuscany-implementation-java-xml-1.4.jar"/>
-        <include name="tuscany-implementation-node-1.4.jar"/>
-        <include name="tuscany-implementation-node-runtime-1.4.jar"/>
-        <include name="tuscany-implementation-resource-1.4.jar"/>
-        <include name="tuscany-implementation-resource-runtime-1.4.jar"/>
-        <include name="tuscany-implementation-widget-1.4.jar"/>
-        <include name="tuscany-implementation-widget-runtime-1.4.jar"/>
-        <include name="tuscany-interface-1.4.jar"/>
-        <include name="tuscany-interface-java-1.4.jar"/>
-        <include name="tuscany-interface-java-jaxws-1.4.jar"/>
-        <include name="tuscany-interface-java-xml-1.4.jar"/>
-        <include name="tuscany-interface-wsdl-1.4.jar"/>
-        <include name="tuscany-interface-wsdl-xml-1.4.jar"/>
-        <include name="tuscany-monitor-1.4.jar"/>
-        <include name="tuscany-node-api-1.4.jar"/>
-        <include name="tuscany-node-impl-1.4.jar"/>
-        <include name="tuscany-node-launcher-1.4.jar"/>
-        <include name="tuscany-node-manager-1.4.jar"/>
-        <include name="tuscany-policy-1.4.jar"/>
-        <include name="tuscany-policy-security-1.4.jar"/>
-        <include name="tuscany-policy-xml-1.4.jar"/>
-        <include name="tuscany-policy-xml-ws-1.4.jar"/>
-        <include name="tuscany-sca-api-1.4.jar"/>
-        <include name="tuscany-sca-api-extension-1.4.jar"/>
-        <include name="tuscany-workspace-1.4.jar"/>
-        <include name="tuscany-workspace-impl-1.4.jar"/>
-        <include name="tuscany-workspace-xml-1.4.jar"/>
-        <include name="tuscany-xsd-1.4.jar"/>
-        <include name="tuscany-xsd-xml-1.4.jar"/>
+        <include name="tuscany-assembly-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-assembly-xsd-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-atom-abdera-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-http-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-http-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jsonrpc-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-jsonrpc-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-axis2-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-sca-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-axis2-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-axis2-policy-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-wsdlgen-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-binding-ws-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-impl-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-java-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-namespace-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-resource-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-contribution-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-core-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-core-databinding-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-core-spi-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-data-api-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-axiom-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-jaxb-axiom-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-databinding-json-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-definitions-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-domain-manager-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-endpoint-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-extensibility-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-host-embedded-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-host-http-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-host-jetty-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-java-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-node-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-resource-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-resource-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-spring-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-implementation-widget-runtime-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-jaxws-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-java-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-wsdl-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-interface-wsdl-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-monitor-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-node-api-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-node-impl-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-node-launcher-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-node-manager-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-security-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-policy-xml-ws-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-sca-api-extension-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-impl-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-workspace-xml-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-1.5-SNAPSHOT.jar"/>
+        <include name="tuscany-xsd-xml-1.5-SNAPSHOT.jar"/>
     </fileset>
     <fileset id="3rdparty.jars" dir="../../lib">
         <include name="XmlSchema-1.4.2.jar"/>
@@ -146,13 +142,12 @@
         <include name="abdera-parser-0.4.0-incubating.jar"/>
         <include name="abdera-server-0.4.0-incubating.jar"/>
         <include name="activation-1.1.jar"/>
-        <include name="activeio-2.0-r118.jar"/>
         <include name="annogen-0.1.0.jar"/>
+        <include name="aopalliance-1.0.jar"/>
         <include name="asm-all-3.1.jar"/>
         <include name="axiom-api-1.2.7.jar"/>
         <include name="axiom-dom-1.2.7.jar"/>
         <include name="axiom-impl-1.2.7.jar"/>
-        <include name="axion-1.0-M3-dev.jar"/>
         <include name="axis-ant-1.4.jar"/>
         <include name="axis2-adb-1.4.1.jar"/>
         <include name="axis2-codegen-1.4.1.jar"/>
@@ -161,59 +156,26 @@
         <include name="axis2-mtompolicy-1.4.1.jar"/>
         <include name="backport-util-concurrent-3.1.jar"/>
         <include name="bcprov-jdk13-132.jar"/>
-        <include name="cglib-nodep-2.1_3.jar"/>
-        <include name="common-2.2.3.jar"/>
+        <include name="cglib-nodep-2.2.jar"/>
         <include name="commons-codec-1.3.jar"/>
         <include name="commons-collections-3.1.jar"/>
         <include name="commons-discovery-0.2.jar"/>
         <include name="commons-fileupload-1.2.jar"/>
         <include name="commons-httpclient-3.1.jar"/>
         <include name="commons-io-1.4.jar"/>
-        <include name="commons-jexl-1.1.jar"/>
-        <include name="commons-lang-2.1.jar"/>
         <include name="commons-logging-1.1.1.jar"/>
-        <include name="commons-primitives-1.0.jar"/>
         <include name="derby-10.3.1.4.jar"/>
-        <include name="dom4j-1.6.1.jar"/>
-        <include name="ecore-2.2.3.jar"/>
-        <include name="ecore-change-2.2.3.jar"/>
-        <include name="ecore-xmi-2.2.3.jar"/>
         <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
-        <include name="geronimo-common-1.2-beta.jar"/>
-        <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
-        <include name="geronimo-connector-1.2-beta.jar"/>
-        <include name="geronimo-core-1.2-beta.jar"/>
-        <include name="geronimo-deployment-1.2-beta.jar"/>
-        <include name="geronimo-ejb_3.0_spec-1.0.jar"/>
-        <include name="geronimo-interceptor-1.2-beta.jar"/>
-        <include name="geronimo-j2ee-1.2-beta.jar"/>
-        <include name="geronimo-j2ee-connector_1.5_spec-1.1.jar"/>
-        <include name="geronimo-j2ee-jacc_1.0_spec-1.1.jar"/>
-        <include name="geronimo-j2ee-management_1.0_spec-1.1.jar"/>
         <include name="geronimo-javamail_1.4_spec-1.2.jar"/>
         <include name="geronimo-jms_1.1_spec-1.1.jar"/>
-        <include name="geronimo-jpa_3.0_spec-1.0.jar"/>
-        <include name="geronimo-jta_1.0.1B_spec-1.0.jar"/>
-        <include name="geronimo-kernel-1.2-beta.jar"/>
-        <include name="geronimo-management-1.2-beta.jar"/>
-        <include name="geronimo-naming-1.2-beta.jar"/>
-        <include name="geronimo-security-1.2-beta.jar"/>
-        <include name="geronimo-spec-j2ee-connector-1.5-rc4.jar"/>
-        <include name="geronimo-spec-jta-1.0.1B-rc4.jar"/>
         <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>
-        <include name="geronimo-system-1.2-beta.jar"/>
-        <include name="geronimo-transaction-1.2-beta.jar"/>
-        <include name="geronimo-util-1.2-beta.jar"/>
-        <include name="howl-1.0.1-1.jar"/>
         <include name="htmlparser-1.0.5.jar"/>
         <include name="httpcore-4.0-beta1.jar"/>
         <include name="httpcore-nio-4.0-beta1.jar"/>
-        <include name="javacc-3.2.jar"/>
         <include name="jaxb-api-2.1.jar"/>
         <include name="jaxb-impl-2.1.7.jar"/>
         <include name="jaxen-1.1.1.jar"/>
         <include name="jaxws-api-2.1.jar"/>
-        <include name="jdom-1.0.jar"/>
         <include name="jettison-1.0.1.jar"/>
         <include name="jetty-6.1.7.jar"/>
         <include name="jetty-util-6.1.7.jar"/>
@@ -221,54 +183,29 @@
         <include name="jsr181-api-1.0-MR1.jar"/>
         <include name="jsr250-api-1.0.jar"/>
         <include name="junit-4.5.jar"/>
-        <include name="log4j-1.2.13.jar"/>
+        <include name="log4j-1.2.15.jar"/>
         <include name="mail-1.4.jar"/>
         <include name="mex-1.41-impl.jar"/>
         <include name="neethi-2.0.4.jar"/>
-        <include name="ode-bpel-api-1.1.1.jar"/>
-        <include name="ode-bpel-compiler-1.1.1.jar"/>
-        <include name="ode-bpel-dao-1.1.1.jar"/>
-        <include name="ode-bpel-epr-1.1.1.jar"/>
-        <include name="ode-bpel-obj-1.1.1.jar"/>
-        <include name="ode-bpel-runtime-1.1.1.jar"/>
-        <include name="ode-bpel-schemas-1.1.1.jar"/>
-        <include name="ode-bpel-store-1.1.1.jar"/>
-        <include name="ode-dao-jpa-1.1.1.jar"/>
-        <include name="ode-jacob-1.1.1.jar"/>
-        <include name="ode-jacob-ap-1.1.1.jar"/>
-        <include name="ode-scheduler-simple-1.1.1.jar"/>
-        <include name="ode-utils-1.1.1.jar"/>
-        <include name="openjpa-all-0.9.7-incubating.jar"/>
-        <include name="openjpa-persistence-0.9.7-incubating.jar"/>
         <include name="opensaml-1.1.jar"/>
         <include name="rampart-core-1.4.jar"/>
         <include name="rampart-policy-1.4.jar"/>
         <include name="rampart-trust-1.4.jar"/>
-        <include name="regexp-1.3.jar"/>
-        <include name="saxon-8.7.jar"/>
-        <include name="saxon-dom-8.7.jar"/>
-        <include name="saxon-xpath-8.7.jar"/>
-        <include name="serp-1.12.0.jar"/>
         <include name="servlet-api-2.5.jar"/>
+        <include name="spring-beans-2.5.5.jar"/>
+        <include name="spring-context-2.5.5.jar"/>
+        <include name="spring-core-2.5.5.jar"/>
         <include name="stax-api-1.0-2.jar"/>
-        <include name="tranql-connector-1.1.jar"/>
-        <include name="tuscany-sdo-api-r2.1-1.1.1.jar"/>
-        <include name="tuscany-sdo-impl-1.1.1.jar"/>
-        <include name="tuscany-sdo-lib-1.1.1.jar"/>
         <include name="woden-api-1.0M8.jar"/>
         <include name="woden-impl-dom-1.0M8.jar"/>
         <include name="wsdl4j-1.6.2.jar"/>
         <include name="wss4j-1.5.4.jar"/>
         <include name="wstx-asl-3.2.4.jar"/>
         <include name="xalan-2.7.0.jar"/>
-        <include name="xbean-naming-2.7.jar"/>
         <include name="xercesImpl-2.8.1.jar"/>
         <include name="xml-apis-1.3.03.jar"/>
-        <include name="xml-resolver-1.1.jar"/>
         <include name="xmlParserAPIs-2.6.0.jar"/>
-        <include name="xmlbeans-2.3.0.jar"/>
         <include name="xmlsec-1.4.2.jar"/>
-        <include name="xsd-2.2.3.jar"/>
     </fileset>
 
 </project>

Modified: tuscany/sandbox/travelsample/chapter-06/node/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/node/pom.xml?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-06/node/pom.xml (original)
+++ tuscany/sandbox/travelsample/chapter-06/node/pom.xml Sat Feb 21 13:31:55 2009
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-chapter-06-node</artifactId>
@@ -32,103 +32,89 @@
             <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-launcher</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-domain-manager</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-widget-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-atom-abdera</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.4</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>1.4</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.4</version>
+            <artifactId>tuscany-implementation-spring</artifactId>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>        
 
@@ -147,7 +133,7 @@
             <plugin>
                 <groupId>org.apache.tuscany.sca</groupId>
                 <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.4</version>
+                <version>1.5-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <configuration>
@@ -159,6 +145,42 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                    <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->
+                    <version>2.3.1</version>
+                <configuration>
+                    <useFile>false</useFile>
+                    <trimStackTrace>false</trimStackTrace>
+                    <useSystemClassLoader>true</useSystemClassLoader>
+                </configuration>
+            </plugin>             
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.ode</groupId>
+                                    <artifactId>ode-dao-jpa-ojpa-derby</artifactId>
+                                    <version>1.1</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>                   
        </plugins>
     </build>
 </project>

Added: tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java?rev=746503&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java (added)
+++ tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java Sat Feb 21 13:31:55 2009
@@ -0,0 +1,66 @@
+/*
+ * 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.    
+ */
+
+package scatours;
+
+import java.io.IOException;
+
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+
+public class LaunchBPELExampleNode {
+    public static void main(String[] args) throws Exception {
+        LaunchBPELExampleNode.launchFromFileSystemDir();
+    }
+    
+    // OK for development but you must launch the node from this module 
+    public static void launchFromFileSystemDir(){
+        SCANode node = null; 
+        
+        try {
+            node = SCANodeFactory.newInstance().createSCANode("scatours.composite", 
+                                                               new SCAContribution("common", "../../shared-contributions/common-contribution/target/classes"),
+                                                               new SCAContribution("currency", "../../shared-contributions/currency-contribution/target/classes"),
+                                                               new SCAContribution("hotel", "../../shared-contributions/hotel-contribution/target/classes"),
+                                                               new SCAContribution("flight", "../../shared-contributions/flight-contribution/target/classes"),
+                                                               new SCAContribution("car", "../../shared-contributions/car-contribution/target/classes"),
+                                                               new SCAContribution("trip", "../../shared-contributions/trip-contribution/target/classes"),
+                                                               new SCAContribution("tripbooking", "../../shared-contributions/tripbooking-contribution/target/classes"),
+                                                               new SCAContribution("travelcatalog", "../../shared-contributions/travelcatalog-contribution/target/classes"),
+                                                               new SCAContribution("creditcardpayment", "../../shared-contributions/creditcard-payment-jaxb-contribution/target/classes"),
+                                                               new SCAContribution("emailgateway", "../../shared-contributions/emailgateway-contribution/target/classes"),
+                                                               new SCAContribution("shoppingcart", "../../shared-contributions/shoppingcart-contribution/target/classes"),
+                                                               new SCAContribution("scatours", "../../shared-contributions/scatours-contribution/target/classes"),
+                                                               new SCAContribution("payment", "../payment-bpel-contribution/target/classes"),
+                                                               new SCAContribution("ui", "../ui-bpel-contribution/target/classes"));
+            node.start();
+            
+            System.out.println("Node started - Press enter to shutdown.");
+            try {
+                System.in.read();
+            } catch (IOException e) {}
+            
+            node.stop();
+            
+        } catch (Exception ex) {
+            System.out.println(ex.toString());
+        }
+    }    
+}

Propchange: tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchBPELExampleNode.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java?rev=746503&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java (added)
+++ tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java Sat Feb 21 13:31:55 2009
@@ -0,0 +1,66 @@
+/*
+ * 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.    
+ */
+
+package scatours;
+
+import java.io.IOException;
+
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+
+public class LaunchSpringExampleNode {
+    public static void main(String[] args) throws Exception {
+        LaunchSpringExampleNode.launchFromFileSystemDir();
+    }
+    
+    // OK for development but you must launch the node from this module 
+    public static void launchFromFileSystemDir(){
+        SCANode node = null; 
+        
+        try {
+            node = SCANodeFactory.newInstance().createSCANode("scatours.composite", 
+                                                               new SCAContribution("common", "../../shared-contributions/common-contribution/target/classes"),
+                                                               new SCAContribution("currency", "../../shared-contributions/currency-contribution/target/classes"),
+                                                               new SCAContribution("hotel", "../../shared-contributions/hotel-contribution/target/classes"),
+                                                               new SCAContribution("flight", "../../shared-contributions/flight-contribution/target/classes"),
+                                                               new SCAContribution("car", "../../shared-contributions/car-contribution/target/classes"),
+                                                               new SCAContribution("trip", "../../shared-contributions/trip-contribution/target/classes"),
+                                                               new SCAContribution("tripbooking", "../../shared-contributions/tripbooking-contribution/target/classes"),
+                                                               new SCAContribution("travelcatalog", "../../shared-contributions/travelcatalog-contribution/target/classes"),
+                                                               new SCAContribution("creditcardpayment", "../../shared-contributions/creditcard-payment-jaxb-contribution/target/classes"),
+                                                               new SCAContribution("emailgateway", "../../shared-contributions/emailgateway-contribution/target/classes"),
+                                                               new SCAContribution("shoppingcart", "../../shared-contributions/shoppingcart-contribution/target/classes"),
+                                                               new SCAContribution("scatours", "../../shared-contributions/scatours-contribution/target/classes"),
+                                                               new SCAContribution("payment", "../payment-spring-annotation-contribution/target/classes"),
+                                                               new SCAContribution("ui", "../ui-spring-contribution/target/classes"));
+            node.start();
+            
+            System.out.println("Node started - Press enter to shutdown.");
+            try {
+                System.in.read();
+            } catch (IOException e) {}
+            
+            node.stop();
+            
+        } catch (Exception ex) {
+            System.out.println(ex.toString());
+        }
+    }     
+}

Propchange: tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/chapter-06/node/src/main/java/scatours/LaunchSpringExampleNode.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/pom.xml?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/pom.xml Sat Feb 21 13:31:55 2009
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-sca</artifactId>
-        <version>1.4</version>
+        <version>1.5-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <artifactId>scatours-chapter-06-payment-bpel-contribution</artifactId>
@@ -32,55 +32,55 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jetty</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-emailgateway-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-creditcard-payment-jaxb-contribution</artifactId>
-            <version>1.4</version>
+            <version>1.5-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>        
         
@@ -169,7 +169,7 @@
                                 <version>1.1</version>
                                 <type>zip</type>
                                 <overWrite>true</overWrite>
-                                <outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
+                                <outputDirectory>${project.build.directory}/classes/</outputDirectory>
                             </artifactItem>
                         </artifactItems>
                     </configuration>

Modified: tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl (original)
+++ tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl Sat Feb 21 13:31:55 2009
@@ -18,17 +18,17 @@
  * under the License.    
 -->
 <wsdl:definitions name="CreditCardPayment" 
-                  targetNamespace="http://www.example.org/CreditCardPayment/"
+                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
                   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.example.org/CreditCardPayment/" 
+                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/" 
                   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
                   xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
                   xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
     <wsdl:types>
         <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.example.org/CreditCardPayment/"
-                    xmlns:tns="http://www.example.org/CreditCardPayment/"
+                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
+                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"
                     elementFormDefault="unqualified">
             
             <xsd:element name="authorize" type="tns:AuthorizeType"/>
@@ -96,7 +96,7 @@
     <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
         <wsdl:operation name="authorize">
-            <soap:operation soapAction="http://www.example.org/CreditCardPayment/authorize" />
+            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
             <wsdl:input>
                 <soap:body use="literal" />
             </wsdl:input>

Modified: tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl (original)
+++ tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl Sat Feb 21 13:31:55 2009
@@ -18,17 +18,17 @@
  * under the License.    
 -->
 <wsdl:definitions name="EmailGateway" 
-                  targetNamespace="http://www.example.org/EmailGateway/"
+                  targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
                   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.example.org/EmailGateway/" 
+                  xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/" 
                   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
                   xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
                   xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
     <wsdl:types>
         <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.example.org/EmailGateway/"
-                    xmlns:tns="http://www.example.org/EmailGateway/">
+                    targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
+                    xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/">
                     
             <xsd:element name="sendEmail" type="tns:SendEmailType"/>
             <xsd:complexType name="SendEmailType">
@@ -68,7 +68,7 @@
     <wsdl:binding name="EmailGatwayBinding" type="tns:EmailGateway">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
         <wsdl:operation name="sendEmail">
-            <soap:operation soapAction="http://www.example.org/EmailGateway/sendEmail" />
+            <soap:operation soapAction="http://www.tuscanyscatours.com/EmailGateway/sendEmail" />
             <wsdl:input>
                 <soap:body use="literal" />
             </wsdl:input>

Modified: tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml Sat Feb 21 13:31:55 2009
@@ -18,6 +18,6 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
-   <export.java package="scatours.payment"/>
-   <export namespace="http://www.example.org/Payment"/>
+   <export namespace="http://www.tuscanyscatours.com/Payment"/>
+   <export namespace="http://www.tuscanyscatours.com/Payment/"/>
 </contribution>
\ No newline at end of file

Modified: tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl (original)
+++ tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/Payment.wsdl Sat Feb 21 13:31:55 2009
@@ -18,51 +18,51 @@
  * under the License.    
 -->
 <wsdl:definitions name="Payment" 
-                  targetNamespace="http://www.example.org/Payment/"
+                  targetNamespace="http://www.tuscanyscatours.com/Payment/"
                   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.example.org/Payment/" 
+                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 
                   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
                   xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
                   xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
     <wsdl:types>
         <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.example.org/Payment/"
-                    xmlns:tns="http://www.example.org/Payment/">
+                    targetNamespace="http://www.tuscanyscatours.com/Payment/"
+                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">
 
-            <xsd:complexType name="MakePaymentType">
+            <xsd:complexType name="MakePaymentMemberType">
                 <xsd:sequence>
                     <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
                     <xsd:element name="Amount" type="xsd:float"></xsd:element>
                 </xsd:sequence>
             </xsd:complexType>                    
-            <xsd:element name="makePayment" type="tns:MakePaymentType"/>
+            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
       
-            <xsd:complexType name="MakePaymentResponseType">
+            <xsd:complexType name="MakePaymentMemberResponseType">
                 <xsd:sequence>
                     <xsd:element name="Status" type="xsd:string"></xsd:element>
                 </xsd:sequence>
             </xsd:complexType>
-            <xsd:element name="makePaymentResponse" type="tns:MakePaymentResponseType"/>
+            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
             
         </xsd:schema>
     </wsdl:types>
-    <wsdl:message name="MakePaymentRequest">
-        <wsdl:part name="parameters" element="tns:makePayment"></wsdl:part>
+    <wsdl:message name="MakePaymentMemberRequest">
+        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
     </wsdl:message>
-    <wsdl:message name="MakePaymentResponse">
-        <wsdl:part name="parameters" element="tns:makePaymentResponse"></wsdl:part>
+    <wsdl:message name="MakePaymentMemberResponse">
+        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
     </wsdl:message>
     <wsdl:portType name="Payment">
-        <wsdl:operation name="makePayment">
-            <wsdl:input message="tns:MakePaymentRequest"></wsdl:input>
-            <wsdl:output message="tns:MakePaymentResponse"></wsdl:output>
+        <wsdl:operation name="makePaymentMember">
+            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
+            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
         </wsdl:operation>
     </wsdl:portType>
     <wsdl:binding name="PaymentBinding" type="tns:Payment">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="makePayment">
-            <soap:operation soapAction="http://www.example.org/Payment/makePayment" />
+        <wsdl:operation name="makePaymentMember">
+            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
             <wsdl:input>
                 <soap:body use="literal" />
             </wsdl:input>
@@ -73,7 +73,7 @@
     </wsdl:binding>
     <wsdl:service name="PaymentService">
         <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
-            <soap:address location="http://localhost:8083/Payment" />
+            <soap:address location="http://localhost:8080/Payment" />
         </wsdl:port>
     </wsdl:service>
     

Modified: tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel (original)
+++ tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/main/resources/payment.bpel Sat Feb 21 13:31:55 2009
@@ -17,29 +17,29 @@
   ~ under the License.
   -->
 <process name="Payment"
-    targetNamespace="http://www.example.org/Payment"
+    targetNamespace="http://www.tuscanyscatours.com/Payment"
     xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
     xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
     xmlns:tns="http://tuscany.apache.org/Payment"    
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:pp="http://www.example.org/Payment/"
-    xmlns:ccp="http://www.example.org/CreditCardPayment/"
-    xmlns:eg="http://www.example.org/EmailGateway/"
+    xmlns:pp="http://www.tuscanyscatours.com/Payment/"
+    xmlns:ccp="http://www.tuscanyscatours.com/CreditCardPayment/"
+    xmlns:eg="http://www.tuscanyscatours.com/EmailGateway/"
     queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
     expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
 
   <import location="Payment.wsdl" 
           importType="http://schemas.xmlsoap.org/wsdl/"
-          namespace="http://www.example.org/Payment/"/>     
+          namespace="http://www.tuscanyscatours.com/Payment/"/>     
 
   <import location="CreditCardPayment.wsdl" 
           importType="http://schemas.xmlsoap.org/wsdl/"
-          namespace="http://www.example.org/CreditCardPayment/"/>
+          namespace="http://www.tuscanyscatours.com/CreditCardPayment/"/>
           
   <import location="EmailGateway.wsdl" 
           importType="http://schemas.xmlsoap.org/wsdl/"
-          namespace="http://www.example.org/EmailGateway/"/>          
+          namespace="http://www.tuscanyscatours.com/EmailGateway/"/>          
           
    <partnerLinks>
       <partnerLink name="paymentPartnerLink" partnerLinkType="pp:PaymentLinkType" myRole="forward" />
@@ -48,8 +48,8 @@
    </partnerLinks>
     
    <variables>
-     <variable name="makePaymentRequestMessage" messageType="pp:MakePaymentRequest"/>
-     <variable name="makePaymentResponseMessage" messageType="pp:MakePaymentResponse"/>
+     <variable name="makePaymentMemberRequestMessage" messageType="pp:MakePaymentMemberRequest"/>
+     <variable name="makePaymentMemberResponseMessage" messageType="pp:MakePaymentMemberResponse"/>
      <variable name="authorizeRequestMessage" messageType="ccp:AuthorizeRequest"/>
      <variable name="authorizeResponseMessage" messageType="ccp:AuthorizeResponse"/>
      <variable name="sendEmailRequestMessage" messageType="eg:SendEmailRequest"/>
@@ -60,8 +60,8 @@
        <receive name="start"
                 partnerLink="paymentPartnerLink"
                 portType="pp:Payment"
-           	    operation="makePayment"
-                variable="makePaymentRequestMessage"
+           	    operation="makePaymentMember"
+                variable="makePaymentMemberRequestMessage"
                 createInstance="yes"/>
 
        <!-- set up call to payments service -->
@@ -69,7 +69,7 @@
           <copy>
               <from>
                   <literal>
-                  <authorize xmlns="http://www.example.org/CreditCardPayment/">
+                  <authorize xmlns="http://www.tuscanyscatours.com/CreditCardPayment/">
                     <CreditCard xmlns="">
                       <CreditCardType>Visa</CreditCardType>
                       <CreditCardNumber>12345678</CreditCardNumber>
@@ -93,11 +93,11 @@
               <to>$authorizeRequestMessage.parameters</to>
           </copy>
           <copy>
-              <from>$makePaymentRequestMessage.parameters/CustomerId/text()</from>
+              <from>$makePaymentMemberRequestMessage.parameters/CustomerId/text()</from>
               <to>$authorizeRequestMessage.parameters/CreditCard/CardOwner/Name</to>
           </copy>
           <copy>
-              <from>$makePaymentRequestMessage.parameters/Amount/text()</from>
+              <from>$makePaymentMemberRequestMessage.parameters/Amount/text()</from>
               <to>$authorizeRequestMessage.parameters/Amount</to>
           </copy>                    
        </assign>
@@ -114,7 +114,7 @@
           <copy>
               <from>
                   <literal>
-                  <sendEmail xmlns="http://www.example.org/EmailGateway/">
+                  <sendEmail xmlns="http://www.tuscanyscatours.com/EmailGateway/">
                     <Email xmlns="">
                       <To>Default</To>
                       <Title>Payment Confirmation</Title>
@@ -126,7 +126,7 @@
               <to>$sendEmailRequestMessage.parameters</to>
           </copy>
           <copy>
-              <from>$makePaymentRequestMessage.parameters/CustomerId/text()</from>
+              <from>$makePaymentMemberRequestMessage.parameters/CustomerId/text()</from>
               <to>$sendEmailRequestMessage.parameters/Email/To</to>
           </copy>                   
        </assign>                  
@@ -144,12 +144,12 @@
           <copy>
               <from>
                   <literal> 
-                  <makePaymentResponse xmlns="http://www.example.org/Payment">
+                  <makePaymentMemberResponse xmlns="http://www.tuscanyscatours.com/Payment">
                     <Status xmlns="">OK</Status>
-                  </makePaymentResponse>
+                  </makePaymentMemberResponse>
                   </literal>
               </from>
-              <to>$makePaymentResponseMessage.parameters</to>
+              <to>$makePaymentMemberResponseMessage.parameters</to>
           </copy>
        </assign>
        
@@ -157,8 +157,8 @@
        <reply name="end"  
               partnerLink="paymentPartnerLink"
               portType="pp:Payment" 
-              operation="makePayment"
-              variable="makePaymentResponseMessage">
+              operation="makePaymentMember"
+              variable="makePaymentMemberResponseMessage">
        </reply>
    </sequence>
 </process>

Modified: tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java (original)
+++ tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java Sat Feb 21 13:31:55 2009
@@ -37,25 +37,28 @@
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {  
-        
-        creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite", 
-            new SCAContribution("creditcard", "../../shared-contributions/creditcardpayment-contribution/target/test-classes"));        
-        emailGatewayNode = SCANodeFactory.newInstance().createSCANode("emailgateway.composite", 
-                new SCAContribution("creditcard", "../../shared-contributions/emailgateway-contribution/target/test-classes"));
-        paymentNode = SCANodeFactory.newInstance().createSCANode("payment.composite", 
-                new SCAContribution("payment", "./target/test-classes"));
-
-        creditCardNode.start();
-        emailGatewayNode.start();
-        paymentNode.start();
+        try {
+            creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite", 
+                new SCAContribution("creditcard", "../../shared-contributions/creditcard-payment-jaxb-contribution/target/test-classes"));        
+            emailGatewayNode = SCANodeFactory.newInstance().createSCANode("emailgateway.composite", 
+                    new SCAContribution("creditcard", "../../shared-contributions/emailgateway-contribution/target/test-classes"));
+            paymentNode = SCANodeFactory.newInstance().createSCANode("payment.composite", 
+                    new SCAContribution("payment-bpel", "./target/classes"),
+                    new SCAContribution("payment-bpel-test", "./target/test-classes"));
+    
+            creditCardNode.start();
+            emailGatewayNode.start();
+            paymentNode.start();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
     }
     
     @Test
     public void testPayment() {
         SCAClient client = (SCAClient) paymentNode;
         Payment payment = client.getService(Payment.class, "PaymentClient");
-        //[nash] Following line is disabled  because of NPE problem
-        //System.out.println("Result = " + payment.makePayment("Fred", 100.00f));
+        System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f));
     }
 
     @AfterClass

Modified: tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java (original)
+++ tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java Sat Feb 21 13:31:55 2009
@@ -29,9 +29,9 @@
     @Reference
     protected Payment payment;
 
-    public String makePayment(String customerId, float amount) {
+    public String makePaymentMember(String customerId, float amount) {
         // Delegate the external web service
-        return payment.makePayment(customerId, amount);
+        return payment.makePaymentMember(customerId, amount);
     }
 
 }

Added: tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml?rev=746503&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml (added)
+++ tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml Sat Feb 21 13:31:55 2009
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+   <import namespace="http://www.tuscanyscatours.com/Payment"/>
+   <import namespace="http://www.tuscanyscatours.com/Payment/"/>
+</contribution>
\ No newline at end of file

Propchange: tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite (original)
+++ tuscany/sandbox/travelsample/chapter-06/payment-bpel-contribution/src/test/resources/payment.composite Sat Feb 21 13:31:55 2009
@@ -19,8 +19,8 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
            xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:pp="http://www.example.org/Payment" 
-           targetNamespace="http://www.example.org/Payment" 
+           xmlns:pp="http://www.tuscanyscatours.com/Payment" 
+           targetNamespace="http://www.tuscanyscatours.com/Payment" 
            name="payment">
            
     <component name="PaymentClient">
@@ -33,8 +33,8 @@
     <component name="Payment">
         <implementation.bpel process="pp:Payment"/>
         <service name="paymentPartnerLink">
-            <interface.wsdl interface="http://www.example.org/Payment/#wsdl.interface(Payment)" />
-            <binding.ws uri="http://localhost:8083/Payment" wsdlElement="http://www.example.org/Payment/#wsdl.service(PaymentService)"/>
+            <interface.wsdl interface="http://www.tuscanyscatours.com/Payment/#wsdl.interface(Payment)" />
+            <binding.ws uri="http://localhost:8083/Payment" wsdlElement="http://www.tuscanyscatours.com/Payment/#wsdl.service(PaymentService)"/>
         </service>
         <reference name="creditCardPaymentPartnerLink">
             <binding.ws uri="http://localhost:8081/CreditCardPayment"/>

Modified: tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl (original)
+++ tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl Sat Feb 21 13:31:55 2009
@@ -18,17 +18,17 @@
  * under the License.    
 -->
 <wsdl:definitions name="CreditCardPayment" 
-                  targetNamespace="http://www.example.org/CreditCardPayment/"
+                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
                   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.example.org/CreditCardPayment/" 
+                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/" 
                   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
                   xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
                   xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
     <wsdl:types>
         <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.example.org/CreditCardPayment/"
-                    xmlns:tns="http://www.example.org/CreditCardPayment/">
+                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
+                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">
             
             <xsd:element name="authorize" type="tns:AuthorizeType"/>
             <xsd:complexType name="AuthorizeType">
@@ -95,7 +95,7 @@
     <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
         <wsdl:operation name="authorize">
-            <soap:operation soapAction="http://www.example.org/CreditCardPayment/authorize" />
+            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
             <wsdl:input>
                 <soap:body use="literal" />
             </wsdl:input>

Modified: tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml Sat Feb 21 13:31:55 2009
@@ -19,7 +19,4 @@
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
    <export.java package="payment.creditcard"/>
-   <export.java package="payment.creditcard.impl"/>
-   <export.java package="payment.creditcard.ws"/>
-   <export.java package="payment.creditcard.ws.impl"/>
 </contribution>
\ No newline at end of file

Added: tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml?rev=746503&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml (added)
+++ tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml Sat Feb 21 13:31:55 2009
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <import.java package="payment.creditcard"/>
+</contribution>
\ No newline at end of file

Propchange: tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/main/resources/EmailGateway.wsdl
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/main/resources/EmailGateway.wsdl?rev=746503&r1=746502&r2=746503&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/main/resources/EmailGateway.wsdl (original)
+++ tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/main/resources/EmailGateway.wsdl Sat Feb 21 13:31:55 2009
@@ -18,17 +18,17 @@
  * under the License.    
 -->
 <wsdl:definitions name="EmailGateway" 
-                  targetNamespace="http://www.example.org/EmailGateway/"
+                  targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
                   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.example.org/EmailGateway/" 
+                  xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/" 
                   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
                   xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
                   xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
     <wsdl:types>
         <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.example.org/EmailGateway/"
-                    xmlns:tns="http://www.example.org/EmailGateway/">
+                    targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
+                    xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/">
                     
             <xsd:element name="sendEmail" type="tns:SendEmailType"/>
             <xsd:complexType name="SendEmailType">
@@ -68,7 +68,7 @@
     <wsdl:binding name="EmailGatwayBinding" type="tns:EmailGateway">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
         <wsdl:operation name="sendEmail">
-            <soap:operation soapAction="http://www.example.org/EmailGateway/sendEmail" />
+            <soap:operation soapAction="http://www.tuscanyscatours.com/EmailGateway/sendEmail" />
             <wsdl:input>
                 <soap:body use="literal" />
             </wsdl:input>

Added: tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java?rev=746503&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java (added)
+++ tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java Sat Feb 21 13:31:55 2009
@@ -0,0 +1,36 @@
+/*
+ * 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.    
+ */
+
+package scatours.emailgateway;
+
+import org.osoa.sca.annotations.Service;
+
+
+/**
+ * 
+ */
+@Service(EmailGateway.class)
+public class EmailGatewayImpl implements EmailGateway {
+
+    public String sendEmail(EmailType email) {
+        System.out.println("Sending mail to " + email.getTo());
+        return "SENT";
+    }
+
+}

Propchange: tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/EmailGatewayImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml?rev=746503&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml (added)
+++ tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml Sat Feb 21 13:31:55 2009
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+   <import.java package="scatours.emailgateway"/>
+</contribution>
\ No newline at end of file

Propchange: tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/travelsample/shared-contributions/emailgateway-contribution/src/test/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message