summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-05-15 15:14:21 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-05-15 15:14:21 +0000
commit0b18cf2f22157402c97e6676dcae521c0de91867 (patch)
treed78a127344d088772865828e37b31747de89b08b /sca-java-1.x
parentaede8220adb471f59ce2f16224f91040663cd40e (diff)
Merge revision r944257 from trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@944663 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x')
-rw-r--r--sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings2.composite1
-rw-r--r--sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings3.composite3
-rw-r--r--sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/carbookings1.composite1
3 files changed, 0 insertions, 5 deletions
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings2.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings2.composite
index 35b5eff4a1..be26a0f7f1 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings2.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings2.composite
@@ -25,7 +25,6 @@
class="com.tuscanyscatours.using.impl.TripBookingImpl" />
<reference name="cars" target="CarPartner/Cars" />
<reference name="flights" target="FlightPartner/Flights" />
- <reference name="hotels" />
</component>
<wire source="TripBooking/hotels" target="HotelPartner" />
<component name="CarPartner">
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings3.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings3.composite
index 8cb7b94010..e952a15381 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings3.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings3.composite
@@ -23,9 +23,6 @@
<component name="TripBooking" autowire="true">
<implementation.java
class="com.tuscanyscatours.using.impl.TripBookingImpl" />
- <reference name="cars" />
- <reference name="flights" />
- <reference name="hotels" />
</component>
<component name="CarPartner">
<implementation.java
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/carbookings1.composite b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/carbookings1.composite
index 16c8b24684..c6dc6def16 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/carbookings1.composite
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/carbookings1.composite
@@ -24,7 +24,6 @@
<implementation.java
class="com.tuscanyscatours.using.impl.CarPartnerImpl" />
<reference name="cars" target="JoesCars KensCars" />
- <reference name="luxuryCars" />
</component>
<component name="JoesCars">
<implementation.java