Author: rfeng
Date: Wed Jul 30 10:13:07 2008
New Revision: 681126
URL: http://svn.apache.org/viewvc?rev=681126&view=rev
Log:
Fix for TUSCANY-2505
Modified:
tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
tuscany/java/sca/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
tuscany/java/sca/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
Modified:
tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java?rev=681126&r1=681125&r2=681126&view=diff
==============================================================================
---
tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
(original)
+++
tuscany/java/sca/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessor.java
Wed Jul 30 10:13:07 2008
@@ -203,6 +203,11 @@
QName qname = new QName(inputNS, inputName);
DataType dt = new
DataTypeImpl<XMLType>(wrapperClass, new XMLType(qname, qname));
dataBindingExtensionPoint.introspectType(dt,
operation);
+ // TUSCANY-2505
+ if (dt.getLogical() instanceof XMLType) {
+ XMLType xmlType = (XMLType)dt.getLogical();
+ xmlType.setElementName(qname);
+ }
return dt;
} catch (ClassNotFoundException e) {
GeneratedClassLoader cl = new
GeneratedClassLoader(clazz.getClassLoader());
@@ -235,9 +240,14 @@
try {
Class<?> wrapperClass =
Class.forName(outputWrapperClassName, false,
clazz.getClassLoader());
- QName qname = new QName(inputNS, inputName);
+ QName qname = new QName(outputNS, outputName);
DataType dt = new
DataTypeImpl<XMLType>(wrapperClass, new XMLType(qname, qname));
dataBindingExtensionPoint.introspectType(dt,
operation);
+ // TUSCANY-2505
+ if (dt.getLogical() instanceof XMLType) {
+ XMLType xmlType = (XMLType)dt.getLogical();
+ xmlType.setElementName(qname);
+ }
return dt;
} catch (ClassNotFoundException e) {
GeneratedClassLoader cl = new
GeneratedClassLoader(clazz.getClassLoader());
Modified:
tuscany/java/sca/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java?rev=681126&r1=681125&r2=681126&view=diff
==============================================================================
---
tuscany/java/sca/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
(original)
+++
tuscany/java/sca/modules/interface-java-jaxws/src/test/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSJavaInterfaceProcessorTestCase.java
Wed Jul 30 10:13:07 2008
@@ -22,13 +22,21 @@
import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import javax.xml.namespace.QName;
+import junit.framework.Assert;
import junit.framework.TestCase;
+import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
+import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint;
+import org.apache.tuscany.sca.databinding.jaxb.DefaultXMLAdapterExtensionPoint;
+import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
+import com.example.stock.StockExceptionTest;
+
/**
*
* @version $Rev$ $Date$
@@ -42,7 +50,20 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- interfaceProcessor = new JAXWSJavaInterfaceProcessor();
+ DataBindingExtensionPoint db = new DefaultDataBindingExtensionPoint();
+ XMLAdapterExtensionPoint xa = new DefaultXMLAdapterExtensionPoint();
+ interfaceProcessor = new JAXWSJavaInterfaceProcessor(db, new
JAXWSFaultExceptionMapper(db, xa), xa);
+ }
+
+ public void testWrapper() throws Exception {
+ DefaultJavaInterfaceFactory iFactory = new
DefaultJavaInterfaceFactory();
+ JavaInterface contract =
iFactory.createJavaInterface(StockExceptionTest.class);
+
+ interfaceProcessor.visitInterface(contract);
+ Operation op = contract.getOperations().get(0);
+ Assert.assertTrue(!op.isWrapperStyle());
+ Assert.assertEquals(new QName("http://www.example.com/stock";,
"stockQuoteOffer"), op.getWrapper().getInputWrapperElement().getQName());
+ Assert.assertEquals(new QName("http://www.example.com/stock";,
"stockQuoteOfferResponse"),
op.getWrapper().getOutputWrapperElement().getQName());
}
/**
Modified:
tuscany/java/sca/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl?rev=681126&r1=681125&r2=681126&view=diff
==============================================================================
---
tuscany/java/sca/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
(original)
+++
tuscany/java/sca/modules/interface-java-jaxws/src/test/resources/wsdl/StockExceptionTest.wsdl
Wed Jul 30 10:13:07 2008
@@ -40,14 +40,14 @@
</sequence>
</complexType>
</element>
- <element name="stockQuoteOfferResponse">
- <complexType>
- <sequence>
- <element name="stockQuoteOfferReturn" minOccurs="0"
type="tns:StockOffer"/>
- </sequence>
- </complexType>
+ <!-- TUSCANY 2505, make the responseWrapper non-anonymous -->
+ <element name="stockQuoteOfferResponse"
type="tns:StockQuoteOfferResponseType">
</element>
-
+ <complexType name="StockQuoteOfferResponseType">
+ <sequence>
+ <element name="stockQuoteOfferReturn" minOccurs="0"
type="tns:StockOffer" />
+ </sequence>
+ </complexType>
<!-- Faults -->
<element name="InvalidSymbolFault">
<complexType>
