From 5d233f4bfd30569617b6704ca41dd75c6c70d565 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 15 May 2010 15:29:33 +0000
Subject: Merge revision r944283 from trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@944666 13f79535-47bb-0310-9956-ffa450edef68
---
 .../contributions/usingsca/src/main/resources/bookings1.composite | 8 ++++----
 .../contributions/usingsca/src/main/resources/bookings2.composite | 8 ++++----
 .../contributions/usingsca/src/main/resources/bookings3.composite | 8 ++++----
 .../contributions/usingsca/src/main/resources/bookings4.composite | 4 ++--
 .../usingsca/src/main/resources/carbookings1.composite            | 6 +++---
 .../usingsca/src/main/resources/carbookings2.composite            | 6 +++---
 .../usingsca/src/main/resources/carbookings3.composite            | 6 +++---
 .../contributions/usingsca/src/main/resources/converter.composite | 8 ++++----
 .../usingsca/src/main/resources/hotelsdomain.composite            | 2 +-
 .../contributions/usingsca/src/main/resources/orders1.composite   | 2 +-
 .../contributions/usingsca/src/main/resources/orders2.composite   | 2 +-
 .../usingsca/src/main/resources/toursdomain.composite             | 4 ++--
 12 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources')

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings1.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings1.composite
index 783bc3c6c7..72347e9987 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings1.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings1.composite
@@ -22,21 +22,21 @@
            name="bookings1">
     <component name="TripBooking">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.TripBookingImpl" />
+            class="com.tuscanyscatours.usingsca.impl.TripBookingImpl" />
         <reference name="cars" target="CarPartner/Cars" />
         <reference name="flights" target="FlightPartner/Flights" />
         <reference name="hotels" target="HotelPartner" />
     </component>
     <component name="CarPartner">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.CarVendorImpl" />
+            class="com.tuscanyscatours.usingsca.impl.CarVendorImpl" />
     </component>
     <component name="FlightPartner">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.FlightPartnerImpl" />
+            class="com.tuscanyscatours.usingsca.impl.FlightPartnerImpl" />
     </component>
     <component name="HotelPartner">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.HotelPartnerImpl" />
+            class="com.tuscanyscatours.usingsca.impl.HotelPartnerImpl" />
     </component>
 </composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings2.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings2.composite
index be26a0f7f1..ef1e214b30 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings2.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings2.composite
@@ -22,21 +22,21 @@
            name="bookings2">
     <component name="TripBooking">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.TripBookingImpl" />
+            class="com.tuscanyscatours.usingsca.impl.TripBookingImpl" />
         <reference name="cars" target="CarPartner/Cars" />
         <reference name="flights" target="FlightPartner/Flights" />
     </component>
     <wire source="TripBooking/hotels" target="HotelPartner" />
     <component name="CarPartner">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.CarVendorImpl" />
+            class="com.tuscanyscatours.usingsca.impl.CarVendorImpl" />
     </component>
     <component name="FlightPartner">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.FlightPartnerImpl" />
+            class="com.tuscanyscatours.usingsca.impl.FlightPartnerImpl" />
     </component>
     <component name="HotelPartner">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.HotelPartnerImpl" />
+            class="com.tuscanyscatours.usingsca.impl.HotelPartnerImpl" />
     </component>
 </composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings3.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings3.composite
index e952a15381..6b961242fd 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings3.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings3.composite
@@ -22,18 +22,18 @@
            name="bookings3">
     <component name="TripBooking" autowire="true">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.TripBookingImpl" />
+            class="com.tuscanyscatours.usingsca.impl.TripBookingImpl" />
     </component>
     <component name="CarPartner">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.CarVendorImpl" />
+            class="com.tuscanyscatours.usingsca.impl.CarVendorImpl" />
     </component>
     <component name="FlightPartner">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.FlightPartnerImpl" />
+            class="com.tuscanyscatours.usingsca.impl.FlightPartnerImpl" />
     </component>
     <component name="HotelPartner">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.HotelPartnerImpl" />
+            class="com.tuscanyscatours.usingsca.impl.HotelPartnerImpl" />
     </component>
 </composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings4.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings4.composite
index acb6e269a4..321c891ff8 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings4.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/bookings4.composite
@@ -22,7 +22,7 @@
            name="bookings4">
     <component name="TripBooking">
         <implementation.java
-              class="com.tuscanyscatours.using.impl.TripBookingImpl" />
+              class="com.tuscanyscatours.usingsca.impl.TripBookingImpl" />
         <service name="Bookings">
             <binding.ws uri="http://tuscanyscatours.com:8085/Bookings" />
             <binding.jms uri="jms:Bookings" />
@@ -37,6 +37,6 @@
     </component>
     <component name="HotelPartner">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.HotelPartnerImpl" />
+            class="com.tuscanyscatours.usingsca.impl.HotelPartnerImpl" />
     </component>
 </composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/carbookings1.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/carbookings1.composite
index c6dc6def16..f112f25cbc 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/carbookings1.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/carbookings1.composite
@@ -22,15 +22,15 @@
            name="carbookings1">
     <component name="CarPartner">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.CarPartnerImpl" />
+            class="com.tuscanyscatours.usingsca.impl.CarPartnerImpl" />
         <reference name="cars" target="JoesCars KensCars" />
     </component>
     <component name="JoesCars">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.CarVendorImpl" />
