TUSCANY-2930 main part of separating wireFormat.jmsdefault out from wireFormat.jmsTextXML. I've spotted a few more things that need fixing but this basic functionality passes all of our current JMS tests and now better matched what the specification says about default format.

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

4 files changed, 44 insertions, 9 deletions

diff --git a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java b/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
index cfe7a649d9..cdf9bef93f 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
+++ b/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
@@ -23,9 +23,9 @@ import javax.jms.Message;
 import javax.jms.Session;
 
 import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
-import org.apache.tuscany.sca.binding.jms.provider.XMLTextMessageProcessor;
+import org.apache.tuscany.sca.binding.jms.provider.TextMessageProcessor;
 
-public class TestMessageProcessor extends XMLTextMessageProcessor {
+public class TestMessageProcessor extends TextMessageProcessor {
 
     public static boolean insertPayloadIntoJMSMessageCalled;
     public static boolean extractPayloadFromJMSMessageCalled;
diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpclient.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpclient.composite
index 69c0ef305e..5389c427dc 100644
--- a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpclient.composite
+++ b/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpclient.composite
@@ -20,17 +20,17 @@
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

            name="MPClientComposite">

 

-    <component name="HelloWorldClient">

+    <component name="HelloWorldClientMP">

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

         <reference name="serviceA" />

     </component>

 

-    <reference name="serviceA" promote="HelloWorldClient/serviceA">

+    <reference name="serviceMP" promote="HelloWorldClientMP/serviceA">

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

         <binding.jms messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">

-            <destination name="DestQueueA"/>

+            <destination name="DestQueueMP"/>

             <response>

-               <destination name="RespQueueA"/>

+               <destination name="RespQueueMP"/>

             </response>

         </binding.jms>  

     </reference>

diff --git a/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpservice.composite b/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpservice.composite
new file mode 100644
index 0000000000..6d0d11f4b6
--- /dev/null
+++ b/branches/sca-java-1.x/itest/jms/src/main/resources/simple/mpservice.composite
@@ -0,0 +1,36 @@
+<?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.    
+ -->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           name="MPServiceComposite">
+
+    <component name="HelloWorldServiceMP">
+        <implementation.java class="org.apache.tuscany.sca.binding.jms.HelloWorldServiceImpl"/>
+        <service name="HelloWorldService">
+            <binding.jms messageProcessor="org.apache.tuscany.sca.binding.jms.TestMessageProcessor">
+               <destination name="DestQueueMP" create="always"> 
+               </destination>
+               <response>
+                  <destination name="RespQueueMP" create="always"/>
+               </response>
+            </binding.jms>  
+        </service> 
+    </component>       
+
+</composite>
diff --git a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java b/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
index 9ec77ca440..44f9754e29 100644
--- a/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
+++ b/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
@@ -36,13 +36,12 @@ public class MessageProcessorTestCase {
     @Before
     public void init() {
         scaDomain =
-            SCADomain.newInstance("http://localhost", "/", "simple/mpclient.composite", "simple/service.composite");
-        // scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
+            SCADomain.newInstance("http://localhost", "/", "simple/mpclient.composite", "simple/mpservice.composite");
     }
 
     @Test
     public void testHelloWorldCreate() throws Exception {
-        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
+        HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClientMP");
         assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
         assertTrue(TestMessageProcessor.extractPayloadFromJMSMessageCalled);
         assertTrue(TestMessageProcessor.insertPayloadIntoJMSMessageCalled);