From 3cba7e922ba7c669e5db55e8c8bd4bfa01a3eed8 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 6 Oct 2009 12:29:55 +0000
Subject: Updates to finish 2.x bring up of selectors test

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@822244 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/resources/jmsdefault/helloworld.composite        |  3 +++
 .../src/main/resources/jmsuserprop/helloworld.composite       | 11 +++++++----
 .../sca/binding/jms/OperationselectorJMSUserPropTestCase.java |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

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

diff --git a/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite b/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
index e5b3f070b4..ab8e29ccdd 100644
--- a/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
+++ b/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
@@ -48,6 +48,9 @@
             <binding.jms>
                 <destination jndiName="HelloWorldService1"/>
                 <operationProperties name="getGreetingsThree" nativeOperation="getGreetingsFour">
+                  <headers>
+                     <property name="blaNotUsed">getGreetingsThree</property>
+                  </headers>
                 </operationProperties>
             </binding.jms>
         </service>
diff --git a/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite b/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
index e04816d711..af36b8af9b 100644
--- a/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
+++ b/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
@@ -23,11 +23,11 @@
     xmlns:hw="http://helloworld"
     name="helloworldUP">
 
-    <component name="HelloWorldReferenceComponent">
+    <component name="HelloWorldReferenceComponent1">
         <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop.HelloWorldReferenceImpl" />
         <reference name="helloWorldService1" >
             <binding.jms>
-                <destination jndiName="HelloWorldService2"/>
+                <destination jndiName="HelloWorldService4"/>
                 <operationProperties name="getGreetingsOne" >
                   <headers>
                      <property name="myProperty">getGreetingsOne</property>
@@ -47,12 +47,15 @@
         </reference> 
     </component>
     
-    <component name="HelloWorldServiceComponent1">
+    <component name="HelloWorldServiceComponent3">
         <implementation.java class="org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop.HelloWorldServiceImpl" />
         <service name="HelloWorldService">
             <binding.jms>
-                <destination jndiName="HelloWorldService2"/>
+                <destination jndiName="HelloWorldService4"/>
                 <operationProperties name="getGreetingsThree" nativeOperation="getGreetingsFour">
+                  <headers>
+                     <property name="blaNotUsed2">getGreetingsThree</property>
+                  </headers>
                 </operationProperties>
                 <tuscany:operationSelector.jmsUserProp propertyName="myProperty"/>
             </binding.jms>
diff --git a/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java b/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
index 3fa3a30884..33e047ae18 100644
--- a/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
+++ b/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
@@ -42,7 +42,7 @@ public class OperationselectorJMSUserPropTestCase {
 
     @Test
     public void testHelloWorldCreate() throws Exception {
-        HelloWorldReference helloWorldReference = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+        HelloWorldReference helloWorldReference = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent1");
         
         assertEquals("Hello One Fred Bloggs Hello Four Fred Bloggs Hello Two Fred Bloggs", helloWorldReference.getGreetings("Fred Bloggs"));
         
-- 
cgit v1.2.3