You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2009/09/15 18:12:30 UTC
svn commit: r815382 - in /tuscany/sandbox/travelsample: contributions/ contributions/databinding-client/ contributions/databinding-client/src/main/java/scatours/client/ contributions/databinding-client/src/main/resources/ contributions/databinding-clie...

Author: nash
Date: Tue Sep 15 16:12:30 2009
New Revision: 815382

URL: http://svn.apache.org/viewvc?rev=815382&view=rev
Log:
Apply new naming conventions to contributions/databinding-client and launchers/databinding

Added:
    tuscany/sandbox/travelsample/contributions/databinding-client/
      - copied from r815305, tuscany/sandbox/travelsample/contributions/databinding-client-contribution/
    tuscany/sandbox/travelsample/contributions/databinding-client/pom.xml
      - copied unchanged from r815338, tuscany/sandbox/travelsample/contributions/databinding-client-contribution/pom.xml
    tuscany/sandbox/travelsample/contributions/databinding-client/src/main/java/scatours/client/TestClient.java
      - copied unchanged from r815338, tuscany/sandbox/travelsample/contributions/databinding-client-contribution/src/main/java/scatours/client/TestClient.java
    tuscany/sandbox/travelsample/contributions/databinding-client/src/main/resources/META-INF/sca-contribution.xml
      - copied, changed from r815338, tuscany/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/META-INF/sca-contribution.xml
    tuscany/sandbox/travelsample/contributions/databinding-client/src/main/resources/client.composite
      - copied unchanged from r815338, tuscany/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/client.composite
    tuscany/sandbox/travelsample/launchers/databinding/
      - copied from r815305, tuscany/sandbox/travelsample/launchers/databinding-launcher/
    tuscany/sandbox/travelsample/launchers/databinding/build.xml
      - copied unchanged from r815338, tuscany/sandbox/travelsample/launchers/databinding-launcher/build.xml
    tuscany/sandbox/travelsample/launchers/databinding/pom.xml
      - copied unchanged from r815338, tuscany/sandbox/travelsample/launchers/databinding-launcher/pom.xml
    tuscany/sandbox/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java
      - copied, changed from r815338, tuscany/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/DatabindingLauncher.java
Removed:
    tuscany/sandbox/travelsample/launchers/databinding/src/main/java/scatours/LaunchDatabindingNode.java
Modified:
    tuscany/sandbox/travelsample/contributions/databinding-client/build.xml
    tuscany/sandbox/travelsample/contributions/payment-java/src/main/resources/payment.composite
    tuscany/sandbox/travelsample/contributions/pom.xml
    tuscany/sandbox/travelsample/launchers/pom.xml

Modified: tuscany/sandbox/travelsample/contributions/databinding-client/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/databinding-client/build.xml?rev=815382&r1=815305&r2=815382&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/databinding-client/build.xml (original)
+++ tuscany/sandbox/travelsample/contributions/databinding-client/build.xml Tue Sep 15 16:12:30 2009
@@ -17,7 +17,7 @@
  * under the License.
 -->
 
-<project name="scatours-chapter-02-client-contribution" default="compile">
+<project name="scatours-contribution-databinding-client" default="compile">
     <property environment="env"/> 
 
     <target name="compile">
@@ -25,14 +25,14 @@
         <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
             <src path="src/main/java"/>
             <classpath>
-                <pathelement location="../tuscanyscatours-contribution/target/scatours-chapter-02-tuscanyscatours-contribution.jar"/>
+                <pathelement location="../payment-java/target/scatours-contribution-payment-java.jar"/>
                 <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </javac>
         <copy todir="target/classes">
             <fileset dir="src/main/resources"/>
         </copy>
-        <jar destfile="target/scatours-chapter-02-client-contribution.jar"
+        <jar destfile="target/scatours-contribution-databinding-client.jar"
              basedir="target/classes"/>
     </target>
 

