You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2009/09/09 11:26:34 UTC
svn commit: r812852 - in /tuscany/sandbox/travelsample:
contributions/calendar-contribution/
contributions/calendar-contribution/src/main/java/calendar/
contributions/calendar-contribution/src/main/resources/
contributions/calendar-contribution/src/mai...
Author: nash
Date: Wed Sep 9 09:26:32 2009
New Revision: 812852
URL: http://svn.apache.org/viewvc?rev=812852&view=rev
Log:
Update interaction-* and calendar contributions and launcher to new naming convention
Added:
tuscany/sandbox/travelsample/contributions/calendar/ (with props)
tuscany/sandbox/travelsample/contributions/calendar/pom.xml
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/calendar-contribution/pom.xml
tuscany/sandbox/travelsample/contributions/calendar/src/
tuscany/sandbox/travelsample/contributions/calendar/src/main/
tuscany/sandbox/travelsample/contributions/calendar/src/main/java/
tuscany/sandbox/travelsample/contributions/calendar/src/main/java/com/
tuscany/sandbox/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/
tuscany/sandbox/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/
tuscany/sandbox/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/Calendar.java
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/java/calendar/Calendar.java
tuscany/sandbox/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/impl/
tuscany/sandbox/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/impl/CalendarImpl.java
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java
tuscany/sandbox/travelsample/contributions/calendar/src/main/resources/
tuscany/sandbox/travelsample/contributions/calendar/src/main/resources/META-INF/
tuscany/sandbox/travelsample/contributions/calendar/src/main/resources/META-INF/sca-contribution.xml
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/calendar/src/test/
tuscany/sandbox/travelsample/contributions/calendar/src/test/java/
tuscany/sandbox/travelsample/contributions/calendar/src/test/java/scatours/
tuscany/sandbox/travelsample/contributions/calendar/src/test/java/scatours/calendar/
tuscany/sandbox/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/calendar-contribution/src/test/java/calendar/CalendarTestCase.java
tuscany/sandbox/travelsample/contributions/calendar/src/test/resources/
tuscany/sandbox/travelsample/contributions/calendar/src/test/resources/calendar.composite
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/calendar-contribution/src/test/resources/calendar.composite
tuscany/sandbox/travelsample/contributions/interaction-client/ (with props)
tuscany/sandbox/travelsample/contributions/interaction-client/build.xml
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/build.xml
tuscany/sandbox/travelsample/contributions/interaction-client/pom.xml
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/pom.xml
tuscany/sandbox/travelsample/contributions/interaction-client/src/
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClient.java
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionConversationClient.java
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClient.java
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionLocalClient.java
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClient.java
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionOneWayCallbackClient.java
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClient.java
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRemoteClient.java
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClient.java
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRequestResponseClient.java
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClient.java
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionStatefulCallbackClient.java
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/resources/
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/resources/META-INF/
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/interaction-client/src/main/resources/client.composite
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite
tuscany/sandbox/travelsample/contributions/interaction-service-remote/ (with props)
tuscany/sandbox/travelsample/contributions/interaction-service-remote/build.xml
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/build.xml
tuscany/sandbox/travelsample/contributions/interaction-service-remote/pom.xml
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/pom.xml
tuscany/sandbox/travelsample/contributions/interaction-service-remote/src/
tuscany/sandbox/travelsample/contributions/interaction-service-remote/src/main/
tuscany/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/
tuscany/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/
tuscany/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite
- copied, changed from r812410, tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/client.composite
tuscany/sandbox/travelsample/launchers/interaction/ (with props)
tuscany/sandbox/travelsample/launchers/interaction/build.xml
- copied, changed from r812410, tuscany/sandbox/travelsample/launchers/interaction-launcher/build.xml
tuscany/sandbox/travelsample/launchers/interaction/pom.xml
- copied, changed from r812410, tuscany/sandbox/travelsample/launchers/interaction-launcher/pom.xml
tuscany/sandbox/travelsample/launchers/interaction/src/
tuscany/sandbox/travelsample/launchers/interaction/src/main/
tuscany/sandbox/travelsample/launchers/interaction/src/main/java/
tuscany/sandbox/travelsample/launchers/interaction/src/main/java/scatours/
tuscany/sandbox/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java
- copied, changed from r812410, tuscany/sandbox/travelsample/launchers/interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java
Removed:
tuscany/sandbox/travelsample/contributions/calendar-contribution/pom.xml
tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/java/calendar/Calendar.java
tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java
tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/resources/calendar.composite
tuscany/sandbox/travelsample/contributions/calendar-contribution/src/test/java/calendar/CalendarTestCase.java
tuscany/sandbox/travelsample/contributions/calendar-contribution/src/test/resources/calendar.composite
tuscany/sandbox/travelsample/contributions/interaction-client-contribution/build.xml
tuscany/sandbox/travelsample/contributions/interaction-client-contribution/pom.xml
tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/
tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite
tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/build.xml
tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/pom.xml
tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/client.composite
tuscany/sandbox/travelsample/launchers/interaction-launcher/build.xml
tuscany/sandbox/travelsample/launchers/interaction-launcher/pom.xml
tuscany/sandbox/travelsample/launchers/interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java
Propchange: tuscany/sandbox/travelsample/contributions/calendar/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 9 09:26:32 2009
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Copied: tuscany/sandbox/travelsample/contributions/calendar/pom.xml (from r812410, tuscany/sandbox/travelsample/contributions/calendar-contribution/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/calendar/pom.xml?p2=tuscany/sandbox/travelsample/contributions/calendar/pom.xml&p1=tuscany/sandbox/travelsample/contributions/calendar-contribution/pom.xml&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/calendar-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/calendar/pom.xml Wed Sep 9 09:26:32 2009
@@ -25,7 +25,7 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-calendar-contribution</artifactId>
+ <artifactId>scatours-contribution-calendar</artifactId>
<name>Apache Tuscany SCA Tours Calendar Contribution</name>
<dependencies>
Copied: tuscany/sandbox/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/Calendar.java (from r812410, tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/java/calendar/Calendar.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/Calendar.java?p2=tuscany/sandbox/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/Calendar.java&p1=tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/java/calendar/Calendar.java&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/java/calendar/Calendar.java (original)
+++ tuscany/sandbox/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/Calendar.java Wed Sep 9 09:26:32 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package calendar;
+package com.tuscanyscatours.calendar;
public interface Calendar {
Copied: tuscany/sandbox/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/impl/CalendarImpl.java (from r812410, tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/impl/CalendarImpl.java?p2=tuscany/sandbox/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/impl/CalendarImpl.java&p1=tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/java/calendar/CalendarImpl.java (original)
+++ tuscany/sandbox/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/impl/CalendarImpl.java Wed Sep 9 09:26:32 2009
@@ -16,13 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package calendar;
+package com.tuscanyscatours.calendar.impl;
import java.text.DateFormat;
import java.util.Date;
+import com.tuscanyscatours.calendar.Calendar;
+
/**
- * An implementation of the Add service
+ * An implementation of the Calendar service
*/
public class CalendarImpl implements Calendar {
Copied: tuscany/sandbox/travelsample/contributions/calendar/src/main/resources/META-INF/sca-contribution.xml (from r812410, tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/resources/META-INF/sca-contribution.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/calendar/src/main/resources/META-INF/sca-contribution.xml?p2=tuscany/sandbox/travelsample/contributions/calendar/src/main/resources/META-INF/sca-contribution.xml&p1=tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/resources/META-INF/sca-contribution.xml&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/calendar-contribution/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/calendar/src/main/resources/META-INF/sca-contribution.xml Wed Sep 9 09:26:32 2009
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:scatours="http://scatours">
- <export.java package="calendar"/>
-</contribution>
\ No newline at end of file
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+ <export.java package="com.tuscanyscatours.calendar" />
+ <export.java package="com.tuscanyscatours.calendar.impl" />
+</contribution>
Copied: tuscany/sandbox/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java (from r812410, tuscany/sandbox/travelsample/contributions/calendar-contribution/src/test/java/calendar/CalendarTestCase.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java?p2=tuscany/sandbox/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java&p1=tuscany/sandbox/travelsample/contributions/calendar-contribution/src/test/java/calendar/CalendarTestCase.java&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/calendar-contribution/src/test/java/calendar/CalendarTestCase.java (original)
+++ tuscany/sandbox/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java Wed Sep 9 09:26:32 2009
@@ -16,12 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package calendar;
+package scatours.calendar;
import junit.framework.TestCase;
import org.apache.tuscany.sca.host.embedded.SCADomain;
+import com.tuscanyscatours.calendar.Calendar;
+
/**
* This shows how to test the Calculator service component.
*/
@@ -33,7 +35,7 @@
@Override
protected void setUp() throws Exception {
scaDomain = SCADomain.newInstance("calendar.composite");
- calendar = scaDomain.getService(Calendar.class, "CalendarComponent");
+ calendar = scaDomain.getService(Calendar.class, "Calendar");
}
@Override
Copied: tuscany/sandbox/travelsample/contributions/calendar/src/test/resources/calendar.composite (from r812410, tuscany/sandbox/travelsample/contributions/calendar-contribution/src/test/resources/calendar.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/calendar/src/test/resources/calendar.composite?p2=tuscany/sandbox/travelsample/contributions/calendar/src/test/resources/calendar.composite&p1=tuscany/sandbox/travelsample/contributions/calendar-contribution/src/test/resources/calendar.composite&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/calendar-contribution/src/test/resources/calendar.composite (original)
+++ tuscany/sandbox/travelsample/contributions/calendar/src/test/resources/calendar.composite Wed Sep 9 09:26:32 2009
@@ -18,12 +18,11 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://travel"
- xmlns:sample="http://travel"
+ targetNamespace="http://tuscanyscatours.com/"
name="calendar">
- <component name="CalendarComponent">
- <implementation.java class="calendar.CalendarImpl"/>
+ <component name="Calendar">
+ <implementation.java class="com.tuscanyscatours.calendar.impl.CalendarImpl"/>
</component>
</composite>
Propchange: tuscany/sandbox/travelsample/contributions/interaction-client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 9 09:26:32 2009
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Copied: tuscany/sandbox/travelsample/contributions/interaction-client/build.xml (from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/build.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/interaction-client/build.xml?p2=tuscany/sandbox/travelsample/contributions/interaction-client/build.xml&p1=tuscany/sandbox/travelsample/contributions/interaction-client-contribution/build.xml&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/interaction-client-contribution/build.xml (original)
+++ tuscany/sandbox/travelsample/contributions/interaction-client/build.xml Wed Sep 9 09:26:32 2009
@@ -17,7 +17,7 @@
* under the License.
-->
-<project name="scatours-chapter-02-client-contribution" default="compile">
+<project name="scatours-contribution-interaction-client" default="compile">
<property environment="env"/>
<target name="compile">
@@ -25,14 +25,14 @@
<javac destdir="target/classes" debug="on" source="1.5" target="1.5">
<src path="src/main/java"/>
<classpath>
- <pathelement location="../tuscanyscatours-contribution/target/scatours-chapter-02-tuscanyscatours-contribution.jar"/>
+ <pathelement location="../common/target/scatours-contribution-common.jar"/>
<pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
</classpath>
</javac>
<copy todir="target/classes">
<fileset dir="src/main/resources"/>
</copy>
- <jar destfile="target/scatours-chapter-02-client-contribution.jar"
+ <jar destfile="target/scatours-contribution-interaction-client.jar"
basedir="target/classes"/>
</target>
Copied: tuscany/sandbox/travelsample/contributions/interaction-client/pom.xml (from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/interaction-client/pom.xml?p2=tuscany/sandbox/travelsample/contributions/interaction-client/pom.xml&p1=tuscany/sandbox/travelsample/contributions/interaction-client-contribution/pom.xml&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/interaction-client-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/interaction-client/pom.xml Wed Sep 9 09:26:32 2009
@@ -25,7 +25,7 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-interaction-client-contribution</artifactId>
+ <artifactId>scatours-contribution-interaction-client</artifactId>
<name>Apache Tuscany SCA Tours Interaction Client Contribution</name>
<dependencies>
@@ -37,31 +37,31 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-common-contribution</artifactId>
+ <artifactId>scatours-contribution-common</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-calendar-contribution</artifactId>
+ <artifactId>scatours-contribution-calendar</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-hotel-contribution</artifactId>
+ <artifactId>scatours-contribution-hotel</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-currency-contribution</artifactId>
+ <artifactId>scatours-contribution-currency</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-shoppingcart-contribution</artifactId>
+ <artifactId>scatours-contribution-shoppingcart</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
Copied: tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClient.java (from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionConversationClient.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClient.java?p2=tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClient.java&p1=tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionConversationClient.java&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionConversationClient.java (original)
+++ tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClient.java Wed Sep 9 09:26:32 2009
@@ -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.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;
Copied: tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClient.java (from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionLocalClient.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClient.java?p2=tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClient.java&p1=tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionLocalClient.java&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionLocalClient.java (original)
+++ tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClient.java Wed Sep 9 09:26:32 2009
@@ -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 {
Copied: tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClient.java (from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionOneWayCallbackClient.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClient.java?p2=tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClient.java&p1=tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionOneWayCallbackClient.java&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionOneWayCallbackClient.java (original)
+++ tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClient.java Wed Sep 9 09:26:32 2009
@@ -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.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)
Copied: tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClient.java (from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRemoteClient.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClient.java?p2=tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClient.java&p1=tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRemoteClient.java&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRemoteClient.java (original)
+++ tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClient.java Wed Sep 9 09:26:32 2009
@@ -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;
Copied: tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClient.java (from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRequestResponseClient.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClient.java?p2=tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClient.java&p1=tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRequestResponseClient.java&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionRequestResponseClient.java (original)
+++ tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClient.java Wed Sep 9 09:26:32 2009
@@ -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 {
Copied: tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClient.java (from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionStatefulCallbackClient.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClient.java?p2=tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClient.java&p1=tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionStatefulCallbackClient.java&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/java/scatours/client/InteractionStatefulCallbackClient.java (original)
+++ tuscany/sandbox/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionStatefulCallbackClient.java Wed Sep 9 09:26:32 2009
@@ -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.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;
Copied: tuscany/sandbox/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml (from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml?p2=tuscany/sandbox/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml&p1=tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml Wed Sep 9 09:26:32 2009
@@ -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>
Copied: tuscany/sandbox/travelsample/contributions/interaction-client/src/main/resources/client.composite (from r812410, tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/interaction-client/src/main/resources/client.composite?p2=tuscany/sandbox/travelsample/contributions/interaction-client/src/main/resources/client.composite&p1=tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/interaction-client-contribution/src/main/resources/client.composite (original)
+++ tuscany/sandbox/travelsample/contributions/interaction-client/src/main/resources/client.composite Wed Sep 9 09:26:32 2009
@@ -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>
Propchange: tuscany/sandbox/travelsample/contributions/interaction-service-remote/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 9 09:26:32 2009
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Copied: tuscany/sandbox/travelsample/contributions/interaction-service-remote/build.xml (from r812410, tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/build.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/interaction-service-remote/build.xml?p2=tuscany/sandbox/travelsample/contributions/interaction-service-remote/build.xml&p1=tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/build.xml&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/build.xml (original)
+++ tuscany/sandbox/travelsample/contributions/interaction-service-remote/build.xml Wed Sep 9 09:26:32 2009
@@ -17,22 +17,14 @@
* under the License.
-->
-<project name="scatours-chapter-02-client-contribution" default="compile">
- <property environment="env"/>
+<project name="scatours-contribution-interaction-service-remote" default="compile">
<target name="compile">
<mkdir dir="target/classes"/>
- <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
- <src path="src/main/java"/>
- <classpath>
- <pathelement location="../tuscanyscatours-contribution/target/scatours-chapter-02-tuscanyscatours-contribution.jar"/>
- <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </javac>
<copy todir="target/classes">
<fileset dir="src/main/resources"/>
</copy>
- <jar destfile="target/scatours-chapter-02-client-contribution.jar"
+ <jar destfile="target/scatours-contribution-interaction-service-remote.jar"
basedir="target/classes"/>
</target>
Copied: tuscany/sandbox/travelsample/contributions/interaction-service-remote/pom.xml (from r812410, tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/interaction-service-remote/pom.xml?p2=tuscany/sandbox/travelsample/contributions/interaction-service-remote/pom.xml&p1=tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/pom.xml&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/interaction-service-remote/pom.xml Wed Sep 9 09:26:32 2009
@@ -25,26 +25,29 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-interaction-service-remote-contribution</artifactId>
+ <artifactId>scatours-contribution-interaction-service-remote</artifactId>
<name>Apache Tuscany SCA Tours Interaction Service Remote Contribution</name>
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.6-SNAPSHOT</version>
+ <artifactId>scatours-contribution-common</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-common-contribution</artifactId>
+ <artifactId>scatours-contribution-flight</artifactId>
<version>1.0-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-hotel-contribution</artifactId>
+ <artifactId>scatours-contribution-hotel</artifactId>
<version>1.0-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
Copied: tuscany/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml (from r812410, tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/META-INF/sca-contribution.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml?p2=tuscany/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml&p1=tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/META-INF/sca-contribution.xml&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml Wed Sep 9 09:26:32 2009
@@ -18,9 +18,9 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:client="http://client.scatours/">
- <import.java package="scatours.common"/>
- <import.java package="scatours.hotel"/>
- <import.java package="scatours.flight"/>
- <deployable composite="client:Client" />
+ xmlns:tours="http://com.tuscanyscatours/">
+ <import.java package="com.tuscanyscatours.common" />
+ <import.java package="com.tuscanyscatours.flight.impl" />
+ <import.java package="com.tuscanyscatours.hotel.impl" />
+ <deployable composite="tours:service" />
</contribution>
Copied: tuscany/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite (from r812410, tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/client.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite?p2=tuscany/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite&p1=tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/client.composite&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/client.composite (original)
+++ tuscany/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite Wed Sep 9 09:26:32 2009
@@ -18,29 +18,29 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://service.scatours/"
+ targetNamespace="http://tuscanyscatours.com/"
name="Service">
<component name="Hotel">
- <implementation.java class="scatours.hotel.HotelImpl"/>
+ <implementation.java class="com.tuscanyscatours.hotel.impl.HotelImpl"/>
<service name="Search">
- <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>
</service>
</component>
<component name="Flight">
- <implementation.java class="scatours.flight.FlightImpl"/>
+ <implementation.java class="com.tuscanyscatours.flight.impl.FlightImpl"/>
<service name="Search">
- <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>
</service>
</component>
Propchange: tuscany/sandbox/travelsample/launchers/interaction/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 9 09:26:32 2009
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Copied: tuscany/sandbox/travelsample/launchers/interaction/build.xml (from r812410, tuscany/sandbox/travelsample/launchers/interaction-launcher/build.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/interaction/build.xml?p2=tuscany/sandbox/travelsample/launchers/interaction/build.xml&p1=tuscany/sandbox/travelsample/launchers/interaction-launcher/build.xml&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/interaction-launcher/build.xml (original)
+++ tuscany/sandbox/travelsample/launchers/interaction/build.xml Wed Sep 9 09:26:32 2009
@@ -17,37 +17,24 @@
* under the License.
-->
-<project name="scatours-interaction-launcher" default="compile">
+<project name="scatours-launcher-interaction" default="compile">
<property environment="env"/>
<target name="compile">
<mkdir dir="target/classes"/>
<javac destdir="target/classes" debug="on" source="1.5" target="1.5">
- <src path="src\main\java"/>
+ <src path="src/main/java"/>
<classpath>
- <fileset refid="tuscany.jars"/>
- <fileset refid="3rdparty.jars"/>
+ <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
</classpath>
</javac>
- <copy todir="target/classes">
- <fileset dir="src\main\resources"/>
- <fileset dir="." includes="*" excludes="src, target, pom.xml, build.xml"/>
- </copy>
- <jar destfile="target/scatours-interaction-launcher.jar" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="scatours.LaunchNode"/>
- </manifest>
- </jar>
</target>
- <target name="package" depends="compile"/>
-
<target name="run">
- <java classname="scatours.LaunchNode" fork="true">
+ <java classname="scatours.InteractionLauncher" fork="true">
<classpath>
- <pathelement location="target/scatours-interaction-launcher.jar"/>
- <fileset refid="tuscany.jars"/>
- <fileset refid="3rdparty.jars"/>
+ <pathelement location="target/classes"/>
+ <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
</classpath>
</java>
</target>
@@ -58,223 +45,4 @@
</delete>
</target>
- <fileset id="tuscany.jars" dir="${env.TUSCANY}/modules">
- <include name="tuscany-assembly-1.5.jar"/>
- <include name="tuscany-assembly-xml-1.5.jar"/>
- <include name="tuscany-assembly-xsd-1.5.jar"/>
- <include name="tuscany-binding-atom-1.5.jar"/>
- <include name="tuscany-binding-atom-abdera-1.5.jar"/>
- <include name="tuscany-binding-atom-js-1.5.jar"/>
- <include name="tuscany-binding-ejb-1.5.jar"/>
- <include name="tuscany-binding-ejb-runtime-1.5.jar"/>
- <include name="tuscany-binding-http-1.5.jar"/>
- <include name="tuscany-binding-http-runtime-1.5.jar"/>
- <include name="tuscany-binding-jsonrpc-1.5.jar"/>
- <include name="tuscany-binding-jsonrpc-runtime-1.5.jar"/>
- <include name="tuscany-binding-sca-1.5.jar"/>
- <include name="tuscany-binding-sca-axis2-1.5.jar"/>
- <include name="tuscany-binding-sca-xml-1.5.jar"/>
- <include name="tuscany-binding-ws-1.5.jar"/>
- <include name="tuscany-binding-ws-axis2-1.5.jar"/>
- <include name="tuscany-binding-ws-axis2-policy-1.5.jar"/>
- <include name="tuscany-binding-ws-wsdlgen-1.5.jar"/>
- <include name="tuscany-binding-ws-xml-1.5.jar"/>
- <include name="tuscany-contribution-1.5.jar"/>
- <include name="tuscany-contribution-impl-1.5.jar"/>
- <include name="tuscany-contribution-java-1.5.jar"/>
- <include name="tuscany-contribution-jee-1.5.jar"/>
- <include name="tuscany-contribution-namespace-1.5.jar"/>
- <include name="tuscany-contribution-resource-1.5.jar"/>
- <include name="tuscany-contribution-xml-1.5.jar"/>
- <include name="tuscany-core-1.5.jar"/>
- <include name="tuscany-core-databinding-1.5.jar"/>
- <include name="tuscany-core-spi-1.5.jar"/>
- <include name="tuscany-data-api-1.5.jar"/>
- <include name="tuscany-databinding-1.5.jar"/>
- <include name="tuscany-databinding-axiom-1.5.jar"/>
- <include name="tuscany-databinding-jaxb-1.5.jar"/>
- <include name="tuscany-databinding-jaxb-axiom-1.5.jar"/>
- <include name="tuscany-databinding-json-1.5.jar"/>
- <include name="tuscany-databinding-sdo-1.5.jar"/>
- <include name="tuscany-definitions-1.5.jar"/>
- <include name="tuscany-definitions-xml-1.5.jar"/>
- <include name="tuscany-domain-manager-1.5.jar"/>
- <include name="tuscany-endpoint-1.5.jar"/>
- <include name="tuscany-extensibility-1.5.jar"/>
- <include name="tuscany-host-embedded-1.5.jar"/>
- <include name="tuscany-host-http-1.5.jar"/>
- <include name="tuscany-host-jetty-1.5.jar"/>
- <include name="tuscany-implementation-bpel-1.5.jar"/>
- <include name="tuscany-implementation-bpel-ode-1.5.jar"/>
- <include name="tuscany-implementation-ejb-1.5.jar"/>
- <include name="tuscany-implementation-java-1.5.jar"/>
- <include name="tuscany-implementation-java-runtime-1.5.jar"/>
- <include name="tuscany-implementation-java-xml-1.5.jar"/>
- <include name="tuscany-implementation-node-1.5.jar"/>
- <include name="tuscany-implementation-node-runtime-1.5.jar"/>
- <include name="tuscany-implementation-resource-1.5.jar"/>
- <include name="tuscany-implementation-resource-runtime-1.5.jar"/>
- <include name="tuscany-implementation-widget-1.5.jar"/>
- <include name="tuscany-implementation-widget-runtime-1.5.jar"/>
- <include name="tuscany-implementation-widget-runtime-tuscany-1.5.jar"/>
- <include name="tuscany-interface-1.5.jar"/>
- <include name="tuscany-interface-java-1.5.jar"/>
- <include name="tuscany-interface-java-jaxws-1.5.jar"/>
- <include name="tuscany-interface-java-xml-1.5.jar"/>
- <include name="tuscany-interface-wsdl-1.5.jar"/>
- <include name="tuscany-interface-wsdl-xml-1.5.jar"/>
- <include name="tuscany-monitor-1.5.jar"/>
- <include name="tuscany-node-api-1.5.jar"/>
- <include name="tuscany-node-impl-1.5.jar"/>
- <include name="tuscany-node-launcher-1.5.jar"/>
- <include name="tuscany-node-manager-1.5.jar"/>
- <include name="tuscany-policy-1.5.jar"/>
- <include name="tuscany-policy-security-1.5.jar"/>
- <include name="tuscany-policy-security-http-1.5.jar"/>
- <include name="tuscany-policy-xml-1.5.jar"/>
- <include name="tuscany-policy-xml-ws-1.5.jar"/>
- <include name="tuscany-sca-api-1.5.jar"/>
- <include name="tuscany-sca-api-extension-1.5.jar"/>
- <include name="tuscany-web-javascript-1.5.jar"/>
- <include name="tuscany-workspace-1.5.jar"/>
- <include name="tuscany-workspace-impl-1.5.jar"/>
- <include name="tuscany-workspace-xml-1.5.jar"/>
- <include name="tuscany-xsd-1.5.jar"/>
- <include name="tuscany-xsd-xml-1.5.jar"/>
- </fileset>
- <fileset id="3rdparty.jars" dir="${env.TUSCANY}/lib">
- <include name="XmlSchema-1.4.2.jar"/>
- <include name="abdera-client-0.4.0-incubating.jar"/>
- <include name="abdera-core-0.4.0-incubating.jar"/>
- <include name="abdera-extensions-html-0.4.0-incubating.jar"/>
- <include name="abdera-extensions-json-0.4.0-incubating.jar"/>
- <include name="abdera-extensions-main-0.4.0-incubating.jar"/>
- <include name="abdera-i18n-0.4.0-incubating.jar"/>
- <include name="abdera-parser-0.4.0-incubating.jar"/>
- <include name="abdera-server-0.4.0-incubating.jar"/>
- <include name="activation-1.1.jar"/>
- <include name="activeio-2.0-r118.jar"/>
- <include name="annogen-0.1.0.jar"/>
- <include name="asm-all-3.1.jar"/>
- <include name="axiom-api-1.2.7.jar"/>
- <include name="axiom-dom-1.2.7.jar"/>
- <include name="axiom-impl-1.2.7.jar"/>
- <include name="axion-1.0-M3-dev.jar"/>
- <include name="axis-ant-1.4.jar"/>
- <include name="axis2-adb-1.4.1.jar"/>
- <include name="axis2-codegen-1.4.1.jar"/>
- <include name="axis2-java2wsdl-1.4.1.jar"/>
- <include name="axis2-kernel-1.4.1.jar"/>
- <include name="axis2-mtompolicy-1.4.1.jar"/>
- <include name="backport-util-concurrent-3.1.jar"/>
- <include name="bcprov-jdk13-132.jar"/>
- <include name="cglib-nodep-2.2.jar"/>
- <include name="common-2.2.3.jar"/>
- <include name="commons-codec-1.3.jar"/>
- <include name="commons-collections-3.1.jar"/>
- <include name="commons-discovery-0.2.jar"/>
- <include name="commons-fileupload-1.2.jar"/>
- <include name="commons-httpclient-3.1.jar"/>
- <include name="commons-io-1.4.jar"/>
- <include name="commons-jexl-1.1.jar"/>
- <include name="commons-lang-2.1.jar"/>
- <include name="commons-logging-1.1.1.jar"/>
- <include name="commons-primitives-1.0.jar"/>
- <include name="derby-10.3.1.4.jar"/>
- <include name="dom4j-1.6.1.jar"/>
- <include name="ecore-2.2.3.jar"/>
- <include name="ecore-change-2.2.3.jar"/>
- <include name="ecore-xmi-2.2.3.jar"/>
- <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>
- <include name="geronimo-common-1.2-beta.jar"/>
- <include name="geronimo-connector-1.2-beta.jar"/>
- <include name="geronimo-core-1.2-beta.jar"/>
- <include name="geronimo-deployment-1.2-beta.jar"/>
- <include name="geronimo-ejb_3.0_spec-1.0.jar"/>
- <include name="geronimo-interceptor-1.2-beta.jar"/>
- <include name="geronimo-j2ee-1.2-beta.jar"/>
- <include name="geronimo-j2ee-connector_1.5_spec-1.1.jar"/>
- <include name="geronimo-j2ee-jacc_1.0_spec-1.1.jar"/>
- <include name="geronimo-j2ee-management_1.0_spec-1.1.jar"/>
- <include name="geronimo-javamail_1.4_spec-1.2.jar"/>
- <include name="geronimo-jms_1.1_spec-1.1.jar"/>
- <include name="geronimo-jpa_3.0_spec-1.0.jar"/>
- <include name="geronimo-jta_1.0.1B_spec-1.0.jar"/>
- <include name="geronimo-kernel-1.2-beta.jar"/>
- <include name="geronimo-management-1.2-beta.jar"/>
- <include name="geronimo-naming-1.2-beta.jar"/>
- <include name="geronimo-security-1.2-beta.jar"/>
- <include name="geronimo-spec-j2ee-connector-1.5-rc4.jar"/>
- <include name="geronimo-spec-jta-1.0.1B-rc4.jar"/>
- <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>
- <include name="geronimo-system-1.2-beta.jar"/>
- <include name="geronimo-transaction-1.2-beta.jar"/>
- <include name="geronimo-util-1.2-beta.jar"/>
- <include name="howl-1.0.1-1.jar"/>
- <include name="htmlparser-1.0.5.jar"/>
- <include name="httpcore-4.0-beta1.jar"/>
- <include name="httpcore-nio-4.0-beta1.jar"/>
- <include name="javacc-3.2.jar"/>
- <include name="jaxb-api-2.1.jar"/>
- <include name="jaxb-impl-2.1.7.jar"/>
- <include name="jaxen-1.1.1.jar"/>
- <include name="jaxws-api-2.1.jar"/>
- <include name="jdom-1.0.jar"/>
- <include name="jettison-1.0.1.jar"/>
- <include name="jetty-6.1.7.jar"/>
- <include name="jetty-util-6.1.7.jar"/>
- <include name="json-rpc-1.0.jar"/>
- <include name="jsr181-api-1.0-MR1.jar"/>
- <include name="jsr250-api-1.0.jar"/>
- <include name="junit-4.5.jar"/>
- <include name="log4j-1.2.13.jar"/>
- <include name="mail-1.4.jar"/>
- <include name="mex-1.41-impl.jar"/>
- <include name="neethi-2.0.4.jar"/>
- <include name="ode-bpel-api-1.1.1.jar"/>
- <include name="ode-bpel-compiler-1.1.1.jar"/>
- <include name="ode-bpel-dao-1.1.1.jar"/>
- <include name="ode-bpel-epr-1.1.1.jar"/>
- <include name="ode-bpel-obj-1.1.1.jar"/>
- <include name="ode-bpel-runtime-1.1.1.jar"/>
- <include name="ode-bpel-schemas-1.1.1.jar"/>
- <include name="ode-bpel-store-1.1.1.jar"/>
- <include name="ode-dao-jpa-1.1.1.jar"/>
- <include name="ode-jacob-1.1.1.jar"/>
- <include name="ode-jacob-ap-1.1.1.jar"/>
- <include name="ode-scheduler-simple-1.1.1.jar"/>
- <include name="ode-utils-1.1.1.jar"/>
- <include name="openjpa-all-0.9.7-incubating.jar"/>
- <include name="openjpa-persistence-0.9.7-incubating.jar"/>
- <include name="opensaml-1.1.jar"/>
- <include name="rampart-core-1.4.jar"/>
- <include name="rampart-policy-1.4.jar"/>
- <include name="rampart-trust-1.4.jar"/>
- <include name="regexp-1.3.jar"/>
- <include name="saxon-8.7.jar"/>
- <include name="saxon-dom-8.7.jar"/>
- <include name="saxon-xpath-8.7.jar"/>
- <include name="serp-1.12.0.jar"/>
- <include name="servlet-api-2.5.jar"/>
- <include name="stax-api-1.0-2.jar"/>
- <include name="tranql-connector-1.1.jar"/>
- <include name="tuscany-sdo-api-r2.1-1.1.1.jar"/>
- <include name="tuscany-sdo-impl-1.1.1.jar"/>
- <include name="tuscany-sdo-lib-1.1.1.jar"/>
- <include name="woden-api-1.0M8.jar"/>
- <include name="woden-impl-dom-1.0M8.jar"/>
- <include name="wsdl4j-1.6.2.jar"/>
- <include name="wss4j-1.5.4.jar"/>
- <include name="wstx-asl-3.2.4.jar"/>
- <include name="xalan-2.7.0.jar"/>
- <include name="xbean-naming-2.7.jar"/>
- <include name="xercesImpl-2.8.1.jar"/>
- <include name="xml-apis-1.3.03.jar"/>
- <include name="xml-resolver-1.1.jar"/>
- <include name="xmlParserAPIs-2.6.0.jar"/>
- <include name="xmlbeans-2.3.0.jar"/>
- <include name="xmlsec-1.4.2.jar"/>
- <include name="xsd-2.2.3.jar"/>
- </fileset>
-
</project>
Copied: tuscany/sandbox/travelsample/launchers/interaction/pom.xml (from r812410, tuscany/sandbox/travelsample/launchers/interaction-launcher/pom.xml)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/interaction/pom.xml?p2=tuscany/sandbox/travelsample/launchers/interaction/pom.xml&p1=tuscany/sandbox/travelsample/launchers/interaction-launcher/pom.xml&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/interaction-launcher/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/interaction/pom.xml Wed Sep 9 09:26:32 2009
@@ -25,11 +25,11 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-interaction-launcher</artifactId>
+ <artifactId>scatours-launcher-interaction</artifactId>
<name>Apache Tuscany SCA Tours Interaction Launcher</name>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-api</artifactId>
<version>1.6-SNAPSHOT</version>
@@ -143,24 +143,5 @@
<build>
<finalName>${artifactId}</finalName>
- <!--
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-ant-generator</artifactId>
- <version>1.6-SNAPSHOT</version>
- <executions>
- <execution>
- <configuration>
- <mainClass>scatours.LaunchNode</mainClass>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- -->
</build>
</project>
Copied: tuscany/sandbox/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java (from r812410, tuscany/sandbox/travelsample/launchers/interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java?p2=tuscany/sandbox/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java&p1=tuscany/sandbox/travelsample/launchers/interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java&r1=812410&r2=812852&rev=812852&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/interaction-launcher/src/main/java/scatours/LaunchIntactionNode.java (original)
+++ tuscany/sandbox/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java Wed Sep 9 09:26:32 2009
@@ -19,61 +19,49 @@
package scatours;
-import java.io.IOException;
-
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
-public class LaunchIntactionNode {
+public class InteractionLauncher {
+
public static void main(String[] args) throws Exception {
- LaunchIntactionNode.launchFromFileSystemDir();
- }
-
- // OK for development but you must launch the node from this module
- public static void launchFromFileSystemDir(){
-
- try {
- SCANode node1 = SCANodeFactory.newInstance().createSCANode("client.composite",
- new SCAContribution("common", "../../contributions/common-contribution/target/classes"),
- new SCAContribution("currency", "../../contributions/currency-contribution/target/classes"),
- new SCAContribution("calendar", "../../contributions/calendar-contribution/target/classes"),
- new SCAContribution("shoppingcart", "../../contributions/shoppingcart-contribution/target/classes"),
- new SCAContribution("client", "../../contributions/interaction-client-contribution/target/classes"));
-
- SCANode node2 = SCANodeFactory.newInstance().createSCANode("client.composite",
- new SCAContribution("common", "../../contributions/common-contribution/target/classes"),
- new SCAContribution("hotel", "../../contributions/hotel-contribution/target/classes"),
- new SCAContribution("flight", "../../contributions/flight-contribution/target/classes"),
- new SCAContribution("remoteService", "../../contributions/interaction-service-remote-contribution/target/classes"));
+ SCANode node1 = SCANodeFactory.newInstance().createSCANode("client.composite",
+ new SCAContribution("common", "../../contributions/common/target/classes"),
+ new SCAContribution("currency", "../../contributions/currency/target/classes"),
+ new SCAContribution("calendar", "../../contributions/calendar/target/classes"),
+ new SCAContribution("shoppingcart", "../../contributions/shoppingcart/target/classes"),
+ new SCAContribution("client", "../../contributions/interaction-client/target/classes"));
+
+ SCANode node2 = SCANodeFactory.newInstance().createSCANode("service.composite",
+ new SCAContribution("common", "../../contributions/common/target/classes"),
+ new SCAContribution("hotel", "../../contributions/hotel/target/classes"),
+ new SCAContribution("flight", "../../contributions/flight/target/classes"),
+ new SCAContribution("remoteService", "../../contributions/interaction-service-remote/target/classes"));
- node2.start();
- node1.start();
-
- Runnable localInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionLocalClient/Runnable");
- localInteraction.run();
-
- Runnable remoteInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionRemoteClient/Runnable");
- remoteInteraction.run();
-
- Runnable requestResponseInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionRequestResponseClient/Runnable");
- requestResponseInteraction.run();
-
- Runnable onewayCallbackInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionOneWayCallbackClient/Runnable");
- onewayCallbackInteraction.run();
-
- Runnable conversationalInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionConversationClient/Runnable");
- conversationalInteraction.run();
-
- Runnable statefulCallbackInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionStatefulCallbackClient/Runnable");
- statefulCallbackInteraction.run();
-
- node1.stop();
- node2.stop();
-
- } catch (Exception ex) {
- System.out.println(ex.toString());
- }
+ node2.start();
+ node1.start();
+
+ Runnable localInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionLocalClient/Runnable");
+ localInteraction.run();
+
+ Runnable remoteInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionRemoteClient/Runnable");
+ remoteInteraction.run();
+
+ Runnable requestResponseInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionRequestResponseClient/Runnable");
+ requestResponseInteraction.run();
+
+ Runnable onewayCallbackInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionOneWayCallbackClient/Runnable");
+ onewayCallbackInteraction.run();
+
+ Runnable conversationalInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionConversationClient/Runnable");
+ conversationalInteraction.run();
+
+ Runnable statefulCallbackInteraction = ((SCAClient)node1).getService(Runnable.class, "InteractionStatefulCallbackClient/Runnable");
+ statefulCallbackInteraction.run();
+
+ node1.stop();
+ node2.stop();
}
}