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, 11 insertions, 11 deletions

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java
index 8e0f003c4b..339c3ed41e 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java
@@ -18,10 +18,10 @@
  */

 package scatours.calendar;

 

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

+import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.Contribution;

+import org.apache.tuscany.sca.node.Node;

+import org.apache.tuscany.sca.node.NodeFactory;

 import org.junit.After;

 import org.junit.Before;

 import org.junit.Test;

@@ -33,20 +33,20 @@ import com.tuscanyscatours.calendar.Calendar;
  */

 public class CalendarTestCase {

 

-    private SCANode node;

+    private Node node;

 

     @Before

     public void startNode() throws Exception {

         node =

-            SCANodeFactory.newInstance().createSCANode("calendar.composite",

-                                                       new SCAContribution("calendar", "./target/classes"),

-                                                       new SCAContribution("calendar-test", "./target/test-classes"));

+            NodeFactory.getInstance().createNode("calendar.composite",

+                                                       new Contribution("calendar", "./target/classes"),

+                                                       new Contribution("calendar-test", "./target/test-classes"));

         node.start();

     }

 

     @Test

     public void testCalendar() throws Exception {

-        Calendar calendar = ((SCAClient)node).getService(Calendar.class, "Calendar");

+        Calendar calendar = ((Node)node).getService(Calendar.class, "Calendar");

         System.out.println(calendar.getEndDate("07/10/96 04:05", 3));

     }

 

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml
index e57bf783fc..87e99010b8 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/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.calendar" />

     <import.java package="com.tuscanyscatours.calendar.impl" />

 </contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/calendar.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/calendar.composite
index 076eed15b2..3ddb33db80 100644
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/calendar.composite
+++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/calendar.composite
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations

  * under the License.    

 -->

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

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

            targetNamespace="http://tuscanyscatours.com/"

            name="calendar">