Update the travelsample with 2.x namespace/api/dependency (not completed yet)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@923913 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 16 insertions, 16 deletions

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml
index f02f8dffe1..c1591336c8 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml
@@ -22,9 +22,9 @@
     <parent>

         <groupId>org.apache.tuscany.sca</groupId>

         <artifactId>scatours</artifactId>

-        <version>1.0-SNAPSHOT</version>

+        <version>2.0-SNAPSHOT</version>

         <relativePath>../../pom.xml</relativePath>

-    </parent><version>1.0-SNAPSHOT</version>

+    </parent><version>2.0-SNAPSHOT</version>

     <artifactId>scatours-contribution-travelcatalog</artifactId>

     <name>Apache Tuscany SCA Tours Travel Catalog Contribution</name>

 

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java
index e558439f82..53997a23c2 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java
@@ -18,7 +18,7 @@
  */

 package com.tuscanyscatours.travelcatalog;

 

-import org.osoa.sca.annotations.Remotable;

+import org.oasisopen.sca.annotation.Remotable;

 

 import com.tuscanyscatours.common.TripItem;

 import com.tuscanyscatours.common.TripLeg;

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java
index 90351720bb..c77b7a03c4 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java
@@ -23,14 +23,14 @@ import java.util.List;
 import java.util.UUID;

 import java.util.concurrent.CountDownLatch;

 

-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;

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

+import org.oasisopen.sca.ComponentContext;

+import org.oasisopen.sca.RequestContext;

+import org.oasisopen.sca.ServiceReference;

+import org.oasisopen.sca.annotation.Context;

+import org.oasisopen.sca.annotation.Property;

+import org.oasisopen.sca.annotation.Reference;

+import org.oasisopen.sca.annotation.Scope;

+import org.oasisopen.sca.annotation.Service;

 

 import com.tuscanyscatours.common.Search;

 import com.tuscanyscatours.common.SearchCallback;

@@ -43,7 +43,7 @@ import com.tuscanyscatours.travelcatalog.TravelCatalogSearch;
  * An implementation of the travel catalog service

  */

 @Scope("COMPOSITE")

-@Service(interfaces = {TravelCatalogSearch.class})

+@Service({TravelCatalogSearch.class})

 public class TravelCatalogImpl implements TravelCatalogSearch, SearchCallback {

 

     @Reference

@@ -80,7 +80,7 @@ public class TravelCatalogImpl implements TravelCatalogSearch, SearchCallback {
 

         ServiceReference<Search> dynamicHotelSearch = componentContext.getServiceReference(Search.class, "hotelSearch");

 

-        dynamicHotelSearch.setCallbackID("HotelSearchCallbackID-" + tripLeg.getId());

+        // dynamicHotelSearch.setCallbackID("HotelSearchCallbackID-" + tripLeg.getId());

         dynamicHotelSearch.getService().searchAsynch(tripLeg);

 

         flightSearch.searchAsynch(tripLeg);

@@ -109,8 +109,8 @@ public class TravelCatalogImpl implements TravelCatalogSearch, SearchCallback {
 

     public synchronized void searchResults(TripItem[] items) {

         RequestContext requestContext = componentContext.getRequestContext();

-        Object callbackID = requestContext.getServiceReference().getCallbackID();

-        System.out.println("Asynch response - " + callbackID);

+        // Object callbackID = requestContext.getServiceReference().getCallbackID();

+        // System.out.println("Asynch response - " + callbackID);

 

         if (items != null) {

             for (int i = 0; i < items.length; i++) {

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml
index b18ae45a09..7b104eab59 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml
@@ -17,7 +17,7 @@
     * specific language governing permissions and limitations

     * under the License.    

 -->

-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">

+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">

     <import.java package="com.tuscanyscatours.common" />

     <import.java package="com.tuscanyscatours.currencyconverter" />

     <export.java package="com.tuscanyscatours.travelcatalog" />