Author: thomas.diesler(a)jboss.com Date: 2007-05-26 10:22:48 -0400 (Sat, 26 May 2007) New Revision: 3270 Modified: trunk/integration/native/.classpath trunk/integration/sunri/ant-import/build-thirdparty.xml trunk/integration/sunri/src/test/resources/excludes-jboss50.txt trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java trunk/testsuite/.classpath trunk/testsuite/ant-import/build-jars-jaxws.xml trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DHRequest.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java Log: Remove dependency on propriatary API Modified: trunk/integration/native/.classpath =================================================================== --- trunk/integration/native/.classpath 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/integration/native/.classpath 2007-05-26 14:22:48 UTC (rev 3270) @@ -5,5 +5,9 @@ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/> + <classpathentry kind="lib" path="/jbossws-core/thirdparty/wsdl4j.jar"/> + <classpathentry kind="lib" path="/integration-spi/thirdparty/activation.jar"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-26 14:22:48 UTC (rev 3270) @@ -78,8 +78,6 @@ <pathelement location="${spi.dir}/thirdparty/jboss-javaee.jar"/> <pathelement location="${thirdparty.dir}/http.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/> <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt =================================================================== --- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-05-26 14:22:48 UTC (rev 3270) @@ -2,26 +2,26 @@ # $Id$ # -org/jboss/test/ws/jaxws/samples/asynchronous/** -org/jboss/test/ws/jaxws/samples/context/** -# org/jboss/test/ws/jaxws/samples/eardeployment/** -org/jboss/test/ws/jaxws/samples/exception/** -org/jboss/test/ws/jaxws/samples/handlerchain/** -org/jboss/test/ws/jaxws/samples/httpbinding/** -org/jboss/test/ws/jaxws/samples/jaxr/** -org/jboss/test/ws/jaxws/samples/jsr181ejb/** -org/jboss/test/ws/jaxws/samples/jsr181pojo/** -org/jboss/test/ws/jaxws/samples/logicalhandler/** -org/jboss/test/ws/jaxws/samples/oneway/** -org/jboss/test/ws/jaxws/samples/provider/** -org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/samples/soapbinding/** -org/jboss/test/ws/jaxws/samples/webmethod/** -org/jboss/test/ws/jaxws/samples/webparam/** -org/jboss/test/ws/jaxws/samples/webresult/** -org/jboss/test/ws/jaxws/samples/webservice/** -org/jboss/test/ws/jaxws/samples/webserviceref/** -org/jboss/test/ws/jaxws/samples/wsaddressing/** -org/jboss/test/ws/jaxws/samples/wseventing/** -org/jboss/test/ws/jaxws/samples/wssecurity/** -org/jboss/test/ws/jaxws/samples/xop/** +#org/jboss/test/ws/jaxws/samples/asynchronous/** +#org/jboss/test/ws/jaxws/samples/context/** +#org/jboss/test/ws/jaxws/samples/eardeployment/** +#org/jboss/test/ws/jaxws/samples/exception/** +#org/jboss/test/ws/jaxws/samples/handlerchain/** +#org/jboss/test/ws/jaxws/samples/httpbinding/** +#org/jboss/test/ws/jaxws/samples/jaxr/** +#org/jboss/test/ws/jaxws/samples/jsr181ejb/** +#org/jboss/test/ws/jaxws/samples/jsr181pojo/** +#org/jboss/test/ws/jaxws/samples/logicalhandler/** +#org/jboss/test/ws/jaxws/samples/oneway/** +#org/jboss/test/ws/jaxws/samples/provider/** +#org/jboss/test/ws/jaxws/samples/retail/** +#org/jboss/test/ws/jaxws/samples/soapbinding/** +#org/jboss/test/ws/jaxws/samples/webmethod/** +#org/jboss/test/ws/jaxws/samples/webparam/** +#org/jboss/test/ws/jaxws/samples/webresult/** +#org/jboss/test/ws/jaxws/samples/webservice/** +#org/jboss/test/ws/jaxws/samples/webserviceref/** +#org/jboss/test/ws/jaxws/samples/wsaddressing/** +#org/jboss/test/ws/jaxws/samples/wseventing/** +#org/jboss/test/ws/jaxws/samples/wssecurity/** +#org/jboss/test/ws/jaxws/samples/xop/** Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -79,13 +79,13 @@ // The associated parameter private ParameterMetaData paramMetaData; - - // content soapContent + // SOAP content private SOAPContent soapContent; + // While transitioning DOM expansion + private boolean lockDOMExpansion; + // While transitioning MTOM expansion + private boolean lockMTOMTransition; - // while transitioning DOM expansion needs to be locked - private boolean lockDOMExpansion = false; - /** Construct a SOAPContentElement */ public SOAPContentElement(Name name) @@ -498,7 +498,10 @@ private void expandToDOM() { if (!lockDOMExpansion) + { + handleMTOMTransitions(); transitionTo(State.DOM_VALID); + } } public void setValue(String value) @@ -522,10 +525,7 @@ public void writeElement(Writer writer) throws IOException { - // JMS transport hot fix - // Can be removed once we got a immutabe object model - if (MessageContextAssociation.peekMessageContext() != null) - handleMTOMTransitions(); + handleMTOMTransitions(); if (soapContent instanceof DOMContent) { @@ -553,36 +553,48 @@ */ public void handleMTOMTransitions() { + // JMS transport hot fix. Can be removed once we got a immutabe object model + if (MessageContextAssociation.peekMessageContext() == null) + return; + // MTOM processing is only required on XOP parameters - if (!isXOPParameter()) + if (lockMTOMTransition || !isXOPParameter()) return; - boolean domContentState = (soapContent instanceof DOMContent); - - if (!XOPContext.isMTOMEnabled()) + try { - // If MTOM is disabled, we force dom expansion on XOP parameters. - // This will inline any XOP include element and remove the attachment part. - // See SOAPFactoryImpl for details. + lockMTOMTransition = true; + boolean domContentState = (soapContent instanceof DOMContent); - log.debug("MTOM disabled: Force inline XOP data"); + if (!XOPContext.isMTOMEnabled()) + { + // If MTOM is disabled, we force dom expansion on XOP parameters. + // This will inline any XOP include element and remove the attachment part. + // See SOAPFactoryImpl for details. - // TODO: This property must be reset, otherwise you negate its purpose - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - msgContext.put(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); - if (msgContext instanceof MessageContextJAXWS) - ((MessageContextJAXWS)msgContext).setScope(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Scope.APPLICATION); + log.debug("MTOM disabled: Force inline XOP data"); - expandToDOM(); + // TODO: This property must be reset, otherwise you negate its purpose + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + msgContext.put(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Boolean.TRUE); + if (msgContext instanceof MessageContextJAXWS) + ((MessageContextJAXWS)msgContext).setScope(CommonMessageContext.ALLOW_EXPAND_TO_DOM, Scope.APPLICATION); + + expandToDOM(); + } + else if (domContentState && XOPContext.isMTOMEnabled()) + { + // When the DOM representation is valid, + // but MTOM is enabled we need to convert the inlined + // element back to an xop:Include element and create the attachment part + + log.debug("MTOM enabled: Restore XOP data"); + XOPContext.restoreXOPDataDOM(this); + } } - else if (domContentState && XOPContext.isMTOMEnabled()) + finally { - // When the DOM representation is valid, - // but MTOM is enabled we need to convert the inlined - // element back to an xop:Include element and create the attachment part - - log.debug("MTOM enabled: Restore XOP data"); - XOPContext.restoreXOPDataDOM(this); + lockMTOMTransition = false; } } Modified: trunk/testsuite/.classpath =================================================================== --- trunk/testsuite/.classpath 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/.classpath 2007-05-26 14:22:48 UTC (rev 3270) @@ -13,6 +13,5 @@ <classpathentry kind="lib" path="/integration-spi/thirdparty/activation.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-api.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-impl.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/testsuite/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-26 14:22:48 UTC (rev 3270) @@ -283,6 +283,7 @@ <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws-handlers-server.xml"/> <exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/> </classes> </war> Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/HttpJAXBTestCase.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -38,8 +38,8 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.utils.DOMUtils; +import org.w3c.dom.Element; /** * Test HTTP Binding @@ -57,9 +57,8 @@ public void testWSDLAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-httpbinding-jaxb/ProviderEndpoint?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); + Element wsdl = DOMUtils.parse(wsdlURL.openStream()); + assertNotNull(wsdl); } public void testProviderDispatch() throws Exception Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -36,8 +36,6 @@ import org.jboss.logging.Logger; -import com.sun.xml.bind.api.JAXBRIContext; - /** * Test a Provider<Source> with JAXB * @@ -57,7 +55,7 @@ { try { - JAXBContext jc = JAXBRIContext.newInstance(new Class[] { UserType.class }); + JAXBContext jc = JAXBContext.newInstance(new Class[] { UserType.class }); UserType user = (UserType)jc.createUnmarshaller().unmarshal(request); log.info("[string=" + user.getString() + ",qname=" + user.getQname() + "]"); Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -34,8 +34,6 @@ import org.jboss.logging.Logger; -import com.sun.xml.bind.api.JAXBRIContext; - /** * Test a Provider<Source> with JAXB * @@ -58,7 +56,7 @@ { try { - JAXBContext jc = JAXBRIContext.newInstance(new Class[] {UserType.class}); + JAXBContext jc = JAXBContext.newInstance(new Class[] {UserType.class}); UserType user = (UserType)jc.createUnmarshaller().unmarshal(request); log.info("[string=" + user.getString() + ",qname=" + user.getQname() + "]"); Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -45,8 +45,7 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; +import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; /** @@ -66,9 +65,8 @@ public void testWSDLAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-provider-jaxb/ProviderEndpoint?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); + Element wsdl = DOMUtils.parse(wsdlURL.openStream()); + assertNotNull(wsdl); } public void testProviderDispatch() throws Exception Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -45,9 +45,8 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.spi.utils.DOMUtils; +import org.w3c.dom.Element; /** * Test a Provider<SOAPMessage> @@ -73,9 +72,8 @@ public void testWSDLAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-provider-message?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); + Element wsdl = DOMUtils.parse(wsdlURL.openStream()); + assertNotNull(wsdl); } public void testProviderDispatch() throws Exception Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -46,8 +46,6 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; @@ -73,9 +71,8 @@ public void testWSDLAccess() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-provider-payload?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); + Element wsdl = DOMUtils.parse(wsdlURL.openStream()); + assertNotNull(wsdl); } public void testProviderDispatch() throws Exception Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/soapbinding/SOAPBindingTestCase.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -39,7 +39,6 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.soap.NameImpl; /** * Test the JSR-181 annotation: javax.jws.SOAPBinding @@ -106,9 +105,9 @@ SOAPMessage reqMsg = MessageFactory.newInstance().createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); SOAPMessage resMsg = (SOAPMessage)dispatch.invoke(reqMsg); - NameImpl name = new NameImpl(new QName(targetNS, "SubmitPOResponse")); - SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(name).next(); - soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl(new QName(targetNS, "product"))).next(); + QName qname = new QName(targetNS, "SubmitPOResponse"); + SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(qname).next(); + soapElement = (SOAPElement)soapElement.getChildElements(new QName(targetNS, "product")).next(); assertEquals("Ferrari", soapElement.getValue()); } @@ -137,9 +136,9 @@ SOAPMessage reqMsg = MessageFactory.newInstance().createMessage(null, new ByteArrayInputStream(reqEnv.getBytes())); SOAPMessage resMsg = (SOAPMessage)dispatch.invoke(reqMsg); - NameImpl name = new NameImpl(new QName(resultNamespace, "SubmitBareResponse")); - SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(name).next(); - soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl(new QName(targetNS, "product"))).next(); + QName qname = new QName(resultNamespace, "SubmitBareResponse"); + SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(qname).next(); + soapElement = (SOAPElement)soapElement.getChildElements(new QName(targetNS, "product")).next(); assertEquals("Ferrari", soapElement.getValue()); } @@ -181,10 +180,10 @@ SOAPMessage resMsg = (SOAPMessage) dispatch.invoke(reqMsg); - NameImpl name = new NameImpl(new QName(targetNS, "SubmitPOResponse")); - SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(name).next(); - soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl(new QName("PurchaseOrderAck"))).next(); - soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl(new QName(targetNS, "product"))).next(); + QName qname = new QName(targetNS, "SubmitPOResponse"); + SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(qname).next(); + soapElement = (SOAPElement)soapElement.getChildElements(new QName("PurchaseOrderAck")).next(); + soapElement = (SOAPElement)soapElement.getChildElements(new QName(targetNS, "product")).next(); assertEquals("Ferrari", soapElement.getValue()); } @@ -214,10 +213,10 @@ SOAPMessage resMsg = con.call(reqMsg, epURL); - NameImpl name = new NameImpl(new QName(targetNS, "SubmitNamespacedPOResponse")); - SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(name).next(); - soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl(new QName(resultNamespace, "NamespacedPurchaseOrderAck"))).next(); - soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl(new QName(targetNS, "product"))).next(); + QName qname = new QName(targetNS, "SubmitNamespacedPOResponse"); + SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(qname).next(); + soapElement = (SOAPElement)soapElement.getChildElements(new QName(resultNamespace, "NamespacedPurchaseOrderAck")).next(); + soapElement = (SOAPElement)soapElement.getChildElements(new QName(targetNS, "product")).next(); assertEquals("Ferrari", soapElement.getValue()); } } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webmethod/WebMethodTestCase.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -42,7 +42,6 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.soap.NameImpl; import org.jboss.wsf.spi.utils.DOMUtils; import org.w3c.dom.Element; @@ -93,9 +92,9 @@ URL epURL = new URL(endpointURL); SOAPMessage resMsg = con.call(reqMsg, epURL); - NameImpl name = new NameImpl(new QName(targetNS, "echoStringResponse")); - SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(name).next(); - soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl("return")).next(); + QName qname = new QName(targetNS, "echoStringResponse"); + SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(qname).next(); + soapElement = (SOAPElement)soapElement.getChildElements(new QName("return")).next(); assertEquals("Hello", soapElement.getValue()); } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webparam/WebParamTestCase.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -32,10 +32,6 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.metadata.umdm.EndpointMetaData; -import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ParameterMetaData; /** * Test the JSR-181 annotation: javax.jws.WebParam @@ -76,12 +72,6 @@ public void testPingOneWay() throws Exception { - StubExt stub = (StubExt)port; - EndpointMetaData epMetaData = stub.getEndpointMetaData(); - OperationMetaData opMetaData = epMetaData.getOperation(new QName(targetNS, "PingOneWay")); - ParameterMetaData param = opMetaData.getParameter(new QName("Ping")); - assertNotNull ("Expected param", param); - PingDocument doc = new PingDocument(); doc.setContent("Hello Kermit"); port.pingOneWay(doc); @@ -99,16 +89,6 @@ public void testSecurePing() throws Exception { - StubExt stub = (StubExt)port; - EndpointMetaData epMetaData = stub.getEndpointMetaData(); - OperationMetaData opMetaData = epMetaData.getOperation(new QName(targetNS, "SecurePing")); - - ParameterMetaData param1 = opMetaData.getParameter(new QName("Ping")); - assertNotNull ("Expected param", param1); - ParameterMetaData param2 = opMetaData.getParameter(new QName(targetNS, "SecHeader")); - assertNotNull ("Expected param", param2); - assertTrue ("Expected header param", param2.isInHeader()); - PingDocument doc = new PingDocument(); doc.setContent("Hello Kermit"); SecurityHeader secHeader = new SecurityHeader(); Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webresult/WebResultTestCase.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -37,7 +37,6 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.soap.NameImpl; /** * Test the JSR-181 annotation: javax.jws.webresult @@ -103,9 +102,9 @@ SOAPMessage resMsg = con.call(reqMsg, epURL); - NameImpl name = new NameImpl(new QName(targetNS, "locateCustomerResponse")); - SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(name).next(); - soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl("CustomerRecord")).next(); + QName qname = new QName(targetNS, "locateCustomerResponse"); + SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(qname).next(); + soapElement = (SOAPElement)soapElement.getChildElements(new QName("CustomerRecord")).next(); assertNotNull("Expected CustomerRecord", soapElement); } } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DHRequest.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DHRequest.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/DHRequest.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -1,50 +1,52 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxws.samples.xop.doclit; import javax.activation.DataHandler; import javax.xml.bind.annotation.XmlMimeType; import javax.xml.bind.annotation.XmlType; -@XmlType(name="dataRequest", namespace = "http://org.jboss.ws/xop/doclit") -public class DHRequest { +@XmlType(name = "dataRequest", namespace = "http://org.jboss.ws/xop/doclit") +public class DHRequest +{ + private DataHandler dataHandler; - - public DHRequest() { + public DHRequest() + { } - - public DHRequest(DataHandler dataHandler) { + public DHRequest(DataHandler dataHandler) + { this.dataHandler = dataHandler; } - private DataHandler dataHandler; - @XmlMimeType("image/jpeg") - public DataHandler getDataHandler() { + public DataHandler getDataHandler() + { return dataHandler; } - public void setDataHandler(DataHandler dataHandler) { + public void setDataHandler(DataHandler dataHandler) + { this.dataHandler = dataHandler; } } Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -25,12 +25,14 @@ import javax.activation.DataHandler; import javax.jws.WebService; +import javax.xml.ws.WebServiceException; -import org.jboss.ws.WSException; +import org.jboss.logging.Logger; @WebService(name = "MTOMEndpoint", serviceName = "MTOMService", endpointInterface = "org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpoint") public class MTOMEndpointBean implements MTOMEndpoint { + private Logger log = Logger.getLogger(MTOMEndpointBean.class); public DHResponse echoDataHandler(DHRequest request) { @@ -39,12 +41,12 @@ try { - System.out.println("Recv " + dataHandler.getContentType()); - System.out.println("Content is " + dataHandler.getContent()); + log.info("Recv " + dataHandler.getContentType()); + log.info("Content is " + dataHandler.getContent()); } catch (IOException e) { - throw new WSException(e); + throw new WebServiceException(e); } return new DHResponse(request.getDataHandler()); Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -1,44 +1,67 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxws.samples.xop.doclit; -import org.jboss.logging.Logger; -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.wsf.spi.handler.GenericSOAPHandler; -import org.jboss.ws.core.soap.SOAPElementImpl; -import org.jboss.ws.core.soap.SOAPElementWriter; -import org.jboss.ws.core.soap.SOAPMessageImpl; - import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.handler.GenericSOAPHandler; +import org.jboss.wsf.spi.utils.DOMWriter; + /** * A MTOM handler should see the conceptual payload, * which means an inlined representation of the binary data. */ -class MTOMProtocolHandler extends GenericSOAPHandler +public class MTOMProtocolHandler extends GenericSOAPHandler { private Logger log = Logger.getLogger(MTOMProtocolHandler.class); - protected boolean handleOutbound(MessageContext msgContext) { + protected boolean handleOutbound(MessageContext msgContext) + { return dumpMessage(msgContext); } - protected boolean handleInbound(MessageContext msgContext) { + protected boolean handleInbound(MessageContext msgContext) + { return dumpMessage(msgContext); } - private boolean dumpMessage(MessageContext context) { + private boolean dumpMessage(MessageContext context) + { try { - CommonMessageContext msgContext = (CommonMessageContext)context; - SOAPMessageImpl soapMsg = (SOAPMessageImpl)msgContext.getSOAPMessage(); - SOAPEnvelope soapReqEnv = soapMsg.getSOAPPart().getEnvelope(); - String xml = SOAPElementWriter.writeElement((SOAPElementImpl)soapReqEnv, true); - log.info(xml.substring(0, 50)+"[...]"); + SOAPMessageContext msgContext = (SOAPMessageContext)context; + SOAPMessage soapMsg = msgContext.getMessage(); + SOAPEnvelope soapEnv = soapMsg.getSOAPPart().getEnvelope(); + log.info(DOMWriter.printNode(soapEnv, true)); } - catch (SOAPException e) + catch (SOAPException ex) { - // + throw new WebServiceException(ex); } return true; Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-05-26 12:36:34 UTC (rev 3269) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-05-26 14:22:48 UTC (rev 3270) @@ -61,7 +61,7 @@ DataHandler dh = new DataHandler(imgFile.toURL()); DHResponse response = getPort().echoDataHandler(new DHRequest(dh)); assertNotNull(response); - assertEquals(response.getDataHandler().getContentType(), "image/jpeg"); + assertEquals("image/jpeg", response.getDataHandler().getContentType()); assertTrue(response.getDataHandler().getContent() instanceof BufferedImage); } @@ -72,7 +72,7 @@ DataHandler dh = new DataHandler(imgFile.toURL()); DHResponse response = getPort().echoDataHandler(new DHRequest(dh)); assertNotNull(response); - assertEquals(response.getDataHandler().getContentType(), "application/octet-stream"); + assertEquals("application/octet-stream", response.getDataHandler().getContentType()); assertTrue("Wrong java type returned", response.getDataHandler().getContent() instanceof InputStream); }