Start bringing up the oneway-nocf itest

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

7 files changed, 51 insertions, 38 deletions

diff --git a/java/sca/itest/jms/oneway-nocf/pom.xml b/java/sca/itest/jms/oneway-nocf/pom.xml
index add122c3ca..c3c1472242 100644
--- a/java/sca/itest/jms/oneway-nocf/pom.xml
+++ b/java/sca/itest/jms/oneway-nocf/pom.xml
@@ -22,57 +22,43 @@
     <parent>

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

         <artifactId>tuscany-itest</artifactId>

-        <version>1.6-SNAPSHOT</version>

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

+        <version>2.0-SNAPSHOT</version>

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

     </parent>

     <artifactId>itest-jms-oneway-nocf</artifactId>

     <name>Apache Tuscany SCA iTest JMS for a oneway service</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>

+            <artifactId>tuscany-node-impl</artifactId>

+            <version>2.0-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-policy</artifactId>

-            <version>1.6-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>

diff --git a/java/sca/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java b/java/sca/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
index 4d00d2df0d..b572b1012a 100644
--- a/java/sca/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
+++ b/java/sca/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.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/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java b/java/sca/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
index 377f227ceb..9cec2d9b3e 100644
--- a/java/sca/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
+++ b/java/sca/itest/jms/oneway-nocf/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.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 OneWayService {

diff --git a/java/sca/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..360b365d1b
--- /dev/null
+++ b/java/sca/itest/jms/oneway-nocf/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,24 @@
+<?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:OneWayServiceComposite"/>

+   <deployable composite="itest:OneWayClientComposite"/>

+</contribution>
\ No newline at end of file
diff --git a/java/sca/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite b/java/sca/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
index ec7b19ff98..ee788ee251 100644
--- a/java/sca/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
+++ b/java/sca/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayClient.composite
@@ -17,7 +17,8 @@
  * 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/200903"

+           targetNamespace="http://itest"

            name="OneWayClientComposite">

 

     <component name="OneWayClient">

@@ -28,8 +29,8 @@
     <reference name="serviceA" promote="OneWayClient/serviceA">

         <interface.java interface="org.apache.tuscany.sca.binding.jms.OneWayService" />

         <binding.jms>

-            <connectionFactory name="SomeConnectionFactory"/>

-            <destination name="SomeQueue"/>

+            <destination jndiName="SomeQueue"/>

+            <connectionFactory jndiName="SomeConnectionFactory"/>

         </binding.jms>  

     </reference>

 

diff --git a/java/sca/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite b/java/sca/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
index dff7d0c77f..5412a1d6e0 100644
--- a/java/sca/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
+++ b/java/sca/itest/jms/oneway-nocf/src/main/resources/oneway/OneWayService.composite
@@ -17,15 +17,16 @@
  * 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/200903"

+           targetNamespace="http://itest"

            name="OneWayServiceComposite">

 

     <component name="OneWayService">

         <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayServiceImpl"/>

         <service name="OneWayService">

             <binding.jms>

-               <connectionFactory name="SomeConnectionFactory"/>

-               <destination name="SomeQueue"/>

+               <destination jndiName="SomeQueue"/>

+               <connectionFactory jndiName="SomeConnectionFactory"/>

             </binding.jms>  

         </service> 

     </component>       

diff --git a/java/sca/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java b/java/sca/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
index adc7813bee..5d1f764382 100644
--- a/java/sca/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
+++ b/java/sca/itest/jms/oneway-nocf/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.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;

@@ -30,16 +31,16 @@ import org.junit.Test;
  */

 public class OneWayTestCase {

 

-    private static SCADomain scaDomain;

+    private Node node;

 

     @Before

     public void init() {

-        scaDomain = SCADomain.newInstance("http://localhost", "/", "oneway/OneWayClient.composite", "oneway/OneWayService.composite");

+        node = NodeFactory.newInstance().createNode().start();

     }

 

     @Test

     public void testOneWayInvoked() throws Exception {

-        OneWayService oneWayService = scaDomain.getService(OneWayService.class, "OneWayClient");

+        OneWayService oneWayService = node.getService(OneWayService.class, "OneWayClient");

         oneWayService.sayHello("Petra");

         synchronized (OneWayServiceImpl.mutex) {

             // wait up to 10 seconds but it will likely be a lot less 

@@ -51,8 +52,8 @@ public class OneWayTestCase {
 

     @After

     public void end() {

-        if (scaDomain != null) {

-            scaDomain.close();

+        if (node != null) {

+            node.stop();

         }

     }

 }