Author: antelder
Date: Tue Oct 6 12:29:55 2009
New Revision: 822244
URL: http://svn.apache.org/viewvc?rev=822244&view=rev
Log:
Updates to finish 2.x bring up of selectors test
Modified:
tuscany/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
tuscany/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
Modified:
tuscany/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite?rev=822244&r1=822243&r2=822244&view=diff
==============================================================================
---
tuscany/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
(original)
+++
tuscany/java/sca/itest/jms/selectors/src/main/resources/jmsdefault/helloworld.composite
Tue Oct 6 12:29:55 2009
@@ -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>
Modified:
tuscany/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite?rev=822244&r1=822243&r2=822244&view=diff
==============================================================================
---
tuscany/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
(original)
+++
tuscany/java/sca/itest/jms/selectors/src/main/resources/jmsuserprop/helloworld.composite
Tue Oct 6 12:29:55 2009
@@ -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>
Modified:
tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java?rev=822244&r1=822243&r2=822244&view=diff
==============================================================================
---
tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
(original)
+++
tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
Tue Oct 6 12:29:55 2009
@@ -42,7 +42,7 @@
@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"));