[jbossws-commits] JBossWS SVN: r2321 - in branches/jbossws-1.2.0: jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc and 33 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-02-09 10:26:41 -0500 (Fri, 09 Feb 2007) New Revision: 2321 Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/ branches/jbossws-1.2.0/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/doclit/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/ Removed: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared/ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/ Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml branches/jbossws-1.2.0/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java branches/jbossws-1.2.0/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/XOPBase.java branches/jbossws-1.2.0/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/XOPPing.java branches/jbossws-1.2.0/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/XOPPingService.java branches/jbossws-1.2.0/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/rpclit/InlineHandler.java branches/jbossws-1.2.0/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/XOPHandlerTestCase.java branches/jbossws-1.2.0/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/XOPPingImpl.java branches/jbossws-1.2.0/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/XOPTestCase.java branches/jbossws-1.2.0/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/PingDataHandler.java branches/jbossws-1.2.0/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/PingImage.java branches/jbossws-1.2.0/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/PingMsg.java branches/jbossws-1.2.0/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/PingSource.java branches/jbossws-1.2.0/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/jaxws/samples/xop/doclit/MTOMProtocolHandler.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java branches/jbossws-1.2.0/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml branches/jbossws-1.2.0/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/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.2.0/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/webservices.xml branches/jbossws-1.2.0/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/WEB-INF/webservices.xml branches/jbossws-1.2.0/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/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.2.0/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/webservices.xml branches/jbossws-1.2.0/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/WEB-INF/webservices.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: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -777,7 +777,7 @@ if (paramMetaData.isXOP() && XOPContext.isXOPEncodedRequest()) { SOAPMessageImpl soapMessage = (SOAPMessageImpl)MessageContextAssociation.peekMessageContext().getSOAPMessage(); - soapMessage.setXOPMessage(true); + soapMessage.setXOPMessage(true); } return soapContentElement; } Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -42,7 +42,7 @@ public SOAP11BindingJAXRPC() { super(); - setMTOMEnabled(true); + setMTOMEnabled(false); } public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -42,7 +42,7 @@ public SOAP12BindingJAXRPC() { super(); - setMTOMEnabled(true); + setMTOMEnabled(false); } public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -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 @@ { 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: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/DisableMTOMHandler.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/extensions/xop/XOPContext.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -593,7 +593,10 @@ // Make sure we have a configuration if (config == null) initEndpointConfig(); - + + // register any configurable with the ConfigProvider + configObservable.addObserver(configurable); + // SOAPBinding configuration if (configurable instanceof CommonBindingProvider) { @@ -664,14 +667,14 @@ reconfigHandlerMetaData(); } - + private void reconfigHandlerMetaData() { log.debug("Configure EndpointMetaData"); List<HandlerMetaData> sepHandlers = getHandlerMetaData(HandlerType.ENDPOINT); clearHandlers(); - + List<HandlerMetaData> preHandlers = config.getHandlers(this, HandlerType.PRE); List<HandlerMetaData> postHandlers = config.getHandlers(this, HandlerType.POST); Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-client-config.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxrpc-endpoint-config.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/schema/jaxrpc-config_2_0.xsd 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java (from rev 2313, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/XOPTypeDefTestCase.java) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java (rev 0) +++ 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) @@ -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()); + } +} Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit (from rev 2320, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/doclit) Modified: branches/jbossws-1.2.0/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/samples/xop/doclit/InlineHandler.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -19,7 +19,7 @@ * 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.samples.xop.doclit; +package org.jboss.test.ws.jaxrpc.xop.doclit; import javax.xml.namespace.QName; import javax.xml.rpc.handler.GenericHandler; Modified: branches/jbossws-1.2.0/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/samples/xop/doclit/XOPBase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -19,7 +19,7 @@ * 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.samples.xop.doclit; +package org.jboss.test.ws.jaxrpc.xop.doclit; import java.awt.Image; import java.io.File; @@ -30,14 +30,14 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.XOPTestSupport; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse; +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; @@ -48,7 +48,7 @@ */ public abstract class XOPBase extends JBossWSTest { - private File imgFile = new File("resources/jaxrpc/samples/xop/shared/attach.jpeg"); + private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); protected abstract XOPPing getPort(); Modified: branches/jbossws-1.2.0/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/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -19,7 +19,7 @@ * 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.samples.xop.doclit; +package org.jboss.test.ws.jaxrpc.xop.doclit; import javax.naming.InitialContext; import javax.xml.rpc.Service; @@ -27,6 +27,7 @@ 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> @@ -39,7 +40,7 @@ */ public class XOPHandlerTestCase extends XOPBase { - private XOPPing port; + private static XOPPing port; public static Test suite() { @@ -54,6 +55,7 @@ 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"); Modified: branches/jbossws-1.2.0/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/samples/xop/doclit/XOPPing.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -4,16 +4,16 @@ */ //Auto Generated by jbossws - Please do not edit!!! -package org.jboss.test.ws.jaxrpc.samples.xop.doclit; +package org.jboss.test.ws.jaxrpc.xop.doclit; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse; +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 { Modified: branches/jbossws-1.2.0/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/samples/xop/doclit/XOPPingImpl.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -1,16 +1,16 @@ -package org.jboss.test.ws.jaxrpc.samples.xop.doclit; +package org.jboss.test.ws.jaxrpc.xop.doclit; import java.rmi.RemoteException; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.MTOMServiceBase; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse; +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. Modified: branches/jbossws-1.2.0/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/samples/xop/doclit/XOPPingService.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -5,7 +5,7 @@ //Auto Generated by jbossws - Please do not edit!!! -package org.jboss.test.ws.jaxrpc.samples.xop.doclit; +package org.jboss.test.ws.jaxrpc.xop.doclit; import javax.xml.rpc.ServiceException; @@ -14,6 +14,6 @@ public interface XOPPingService extends javax.xml.rpc.Service { - public org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing getTestServicePort() throws ServiceException; + public org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing getTestServicePort() throws ServiceException; } Modified: branches/jbossws-1.2.0/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/samples/xop/doclit/XOPTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -19,7 +19,7 @@ * 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.samples.xop.doclit; +package org.jboss.test.ws.jaxrpc.xop.doclit; // $Id$ @@ -29,6 +29,7 @@ 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. @@ -38,7 +39,7 @@ */ public class XOPTestCase extends XOPBase { - private XOPPing port; + private static XOPPing port; public static Test suite() { @@ -53,6 +54,7 @@ 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"); Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit (from rev 2320, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/rpclit) Modified: branches/jbossws-1.2.0/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/samples/xop/rpclit/InlineHandler.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -1,4 +1,4 @@ -package org.jboss.test.ws.jaxrpc.samples.xop.rpclit; +package org.jboss.test.ws.jaxrpc.xop.rpclit; import javax.xml.namespace.QName; import javax.xml.rpc.handler.GenericHandler; Modified: branches/jbossws-1.2.0/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/samples/xop/rpclit/XOPBase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -19,7 +19,7 @@ * 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.samples.xop.rpclit; +package org.jboss.test.ws.jaxrpc.xop.rpclit; import java.awt.Image; import java.io.File; @@ -31,14 +31,14 @@ import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.XOPTestSupport; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse; +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; @@ -49,7 +49,7 @@ */ public abstract class XOPBase extends JBossWSTest { - private File imgFile = new File("resources/jaxrpc/samples/xop/shared/attach.jpeg"); + private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); protected abstract XOPPing getPort(); Modified: branches/jbossws-1.2.0/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/samples/xop/rpclit/XOPHandlerTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -19,7 +19,7 @@ * 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.samples.xop.rpclit; +package org.jboss.test.ws.jaxrpc.xop.rpclit; import javax.naming.InitialContext; import javax.xml.rpc.Service; @@ -27,6 +27,7 @@ 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; @@ -35,7 +36,7 @@ */ public class XOPHandlerTestCase extends XOPBase { - private XOPPing port; + private static XOPPing port; public static Test suite() { @@ -50,6 +51,7 @@ 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"); Modified: branches/jbossws-1.2.0/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/samples/xop/rpclit/XOPPing.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -4,18 +4,18 @@ */ //Auto Generated by jbossws - Please do not edit!!! -package org.jboss.test.ws.jaxrpc.samples.xop.rpclit; +package org.jboss.test.ws.jaxrpc.xop.rpclit; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse; +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.samples.xop.shared.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg pingMsg) throws java.rmi.RemoteException; + 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; Modified: branches/jbossws-1.2.0/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/samples/xop/rpclit/XOPPingImpl.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -1,16 +1,16 @@ -package org.jboss.test.ws.jaxrpc.samples.xop.rpclit; +package org.jboss.test.ws.jaxrpc.xop.rpclit; import java.rmi.RemoteException; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.MTOMServiceBase; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource; -import org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse; +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; Modified: branches/jbossws-1.2.0/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/samples/xop/rpclit/XOPPingService.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -5,7 +5,7 @@ //Auto Generated by jbossws - Please do not edit!!! -package org.jboss.test.ws.jaxrpc.samples.xop.rpclit; +package org.jboss.test.ws.jaxrpc.xop.rpclit; import javax.xml.rpc.ServiceException; @@ -13,5 +13,5 @@ public interface XOPPingService extends javax.xml.rpc.Service { - public org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing getTestServicePort() throws ServiceException; + public org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing getTestServicePort() throws ServiceException; } Modified: branches/jbossws-1.2.0/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/samples/xop/rpclit/XOPTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -19,7 +19,7 @@ * 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.samples.xop.rpclit; +package org.jboss.test.ws.jaxrpc.xop.rpclit; // $Id$ @@ -29,6 +29,7 @@ import junit.framework.Test; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; /** * @@ -37,7 +38,7 @@ */ public class XOPTestCase extends XOPBase { - private XOPPing port; + private static XOPPing port; public static Test suite() { @@ -52,6 +53,7 @@ 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"); Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/shared (from rev 2320, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/shared) Modified: branches/jbossws-1.2.0/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/samples/xop/shared/MTOMServiceBase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -19,7 +19,7 @@ * 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.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; import java.util.StringTokenizer; Modified: branches/jbossws-1.2.0/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/samples/xop/shared/PingDataHandler.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -19,7 +19,7 @@ * 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.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; import javax.activation.DataHandler; Modified: branches/jbossws-1.2.0/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/samples/xop/shared/PingDataHandlerResponse.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -19,7 +19,7 @@ * 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.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; import javax.activation.DataHandler; Modified: branches/jbossws-1.2.0/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/samples/xop/shared/PingImage.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -19,7 +19,7 @@ * 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.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; import java.awt.Image; Modified: branches/jbossws-1.2.0/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/samples/xop/shared/PingImageResponse.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -19,7 +19,7 @@ * 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.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; import java.awt.Image; Modified: branches/jbossws-1.2.0/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/samples/xop/shared/PingMsg.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -4,7 +4,7 @@ */ //Auto Generated by jbossws - Please do not edit!!! -package org.jboss.test.ws.jaxrpc.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; public class PingMsg { Modified: branches/jbossws-1.2.0/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/samples/xop/shared/PingMsgResponse.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -5,7 +5,7 @@ //Auto Generated by jbossws - Please do not edit!!! -package org.jboss.test.ws.jaxrpc.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; public class PingMsgResponse { Modified: branches/jbossws-1.2.0/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/samples/xop/shared/PingSource.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -19,7 +19,7 @@ * 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.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; import javax.xml.transform.Source; Modified: branches/jbossws-1.2.0/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/samples/xop/shared/PingSourceResponse.java 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -19,7 +19,7 @@ * 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.samples.xop.shared; +package org.jboss.test.ws.jaxrpc.xop.shared; import javax.xml.transform.Source; Deleted: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMProtocolHandler.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-02-09 15:26:41 UTC (rev 2321) @@ -57,6 +57,7 @@ // enable MTOM binding = (SOAPBinding)((BindingProvider)port).getBinding(); + binding.setMTOMEnabled(true); } Copied: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java (from rev 2313, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/MimeDeclarationTestCase.java) =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/xop/MimeDeclarationTestCase.java (rev 0) +++ 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) @@ -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: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/common/config/jaxrpc-endpoint-config.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/META-INF/jboss-client.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/marshall-rpclit/WEB-INF/webservices.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/outparam/WEB-INF/web.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/holder/WEB-INF/web.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/mtom/WEB-INF/web.xml 2007-02-09 15:26:41 UTC (rev 2321) @@ -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: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop (from rev 2320, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop) Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/META-INF/application-client.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -13,7 +13,7 @@ <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.samples.xop.doclit.XOPPing</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPing</service-endpoint-interface> </port-component-ref> </service-ref> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -1,11 +1,11 @@ <?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.samples.xop.doclit</package-type> + <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.samples.xop.shared.PingMsg</java-type> + <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> @@ -19,7 +19,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse</java-type> + <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> @@ -29,7 +29,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage</java-type> + <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> @@ -43,7 +43,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse</java-type> + <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> @@ -53,7 +53,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource</java-type> + <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> @@ -67,7 +67,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse</java-type> + <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> @@ -77,7 +77,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler</java-type> + <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> @@ -91,7 +91,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse</java-type> + <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> @@ -101,7 +101,7 @@ </java-xml-type-mapping> <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPingService</service-interface> + <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> @@ -110,7 +110,7 @@ </service-interface-mapping> <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing</service-endpoint-interface> + <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... @@ -119,7 +119,7 @@ <wsdl-operation>ping</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg</param-type> + <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> @@ -127,7 +127,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse</method-return-value> + <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> @@ -138,7 +138,7 @@ <wsdl-operation>pingImage</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage</param-type> + <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> @@ -146,7 +146,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse</method-return-value> + <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> @@ -157,7 +157,7 @@ <wsdl-operation>pingSource</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource</param-type> + <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> @@ -165,7 +165,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse</method-return-value> + <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> @@ -176,7 +176,7 @@ <wsdl-operation>pingDataHandler</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler</param-type> + <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> @@ -184,7 +184,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse</method-return-value> + <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> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/web.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -5,9 +5,14 @@ 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.samples.xop.doclit.XOPPingImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxrpc.xop.doclit.XOPPingImpl</servlet-class> </servlet> <servlet-mapping> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/WEB-INF/webservices.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -13,7 +13,7 @@ <port-component> <port-component-name>TestServicePort</port-component-name> <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing</service-endpoint-interface> + <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> Modified: branches/jbossws-1.2.0/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/samples/xop/doclit/handlerconfig/META-INF/application-client.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -13,11 +13,11 @@ <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.samples.xop.doclit.XOPPing</service-endpoint-interface> + <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.samples.xop.doclit.InlineHandler</handler-class> + <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class> </handler> </service-ref> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -13,10 +13,10 @@ <port-component> <port-component-name>TestServicePort</port-component-name> <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.doclit.XOPPing</service-endpoint-interface> + <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.samples.xop.doclit.InlineHandler</handler-class> + <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class> </handler> <service-impl-bean> <servlet-link>TestService</servlet-link> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/application-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/META-INF/application-client.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -13,7 +13,7 @@ <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.samples.xop.rpclit.XOPPing</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPing</service-endpoint-interface> </port-component-ref> </service-ref> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/jaxrpc-mapping.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -4,16 +4,16 @@ 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.samples.xop.rpclit</package-type> + <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.samples.xop.shared</package-type> + <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.samples.xop.shared.PingMsg</java-type> + <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> @@ -27,7 +27,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse</java-type> + <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> @@ -37,7 +37,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage</java-type> + <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> @@ -51,7 +51,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse</java-type> + <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> @@ -61,7 +61,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource</java-type> + <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> @@ -75,7 +75,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse</java-type> + <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> @@ -85,7 +85,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler</java-type> + <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> @@ -99,7 +99,7 @@ </java-xml-type-mapping> <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse</java-type> + <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> @@ -109,7 +109,7 @@ </java-xml-type-mapping> <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPingService</service-interface> + <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> @@ -119,7 +119,7 @@ <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing</service-endpoint-interface> + <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... @@ -128,7 +128,7 @@ <wsdl-operation>ping</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsg</param-type> + <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> @@ -136,7 +136,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingMsgResponse</method-return-value> + <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> @@ -175,7 +175,7 @@ <wsdl-operation>pingImage</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImage</param-type> + <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> @@ -183,7 +183,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingImageResponse</method-return-value> + <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> @@ -194,7 +194,7 @@ <wsdl-operation>pingSource</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSource</param-type> + <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> @@ -202,7 +202,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingSourceResponse</method-return-value> + <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> @@ -213,7 +213,7 @@ <wsdl-operation>pingDataHandler</wsdl-operation> <method-param-parts-mapping> <param-position>0</param-position> - <param-type>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandler</param-type> + <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> @@ -221,7 +221,7 @@ </wsdl-message-mapping> </method-param-parts-mapping> <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jaxrpc.samples.xop.shared.PingDataHandlerResponse</method-return-value> + <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> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/web.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -1,13 +1,18 @@ <?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"> + 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.samples.xop.rpclit.XOPPingImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxrpc.xop.rpclit.XOPPingImpl</servlet-class> </servlet> <servlet-mapping> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/WEB-INF/webservices.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -13,7 +13,7 @@ <port-component> <port-component-name>TestServicePort</port-component-name> <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing</service-endpoint-interface> + <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> Modified: branches/jbossws-1.2.0/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/samples/xop/rpclit/handlerconfig/META-INF/application-client.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -13,11 +13,11 @@ <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.samples.xop.rpclit.XOPPing</service-endpoint-interface> + <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.samples.xop.rpclit.InlineHandler</handler-class> + <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class> </handler> </service-ref> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxrpc/samples/xop/rpclit/handlerconfig/WEB-INF/webservices.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ 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) @@ -13,10 +13,10 @@ <port-component> <port-component-name>TestServicePort</port-component-name> <wsdl-port>impl:TestServicePort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.xop.rpclit.XOPPing</service-endpoint-interface> + <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.samples.xop.rpclit.InlineHandler</handler-class> + <handler-class>org.jboss.test.ws.jaxrpc.xop.rpclit.InlineHandler</handler-class> </handler> <service-impl-bean> <servlet-link>TestService</servlet-link>