Copied: tuscany/sandbox/travelsample/contributions/databinding-client/src/main/resources/META-INF/sca-contribution.xml (from r815338, tuscany/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/META-INF/sca-contribution.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/databinding-client/src/main/resources/META-INF/sca-contribution.xml?p2=tuscany/sandbox/travelsample/contributions/databinding-client/src/main/resources/META-INF/sca-contribution.xml&p1=tuscany/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/META-INF/sca-contribution.xml&r1=815338&r2=815382&rev=815382&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/databinding-client-contribution/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/databinding-client/src/main/resources/META-INF/sca-contribution.xml Tue Sep 15 16:12:30 2009
@@ -19,7 +19,6 @@
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
               xmlns:client="http://client.scatours/">
-    <export namespace="http://client.scatours/" />
     <import.java package="com.tuscanyscatours.payment" />
     <deployable composite="client:Client" />
 </contribution>

Modified: tuscany/sandbox/travelsample/contributions/payment-java/src/main/resources/payment.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/payment-java/src/main/resources/payment.composite?rev=815382&r1=815381&r2=815382&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/payment-java/src/main/resources/payment.composite (original)
+++ tuscany/sandbox/travelsample/contributions/payment-java/src/main/resources/payment.composite Tue Sep 15 16:12:30 2009
@@ -24,13 +24,14 @@
     <component name="Payment">
         <implementation.java class="com.tuscanyscatours.payment.impl.PaymentImpl" />
         <service name="Payment">
-            <binding.ws uri="http://localhost:8081/Payment"/>
+            <binding.ws uri="http://localhost:8081/Payment" />
+            <binding.sca />
         </service>
-        <reference name="customerRegistry" target="CustomerRegistry"/>
+        <reference name="customerRegistry" target="CustomerRegistry" />
         <reference name="creditCardPayment">
-            <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
+            <binding.ws uri="http://localhost:8082/CreditCardPayment" />
         </reference>
-        <reference name="emailGateway" target="EmailGateway"/>
+        <reference name="emailGateway" target="EmailGateway" />
         <property name="transactionFee">0.02</property>
     </component>
         

Modified: tuscany/sandbox/travelsample/contributions/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/pom.xml?rev=815382&r1=815381&r2=815382&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/pom.xml Tue Sep 15 16:12:30 2009
@@ -50,7 +50,7 @@
                 <module>currency-jsp</module>
                 <module>currency-rmi</module>
                 <module>currency-ws</module>
-                <module>databinding-client-contribution</module>
+                <module>databinding-client</module>
                 <module>emailgateway</module>
                 <module>feed-logger-contribution</module>
                 <module>flight</module>

Copied: tuscany/sandbox/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java (from r815338, tuscany/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/DatabindingLauncher.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java?p2=tuscany/sandbox/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java&p1=tuscany/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/DatabindingLauncher.java&r1=815338&r2=815382&rev=815382&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/DatabindingLauncher.java (original)
+++ tuscany/sandbox/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java Tue Sep 15 16:12:30 2009
@@ -28,7 +28,7 @@
     public static void main(String[] args) throws Exception {
         SCANode node1 = SCANodeFactory.newInstance().createSCANode(null, 
                 new SCAContribution("paymentjava", "../../contributions/payment-java/target/classes"),
-                new SCAContribution("client", "../../contributions/databinding-client-contribution/target/classes"));
+                new SCAContribution("client", "../../contributions/databinding-client/target/classes"));
         
         SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, 
                 new SCAContribution("creditcardpaymentsdo", "../../contributions/creditcard-payment-sdo/target/classes"));

Modified: tuscany/sandbox/travelsample/launchers/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/pom.xml?rev=815382&r1=815381&r2=815382&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/pom.xml Tue Sep 15 16:12:30 2009
@@ -43,7 +43,7 @@
                 <module>currency-converter-jms</module>
                 <module>currency-converter-rmi</module>
                 <module>currency-converter-ws</module>
-                <module>databinding-launcher</module>
+                <module>databinding</module>
                 <module>feed-logger-launcher</module>
                 <module>interaction</module>
                 <module>introducing</module>