diff options
Diffstat (limited to '')
-rw-r--r-- | sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClient.java (renamed from sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionConversationClient.java) | 14 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClient.java (renamed from sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionLocalClient.java) | 7 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClient.java (renamed from sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionOneWayCallbackClient.java) | 10 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClient.java (renamed from sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRemoteClient.java) | 12 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClient.java (renamed from sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRequestResponseClient.java) | 8 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClient.java (renamed from sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionStatefulCallbackClient.java) | 12 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml) | 15 | ||||
-rw-r--r-- | sandbox/travelsample/contributions/interaction-client/src/main/resources/client.composite (renamed from sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite) | 32 |
8 files changed, 56 insertions, 54 deletions
diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionConversationClient.java b/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClient.java index c013cd63fb..15ebdc6ae6 100644 --- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionConversationClient.java +++ b/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClient.java @@ -17,7 +17,7 @@ * under the License. */ -package scatours.client; +package scatours.client.impl; import java.util.concurrent.CountDownLatch; @@ -25,15 +25,15 @@ import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Scope; import org.osoa.sca.annotations.Service; -import scatours.common.Search; -import scatours.common.SearchCallback; -import scatours.common.TripItem; -import scatours.common.TripLeg; -import scatours.shoppingcart.CartStore; +import com.tuscanyscatours.common.Search; +import com.tuscanyscatours.common.SearchCallback; +import com.tuscanyscatours.common.TripItem; +import com.tuscanyscatours.common.TripLeg; +import com.tuscanyscatours.shoppingcart.CartStore; @Scope("COMPOSITE") @Service(Runnable.class) -public class InteractionConversationClient implements Runnable{ +public class InteractionConversationClient implements Runnable { @Reference protected CartStore cartStoreConversation; diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionLocalClient.java b/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClient.java index 4ada5ab47f..1b6b179303 100644 --- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionLocalClient.java +++ b/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClient.java @@ -17,14 +17,13 @@ * under the License. */ -package scatours.client; +package scatours.client.impl; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Service; -import calendar.Calendar; - -import scatours.common.TripLeg; +import com.tuscanyscatours.calendar.Calendar; +import com.tuscanyscatours.common.TripLeg; @Service(Runnable.class) public class InteractionLocalClient implements Runnable { diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionOneWayCallbackClient.java b/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClient.java index 94ef5ef284..1612611d04 100644 --- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionOneWayCallbackClient.java +++ b/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClient.java @@ -17,7 +17,7 @@ * under the License. */ -package scatours.client; +package scatours.client.impl; import java.util.concurrent.CountDownLatch; @@ -25,10 +25,10 @@ import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Scope; import org.osoa.sca.annotations.Service; -import scatours.common.Search; -import scatours.common.SearchCallback; -import scatours.common.TripItem; -import scatours.common.TripLeg; +import com.tuscanyscatours.common.Search; +import com.tuscanyscatours.common.SearchCallback; +import com.tuscanyscatours.common.TripItem; +import com.tuscanyscatours.common.TripLeg; @Scope("COMPOSITE") @Service(Runnable.class) diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRemoteClient.java b/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClient.java index 278c7bb08f..faa580be0d 100644 --- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRemoteClient.java +++ b/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClient.java @@ -17,18 +17,18 @@ * under the License. */ -package scatours.client; +package scatours.client.impl; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Service; -import scatours.common.Search; -import scatours.common.SearchCallback; -import scatours.common.TripItem; -import scatours.common.TripLeg; +import com.tuscanyscatours.common.Search; +import com.tuscanyscatours.common.SearchCallback; +import com.tuscanyscatours.common.TripItem; +import com.tuscanyscatours.common.TripLeg; @Service(Runnable.class) -public class InteractionRemoteClient implements Runnable, SearchCallback{ +public class InteractionRemoteClient implements Runnable, SearchCallback { @Reference protected Search hotelSearchRemote; diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRequestResponseClient.java b/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClient.java index b418cf361b..ff23cc4691 100644 --- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRequestResponseClient.java +++ b/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClient.java @@ -17,15 +17,15 @@ * under the License. */ -package scatours.client; +package scatours.client.impl; import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Service; -import calendar.Calendar; +import com.tuscanyscatours.calendar.Calendar; -import scatours.common.TripLeg; -import scatours.currencyconverter.CurrencyConverter; +import com.tuscanyscatours.common.TripLeg; +import com.tuscanyscatours.currencyconverter.CurrencyConverter; @Service(Runnable.class) public class InteractionRequestResponseClient implements Runnable { diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionStatefulCallbackClient.java b/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClient.java index 690c99373e..a8dd04dd7e 100644 --- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionStatefulCallbackClient.java +++ b/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClient.java @@ -17,7 +17,7 @@ * under the License. */ -package scatours.client; +package scatours.client.impl; import java.util.concurrent.CountDownLatch; @@ -29,14 +29,14 @@ import org.osoa.sca.annotations.Reference; import org.osoa.sca.annotations.Scope; import org.osoa.sca.annotations.Service; -import scatours.common.Search; -import scatours.common.SearchCallback; -import scatours.common.TripItem; -import scatours.common.TripLeg; +import com.tuscanyscatours.common.Search; +import com.tuscanyscatours.common.SearchCallback; +import com.tuscanyscatours.common.TripItem; +import com.tuscanyscatours.common.TripLeg; @Scope("CONVERSATION") @Service(Runnable.class) -public class InteractionStatefulCallbackClient implements Runnable, SearchCallback{ +public class InteractionStatefulCallbackClient implements Runnable, SearchCallback { @Reference protected Search flightSearchStatefulCallback; diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml index bc47b4de2e..283a1588df 100644 --- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml +++ b/sandbox/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml @@ -18,10 +18,13 @@ * under the License. --> <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:client="http://client.scatours/"> - <import.java package="calendar"/> - <import.java package="scatours.common"/> - <import.java package="scatours.currencyconverter"/> - <import.java package="scatours.shoppingcart"/> - <deployable composite="client:Client" /> + xmlns:tours="http://tucsanyscatours.com/"> + <import.java package="com.tuscanyscatours.calendar" /> + <import.java package="com.tuscanyscatours.calendar.impl" /> + <import.java package="com.tuscanyscatours.common" /> + <import.java package="com.tuscanyscatours.currencyconverter" /> + <import.java package="com.tuscanyscatours.currencyconverter.impl" /> + <import.java package="com.tuscanyscatours.shoppingcart" /> + <import.java package="com.tuscanyscatours.shoppingcart.impl" /> + <deployable composite="tours:client" /> </contribution> diff --git a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite b/sandbox/travelsample/contributions/interaction-client/src/main/resources/client.composite index 2900b764f6..e1d3c6687f 100644 --- a/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite +++ b/sandbox/travelsample/contributions/interaction-client/src/main/resources/client.composite @@ -18,23 +18,23 @@ * under the License. --> <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://client.scatours/" + targetNamespace="http://tuscanyscatours.com/" name="Client"> <!-- Local interaction --> <component name="InteractionLocalClient"> - <implementation.java class="scatours.client.InteractionLocalClient" /> + <implementation.java class="scatours.client.impl.InteractionLocalClient" /> <reference name="calendarLocal" target="Calendar"/> </component> <component name="Calendar"> - <implementation.java class="calendar.CalendarImpl"/> + <implementation.java class="com.tuscanyscatours.calendar.impl.CalendarImpl"/> </component> <!-- Remote interaction --> <component name="InteractionRemoteClient"> - <implementation.java class="scatours.client.InteractionRemoteClient" /> + <implementation.java class="scatours.client.impl.InteractionRemoteClient" /> <reference name="hotelSearchRemote"> <binding.ws uri="http://localhost:8081/Hotel/Search"/> </reference> @@ -42,47 +42,47 @@ <!-- Request response interaction --> <component name="InteractionRequestResponseClient"> - <implementation.java class="scatours.client.InteractionRequestResponseClient" /> + <implementation.java class="scatours.client.impl.InteractionRequestResponseClient" /> <reference name="currencyConverterRequestResponse" target="CurrencyConverter"/> </component> <component name="CurrencyConverter"> - <implementation.java class="scatours.currencyconverter.CurrencyConverterImpl"/> + <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl"/> </component> <!-- One way and callback interaction --> <component name="InteractionOneWayCallbackClient"> - <implementation.java class="scatours.client.InteractionOneWayCallbackClient" /> + <implementation.java class="scatours.client.impl.InteractionOneWayCallbackClient" /> <reference name="hotelSearchOneWayCallback"> - <interface.java interface="scatours.common.Search" - callbackInterface="scatours.common.SearchCallback"/> + <interface.java interface="com.tuscanyscatours.common.Search" + callbackInterface="com.tuscanyscatours.common.SearchCallback"/> <binding.ws uri="http://localhost:8081/Hotel/Search"/> <callback> - <binding.ws uri="http://localhost:8080/Client/SearchCallback"/> + <binding.ws name="callback" uri="http://localhost:8080/Client/SearchCallback"/> </callback> </reference> </component> <!-- Conversational interaction --> <component name="InteractionConversationClient"> - <implementation.java class="scatours.client.InteractionConversationClient" /> + <implementation.java class="scatours.client.impl.InteractionConversationClient" /> <reference name="cartStoreConversation" target="CartStore"/> </component> <component name="CartStore"> - <implementation.java class="scatours.shoppingcart.CartStoreImpl"/> + <implementation.java class="com.tuscanyscatours.shoppingcart.impl.CartStoreImpl"/> <service name="CartStore"/> </component> <!-- Stateful callback interaction --> <component name="InteractionStatefulCallbackClient"> - <implementation.java class="scatours.client.InteractionStatefulCallbackClient" /> + <implementation.java class="scatours.client.impl.InteractionStatefulCallbackClient" /> <reference name="flightSearchStatefulCallback"> - <interface.java interface="scatours.common.Search" - callbackInterface="scatours.common.SearchCallback"/> + <interface.java interface="com.tuscanyscatours.common.Search" + callbackInterface="com.tuscanyscatours.common.SearchCallback"/> <binding.ws uri="http://localhost:8081/Hotel/SearchConversational"/> <callback> - <binding.ws uri="http://localhost:8080/Client/SearchCallbackConversational"/> + <binding.ws name="callback" uri="http://localhost:8080/Client/SearchCallbackConversational"/> </callback> </reference> </component> |