[jbossws-commits] JBossWS SVN: r2324 - in trunk: jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc and 41 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-02-09 11:14:15 -0500 (Fri, 09 Feb 2007) New Revision: 2324 Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java trunk/jbossws-tests/src/main/resources/jaxrpc/xop/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/attach.jpeg trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.jpeg trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/disguised_jpeg.xcf Removed: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java trunk/jbossws-tests/src/main/resources/jaxrpc/samples/xop/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/attach.jpeg trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.jpeg trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/disguised_jpeg.xcf Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml trunk/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java trunk/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml trunk/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml Log: Same MTOM default for JAX-WS and JAX-RPC (disabled). JAX-RPC endpoint config supports Features now. Removed XOP unit tests from samples package. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -777,7 +777,7 @@ if (paramMetaData.isXOP() && XOPContext.isXOPEncodedRequest()) { SOAPMessageImpl soapMessage = (SOAPMessageImpl)MessageContextAssociation.peekMessageContext().getSOAPMessage(); - soapMessage.setXOPMessage(true); + soapMessage.setXOPMessage(true); } return soapContentElement; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -42,7 +42,7 @@ public SOAP11BindingJAXRPC() { super(); - setMTOMEnabled(true); + setMTOMEnabled(false); } public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -42,7 +42,7 @@ public SOAP12BindingJAXRPC() { super(); - setMTOMEnabled(true); + setMTOMEnabled(false); } public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -46,6 +46,7 @@ import org.jboss.ws.core.CommonBindingProvider; import org.jboss.ws.core.CommonClient; import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.StubExt; import org.jboss.ws.core.jaxws.binding.BindingExt; import org.jboss.ws.core.jaxws.binding.BindingProviderImpl; import org.jboss.ws.core.jaxws.handler.HandlerChainExecutor; @@ -59,6 +60,7 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +import org.jboss.ws.extensions.xop.XOPContext; /** * Provides support for the dynamic invocation of a service endpoint. @@ -207,12 +209,16 @@ { if(log.isDebugEnabled()) log.debug("Begin response processing"); + // MTOM setting need to pass past pivot + boolean mtomEnabled = XOPContext.isMTOMEnabled(); + // remove existing context MessageContextAssociation.popMessageContext(); SOAPMessageContextJAXWS responseContext = new SOAPMessageContextJAXWS(requestContext); responseContext.setSOAPMessage(null); responseContext.clear(); // clear message context properties + responseContext.setProperty(StubExt.PROPERTY_MTOM_ENABLED, mtomEnabled); // associate new context MessageContextAssociation.pushMessageContext(responseContext); Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,59 +0,0 @@ -/* -* 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.ws.extensions.xop; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.MessageContext; - -import org.jboss.ws.core.StubExt; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id$ - * @since Oct 2, 2006 - */ -public class DisableMTOMHandler extends GenericHandler { - public QName[] getHeaders() { - return new QName[0]; - } - - public boolean handleRequest(MessageContext msgContext) { - disableMTOM(msgContext); - return true; - } - - public boolean handleResponse(MessageContext msgContext) { - disableMTOM(msgContext); - return true; - } - - public boolean handleFault(MessageContext msgContext) { - disableMTOM(msgContext); - return true; - } - - public void disableMTOM(MessageContext msgContext) - { - msgContext.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - } -} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -126,7 +126,7 @@ { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); Boolean mtomEnabled = (Boolean)msgContext.getProperty(StubExt.PROPERTY_MTOM_ENABLED); - return Boolean.TRUE.equals(mtomEnabled) || mtomEnabled == null; + return Boolean.TRUE.equals(mtomEnabled); } public static void setMTOMEnabled(boolean b) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -23,22 +23,6 @@ // $Id$ -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Observable; -import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; - -import javax.jws.soap.SOAPBinding.ParameterStyle; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; -import javax.xml.ws.Service.Mode; - import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -56,13 +40,17 @@ import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.utils.JavaUtils; -import org.jboss.ws.metadata.config.CommonConfig; -import org.jboss.ws.metadata.config.Configurable; -import org.jboss.ws.metadata.config.ConfigurationProvider; -import org.jboss.ws.metadata.config.EndpointFeature; -import org.jboss.ws.metadata.config.JBossWSConfigFactory; +import org.jboss.ws.metadata.config.*; import org.jboss.ws.metadata.umdm.HandlerMetaData.HandlerType; +import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; +import javax.xml.ws.Service.Mode; +import java.lang.reflect.Method; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; + /** * A Service component describes a set of endpoints. * @@ -595,6 +583,9 @@ if (config == null) initEndpointConfig(); + // register any configurable with the ConfigProvider + configObservable.addObserver(configurable); + // SOAPBinding configuration if (configurable instanceof CommonBindingProvider) { Modified: trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml =================================================================== --- trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -3,21 +3,15 @@ <!-- $Id$ --> <jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" - xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> + xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> <client-config> <config-name>Standard Client</config-name> </client-config> <client-config> - <config-name>Standard MTOM disabled client</config-name> - <post-handler-chain> - <handler-chain-name>MTOM handler</handler-chain-name> - <handler> - <j2ee:handler-name>DisableMTOMHandler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.xop.DisableMTOMHandler</j2ee:handler-class> - </handler> - </post-handler-chain> + <config-name>Standard MTOM client</config-name> + <feature>http://org.jboss.ws/mtom</feature> </client-config> <client-config> Modified: trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml =================================================================== --- trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -2,7 +2,8 @@ <!-- $Id$ --> -<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" +<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd"> <endpoint-config> @@ -10,14 +11,8 @@ </endpoint-config> <endpoint-config> - <config-name>Standard MTOM disabled endpoint</config-name> - <pre-handler-chain> - <handler-chain-name>MTOM handlers</handler-chain-name> - <handler> - <j2ee:handler-name>DisableMTOMHandler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.xop.DisableMTOMHandler</j2ee:handler-class> - </handler> - </pre-handler-chain> + <config-name>Standard MTOM Endpoint</config-name> + <feature>http://org.jboss.ws/mtom</feature> </endpoint-config> <endpoint-config> Modified: trunk/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd =================================================================== --- trunk/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd 2007-02-09 16:14:15 UTC (rev 2324) @@ -56,6 +56,7 @@ <xsd:element name="config-name" type="xsd:string"/> <xsd:element name="pre-handler-chain" type="tns:handlerChainType" minOccurs="0"/> <xsd:element name="post-handler-chain" type="tns:handlerChainType" minOccurs="0"/> + <xsd:element name="feature" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="property" type="tns:propertyType" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:complexType> Modified: trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -628,13 +628,13 @@ </jar> <!-- jaxrpc-samples-xop-doclit without handlers --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -642,59 +642,59 @@ </war> <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-samples-xop-doclit with handlers --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF"> <include name="webservices.xml"/> </webinf> </war> <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/doclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/handlerconfig/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/doclit/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-samples-xop-rpclit without handlers --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -702,46 +702,46 @@ </war> <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-samples-xop-rpclit with handlers --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF"> <include name="webservices.xml"/> </webinf> </war> <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler-client.jar"> <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/xop/rpclit/*TestCase.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/handlerconfig/META-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/xop/rpclit/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -28,6 +28,7 @@ import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC; +import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC; import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; import org.jboss.ws.metadata.config.jaxws.EndpointConfigJAXWS; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; @@ -52,13 +53,14 @@ assertNotNull("Null config", config); - assertEquals(2, config.getEndpointConfig().size()); + assertEquals(3, config.getEndpointConfig().size()); EndpointConfigJAXRPC epc1 = (EndpointConfigJAXRPC)config.getEndpointConfig().get(0); - EndpointConfigJAXRPC epc2 = (EndpointConfigJAXRPC)config.getEndpointConfig().get(1); + EndpointConfigJAXRPC epc2 = (EndpointConfigJAXRPC)config.getEndpointConfig().get(2); assertEquals("Standard Endpoint", epc1.getConfigName()); assertNull(epc1.getPreHandlerChain()); assertNull(epc1.getPostHandlerChain()); + assertFalse("MTOM should not be enabled" , epc1.hasFeature("http://org.jboss.ws/mtom")); assertEquals("Standard WSSecurity Endpoint", epc2.getConfigName()); HandlerChainMetaData preChain = epc2.getPreHandlerChain(); @@ -68,12 +70,12 @@ assertEquals("org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound", h1.getHandlerClass()); } - public void testFeatures() throws Exception + public void testJAXWSFeatures() throws Exception { File confFile = new File("resources/common/config/jaxws-endpoint-config.xml"); assertTrue(confFile.exists()); + JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); ConfigRootJAXWS config = (ConfigRootJAXWS)factory.parse(confFile.toURL()); assertNotNull("Null config", config); @@ -83,7 +85,22 @@ // disable feature epConfig.setFeature("http://org.jboss.ws/mtom", false); assertFalse("Feature still set", epConfig.hasFeature("http://org.jboss.ws/mtom")); + } + public void testJAXRPCFeatures() throws Exception + { + File confFile = new File("resources/common/config/jaxrpc-endpoint-config.xml"); + assertTrue(confFile.exists()); + JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); + ConfigRootJAXRPC config = (ConfigRootJAXRPC)factory.parse(confFile.toURL()); + assertNotNull("Null config", config); + + CommonConfigJAXRPC epConfig = (CommonConfigJAXRPC)config.getConfigByName("Standard MTOM Endpoint"); + assertTrue("Feature not set" , epConfig.hasFeature("http://org.jboss.ws/mtom")); + + // disable feature + epConfig.setFeature("http://org.jboss.ws/mtom", false); + assertFalse("Feature still set", epConfig.hasFeature("http://org.jboss.ws/mtom")); } public void testProperties() throws Exception Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,119 +0,0 @@ -package org.jboss.test.ws.jaxrpc.samples.xop; - -import java.io.File; - -import junit.framework.TestCase; - -import org.apache.xerces.xs.XSComplexTypeDefinition; -import org.apache.xerces.xs.XSModel; -import org.apache.xerces.xs.XSTypeDefinition; -import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; -import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; -import org.jboss.xb.binding.NamespaceRegistry; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @since Jun 9, 2006 - */ -public class XOPTypeDefTestCase extends TestCase -{ - public XOPTypeDefTestCase(String string) - { - super(string); - } - - protected void setUp() throws Exception - { - super.setUp(); - } - - public void testCircularReferences() throws Exception - { - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/samples/xop/circular.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - XSTypeDefinition xsType = schemaModel.getTypeDefinition("Customer", "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - - // it fails when getting a stack overflow ;) - } - } - - public void testXOPElementScan() throws Exception - { - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/samples/xop/schema.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - // test custom binary declaration - XSTypeDefinition xsType = schemaModel.getTypeDefinition(">PingMsg", "http://jboss.org/test/ws/xop/doclit"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find xop typedef in schema", resultType); - } - - scanner.reset(); - - // test the xmime binary declaration - xsType = schemaModel.getTypeDefinition(">PingMsgResponse", "http://jboss.org/test/ws/xop/doclit"); - assertNotNull("Root type def not found", xsType); - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find XOP typedef in schema", resultType); - } - - } - - public void testMSFTElementScan() throws Exception - { - - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/samples/xop/schema.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find xop typedef in schema", resultType); - } - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,129 +0,0 @@ -package org.jboss.test.ws.jaxrpc.xop; - -import java.io.File; - -import junit.framework.TestCase; - -import org.apache.xerces.xs.XSComplexTypeDefinition; -import org.apache.xerces.xs.XSModel; -import org.apache.xerces.xs.XSTypeDefinition; -import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner; -import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; -import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; -import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; -import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.xb.binding.NamespaceRegistry; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @since Jun 9, 2006 - */ -public class XOPTypeDefTestCase extends TestCase -{ - public XOPTypeDefTestCase(String string) - { - super(string); - } - - protected void setUp() throws Exception - { - super.setUp(); - } - - public void testCircularReferences() throws Exception - { - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/xop/circular.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - XSTypeDefinition xsType = schemaModel.getTypeDefinition("Customer", "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - - // it fails when getting a stack overflow ;) - } - } - - public void testXOPElementScan() throws Exception - { - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/xop/schema.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - // test custom binary declaration - XSTypeDefinition xsType = schemaModel.getTypeDefinition(">PingMsg", "http://jboss.org/test/ws/xop/doclit"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find xop typedef in schema", resultType); - } - - scanner.reset(); - - // test the xmime binary declaration - xsType = schemaModel.getTypeDefinition(">PingMsgResponse", "http://jboss.org/test/ws/xop/doclit"); - assertNotNull("Root type def not found", xsType); - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find XOP typedef in schema", resultType); - } - - } - - public void testMSFTElementScan() throws Exception - { - - SchemaUtils utils = SchemaUtils.getInstance(); - File f = new File("resources/jaxrpc/xop/schema.xsd"); - assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); - - XSModel xsModel = utils.parseSchema(f.toURL()); - assertNotNull(xsModel); - WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); - JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); - - XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit"); - - assertNotNull("Root type def not found", xsType); - XOPScanner scanner = new XOPScanner(); - - if (xsType instanceof XSComplexTypeDefinition) - { - XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; - XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); - assertNotNull("Unable to find xop typedef in schema", resultType); - } - } - - public void testXOPContext() - { - SOAPMessageContextJAXRPC messageContext = new SOAPMessageContextJAXRPC(); - MessageContextAssociation.pushMessageContext(messageContext); - assertFalse("MTOM should be disabled", XOPContext.isMTOMEnabled()); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,129 @@ +package org.jboss.test.ws.jaxrpc.xop; + +import java.io.File; + +import junit.framework.TestCase; + +import org.apache.xerces.xs.XSComplexTypeDefinition; +import org.apache.xerces.xs.XSModel; +import org.apache.xerces.xs.XSTypeDefinition; +import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner; +import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; +import org.jboss.ws.metadata.wsdl.xmlschema.WSSchemaUtils; +import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; +import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.xb.binding.NamespaceRegistry; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @since Jun 9, 2006 + */ +public class XOPTypeDefTestCase extends TestCase +{ + public XOPTypeDefTestCase(String string) + { + super(string); + } + + protected void setUp() throws Exception + { + super.setUp(); + } + + public void testCircularReferences() throws Exception + { + SchemaUtils utils = SchemaUtils.getInstance(); + File f = new File("resources/jaxrpc/xop/circular.xsd"); + assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); + + XSModel xsModel = utils.parseSchema(f.toURL()); + assertNotNull(xsModel); + WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); + JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); + + XSTypeDefinition xsType = schemaModel.getTypeDefinition("Customer", "http://complex.jsr181.jaxws.ws.test.jboss.org/jaws"); + + assertNotNull("Root type def not found", xsType); + XOPScanner scanner = new XOPScanner(); + + if (xsType instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; + XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); + + // it fails when getting a stack overflow ;) + } + } + + public void testXOPElementScan() throws Exception + { + SchemaUtils utils = SchemaUtils.getInstance(); + File f = new File("resources/jaxrpc/xop/schema.xsd"); + assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); + + XSModel xsModel = utils.parseSchema(f.toURL()); + assertNotNull(xsModel); + WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); + JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); + + // test custom binary declaration + XSTypeDefinition xsType = schemaModel.getTypeDefinition(">PingMsg", "http://jboss.org/test/ws/xop/doclit"); + + assertNotNull("Root type def not found", xsType); + XOPScanner scanner = new XOPScanner(); + + if (xsType instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; + XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); + assertNotNull("Unable to find xop typedef in schema", resultType); + } + + scanner.reset(); + + // test the xmime binary declaration + xsType = schemaModel.getTypeDefinition(">PingMsgResponse", "http://jboss.org/test/ws/xop/doclit"); + assertNotNull("Root type def not found", xsType); + if (xsType instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; + XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); + assertNotNull("Unable to find XOP typedef in schema", resultType); + } + + } + + public void testMSFTElementScan() throws Exception + { + + SchemaUtils utils = SchemaUtils.getInstance(); + File f = new File("resources/jaxrpc/xop/schema.xsd"); + assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); + + XSModel xsModel = utils.parseSchema(f.toURL()); + assertNotNull(xsModel); + WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); + JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); + + XSTypeDefinition xsType = schemaModel.getTypeDefinition(">MSFTBinary", "http://jboss.org/test/ws/xop/doclit"); + + assertNotNull("Root type def not found", xsType); + XOPScanner scanner = new XOPScanner(); + + if (xsType instanceof XSComplexTypeDefinition) + { + XSComplexTypeDefinition xsComplexType = (XSComplexTypeDefinition)xsType; + XSTypeDefinition resultType = scanner.findXOPTypeDef(xsComplexType); + assertNotNull("Unable to find xop typedef in schema", resultType); + } + } + + public void testXOPContext() + { + SOAPMessageContextJAXRPC messageContext = new SOAPMessageContextJAXRPC(); + MessageContextAssociation.pushMessageContext(messageContext); + assertFalse("MTOM should be disabled", XOPContext.isMTOMEnabled()); + } +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,86 +0,0 @@ -/* -* 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.jaxrpc.xop.doclit; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.HandlerInfo; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPMessage; - -import org.jboss.logging.Logger; -import org.jboss.ws.core.soap.NameImpl; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id$ - * @since Sep 25, 2006 - */ -public class InlineHandler extends GenericHandler -{ - HandlerInfo config; - - private static Logger log = Logger.getLogger(InlineHandler.class); - - public QName[] getHeaders() - { - return new QName[0]; - } - - public void init(HandlerInfo config) { - this.config = config; - } - - public boolean handleRequest(MessageContext messageContext) - { - dumpMessage(messageContext); - return true; - } - - public boolean handleResponse(MessageContext messageContext) - { - dumpMessage(messageContext); - return true; - } - - private void dumpMessage(MessageContext messageContext) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)messageContext).getMessage(); - SOAPBody soapBody = soapMessage.getSOAPBody(); - - SOAPElement bodyElement = (SOAPElement)soapBody.getChildElements().next(); - SOAPElement xopElement = (SOAPElement)bodyElement.getChildElements(new NameImpl("xopContent")).next(); - String base64Value = xopElement.getValue(); - log.debug("base64Value: " + base64Value); - messageContext.setProperty("xop.inline.value", base64Value); - } - catch (Exception e) - { - log.error("Failed to access inline XOP values", e); - } - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/InlineHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,86 @@ +/* +* 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.jaxrpc.xop.doclit; + +import javax.xml.namespace.QName; +import javax.xml.rpc.handler.GenericHandler; +import javax.xml.rpc.handler.HandlerInfo; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPMessage; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.soap.NameImpl; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id$ + * @since Sep 25, 2006 + */ +public class InlineHandler extends GenericHandler +{ + HandlerInfo config; + + private static Logger log = Logger.getLogger(InlineHandler.class); + + public QName[] getHeaders() + { + return new QName[0]; + } + + public void init(HandlerInfo config) { + this.config = config; + } + + public boolean handleRequest(MessageContext messageContext) + { + dumpMessage(messageContext); + return true; + } + + public boolean handleResponse(MessageContext messageContext) + { + dumpMessage(messageContext); + return true; + } + + private void dumpMessage(MessageContext messageContext) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)messageContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + + SOAPElement bodyElement = (SOAPElement)soapBody.getChildElements().next(); + SOAPElement xopElement = (SOAPElement)bodyElement.getChildElements(new NameImpl("xopContent")).next(); + String base64Value = xopElement.getValue(); + log.debug("base64Value: " + base64Value); + messageContext.setProperty("xop.inline.value", base64Value); + } + catch (Exception e) + { + log.error("Failed to access inline XOP values", e); + } + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,195 +0,0 @@ -/* -* 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.jaxrpc.xop.doclit; - -import java.awt.Image; -import java.io.File; - -import javax.activation.DataHandler; -import javax.xml.rpc.Stub; -import javax.xml.transform.Source; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.XOPTestSupport; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.utils.IOUtils; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id:XOPBase.java 1321 2006-10-27 11:47:18Z heiko.braun(a)jboss.com $ - * @since Sep 25, 2006 - */ -public abstract class XOPBase extends JBossWSTest { - - private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); - - protected abstract XOPPing getPort(); - - // --------------------------------------------------------------------------------- - // Test raw binary data - - public void testRequestResponseOptimized() throws Exception { - - DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); - byte[] bytesIn = IOUtils.convertToBytes(dh); - PingMsgResponse value = getPort().ping(new PingMsg("1|1", bytesIn)); - assertNotNull("Return value was null", value); - byte[] bytesOut = value.getXopContent(); - assertNotNull("Returned xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } - - public void testResponseOptimized() throws Exception { - - byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); - - // disable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingMsgResponse value = getPort().ping(new PingMsg("0|1", bytesIn)); - assertNotNull("Return value was null",value); - byte[] bytesOut = value.getXopContent(); - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } - - public void testRequestOptimized() throws Exception { - - byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); - - // reusing the stub means cleaning the previous state - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingMsgResponse value = getPort().ping(new PingMsg("1|0", bytesIn)); - assertNotNull("Return value was null",value); - byte[] bytesOut = value.getXopContent(); - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } - - // --------------------------------------------------------------------------------- - // Test concrete java types - - public void testImageResponseOptimized() throws Exception { - - Image image = XOPTestSupport.createTestImage(imgFile); - - if(image!=null) - { - // disable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingImage pingImage = new PingImage("0|1", image); - PingImageResponse response = getPort().pingImage(pingImage); - assertNotNull("Return xopContent was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - } - - public void testImageRequestOptimized() throws Exception { - - Image image = XOPTestSupport.createTestImage(imgFile); - - if(image!=null) - { - // enable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingImage pingImage = new PingImage("1|0", image); - PingImageResponse response = getPort().pingImage(pingImage); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - } - - public void testSourceResponseOptimized() throws Exception { - - Source source = XOPTestSupport.createTestSource(); - - // disable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingSource pingSource = new PingSource(); - pingSource.setMessage("0|1"); - pingSource.setXopContent(source); - - PingSourceResponse response = getPort().pingSource(pingSource); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - - } - - public void testSourceRequestOptimized() throws Exception { - - Source source = XOPTestSupport.createTestSource(); - - // enable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingSource pingSource = new PingSource(); - pingSource.setMessage("1|0"); - pingSource.setXopContent(source); - - PingSourceResponse response = getPort().pingSource(pingSource); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - - public void testDHResponseOptimized() throws Exception { - - DataHandler dh = XOPTestSupport.createDataHandler(imgFile); - - // disable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingDataHandler reqest = new PingDataHandler(dh); - reqest.setMessage("0|1"); - - PingDataHandlerResponse response = getPort().pingDataHandler(reqest); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - - } - - public void testDHRequestOptimized() throws Exception { - - DataHandler dh = XOPTestSupport.createDataHandler(imgFile); - - // enable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingDataHandler reqest = new PingDataHandler(dh); - reqest.setMessage("1|0"); - - PingDataHandlerResponse response = getPort().pingDataHandler(reqest); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,195 @@ +/* +* 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.jaxrpc.xop.doclit; + +import java.awt.Image; +import java.io.File; + +import javax.activation.DataHandler; +import javax.xml.rpc.Stub; +import javax.xml.transform.Source; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.XOPTestSupport; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.utils.IOUtils; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id:XOPBase.java 1321 2006-10-27 11:47:18Z heiko.braun(a)jboss.com $ + * @since Sep 25, 2006 + */ +public abstract class XOPBase extends JBossWSTest { + + private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); + + protected abstract XOPPing getPort(); + + // --------------------------------------------------------------------------------- + // Test raw binary data + + public void testRequestResponseOptimized() throws Exception { + + DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); + byte[] bytesIn = IOUtils.convertToBytes(dh); + PingMsgResponse value = getPort().ping(new PingMsg("1|1", bytesIn)); + assertNotNull("Return value was null", value); + byte[] bytesOut = value.getXopContent(); + assertNotNull("Returned xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + public void testResponseOptimized() throws Exception { + + byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingMsgResponse value = getPort().ping(new PingMsg("0|1", bytesIn)); + assertNotNull("Return value was null",value); + byte[] bytesOut = value.getXopContent(); + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + public void testRequestOptimized() throws Exception { + + byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); + + // reusing the stub means cleaning the previous state + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingMsgResponse value = getPort().ping(new PingMsg("1|0", bytesIn)); + assertNotNull("Return value was null",value); + byte[] bytesOut = value.getXopContent(); + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + // --------------------------------------------------------------------------------- + // Test concrete java types + + public void testImageResponseOptimized() throws Exception { + + Image image = XOPTestSupport.createTestImage(imgFile); + + if(image!=null) + { + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingImage pingImage = new PingImage("0|1", image); + PingImageResponse response = getPort().pingImage(pingImage); + assertNotNull("Return xopContent was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + } + + public void testImageRequestOptimized() throws Exception { + + Image image = XOPTestSupport.createTestImage(imgFile); + + if(image!=null) + { + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingImage pingImage = new PingImage("1|0", image); + PingImageResponse response = getPort().pingImage(pingImage); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + } + + public void testSourceResponseOptimized() throws Exception { + + Source source = XOPTestSupport.createTestSource(); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingSource pingSource = new PingSource(); + pingSource.setMessage("0|1"); + pingSource.setXopContent(source); + + PingSourceResponse response = getPort().pingSource(pingSource); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testSourceRequestOptimized() throws Exception { + + Source source = XOPTestSupport.createTestSource(); + + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingSource pingSource = new PingSource(); + pingSource.setMessage("1|0"); + pingSource.setXopContent(source); + + PingSourceResponse response = getPort().pingSource(pingSource); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + + public void testDHResponseOptimized() throws Exception { + + DataHandler dh = XOPTestSupport.createDataHandler(imgFile); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingDataHandler reqest = new PingDataHandler(dh); + reqest.setMessage("0|1"); + + PingDataHandlerResponse response = getPort().pingDataHandler(reqest); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testDHRequestOptimized() throws Exception { + + DataHandler dh = XOPTestSupport.createDataHandler(imgFile); + + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingDataHandler reqest = new PingDataHandler(dh); + reqest.setMessage("1|0"); + + PingDataHandlerResponse response = getPort().pingDataHandler(reqest); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,67 +0,0 @@ -/* -* 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.jaxrpc.xop.doclit; - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; - -/** - * Test MTOM functionality with jaxrpc-handlers in place.<br> - * This basically determines wether XB needs to handle base64 values directly - * or uses callbacks to XOPMarshaller/Unmarshaller. - * - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id$ - * @since Sep 22, 2006 - */ -public class XOPHandlerTestCase extends XOPBase { - - private static XOPPing port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-doclit_handler.war, jaxrpc-samples-xop-doclit_handler-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCase"); - port = (XOPPing)service.getPort(XOPPing.class); - ((StubExt)port).setConfigName("Standard MTOM client"); - } - - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit_handler"); - } - - protected XOPPing getPort() { - return port; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +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.jaxrpc.xop.doclit; + +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; + +/** + * Test MTOM functionality with jaxrpc-handlers in place.<br> + * This basically determines wether XB needs to handle base64 values directly + * or uses callbacks to XOPMarshaller/Unmarshaller. + * + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id$ + * @since Sep 22, 2006 + */ +public class XOPHandlerTestCase extends XOPBase { + + private static XOPPing port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-doclit_handler.war, jaxrpc-samples-xop-doclit_handler-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCase"); + port = (XOPPing)service.getPort(XOPPing.class); + ((StubExt)port).setConfigName("Standard MTOM client"); + } + + //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit_handler"); + } + + protected XOPPing getPort() { + return port; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,24 +0,0 @@ -/* - * JBoss, the OpenSource EJB server - * Distributable under LGPL license. See terms of license at gnu.org. - */ -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.xop.doclit; - -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; - -public interface XOPPing extends java.rmi.Remote -{ - public PingMsgResponse ping(PingMsg pingMsg) throws java.rmi.RemoteException; - public PingImageResponse pingImage(PingImage pingImage) throws java.rmi.RemoteException; - public PingSourceResponse pingSource(PingSource pingSource) throws java.rmi.RemoteException; - public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPing.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,24 @@ +/* + * JBoss, the OpenSource EJB server + * Distributable under LGPL license. See terms of license at gnu.org. + */ +//Auto Generated by jbossws - Please do not edit!!! + +package org.jboss.test.ws.jaxrpc.xop.doclit; + +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; + +public interface XOPPing extends java.rmi.Remote +{ + public PingMsgResponse ping(PingMsg pingMsg) throws java.rmi.RemoteException; + public PingImageResponse pingImage(PingImage pingImage) throws java.rmi.RemoteException; + public PingSourceResponse pingSource(PingSource pingSource) throws java.rmi.RemoteException; + public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws java.rmi.RemoteException; +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,43 +0,0 @@ -package org.jboss.test.ws.jaxrpc.xop.doclit; - -import java.rmi.RemoteException; - -import org.jboss.test.ws.jaxrpc.xop.shared.MTOMServiceBase; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; - -/** - * MTOM test service impl. - * The 'message' param value determines wether or not the response should be XOP encoded. - * - * @author Heiko Braun, <heiko(a)openj.net&gt; - * @since 11-Apr-2006 - */ -public class XOPPingImpl extends MTOMServiceBase implements XOPPing { - - public PingMsgResponse ping(PingMsg pingMsg) throws RemoteException { - toggleXOP(pingMsg.getMessage()); - return new PingMsgResponse(pingMsg.getXopContent()); - } - - public PingImageResponse pingImage(PingImage pingImage) throws RemoteException { - toggleXOP(pingImage.getMessage()); - return new PingImageResponse(pingImage.getXopContent()); - } - - public PingSourceResponse pingSource(PingSource pingSource) throws RemoteException { - toggleXOP(pingSource.getMessage()); - return new PingSourceResponse(pingSource.getXopContent()); - } - - public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws RemoteException { - toggleXOP(pingDataHandler.getMessage()); - return new PingDataHandlerResponse(pingDataHandler.getXopContent()); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingImpl.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,43 @@ +package org.jboss.test.ws.jaxrpc.xop.doclit; + +import java.rmi.RemoteException; + +import org.jboss.test.ws.jaxrpc.xop.shared.MTOMServiceBase; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; + +/** + * MTOM test service impl. + * The 'message' param value determines wether or not the response should be XOP encoded. + * + * @author Heiko Braun, <heiko(a)openj.net&gt; + * @since 11-Apr-2006 + */ +public class XOPPingImpl extends MTOMServiceBase implements XOPPing { + + public PingMsgResponse ping(PingMsg pingMsg) throws RemoteException { + toggleXOP(pingMsg.getMessage()); + return new PingMsgResponse(pingMsg.getXopContent()); + } + + public PingImageResponse pingImage(PingImage pingImage) throws RemoteException { + toggleXOP(pingImage.getMessage()); + return new PingImageResponse(pingImage.getXopContent()); + } + + public PingSourceResponse pingSource(PingSource pingSource) throws RemoteException { + toggleXOP(pingSource.getMessage()); + return new PingSourceResponse(pingSource.getXopContent()); + } + + public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws RemoteException { + toggleXOP(pingDataHandler.getMessage()); + return new PingDataHandlerResponse(pingDataHandler.getXopContent()); + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,19 +0,0 @@ -/* -* JBoss, the OpenSource EJB server -* Distributable under LGPL license. See terms of license at gnu.org. -*/ - -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.xop.doclit; - - -import javax.xml.rpc.ServiceException; - - -public interface XOPPingService extends javax.xml.rpc.Service -{ - - public org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing getTestServicePort() throws ServiceException; - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPPingService.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,19 @@ +/* +* JBoss, the OpenSource EJB server +* Distributable under LGPL license. See terms of license at gnu.org. +*/ + +//Auto Generated by jbossws - Please do not edit!!! + +package org.jboss.test.ws.jaxrpc.xop.doclit; + + +import javax.xml.rpc.ServiceException; + + +public interface XOPPingService extends javax.xml.rpc.Service +{ + + public org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing getTestServicePort() throws ServiceException; + +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,68 +0,0 @@ -/* - * 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.jaxrpc.xop.doclit; - -// $Id$ - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; - -/** - * Test MTOM functionaly without any jaxrpc handlers in place. - * - * @author Heiko.Braun(a)jboss.org - * @since Sep 22, 2006 - */ -public class XOPTestCase extends XOPBase { - - private static XOPPing port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-doclit.war, jaxrpc-samples-xop-doclit-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCase"); - port = (XOPPing)service.getPort(XOPPing.class); - ((StubExt)port).setConfigName("Standard MTOM client"); - } - - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit"); - } - - protected XOPPing getPort() - { - return port; - } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,68 @@ +/* + * 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.jaxrpc.xop.doclit; + +// $Id$ + +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; + +/** + * Test MTOM functionaly without any jaxrpc handlers in place. + * + * @author Heiko.Braun(a)jboss.org + * @since Sep 22, 2006 + */ +public class XOPTestCase extends XOPBase { + + private static XOPPing port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-doclit.war, jaxrpc-samples-xop-doclit-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCase"); + port = (XOPPing)service.getPort(XOPPing.class); + ((StubExt)port).setConfigName("Standard MTOM client"); + } + + //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit"); + } + + protected XOPPing getPort() + { + return port; + } + +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,65 +0,0 @@ -package org.jboss.test.ws.jaxrpc.xop.rpclit; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.HandlerInfo; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPMessage; - -import org.jboss.logging.Logger; -import org.jboss.ws.core.soap.NameImpl; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @since Jun 16, 2006 - */ -public class InlineHandler extends GenericHandler -{ - HandlerInfo config; - - private static Logger log = Logger.getLogger(InlineHandler.class); - - public QName[] getHeaders() - { - return new QName[0]; - } - - public void init(HandlerInfo config) { - this.config = config; - } - - public boolean handleRequest(MessageContext messageContext) - { - dumpMessage(messageContext, "parameters"); - return true; - } - - public boolean handleResponse(MessageContext messageContext) - { - dumpMessage(messageContext, "result"); - return true; - } - - private void dumpMessage(MessageContext messageContext, String parentName) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)messageContext).getMessage(); - SOAPBody soapBody = soapMessage.getSOAPBody(); - - SOAPElement bodyElement = (SOAPElement)soapBody.getChildElements().next(); - SOAPElement wrapper = (SOAPElement)bodyElement.getChildElements(new NameImpl(parentName)).next(); - SOAPElement xopElement = (SOAPElement)wrapper.getChildElements(new NameImpl("xopContent")).next(); - String base64Value = xopElement.getValue(); - log.debug("base64Value: " + base64Value); - messageContext.setProperty("xop.inline.value", base64Value); - } - catch (Exception e) - { - // ingore, happens when simple types are send - } - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/InlineHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,65 @@ +package org.jboss.test.ws.jaxrpc.xop.rpclit; + +import javax.xml.namespace.QName; +import javax.xml.rpc.handler.GenericHandler; +import javax.xml.rpc.handler.HandlerInfo; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.handler.soap.SOAPMessageContext; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPElement; +import javax.xml.soap.SOAPMessage; + +import org.jboss.logging.Logger; +import org.jboss.ws.core.soap.NameImpl; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @since Jun 16, 2006 + */ +public class InlineHandler extends GenericHandler +{ + HandlerInfo config; + + private static Logger log = Logger.getLogger(InlineHandler.class); + + public QName[] getHeaders() + { + return new QName[0]; + } + + public void init(HandlerInfo config) { + this.config = config; + } + + public boolean handleRequest(MessageContext messageContext) + { + dumpMessage(messageContext, "parameters"); + return true; + } + + public boolean handleResponse(MessageContext messageContext) + { + dumpMessage(messageContext, "result"); + return true; + } + + private void dumpMessage(MessageContext messageContext, String parentName) + { + try + { + SOAPMessage soapMessage = ((SOAPMessageContext)messageContext).getMessage(); + SOAPBody soapBody = soapMessage.getSOAPBody(); + + SOAPElement bodyElement = (SOAPElement)soapBody.getChildElements().next(); + SOAPElement wrapper = (SOAPElement)bodyElement.getChildElements(new NameImpl(parentName)).next(); + SOAPElement xopElement = (SOAPElement)wrapper.getChildElements(new NameImpl("xopContent")).next(); + String base64Value = xopElement.getValue(); + log.debug("base64Value: " + base64Value); + messageContext.setProperty("xop.inline.value", base64Value); + } + catch (Exception e) + { + // ingore, happens when simple types are send + } + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,219 +0,0 @@ -/* - * 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.jaxrpc.xop.rpclit; - -import java.awt.Image; -import java.io.File; -import java.util.StringTokenizer; - -import javax.activation.DataHandler; -import javax.xml.rpc.Stub; -import javax.xml.transform.Source; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.XOPTestSupport; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.utils.IOUtils; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id:XOPBase.java 1321 2006-10-27 11:47:18Z heiko.braun(a)jboss.com $ - * @since Sep 25, 2006 - */ -public abstract class XOPBase extends JBossWSTest -{ - private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); - - protected abstract XOPPing getPort(); - - public void testRequestResponseOptimized() throws Exception - { - - DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); - byte[] bytesIn = IOUtils.convertToBytes(dh); - requestComplex(new PingMsg("1|1", bytesIn)); - - } - - public void testResponseOptimized() throws Exception - { - - byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); - requestComplex(new PingMsg("0|1", bytesIn)); - - } - - public void testRequestOptimized() throws Exception - { - - byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); - requestComplex(new PingMsg("1|0", bytesIn)); - - } - - private void requestComplex(PingMsg payload) throws Exception - { - StringTokenizer tok = new StringTokenizer(payload.getMessage(), "|"); - boolean mtomEnabled = tok.nextToken().equals("1"); - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.valueOf(mtomEnabled)); - - PingMsgResponse value = getPort().ping(payload); - assertNotNull("Return value was null", value); - byte[] bytesOut = value.getXopContent(); - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", payload.getXopContent().length, bytesOut.length); - } - - public void testSimpleTypesOptimized() throws Exception - { - DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); - byte[] bytesIn = IOUtils.convertToBytes(dh); - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - byte[] bytesOut = getPort().pingSimple("s1|s1", bytesIn); - - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } - - public void testSimpleTypesResponseOptimized() throws Exception - { - DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); - byte[] bytesIn = IOUtils.convertToBytes(dh); - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - byte[] bytesOut = getPort().pingSimple("s0|s1", bytesIn); - - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } - - public void testImageResponseOptimized() throws Exception - { - - Image image = XOPTestSupport.createTestImage(imgFile); - - if (image != null) - { - // disable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingImage pingImage = new PingImage("0|1", image); - PingImageResponse response = getPort().pingImage(pingImage); - assertNotNull("Return xopContent was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - } - - public void testImageRequestOptimized() throws Exception - { - - Image image = XOPTestSupport.createTestImage(imgFile); - - if (image != null) - { - // enable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingImage pingImage = new PingImage("1|0", image); - PingImageResponse response = getPort().pingImage(pingImage); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - } - - public void testSourceResponseOptimized() throws Exception - { - - Source source = XOPTestSupport.createTestSource(); - - // disable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingSource pingSource = new PingSource(); - pingSource.setMessage("0|1"); - pingSource.setXopContent(source); - - PingSourceResponse response = getPort().pingSource(pingSource); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - - } - - public void testSourceRequestOptimized() throws Exception - { - - Source source = XOPTestSupport.createTestSource(); - - // enable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingSource pingSource = new PingSource(); - pingSource.setMessage("1|0"); - pingSource.setXopContent(source); - - PingSourceResponse response = getPort().pingSource(pingSource); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - - public void testDHResponseOptimized() throws Exception - { - - DataHandler dh = XOPTestSupport.createDataHandler(imgFile); - - // disable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - PingDataHandler reqest = new PingDataHandler(dh); - reqest.setMessage("0|1"); - - PingDataHandlerResponse response = getPort().pingDataHandler(reqest); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - - } - - public void testDHRequestOptimized() throws Exception - { - - DataHandler dh = XOPTestSupport.createDataHandler(imgFile); - - // enable MTOM - ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - - PingDataHandler reqest = new PingDataHandler(dh); - reqest.setMessage("1|0"); - - PingDataHandlerResponse response = getPort().pingDataHandler(reqest); - assertNotNull("Response was null", response); - assertNotNull("Return xopContent was null", response.getXopContent()); - } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,219 @@ +/* + * 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.jaxrpc.xop.rpclit; + +import java.awt.Image; +import java.io.File; +import java.util.StringTokenizer; + +import javax.activation.DataHandler; +import javax.xml.rpc.Stub; +import javax.xml.transform.Source; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.XOPTestSupport; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.utils.IOUtils; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id:XOPBase.java 1321 2006-10-27 11:47:18Z heiko.braun(a)jboss.com $ + * @since Sep 25, 2006 + */ +public abstract class XOPBase extends JBossWSTest +{ + private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); + + protected abstract XOPPing getPort(); + + public void testRequestResponseOptimized() throws Exception + { + + DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); + byte[] bytesIn = IOUtils.convertToBytes(dh); + requestComplex(new PingMsg("1|1", bytesIn)); + + } + + public void testResponseOptimized() throws Exception + { + + byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); + requestComplex(new PingMsg("0|1", bytesIn)); + + } + + public void testRequestOptimized() throws Exception + { + + byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); + requestComplex(new PingMsg("1|0", bytesIn)); + + } + + private void requestComplex(PingMsg payload) throws Exception + { + StringTokenizer tok = new StringTokenizer(payload.getMessage(), "|"); + boolean mtomEnabled = tok.nextToken().equals("1"); + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.valueOf(mtomEnabled)); + + PingMsgResponse value = getPort().ping(payload); + assertNotNull("Return value was null", value); + byte[] bytesOut = value.getXopContent(); + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", payload.getXopContent().length, bytesOut.length); + } + + public void testSimpleTypesOptimized() throws Exception + { + DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); + byte[] bytesIn = IOUtils.convertToBytes(dh); + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + byte[] bytesOut = getPort().pingSimple("s1|s1", bytesIn); + + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + public void testSimpleTypesResponseOptimized() throws Exception + { + DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); + byte[] bytesIn = IOUtils.convertToBytes(dh); + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + byte[] bytesOut = getPort().pingSimple("s0|s1", bytesIn); + + assertNotNull("Return xopContent was null", bytesOut); + assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } + + public void testImageResponseOptimized() throws Exception + { + + Image image = XOPTestSupport.createTestImage(imgFile); + + if (image != null) + { + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingImage pingImage = new PingImage("0|1", image); + PingImageResponse response = getPort().pingImage(pingImage); + assertNotNull("Return xopContent was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + } + + public void testImageRequestOptimized() throws Exception + { + + Image image = XOPTestSupport.createTestImage(imgFile); + + if (image != null) + { + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingImage pingImage = new PingImage("1|0", image); + PingImageResponse response = getPort().pingImage(pingImage); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + } + + public void testSourceResponseOptimized() throws Exception + { + + Source source = XOPTestSupport.createTestSource(); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingSource pingSource = new PingSource(); + pingSource.setMessage("0|1"); + pingSource.setXopContent(source); + + PingSourceResponse response = getPort().pingSource(pingSource); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testSourceRequestOptimized() throws Exception + { + + Source source = XOPTestSupport.createTestSource(); + + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingSource pingSource = new PingSource(); + pingSource.setMessage("1|0"); + pingSource.setXopContent(source); + + PingSourceResponse response = getPort().pingSource(pingSource); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + + public void testDHResponseOptimized() throws Exception + { + + DataHandler dh = XOPTestSupport.createDataHandler(imgFile); + + // disable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingDataHandler reqest = new PingDataHandler(dh); + reqest.setMessage("0|1"); + + PingDataHandlerResponse response = getPort().pingDataHandler(reqest); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testDHRequestOptimized() throws Exception + { + + DataHandler dh = XOPTestSupport.createDataHandler(imgFile); + + // enable MTOM + ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingDataHandler reqest = new PingDataHandler(dh); + reqest.setMessage("1|0"); + + PingDataHandlerResponse response = getPort().pingDataHandler(reqest); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,63 +0,0 @@ -/* -* 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.jaxrpc.xop.rpclit; - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id$ - * @since Sep 22, 2006 - */ -public class XOPHandlerTestCase extends XOPBase { - - private static XOPPing port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-rpclit_handler.war, jaxrpc-samples-xop-rpclit_handler-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCaseRPC"); - port = (XOPPing)service.getPort(XOPPing.class); - ((StubExt)port).setConfigName("Standard MTOM client"); - } - - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit_handler"); - } - - protected XOPPing getPort() { - return port; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,63 @@ +/* +* 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.jaxrpc.xop.rpclit; + +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id$ + * @since Sep 22, 2006 + */ +public class XOPHandlerTestCase extends XOPBase { + + private static XOPPing port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-rpclit_handler.war, jaxrpc-samples-xop-rpclit_handler-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPHandlerTestCaseRPC"); + port = (XOPPing)service.getPort(XOPPing.class); + ((StubExt)port).setConfigName("Standard MTOM client"); + } + + //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit_handler"); + } + + protected XOPPing getPort() { + return port; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,23 +0,0 @@ -/* - * JBoss, the OpenSource EJB server - * Distributable under LGPL license. See terms of license at gnu.org. - */ -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.xop.rpclit; - -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; - -public interface XOPPing extends java.rmi.Remote -{ - public org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.xop.shared.PingMsg pingMsg) throws java.rmi.RemoteException; - public byte[] pingSimple(String parameters, byte[] xopContent) throws java.rmi.RemoteException; - public PingImageResponse pingImage(PingImage pingImage) throws java.rmi.RemoteException; - public PingSourceResponse pingSource(PingSource pingSource) throws java.rmi.RemoteException; - public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws java.rmi.RemoteException; -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPing.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,23 @@ +/* + * JBoss, the OpenSource EJB server + * Distributable under LGPL license. See terms of license at gnu.org. + */ +//Auto Generated by jbossws - Please do not edit!!! + +package org.jboss.test.ws.jaxrpc.xop.rpclit; + +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; + +public interface XOPPing extends java.rmi.Remote +{ + public org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.xop.shared.PingMsg pingMsg) throws java.rmi.RemoteException; + public byte[] pingSimple(String parameters, byte[] xopContent) throws java.rmi.RemoteException; + public PingImageResponse pingImage(PingImage pingImage) throws java.rmi.RemoteException; + public PingSourceResponse pingSource(PingSource pingSource) throws java.rmi.RemoteException; + public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws java.rmi.RemoteException; +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,49 +0,0 @@ -package org.jboss.test.ws.jaxrpc.xop.rpclit; - -import java.rmi.RemoteException; - -import org.jboss.test.ws.jaxrpc.xop.shared.MTOMServiceBase; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; - -/** - * @author Heiko Braun, <heiko(a)openj.net&gt; - * @since 11-Apr-2006 - */ -public class XOPPingImpl extends MTOMServiceBase implements XOPPing { - - public PingMsgResponse ping(PingMsg pingMsg) throws RemoteException { - - String message = pingMsg.getMessage(); - toggleXOP(message); - - return new PingMsgResponse(pingMsg.getXopContent()); - } - - public byte[] pingSimple(String parameters, byte[] xopContent) throws RemoteException { - toggleXOP(parameters); - return xopContent; - } - - public PingImageResponse pingImage(PingImage pingImage) throws RemoteException { - toggleXOP(pingImage.getMessage()); - return new PingImageResponse(pingImage.getXopContent()); - } - - public PingSourceResponse pingSource(PingSource pingSource) throws RemoteException { - toggleXOP(pingSource.getMessage()); - return new PingSourceResponse(pingSource.getXopContent()); - } - - public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws RemoteException { - toggleXOP(pingDataHandler.getMessage()); - return new PingDataHandlerResponse(pingDataHandler.getXopContent()); - } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingImpl.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,49 @@ +package org.jboss.test.ws.jaxrpc.xop.rpclit; + +import java.rmi.RemoteException; + +import org.jboss.test.ws.jaxrpc.xop.shared.MTOMServiceBase; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; +import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; +import org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; +import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSource; +import org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse; + +/** + * @author Heiko Braun, <heiko(a)openj.net&gt; + * @since 11-Apr-2006 + */ +public class XOPPingImpl extends MTOMServiceBase implements XOPPing { + + public PingMsgResponse ping(PingMsg pingMsg) throws RemoteException { + + String message = pingMsg.getMessage(); + toggleXOP(message); + + return new PingMsgResponse(pingMsg.getXopContent()); + } + + public byte[] pingSimple(String parameters, byte[] xopContent) throws RemoteException { + toggleXOP(parameters); + return xopContent; + } + + public PingImageResponse pingImage(PingImage pingImage) throws RemoteException { + toggleXOP(pingImage.getMessage()); + return new PingImageResponse(pingImage.getXopContent()); + } + + public PingSourceResponse pingSource(PingSource pingSource) throws RemoteException { + toggleXOP(pingSource.getMessage()); + return new PingSourceResponse(pingSource.getXopContent()); + } + + public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws RemoteException { + toggleXOP(pingDataHandler.getMessage()); + return new PingDataHandlerResponse(pingDataHandler.getXopContent()); + } + +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,17 +0,0 @@ -/* -* JBoss, the OpenSource EJB server -* Distributable under LGPL license. See terms of license at gnu.org. -*/ - -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.xop.rpclit; - - -import javax.xml.rpc.ServiceException; - - -public interface XOPPingService extends javax.xml.rpc.Service -{ - public org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing getTestServicePort() throws ServiceException; -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPPingService.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,17 @@ +/* +* JBoss, the OpenSource EJB server +* Distributable under LGPL license. See terms of license at gnu.org. +*/ + +//Auto Generated by jbossws - Please do not edit!!! + +package org.jboss.test.ws.jaxrpc.xop.rpclit; + + +import javax.xml.rpc.ServiceException; + + +public interface XOPPingService extends javax.xml.rpc.Service +{ + public org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing getTestServicePort() throws ServiceException; +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,66 +0,0 @@ -/* - * 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.jaxrpc.xop.rpclit; - -// $Id$ - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; - -/** - * - * @author Heiko.Braun(a)jboss.org - * @since 11-Nov-2005 - */ -public class XOPTestCase extends XOPBase { - - private static XOPPing port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-rpclit.war, jaxrpc-samples-xop-rpclit-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCaseRPC"); - port = (XOPPing)service.getPort(XOPPing.class); - ((StubExt)port).setConfigName("Standard MTOM client"); - } - - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit"); - } - - protected XOPPing getPort() { - return port; - } - -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,66 @@ +/* + * 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.jaxrpc.xop.rpclit; + +// $Id$ + +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; + +/** + * + * @author Heiko.Braun(a)jboss.org + * @since 11-Nov-2005 + */ +public class XOPTestCase extends XOPBase { + + private static XOPPing port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-rpclit.war, jaxrpc-samples-xop-rpclit-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/XOPTestCaseRPC"); + port = (XOPPing)service.getPort(XOPPing.class); + ((StubExt)port).setConfigName("Standard MTOM client"); + } + + //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit"); + } + + protected XOPPing getPort() { + return port; + } + +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,54 +0,0 @@ -/* -* 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.jaxrpc.xop.shared; - -import java.util.StringTokenizer; - -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.xop.XOPContext; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id$ - * @since Sep 25, 2006 - */ -public class MTOMServiceBase { - protected void toggleXOP(String message) { - StringTokenizer tok = new StringTokenizer(message, "|"); - String requestOptimized = tok.nextToken(); - String responseOptimized = tok.nextToken(); - System.out.println(requestOptimized+"|"+responseOptimized); - - if(requestOptimized.equals("1") && !XOPContext.isXOPEncodedRequest()) - { - throw new RuntimeException("Illegal state: No XOP encoded request found"); - } - - if(responseOptimized.equals("0")) - { - CommonMessageContext ctx = MessageContextAssociation.peekMessageContext(); - ctx.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - } - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,54 @@ +/* +* 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.jaxrpc.xop.shared; + +import java.util.StringTokenizer; + +import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.extensions.xop.XOPContext; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id$ + * @since Sep 25, 2006 + */ +public class MTOMServiceBase { + protected void toggleXOP(String message) { + StringTokenizer tok = new StringTokenizer(message, "|"); + String requestOptimized = tok.nextToken(); + String responseOptimized = tok.nextToken(); + System.out.println(requestOptimized+"|"+responseOptimized); + + if(requestOptimized.equals("1") && !XOPContext.isXOPEncodedRequest()) + { + throw new RuntimeException("Illegal state: No XOP encoded request found"); + } + + if(responseOptimized.equals("0")) + { + CommonMessageContext ctx = MessageContextAssociation.peekMessageContext(); + ctx.setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + } + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,57 +0,0 @@ -/* -* 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.jaxrpc.xop.shared; - -import javax.activation.DataHandler; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id: PingDataHandler.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ - * @since Oct 23, 2006 - */ -public class PingDataHandler { - String message; - DataHandler xopContent; - - public PingDataHandler() { - } - - public PingDataHandler(DataHandler dataHandler) { - this.xopContent = dataHandler; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public DataHandler getXopContent() { - return xopContent; - } - - public void setXopContent(DataHandler xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,57 @@ +/* +* 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.jaxrpc.xop.shared; + +import javax.activation.DataHandler; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id: PingDataHandler.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ + * @since Oct 23, 2006 + */ +public class PingDataHandler { + String message; + DataHandler xopContent; + + public PingDataHandler() { + } + + public PingDataHandler(DataHandler dataHandler) { + this.xopContent = dataHandler; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public DataHandler getXopContent() { + return xopContent; + } + + public void setXopContent(DataHandler xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,48 +0,0 @@ -/* -* 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.jaxrpc.xop.shared; - -import javax.activation.DataHandler; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id: PingDataHandlerResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ - * @since Oct 23, 2006 - */ -public class PingDataHandlerResponse { - DataHandler xopContent; - - public PingDataHandlerResponse() { - } - - public PingDataHandlerResponse(DataHandler dataHandler) { - this.xopContent = dataHandler; - } - - public DataHandler getXopContent() { - return xopContent; - } - - public void setXopContent(DataHandler xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,48 @@ +/* +* 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.jaxrpc.xop.shared; + +import javax.activation.DataHandler; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id: PingDataHandlerResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ + * @since Oct 23, 2006 + */ +public class PingDataHandlerResponse { + DataHandler xopContent; + + public PingDataHandlerResponse() { + } + + public PingDataHandlerResponse(DataHandler dataHandler) { + this.xopContent = dataHandler; + } + + public DataHandler getXopContent() { + return xopContent; + } + + public void setXopContent(DataHandler xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,59 +0,0 @@ -/* -* 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.jaxrpc.xop.shared; - -import java.awt.Image; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id: PingImage.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ - * @since Oct 17, 2006 - */ -public class PingImage { - - String message; - Image xopContent; - - public PingImage() { - } - - public PingImage(String message, Image xopContent) { - this.message = message; - this.xopContent = xopContent; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public Image getXopContent() { - return xopContent; - } - - public void setXopContent(Image xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,59 @@ +/* +* 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.jaxrpc.xop.shared; + +import java.awt.Image; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id: PingImage.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ + * @since Oct 17, 2006 + */ +public class PingImage { + + String message; + Image xopContent; + + public PingImage() { + } + + public PingImage(String message, Image xopContent) { + this.message = message; + this.xopContent = xopContent; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Image getXopContent() { + return xopContent; + } + + public void setXopContent(Image xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,49 +0,0 @@ -/* -* 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.jaxrpc.xop.shared; - -import java.awt.Image; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id: PingImageResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ - * @since Oct 17, 2006 - */ -public class PingImageResponse { - - Image xopContent; - - public PingImageResponse() { - } - - public PingImageResponse(Image xopContent) { - this.xopContent = xopContent; - } - - public Image getXopContent() { - return xopContent; - } - - public void setXopContent(Image xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,49 @@ +/* +* 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.jaxrpc.xop.shared; + +import java.awt.Image; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id: PingImageResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ + * @since Oct 17, 2006 + */ +public class PingImageResponse { + + Image xopContent; + + public PingImageResponse() { + } + + public PingImageResponse(Image xopContent) { + this.xopContent = xopContent; + } + + public Image getXopContent() { + return xopContent; + } + + public void setXopContent(Image xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,32 +0,0 @@ -/* - * JBoss, the OpenSource EJB server - * Distributable under LGPL license. See terms of license at gnu.org. - */ -//Auto Generated by jbossws - Please do not edit!!! - -package org.jboss.test.ws.jaxrpc.xop.shared; - -public class PingMsg -{ - protected String message; - protected byte[] xopContent; - - public PingMsg(){} - - public PingMsg(String message, byte[] dataHandler){ - this.message=message; - this.xopContent = dataHandler; - } - - public java.lang.String getMessage() { return message ;} - - public void setMessage(java.lang.String message){ this.message=message; } - - public byte[] getXopContent() { - return xopContent; - } - - public void setXopContent(byte[] xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsg.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,32 @@ +/* + * JBoss, the OpenSource EJB server + * Distributable under LGPL license. See terms of license at gnu.org. + */ +//Auto Generated by jbossws - Please do not edit!!! + +package org.jboss.test.ws.jaxrpc.xop.shared; + +public class PingMsg +{ + protected String message; + protected byte[] xopContent; + + public PingMsg(){} + + public PingMsg(String message, byte[] dataHandler){ + this.message=message; + this.xopContent = dataHandler; + } + + public java.lang.String getMessage() { return message ;} + + public void setMessage(java.lang.String message){ this.message=message; } + + public byte[] getXopContent() { + return xopContent; + } + + public void setXopContent(byte[] xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,28 +0,0 @@ -/* - * JBoss, the OpenSource EJB server - * Distributable under LGPL license. See terms of license at gnu.org. - */ -//Auto Generated by jbossws - Please do not edit!!! - - -package org.jboss.test.ws.jaxrpc.xop.shared; - -public class PingMsgResponse -{ - protected byte[] xopContent; - - public PingMsgResponse(){ - } - - public PingMsgResponse(byte[] dataHandler) { - this.xopContent = dataHandler; - } - - public byte[] getXopContent() { - return xopContent; - } - - public void setXopContent(byte[] xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingMsgResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,28 @@ +/* + * JBoss, the OpenSource EJB server + * Distributable under LGPL license. See terms of license at gnu.org. + */ +//Auto Generated by jbossws - Please do not edit!!! + + +package org.jboss.test.ws.jaxrpc.xop.shared; + +public class PingMsgResponse +{ + protected byte[] xopContent; + + public PingMsgResponse(){ + } + + public PingMsgResponse(byte[] dataHandler) { + this.xopContent = dataHandler; + } + + public byte[] getXopContent() { + return xopContent; + } + + public void setXopContent(byte[] xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,50 +0,0 @@ -/* -* 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.jaxrpc.xop.shared; - -import javax.xml.transform.Source; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id: PingSource.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ - * @since Oct 19, 2006 - */ -public class PingSource { - String message; - Source xopContent; - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public Source getXopContent() { - return xopContent; - } - - public void setXopContent(Source xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,50 @@ +/* +* 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.jaxrpc.xop.shared; + +import javax.xml.transform.Source; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id: PingSource.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ + * @since Oct 19, 2006 + */ +public class PingSource { + String message; + Source xopContent; + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Source getXopContent() { + return xopContent; + } + + public void setXopContent(Source xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,49 +0,0 @@ -/* -* 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.jaxrpc.xop.shared; - -import javax.xml.transform.Source; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id: PingSourceResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ - * @since Oct 19, 2006 - */ -public class PingSourceResponse { - - Source xopContent; - - public PingSourceResponse() { - } - - public PingSourceResponse(Source source) { - this.xopContent = source; - } - - public Source getXopContent() { - return xopContent; - } - - public void setXopContent(Source xopContent) { - this.xopContent = xopContent; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,49 @@ +/* +* 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.jaxrpc.xop.shared; + +import javax.xml.transform.Source; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id: PingSourceResponse.java 1296 2006-10-24 14:06:00Z heiko.braun(a)jboss.com $ + * @since Oct 19, 2006 + */ +public class PingSourceResponse { + + Source xopContent; + + public PingSourceResponse() { + } + + public PingSourceResponse(Source source) { + this.xopContent = source; + } + + public Source getXopContent() { + return xopContent; + } + + public void setXopContent(Source xopContent) { + this.xopContent = xopContent; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,151 +0,0 @@ -/* -* 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; - -import java.awt.Image; -import java.lang.reflect.Method; - -import javax.xml.bind.annotation.XmlMimeType; - -import junit.framework.TestCase; - -import org.jboss.ws.extensions.xop.jaxws.ReflectiveXOPScanner; - -/** - * Test the ReflectiveXOPScanner. - * - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id$ - * @since 04.12.2006 - */ -public class MimeDeclarationTestCase extends TestCase { - - static ReflectiveXOPScanner SCANNER = new ReflectiveXOPScanner(); - - - protected void setUp() throws Exception - { - SCANNER.reset(); - } - - public void testFieldAnnotation() throws Exception - { - String mimeType = SCANNER.scan(FieldAnnotation.class); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/xml", mimeType); - } - - public void testMethodAnnotation() throws Exception - { - String mimeType = SCANNER.scan(MethodAnnotation.class); - assertNotNull("Unable to find xop declaration", mimeType); - } - - public void testAnnotationMissing() throws Exception - { - String mimeType = SCANNER.scan(NoAnnotation.class); - assertNull("There should be no mimeType available", mimeType); - } - - public void testAnnotatedParameter() throws Exception - { - - if(true) - { - System.out.println("FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations"); - return; - } - - Method m = AnnotatedSEI.class.getMethod("foo", new Class[] {byte[].class}); - assertNotNull(m); - - System.out.println(m.getParameterAnnotations().length); - - String mimeType = SCANNER.scan( m.getParameterTypes()[0]); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/xml", mimeType); - } - - public void testSimpleRecursion() throws Exception - { - String mimeType = SCANNER.scan(SimpleRecursion.class); - assertNull(mimeType); - } - - public void testComplexRecursion() throws Exception - { - String mimeType = SCANNER.scan(ComplexRecursion.class); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/plain", mimeType); - } - - class FieldAnnotation - { - @XmlMimeType("text/xml") - public byte[] data; - - - @XmlMimeType("text/plain") // check field level precedence - public byte[] getData() { - return data; - } - } - - class MethodAnnotation - { - private Image data; - - @XmlMimeType("image/jpeg") - public Image getData() { - return data; - } - } - - class NoAnnotation - { - private Image data; - - public Image getData() { - return data; - } - } - - interface AnnotatedSEI { - void foo(@XmlMimeType("text/xml")byte[] bar); - } - - class SimpleRecursion { - private SimpleRecursion data; - } - - class ComplexRecursion - { - String data; - Nested nested; - } - - class Nested - { - @XmlMimeType("text/plain") - String data; - } -} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,14 +1,20 @@ package org.jboss.test.ws.jaxws.samples.xop.doclit; -import java.io.ByteArrayOutputStream; - -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.MessageContext; - import org.jboss.logging.Logger; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.jaxws.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.ws.handler.MessageContext; + +/** + * A MTOM handler should see the conceptual payload, + * which means an inlined representation of the binary data. + */ class MTOMProtocolHandler extends GenericSOAPHandler { private Logger log = Logger.getLogger(MTOMProtocolHandler.class); @@ -24,13 +30,16 @@ private boolean dumpMessage(MessageContext context) { try { - SOAPMessage msg = ((CommonMessageContext)context).getSOAPMessage(); - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - msg.writeTo(bout); - log.info(bout.toString()); - } catch (Exception e) { - throw new RuntimeException(e); + 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)+"[...]"); } + catch (SOAPException e) + { + // + } return true; } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -61,6 +61,8 @@ // enable MTOM binding = (SOAPBinding)((BindingProvider)port).getBinding(); + binding.setMTOMEnabled(true); + List<Handler> handlerChain = new ArrayList<Handler>(); handlerChain.addAll(binding.getHandlerChain()); handlerChain.add(new MTOMProtocolHandler()); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -57,6 +57,7 @@ // enable MTOM binding = (SOAPBinding)((BindingProvider)port).getBinding(); + binding.setMTOMEnabled(true); } Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,159 +0,0 @@ -/* -* 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.xop; - -import junit.framework.TestCase; -import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.ws.extensions.xop.jaxws.ReflectiveXOPScanner; - -import javax.xml.bind.annotation.XmlMimeType; -import java.awt.*; -import java.lang.reflect.Method; - -/** - * Test the ReflectiveXOPScanner. - * - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id$ - * @since 04.12.2006 - */ -public class MimeDeclarationTestCase extends TestCase { - - static ReflectiveXOPScanner SCANNER = new ReflectiveXOPScanner(); - - - protected void setUp() throws Exception - { - SCANNER.reset(); - } - - public void testFieldAnnotation() throws Exception - { - String mimeType = SCANNER.scan(FieldAnnotation.class); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/xml", mimeType); - } - - public void testMethodAnnotation() throws Exception - { - String mimeType = SCANNER.scan(MethodAnnotation.class); - assertNotNull("Unable to find xop declaration", mimeType); - } - - public void testAnnotationMissing() throws Exception - { - String mimeType = SCANNER.scan(NoAnnotation.class); - assertNull("There should be no mimeType available", mimeType); - } - - public void testAnnotatedParameter() throws Exception - { - - if(true) - { - System.out.println("FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations"); - return; - } - - Method m = AnnotatedSEI.class.getMethod("foo", new Class[] {byte[].class}); - assertNotNull(m); - - System.out.println(m.getParameterAnnotations().length); - - String mimeType = SCANNER.scan( m.getParameterTypes()[0]); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/xml", mimeType); - } - - public void testSimpleRecursion() throws Exception - { - String mimeType = SCANNER.scan(SimpleRecursion.class); - assertNull(mimeType); - } - - public void testComplexRecursion() throws Exception - { - String mimeType = SCANNER.scan(ComplexRecursion.class); - assertNotNull("Unable to find xop declaration", mimeType); - assertEquals("text/plain", mimeType); - } - - public void testXOPContext() - { - SOAPMessageContextJAXWS msgContext = new SOAPMessageContextJAXWS(); - MessageContextAssociation.pushMessageContext(msgContext); - assertFalse("MTOM should be disabled", XOPContext.isMTOMEnabled()); - } - - class FieldAnnotation - { - @XmlMimeType("text/xml") - public byte[] data; - - - @XmlMimeType("text/plain") // check field level precedence - public byte[] getData() { - return data; - } - } - - class MethodAnnotation - { - private Image data; - - @XmlMimeType("image/jpeg") - public Image getData() { - return data; - } - } - - class NoAnnotation - { - private Image data; - - public Image getData() { - return data; - } - } - - interface AnnotatedSEI { - void foo(@XmlMimeType("text/xml")byte[] bar); - } - - class SimpleRecursion { - private SimpleRecursion data; - } - - class ComplexRecursion - { - String data; - Nested nested; - } - - class Nested - { - @XmlMimeType("text/plain") - String data; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,159 @@ +/* +* 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.xop; + +import junit.framework.TestCase; +import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.ws.extensions.xop.jaxws.ReflectiveXOPScanner; + +import javax.xml.bind.annotation.XmlMimeType; +import java.awt.*; +import java.lang.reflect.Method; + +/** + * Test the ReflectiveXOPScanner. + * + * @author Heiko Braun <heiko.braun(a)jboss.com&gt; + * @version $Id$ + * @since 04.12.2006 + */ +public class MimeDeclarationTestCase extends TestCase { + + static ReflectiveXOPScanner SCANNER = new ReflectiveXOPScanner(); + + + protected void setUp() throws Exception + { + SCANNER.reset(); + } + + public void testFieldAnnotation() throws Exception + { + String mimeType = SCANNER.scan(FieldAnnotation.class); + assertNotNull("Unable to find xop declaration", mimeType); + assertEquals("text/xml", mimeType); + } + + public void testMethodAnnotation() throws Exception + { + String mimeType = SCANNER.scan(MethodAnnotation.class); + assertNotNull("Unable to find xop declaration", mimeType); + } + + public void testAnnotationMissing() throws Exception + { + String mimeType = SCANNER.scan(NoAnnotation.class); + assertNull("There should be no mimeType available", mimeType); + } + + public void testAnnotatedParameter() throws Exception + { + + if(true) + { + System.out.println("FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations"); + return; + } + + Method m = AnnotatedSEI.class.getMethod("foo", new Class[] {byte[].class}); + assertNotNull(m); + + System.out.println(m.getParameterAnnotations().length); + + String mimeType = SCANNER.scan( m.getParameterTypes()[0]); + assertNotNull("Unable to find xop declaration", mimeType); + assertEquals("text/xml", mimeType); + } + + public void testSimpleRecursion() throws Exception + { + String mimeType = SCANNER.scan(SimpleRecursion.class); + assertNull(mimeType); + } + + public void testComplexRecursion() throws Exception + { + String mimeType = SCANNER.scan(ComplexRecursion.class); + assertNotNull("Unable to find xop declaration", mimeType); + assertEquals("text/plain", mimeType); + } + + public void testXOPContext() + { + SOAPMessageContextJAXWS msgContext = new SOAPMessageContextJAXWS(); + MessageContextAssociation.pushMessageContext(msgContext); + assertFalse("MTOM should be disabled", XOPContext.isMTOMEnabled()); + } + + class FieldAnnotation + { + @XmlMimeType("text/xml") + public byte[] data; + + + @XmlMimeType("text/plain") // check field level precedence + public byte[] getData() { + return data; + } + } + + class MethodAnnotation + { + private Image data; + + @XmlMimeType("image/jpeg") + public Image getData() { + return data; + } + } + + class NoAnnotation + { + private Image data; + + public Image getData() { + return data; + } + } + + interface AnnotatedSEI { + void foo(@XmlMimeType("text/xml")byte[] bar); + } + + class SimpleRecursion { + private SimpleRecursion data; + } + + class ComplexRecursion + { + String data; + Nested nested; + } + + class Nested + { + @XmlMimeType("text/plain") + String data; + } +} Modified: trunk/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -10,8 +10,13 @@ <endpoint-config> <config-name>Standard Endpoint</config-name> </endpoint-config> - + <endpoint-config> + <config-name>Standard MTOM Endpoint</config-name> + <feature>http://org.jboss.ws/mtom</feature> + </endpoint-config> + + <endpoint-config> <config-name>Standard WSSecurity Endpoint</config-name> <pre-handler-chain> <handler-chain-name>PreHandlerChain</handler-chain-name> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/StandardTypes</service-ref-name> - <config-name>Standard MTOM disabled client</config-name> + <config-name>Standard Client</config-name> <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-marshall-rpclit?wsdl</wsdl-override> </service-ref> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -7,7 +7,7 @@ <context-param> <param-name>jbossws-config-name</param-name> - <param-value>Standard MTOM disabled endpoint</param-value> + <param-value>Standard Endpoint</param-value> </context-param> <servlet> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -16,11 +16,7 @@ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.marshall.StandardTypes</service-endpoint-interface> <service-impl-bean> <servlet-link>StandardTypes</servlet-link> - </service-impl-bean> - <handler> - <handler-name>MTOM disabled handler</handler-name> - <handler-class>org.jboss.ws.extensions.xop.DisableMTOMHandler</handler-class> - </handler> + </service-impl-bean> </port-component> </webservice-description> </webservices> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -7,8 +7,9 @@ <context-param> <param-name>jbossws-config-name</param-name>> - <param-value>Standard MTOM disabled endpoint</param-value> + <param-value>Standard Endpoint</param-value> </context-param> + <servlet> <servlet-name>OutParamTestService</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.outparam.OutParamTestServiceBean</servlet-class> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -7,8 +7,9 @@ <context-param> <param-name>jbossws-config-name</param-name>> - <param-value>Standard MTOM disabled endpoint</param-value> + <param-value>Standard Endpoint</param-value> </context-param> + <servlet> <servlet-name>TestService</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.samples.holder.HolderTestServiceBean</servlet-class> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml 2007-02-09 15:44:12 UTC (rev 2323) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -5,6 +5,12 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> + <context-param> + <param-name>jbossws-config-name</param-name>> + <param-value>Standard MTOM Endpoint</param-value> + </context-param> + + <servlet> <servlet-name>EmployeeEndpoint</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.samples.mtom.EmployeeRecordsImpl</servlet-class> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,134 +0,0 @@ -<schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... xmlns="http://www.w3.org/2001/XMLSchema" - xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws&... - xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws&... - - <complexType name="Address"> - <sequence> - <element name="city" nillable="true" type="string"/> - <element name="state" nillable="true" type="string"/> - <element name="street" nillable="true" type="string"/> - <element name="zip" nillable="true" type="string"/> - </sequence> - </complexType> - <complexType name="AlreadyRegisteredException"> - <complexContent> - <extension base="tns:RegistrationException"> - <sequence> - <element name="existingId" type="long"/> - </sequence> - </extension> - </complexContent> - </complexType> - <complexType name="BulkRegister"> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="Customers" nillable="true" type="tns:Customer"/> - <element name="When" nillable="true" type="dateTime"/> - </sequence> - </complexType> - <complexType name="BulkRegisterResponse"> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="RegisteredIDs" type="long"/> - </sequence> - </complexType> - <complexType name="Customer"> - <sequence> - <element name="address" nillable="true" type="tns:Address"/> - <element maxOccurs="unbounded" minOccurs="0" name="contactNumbers" nillable="true" type="tns:PhoneNumber"/> - <element name="id" type="long"/> - <element name="name" nillable="true" type="tns:Name"/> - <element maxOccurs="unbounded" minOccurs="0" name="referredCustomers" nillable="true" type="tns:Customer"/> - </sequence> - </complexType> - <complexType name="GetStatistics"> - <sequence> - <element name="Customer" nillable="true" type="tns:Customer"/> - </sequence> - </complexType> - <complexType name="GetStatisticsResponse"> - <sequence> - <element name="Statistics" nillable="true" type="Statistics"/> - </sequence> - </complexType> - - <complexType name="Statistics"> - <sequence> - <element name="activationTime" nillable="true" type="dateTime"/> - <element name="hits" type="long"/> - </sequence> - </complexType> - - - <complexType name="InvoiceCustomer"> - <complexContent> - <extension base="tns:Customer"> - <sequence> - <element name="cycleDay" type="int"/> - </sequence> - </extension> - </complexContent> - </complexType> - <complexType name="Name"> - <sequence> - <element name="firstName" nillable="true" type="string"/> - <element name="lastName" nillable="true" type="string"/> - <element name="middleName" nillable="true" type="string"/> - </sequence> - </complexType> - <complexType name="PhoneNumber"> - <sequence> - <element name="areaCode" nillable="true" type="string"/> - <element name="exchange" nillable="true" type="string"/> - <element name="line" nillable="true" type="string"/> - </sequence> - </complexType> - <complexType name="Register"> - <sequence> - <element name="Customer" nillable="true" type="tns:Customer"/> - <element name="When" nillable="true" type="dateTime"/> - </sequence> - </complexType> - <complexType name="RegisterForInvoice"> - <sequence> - <element name="InvoiceCustomer" nillable="true" type="tns:InvoiceCustomer"/> - </sequence> - </complexType> - <complexType name="RegisterForInvoiceResponse"> - <sequence> - <element name="done" type="boolean"/> - </sequence> - </complexType> - <complexType name="RegisterResponse"> - <sequence> - <element name="RegisteredID" type="long"/> - </sequence> - </complexType> - <complexType name="RegistrationException"> - <sequence> - <element name="message" nillable="true" type="string"/> - </sequence> - </complexType> - <complexType name="ValidationException"> - <complexContent> - <extension base="tns:RegistrationException"> - <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="failiedCustomers" type="long"/> - </sequence> - </extension> - </complexContent> - </complexType> - <element name="AlreadyRegisteredException" type="tns:AlreadyRegisteredException"/> - <element name="BulkRegister" type="tns:BulkRegister"/> - <element name="BulkRegisterResponse" type="tns:BulkRegisterResponse"/> - <element name="GetStatistics" type="tns:GetStatistics"/> - <element name="GetStatisticsResponse" type="tns:GetStatisticsResponse"/> - <element name="Register" type="tns:Register"/> - <element name="RegisterForInvoice" type="tns:RegisterForInvoice"/> - <element name="RegisterForInvoiceResponse" type="tns:RegisterForInvoiceResponse"/> - <element name="RegisterResponse" type="tns:RegisterResponse"/> - <element name="RegistrationException" type="tns:RegistrationException"/> - <element name="ValidationException" type="tns:ValidationException"/> -</schema> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/circular.xsd 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,134 @@ +<schema elementFormDefault="qualified" targetNamespace="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws&... xmlns="http://www.w3.org/2001/XMLSchema" + xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws&... + xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:tns="http://complex.jsr181.jaxws.ws.test.jboss.org/jaws" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/jaws&... + + <complexType name="Address"> + <sequence> + <element name="city" nillable="true" type="string"/> + <element name="state" nillable="true" type="string"/> + <element name="street" nillable="true" type="string"/> + <element name="zip" nillable="true" type="string"/> + </sequence> + </complexType> + <complexType name="AlreadyRegisteredException"> + <complexContent> + <extension base="tns:RegistrationException"> + <sequence> + <element name="existingId" type="long"/> + </sequence> + </extension> + </complexContent> + </complexType> + <complexType name="BulkRegister"> + <sequence> + <element maxOccurs="unbounded" minOccurs="0" name="Customers" nillable="true" type="tns:Customer"/> + <element name="When" nillable="true" type="dateTime"/> + </sequence> + </complexType> + <complexType name="BulkRegisterResponse"> + <sequence> + <element maxOccurs="unbounded" minOccurs="0" name="RegisteredIDs" type="long"/> + </sequence> + </complexType> + <complexType name="Customer"> + <sequence> + <element name="address" nillable="true" type="tns:Address"/> + <element maxOccurs="unbounded" minOccurs="0" name="contactNumbers" nillable="true" type="tns:PhoneNumber"/> + <element name="id" type="long"/> + <element name="name" nillable="true" type="tns:Name"/> + <element maxOccurs="unbounded" minOccurs="0" name="referredCustomers" nillable="true" type="tns:Customer"/> + </sequence> + </complexType> + <complexType name="GetStatistics"> + <sequence> + <element name="Customer" nillable="true" type="tns:Customer"/> + </sequence> + </complexType> + <complexType name="GetStatisticsResponse"> + <sequence> + <element name="Statistics" nillable="true" type="Statistics"/> + </sequence> + </complexType> + + <complexType name="Statistics"> + <sequence> + <element name="activationTime" nillable="true" type="dateTime"/> + <element name="hits" type="long"/> + </sequence> + </complexType> + + + <complexType name="InvoiceCustomer"> + <complexContent> + <extension base="tns:Customer"> + <sequence> + <element name="cycleDay" type="int"/> + </sequence> + </extension> + </complexContent> + </complexType> + <complexType name="Name"> + <sequence> + <element name="firstName" nillable="true" type="string"/> + <element name="lastName" nillable="true" type="string"/> + <element name="middleName" nillable="true" type="string"/> + </sequence> + </complexType> + <complexType name="PhoneNumber"> + <sequence> + <element name="areaCode" nillable="true" type="string"/> + <element name="exchange" nillable="true" type="string"/> + <element name="line" nillable="true" type="string"/> + </sequence> + </complexType> + <complexType name="Register"> + <sequence> + <element name="Customer" nillable="true" type="tns:Customer"/> + <element name="When" nillable="true" type="dateTime"/> + </sequence> + </complexType> + <complexType name="RegisterForInvoice"> + <sequence> + <element name="InvoiceCustomer" nillable="true" type="tns:InvoiceCustomer"/> + </sequence> + </complexType> + <complexType name="RegisterForInvoiceResponse"> + <sequence> + <element name="done" type="boolean"/> + </sequence> + </complexType> + <complexType name="RegisterResponse"> + <sequence> + <element name="RegisteredID" type="long"/> + </sequence> + </complexType> + <complexType name="RegistrationException"> + <sequence> + <element name="message" nillable="true" type="string"/> + </sequence> + </complexType> + <complexType name="ValidationException"> + <complexContent> + <extension base="tns:RegistrationException"> + <sequence> + <element maxOccurs="unbounded" minOccurs="0" name="failiedCustomers" type="long"/> + </sequence> + </extension> + </complexContent> + </complexType> + <element name="AlreadyRegisteredException" type="tns:AlreadyRegisteredException"/> + <element name="BulkRegister" type="tns:BulkRegister"/> + <element name="BulkRegisterResponse" type="tns:BulkRegisterResponse"/> + <element name="GetStatistics" type="tns:GetStatistics"/> + <element name="GetStatisticsResponse" type="tns:GetStatisticsResponse"/> + <element name="Register" type="tns:Register"/> + <element name="RegisterForInvoice" type="tns:RegisterForInvoice"/> + <element name="RegisterForInvoiceResponse" type="tns:RegisterForInvoiceResponse"/> + <element name="RegisterResponse" type="tns:RegisterResponse"/> + <element name="RegistrationException" type="tns:RegistrationException"/> + <element name="ValidationException" type="tns:ValidationException"/> +</schema> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>XOP DOC/Lit without handlers</display-name> - - <service-ref> - <service-ref-name>service/XOPTestCase</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" + version="1.4"> + + <display-name>XOP DOC/Lit without handlers</display-name> + + <service-ref> + <service-ref-name>service/XOPTestCase</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> + </port-component-ref> + </service-ref> + +</application-client> + Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/XOPTestCase</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC + "-//JBoss//DTD Application Client 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>service/XOPTestCase</service-ref-name> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit?wsdl</wsdl-override> + </service-ref> + +</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,194 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.xop.doclit</package-type> - <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> - </package-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type> - <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestS... - <port-mapping> - <port-name>TestServicePort</port-name> - <java-port-name>TestServicePort</java-port-name> - </port-mapping> - </service-interface-mapping> - - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:Tes... - <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestS... - - <service-endpoint-method-mapping> - <java-method-name>ping</java-method-name> - <wsdl-operation>ping</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingO... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - <service-endpoint-method-mapping> - <java-method-name>pingImage</java-method-name> - <wsdl-operation>pingImage</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - <service-endpoint-method-mapping> - <java-method-name>pingSource</java-method-name> - <wsdl-operation>pingSource</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingS... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingS... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - <service-endpoint-method-mapping> - <java-method-name>pingDataHandler</java-method-name> - <wsdl-operation>pingDataHandler</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingD... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingD... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - </service-endpoint-interface-mapping> -</java-wsdl-mapping> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,194 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.xop.doclit</package-type> + <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> + </package-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:&gt;Pin... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestS... + <port-mapping> + <port-name>TestServicePort</port-name> + <java-port-name>TestServicePort</java-port-name> + </port-mapping> + </service-interface-mapping> + + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:Tes... + <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestS... + + <service-endpoint-method-mapping> + <java-method-name>ping</java-method-name> + <wsdl-operation>ping</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingO... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingImage</java-method-name> + <wsdl-operation>pingImage</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingSource</java-method-name> + <wsdl-operation>pingSource</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingS... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingS... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingDataHandler</java-method-name> + <wsdl-operation>pingDataHandler</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingD... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingD... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <context-param> - <param-name>jbossws-config-name</param-name>> - <param-value>Standard MTOM Endpoint</param-value> - </context-param> - - <servlet> - <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> - Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <context-param> + <param-name>jbossws-config-name</param-name>> + <param-value>Standard MTOM Endpoint</param-value> + </context-param> + + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://jboss.org/test/ws/xop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" - version="1.1"> - - <webservice-description> - <webservice-description-name>XOP DOC/Lit without handlers</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/service-doclit.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestService</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<webservices xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:impl="http://jboss.org/test/ws/xop" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" + version="1.1"> + + <webservice-description> + <webservice-description-name>XOP DOC/Lit without handlers</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/service-doclit.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestServicePort</port-component-name> + <wsdl-port>impl:TestServicePort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestService</servlet-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<wsdl:definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tns="http://jboss.org/test/ws/xop" - targetNamespace="http://jboss.org/test/ws/xop" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <wsdl:types> - <xsd:import schemaLocation="xsd0.xsd"/> - </wsdl:types> - - <wsdl:import namespace="http://jboss.org/test/ws/xop" location="wsdl0.wsdl"/> - - <wsdl:binding name="TestServiceBinding" type="tns:TestService"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" /> - <wsdl:operation name="ping"> - <soap:operation soapAction="http://jboss.org/test/ws/xop/Ping" style="document" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="pingImage"> - <soap:operation soapAction="http://jboss.org/test/ws/xop/PingImage" style="document" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="pingSource"> - <soap:operation soapAction="http://jboss.org/test/ws/xop/PingSource" style="document" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="pingDataHandler"> - <soap:operation soapAction="http://jboss.org/test/ws/xop/PingDataHandler" style="document" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="TestService"> - <wsdl:port name="TestServicePort" binding="tns:TestServiceBinding"> - <soap:address location="REPLACE_WITH_ACTUAL_URL" /> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/service-doclit.wsdl 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions + xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:tns="http://jboss.org/test/ws/xop" + targetNamespace="http://jboss.org/test/ws/xop" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + + <wsdl:types> + <xsd:import schemaLocation="xsd0.xsd"/> + </wsdl:types> + + <wsdl:import namespace="http://jboss.org/test/ws/xop" location="wsdl0.wsdl"/> + + <wsdl:binding name="TestServiceBinding" type="tns:TestService"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" /> + <wsdl:operation name="ping"> + <soap:operation soapAction="http://jboss.org/test/ws/xop/Ping" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="pingImage"> + <soap:operation soapAction="http://jboss.org/test/ws/xop/PingImage" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="pingSource"> + <soap:operation soapAction="http://jboss.org/test/ws/xop/PingSource" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="pingDataHandler"> + <soap:operation soapAction="http://jboss.org/test/ws/xop/PingDataHandler" style="document" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + + <wsdl:service name="TestService"> + <wsdl:port name="TestServicePort" binding="tns:TestServiceBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL" /> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,60 +0,0 @@ -<?xml version="1.0" ?> - -<wsdl:definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tns="http://jboss.org/test/ws/xop" - targetNamespace="http://jboss.org/test/ws/xop" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <wsdl:message name="PingIn"> - <wsdl:part name="parameters" element="tns:PingMsg" /> - </wsdl:message> - - <wsdl:message name="PingOut"> - <wsdl:part name="parameters" element="tns:PingMsgResponse" /> - </wsdl:message> - - <wsdl:message name="PingImageIn"> - <wsdl:part name="parameters" element="tns:PingImage" /> - </wsdl:message> - <wsdl:message name="PingImageOut"> - <wsdl:part name="parameters" element="tns:PingImageResponse" /> - </wsdl:message> - - <wsdl:message name="PingSourceIn"> - <wsdl:part name="parameters" element="tns:PingSource" /> - </wsdl:message> - <wsdl:message name="PingSourceOut"> - <wsdl:part name="parameters" element="tns:PingSourceResponse" /> - </wsdl:message> - - <wsdl:message name="PingDataHandlerIn"> - <wsdl:part name="parameters" element="tns:PingDataHandler" /> - </wsdl:message> - <wsdl:message name="PingDataHandlerOut"> - <wsdl:part name="parameters" element="tns:PingDataHandlerResponse" /> - </wsdl:message> - - <wsdl:portType name="TestService"> - <wsdl:operation name="ping"> - <wsdl:input message="tns:PingIn" /> - <wsdl:output message="tns:PingOut" /> - </wsdl:operation> - <wsdl:operation name="pingImage"> - <wsdl:input message="tns:PingImageIn" /> - <wsdl:output message="tns:PingImageOut" /> - </wsdl:operation> - <wsdl:operation name="pingSource"> - <wsdl:input message="tns:PingSourceIn" /> - <wsdl:output message="tns:PingSourceOut" /> - </wsdl:operation> - <wsdl:operation name="pingDataHandler"> - <wsdl:input message="tns:PingDataHandlerIn" /> - <wsdl:output message="tns:PingDataHandlerOut" /> - </wsdl:operation> - </wsdl:portType> - -</wsdl:definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/wsdl0.wsdl 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,60 @@ +<?xml version="1.0" ?> + +<wsdl:definitions + xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:tns="http://jboss.org/test/ws/xop" + targetNamespace="http://jboss.org/test/ws/xop" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + + <wsdl:message name="PingIn"> + <wsdl:part name="parameters" element="tns:PingMsg" /> + </wsdl:message> + + <wsdl:message name="PingOut"> + <wsdl:part name="parameters" element="tns:PingMsgResponse" /> + </wsdl:message> + + <wsdl:message name="PingImageIn"> + <wsdl:part name="parameters" element="tns:PingImage" /> + </wsdl:message> + <wsdl:message name="PingImageOut"> + <wsdl:part name="parameters" element="tns:PingImageResponse" /> + </wsdl:message> + + <wsdl:message name="PingSourceIn"> + <wsdl:part name="parameters" element="tns:PingSource" /> + </wsdl:message> + <wsdl:message name="PingSourceOut"> + <wsdl:part name="parameters" element="tns:PingSourceResponse" /> + </wsdl:message> + + <wsdl:message name="PingDataHandlerIn"> + <wsdl:part name="parameters" element="tns:PingDataHandler" /> + </wsdl:message> + <wsdl:message name="PingDataHandlerOut"> + <wsdl:part name="parameters" element="tns:PingDataHandlerResponse" /> + </wsdl:message> + + <wsdl:portType name="TestService"> + <wsdl:operation name="ping"> + <wsdl:input message="tns:PingIn" /> + <wsdl:output message="tns:PingOut" /> + </wsdl:operation> + <wsdl:operation name="pingImage"> + <wsdl:input message="tns:PingImageIn" /> + <wsdl:output message="tns:PingImageOut" /> + </wsdl:operation> + <wsdl:operation name="pingSource"> + <wsdl:input message="tns:PingSourceIn" /> + <wsdl:output message="tns:PingSourceOut" /> + </wsdl:operation> + <wsdl:operation name="pingDataHandler"> + <wsdl:input message="tns:PingDataHandlerIn" /> + <wsdl:output message="tns:PingDataHandlerOut" /> + </wsdl:operation> + </wsdl:portType> + +</wsdl:definitions> \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,108 +0,0 @@ -<?xml version="1.0" ?> -<s:schema xmlns:s="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://jboss.org/test/ws/xop" - xmlns:xmime="http://www.w3.org/2005/05/xmlmime" > - - <s:import namespace="http://www.w3.org/2005/05/xmlmime"/> - - <!-- - the xmime:expectedContentType is missing. - this maps to byte[] - --> - <s:element name="PingMsg"> - <s:complexType> - <s:sequence> - <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" type="s:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - - <!-- - a known media type maps to specific java type. - in this case a byte[] as well - --> - <s:element name="PingMsgResponse"> - <s:complexType> - <s:sequence> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" - xmime:expectedContentTypes="application/octet-stream" - type="xmime:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - - <!-- - a known media type that maps to java.awt.Image - --> - <s:element name="PingImage"> - <s:complexType> - <s:sequence> - <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" - xmime:expectedContentTypes="image/jpeg" - type="xmime:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - - <s:element name="PingImageResponse"> - <s:complexType> - <s:sequence> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" - xmime:expectedContentTypes="image/jpeg" - type="xmime:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - - <!-- - a preferred media type specified through xmime:contentType. - this would map to javax.transform.Source - --> - <s:element name="PingSource"> - <s:complexType> - <s:sequence> - <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" - xmime:expectedContentTypes="image/jpeg,text/xml" - xmime:contentType="text/xml" - type="xmime:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - - <s:element name="PingSourceResponse"> - <s:complexType> - <s:sequence> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" - xmime:expectedContentTypes="text/xml" - type="xmime:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - - <!-- - the preferred media type is not declared - binaries will be mapped to javax.activation.DataHandler - --> - <s:element name="PingDataHandler"> - <s:complexType> - <s:sequence> - <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" - xmime:expectedContentTypes="image/jpeg,text/xml" - type="xmime:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - - <s:element name="PingDataHandlerResponse"> - <s:complexType> - <s:sequence> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" type="s:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - -</s:schema> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/xsd0.xsd 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,108 @@ +<?xml version="1.0" ?> +<s:schema xmlns:s="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://jboss.org/test/ws/xop" + xmlns:xmime="http://www.w3.org/2005/05/xmlmime" > + + <s:import namespace="http://www.w3.org/2005/05/xmlmime"/> + + <!-- + the xmime:expectedContentType is missing. + this maps to byte[] + --> + <s:element name="PingMsg"> + <s:complexType> + <s:sequence> + <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" type="s:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <!-- + a known media type maps to specific java type. + in this case a byte[] as well + --> + <s:element name="PingMsgResponse"> + <s:complexType> + <s:sequence> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="application/octet-stream" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <!-- + a known media type that maps to java.awt.Image + --> + <s:element name="PingImage"> + <s:complexType> + <s:sequence> + <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="image/jpeg" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <s:element name="PingImageResponse"> + <s:complexType> + <s:sequence> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="image/jpeg" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <!-- + a preferred media type specified through xmime:contentType. + this would map to javax.transform.Source + --> + <s:element name="PingSource"> + <s:complexType> + <s:sequence> + <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="image/jpeg,text/xml" + xmime:contentType="text/xml" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <s:element name="PingSourceResponse"> + <s:complexType> + <s:sequence> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="text/xml" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <!-- + the preferred media type is not declared + binaries will be mapped to javax.activation.DataHandler + --> + <s:element name="PingDataHandler"> + <s:complexType> + <s:sequence> + <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="image/jpeg,text/xml" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <s:element name="PingDataHandlerResponse"> + <s:complexType> + <s:sequence> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" type="s:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + +</s:schema> \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/attach.jpeg =================================================================== (Binary files differ) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/attach.jpeg (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/attach.jpeg) =================================================================== (Binary files differ) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>XOP DOC/Lit with handlers</display-name> - - <service-ref> - <service-ref-name>service/XOPHandlerTestCase</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> - </port-component-ref> - <handler> - <handler-name>XOPInlineHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class> - </handler> - </service-ref> - -</application-client> - Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" + version="1.4"> + + <display-name>XOP DOC/Lit with handlers</display-name> + + <service-ref> + <service-ref-name>service/XOPHandlerTestCase</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> + </port-component-ref> + <handler> + <handler-name>XOPInlineHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class> + </handler> + </service-ref> + +</application-client> + Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/XOPHandlerTestCase</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit_handler?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC + "-//JBoss//DTD Application Client 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>service/XOPHandlerTestCase</service-ref-name> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit_handler?wsdl</wsdl-override> + </service-ref> + +</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://jboss.org/test/ws/xop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" - version="1.1"> - - <webservice-description> - <webservice-description-name>XOP DOC/Lit with handlers</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/service-doclit.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> - <handler> - <handler-name>XOPInlineHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class> - </handler> - <service-impl-bean> - <servlet-link>TestService</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<webservices xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:impl="http://jboss.org/test/ws/xop" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" + version="1.1"> + + <webservice-description> + <webservice-description-name>XOP DOC/Lit with handlers</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/service-doclit.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestServicePort</port-component-name> + <wsdl-port>impl:TestServicePort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> + <handler> + <handler-name>XOPInlineHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class> + </handler> + <service-impl-bean> + <servlet-link>TestService</servlet-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>XOP DOC/Lit without handlers</display-name> - - <service-ref> - <service-ref-name>service/XOPTestCaseRPC</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" + version="1.4"> + + <display-name>XOP DOC/Lit without handlers</display-name> + + <service-ref> + <service-ref-name>service/XOPTestCaseRPC</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> + </port-component-ref> + </service-ref> + +</application-client> + Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/XOPTestCaseRPC</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC + "-//JBoss//DTD Application Client 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>service/XOPTestCaseRPC</service-ref-name> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit?wsdl</wsdl-override> + </service-ref> + +</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,231 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<java-wsdl-mapping version='1.1' - xmlns='http://java.sun.com/xml/ns/j2ee' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' - xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.xop.rpclit</package-type> - <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jaxrpc.xop.shared</package-type> - <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> - </package-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingInType&... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingOutType... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageTy... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageOu... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceT... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceO... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHan... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>message</java-variable-name> - <xml-element-name>message</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type> - <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHan... - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>xopContent</java-variable-name> - <xml-element-name>xopContent</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestS... - <port-mapping> - <port-name>TestServicePort</port-name> - <java-port-name>TestServicePort</java-port-name> - </port-mapping> - </service-interface-mapping> - - <service-endpoint-interface-mapping> - - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:Tes... - <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestS... - - <service-endpoint-method-mapping> - <java-method-name>ping</java-method-name> - <wsdl-operation>ping</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingO... - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - <service-endpoint-method-mapping> - <java-method-name>pingSimple</java-method-name> - <wsdl-operation>pingSimple</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:Octet... - <wsdl-message-part-name>message</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>byte[]</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:Octet... - <wsdl-message-part-name>xopContent</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>byte[]</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:Octet... - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - <service-endpoint-method-mapping> - <java-method-name>pingImage</java-method-name> - <wsdl-operation>pingImage</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - <service-endpoint-method-mapping> - <java-method-name>pingSource</java-method-name> - <wsdl-operation>pingSource</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingS... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingS... - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - <service-endpoint-method-mapping> - <java-method-name>pingDataHandler</java-method-name> - <wsdl-operation>pingDataHandler</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingD... - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingD... - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,231 @@ +<?xml version='1.0' encoding='UTF-8'?> +<java-wsdl-mapping version='1.1' + xmlns='http://java.sun.com/xml/ns/j2ee' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.xop.rpclit</package-type> + <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.xop.shared</package-type> + <namespaceURI>http://jboss.org/test/ws/xop</namespaceURI> + </package-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingInType&... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingOutType... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageTy... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingImageOu... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceT... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingSourceO... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHan... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type> + <root-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop'>typeNS:PingDataHan... + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop'>serviceNS:TestS... + <port-mapping> + <port-name>TestServicePort</port-name> + <java-port-name>TestServicePort</java-port-name> + </port-mapping> + </service-interface-mapping> + + <service-endpoint-interface-mapping> + + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop'>portTypeNS:Tes... + <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop'>bindingNS:TestS... + + <service-endpoint-method-mapping> + <java-method-name>ping</java-method-name> + <wsdl-operation>ping</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingO... + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingSimple</java-method-name> + <wsdl-operation>pingSimple</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:Octet... + <wsdl-message-part-name>message</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>1</param-position> + <param-type>byte[]</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:Octet... + <wsdl-message-part-name>xopContent</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>byte[]</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:Octet... + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingImage</java-method-name> + <wsdl-operation>pingImage</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingI... + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingSource</java-method-name> + <wsdl-operation>pingSource</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingS... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingS... + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingDataHandler</java-method-name> + <wsdl-operation>pingDataHandler</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingD... + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop'>wsdlMsgNS:PingD... + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <context-param> - <param-name>jbossws-config-name</param-name>> - <param-value>Standard MTOM Endpoint</param-value> - </context-param> - - <servlet> - <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - -</web-app> - Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <context-param> + <param-name>jbossws-config-name</param-name>> + <param-value>Standard MTOM Endpoint</param-value> + </context-param> + + <servlet> + <servlet-name>TestService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + +</web-app> + Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://jboss.org/test/ws/xop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" - version="1.1"> - - <webservice-description> - <webservice-description-name>XOP RPC/Lit without handlers</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/service-rpclit.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestService</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<webservices xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:impl="http://jboss.org/test/ws/xop" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" + version="1.1"> + + <webservice-description> + <webservice-description-name>XOP RPC/Lit without handlers</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/service-rpclit.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestServicePort</port-component-name> + <wsdl-port>impl:TestServicePort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> + <service-impl-bean> + <servlet-link>TestService</servlet-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<wsdl:definitions - xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:tns="http://jboss.org/test/ws/xop" - targetNamespace="http://jboss.org/test/ws/xop" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> - - <wsdl:types> - <xsd:schema targetNamespace="http://jboss.org/test/ws/xop" - xmlns:xmime="http://www.w3.org/2005/05/xmlmime" > - - <xsd:import namespace="http://www.w3.org/2005/05/xmlmime"/> - - <xsd:complexType name="PingInType"> - <xsd:sequence> - <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="PingOutType"> - <xsd:sequence> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="PingImageType"> - <xsd:sequence> - <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="PingImageOutType"> - <xsd:sequence> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="PingSourceType"> - <xsd:sequence> - <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="PingSourceOutType"> - <xsd:sequence> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="PingDataHandlerType"> - <xsd:sequence> - <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="PingDataHandlerOutType"> - <xsd:sequence> - <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> - </xsd:sequence> - </xsd:complexType> - </xsd:schema> - - </wsdl:types> - - <wsdl:message name="PingIn"> - <wsdl:part name="parameters" type="tns:PingInType" /> - </wsdl:message> - - <wsdl:message name="PingOut"> - <wsdl:part name="result" type="tns:PingOutType" /> - </wsdl:message> - - <wsdl:message name="OctetsIn"> - <wsdl:part name="message" type="xsd:string" /> - <wsdl:part name="xopContent" type="xsd:base64Binary" /> - </wsdl:message> - - <wsdl:message name="OctetsOut"> - <wsdl:part name="result" type="xsd:base64Binary" /> - </wsdl:message> - - <wsdl:message name="PingImageIn"> - <wsdl:part name="parameters" type="tns:PingImageType" /> - </wsdl:message> - <wsdl:message name="PingImageOut"> - <wsdl:part name="result" type="tns:PingImageOutType" /> - </wsdl:message> - - <wsdl:message name="PingSourceIn"> - <wsdl:part name="parameters" type="tns:PingSourceType" /> - </wsdl:message> - <wsdl:message name="PingSourceOut"> - <wsdl:part name="result" type="tns:PingSourceOutType" /> - </wsdl:message> - - <wsdl:message name="PingDataHandlerIn"> - <wsdl:part name="parameters" type="tns:PingDataHandlerType" /> - </wsdl:message> - <wsdl:message name="PingDataHandlerOut"> - <wsdl:part name="result" type="tns:PingDataHandlerOutType" /> - </wsdl:message> - - <wsdl:portType name="TestService"> - <wsdl:operation name="ping"> - <wsdl:input message="tns:PingIn" /> - <wsdl:output message="tns:PingOut" /> - </wsdl:operation> - <wsdl:operation name="pingSimple"> - <wsdl:input message="tns:OctetsIn" /> - <wsdl:output message="tns:OctetsOut" /> - </wsdl:operation> - <wsdl:operation name="pingImage"> - <wsdl:input message="tns:PingImageIn" /> - <wsdl:output message="tns:PingImageOut" /> - </wsdl:operation> - <wsdl:operation name="pingSource"> - <wsdl:input message="tns:PingSourceIn" /> - <wsdl:output message="tns:PingSourceOut" /> - </wsdl:operation> - <wsdl:operation name="pingDataHandler"> - <wsdl:input message="tns:PingDataHandlerIn" /> - <wsdl:output message="tns:PingDataHandlerOut" /> - </wsdl:operation> - </wsdl:portType> - - - <wsdl:binding name="TestServiceBinding" type="tns:TestService"> - <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" /> - <wsdl:operation name="ping"> - <soap:operation soapAction="" style="rpc" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="pingSimple"> - <soap:operation soapAction="http://jboss.org/test/ws/xop/PingSimple" style="rpc" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - - <wsdl:operation name="pingImage"> - <soap:operation soapAction="" style="rpc" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="pingSource"> - <soap:operation soapAction="" style="rpc" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="pingDataHandler"> - <soap:operation soapAction="" style="rpc" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="TestService"> - <wsdl:port name="TestServicePort" binding="tns:TestServiceBinding"> - <soap:address location="REPLACE_WITH_ACTUAL_URL" /> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/wsdl/service-rpclit.wsdl 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,190 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions + xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:tns="http://jboss.org/test/ws/xop" + targetNamespace="http://jboss.org/test/ws/xop" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + + <wsdl:types> + <xsd:schema targetNamespace="http://jboss.org/test/ws/xop" + xmlns:xmime="http://www.w3.org/2005/05/xmlmime" > + + <xsd:import namespace="http://www.w3.org/2005/05/xmlmime"/> + + <xsd:complexType name="PingInType"> + <xsd:sequence> + <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="PingOutType"> + <xsd:sequence> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="PingImageType"> + <xsd:sequence> + <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="PingImageOutType"> + <xsd:sequence> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="PingSourceType"> + <xsd:sequence> + <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="PingSourceOutType"> + <xsd:sequence> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="PingDataHandlerType"> + <xsd:sequence> + <xsd:element name="message" minOccurs="0" maxOccurs="1" type="xsd:string" /> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="PingDataHandlerOutType"> + <xsd:sequence> + <xsd:element name="xopContent" minOccurs="0" maxOccurs="1" type="xsd:base64Binary"/> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + + </wsdl:types> + + <wsdl:message name="PingIn"> + <wsdl:part name="parameters" type="tns:PingInType" /> + </wsdl:message> + + <wsdl:message name="PingOut"> + <wsdl:part name="result" type="tns:PingOutType" /> + </wsdl:message> + + <wsdl:message name="OctetsIn"> + <wsdl:part name="message" type="xsd:string" /> + <wsdl:part name="xopContent" type="xsd:base64Binary" /> + </wsdl:message> + + <wsdl:message name="OctetsOut"> + <wsdl:part name="result" type="xsd:base64Binary" /> + </wsdl:message> + + <wsdl:message name="PingImageIn"> + <wsdl:part name="parameters" type="tns:PingImageType" /> + </wsdl:message> + <wsdl:message name="PingImageOut"> + <wsdl:part name="result" type="tns:PingImageOutType" /> + </wsdl:message> + + <wsdl:message name="PingSourceIn"> + <wsdl:part name="parameters" type="tns:PingSourceType" /> + </wsdl:message> + <wsdl:message name="PingSourceOut"> + <wsdl:part name="result" type="tns:PingSourceOutType" /> + </wsdl:message> + + <wsdl:message name="PingDataHandlerIn"> + <wsdl:part name="parameters" type="tns:PingDataHandlerType" /> + </wsdl:message> + <wsdl:message name="PingDataHandlerOut"> + <wsdl:part name="result" type="tns:PingDataHandlerOutType" /> + </wsdl:message> + + <wsdl:portType name="TestService"> + <wsdl:operation name="ping"> + <wsdl:input message="tns:PingIn" /> + <wsdl:output message="tns:PingOut" /> + </wsdl:operation> + <wsdl:operation name="pingSimple"> + <wsdl:input message="tns:OctetsIn" /> + <wsdl:output message="tns:OctetsOut" /> + </wsdl:operation> + <wsdl:operation name="pingImage"> + <wsdl:input message="tns:PingImageIn" /> + <wsdl:output message="tns:PingImageOut" /> + </wsdl:operation> + <wsdl:operation name="pingSource"> + <wsdl:input message="tns:PingSourceIn" /> + <wsdl:output message="tns:PingSourceOut" /> + </wsdl:operation> + <wsdl:operation name="pingDataHandler"> + <wsdl:input message="tns:PingDataHandlerIn" /> + <wsdl:output message="tns:PingDataHandlerOut" /> + </wsdl:operation> + </wsdl:portType> + + + <wsdl:binding name="TestServiceBinding" type="tns:TestService"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" /> + <wsdl:operation name="ping"> + <soap:operation soapAction="" style="rpc" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="pingSimple"> + <soap:operation soapAction="http://jboss.org/test/ws/xop/PingSimple" style="rpc" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + + <wsdl:operation name="pingImage"> + <soap:operation soapAction="" style="rpc" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="pingSource"> + <soap:operation soapAction="" style="rpc" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="pingDataHandler"> + <soap:operation soapAction="" style="rpc" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + + </wsdl:binding> + + <wsdl:service name="TestService"> + <wsdl:port name="TestServicePort" binding="tns:TestServiceBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL" /> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>XOP DOC/Lit with handlers</display-name> - - <service-ref> - <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> - <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component-ref> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> - </port-component-ref> - <handler> - <handler-name>XOPInlineHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class> - </handler> - </service-ref> - -</application-client> - Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/application-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<application-client xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" + version="1.4"> + + <display-name>XOP DOC/Lit with handlers</display-name> + + <service-ref> + <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name> + <service-interface>javax.xml.rpc.Service</service-interface> + <wsdl-file>use overwrite in jboss-client.xml</wsdl-file> + <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component-ref> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> + </port-component-ref> + <handler> + <handler-name>XOPInlineHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class> + </handler> + </service-ref> + +</application-client> + Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit_handler?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,15 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss-client PUBLIC + "-//JBoss//DTD Application Client 4.0//EN" + "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> + + <service-ref> + <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit_handler?wsdl</wsdl-override> + </service-ref> + +</jboss-client> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<webservices xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:impl="http://jboss.org/test/ws/xop" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" - version="1.1"> - - <webservice-description> - <webservice-description-name>XOP RPC/Lit with handlers</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/service-rpclit.wsdl</wsdl-file> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestServicePort</port-component-name> - <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> - <handler> - <handler-name>XOPInlineHandler</handler-name> - <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class> - </handler> - <service-impl-bean> - <servlet-link>TestService</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<webservices xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:impl="http://jboss.org/test/ws/xop" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd" + version="1.1"> + + <webservice-description> + <webservice-description-name>XOP RPC/Lit with handlers</webservice-description-name> + <wsdl-file>WEB-INF/wsdl/service-rpclit.wsdl</wsdl-file> + <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> + <port-component> + <port-component-name>TestServicePort</port-component-name> + <wsdl-port>impl:TestServicePort</wsdl-port> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> + <handler> + <handler-name>XOPInlineHandler</handler-name> + <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class> + </handler> + <service-impl-bean> + <servlet-link>TestService</servlet-link> + </service-impl-bean> + </port-component> + </webservice-description> +</webservices> Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,41 +0,0 @@ -<s:schema xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://jboss.org/test/ws/xop/doclit" - xmlns:xmime="http://www.w3.org/2005/05/xmlmime" - xmlns:tns="http://jboss.org/test/ws/xop/doclit"> - - <s:import schemaLocation="http://www.w3.org/2005/05/xmlmime" namespace="http://www.w3.org/2005/05/xmlmime"/> - - <s:element name="PingMsg"> - <s:complexType> - <s:sequence> - <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> - <s:element name="xopContent" xmime:contentType="image/jpeg" type="tns:XOPBinary"/> - </s:sequence> - </s:complexType> - </s:element> - - <s:element name="PingMsgResponse"> - <s:complexType> - <s:sequence> - <s:element name="xopContent" xmime:contentType="image/jpeg" type="xmime:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - - <s:complexType name="XOPBinary" > - <s:simpleContent> - <s:extension base="s:base64Binary" > - <s:attribute ref="xmime:contentType" use="optional"/> - </s:extension> - </s:simpleContent> - </s:complexType> - - <s:element name="MSFTBinary"> - <s:complexType> - <s:sequence> - <s:element minOccurs="0" name="xopContent" nillable="true" type="s:base64Binary"/> - </s:sequence> - </s:complexType> - </s:element> - -</s:schema> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/schema.xsd 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,41 @@ +<s:schema xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://jboss.org/test/ws/xop/doclit" + xmlns:xmime="http://www.w3.org/2005/05/xmlmime" + xmlns:tns="http://jboss.org/test/ws/xop/doclit"> + + <s:import schemaLocation="http://www.w3.org/2005/05/xmlmime" namespace="http://www.w3.org/2005/05/xmlmime"/> + + <s:element name="PingMsg"> + <s:complexType> + <s:sequence> + <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> + <s:element name="xopContent" xmime:contentType="image/jpeg" type="tns:XOPBinary"/> + </s:sequence> + </s:complexType> + </s:element> + + <s:element name="PingMsgResponse"> + <s:complexType> + <s:sequence> + <s:element name="xopContent" xmime:contentType="image/jpeg" type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <s:complexType name="XOPBinary" > + <s:simpleContent> + <s:extension base="s:base64Binary" > + <s:attribute ref="xmime:contentType" use="optional"/> + </s:extension> + </s:simpleContent> + </s:complexType> + + <s:element name="MSFTBinary"> + <s:complexType> + <s:sequence> + <s:element minOccurs="0" name="xopContent" nillable="true" type="s:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + +</s:schema> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.jpeg =================================================================== (Binary files differ) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.jpeg (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.jpeg) =================================================================== (Binary files differ) Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt 2007-02-09 16:14:15 UTC (rev 2324) @@ -1 +0,0 @@ -This is a plain text attachment. Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.txt 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1 @@ +This is a plain text attachment. Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml 2007-02-09 15:26:41 UTC (rev 2321) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<mime-message>This is an xml attachment.</mime-message> Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/attach.xml 2007-02-09 16:14:15 UTC (rev 2324) @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<mime-message>This is an xml attachment.</mime-message> Deleted: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/disguised_jpeg.xcf =================================================================== (Binary files differ) Copied: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/shared/disguised_jpeg.xcf (from rev 2321, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/shared/disguised_jpeg.xcf) =================================================================== (Binary files differ)