svn commit: r918089 - in /tuscany/sca-java-1.x/trunk/tutorials/travelsample: contributions/common/src/main/java/com/tuscanyscatours/common/ contributions/interaction-client/src/main/java/scatours/client/impl/ contributions/interaction-client/src/main/r...

[sl...@apache.org]

Author: slaws
Date: Tue Mar  2 15:59:52 2010
New Revision: 918089

URL: http://svn.apache.org/viewvc?rev=918089&view=rev
Log:
Remove bogus conversational configuration that is add odds with the current application configuration.

Removed:
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClientImpl.java
Modified:
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite
    tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java?rev=918089&r1=918088&r2=918089&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java Tue Mar  2 15:59:52 2010
@@ -25,7 +25,6 @@
 import org.osoa.sca.annotations.Remotable;
 
 @Remotable
-@Conversational
 @Callback(SearchCallback.class)
 public interface Search {
     TripItem[] searchSynch(TripLeg tripLeg);

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java?rev=918089&r1=918088&r2=918089&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java Tue Mar  2 15:59:52 2010
@@ -19,15 +19,10 @@
 
 package com.tuscanyscatours.common;
 
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
 import org.osoa.sca.annotations.Remotable;
 
 @Remotable
-@Conversational
 public interface SearchCallback {
-    @EndsConversation
     void searchResults(TripItem[] items);
-
     void setPercentComplete(String searchComponent, int percentComplete);
 }

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite?rev=918089&r1=918088&r2=918089&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite Tue Mar  2 15:59:52 2010
@@ -72,19 +72,6 @@
     <component name="CartStore">
         <implementation.java class="com.tuscanyscatours.shoppingcart.impl.CartStoreImpl"/>
         <service name="CartStore"/>
-    </component> 
-    
-    <!-- Stateful callback interaction -->
-    <component name="InteractionStatefulCallbackClient">
-        <implementation.java class="scatours.client.impl.InteractionStatefulCallbackClientImpl" />
-        <reference name="flightSearchStatefulCallback">
-            <interface.java interface="com.tuscanyscatours.common.Search" 
-                    callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
-            <binding.ws uri="http://localhost:8081/Hotel/SearchConversational"/>
-            <callback>
-                <binding.ws name="callback" uri="http://localhost:8080/Client/SearchCallbackConversational"/>
-            </callback>
-        </reference>
-     </component>    
+    </component>   
 
 </composite>

Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java?rev=918089&r1=918088&r2=918089&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java Tue Mar  2 15:59:52 2010
@@ -64,10 +64,6 @@
             ((SCAClient)node1).getService(Runnable.class, "InteractionConversationClient/Runnable");
         conversationalInteraction.run();
 
-        Runnable statefulCallbackInteraction =
-            ((SCAClient)node1).getService(Runnable.class, "InteractionStatefulCallbackClient/Runnable");
-        statefulCallbackInteraction.run();
-
         node1.stop();
         node2.stop();
     }