Author: nash
Date: Sat May 15 15:14:21 2010
New Revision: 944663
URL: http://svn.apache.org/viewvc?rev=944663&view=rev
Log:
Merge revision r944257 from trunk
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings2.composite
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings3.composite
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/carbookings1.composite
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings2.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings2.composite?rev=944663&r1=944662&r2=944663&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings2.composite
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings2.composite
Sat May 15 15:14:21 2010
@@ -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">
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings3.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings3.composite?rev=944663&r1=944662&r2=944663&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings3.composite
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/bookings3.composite
Sat May 15 15:14:21 2010
@@ -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
Modified:
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/carbookings1.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/carbookings1.composite?rev=944663&r1=944662&r2=944663&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/carbookings1.composite
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/contributions/using/src/main/resources/carbookings1.composite
Sat May 15 15:14:21 2010
@@ -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
