TUSCANY-2931 - allow separate request and response wire formats in binding.jms. The tuscany binding.jms XSD has been extended to allow a response wireFormat element to be specified. The knock on effect of all this is that the Operation interface has been changed to allow input and output wrapper info to be held separately. Also Interface has some new operations. There are changes across the code base to take account of this interface change.

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

1 files changed, 11 insertions, 7 deletions

diff --git a/branches/sca-java-1.x/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java b/branches/sca-java-1.x/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
index ac086745c0..79a304bc2b 100644
--- a/branches/sca-java-1.x/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
+++ b/branches/sca-java-1.x/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
@@ -129,7 +129,8 @@ public class JAXWSJavaInterfaceProcessor implements JavaInterfaceVisitor {
                 if(bare) {
                     // For BARE parameter style, the data won't be unwrapped
                     // The wrapper should be null
-                    operation.setWrapperStyle(false);
+                    operation.setInputWrapperStyle(false);
+                    operation.setOutputWrapperStyle(false);
                 }
                 documentStyle = methodSOAPBinding.style() == Style.DOCUMENT;
             }
@@ -300,14 +301,17 @@ public class JAXWSJavaInterfaceProcessor implements JavaInterfaceVisitor {
                 }
 
                 String db = inputWrapperDT != null ? inputWrapperDT.getDataBinding() : JAXB_DATABINDING;
-                WrapperInfo wrapperInfo =
-                    new WrapperInfo(db, new ElementInfo(inputWrapper, null), new ElementInfo(outputWrapper, null),
-                                    inputElements, outputElements);
+                
+                WrapperInfo inputWrapperInfo =
+                    new WrapperInfo(db, new ElementInfo(inputWrapper, null), inputElements);
+                WrapperInfo outputWrapperInfo =
+                    new WrapperInfo(db, new ElementInfo(outputWrapper, null), outputElements);  
 
-                wrapperInfo.setInputWrapperType(inputWrapperDT);
-                wrapperInfo.setOutputWrapperType(outputWrapperDT);
+                inputWrapperInfo.setWrapperType(inputWrapperDT);
+                outputWrapperInfo.setWrapperType(outputWrapperDT);
 
-                operation.setWrapper(wrapperInfo);
+                operation.setInputWrapper(inputWrapperInfo);
+                operation.setOutputWrapper(outputWrapperInfo);
             }
         }
     }