You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/08/31 14:27:58 UTC
svn commit: r690687 - in /tuscany/sandbox/travelsample: gettingstarted/
gettingstarted/src/ gettingstarted/src/client/ node/
travel-contribution/src/scatours/travel/ ui-contribution/
Author: slaws
Date: Sun Aug 31 05:27:58 2008
New Revision: 690687
URL: http://svn.apache.org/viewvc?rev=690687&view=rev
Log:
Namespace changes from scatours to tuscanyscatours and addition of callback configuration.
Modified:
tuscany/sandbox/travelsample/gettingstarted/pom.xml
tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java
tuscany/sandbox/travelsample/gettingstarted/src/client/TripClient.java
tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java
tuscany/sandbox/travelsample/gettingstarted/src/currencyconverter.composite
tuscany/sandbox/travelsample/gettingstarted/src/trip.composite
tuscany/sandbox/travelsample/gettingstarted/src/tripws.composite
tuscany/sandbox/travelsample/node/build.xml
tuscany/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java
tuscany/sandbox/travelsample/ui-contribution/build.xml
tuscany/sandbox/travelsample/ui-contribution/scatours.composite
Modified: tuscany/sandbox/travelsample/gettingstarted/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/gettingstarted/pom.xml?rev=690687&r1=690686&r2=690687&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/gettingstarted/pom.xml (original)
+++ tuscany/sandbox/travelsample/gettingstarted/pom.xml Sun Aug 31 05:27:58 2008
@@ -31,8 +31,9 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node2-impl</artifactId>
<version>1.4-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
Modified: tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java?rev=690687&r1=690686&r2=690687&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java (original)
+++ tuscany/sandbox/travelsample/gettingstarted/src/client/CurrencyConverterClient.java Sun Aug 31 05:27:58 2008
@@ -19,6 +19,11 @@
package client;
import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
+
+import trip.Trip;
import currencyconverter.CurrencyConverter;
/**
@@ -27,12 +32,17 @@
public class CurrencyConverterClient {
public final static void main(String[] args) throws Exception {
- SCADomain scaDomain =
- SCADomain.newInstance("currencyconverter.composite");
+ SCANode2Factory factory = SCANode2Factory.newInstance();
+ SCANode2 node = factory.createSCANodeFromClassLoader("currencyconverter.composite",
+ null);
+ node.start();
+
CurrencyConverter currencyConverter =
- scaDomain.getService(CurrencyConverter.class,
- "CurrencyConverterComponent");
+ ((SCAClient)node).getService(CurrencyConverter.class,
+ "CurrencyConverterComponent");
+
System.out.println(currencyConverter.convert("GBP", "USD", 10.00));
- scaDomain.close();
+
+ node.stop();
}
}
Modified: tuscany/sandbox/travelsample/gettingstarted/src/client/TripClient.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/gettingstarted/src/client/TripClient.java?rev=690687&r1=690686&r2=690687&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/gettingstarted/src/client/TripClient.java (original)
+++ tuscany/sandbox/travelsample/gettingstarted/src/client/TripClient.java Sun Aug 31 05:27:58 2008
@@ -18,7 +18,9 @@
*/
package client;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
import trip.Trip;
@@ -28,10 +30,16 @@
public class TripClient {
public final static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("trip.composite");
- Trip trip = scaDomain.getService(Trip.class, "TripComponent");
+ SCANode2Factory factory = SCANode2Factory.newInstance();
+ SCANode2 node = factory.createSCANodeFromClassLoader("trip.composite",
+ null);
+ node.start();
+
+ Trip trip = ((SCAClient)node).getService(Trip.class,
+ "TripComponent");
+
System.out.println(trip.getTotalPrice());
- scaDomain.close();
+ node.stop();
}
}
Modified: tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java?rev=690687&r1=690686&r2=690687&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java (original)
+++ tuscany/sandbox/travelsample/gettingstarted/src/client/TripWsClient.java Sun Aug 31 05:27:58 2008
@@ -19,6 +19,9 @@
package client;
import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
import trip.Trip;
@@ -28,13 +31,19 @@
public class TripWsClient {
public final static void main(String[] args) throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("tripws.composite");
- Trip trip = scaDomain.getService(Trip.class, "TripComponent");
- System.out.println(trip.getTotalPrice());
+ SCANode2Factory factory = SCANode2Factory.newInstance();
+ SCANode2 node = factory.createSCANodeFromClassLoader("tripws.composite",
+ null);
+ node.start();
+
+ Trip trip = ((SCAClient)node).getService(Trip.class,
+ "TripComponent");
- System.out.println("press enter to continue");
- System.in.read();
+ System.out.println(trip.getTotalPrice());
- scaDomain.close();
+ System.out.println("press enter to continue");
+ System.in.read();
+
+ node.stop();
}
}
Modified: tuscany/sandbox/travelsample/gettingstarted/src/currencyconverter.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/gettingstarted/src/currencyconverter.composite?rev=690687&r1=690686&r2=690687&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/gettingstarted/src/currencyconverter.composite (original)
+++ tuscany/sandbox/travelsample/gettingstarted/src/currencyconverter.composite Sun Aug 31 05:27:58 2008
@@ -18,8 +18,8 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://scatours"
- xmlns:sample="http://scatours"
+ targetNamespace="http://tuscanyscatours"
+ xmlns:sample="http://tuscanyscatours"
name="currencyconverter">
<component name="CurrencyConverterComponent">
Modified: tuscany/sandbox/travelsample/gettingstarted/src/trip.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/gettingstarted/src/trip.composite?rev=690687&r1=690686&r2=690687&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/gettingstarted/src/trip.composite (original)
+++ tuscany/sandbox/travelsample/gettingstarted/src/trip.composite Sun Aug 31 05:27:58 2008
@@ -18,8 +18,8 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://scatours"
- xmlns:sample="http://scatours"
+ targetNamespace="http://tuscanyscatours"
+ xmlns:sample="http://tuscanyscatours"
name="trip">
<component name="TripComponent">
Modified: tuscany/sandbox/travelsample/gettingstarted/src/tripws.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/gettingstarted/src/tripws.composite?rev=690687&r1=690686&r2=690687&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/gettingstarted/src/tripws.composite (original)
+++ tuscany/sandbox/travelsample/gettingstarted/src/tripws.composite Sun Aug 31 05:27:58 2008
@@ -18,8 +18,8 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://scatours"
- xmlns:sample="http://scatours"
+ targetNamespace="http://tuscanyscatours"
+ xmlns:sample="http://tuscanyscatours"
name="tripws">
<component name="TripComponent">
Modified: tuscany/sandbox/travelsample/node/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/node/build.xml?rev=690687&r1=690686&r2=690687&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/node/build.xml (original)
+++ tuscany/sandbox/travelsample/node/build.xml Sun Aug 31 05:27:58 2008
@@ -116,9 +116,11 @@
<include name="tuscany-interface-wsdl-xml-1.4-SNAPSHOT.jar"/>
<include name="tuscany-monitor-1.4-SNAPSHOT.jar"/>
<include name="tuscany-monitor-logging-1.4-SNAPSHOT.jar"/>
+ <include name="tuscany-node-api-1.4-SNAPSHOT.jar"/>
+ <include name="tuscany-node-impl-1.4-SNAPSHOT.jar"/>
+ <include name="tuscany-node-launcher-1.4-SNAPSHOT.jar"/>
<include name="tuscany-node-manager-1.4-SNAPSHOT.jar"/>
<include name="tuscany-node2-api-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-node2-impl-1.4-SNAPSHOT.jar"/>
<include name="tuscany-node2-launcher-1.4-SNAPSHOT.jar"/>
<include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
<include name="tuscany-policy-security-1.4-SNAPSHOT.jar"/>
@@ -134,9 +136,14 @@
</fileset>
<fileset id="3rdparty.jars" dir="../../lib">
<include name="XmlSchema-1.3.2.jar"/>
- <include name="abdera-core-0.3.0-incubating.jar"/>
- <include name="abdera-i18n-0.3.0-incubating.jar"/>
- <include name="abdera-parser-0.3.0-incubating.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="annogen-0.1.0.jar"/>
<include name="asm-all-3.1.jar"/>
@@ -160,12 +167,13 @@
<include name="commons-io-1.1.jar"/>
<include name="commons-logging-1.1.jar"/>
<include name="derby-10.3.1.4.jar"/>
- <include name="dom4j-1.6.1.jar"/>
<include name="geronimo-activation_1.1_spec-1.0-M1.jar"/>
<include name="geronimo-commonj_1.1_spec-1.0.jar"/>
<include name="geronimo-ejb_3.0_spec-1.0.jar"/>
<include name="geronimo-javamail_1.4_spec-1.0-M1.jar"/>
<include name="geronimo-jms_1.1_spec-1.1.jar"/>
+ <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>
+ <include name="htmlparser-1.0.5.jar"/>
<include name="httpcore-4.0-alpha5.jar"/>
<include name="httpcore-nio-4.0-alpha5.jar"/>
<include name="httpcore-niossl-4.0-alpha5.jar"/>
@@ -173,7 +181,6 @@
<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"/>
Modified: tuscany/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java?rev=690687&r1=690686&r2=690687&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java (original)
+++ tuscany/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java Sun Aug 31 05:27:58 2008
@@ -26,7 +26,9 @@
import org.apache.tuscany.sca.data.collection.Entry;
import org.apache.tuscany.sca.data.collection.NotFoundException;
+import org.osoa.sca.CallableReference;
import org.osoa.sca.ComponentContext;
+import org.osoa.sca.RequestContext;
import org.osoa.sca.ServiceReference;
import org.osoa.sca.annotations.Context;
import org.osoa.sca.annotations.Property;
@@ -81,7 +83,12 @@
searchResults.clear();
responsesReceived = 0;
- hotelSearch.searchAsynch(tripLeg);
+ ServiceReference<Search> dynamicHotelSearch =
+ componentContext.getServiceReference(Search.class, "hotelSearch");
+
+ dynamicHotelSearch.setCallbackID("HotelSearchCallbackID-" + tripLeg.getId());
+ dynamicHotelSearch.getService().searchAsynch(tripLeg);
+
flightSearch.searchAsynch(tripLeg);
carSearch.searchAsynch(tripLeg);
@@ -110,6 +117,10 @@
// SearchCallback methods
public void searchResults(TripItem[] items){
+ RequestContext requestContext = componentContext.getRequestContext();
+ Object callbackID = requestContext.getServiceReference().getCallbackID();
+ System.out.println(callbackID);
+
for(int i = 0; i < items.length; i++ ){
searchResults.add(items[i]);
}
Modified: tuscany/sandbox/travelsample/ui-contribution/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/ui-contribution/build.xml?rev=690687&r1=690686&r2=690687&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/ui-contribution/build.xml (original)
+++ tuscany/sandbox/travelsample/ui-contribution/build.xml Sun Aug 31 05:27:58 2008
@@ -77,11 +77,14 @@
<include name="tuscany-endpoint-1.4-SNAPSHOT.jar"/>
<include name="tuscany-extensibility-1.4-SNAPSHOT.jar"/>
<include name="tuscany-host-embedded-1.4-SNAPSHOT.jar"/>
+ <include name="tuscany-implementation-node-1.4-SNAPSHOT.jar"/>
<include name="tuscany-interface-1.4-SNAPSHOT.jar"/>
<include name="tuscany-interface-java-1.4-SNAPSHOT.jar"/>
<include name="tuscany-interface-java-jaxws-1.4-SNAPSHOT.jar"/>
<include name="tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>
<include name="tuscany-monitor-1.4-SNAPSHOT.jar"/>
+ <include name="tuscany-node-api-1.4-SNAPSHOT.jar"/>
+ <include name="tuscany-node-impl-1.4-SNAPSHOT.jar"/>
<include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
<include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
<include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
Modified: tuscany/sandbox/travelsample/ui-contribution/scatours.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/ui-contribution/scatours.composite?rev=690687&r1=690686&r2=690687&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/ui-contribution/scatours.composite (original)
+++ tuscany/sandbox/travelsample/ui-contribution/scatours.composite Sun Aug 31 05:27:58 2008
@@ -53,11 +53,16 @@
<service name="TravelBooking">
<tuscany:binding.jsonrpc/>
</service>
- <reference name="hotelSearch" target="HotelComponent/Search">
+ <reference name="hotelSearch" target="HotelComponent">
<binding.sca/>
</reference>
- <reference name="flightSearch" target="FlightComponent">
- <binding.sca/>
+ <reference name="flightSearch">
+ <interface.java interface="scatours.common.Search"
+ callbackInterface="scatours.common.SearchCallback"/>
+ <binding.ws uri="http://localhost:8080/Flight/Search"/>
+ <callback>
+ <binding.ws uri="http://localhost:8080/Flight/SearchCallback"/>
+ </callback>
</reference>
<reference name="carSearch" target="CarComponent">
<binding.sca/>
@@ -68,6 +73,7 @@
</reference>
<property name="quoteCurrencyCode">GBP</property>
</component>
+
<component name="TripComponent">
<implementation.java class="scatours.trip.TripImpl"/>
<service name="Trip">
@@ -85,8 +91,13 @@
<component name="FlightComponent">
<implementation.java class="scatours.flight.FlightImpl"/>
<service name="Search">
- <binding.sca/>
+ <interface.java interface="scatours.common.Search"
+ callbackInterface="scatours.common.SearchCallback"/>
+ <binding.ws uri="http://localhost:8080/Flight/Search"/>
<tuscany:binding.jsonrpc/>
+ <callback>
+ <binding.ws uri="http://localhost:8080/Flight/SearchCallback"/>
+ </callback>
</service>
</component>