diff options
Diffstat (limited to 'branches/sca-java-1.x')
3 files changed, 28 insertions, 7 deletions
diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java index 7271deac24..87192fbad5 100644 --- a/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java +++ b/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java @@ -31,17 +31,22 @@ public class HelloWorldReferenceImpl implements HelloWorldService { @Reference protected HelloWorldService helloWorldService3; + + @Reference + protected HelloWorldService helloWorldService4; public String getGreetings(String name){ return helloWorldService1.getGreetings(name) + " " + helloWorldService2.getGreetings(name) + " " + - helloWorldService3.getGreetings(name); + helloWorldService3.getGreetings(name) + " " + + helloWorldService4.getGreetings(name); } public String getPersonGreetings(Person person){ return helloWorldService1.getPersonGreetings(person) + " " + helloWorldService2.getPersonGreetings(person) + " " + - helloWorldService3.getPersonGreetings(person); + helloWorldService3.getPersonGreetings(person) + " " + + helloWorldService4.getPersonGreetings(person); } } diff --git a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite b/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite index 2c0fd1b27a..2c54bf8bc5 100644 --- a/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite +++ b/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite @@ -39,9 +39,15 @@ <reference name="helloWorldService3" > <binding.jms> <destination name="HelloWorldService3"/> + <tuscany:wireFormat.jmsdefault/> + </binding.jms> + </reference> + <reference name="helloWorldService4" > + <binding.jms> + <destination name="HelloWorldService4"/> <tuscany:wireFormat.jmsdefault sendFormat="text"/> </binding.jms> - </reference> + </reference> </component> <component name="HelloWorldServiceComponent1"> @@ -59,7 +65,6 @@ <interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldService" /> <binding.jms> <destination name="HelloWorldService2"/> - <tuscany:wireFormat.jmsdefault/> </binding.jms> </service> </component> @@ -70,9 +75,20 @@ <!--interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" /--> <binding.jms> <destination name="HelloWorldService3"/> - <tuscany:wireFormat.jmsdefault sendFormat="text"/> + <tuscany:wireFormat.jmsdefault /> </binding.jms> </service> </component> + <component name="HelloWorldServiceComponent4"> + <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl" /> + <service name="HelloWorldService"> + <!--interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" /--> + <binding.jms> + <destination name="HelloWorldService4"/> + <tuscany:wireFormat.jmsdefault /> + </binding.jms> + </service> + </component> + </composite>
\ No newline at end of file diff --git a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java b/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java index 7000ff9212..a83bfb758a 100644 --- a/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java +++ b/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java @@ -51,12 +51,12 @@ public class FormatJMSDefaultTestCase { public void testHelloWorldCreate() throws Exception { HelloWorldService helloWorldService = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldReferenceComponent"); - assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs")); + assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs")); Person person = new Person(); person.setFirstName("Fred"); person.setLastName("Bloggs"); - assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getPersonGreetings(person)); + assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getPersonGreetings(person)); } @After |