From 699653d2ae2df1cec6af2915c90a6a7137a1c077 Mon Sep 17 00:00:00 2001 From: slaws Date: Tue, 13 Dec 2011 14:12:38 +0000 Subject: TUSCANY-3890 - separate the request wrapper model from the response wrapper model as per the change in 1.x under TUSCANY-2931. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1213702 13f79535-47bb-0310-9956-ffa450edef68 --- .../jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java | 2 +- .../jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java | 6 +++--- .../jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java | 6 +++--- .../jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java | 2 +- .../jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache') diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java index b2b424378f..797b0e45de 100644 --- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java +++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsbytesxml/runtime/WireFormatJMSBytesXMLServiceProvider.java @@ -64,7 +64,7 @@ public class WireFormatJMSBytesXMLServiceProvider implements WireFormatProvider } // create a local interface contract that is configured specifically to - // deal with the data format that this wire format is expecting to sent to + // deal with the data format that this wire format is expecting to send to // and receive from the databinding interceptor. The request/response parts of // this interface contract will be copied into the binding interface contract // as required diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java index 67ee7309e2..b04072c992 100644 --- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java +++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultReferenceProvider.java @@ -121,7 +121,7 @@ public class WireFormatJMSDefaultReferenceProvider implements WireFormatProvider // like the separate code paths imply. Not sure how many @OneWay tests we have, this might // not be an issue. - if (matchingWsdlOp.isWrapperStyle()) { + if (matchingWsdlOp.isInputWrapperStyle()) { if (op.getInputType().getLogical().size() == 1) { this.inputWrapperMap.put(name, true); } else { @@ -131,10 +131,10 @@ public class WireFormatJMSDefaultReferenceProvider implements WireFormatProvider this.inputWrapperMap.put(name, false); } - if (matchingWsdlOp.isWrapperStyle()) { + if (matchingWsdlOp.isOutputWrapperStyle()) { // we only need to know what the wrapper is on the deserialization // might need to change this when there input/output wrapper style is different - ElementInfo ei = op.getWrapper().getOutputWrapperElement(); + ElementInfo ei = op.getOutputWrapper().getWrapperElement(); this.outputWrapperMap.put(name, xmlHelper.createWrapper(ei.getQName())); } } diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java index e24be41ebf..408aba9bbb 100644 --- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java +++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmsdefault/runtime/WireFormatJMSDefaultServiceProvider.java @@ -115,16 +115,16 @@ public class WireFormatJMSDefaultServiceProvider implements WireFormatProvider { // TODO - not sure we really support viewing the input/output as separately wrapped // like the separate code paths imply. Not sure how many @OneWay tests we have, this might // not be an issue. - if (matchingWsdlOp.isWrapperStyle()) { + if (matchingWsdlOp.isInputWrapperStyle()) { if (op.getInputType().getLogical().size() == 1) { // we only need to know what the wrapper is on the deserialization // might need to change this when the input/output wrapper style is different - ElementInfo ei = op.getWrapper().getInputWrapperElement(); + ElementInfo ei = op.getInputWrapper().getWrapperElement(); this.inputWrapperMap.put(name, xmlHelper.createWrapper(ei.getQName())); } } - if (matchingWsdlOp.isWrapperStyle()) { + if (matchingWsdlOp.isOutputWrapperStyle()) { this.outputWrapperMap.put(name, true); } else { this.outputWrapperMap.put(name, false); diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java index a2830d1fc3..48b377607e 100644 --- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java +++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLReferenceProvider.java @@ -64,7 +64,7 @@ public class WireFormatJMSTextXMLReferenceProvider implements WireFormatProvider } // create a local interface contract that is configured specifically to - // deal with the data format that this wire format is expecting to sent to + // deal with the data format that this wire format is expecting to send to // and receive from the databinding interceptor. The request/response parts of // this interface contract will be copied into the binding interface contract // as required diff --git a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java index fef9e78937..89fe2c7c39 100644 --- a/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java +++ b/sca-java-2.x/trunk/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/wireformat/jmstextxml/runtime/WireFormatJMSTextXMLServiceProvider.java @@ -67,7 +67,7 @@ public class WireFormatJMSTextXMLServiceProvider implements WireFormatProvider { } // create a local interface contract that is configured specifically to - // deal with the data format that this wire format is expecting to sent to + // deal with the data format that this wire format is expecting to send to // and receive from the databinding interceptor. The request/response parts of // this interface contract will be copied into the binding interface contract // as required -- cgit v1.2.3