From 92ee976b4c008a30cc7942a77952ba4edc5a4861 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 2 Oct 2009 13:10:36 +0000
Subject: Bring up the JMS topics itest. (coincidentally, this had the same
 issue Luciano just emailed about bindings on promoted services and references
 being ignored)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@821007 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/resources/META-INF/sca-contribution.xml   | 24 ++++++++++++++++++++++
 .../main/resources/topics/TopicsClient.composite   | 14 ++++++-------
 .../main/resources/topics/TopicsService.composite  |  3 ++-
 3 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 java/sca/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml

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

diff --git a/java/sca/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml b/java/sca/itest/jms/topics/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..2690297524
--- /dev/null
+++ b/java/sca/itest/jms/topics/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:TopicsClientComposite"/>
+   <deployable composite="itest:OneWayServiceComposite"/>
+</contribution>
\ No newline at end of file
diff --git a/java/sca/itest/jms/topics/src/main/resources/topics/TopicsClient.composite b/java/sca/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
index b400bdb490..b951484044 100644
--- a/java/sca/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
+++ b/java/sca/itest/jms/topics/src/main/resources/topics/TopicsClient.composite
@@ -18,18 +18,16 @@
  * under the License.    
  -->
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+           targetNamespace="http://itest"
            name="TopicsClientComposite">
 
     <component name="OneWayClient">
         <implementation.java class="org.apache.tuscany.sca.binding.jms.OneWayClientImpl"/>
-        <reference name="serviceA" />
+        <reference name="serviceA">
+            <binding.jms>
+                <destination jndiName="MyTopic" type="topic" create="never"/>
+            </binding.jms>  
+        </reference>
     </component>
 
-    <reference name="serviceA" promote="OneWayClient/serviceA">
-        <interface.java interface="org.apache.tuscany.sca.binding.jms.OneWayService" />
-        <binding.jms>
-            <destination name="MyTopic" type="topic" create="never"/>
-        </binding.jms>  
-    </reference>
-
 </composite>
diff --git a/java/sca/itest/jms/topics/src/main/resources/topics/TopicsService.composite b/java/sca/itest/jms/topics/src/main/resources/topics/TopicsService.composite
index ff1122362c..80c653cc29 100644
--- a/java/sca/itest/jms/topics/src/main/resources/topics/TopicsService.composite
+++ b/java/sca/itest/jms/topics/src/main/resources/topics/TopicsService.composite
@@ -18,13 +18,14 @@
  * under the License.    
  -->
 <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>
-               <destination name="MyTopic" type="topic" create="never"/>
+               <destination jndiName="MyTopic" type="topic" create="never"/>
             </binding.jms>  
         </service> 
     </component>       
-- 
cgit v1.2.3