Author: ropalka Date: 2012-03-23 06:27:23 -0400 (Fri, 23 Mar 2012) New Revision: 16013 Removed: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/xop/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/xop/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples-override/mtom/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/mtom/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2259/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/ Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/StubExt.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBUnmarshallerImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/WSDDEndpointImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-3471] remove MTOM & SWAREF support + don't run shared-testsuite anymore Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -74,7 +74,6 @@ private void configure() { - // process MTOM config elements if (epMetaData != null) { epMetaData.configure(this); @@ -87,18 +86,10 @@ { binding = (type == Type.JAXWS ? new SOAP11BindingJAXWS() : new SOAP11BindingJAXRPC()); } - else if (SOAPBinding.SOAP11HTTP_MTOM_BINDING.equals(bindingId)) - { - binding = (type == Type.JAXWS ? new SOAP11BindingJAXWS(true) : new SOAP11BindingJAXRPC(true)); - } else if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) { binding = (type == Type.JAXWS ? new SOAP12BindingJAXWS() : new SOAP12BindingJAXRPC()); } - else if (SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) - { - binding = (type == Type.JAXWS ? new SOAP12BindingJAXWS(true) : new SOAP12BindingJAXRPC(true)); - } else if (HTTPBinding.HTTP_BINDING.equals(bindingId)) { binding = new HTTPBindingJAXWS(); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -59,7 +59,6 @@ import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -317,8 +316,6 @@ handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[1]); handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[2]); - XOPContext.visitAndRestoreXOPData(); - // Handlers might have replaced the message reqMessage = msgContext.getMessageAbstraction(); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -38,7 +38,6 @@ import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.soap.attachment.SwapableMemoryDataSource; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.xb.binding.NamespaceRegistry; @@ -268,12 +267,6 @@ public boolean isModified() { - // skip changes from XOP handler interactions - if (XOPContext.isXOPEncodedRequest() && !XOPContext.isXOPMessage()) - { - log.debug("Disregard changes from XOP/Handler interactions"); - return false; - } return isModified; } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -74,7 +74,6 @@ import org.jboss.ws.core.soap.attachment.AttachmentPartImpl; import org.jboss.ws.core.soap.attachment.CIDGenerator; import org.jboss.ws.core.utils.MimeUtils; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.TypesMetaData; @@ -93,18 +92,12 @@ // provide logging protected Logger log = Logger.getLogger(getClass()); - private boolean mtomEnabled; - protected HeaderSource headerSource; /** A constant representing the identity of the SOAP 1.1 over HTTP binding. */ public static final String SOAP11HTTP_BINDING = "http://schemas.xmlsoap.org/wsdl/soap/http"; /** A constant representing the identity of the SOAP 1.2 over HTTP binding. */ public static final String SOAP12HTTP_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/"; - /** A constant representing the identity of the SOAP 1.1 over HTTP binding with MTOM enabled by default. */ - public static final String SOAP11HTTP_MTOM_BINDING = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true"; - /** A constant representing the identity of the SOAP 1.2 over HTTP binding with MTOM enabled by default. */ - public static final String SOAP12HTTP_MTOM_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true"; /** The SOAP encoded Array name */ private static final Name SOAP_ARRAY_NAME = new NameImpl("Array", Constants.PREFIX_SOAP11_ENC, Constants.URI_SOAP11_ENC); @@ -122,16 +115,6 @@ return new SOAPFactoryImpl(); } - public boolean isMTOMEnabled() - { - return this.mtomEnabled; - } - - public void setMTOMEnabled(boolean flag) - { - this.mtomEnabled = flag; - } - /** Create the message */ protected abstract MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException; @@ -149,12 +132,6 @@ if (msgContext == null) throw new WSException(BundleUtils.getMessage(bundle, "MESSAGECONTEXT_NOT_AVAILABLE")); - // Disable MTOM for rpc/encoded - if (opMetaData.isRPCEncoded()) - XOPContext.setMTOMEnabled(false); - else - XOPContext.setMTOMEnabled(isMTOMEnabled()); - // Associate current message with message context SOAPMessageImpl reqMessage = (SOAPMessageImpl)createMessage(opMetaData); msgContext.setSOAPMessage(reqMessage); @@ -283,10 +260,6 @@ if (msgContext == null) throw new WSException(BundleUtils.getMessage(bundle, "MESSAGECONTEXT_NOT_AVAILABLE")); - // Disable MTOM for rpc/encoded - if (opMetaData.isRPCEncoded()) - msgContext.put(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - // Get the namespace registry NamespaceRegistry namespaceRegistry = msgContext.getNamespaceRegistry(); @@ -390,12 +363,6 @@ if (msgContext == null) throw new WSException(BundleUtils.getMessage(bundle, "MESSAGECONTEXT_NOT_AVAILABLE")); - // Disable MTOM for rpc/encoded - if (opMetaData.isRPCEncoded()) - XOPContext.setMTOMEnabled(false); - else - XOPContext.setMTOMEnabled(isMTOMEnabled()); - // Associate current message with message context SOAPMessageImpl resMessage = (SOAPMessageImpl)createMessage(opMetaData); msgContext.setSOAPMessage(resMessage); @@ -567,10 +534,6 @@ if (msgContext == null) throw new WSException(BundleUtils.getMessage(bundle, "MESSAGECONTEXT_NOT_AVAILABLE")); - // Disable MTOM for rpc/encoded - if (opMetaData.isRPCEncoded()) - msgContext.put(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - SOAPHeader soapHeader = soapEnvelope.getHeader(); SOAPBodyImpl soapBody = (SOAPBodyImpl)soapEnvelope.getBody(); SOAPBodyElement soapBodyElement = soapBody.getBodyElement(); @@ -748,11 +711,6 @@ String swaCID = '<' + partName + "=" + cidGenerator.generateFromCount() + '>'; part.setContentId(swaCID); } - if (paramMetaData.isXOP()) - { - String xopCID = '<' + cidGenerator.generateFromName(partName) + '>'; - part.setContentId(xopCID); - } return part; } @@ -783,7 +741,7 @@ QName xmlName = paramMetaData.getXmlName(); Class javaType = paramMetaData.getJavaType(); - if (value != null && paramMetaData.isXOP() == false) + if (value != null) { Class valueType = value.getClass(); if (JavaUtils.isAssignableFrom(javaType, valueType) == false) @@ -829,22 +787,6 @@ contentElement.addNamespaceDeclaration(Constants.PREFIX_SOAP11_ENC, Constants.URI_SOAP11_ENC); } - // When a potential xop parameter is detected and MTOM is enabled - // we flag the SOAP message as a XOP package - if (paramMetaData.isXOP() && XOPContext.isMTOMEnabled()) - { - log.trace("Add parameter as XOP"); - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgContext.getSOAPMessage(); - soapMessage.setXOPMessage(true); - } - else if (paramMetaData.isSwaRef()) - { - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgContext.getSOAPMessage(); - soapMessage.setSWARefMessage(true); - } - contentElement.setObjectValue(value); return contentElement; @@ -937,20 +879,6 @@ if (soapContentElement == null && optional == false) throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_FIND_CHILD_ELEMENT", xmlName)); - // When a potential XOP parameter is detected and - // the incomming request is actuall XOP encoded we flag - // the SOAP message a XOP packaged. - if (paramMetaData.isXOP() && XOPContext.isXOPEncodedRequest()) - { - SOAPMessageImpl soapMessage = (SOAPMessageImpl)MessageContextAssociation.peekMessageContext().getSOAPMessage(); - soapMessage.setXOPMessage(true); - } - else if (paramMetaData.isSwaRef()) - { - SOAPMessageImpl soapMessage = (SOAPMessageImpl)MessageContextAssociation.peekMessageContext().getSOAPMessage(); - soapMessage.setSWARefMessage(true); - } - return soapContentElement; } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -320,7 +320,7 @@ // Verify that the java type matches a registered xmlType // Attachments are skipped because they don't use type mapping - if (value != null && !paramMetaData.isSwA() && !paramMetaData.isXOP()) + if (value != null && !paramMetaData.isSwA()) { if (JavaUtils.isAssignableFrom(javaType, inputType) == false) throw new WSException(BundleUtils.getMessage(bundle, "PARAMETER_NOT_ASSIGNABLE", new Object[]{ javaType , inputType})); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/StubExt.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/StubExt.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/StubExt.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -65,8 +65,6 @@ static final String PROPERTY_AUTH_TYPE = "org.jboss.ws.authType"; /** Authentication type, BASIC */ static final String PROPERTY_AUTH_TYPE_BASIC = "org.jboss.ws.authType.basic"; - /** Enable MTOM on the stub */ - static final String PROPERTY_MTOM_ENABLED= "org.jboss.ws.mtom.enabled"; /** HTTP chunk size */ static final String PROPERTY_CHUNKED_ENCODING_SIZE = "http://org.jboss.ws/http#chunksize"; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -31,7 +31,6 @@ import org.jboss.ws.core.MessageAbstraction; import org.jboss.ws.core.soap.SOAPMessageMarshaller; import org.jboss.ws.core.soap.SOAPMessageUnMarshallerHTTP; -import org.jboss.ws.extensions.xop.XOPContext; /** * SOAPConnection implementation @@ -57,10 +56,6 @@ { try { - // enforce xop transitions - // TODO: there should be a clear transition to an immutable object model - XOPContext.eagerlyCreateAttachments(); - // save object model changes SOAPMessage soapMessage = (SOAPMessage)reqMessage; if (reqMessage != null && soapMessage.saveRequired()) Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -21,20 +21,16 @@ */ package org.jboss.ws.core.jaxrpc; -import java.awt.Image; import javax.activation.DataHandler; import javax.mail.internet.MimeMultipart; import javax.xml.soap.SOAPElement; -import javax.xml.transform.Source; import org.jboss.util.NotImplementedException; import org.jboss.ws.common.Constants; import org.jboss.ws.core.binding.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.binding.ElementDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.ElementSerializerFactory; -import org.jboss.ws.core.jaxrpc.binding.JBossXBDeserializerFactory; -import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPElementDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPElementSerializerFactory; import org.w3c.dom.Element; @@ -62,21 +58,6 @@ */ public LiteralTypeMapping() { - // XOP default mapping - JBossXBSerializerFactory jbxbSF = new JBossXBSerializerFactory(); - JBossXBDeserializerFactory jbxbDF = new JBossXBDeserializerFactory(); - - register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - - register(String.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - register(Image.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - register(Source.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - register(MimeMultipart.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - registerStandardLiteralTypes(); // register default mime mappings Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -44,16 +44,6 @@ // Delegate to JAXWS SOAP binding private SOAPBindingJAXRPC delegate = new SOAPBindingJAXRPC(); - public SOAP11BindingJAXRPC() - { - setMTOMEnabled(false); - } - - public SOAP11BindingJAXRPC(boolean mtomEnabled) - { - setMTOMEnabled(mtomEnabled); - } - public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) { delegate.setSOAPActionHeader(opMetaData, reqMessage); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -44,16 +44,6 @@ // Delegate to JAXWS SOAP binding private SOAPBindingJAXRPC delegate = new SOAPBindingJAXRPC(); - public SOAP12BindingJAXRPC() - { - setMTOMEnabled(false); - } - - public SOAP12BindingJAXRPC(boolean mtomEnabled) - { - setMTOMEnabled(mtomEnabled); - } - public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) { delegate.setSOAPActionHeader(opMetaData, reqMessage); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -327,7 +327,7 @@ { EndpointMetaData emd = msgContext.getEndpointMetaData(); String bindingId = emd.getBindingId(); - if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) + if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) { return true; } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -28,11 +28,7 @@ import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.DeserializerSupport; import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.ws.extensions.xop.jaxrpc.XOPUnmarshallerImpl; -import org.jboss.ws.common.DOMUtils; import org.jboss.xb.binding.SimpleTypeBindings; -import org.jboss.xb.binding.sunday.xop.XOPUnmarshaller; import org.w3c.dom.Element; /** @@ -56,19 +52,9 @@ byte[] value = null; - if(XOPContext.isXOPMessage()) - { - Element xopInclude = DOMUtils.getFirstChildElement(xmlFragment); - String cid = xopInclude.getAttribute("href"); - XOPUnmarshaller xopUnmarshaller = new XOPUnmarshallerImpl(); - value = xopUnmarshaller.getAttachmentAsByteArray(cid); - } - else - { - String valueStr = unwrapValueStr(xmlFragment); - if (valueStr != null) - value = SimpleTypeBindings.unmarshalBase64(valueStr); - } + String valueStr = unwrapValueStr(xmlFragment); + if (valueStr != null) + value = SimpleTypeBindings.unmarshalBase64(valueStr); return value; } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -28,14 +28,10 @@ import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.SerializerSupport; -import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.ws.extensions.xop.jaxrpc.XOPMarshallerImpl; import org.jboss.ws.util.xml.BufferedStreamResult; import org.jboss.ws.common.JavaUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.jboss.xb.binding.SimpleTypeBindings; -import org.jboss.xb.binding.sunday.xop.XOPMarshaller; -import org.jboss.xb.binding.sunday.xop.XOPObject; import org.w3c.dom.NamedNodeMap; /** @@ -57,21 +53,9 @@ String xmlFragment = null; NamespaceRegistry nsRegistry = serContext.getNamespaceRegistry(); - if (XOPContext.isXOPMessage()) - { - XOPMarshaller xopMarshaller = new XOPMarshallerImpl(); - XOPObject xopObject = new XOPObject(value); - xopObject.setContentType("application/octet-stream"); - String cid = xopMarshaller.addMtomAttachment(xopObject, xmlName.getNamespaceURI(), xmlType.getLocalPart()); - String xopInclude = "<xop:Include xmlns:xop='http://www.w3.org/2004/08/xop/include' href='" + cid + "'/>"; - xmlFragment = wrapValueStr(xmlName, xopInclude, nsRegistry, null, attributes, false); - } - else - { - value = JavaUtils.getPrimitiveValueArray(value); - String valueStr = SimpleTypeBindings.marshalBase64((byte[])value); - xmlFragment = wrapValueStr(xmlName, valueStr, nsRegistry, null, attributes, true); - } + value = JavaUtils.getPrimitiveValueArray(value); + String valueStr = SimpleTypeBindings.marshalBase64((byte[])value); + xmlFragment = wrapValueStr(xmlName, valueStr, nsRegistry, null, attributes, true); return new BufferedStreamResult(xmlFragment); } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -34,7 +34,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.JavaUtils; -import org.jboss.ws.extensions.xop.jaxrpc.XOPMarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; import org.jboss.ws.metadata.jaxrpcmapping.VariableMapping; @@ -143,7 +142,6 @@ // the actual marshalling SchemaBinding schemaBinding = JBossXBSupport.getOrCreateSchemaBinding(properties); - schemaBinding.setXopMarshaller(new XOPMarshallerImpl()); delegate.marshal(schemaBinding, null, obj, writer); } catch (RuntimeException e) Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBUnmarshallerImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBUnmarshallerImpl.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBUnmarshallerImpl.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -27,7 +27,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.extensions.xop.jaxrpc.XOPUnmarshallerImpl; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.UnmarshallerFactory; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; @@ -54,8 +53,6 @@ org.jboss.xb.binding.Unmarshaller unm = UnmarshallerFactory.newInstance().newUnmarshaller(); SchemaBinding schemaBinding = JBossXBSupport.getOrCreateSchemaBinding(properties); - XOPUnmarshallerImpl xopUnmarshaller = new XOPUnmarshallerImpl(); - schemaBinding.setXopUnmarshaller(xopUnmarshaller); try { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -38,7 +38,6 @@ import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.common.utils.JBossWSEntityResolver; -import org.jboss.ws.extensions.xop.jaxrpc.JBossXBContentAdapter; import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; @@ -101,9 +100,6 @@ bindSchemaToJava(schemaBinding, wsdlMapping); } - // setup MTOM handler - JBossXBContentAdapter.register(schemaBinding); - return schemaBinding; } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -44,7 +44,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; -import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.SOAPElementImpl; import org.jboss.ws.core.soap.SOAPElementWriter; import org.jboss.ws.core.soap.SOAPEnvelopeImpl; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -37,12 +37,11 @@ import org.jboss.ws.core.RoleSource; import org.jboss.ws.core.server.ServerHandlerDelegate; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; /** Delegates to JAXRPC handlers * @@ -126,12 +125,7 @@ else if (type == HandlerType.POST) handlerChain = postHandlerChain; - boolean status = (handlerChain != null ? handlerChain.handleResponse(msgContext) : true); - - if (type == HandlerType.ENDPOINT) - XOPContext.visitAndRestoreXOPData(); - - return status; + return handlerChain != null ? handlerChain.handleResponse(msgContext) : true; } public boolean callFaultHandlerChain(ServerEndpointMetaData sepMetaData, HandlerType type, Exception ex) @@ -146,12 +140,7 @@ else if (type == HandlerType.POST) handlerChain = postHandlerChain; - boolean status = (handlerChain != null ? handlerChain.handleFault(msgContext) : true); - - if (type == HandlerType.ENDPOINT) - XOPContext.visitAndRestoreXOPData(); - - return status; + return handlerChain != null ? handlerChain.handleFault(msgContext) : true; } public void closeHandlerChain(ServerEndpointMetaData sepMetaData, HandlerType type) Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -40,10 +40,8 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttachmentRef; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlList; -import javax.xml.bind.annotation.XmlMimeType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; @@ -126,7 +124,6 @@ clazz, parameter.getType(), parameter.getName(), parameter.getVariable(), parameter.getTypeArguments(), - new boolean[] {parameter.isSwaRef(), parameter.isXop()}, false, parameter.isXmlList(), parameter.getAdapter() ); } @@ -164,7 +161,7 @@ addProperty( clazz, prop.getReturnType().getName(), new QName(prop.getName()), prop.getName(), null, - new boolean[] {false, false}, prop.isTransientAnnotated(), false, null + prop.isTransientAnnotated(), false, null ); clazz.stopPruning(!prune); @@ -221,7 +218,7 @@ private void addProperty(CtClass clazz, String typeName, QName name, String variable, String[] typeArguments, - boolean[] attachments, boolean xmlTransient, boolean xmlList, String adapter) + boolean xmlTransient, boolean xmlList, String adapter) throws CannotCompileException, NotFoundException { ConstPool constPool = clazz.getClassFile().getConstPool(); @@ -253,19 +250,6 @@ annotation.addParameter("name", name.getLocalPart()); annotation.markField(field); } - // @XmlAttachmentRef - if(attachments[0]) - { - annotation = JavassistUtils.createAnnotation(XmlAttachmentRef.class, constPool); - annotation.markField(field); - } - // @XmlMimeType - if(attachments[1]) - { - annotation = JavassistUtils.createAnnotation(XmlMimeType.class, constPool); - annotation.addParameter("value", "application/octet-stream"); // TODO: default mime - annotation.markField(field); - } // @XmlTransient if(xmlTransient) { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -34,14 +34,12 @@ import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; -import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.ComplexTypeDeserializer; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.TypeMappingImpl; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.api.binding.BindingCustomization; import org.jboss.ws.api.binding.JAXBBindingCustomization; @@ -76,8 +74,7 @@ JAXBContext jaxbContext = getJAXBContext(javaTypes); Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); - unmarshaller.setAttachmentUnmarshaller( new AttachmentUnmarshallerImpl()); - + //workaround for https://jira.jboss.org/jira/browse/JBWS-2686 while waiting for Sun's bug to be fixed unmarshaller.setEventHandler(new ValidationEventHandler() { public boolean handleEvent(final ValidationEvent event) Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -35,13 +35,11 @@ import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; -import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.ComplexTypeSerializer; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.util.xml.BufferedStreamResult; import org.jboss.ws.api.binding.BindingCustomization; @@ -79,7 +77,6 @@ Marshaller marshaller = jaxbContext.createMarshaller(); marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); - marshaller.setAttachmentMarshaller(new AttachmentMarshallerImpl()); // It's safe to pass a stream result, because the SCE will always be in XML_VALID state afterwards. // This state can safely be written to an outstream. See XMLFragment and XMLContent as well. Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -345,7 +345,7 @@ { EndpointMetaData emd = msgContext.getEndpointMetaData(); String bindingId = emd.getBindingId(); - if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) + if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) { return true; } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -47,16 +47,6 @@ // Delegate to JAXWS SOAP binding private SOAPBindingJAXWS delegate = new SOAPBindingJAXWS(); - public SOAP11BindingJAXWS() - { - setMTOMEnabled(false); - } - - public SOAP11BindingJAXWS(boolean mtomEnabled) - { - setMTOMEnabled(mtomEnabled); - } - public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) { delegate.setSOAPActionHeader(opMetaData, reqMessage); @@ -109,6 +99,17 @@ public String getBindingID() { - return isMTOMEnabled() ? SOAPBinding.SOAP11HTTP_MTOM_BINDING : SOAPBinding.SOAP11HTTP_BINDING; + return SOAPBinding.SOAP11HTTP_BINDING; } + + @Override + public boolean isMTOMEnabled() // does nothing + { + return false; + } + + @Override + public void setMTOMEnabled(boolean flag) // does nothing + { + } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -51,16 +51,6 @@ // Delegate to JAXWS SOAP binding private SOAPBindingJAXWS delegate = new SOAPBindingJAXWS(); - public SOAP12BindingJAXWS() - { - super(); - setMTOMEnabled(false); - } - - public SOAP12BindingJAXWS(boolean mtomEnabled) { - setMTOMEnabled(mtomEnabled); - } - public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) { delegate.setSOAPActionHeader(opMetaData, reqMessage); @@ -120,6 +110,17 @@ public String getBindingID() { - return isMTOMEnabled() ? SOAPBinding.SOAP12HTTP_MTOM_BINDING : SOAPBinding.SOAP12HTTP_BINDING; + return SOAPBinding.SOAP12HTTP_BINDING; } + + @Override + public boolean isMTOMEnabled() // does nothing + { + return false; + } + + @Override + public void setMTOMEnabled(boolean flag) // does nothing + { + } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -31,8 +31,6 @@ import javax.xml.ws.WebServiceFeature; import javax.xml.ws.handler.Handler; import javax.xml.ws.soap.AddressingFeature; -import javax.xml.ws.soap.MTOMFeature; -import javax.xml.ws.soap.SOAPBinding; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; @@ -69,7 +67,6 @@ static { supportedFeatures.addFeature(new AddressingFeature()); - supportedFeatures.addFeature(new MTOMFeature()); supportedFeatures.addFeature(new RespectBindingFeature()); supportedFeatures.addFeature(new ChunkedEncodingFeature()); } @@ -81,7 +78,6 @@ throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "UNSUPPORTED_FEATURE", feature)); } processAddressingFeature(feature, epMetaData, stub); - processMTOMFeature(feature, epMetaData, stub); processRespectBindingFeature(feature, epMetaData, stub); processChunkedEncodingFeature(feature, epMetaData, stub); @@ -157,25 +153,7 @@ } /** - * Setup MTOM * - * @param <T> - * @param feature - * @param epMetaData - * @param stub - * @return - */ - private static <T> void processMTOMFeature(WebServiceFeature feature, EndpointMetaData epMetaData, T stub) - { - if (feature instanceof MTOMFeature) - { - SOAPBinding binding = (SOAPBinding)((BindingProvider)stub).getBinding(); - binding.setMTOMEnabled(feature.isEnabled()); - } - } - - /** - * * Perform respect binding checks * * @param <T> Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -55,7 +55,6 @@ import javax.xml.ws.soap.SOAPFaultException; import org.jboss.logging.Logger; -import org.jboss.ws.WSException; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.ConfigProvider; @@ -73,15 +72,12 @@ import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.SOAPMessageImpl; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.ws.metadata.umdm.EndpointConfigMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FeatureAwareClientEndpointMetaDataAdapter; import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.w3c.dom.Node; @@ -249,8 +245,6 @@ handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[1]); handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[2]); - XOPContext.visitAndRestoreXOPData(); - // Handlers might have replaced the message reqMsg = (SOAPMessageImpl)msgContext.getSOAPMessage(); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -27,7 +27,6 @@ import java.util.Set; import javax.xml.namespace.QName; -import javax.xml.soap.SOAPMessage; import javax.xml.ws.handler.Handler; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.PortInfo; @@ -35,10 +34,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.MessageAbstraction; import org.jboss.ws.core.server.ServerHandlerDelegate; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointConfigMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; @@ -107,13 +104,7 @@ log.debug("callResponseHandlerChain: " + type); HandlerChainExecutor executor = getExecutor(type); MessageContext msgContext = (MessageContext)MessageContextAssociation.peekMessageContext(); - boolean status = (executor != null ? executor.handleMessage(msgContext) : true); - - MessageAbstraction msg = ((CommonMessageContext)msgContext).getMessageAbstraction(); - if (msg instanceof SOAPMessage) - XOPContext.visitAndRestoreXOPData(); - - return status; + return executor != null ? executor.handleMessage(msgContext) : true; } public void closeHandlerChain(ServerEndpointMetaData sepMetaData, HandlerType type) @@ -136,13 +127,7 @@ HandlerChainExecutor executor = getExecutor(type); MessageContext msgContext = (MessageContext)MessageContextAssociation.peekMessageContext(); ((CommonMessageContext)msgContext).setCurrentException(ex); - boolean status = (executor != null ? executor.handleFault(msgContext, ex) : true); - - MessageAbstraction msg = ((CommonMessageContext)msgContext).getMessageAbstraction(); - if (msg instanceof SOAPMessage) - XOPContext.visitAndRestoreXOPData(); - - return status; + return executor != null ? executor.handleFault(msgContext, ex) : true; } private List<Handler> getHandlerChain(EndpointMetaData epMetaData, HandlerType type) Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -73,9 +73,7 @@ static { protocolMap.put("##SOAP11_HTTP", SOAPBinding.SOAP11HTTP_BINDING); - protocolMap.put("##SOAP11_HTTP_MTOM", SOAPBinding.SOAP11HTTP_MTOM_BINDING); protocolMap.put("##SOAP12_HTTP", SOAPBinding.SOAP12HTTP_BINDING); - protocolMap.put("##SOAP12_HTTP_MTOM", SOAPBinding.SOAP12HTTP_MTOM_BINDING); protocolMap.put("##XML_HTTP", HTTPBinding.HTTP_BINDING); } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -68,7 +68,6 @@ import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; @@ -171,9 +170,6 @@ CommonBinding binding = bindingProvider.getCommonBinding(); binding.setHeaderSource(delegate); - if (binding instanceof CommonSOAPBinding) - XOPContext.setMTOMEnabled(((CommonSOAPBinding)binding).isMTOMEnabled()); - // call the request handler chain boolean handlersPass = callRequestHandlerChain(sepMetaData, handlerType[0]); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties 2012-03-23 10:27:23 UTC (rev 16013) @@ -57,7 +57,6 @@ ILLEGAL_STATE_REQUESTED=Illegal state requested: {0} OBJECT_VALUE_NOT_AVAILABLE=Object value not available MESSAGECONTEXT_NOT_AVAILABLE=MessageContext not available -FAILED_TO_ADOPT_XOP_CONTENT_TYPE=Failed to adopt XOP content type JAVA_TYPE_NOT_ASSIGNABLE=Java type '{0}' is not assignable from: {1} CANNOT_OBTAIN_DESERIALIZER_FACTORY=Cannot obtain deserializer factory for: [xmlType={0},javaType={1}] DOES_NOT_MATCH_ELEMENT_NAME=Content root name does not match element name: {0} != {1} @@ -109,7 +108,6 @@ CANNOT_DECODE_NAME=Cannot decode name for cid: {0} IGNORE_SOAPEXCEPTION=Ignore SOAPException: {0} MIMEHEADERS_CANNOT_BE_NULL=MimeHeaders cannot be null -XOP_PARAMETER_NOT_PROPERLY_INLINED=XOP parameter not properly inlined INVALID_OFFSET=Invalid offset [{0}] for '{1}' ILLEGAL_STATE_REQUESTED=Illegal state requested: {0} PAYLOAD_NOT_AVAILABLE=Payload not available Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -259,10 +259,6 @@ inputStream = decoder.getRootPart().getDataHandler().getInputStream(); attachments = decoder.getRelatedParts(); - if (isXOPContent(contentType)) - { - soapMessage.setXOPMessage(true); - } } else if (isSoapContent(contentType) == false) { @@ -328,10 +324,4 @@ String baseType = type.getBaseType(); return MimeConstants.TYPE_MULTIPART_RELATED.equalsIgnoreCase(baseType); } - - private boolean isXOPContent(ContentType type) - { - String paramType = type.getParameter("type"); - return MimeConstants.TYPE_APPLICATION_XOP_XML.endsWith(paramType); - } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -31,16 +31,13 @@ import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.transform.Source; -import javax.xml.ws.handler.MessageContext.Scope; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.common.DOMWriter; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS; import org.jboss.ws.core.soap.SOAPContent.State; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; @@ -590,55 +587,6 @@ } } - /** - * When a SOAPContentElement transitions between dom-valid and xml-valid - * the XOP elements need to transition from XOP optimized to base64 and reverse.<p> - * - * If MTOM is disabled through a message context property we always enforce the - * base64 representation by expanding to DOM, the same happens when a JAXRPC handler - * accesses the SOAPContentElement.<p> - * - * If the element is in dom-valid state (because a handlers accessed it), upon marshalling - * it's needs to be decided wether or not the <code>xop:Include</code> should be restored. - * This as well depends upon the message context property. - */ - public void handleMTOMTransitions() - { - // JMS transport hot fix. Can be removed once we got a immutabe object model - if (MessageContextAssociation.peekMessageContext() == null) - return; - - // MTOM processing is only required on XOP parameters - if (!isXOPParameter()) - return; - - boolean domContentState = (soapContent instanceof DOMContent); - - if (!XOPContext.isMTOMEnabled()) - { - // If MTOM is disabled, we force dom expansion on XOP parameters. - // This will inline any XOP include element and remove the attachment part. - // See SOAPFactoryImpl for details. - - log.debug("MTOM disabled: Force inline XOP data"); - expandToDOM(); - } - else if (domContentState && XOPContext.isMTOMEnabled()) - { - // When the DOM representation is valid, - // but MTOM is enabled we need to convert the inlined - // element back to an xop:Include element and create the attachment part - - log.debug("MTOM enabled: Restore XOP data"); - XOPContext.restoreXOPDataDOM(this); - } - } - - boolean isXOPParameter() - { - return paramMetaData != null && paramMetaData.isXOP(); - } - public void accept(SAAJVisitor visitor) { visitor.visitSOAPContentElement(this); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -37,9 +37,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.common.Constants; import org.jboss.ws.common.DOMUtils; -import org.jboss.ws.extensions.xop.XOPContext; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -142,8 +140,6 @@ { SOAPElement soapChild = createElement((Element)child); soapElement.addChildElement(soapChild); - if (Constants.NAME_XOP_INCLUDE.equals(soapChild.getElementQName())) - XOPContext.inlineXOPData(soapChild); } else if (nodeType == Node.TEXT_NODE) { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -59,8 +59,6 @@ import org.jboss.ws.core.soap.attachment.MimeConstants; import org.jboss.ws.core.soap.attachment.MultipartRelatedEncoder; import org.jboss.ws.core.soap.attachment.MultipartRelatedSwAEncoder; -import org.jboss.ws.core.soap.attachment.MultipartRelatedXOPEncoder; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.w3c.dom.Node; @@ -83,8 +81,6 @@ private List<AttachmentPart> attachments = new LinkedList<AttachmentPart>(); private CIDGenerator cidGenerator = new CIDGenerator(); private boolean faultMessage; - private boolean isXOPMessage; - private boolean isSWARefMessage; private SOAPPartImpl soapPart; private MultipartRelatedEncoder multipartRelatedEncoder; private static final boolean writeXMLDeclaration = Boolean.getBoolean(WRITE_XML_DECLARATION); @@ -156,26 +152,6 @@ this.faultMessage = faultMessage; } - public boolean isXOPMessage() - { - return isXOPMessage; - } - - public void setXOPMessage(boolean isXOPMessage) - { - this.isXOPMessage = isXOPMessage; - } - - public boolean isSWARefMessage() - { - return isSWARefMessage; - } - - public void setSWARefMessage(boolean isSWAMessage) - { - this.isSWARefMessage = isSWAMessage; - } - public void setAttachments(Collection<AttachmentPart> parts) throws SOAPException { for (AttachmentPart part : parts) @@ -340,27 +316,15 @@ { boolean hasAttachments = attachments.size() > 0; - if (isXOPMessage() && !XOPContext.isMTOMEnabled() && hasAttachments) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "XOP_PARAMETER_NOT_PROPERLY_INLINED")); - // default content-type CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); String contentType = getSOAPContentType(msgContext) + "; charset=" + getCharSetEncoding(); if (hasAttachments) { - if (isXOPMessage() && XOPContext.isMTOMEnabled()) - { - multipartRelatedEncoder = new MultipartRelatedXOPEncoder(this); - multipartRelatedEncoder.encodeMultipartRelatedMessage(); - contentType = multipartRelatedEncoder.getContentType(); - } - else - { - multipartRelatedEncoder = new MultipartRelatedSwAEncoder(this); - multipartRelatedEncoder.encodeMultipartRelatedMessage(); - contentType = multipartRelatedEncoder.getContentType(); - } + multipartRelatedEncoder = new MultipartRelatedSwAEncoder(this); + multipartRelatedEncoder.encodeMultipartRelatedMessage(); + contentType = multipartRelatedEncoder.getContentType(); } //JBWS-2964:Create a new mimeHeaders to avoid changing another referenced mimeHeaders MimeHeaders newMimeHeaders = new MimeHeaders(); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -21,16 +21,11 @@ */ package org.jboss.ws.core.soap; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; import java.lang.reflect.Array; import java.lang.reflect.Method; import java.util.List; import java.util.ResourceBundle; -import javax.activation.DataHandler; -import javax.activation.DataSource; import javax.xml.namespace.QName; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; @@ -39,7 +34,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.common.Constants; import org.jboss.ws.common.DOMUtils; import org.jboss.ws.common.JavaUtils; import org.jboss.ws.core.CommonMessageContext; @@ -49,9 +43,6 @@ import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.TypeMappingImpl; import org.jboss.ws.core.jaxws.SerializationContextJAXWS; -import org.jboss.ws.core.soap.attachment.SwapableMemoryDataSource; -import org.jboss.ws.core.utils.MimeUtils; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.w3c.dom.Comment; @@ -219,30 +210,6 @@ if (!isAssignable) { - // handle XOP simple types, i.e. in RPC/LIT - try - { - String contentType = MimeUtils.resolveMimeType(javaType); - if (debugEnabled) - log.debug("Adopt DataHandler to " + javaType + ", contentType " + contentType); - - DataSource ds = new SwapableMemoryDataSource(((DataHandler)obj).getInputStream(), contentType); - DataHandler dh = new DataHandler(ds); - obj = dh.getContent(); - - // 'application/octet-stream' will return a byte[] instead fo the stream - if (obj instanceof InputStream) - { - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - dh.writeTo(bout); - obj = bout.toByteArray(); - } - } - catch (IOException e) - { - throw new WSException(BundleUtils.getMessage(bundle, "FAILED_TO_ADOPT_XOP_CONTENT_TYPE"), e); - } - if (!JavaUtils.isAssignableFrom(javaType, obj.getClass())) { throw new WSException(BundleUtils.getMessage(bundle, "JAVA_TYPE_NOT_ASSIGNABLE", new Object[]{ javaType , objType.getName()})); @@ -356,9 +323,6 @@ } SOAPElement soapElement = soapFactory.createElement((Element)child); container.addChildElement(soapElement); - if (Constants.NAME_XOP_INCLUDE.equals(qname) || container.isXOPParameter()) - XOPContext.inlineXOPData(soapElement); - } finally { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -38,7 +38,6 @@ // Types public static final String TYPE_APPLICATION_OCTET_STREAM = "application/octet-stream"; - public static final String TYPE_APPLICATION_XOP_XML = "application/xop+xml"; public static final String TYPE_MULTIPART_RELATED = "multipart/related"; public static final String TYPE_TEXT_XML = "text/xml"; public static final String TYPE_XML_UTF8 = TYPE_TEXT_XML + "; charset=UTF-8"; @@ -55,5 +54,4 @@ // Misc public static final String CID_DOMAIN = "ws.jboss.org"; public static final String ROOTPART_CID = "<rootpart@" + CID_DOMAIN + ">"; - public static final String START_INFO_XOP = "text/xml"; } Deleted: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.core.soap.attachment; - -import java.io.OutputStream; - -import javax.mail.MessagingException; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMultipart; -import javax.mail.internet.ParameterList; -import javax.xml.soap.SOAPConstants; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; - -import org.jboss.ws.core.soap.SOAPElementImpl; -import org.jboss.ws.core.soap.SOAPElementWriter; -import org.jboss.ws.core.soap.SOAPMessageImpl; - -/** - * <code>MultipartRelatedEncoder</code> encodes a <code>SOAPMessage</code> - * into a multipart/related stream. - * - * @author Thomas.Diesler(a)jboss.org - * @since 17-Jan-2006 - */ -public class MultipartRelatedXOPEncoder extends MultipartRelatedEncoder -{ - /** - * Construct a MultipartRelatedEncoder from the specified <code>SOAPMessage</code>. - * There is minimal overhead on construction because all source streams are read - * only on a call to {@link #writeTo(OutputStream)}. - * - * @param soapMessage the SOAP message to be sent as a root part - */ - public MultipartRelatedXOPEncoder(SOAPMessageImpl soapMessage) throws SOAPException - { - super(soapMessage); - } - - public void encodeMultipartRelatedMessage() throws SOAPException, MessagingException - { - SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope(); - boolean isSoap12 = SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE.equals(soapEnv.getElementQName().getNamespaceURI()); - String soapType = isSoap12 ? MimeConstants.TYPE_SOAP12 : MimeConstants.TYPE_SOAP11; - - ParameterList p = new ParameterList(); - p.set("type", MimeConstants.TYPE_APPLICATION_XOP_XML); - p.set("start", MimeConstants.ROOTPART_CID); - p.set("start-info", soapType); - - MimeMultipart multipart = new MimeMultipart("related" + p); - MimeBodyPart rootPart = new MimeBodyPart(); - - /* - * TODO - For now we build the root part content from a serialized string of the - * DOM tree, in the future, this should utilize a DataHandler, and a DataContentHandler - * to marshall the message. In this way the root part can be lazily written to the output - * stream. - */ - String envStr = SOAPElementWriter.writeElement((SOAPElementImpl)soapEnv, false); - rootPart.setText(envStr, "UTF-8"); - - rootPart.setContentID(MimeConstants.ROOTPART_CID); - rootPart.setHeader(MimeConstants.CONTENT_TYPE, MimeConstants.TYPE_APPLICATION_XOP_XML + "; charset=UTF-8; type=\"" + soapType + "\""); - rootPart.setHeader(MimeConstants.CONTENT_TRANSFER_ENCODING, MimeConstants.TEXT_8BIT_ENCODING); - - multipart.addBodyPart(rootPart); - - addAttachmentParts(multipart); - - this.multipart = multipart; - } -} Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -32,7 +32,6 @@ import javax.xml.rpc.ParameterMode; import javax.xml.rpc.encoding.TypeMappingRegistry; -import org.apache.xerces.xs.XSTypeDefinition; import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.api.util.BundleUtils; @@ -44,7 +43,6 @@ import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; -import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner; import org.jboss.ws.metadata.builder.MetaDataBuilder; import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; @@ -78,7 +76,6 @@ import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; import org.jboss.ws.metadata.wsdl.WSDLTypes; import org.jboss.ws.metadata.wsdl.WSDLUtils; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; /** * A meta data builder that is based on webservices.xml. @@ -504,34 +501,6 @@ } } - private void setupXOPAttachmentParameter(WSDLInterfaceOperation operation, ParameterMetaData paramMetaData) - { - QName xmlType = paramMetaData.getXmlType(); - - // An XOP parameter is detected if it is a complex type that derives from xsd:base64Binary - WSDLTypes wsdlTypes = operation.getWsdlInterface().getWsdlDefinitions().getWsdlTypes(); - JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlTypes); - String localPart = xmlType.getLocalPart() != null ? xmlType.getLocalPart() : ""; - String ns = xmlType.getNamespaceURI() != null ? xmlType.getNamespaceURI() : ""; - XSTypeDefinition xsType = schemaModel.getTypeDefinition(localPart, ns); - XOPScanner scanner = new XOPScanner(); - if (scanner.findXOPTypeDef(xsType) != null || (localPart.equals("base64Binary") && ns.equals(Constants.NS_SCHEMA_XSD))) - { - // FIXME: read the xmime:contentType from the element declaration - // See SchemaUtils#findXOPTypeDef(XSTypeDefinition typeDef) for details - - /* - FIXME: the classloader is not set yet - paramMetaData.setXopContentType( - MimeUtils.resolveMimeType(paramMetaData.getJavaType()) - ); - */ - - paramMetaData.setXOP(true); - - } - } - /* * Perhaps the JAX-RPC mapping model should be hash based. For now we optimize just this case. */ @@ -565,7 +534,6 @@ ParameterMetaData pmd = buildInputParameter(opMetaData, wsdlOperation, seiMethodMapping, typeMapping, partName, xmlName, xmlType, wsdlPosition++, false); - setupXOPAttachmentParameter(wsdlOperation, pmd); setupSOAPArrayParameter(pmd); } @@ -593,7 +561,6 @@ if (opMetaData.getReturnParameter() != pmd) wsdlPosition++; - setupXOPAttachmentParameter(wsdlOperation, pmd); setupSOAPArrayParameter(pmd); } } @@ -696,7 +663,6 @@ } } - setupXOPAttachmentParameter(wsdlOperation, inMetaData); wsdlPosition = 1; } @@ -852,7 +818,6 @@ } } - setupXOPAttachmentParameter(wsdlOperation, outMetaData); setupSOAPArrayParameter(outMetaData); } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -30,9 +30,6 @@ import javax.xml.ws.WebServiceException; import javax.xml.ws.soap.Addressing; import javax.xml.ws.soap.AddressingFeature; -import javax.xml.ws.soap.MTOM; -import javax.xml.ws.soap.MTOMFeature; -import javax.xml.ws.soap.SOAPBinding; import javax.xml.ws.spi.WebServiceFeatureAnnotation; import org.jboss.logging.Logger; @@ -75,12 +72,6 @@ AddressingFeature feature = new AddressingFeature(anFeature.enabled(), anFeature.required(), anFeature.responses()); sepMetaData.addFeature(feature); } - else if (an.annotationType() == MTOM.class) - { - MTOM anFeature = sepClass.getAnnotation(MTOM.class); - MTOMFeature feature = new MTOMFeature(anFeature.enabled(), anFeature.threshold()); - sepMetaData.addFeature(feature); - } else if (an.annotationType() == RespectBinding.class) { RespectBinding anFeature = sepClass.getAnnotation(RespectBinding.class); @@ -98,8 +89,7 @@ protected void setupEndpointFeatures(ServerEndpointMetaData sepMetaData) { setupAddressingFeature(sepMetaData); - setupMTOMFeature(sepMetaData); - setupRespectBindingFeature(sepMetaData); //this need to be processed last + setupRespectBindingFeature(sepMetaData); } private static void setupAddressingFeature(ServerEndpointMetaData sepMetaData) @@ -112,32 +102,11 @@ hmd.setEndpointMetaData(sepMetaData); hmd.setHandlerClassName(WSAddressingServerHandler.class.getName()); hmd.setHandlerName("WSAddressing Handler"); - hmd.setProtocolBindings("##SOAP11_HTTP ##SOAP12_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP_MTOM"); + hmd.setProtocolBindings("##SOAP11_HTTP ##SOAP12_HTTP"); sepMetaData.addHandler(hmd); } } - private static void setupMTOMFeature(ServerEndpointMetaData sepMetaData) - { - MTOMFeature mtomFeature = sepMetaData.getFeature(MTOMFeature.class); - if (mtomFeature != null && mtomFeature.isEnabled()) - { - String bindingId = sepMetaData.getBindingId(); - if (SOAPBinding.SOAP11HTTP_BINDING.equals(bindingId)) - { - if (log.isDebugEnabled()) - log.debug("MTOMFeature found, setting binding to " + SOAPBinding.SOAP11HTTP_MTOM_BINDING); - sepMetaData.setBindingId(SOAPBinding.SOAP11HTTP_MTOM_BINDING); - } - else if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) - { - if (log.isDebugEnabled()) - log.debug("MTOMFeature found, setting binding to " + SOAPBinding.SOAP12HTTP_MTOM_BINDING); - sepMetaData.setBindingId(SOAPBinding.SOAP12HTTP_MTOM_BINDING); - } - } - } - private static void setupRespectBindingFeature(ServerEndpointMetaData sepMetaData) { RespectBindingFeature respectBindingFeature = sepMetaData.getFeature(RespectBindingFeature.class); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -34,7 +34,6 @@ import javax.xml.ws.BindingType; import javax.xml.ws.RespectBindingFeature; import javax.xml.ws.soap.AddressingFeature; -import javax.xml.ws.soap.MTOMFeature; import org.jboss.ws.WSException; import org.jboss.ws.api.annotation.EndpointConfig; @@ -71,6 +70,7 @@ public class JAXWSClientMetaDataBuilder extends JAXWSMetaDataBuilder { private static final ResourceBundle bundle = BundleUtils.getBundle(JAXWSClientMetaDataBuilder.class); + public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL, UnifiedVirtualFile vfsRoot) { return this.buildMetaData(serviceName, wsdlURL, vfsRoot, null); @@ -80,7 +80,7 @@ ClassLoader classLoader) { if (wsdlURL == null) - throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "INVALID_WSDLURL", wsdlURL)); + throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "INVALID_WSDLURL", wsdlURL)); if (log.isDebugEnabled()) log.debug("START buildMetaData: [service=" + serviceName + "]"); @@ -119,7 +119,7 @@ } catch (Exception ex) { - throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_BUILD_META_DATA", ex.getMessage()), ex); + throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_BUILD_META_DATA", ex.getMessage()), ex); } } @@ -138,10 +138,11 @@ throw new IllegalStateException(BundleUtils.getMessage(bundle, "ONLY_ONE_EPR_ALLOWED")); Element eprElement = portEPRs.get(0).getElement(); - + // construct Native EPR DOMSource eprInfoset = new DOMSource(eprElement); - NativeEndpointReference nativeEPR = (NativeEndpointReference)NativeEndpointReference.readFrom(eprInfoset); + NativeEndpointReference nativeEPR = (NativeEndpointReference) NativeEndpointReference + .readFrom(eprInfoset); nativeEPR.setAddress(endpointMD.getEndpointAddress()); endpointMD.setEndpointReference(nativeEPR); } @@ -181,7 +182,8 @@ for (WSDLService wsdls : wsdlDefinitions.getServices()) serviceNames.add(wsdls.getName()); - throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_WSDL_SERVICE", new Object[]{ serviceName , serviceNames})); + throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_WSDL_SERVICE", new Object[] + {serviceName, serviceNames})); } // Build endpoint meta data @@ -250,20 +252,15 @@ if (log.isDebugEnabled()) log.debug("Processing service-ref contribution on portType: " + epMetaData.getPortTypeName()); - // process MTOM overrides - if (portComp.isMtomEnabled()) - { - epMetaData.addFeature(new MTOMFeature(true, portComp.getMtomThreshold())); - } // process Addressing - if (portComp.isAddressingEnabled()) + if (portComp.isAddressingEnabled()) { - AddressingFeature.Responses response = getAddressFeatureResponses(portComp.getAddressingResponses()); + AddressingFeature.Responses response = getAddressFeatureResponses(portComp.getAddressingResponses()); epMetaData.addFeature(new AddressingFeature(true, portComp.isAddressingRequired(), response)); } - + // process RespectBinding - if (portComp.isRespectBindingEnabled()) + if (portComp.isRespectBindingEnabled()) { epMetaData.addFeature(new RespectBindingFeature(true)); } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -74,8 +74,6 @@ import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; -import org.jboss.ws.extensions.xop.jaxws.AttachmentScanResult; -import org.jboss.ws.extensions.xop.jaxws.ReflectiveAttachmentRefScanner; import org.jboss.ws.metadata.accessor.JAXBAccessorFactoryCreator; import org.jboss.ws.metadata.builder.MetaDataBuilder; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -763,10 +761,6 @@ opMetaData.setDocumentation(method.getAnnotation(Documentation.class).content()); } - // Build parameter meta data - // Attachment annotations on SEI parameters - List<AttachmentScanResult> scanResult = ReflectiveAttachmentRefScanner.scanMethod(method); - Class<?>[] parameterTypes = method.getParameterTypes(); Type[] genericTypes = method.getGenericParameterTypes(); Annotation[][] parameterAnnotations = method.getParameterAnnotations(); @@ -841,8 +835,6 @@ wrappedParameter = new WrappedParameter(wrappedParameter); wrappedOutputParameters.add(wrappedParameter); } - - processAttachmentAnnotationsWrapped(scanResult, i, wrappedParameter); } else { @@ -872,7 +864,6 @@ javaTypes.add(javaType); typeRefs.add(new TypeReference(xmlName, genericType, parameterAnnotations[i])); - processAttachmentAnnotations(scanResult, i, paramMetaData); processMIMEBinding(epMetaData, opMetaData, paramMetaData); } } @@ -905,8 +896,6 @@ // insert at the beginning just for prettiness wrappedOutputParameters.add(0, wrapped); - - processAttachmentAnnotationsWrapped(scanResult, -1, wrapped); } else { @@ -939,7 +928,6 @@ javaTypes.add(returnType); typeRefs.add(new TypeReference(xmlName, genericReturnType, method.getAnnotations())); - processAttachmentAnnotations(scanResult, -1, retMetaData); processMIMEBinding(epMetaData, opMetaData, retMetaData); } } @@ -984,42 +972,6 @@ processMetaExtensions(method, epMetaData, opMetaData); } - /** - * @see org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilder#processAttachmentAnnotations(java.util.List, int, org.jboss.ws.metadata.umdm.ParameterMetaData) - * @param scanResult - * @param i - * @param wrappedParameter - */ - private void processAttachmentAnnotationsWrapped(List<AttachmentScanResult> scanResult, int i, WrappedParameter wrappedParameter) - { - AttachmentScanResult asr = ReflectiveAttachmentRefScanner.getResultByIndex(scanResult, i); - if (asr != null) - { - if (AttachmentScanResult.Type.SWA_REF == asr.getType()) - wrappedParameter.setSwaRef(true); - else - wrappedParameter.setXOP(true); - } - } - - /** - * Update PMD according to attachment annotations that might be in place - * @param scanResult - * @param i - * @param parameter - */ - private void processAttachmentAnnotations(List<AttachmentScanResult> scanResult, int i, ParameterMetaData parameter) - { - AttachmentScanResult asr = ReflectiveAttachmentRefScanner.getResultByIndex(scanResult, i); - if (asr != null) - { - if (AttachmentScanResult.Type.SWA_REF == asr.getType()) - parameter.setSwaRef(true); - else - parameter.setXOP(true); - } - } - private void processMIMEBinding(EndpointMetaData epMetaData, OperationMetaData opMetaData, ParameterMetaData paramMetaData) { // process SWA metadata Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -29,7 +29,6 @@ import javax.xml.ws.RespectBindingFeature; import javax.xml.ws.WebServiceProvider; import javax.xml.ws.soap.AddressingFeature; -import javax.xml.ws.soap.MTOMFeature; import org.jboss.ws.api.annotation.EndpointConfig; import org.jboss.ws.api.annotation.WebContext; @@ -236,14 +235,6 @@ } } - // MTOM settings - if (portComp.isMtomEnabled()) - { - log.debug("Enabling MTOM"); - MTOMFeature feature = new MTOMFeature(true, portComp.getMtomThreshold()); - sepMetaData.getFeatures().addFeature(feature); - } - if (portComp.isAddressingEnabled()) { log.debug("Enabling Addressing"); AddressingFeature.Responses responses = getAddressFeatureResponses(portComp.getAddressingResponses()); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -28,9 +28,6 @@ */ public interface EndpointFeature { - /** Enable MTOM per endpoint */ - final static String MTOM = "http://org.jboss.ws/mtom"; - /** * Validate the XML stream upon dispatch. * Introduces an additional parsing overhead and could be disabled. Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -34,8 +34,6 @@ @Deprecated public class EndpointProperty { - public final static String MTOM_THRESHOLD = "http://org.jboss.ws/mtom#threshold"; - /** * Set to 0 in order to disable chunked encoding */ Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -105,8 +105,6 @@ { SUPPORTED_BINDINGS.add(Constants.SOAP11HTTP_BINDING); SUPPORTED_BINDINGS.add(Constants.SOAP12HTTP_BINDING); - SUPPORTED_BINDINGS.add(Constants.SOAP11HTTP_MTOM_BINDING); - SUPPORTED_BINDINGS.add(Constants.SOAP12HTTP_MTOM_BINDING); SUPPORTED_BINDINGS.add(Constants.HTTP_BINDING); } @@ -773,21 +771,8 @@ { CommonConfig config = getConfig(); - // SOAPBinding configuration - if (configurable instanceof CommonBindingProvider) + if (configurable instanceof DispatchBinding) { - log.debug("Configure SOAPBinding"); - - if (config.hasFeature(EndpointFeature.MTOM)) - { - CommonBindingProvider provider = (CommonBindingProvider)configurable; - ((CommonSOAPBinding)provider.getCommonBinding()).setMTOMEnabled(true); - if (log.isDebugEnabled()) - log.debug("Enable MTOM on endpoint " + getPortName()); - } - } - else if (configurable instanceof DispatchBinding) - { DispatchBinding dpb = (DispatchBinding)configurable; dpb.setValidateDispatch(config.hasFeature(EndpointFeature.VALIDATE_DISPATCH)); } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -40,8 +40,6 @@ import org.jboss.ws.core.jaxrpc.ParameterWrapping; import org.jboss.ws.core.jaxws.DynamicWrapperGenerator; import org.jboss.ws.core.utils.HolderUtils; -import org.jboss.ws.extensions.xop.jaxws.AttachmentScanResult; -import org.jboss.ws.extensions.xop.jaxws.ReflectiveAttachmentRefScanner; import org.jboss.ws.metadata.accessor.AccessorFactoryCreator; import org.jboss.ws.metadata.accessor.ReflectiveMethodAccessorFactoryCreator; import org.jboss.ws.metadata.config.EndpointFeature; @@ -72,8 +70,6 @@ private Set<String> mimeTypes; private boolean inHeader; private boolean isSwA; - private boolean isXOP; - private boolean isSwaRef; private List<WrappedParameter> wrappedParameters; private int index; @@ -336,26 +332,6 @@ this.isSwA = isSwA; } - public boolean isSwaRef() - { - return isSwaRef; - } - - public void setSwaRef(boolean swaRef) - { - isSwaRef = swaRef; - } - - public boolean isXOP() - { - return isXOP; - } - - public void setXOP(boolean isXOP) - { - this.isXOP = isXOP; - } - public boolean isSOAPArrayParam() { return soapArrayParam; @@ -480,35 +456,8 @@ javaType = getJavaType(); if (javaType == null) throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_LOAD_JAVA_TYPE", javaTypeName)); - - initializeAttachmentParameter(epType); } - /** - * Identify MTOM and SWA:Ref parameter as these require special treatment. - * This only affects JAX-WS endpoints. - * - * Note: For SEI parameter annotations this happens within the metadata builder. - * @param epType - */ - private void initializeAttachmentParameter(Type epType) - { - if (epType == Type.JAXWS) - { - ReflectiveAttachmentRefScanner scanner = new ReflectiveAttachmentRefScanner(); - AttachmentScanResult scanResult = scanner.scanBean(javaType); - if (scanResult != null) - { - if (log.isDebugEnabled()) - log.debug("Identified attachment reference: " + xmlName + ", type=" + scanResult.getType()); - if (scanResult.getType() == AttachmentScanResult.Type.XOP) - setXOP(true); - else - setSwaRef(true); - } - } - } - private ClassLoader getClassLoader() { ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader(); @@ -583,12 +532,6 @@ buffer.append("\n mimeTypes=").append(getMimeTypes()); } - if (isXOP()) - { - buffer.append("\n isXOP=").append(isXOP()); - buffer.append("\n mimeTypes=").append(getMimeTypes()); - } - if (wrappedParameters != null) buffer.append("\n wrappedParameters=").append(wrappedParameters); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -41,8 +41,6 @@ private boolean holder = false; private int index = -2; private Accessor accessor; - private boolean swaRef; - private boolean xop; private boolean xmlList; private String adapter = null; @@ -135,26 +133,6 @@ this.accessor = accessor; } - public boolean isSwaRef() - { - return swaRef; - } - - public void setSwaRef(boolean swaRef) - { - this.swaRef = swaRef; - } - - public boolean isXop() - { - return xop; - } - - public void setXOP(boolean xop) - { - this.xop = xop; - } - public boolean isXmlList() { return xmlList; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -80,7 +80,6 @@ import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.utils.ThreadLocalAssociation; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -574,7 +573,6 @@ // Set the outbound headers if (headerSource != null && resMessage instanceof SOAPMessage) { - XOPContext.eagerlyCreateAttachments(); ((SOAPMessage)resMessage).saveChanges(); headerSource.setMimeHeaders(resMessage.getMimeHeaders()); } Modified: stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml 2012-03-23 10:27:23 UTC (rev 16013) @@ -8,11 +8,6 @@ </client-config> <client-config> - <config-name>Standard MTOM client</config-name> - <feature>http://org.jboss.ws/mtom</feature> - </client-config> - - <client-config> <config-name>Standard WSAddressing Client</config-name> <post-handler-chain> <handler-chain-name>WSAddressing Handlers</handler-chain-name> @@ -23,4 +18,4 @@ </post-handler-chain> </client-config> -</jaxrpc-config> \ No newline at end of file +</jaxrpc-config> Modified: stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml 2012-03-23 10:27:23 UTC (rev 16013) @@ -8,11 +8,6 @@ </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 WSAddressing Endpoint</config-name> <pre-handler-chain> <handler-chain-name>WSAddressing Handlers</handler-chain-name> @@ -23,4 +18,4 @@ </pre-handler-chain> </endpoint-config> -</jaxrpc-config> \ No newline at end of file +</jaxrpc-config> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-23 10:27:23 UTC (rev 16013) @@ -3423,174 +3423,6 @@ </webinf> </war> - <!-- jaxrpc-xop-doclit without handlers --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <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> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <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"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-xop-doclit-appclient.jar"/> - </fileset> - </jar> - - <!-- jaxrpc-xop-doclit with handlers --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit_handler.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <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> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF"> - <include name="webservices.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit_handler-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <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"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/handlerconfig/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit_handler-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-xop-doclit_handler-appclient.jar"/> - </fileset> - </jar> - - <!-- jaxrpc-xop-rpclit without handlers --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <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> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <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"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-xop-rpclit-appclient.jar"/> - </fileset> - </jar> - - <!-- jaxrpc-xop-rpclit with handlers --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit_handler.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <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> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF"> - <include name="webservices.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit_handler-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <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"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/handlerconfig/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit_handler-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-xop-rpclit_handler-appclient.jar"/> - </fileset> - </jar> - <!-- Please add alphabetically --> </target> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-23 10:27:23 UTC (rev 16013) @@ -247,22 +247,6 @@ </webinf> </war> - <!-- jaxws-jbws2259 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2259.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2259/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2259/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2259/CustomHandler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2259/Photo.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2259/WEB-INF"> - <include name="jaxws-endpoint-config.xml" /> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> - <!-- jaxws-jbws2285 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2285.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2285/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -480,14 +464,6 @@ </classes> </war> - <!-- jaxws-jbws3250 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3250.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3250/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3250/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3250/*TestCase*.class" /> - </classes> - </war> - <!-- jaxws-webserviceref --> <war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-03-23 10:27:23 UTC (rev 16013) @@ -364,32 +364,6 @@ </metainf> </jar> - <!-- jaxrpc-samples-mtom --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-mtom.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.common,javax.mail.api services export,javax.activation.api services export"/> - </manifest> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-mtom-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <!-- jaxrpc-samples-oneway --> <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-oneway.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/oneway/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -1,120 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.common.config; - -import java.io.File; - -import org.jboss.ws.metadata.config.JBossWSConfigFactory; -import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC; -import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; -import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC; -import org.jboss.wsf.spi.metadata.config.ConfigRoot; -import org.jboss.wsf.spi.metadata.config.EndpointConfig; -import org.jboss.wsf.spi.metadata.config.Feature; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsf.test.JBossWSTest; - -/** - * Test parsing of the JBossWS config - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Dec-2004 - */ -public class ConfigFactoryTestCase extends JBossWSTest -{ - - public void testJAXRPCObjectModelFactory() throws Exception - { - File confFile = getResourceFile("common/config/jaxrpc-endpoint-config.xml"); - assertTrue(confFile.exists()); - - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - ConfigRootJAXRPC config = (ConfigRootJAXRPC)factory.parse(confFile.toURI().toURL()); - - assertNotNull("Null config", config); - - assertEquals(3, config.getEndpointConfig().size()); - EndpointConfigJAXRPC epc1 = (EndpointConfigJAXRPC)config.getEndpointConfig().get(0); - 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()); - UnifiedHandlerChainMetaData preChain = epc2.getPreHandlerChain(); - assertEquals(1, preChain.getHandlers().size()); - UnifiedHandlerMetaData h1 = (UnifiedHandlerMetaData)preChain.getHandlers().get(0); - assertEquals("WSSecurityHandlerInbound", h1.getHandlerName()); - assertEquals("org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound", h1.getHandlerClass()); - } - - public void testJAXWSFeatures() throws Exception - { - File confFile = getResourceFile("common/config/jaxws-endpoint-config.xml"); - assertTrue(confFile.exists()); - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - - ConfigRoot config = (ConfigRoot)factory.parse(confFile.toURI().toURL()); - assertNotNull("Null config", config); - - EndpointConfig epConfig = (EndpointConfig)config.getConfigByName("Standard MTOM Endpoint"); - assertTrue("Feature not set", epConfig.hasFeature("http://org.jboss.ws/mtom")); - - // disable feature - epConfig.setFeature(new Feature("http://org.jboss.ws/mtom"), false); - assertFalse("Feature still set", epConfig.hasFeature("http://org.jboss.ws/mtom")); - } - - public void testJAXRPCFeatures() throws Exception - { - File confFile = getResourceFile("common/config/jaxrpc-endpoint-config.xml"); - assertTrue(confFile.exists()); - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - ConfigRootJAXRPC config = (ConfigRootJAXRPC)factory.parse(confFile.toURI().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 - { - File confFile = getResourceFile("common/config/jaxws-endpoint-config.xml"); - assertTrue(confFile.exists()); - - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - ConfigRoot config = (ConfigRoot)factory.parse(confFile.toURI().toURL()); - assertNotNull("Null config", config); - - EndpointConfig epConfig = (EndpointConfig)config.getConfigByName("Standard WSSecurity Endpoint"); - String value = epConfig.getProperty("http://org.jboss.ws/mtom#threshold"); - assertNotNull("Property does not exist", value); - assertEquals("Wrong property valule", value, "5000"); - } -} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.wsdd; - -import org.jboss.ws.core.soap.TextImpl; -import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.ws.api.handler.GenericSOAPHandler; - -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; -import javax.xml.ws.WebServiceException; -import javax.xml.soap.*; - -/** - * Inbound the handler appends to the echo message, - * outbound it changes the boolean value of the checkMTOM invocation. - * - * @author Heiko.Braun(a)jboss.org - * @since Mar 12, 2007 - */ -public class CustomHandler extends GenericSOAPHandler { - - protected boolean handleInbound(MessageContext msgContext) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - SOAPBody soapBody = soapMessage.getSOAPBody(); - - SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); - if(soapBodyElement.getChildElements().hasNext()) - { - SOAPElement payload = (SOAPElement)soapBodyElement.getChildElements().next(); - SOAPElement message = (SOAPElement)payload.getChildElements().next(); - String value = message.getValue(); - message.setValue(value + "World"); - } - } - catch (SOAPException e) - { - throw new WebServiceException(e); - } - return true; - } - - protected boolean handleOutbound(MessageContext msgContext) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - SOAPBody soapBody = soapMessage.getSOAPBody(); - - SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); - if(soapBodyElement.getChildElements().hasNext()) - { - SOAPElement payload = (SOAPElement)soapBodyElement.getChildElements().next(); - if(soapBodyElement.getElementQName().getLocalPart().indexOf("MTOM") != -1) - { - TextImpl response = (TextImpl)payload.getChildElements().next(); - String value = response.getValue(); - response.setValue( String.valueOf(XOPContext.isMTOMEnabled()) ); - } - - } - } - catch (SOAPException e) - { - throw new WebServiceException(e); - } - - return true; - } -} Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -28,8 +28,6 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.soap.SOAPBinding; import java.net.URL; /** @@ -58,16 +56,4 @@ assertNotNull(response); assertEquals(response.msg, "HelloWorld"); } - - public void testMTOMOverride() throws Exception - { - QName serviceName = new QName("http://wsdd.jaxws.ws.test.jboss.org/";, "WSDDEndpointImplService"); - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - WSDDEndpoint port = service.getPort(WSDDEndpoint.class); - - assertTrue("MTOM should be enabled thorugh webservice.xml overrides", port.checkMTOMEnabled()); - - } } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/WSDDEndpointImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/WSDDEndpointImpl.java 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/WSDDEndpointImpl.java 2012-03-23 10:27:23 UTC (rev 16013) @@ -41,9 +41,6 @@ @WebMethod public Boolean checkMTOMEnabled() { - // At this point it's not set - // The MTOM property is avaialbel when the CommonSOAPBinding - // did bin the reponse. Therefore we delegate this task to the handler impl. return Boolean.FALSE; } Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml 2012-03-23 10:27:23 UTC (rev 16013) @@ -9,20 +9,4 @@ <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> - <handler> - <j2ee:handler-name>WSSecurityHandlerInbound</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound</j2ee:handler-class> - </handler> - </pre-handler-chain> - </endpoint-config> - </jaxrpc-config> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml 2012-03-23 10:27:23 UTC (rev 16013) @@ -9,34 +9,4 @@ <config-name>Standard Endpoint</config-name> </endpoint-config> - <endpoint-config> - <config-name>Standard MTOM Endpoint</config-name> - - <feature><feature-name>http://org.jboss.ws/mtom</feature-name></feature> - - </endpoint-config> - - <endpoint-config> - - <config-name>Standard WSSecurity Endpoint</config-name> - - <pre-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSSecurityHandlerInbound</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </pre-handler-chains> - - <feature><feature-name>http://org.jboss.ws/mtom</feature-name></feature> - - <property> - <property-name>http://org.jboss.ws/mtom#threshold</property-name> - <property-value>5000</property-value> - </property> - - </endpoint-config> - </jaxws-config> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-23 10:01:47 UTC (rev 16012) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-23 10:27:23 UTC (rev 16013) @@ -33,7 +33,6 @@ <!-- Modules --> <modules> <module>native-tests</module> - <module>shared-tests</module> </modules> <!-- Dependencies --> @@ -800,10 +799,6 @@ <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/utf16/UTF16TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/wsdlpublish/WsdlPublishTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude> <!-- # webservices-description in jboss-web.xml / jboss.xml -->