+            class="com.tuscanyscatours.usingsca.impl.CarVendorImpl" />
     </component>
     <component name="KensCars">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.CarVendorImpl" />
+            class="com.tuscanyscatours.usingsca.impl.CarVendorImpl" />
     </component>
 </composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/carbookings2.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/carbookings2.composite
index af01006b6f..b41b569544 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/carbookings2.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/carbookings2.composite
@@ -22,16 +22,16 @@
            name="carbookings2">
     <component name="CarPartner">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.CarPartnerImpl" />
+            class="com.tuscanyscatours.usingsca.impl.CarPartnerImpl" />
     </component>
     <wire source="CarPartner/cars" target="JoesCars" />
     <wire source="CarPartner/cars" target="KensCars" />
     <component name="JoesCars">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.CarVendorImpl" />
+            class="com.tuscanyscatours.usingsca.impl.CarVendorImpl" />
     </component>
     <component name="KensCars">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.CarVendorImpl" />
+            class="com.tuscanyscatours.usingsca.impl.CarVendorImpl" />
     </component>
 </composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/carbookings3.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/carbookings3.composite
index f1d3a81d42..1bcfb101e4 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/carbookings3.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/carbookings3.composite
@@ -22,15 +22,15 @@
            name="carbookings3">
     <component name="CarPartner" autowire="true">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.CarPartnerImpl" />
+            class="com.tuscanyscatours.usingsca.impl.CarPartnerImpl" />
         <reference name="luxuryCars" autowire="false" />
     </component>
     <component name="JoesCars">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.CarVendorImpl" />
+            class="com.tuscanyscatours.usingsca.impl.CarVendorImpl" />
     </component>
     <component name="KensCars">
         <implementation.java
-            class="com.tuscanyscatours.using.impl.CarVendorImpl" />
+            class="com.tuscanyscatours.usingsca.impl.CarVendorImpl" />
     </component>
 </composite>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/converter.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/converter.composite
index c0a1d32e11..2afe9cd6e2 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/converter.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/converter.composite
@@ -21,14 +21,14 @@
            targetNamespace="http://tuscanyscatours.com/"
            name="converter">
     <component name="EURJPYConverter">
-        <implementation.java
-            class="com.tuscanyscatours.using.impl.CurrencyConverterImpl" />
+        <implementation.java class=
+            "com.tuscanyscatours.usingsca.impl.CurrencyConverterImpl" />
         <property name="fromCurrency">EUR</property>
         <property name="toCurrency">JPY</property>
     </component>
     <component name="USDGBPConverter">
-        <implementation.java
-            class="com.tuscanyscatours.using.impl.CurrencyConverterImpl" />
+        <implementation.java class=
+            "com.tuscanyscatours.usingsca.impl.CurrencyConverterImpl" />
         <property name="fromCurrency">USD</property>
         <property name="toCurrency">GBP</property>
     </component>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/hotelsdomain.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/hotelsdomain.composite
index 1db3586513..758c3e31d2 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/hotelsdomain.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/hotelsdomain.composite
@@ -22,7 +22,7 @@
            name="hotelsdomain">
     <component name="HotelPartner">
         <implementation.java class=
-           "com.tuscanyscatours.using.impl.HotelPartnerImpl" />
+           "com.tuscanyscatours.usingsca.impl.HotelPartnerImpl" />
         <service name="Hotels">
             <binding.ws uri=
                 "http://tuscanyscahotels.com:8083/Hotels" />
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/orders1.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/orders1.composite
index ac2647b387..b0ff245132 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/orders1.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/orders1.composite
@@ -24,7 +24,7 @@
 
     <component name="Customer">
         <implementation.java
-              class="com.tuscanyscatours.using.impl.CustomerImpl" />
+              class="com.tuscanyscatours.usingsca.impl.CustomerImpl" />
         <property name="billingAddress" element="t:billingAddress">
             <t:billingAddress xmlns="">
                 <street>123 Main Street</street>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/orders2.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/orders2.composite
index d0489bbd21..79d4be7b61 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/orders2.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/orders2.composite
@@ -25,7 +25,7 @@
 
     <component name="Customer">
         <implementation.java
-              class="com.tuscanyscatours.using.impl.CustomerImpl" />
+              class="com.tuscanyscatours.usingsca.impl.CustomerImpl" />
         <property name="billingAddress" type="t:Address">
             <o:address xmlns="">
                 <street>123 Main Street</street>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/toursdomain.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/toursdomain.composite
index c04fb897d7..a0ee26fb89 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/toursdomain.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/usingsca/src/main/resources/toursdomain.composite
@@ -22,7 +22,7 @@
            name="toursdomain">
     <component name="TripBooking">
         <implementation.java
-              class="com.tuscanyscatours.using.impl.TripBookingImpl" />
+              class="com.tuscanyscatours.usingsca.impl.TripBookingImpl" />
         <reference name="flights">
             <binding.ws
                 uri="http://flightbookingservice.com:8084/Flights" />
@@ -34,6 +34,6 @@
     </component>
     <component name="CarPartner">
         <implementation.java
-              class="com.tuscanyscatours.using.impl.CarVendorImpl" />
+              class="com.tuscanyscatours.usingsca.impl.CarVendorImpl" />
     </component>
 </composite>
-- 
cgit v1.2.3