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

3 files changed, 8 insertions, 8 deletions

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/pom.xml
index 30ce5d7bb1..e71040dc04 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/pom.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/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-car</artifactId>

     <name>Apache Tuscany SCA Tours Car Contribution</name>

 

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java
index f75c772d48..672afbc609 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java
@@ -21,10 +21,10 @@ package com.tuscanyscatours.car.impl;
 import java.util.ArrayList;

 import java.util.List;

 

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

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

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

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

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

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

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

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

 

 import com.tuscanyscatours.common.Book;

 import com.tuscanyscatours.common.Search;

@@ -36,7 +36,7 @@ import com.tuscanyscatours.common.TripLeg;
  * An implementation of the Car service

  */

 @Scope("STATELESS")

-@Service(interfaces = {Search.class, Book.class})

+@Service({Search.class, Book.class})

 public class CarImpl implements Search, Book {

 

     private List<CarInfo> cars = new ArrayList<CarInfo>();

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml
index eb9ffba20d..67fcaf8c6c 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/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"/>

    <export.java package="com.tuscanyscatours.car.impl"/>

 </contribution>