From e35a98ce2004302b75ec0ef8d78bd39b2e75fe8f Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 14 Sep 2009 13:10:22 +0000
Subject: Bring up the JMS args itest

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@814625 13f79535-47bb-0310-9956-ffa450edef68
---
 java/sca/itest/jms/args/pom.xml                    | 26 +++++-----------------
 .../apache/tuscany/sca/binding/jms/ClientImpl.java |  4 ++--
 .../apache/tuscany/sca/binding/jms/MyService.java  |  4 ++--
 .../main/resources/META-INF/sca-contribution.xml   | 23 +++++++++++++++++++
 .../main/resources/selectors/selectors.composite   |  5 ++---
 .../tuscany/sca/binding/jms/ArgsTestCase.java      | 13 ++++++-----
 6 files changed, 42 insertions(+), 33 deletions(-)
 create mode 100644 java/sca/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml

(limited to 'java/sca/itest/jms')

diff --git a/java/sca/itest/jms/args/pom.xml b/java/sca/itest/jms/args/pom.xml
index ed3bafe32f..4cfe475b92 100644
--- a/java/sca/itest/jms/args/pom.xml
+++ b/java/sca/itest/jms/args/pom.xml
@@ -23,50 +23,36 @@
         <groupId>org.apache.tuscany.sca</groupId>
         <artifactId>tuscany-itest</artifactId>
         <version>1.6-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>itest-jms-args</artifactId>
     <name>Apache Tuscany SCA iTest JMS Args</name>
 
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
     <dependencies>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>        
 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency> 
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -79,7 +65,7 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <version>2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/java/sca/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java b/java/sca/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
index 51ce5f4f24..68506b857b 100644
--- a/java/sca/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
+++ b/java/sca/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.binding.jms;
 
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
 
 /**
  * This class implements the OneWay service.
diff --git a/java/sca/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java b/java/sca/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
index 487e5f2cbb..5f19aa1fa5 100644
--- a/java/sca/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
+++ b/java/sca/itest/jms/args/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
@@ -18,8 +18,8 @@
  */
 package org.apache.tuscany.sca.binding.jms;
 
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
 
 @Remotable
 public interface MyService {
diff --git a/java/sca/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..07caa57490
--- /dev/null
+++ b/java/sca/itest/jms/args/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+              xmlns:itest="http://itest">
+   <deployable composite="itest:DefinitionsTests"/>
+</contribution>
\ No newline at end of file
diff --git a/java/sca/itest/jms/args/src/main/resources/selectors/selectors.composite b/java/sca/itest/jms/args/src/main/resources/selectors/selectors.composite
index 74c352934f..1a9075f6d4 100644
--- a/java/sca/itest/jms/args/src/main/resources/selectors/selectors.composite
+++ b/java/sca/itest/jms/args/src/main/resources/selectors/selectors.composite
@@ -17,9 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.    
  -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://jms"
-           xmlns:itest="http://jms"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+           targetNamespace="http://itest"
            name="DefinitionsTests">
 
     <component name="Client1">
diff --git a/java/sca/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java b/java/sca/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
index 228366d596..28e0b530c1 100644
--- a/java/sca/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
+++ b/java/sca/itest/jms/args/src/test/java/org/apache/tuscany/sca/binding/jms/ArgsTestCase.java
@@ -20,7 +20,8 @@ package org.apache.tuscany.sca.binding.jms;
 
 import static org.junit.Assert.assertEquals;
 
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -29,16 +30,16 @@ import org.junit.Test;
  */
 public class ArgsTestCase {
 
-    private static SCADomain scaDomain;
+    private Node node;
 
     @Before
     public void init() {
-        scaDomain = SCADomain.newInstance("http://localhost", "/", "selectors/selectors.composite");
+        node = NodeFactory.newInstance().createNode().start();
     }
 
     @Test
     public void testSayHello() throws Exception {
-        MyService client1 = scaDomain.getService(MyService.class, "Client1");
+        MyService client1 = node.getService(MyService.class, "Client1");
 
         client1.sayHello("petra", "beate");
 
@@ -54,8 +55,8 @@ public class ArgsTestCase {
 
     @After
     public void end() {
-        if (scaDomain != null) {
-            scaDomain.close();
+        if (node != null) {
+            node.stop();
         }
     }
 }
-- 
cgit v1.2.3