[jbossws-commits] JBossWS SVN: r16015 - in stack/native/trunk/modules: core/src/main/java/org/jboss/ws/core and 27 other directories.

Author: ropalka Date: 2012-03-23 08:14:28 -0400 (Fri, 23 Mar 2012) New Revision: 16015 Removed: stack/native/trunk/modules/core/src/main/java/javax/xml/ws/addressing/ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/wsaddressing/ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/addressing/ stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPMessageWriterTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2166/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2926/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2927/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3124/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/req1.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/req3.xml stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/wsaddr.xsd stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/handlerlifecycle/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2166/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2927/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2978/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/samples/wsa/ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/ 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/client/HTTPRemotingConnection.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/BindingProviderImpl.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/ClientImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.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/umdm/EndpointMetaData.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.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/jbossws-entities.properties 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/core/src/main/resources/META-INF/standard-jaxws-client-config.xml stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.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/scripts/build-samples-jaxws.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2651/EnvelopBuilderTestCase.java stack/native/trunk/modules/testsuite/pom.xml Log: [JBWS-3472] removing ws-addressing support 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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -22,22 +22,17 @@ package org.jboss.ws.core; import java.util.Observable; -import java.util.ResourceBundle; import javax.xml.ws.EndpointReference; import javax.xml.ws.http.HTTPBinding; import javax.xml.ws.soap.SOAPBinding; -import javax.xml.ws.wsaddressing.W3CEndpointReference; -import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder; import org.jboss.logging.Logger; -import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.core.jaxrpc.SOAP11BindingJAXRPC; import org.jboss.ws.core.jaxrpc.SOAP12BindingJAXRPC; import org.jboss.ws.core.jaxws.binding.HTTPBindingJAXWS; import org.jboss.ws.core.jaxws.binding.SOAP11BindingJAXWS; import org.jboss.ws.core.jaxws.binding.SOAP12BindingJAXWS; -import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil; import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -51,7 +46,6 @@ */ public class CommonBindingProvider implements Configurable { - private static final ResourceBundle bundle = BundleUtils.getBundle(CommonBindingProvider.class); private static Logger log = Logger.getLogger(CommonBindingProvider.class); protected EndpointMetaData epMetaData; @@ -103,42 +97,9 @@ public EndpointReference getEndpointReference() { - if (binding instanceof HTTPBinding ) - { - throw new UnsupportedOperationException(BundleUtils.getMessage(bundle, "CANNOT_GET_EPR")); - } - return getEndpointReference(W3CEndpointReference.class); + throw new UnsupportedOperationException(); } - public <T extends EndpointReference> T getEndpointReference(Class<T> clazz) - { - // Conformance 4.5 (javax.xml.ws.BindingProvider.getEndpointReference): An implementation - // MUST be able to return an javax.xml.ws.EndpointReference for the target endpoint if a SOAP binding - // is being used. If the BindingProvider instance has a binding that is either SOAP 1.1/HTTP or - // SOAP 1.2/HTTP, then a W3CEndpointReference MUST be returned. If the binding is XML/HTTP an - // java.lang.UnsupportedOperationExceptionMUST be thrown. - - if (binding instanceof HTTPBinding ) - { - throw new UnsupportedOperationException(BundleUtils.getMessage(bundle, "CANNOT_GET_EPR")); - } - if (epMetaData == null) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "CANNOT_GET_EPR_FROM_EMD")); - - if (epMetaData.getEndpointReference() != null) - { - return EndpointReferenceUtil.transform(clazz, epMetaData.getEndpointReference()); - } - - W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder(); - builder.address(epMetaData.getEndpointAddress()); - builder.serviceName(epMetaData.getServiceMetaData().getServiceName()); - builder.endpointName(epMetaData.getPortName()); - builder.wsdlDocumentLocation(epMetaData.getEndpointAddress() + "?wsdl"); - - return EndpointReferenceUtil.transform(clazz, builder.build()); - } - public void update(Observable observable, Object object) { if(log.isDebugEnabled()) log.debug("Update config: " + object); 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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -21,8 +21,6 @@ */ package org.jboss.ws.core; -import java.net.MalformedURLException; -import java.net.URL; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -39,8 +37,6 @@ import javax.xml.soap.SOAPException; import javax.xml.ws.ProtocolException; import javax.xml.ws.WebServiceException; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.JAXWSAConstants; import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; @@ -58,7 +54,6 @@ import org.jboss.ws.core.soap.Style; 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.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -323,29 +318,6 @@ { String targetAddress = getTargetEndpointAddress(); - // Fall back to wsa:To - AddressingProperties addrProps = (AddressingProperties)msgContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND); - if (targetAddress == null && addrProps != null && addrProps.getTo() != null) - { - AddressingConstantsImpl ADDR = new AddressingConstantsImpl(); - String wsaTo = addrProps.getTo().getURI().toString(); - if (wsaTo.equals(ADDR.getAnonymousURI()) == false) - { - try - { - URL wsaToURL = new URL(wsaTo); - if (log.isDebugEnabled()) - log.debug("Sending request to addressing destination: " + wsaToURL); - targetAddress = wsaToURL.toExternalForm(); - } - catch (MalformedURLException ex) - { - if (log.isDebugEnabled()) - log.debug("Not a valid URL: " + wsaTo); - } - } - } - // The endpoint address must be known beyond this point if (targetAddress == null) throw new WSException(BundleUtils.getMessage(bundle, "TARGET_ENDPOINT_ADDRESS_NOT_SET")); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -29,9 +29,7 @@ import javax.xml.soap.MimeHeader; import javax.xml.soap.MimeHeaders; -import javax.xml.ws.addressing.EndpointReference; -import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.core.MessageAbstraction; import org.jboss.ws.core.MessageTrace; @@ -55,8 +53,6 @@ public abstract class HTTPRemotingConnection implements RemoteConnection { private static final ResourceBundle bundle = BundleUtils.getBundle(HTTPRemotingConnection.class); - // provide logging - private static Logger log = Logger.getLogger(HTTPRemotingConnection.class); private boolean closed; private Integer chunkSize; @@ -108,11 +104,6 @@ targetAddress = epInfo.getTargetAddress(); callProps = epInfo.getProperties(); } - else if (endpoint instanceof EndpointReference) - { - EndpointReference epr = (EndpointReference)endpoint; - targetAddress = epr.getAddress().toString(); - } else { targetAddress = endpoint.toString(); 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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -38,8 +38,6 @@ import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.ws.WebServiceException; -import javax.xml.ws.addressing.AddressingException; -import javax.xml.ws.addressing.MapRequiredException; import javax.xml.ws.soap.SOAPBinding; import javax.xml.ws.soap.SOAPFaultException; @@ -59,14 +57,12 @@ import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; -import org.jboss.ws.core.soap.SOAPFaultImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.soap.XMLFragment; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.w3c.dom.Element; -import org.w3c.dom.Node; /** * Helper methods to translate between SOAPFault and SOAPFaultException @@ -267,38 +263,7 @@ SOAPBody soapBody = soapMessage.getSOAPBody(); - SOAPFault soapFault = null; - if(ex instanceof MapRequiredException) - { - MapRequiredException addrException = (MapRequiredException)ex; - soapFault = soapBody.addFault(addrException.getSubcode(), addrException.getMessage()); - } - else if (ex instanceof AddressingException) - { - try - { - AddressingException addrException = (AddressingException) ex; - SOAPFault fault = new SOAPFaultImpl(); - fault.setFaultCode(addrException.getCode()); - fault.setFaultString(addrException.getReason()); - Detail detail = fault.addDetail(); - Object detailElement = addrException.getDetail(); - if (detailElement instanceof Node) - { - detail.appendChild((Node)detailElement); - } - - return toSOAPMessage(new SOAPFaultException(fault)); - } - catch (SOAPException e) - { - log.warn(BundleUtils.getMessage(bundle, "")); - } - } - else - { - soapFault = soapBody.addFault(getFallbackFaultCode(), getFallbackFaultString(ex)); - } + SOAPFault soapFault = soapBody.addFault(getFallbackFaultCode(), getFallbackFaultString(ex)); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); SerializationContext serContext = msgContext.getSerializationContext(); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingProviderImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingProviderImpl.java 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingProviderImpl.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -27,6 +27,7 @@ import javax.xml.ws.Binding; import javax.xml.ws.BindingProvider; +import javax.xml.ws.EndpointReference; import javax.xml.ws.Service.Mode; import javax.xml.ws.WebServiceException; import javax.xml.ws.http.HTTPBinding; @@ -95,4 +96,10 @@ { return (Binding)binding; } + + @Override + public <T extends EndpointReference> T getEndpointReference(Class<T> clazz) + { + throw new UnsupportedOperationException(); + } } 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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -29,15 +29,11 @@ import javax.xml.ws.RespectBindingFeature; import javax.xml.ws.WebServiceException; import javax.xml.ws.WebServiceFeature; -import javax.xml.ws.handler.Handler; -import javax.xml.ws.soap.AddressingFeature; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.DOMWriter; import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.jaxws.binding.BindingExt; -import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler; import org.jboss.ws.feature.ChunkedEncodingFeature; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData; @@ -49,7 +45,6 @@ import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Process WebServiceFeature provided on client side @@ -66,7 +61,6 @@ private static FeatureSet supportedFeatures = new FeatureSet(); static { - supportedFeatures.addFeature(new AddressingFeature()); supportedFeatures.addFeature(new RespectBindingFeature()); supportedFeatures.addFeature(new ChunkedEncodingFeature()); } @@ -77,7 +71,6 @@ { throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "UNSUPPORTED_FEATURE", feature)); } - processAddressingFeature(feature, epMetaData, stub); processRespectBindingFeature(feature, epMetaData, stub); processChunkedEncodingFeature(feature, epMetaData, stub); @@ -87,54 +80,6 @@ } /** - * Setup addressing - * - * @param <T> - * @param feature - * @param epMetaData - * @param stub - * @return - */ - @SuppressWarnings("unchecked") - private static <T> void processAddressingFeature(WebServiceFeature feature, EndpointMetaData epMetaData, T stub) - { - if (feature instanceof AddressingFeature) - { - BindingExt bindingExt = (BindingExt) ((BindingProvider) stub).getBinding(); - List<Handler> handlers = bindingExt.getHandlerChain(HandlerType.POST); - int addressingHandlerIndex = getAddressingHandlerIndex(handlers); - - if (feature.isEnabled()) - { - if (addressingHandlerIndex == -1) - { - handlers.add(new WSAddressingClientHandler()); - bindingExt.setHandlerChain(handlers, HandlerType.POST); - } - } - else if (addressingHandlerIndex != -1) - { - handlers.remove(addressingHandlerIndex); - bindingExt.setHandlerChain(handlers, HandlerType.POST); - } - } - } - - private static int getAddressingHandlerIndex(final List<Handler> handlers) - { - if (handlers != null) - { - for (int i = 0; i < handlers.size(); i++) - { - if (handlers.get(i) instanceof WSAddressingClientHandler) - return i; - } - } - - return -1; - } - - /** * Setup http chunked encoding * * @param <T> Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -382,7 +382,7 @@ public <T extends EndpointReference> T getEndpointReference(Class<T> clazz) { - return bindingProvider.getEndpointReference(clazz); + throw new UnsupportedOperationException(); } public EndpointConfigMetaData getEndpointConfigMetaData() Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -37,9 +37,7 @@ import javax.xml.ws.WebServiceException; import javax.xml.ws.WebServiceFeature; import javax.xml.ws.WebServicePermission; -import javax.xml.ws.http.HTTPBinding; import javax.xml.ws.wsaddressing.W3CEndpointReference; -import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; @@ -47,7 +45,6 @@ import org.jboss.ws.core.jaxws.spi.http.HttpContext; import org.jboss.ws.core.jaxws.spi.http.HttpServer; import org.jboss.ws.core.jaxws.spi.http.NettyHttpServerFactory; -import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Deployment; @@ -70,7 +67,6 @@ private Object implementor; private Executor executor; - private WebServiceFeature[] features; // TODO: use features private List<Source> metadata; private BindingProviderImpl bindingProvider; private Map<String, Object> properties = new HashMap<String, Object>(); @@ -89,7 +85,6 @@ this.implementor = implementor; this.bindingProvider = new BindingProviderImpl(bindingId); - this.features = features; } @Override @@ -285,24 +280,7 @@ @Override public <T extends EndpointReference> T getEndpointReference(Class<T> clazz, Element... referenceParameters) { - if (isDestroyed || !isPublished) - throw new WebServiceException(BundleUtils.getMessage(bundle, "CANNOT_GET_EPR_FOR_ENDPOINT")); - - if (getBinding() instanceof HTTPBinding) - { - throw new UnsupportedOperationException(BundleUtils.getMessage(bundle, "CANNOT_GET_EPR_WITH_XML_BINDING")); - } - W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder(); - builder.address(address.toString()); - builder.wsdlDocumentLocation(address.toString() + "?wsdl"); - //TODO set other parameters in the builder - if (referenceParameters != null && W3CEndpointReference.class.getName().equals(clazz.getName())) - { - for (Element el : referenceParameters) - builder.referenceParameter(el); - } - - return EndpointReferenceUtil.transform(clazz, builder.build()); + throw new UnsupportedOperationException(); } public String getPath() Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -32,7 +32,6 @@ import javax.xml.ws.BindingType; import javax.xml.ws.Endpoint; import javax.xml.ws.EndpointReference; -import javax.xml.ws.Service; import javax.xml.ws.WebServiceException; import javax.xml.ws.WebServiceFeature; import javax.xml.ws.soap.SOAPBinding; @@ -44,8 +43,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.DOMUtils; -import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil; -import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.w3c.dom.Element; /** @@ -135,21 +132,7 @@ final QName serviceName, final QName portName, final List<Element> metadata, final String wsdlDocumentLocation, final List<Element> referenceParameters, final List<Element> elements, final Map<QName, String> attributes) { - if ((serviceName == null) && (address == null) && (portName == null)) - throw new IllegalStateException(); - if ((portName != null) && (serviceName == null)) - throw new IllegalStateException(); - - final NativeEndpointReference epr = new NativeEndpointReference(); - epr.setAddress(address); - epr.setServiceName(serviceName); - epr.setEndpointName(portName); - epr.setInterfaceName(interfaceName); - epr.setMetadata(metadata); - epr.setWsdlLocation(wsdlDocumentLocation); - epr.setReferenceParameters(referenceParameters); - - return EndpointReferenceUtil.transform(W3CEndpointReference.class, epr); + throw new UnsupportedOperationException(); } public W3CEndpointReference createW3CEndpointReference(final String address, final QName serviceName, @@ -161,29 +144,12 @@ public <T> T getPort(final EndpointReference epr, final Class<T> sei, final WebServiceFeature... features) { - final NativeEndpointReference nepr = EndpointReferenceUtil.transform(NativeEndpointReference.class, epr); - final URL wsdlLocation = nepr.getWsdlLocation(); - final QName serviceName = nepr.getServiceName(); - final ServiceDelegate delegate = createServiceDelegate(wsdlLocation, serviceName, Service.class); - - return delegate.getPort(epr, sei, features); + throw new UnsupportedOperationException(); } public EndpointReference readEndpointReference(final Source eprInfoset) { - if (eprInfoset == null) - throw new NullPointerException(BundleUtils.getMessage(bundle, "PROVIDED_EPRINFOSET_CANNOT_BE_NULL")); - - try - { - final NativeEndpointReference nativeEPR = new NativeEndpointReference(eprInfoset); - final Source source = EndpointReferenceUtil.getSourceFromEndpointReference(nativeEPR); - return new W3CEndpointReference(source); - } - catch (Exception e) - { - throw new WebServiceException(e); - } + throw new UnsupportedOperationException(); } private String getBindingFromAddress(final String address) Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -25,7 +25,6 @@ import java.io.InputStream; import java.lang.reflect.Proxy; import java.net.MalformedURLException; -import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.Iterator; @@ -47,10 +46,6 @@ import javax.xml.ws.Service.Mode; import javax.xml.ws.WebServiceException; import javax.xml.ws.WebServiceFeature; -import javax.xml.ws.addressing.AddressingBuilder; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.JAXWSAConstants; -import javax.xml.ws.addressing.ReferenceParameters; import javax.xml.ws.handler.HandlerResolver; import javax.xml.ws.spi.ServiceDelegate; @@ -66,8 +61,6 @@ import org.jboss.ws.core.jaxws.client.DispatchImpl; import org.jboss.ws.core.jaxws.client.serviceref.NativeServiceObjectFactoryJAXWS; import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; -import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil; -import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilder; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; @@ -87,7 +80,6 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; -import org.w3c.dom.Element; /** * Service delegates are used internally by Service objects to allow pluggability of JAX-WS implementations. @@ -244,11 +236,6 @@ } T port = (T)createProxy(seiClass, epMetaData); - EndpointReference epr = epMetaData.getEndpointReference(); - if (epr != null) - { - initAddressingProperties((BindingProvider)port, epr); - } initWebserviceFeatures(port, epMetaData.getFeatures().getFeatures()); //initialize webserviceFeature in service for getPort(Class<T> seiClass) and getPort(QName portName, Class<T> seiClass) @@ -492,19 +479,7 @@ @Override public <T> Dispatch<T> createDispatch(EndpointReference epr, Class<T> type, Mode mode, WebServiceFeature... features) { - QName portName = null; - NativeEndpointReference nepr = EndpointReferenceUtil.transform(NativeEndpointReference.class, epr); - portName = nepr.getEndpointName(); - //From the JAXWS dispacth api, EPR's address MUST be used for invocations on the endpoint - if (getEndpointMetaData(portName) != null && nepr.getAddress() != null && nepr.getAddress().length() > 0) - { - getEndpointMetaData(portName).setEndpointAddress(nepr.getAddress()); - } - Dispatch<T> dispatch = createDispatch(portName, type, mode); - initAddressingProperties(dispatch, epr); - initWebserviceFeatures(dispatch, this.features); - initWebserviceFeatures(dispatch, features); - return dispatch; + throw new UnsupportedOperationException(); } @Override @@ -519,15 +494,7 @@ @Override public Dispatch<Object> createDispatch(EndpointReference epr, JAXBContext context, Mode mode, WebServiceFeature... features) { - QName portName = null; - NativeEndpointReference nepr = EndpointReferenceUtil.transform(NativeEndpointReference.class, epr); - portName = nepr.getEndpointName(); - - Dispatch<Object> dispatch = createDispatch(portName, context, mode); - initAddressingProperties(dispatch, epr); - initWebserviceFeatures(dispatch, this.features); - initWebserviceFeatures(dispatch, features); - return dispatch; + throw new UnsupportedOperationException(); } @Override @@ -543,7 +510,6 @@ public <T> T getPort(EndpointReference epr, Class<T> sei, WebServiceFeature... features) { T port = getPort(sei); - initAddressingProperties((BindingProvider)port, epr); initWebserviceFeatures(port, features); return port; } @@ -639,34 +605,4 @@ } } } - - // Workaround for [JBWS-2015] Modify addressing handlers to work with the JAXWS-2.1 API - private void initAddressingProperties(BindingProvider bindingProvider, EndpointReference epr) - { - Map<String, Object> reqContext = bindingProvider.getRequestContext(); - AddressingBuilder builder = AddressingBuilder.getAddressingBuilder(); - AddressingProperties addrProps = builder.newAddressingProperties(); - reqContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addrProps); - - NativeEndpointReference nepr = EndpointReferenceUtil.transform(NativeEndpointReference.class, epr); - try - { - if (nepr.getAddress() != null) - addrProps.setTo(builder.newURI(nepr.getAddress())); - - List<Element> w3cRefParams = nepr.getReferenceParameters(); - if (w3cRefParams != null) - { - ReferenceParameters refParams = addrProps.getReferenceParameters(); - for (Element w3cRefParam : w3cRefParams) - { - refParams.addElement(w3cRefParam); - } - } - } - catch (URISyntaxException ex) - { - throw new IllegalArgumentException(ex); - } - } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -26,11 +26,9 @@ import javax.xml.soap.SOAPConnection; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.addressing.EndpointReference; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.core.MessageAbstraction; -import org.jboss.ws.core.client.EndpointInfo; import org.jboss.ws.core.client.HTTPRemotingConnection; import org.jboss.ws.core.client.RemoteConnection; import org.jboss.ws.core.client.SOAPProtocolConnectionHTTP; @@ -96,21 +94,6 @@ if (endpoint == null) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "ENDPOINT_CANNOT_BE_NULL")); - String targetAddress = null; - if (endpoint instanceof EndpointInfo) - { - targetAddress = ((EndpointInfo) endpoint).getTargetAddress(); - } - else if (endpoint instanceof EndpointReference) - { - EndpointReference epr = (EndpointReference) endpoint; - targetAddress = epr.getAddress().toString(); - } - else - { - targetAddress = endpoint.toString(); - } - return remotingConnection; } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -30,12 +30,9 @@ import javax.xml.soap.SOAPBodyElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.JAXWSAConstants; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; @@ -58,24 +55,6 @@ OperationMetaData opMetaData = null; boolean debugEnabled = log.isDebugEnabled(); - // Dispatch based on wsa:Action - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - AddressingProperties inProps = (AddressingProperties)msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND); - if (inProps != null && inProps.getAction() != null) - { - String wsaAction = inProps.getAction().getURI().toASCIIString(); - for (OperationMetaData opAux : epMetaData.getOperations()) - { - if (wsaAction.equals(opAux.getSOAPAction())) - { - opMetaData = opAux; - if (debugEnabled) - log.debug("Use wsa:Action dispatch: " + wsaAction); - break; - } - } - } - // Dispatch to JAXWS Provider if (opMetaData == null && epMetaData.getServiceMode() != null) { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -41,7 +41,6 @@ import javax.wsdl.extensions.soap.SOAPAddress; import javax.wsdl.extensions.soap12.SOAP12Address; import javax.xml.namespace.QName; -import javax.xml.ws.addressing.AddressingProperties; import org.jboss.logging.Logger; import org.jboss.ws.WSException; @@ -50,8 +49,6 @@ import org.jboss.ws.common.ObjectNameFactory; import org.jboss.ws.core.jaxrpc.UnqualifiedFaultException; import org.jboss.ws.core.soap.Use; -import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; -import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; @@ -66,7 +63,6 @@ import org.jboss.ws.metadata.wsdl.WSDLInterfaceFault; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutfault; -import org.jboss.ws.metadata.wsdl.WSDLProperty; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; @@ -475,158 +471,6 @@ } } - /** Process operation meta data extensions. */ - protected void processOpMetaExtensions(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation) - { - final AddressingProperties ADDR = new AddressingPropertiesImpl(); - final AddressingOpMetaExt addrExt = new AddressingOpMetaExt(ADDR.getNamespaceURI()); - final boolean isOneWay = Constants.WSDL20_PATTERN_IN_ONLY.equals(wsdlOperation.getPattern()); - - final String inputAction = this.getInputAction(wsdlOperation, isOneWay); - addrExt.setInboundAction(inputAction); - - if (!isOneWay) - { - final String outputAction = this.getOutputAction(wsdlOperation, isOneWay); - addrExt.setOutboundAction(outputAction); - - setFaultActions(opMetaData, wsdlOperation, addrExt); - } - - opMetaData.addExtension(addrExt); - } - - private void setFaultActions(final OperationMetaData opMetaData, final WSDLInterfaceOperation wsdlOperation, final AddressingOpMetaExt addrExt) - { - for (WSDLInterfaceOperationOutfault fault : wsdlOperation.getOutfaults()) - { - final QName faultQName = wsdlOperation.getWsdlInterface().getFault(fault.getRef()).getElement(); - final String action = this.getFaultAction(wsdlOperation, fault); - - addrExt.setFaultAction(faultQName, action); - } - } - - /* - Copy/paste from http://www.w3.org/TR/wsdl#_names - - 2.4.5 Names of Elements within an Operation - - The name attribute of the input and output elements provides a unique name among all - input and output elements within the enclosing port type. - - In order to avoid having to name each input and output element within an operation, - WSDL provides some default values based on the operation name. If the name attribute - is not specified on a one-way or notification message, it defaults to the name of the operation. - If the name attribute is not specified on the input or output messages of a - request-response or solicit-response operation, the name defaults to the name of - the operation with "Request"/"Solicit" or "Response" appended, respectively. - - Each fault element must be named to allow a binding to specify the concrete format of the fault message. - The name of the fault element is unique within the set of faults defined for the operation. - */ - - private String getInputAction(final WSDLInterfaceOperation wsdlOperation, final boolean oneWay) - { - WSDLProperty wsaInAction = wsdlOperation.getProperty(Constants.WSDL_PROPERTY_ACTION_IN); - if (wsaInAction != null && wsaInAction.getValue() != null && !"".equals(wsaInAction.getValue())) - { - return wsaInAction.getValue(); - } - - final String prefix = this.getActionPrefix(wsdlOperation); - String operationName = wsdlOperation.getName().getLocalPart(); - - WSDLProperty inputName = wsdlOperation.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_IN); - if (inputName != null && inputName.getValue() != null && !"".equals(inputName.getValue())) - { - return prefix + inputName.getValue(); - } - else - { - return prefix + operationName + (oneWay ? "" : "Request"); - } - } - - private String getOutputAction(final WSDLInterfaceOperation wsdlOperation, final boolean oneWay) - { - WSDLProperty wsaOutAction = wsdlOperation.getProperty(Constants.WSDL_PROPERTY_ACTION_OUT); - if (wsaOutAction != null && wsaOutAction.getValue() != null && !"".equals(wsaOutAction.getValue())) - { - return wsaOutAction.getValue(); - } - - final String prefix = this.getActionPrefix(wsdlOperation); - String operationName = wsdlOperation.getName().getLocalPart(); - - WSDLProperty outputName = wsdlOperation.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_OUT); - if (outputName != null && outputName.getValue() != null && !"".equals(outputName.getValue())) - { - return prefix + outputName.getValue(); - } - else - { - return prefix + operationName + (oneWay ? "" : "Response"); - } - } - - /* - Copy/paste from http://www.w3.org/TR/2007/REC-ws-addr-metadata-20070904/#defactionwsdl11 - - 4.4.4 Default Action Pattern for WSDL 1.1 - - A default pattern is also defined for backwards compatibility with WSDL 1.1. In the absence of an explicitly specified value - for the [action] property (see section 4.4.1 Explicit Association), the following pattern is used to construct a default action - for inputs and outputs. The general form of an action IRI is as follows: - - Example 4-6. Structure of defaulted wsa:Action IRI. - - [target namespace][delimiter][port type name][delimiter][input|output name] - - For fault messages, the general form of an action IRI is as follows: - - Example 4-7. Structure of default wsa:Action IRI for faults - - [target namespace][delimiter][port type name][delimiter][operation name][delimiter]Fault[delimiter][fault name] - */ - private String getFaultAction(final WSDLInterfaceOperation wsdlOperation, final WSDLInterfaceOperationOutfault fault) - { - final WSDLProperty wsaFaultAction = fault.getProperty(Constants.WSDL_PROPERTY_ACTION_FAULT); - if (wsaFaultAction != null && wsaFaultAction.getValue() != null && !"".equals(wsaFaultAction.getValue())) - { - return wsaFaultAction.getValue(); - } - - final String prefix = this.getActionPrefix(wsdlOperation); - String operationName = wsdlOperation.getName().getLocalPart(); - - final WSDLProperty faultName = fault.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_FAULT); - final String delimeter = this.getDelimeter(prefix); - if (faultName != null && faultName.getValue() != null && !"".equals(faultName.getValue())) - { - return prefix + operationName + delimeter + "Fault" + delimeter + faultName.getValue(); - } - - throw new IllegalStateException(); - } - - private String getActionPrefix(final WSDLInterfaceOperation wsdlOperation) - { - final String portTypeName = wsdlOperation.getWsdlInterface().getName().getLocalPart(); - String namespace = wsdlOperation.getName().getNamespaceURI(); - final String delimeter = this.getDelimeter(namespace); - - if (!namespace.endsWith(delimeter)) - namespace += delimeter; - - return namespace + portTypeName + delimeter; - } - - private String getDelimeter(final String namespace) - { - return namespace.toLowerCase().startsWith("urn:") ? ":" : "/"; - } - protected void buildFaultMetaData(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation) { TypesMetaData typesMetaData = opMetaData.getEndpointMetaData().getServiceMetaData().getTypesMetaData(); 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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -144,8 +144,6 @@ protected void setupOperationsFromWSDL(EndpointMetaData epMetaData, WSDLEndpoint wsdlEndpoint, ServiceEndpointInterfaceMapping seiMapping) { - WSDLDefinitions wsdlDefinitions = wsdlEndpoint.getInterface().getWsdlDefinitions(); - // For every WSDL interface operation build the OperationMetaData WSDLInterface wsdlInterface = wsdlEndpoint.getInterface(); for (WSDLInterfaceOperation wsdlOperation : wsdlInterface.getOperations()) @@ -213,9 +211,6 @@ // Build operation faults buildFaultMetaData(opMetaData, wsdlOperation); - - // process further operation extensions - processOpMetaExtensions(opMetaData, wsdlOperation); } } 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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -28,15 +28,11 @@ import javax.xml.ws.RespectBinding; import javax.xml.ws.RespectBindingFeature; import javax.xml.ws.WebServiceException; -import javax.xml.ws.soap.Addressing; -import javax.xml.ws.soap.AddressingFeature; import javax.xml.ws.spi.WebServiceFeatureAnnotation; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.DOMWriter; -import org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler; -import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsdl.Extendable; @@ -46,7 +42,6 @@ import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Process EndpointFeature annotations @@ -66,14 +61,8 @@ WebServiceFeatureAnnotation wsfa = an.annotationType().getAnnotation(WebServiceFeatureAnnotation.class); if (wsfa != null) { - if (an.annotationType() == Addressing.class) + if (an.annotationType() == RespectBinding.class) { - Addressing anFeature = sepClass.getAnnotation(Addressing.class); - AddressingFeature feature = new AddressingFeature(anFeature.enabled(), anFeature.required(), anFeature.responses()); - sepMetaData.addFeature(feature); - } - else if (an.annotationType() == RespectBinding.class) - { RespectBinding anFeature = sepClass.getAnnotation(RespectBinding.class); RespectBindingFeature feature = new RespectBindingFeature(anFeature.enabled()); sepMetaData.addFeature(feature); @@ -88,25 +77,9 @@ protected void setupEndpointFeatures(ServerEndpointMetaData sepMetaData) { - setupAddressingFeature(sepMetaData); setupRespectBindingFeature(sepMetaData); } - private static void setupAddressingFeature(ServerEndpointMetaData sepMetaData) - { - AddressingFeature addressingFeature = sepMetaData.getFeature(AddressingFeature.class); - if (addressingFeature != null && addressingFeature.isEnabled()) - { - log.debug("AddressingFeature found, installing WS-Addressing post-handler"); - HandlerMetaDataJAXWS hmd = new HandlerMetaDataJAXWS(HandlerType.POST); - hmd.setEndpointMetaData(sepMetaData); - hmd.setHandlerClassName(WSAddressingServerHandler.class.getName()); - hmd.setHandlerName("WSAddressing Handler"); - hmd.setProtocolBindings("##SOAP11_HTTP ##SOAP12_HTTP"); - sepMetaData.addHandler(hmd); - } - } - 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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -30,10 +30,8 @@ import javax.jws.soap.SOAPBinding; import javax.xml.namespace.QName; -import javax.xml.transform.dom.DOMSource; import javax.xml.ws.BindingType; import javax.xml.ws.RespectBindingFeature; -import javax.xml.ws.soap.AddressingFeature; import org.jboss.ws.WSException; import org.jboss.ws.api.annotation.EndpointConfig; @@ -41,7 +39,6 @@ import org.jboss.ws.common.Constants; import org.jboss.ws.common.ResourceLoaderAdapter; import org.jboss.ws.core.jaxws.client.serviceref.NativeServiceObjectFactoryJAXWS; -import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -50,7 +47,6 @@ import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; @@ -59,7 +55,6 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; -import org.w3c.dom.Element; /** * A client side meta data builder. @@ -98,12 +93,6 @@ buildMetaDataInternal(serviceMetaData, wsdlDefinitions); - //Setup policies and EPRs for each endpoint - for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints()) - { - processEPRs(epMetaData, wsdlDefinitions); - } - // Read the WSDL and initialize the schema model // This should only be needed for debuging purposes of the UMDM JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); @@ -123,33 +112,6 @@ } } - private void processEPRs(EndpointMetaData endpointMD, WSDLDefinitions wsdlDefinitions) - { - WSDLService wsdlService = wsdlDefinitions.getService(endpointMD.getServiceMetaData().getServiceName()); - if (wsdlService != null) - { - WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoint(endpointMD.getPortName()); - if (wsdlEndpoint != null) - { - List<WSDLExtensibilityElement> portEPRs = wsdlEndpoint.getExtensibilityElements(Constants.WSDL_ELEMENT_EPR); - if (portEPRs != null && portEPRs.size() != 0) - { - if (portEPRs.size() > 1) - 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); - nativeEPR.setAddress(endpointMD.getEndpointAddress()); - endpointMD.setEndpointReference(nativeEPR); - } - } - } - } - /** Build from WSDL and service name */ public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL) @@ -252,13 +214,6 @@ if (log.isDebugEnabled()) log.debug("Processing service-ref contribution on portType: " + epMetaData.getPortTypeName()); - // process Addressing - if (portComp.isAddressingEnabled()) - { - AddressingFeature.Responses response = getAddressFeatureResponses(portComp.getAddressingResponses()); - epMetaData.addFeature(new AddressingFeature(true, portComp.isAddressingRequired(), response)); - } - // process RespectBinding if (portComp.isRespectBindingEnabled()) { 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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -50,14 +50,10 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; -import javax.xml.ws.Action; import javax.xml.ws.BindingType; -import javax.xml.ws.FaultAction; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; import javax.xml.ws.WebFault; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.soap.AddressingFeature; import org.jboss.logging.Logger; import org.jboss.ws.WSException; @@ -72,8 +68,6 @@ import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; 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.metadata.accessor.JAXBAccessorFactoryCreator; import org.jboss.ws.metadata.builder.MetaDataBuilder; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -201,17 +195,6 @@ } } - protected AddressingFeature.Responses getAddressFeatureResponses(String responses) - { - - AddressingFeature.Responses result = AddressingFeature.Responses.ALL; - if ("ANONYMOUS".equals(responses)) - result = AddressingFeature.Responses.ANONYMOUS; - if ("NON_ANONYMOUS".equals(responses)) - result = AddressingFeature.Responses.NON_ANONYMOUS; - return result; - } - public static UnifiedHandlerChainsMetaData getHandlerChainsMetaData(Class<?> wsClass, String filename) { URL fileURL = null; @@ -567,151 +550,6 @@ return (namespace != null) ? new QName(namespace, name) : new QName(name); } - /* - * 1. A non-default @Action(input=...) or @WebMethod(action=...) value on a SEI method - * MUST result into wsdl:input[@wsam:Action] attribute in the corresponding wsdl:operation. - * Also, @Action(input=...) and @WebMethod(action=...) annotation element values MUST - * be same, if present. - * 2. If wsdl:input[@wsam:Action] cannot be mapped from the above steps, then wsam:Action - * is generated using the metadata defaulting algorithm as if wsdl:input[@name] is - * not present in WSDL. - */ - private String getInputActionName(final Method method, final EndpointMetaData endpointMD, final OperationMetaData operationMD, final AddressingOpMetaExt addrExt) - { - String actionInput = null; - Action actionAnn = method.getAnnotation(Action.class); - if ((actionAnn != null) && (!"".equals(actionAnn.input()))) - actionInput = actionAnn.input(); - - String webMethodAction = null; - WebMethod webMethodAnn = method.getAnnotation(WebMethod.class); - if ((webMethodAnn != null) && (!"".equals(webMethodAnn.action()))) - webMethodAction = webMethodAnn.action(); - - if ((actionInput != null) && (webMethodAction != null) && !actionInput.equals(webMethodAction)) - throw new RuntimeException(BundleUtils.getMessage(bundle, "MUST_HAVE_SAME_VALUE", method)); - - if (actionInput != null) - return actionInput; - - if (webMethodAction != null) - return webMethodAction; - - if (addrExt.getInboundAction() != null) - return addrExt.getInboundAction(); - - String tns = this.getEndpointNamespace(endpointMD); - String portTypeName = endpointMD.getPortTypeName().getLocalPart(); - String opName = operationMD.getQName().getLocalPart(); - - return tns + portTypeName + "/" + opName + "Request"; - } - - /* - * 2. A non-default @Action(output=...) value on a SEI method MUST result into wsdl:output- - * [@wsam:Action] attribute in the corresponding wsdl:operation. - * 5. If wsdl:output[@wsam:Action] cannot be mapped from the above steps, then wsam:Action - * is generated using the metadata defaulting algorithm as if wsdl:output[@name] is not present in - * WSDL. - */ - private String getOutputActionName(final Method method, final EndpointMetaData endpointMD, final OperationMetaData operationMD, final AddressingOpMetaExt addrExt) - { - if (operationMD.isOneWay()) - return null; - - Action actionAnn = method.getAnnotation(Action.class); - if ((actionAnn != null) && (!"".equals(actionAnn.output()))) - return actionAnn.output(); - - if (addrExt.getOutboundAction() != null) - return addrExt.getOutboundAction(); - - String tns = this.getEndpointNamespace(endpointMD); - String portTypeName = endpointMD.getPortTypeName().getLocalPart(); - String opName = operationMD.getQName().getLocalPart(); - - return tns + portTypeName + "/" + opName + "Response"; - } - - /* - * 3. A non-default @Action(@FaultAction=...) value on a SEI method MUST result into wsdl:fault- - * [@wsam:Action] attribute in the corresponding wsdl:operation. The wsdl:fault element - * MUST correspond to the exception specified by className annotated element value. - * 6. If wsdl:fault[@wsam:Action] cannot be mapped from the above steps, then wsam:Action is - * generated using the metadata defaulting algorithm as if wsdl:fault[@name] is the corresponding - * exception class name. - */ - private String getFaultActionName(final Method method, final EndpointMetaData endpointMD, final OperationMetaData operationMD, final FaultMetaData faultMD, final AddressingOpMetaExt addrExt) - { - if (operationMD.isOneWay()) - return null; - - String faultBeanName = faultMD.getJavaTypeName(); - Action actionAnn = method.getAnnotation(Action.class); - FaultAction faultActionAnn = null; - if (actionAnn != null) - { - for (FaultAction faultAction : actionAnn.fault()) - { - if (faultAction.className().getName().equals(faultBeanName)) - { - faultActionAnn = faultAction; - break; - } - } - } - - if ((faultActionAnn != null) && (!"".equals(faultActionAnn.value()))) - return faultActionAnn.value(); - - final String faultAction = addrExt.getFaultAction(faultMD.getXmlName()); - if (faultAction != null) - return faultAction; - - String tns = this.getEndpointNamespace(endpointMD); - String portTypeName = endpointMD.getPortTypeName().getLocalPart(); - String opName = operationMD.getQName().getLocalPart(); - int dotIndex = faultBeanName.lastIndexOf('.'); - String excetionClassName = dotIndex == -1 ? faultBeanName : faultBeanName.substring(dotIndex + 1); - - return tns + portTypeName + "/" + opName + "/Fault/" + excetionClassName; - } - - private String getEndpointNamespace(final EndpointMetaData endpointMD) - { - String namespace = endpointMD.getPortTypeName().getNamespaceURI(); - if (!namespace.endsWith("/")) - namespace += "/"; - - return namespace; - } - - /** - * Process operation meta data extensions. - */ - private void processMetaExtensions(Method method, EndpointMetaData endpointMD, OperationMetaData operationMD) - { - AddressingProperties ADDR = new AddressingPropertiesImpl(); - - AddressingOpMetaExt addrExt = (AddressingOpMetaExt)operationMD.getExtension(ADDR.getNamespaceURI()); - if (addrExt == null) - { - addrExt = new AddressingOpMetaExt(ADDR.getNamespaceURI()); - operationMD.addExtension(addrExt); - } - - final String inboundAction = this.getInputActionName(method, endpointMD, operationMD, addrExt); - addrExt.setInboundAction(inboundAction); - - final String outboundAction = this.getOutputActionName(method, endpointMD, operationMD, addrExt); - addrExt.setOutboundAction(outboundAction); - - for (FaultMetaData faultMD : operationMD.getFaults()) - { - addrExt.setFaultAction(faultMD.getXmlName(), this.getFaultActionName(method, endpointMD, operationMD, faultMD, addrExt)); - } - } - private void processWebMethod(EndpointMetaData epMetaData, Method method) { String javaName = method.getName(); @@ -967,9 +805,6 @@ addFault(opMetaData, exClass); } } - - // process operation meta data extension - processMetaExtensions(method, epMetaData, opMetaData); } private void processMIMEBinding(EndpointMetaData epMetaData, OperationMetaData opMetaData, ParameterMetaData paramMetaData) @@ -1015,9 +850,6 @@ protected void processWebMethods(EndpointMetaData epMetaData, Class<?> wsClass) { - if (epMetaData.getFeature(AddressingFeature.class) == null) - epMetaData.clearOperations(); - // Process @WebMethod annotations boolean webMethodFound = false; for (Method method : wsClass.getMethods()) @@ -1181,9 +1013,6 @@ // Build operation faults buildFaultMetaData(opMetaData, wsdlOperation); - - // process further operation extensions - processOpMetaExtensions(opMetaData, wsdlOperation); } } 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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -28,7 +28,6 @@ import javax.jws.WebService; import javax.xml.ws.RespectBindingFeature; import javax.xml.ws.WebServiceProvider; -import javax.xml.ws.soap.AddressingFeature; import org.jboss.ws.api.annotation.EndpointConfig; import org.jboss.ws.api.annotation.WebContext; @@ -46,7 +45,6 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** @@ -235,13 +233,6 @@ } } - if (portComp.isAddressingEnabled()) - { log.debug("Enabling Addressing"); - AddressingFeature.Responses responses = getAddressFeatureResponses(portComp.getAddressingResponses()); - AddressingFeature feature = new AddressingFeature(true, portComp.isAddressingRequired(), responses); - sepMetaData.getFeatures().addFeature(feature); - } - if (portComp.isRespectBindingEnabled()) { log.debug("Enabling RespectBinding Feature"); 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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -54,8 +54,6 @@ import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.common.JavaUtils; -import org.jboss.ws.core.CommonBindingProvider; -import org.jboss.ws.core.CommonSOAPBinding; import org.jboss.ws.core.binding.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.binding.JBossXBDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory; @@ -66,7 +64,6 @@ import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.jaxws.client.DispatchBinding; -import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; import org.jboss.ws.metadata.accessor.AccessorFactory; @@ -147,8 +144,6 @@ private FeatureSet features = new FeatureSet(); // The documentation edfined through the @Documentation annotation private String documentation; - - private NativeEndpointReference epr; private ConfigObservable configObservable = new ConfigObservable(); @@ -188,16 +183,6 @@ this.portName = portName; } - public NativeEndpointReference getEndpointReference() - { - return epr; - } - - public void setEndpointReference(final NativeEndpointReference epr) - { - this.epr = epr; - } - public QName getPortTypeName() { return portTypeName; Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -36,7 +36,6 @@ import javax.xml.ws.handler.PortInfo; import org.jboss.ws.core.jaxws.JAXBContextCache; -import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; import org.jboss.ws.metadata.config.Configurable; @@ -247,12 +246,6 @@ } @Override - public NativeEndpointReference getEndpointReference() - { - return this.delegee.getEndpointReference(); - } - - @Override public List<HandlerMetaData> getHandlerMetaData(HandlerType type) { return this.delegee.getHandlerMetaData(type); @@ -421,12 +414,6 @@ } @Override - public void setEndpointReference(NativeEndpointReference epr) - { - this.delegee.setEndpointReference(epr); - } - - @Override public void setHandlersInitialized(boolean flag) { this.delegee.setHandlersInitialized(flag); Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -29,24 +29,17 @@ import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.soap.AddressingFeature; import javax.xml.ws.soap.SOAPBinding; -import org.jboss.ws.api.addressing.AddressingConstants; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.common.DOMUtils; -import org.jboss.ws.common.utils.UUIDGenerator; import org.jboss.ws.core.soap.Style; -import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; -import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.wsdl.Extendable; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingFault; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; @@ -78,9 +71,7 @@ public abstract class WSDLGenerator { private static final ResourceBundle bundle = BundleUtils.getBundle(WSDLGenerator.class); - private static final AddressingProperties WSA_PROPERTIES = new AddressingPropertiesImpl(); public static final String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"; - public static final String WSAM_NS = AddressingConstants.Metadata.NS; public static final String WSP_NS = "http://www.w3.org/ns/ws-policy"; protected WSDLDefinitions wsdl; @@ -119,14 +110,6 @@ wsdlBinding.setType(endpoint.getBindingId()); wsdl.addBinding(wsdlBinding); wsdlEndpoint.setBinding(bindingQName); - if (endpoint.isFeatureEnabled(AddressingFeature.class)) - { - // register WSAM namespace - if (wsdl.getPrefix(WSAM_NS) == null) - { - wsdl.registerNamespaceURI(WSAM_NS, "wsa"); - } - } if (endpoint.getDocumentation() != null) { @@ -153,79 +136,8 @@ { processOperation(wsdlInterface, wsdlBinding, operation); } - - // Addressing policies - http://ws.apache.org/commons/neethi/ is not usable thus hacking the code ATM :( - // TODO: implement WS-P facade? - if (endpoint.isFeatureEnabled(AddressingFeature.class)) - { - AddressingFeature addressingFeature = endpoint.getFeature(AddressingFeature.class); - - String policyId = this.addAddressingPolicyDefinition(addressingFeature); - this.addAddressingPolicyReference(policyId, wsdlBinding); - } } - /** - * JAX-WS 3.11 Service and Ports - * <p> - * Conformance (Use of Addressing): Endpoint’s use of addressing, if any, MUST be indicated in the - * wsdl:binding or wsdl:port sections of the WSDL 1.1 as per WS-Addressing 1.0 - Metadata. - * </p> - * <pre> - * &lt;wsp:Policy wsu:Id="SOME_ID"&gt; - * &lt;wsam:Addressing wsp:Optional="true"&gt; - * &lt;wsp:Policy&gt; - * &lt;wsam:NonAnonymousResponses/&gt; - * &lt;/wsp:Policy&gt; - * &lt;/wsam:Addressing&gt; - * &lt;/wsp:Policy&gt; - * <pre> - */ - private String addAddressingPolicyDefinition(final AddressingFeature addressing) - { - // construct addressing policy - String policyId = UUIDGenerator.generateRandomUUIDString(); - Element policyElement = DOMUtils.createElement(new QName(WSP_NS, "Policy", "wsp")); - policyElement.setAttribute("xmlns:wsu", WSU_NS); - policyElement.setAttribute("xmlns:wsp", WSP_NS); - policyElement.setAttribute("wsu:Id", policyId); - Element addressingElement = DOMUtils.createElement(new QName(WSAM_NS, "Addressing", "wsam")); - addressingElement.setAttribute("xmlns:wsam", WSAM_NS); - policyElement.appendChild(addressingElement); - if (!addressing.isRequired()) - { - addressingElement.setAttributeNS(WSP_NS, "wsp:Optional", "true"); - } - Element nestedPolicyElement = DOMUtils.createElement(new QName(WSP_NS, "Policy", "wsp")); - addressingElement.appendChild(nestedPolicyElement); - if (addressing.getResponses() == AddressingFeature.Responses.ANONYMOUS) - { - Element anonymousResponsesElement = DOMUtils.createElement(new QName(WSAM_NS, "AnonymousResponses", "wsam")); - nestedPolicyElement.appendChild(anonymousResponsesElement); - } - else if (addressing.getResponses() == AddressingFeature.Responses.NON_ANONYMOUS) - { - Element anonymousResponsesElement = DOMUtils.createElement(new QName(WSAM_NS, "NonAnonymousResponses", "wsam")); - nestedPolicyElement.appendChild(anonymousResponsesElement); - } - - // bind policy to WSDL - wsdl.addExtensibilityElement(new WSDLExtensibilityElement(WSP_NS, policyElement)); - - return policyId; - } - - /* - * <wsp:PolicyReference URI="#SOME_ID"/> - */ - protected void addAddressingPolicyReference(String policyId, Extendable extendable) - { - Element policyReferenceElement = DOMUtils.createElement(new QName(WSP_NS, "PolicyReference", "wsp")); - policyReferenceElement.setAttribute("xmlns:wsp", WSP_NS); - policyReferenceElement.setAttribute("URI", "#" + policyId); - extendable.addExtensibilityElement(new WSDLExtensibilityElement(WSP_NS, policyReferenceElement)); - } - protected void processOperation(WSDLInterface wsdlInterface, WSDLBinding wsdlBinding, OperationMetaData operation) { WSDLInterfaceOperation interfaceOperation = new WSDLInterfaceOperation(wsdlInterface, operation.getQName()); @@ -253,7 +165,6 @@ String ns = getNamespace(fault.getJavaType(), fault.getXmlName().getNamespaceURI()); QName outFaultName = new QName(ns, fault.getXmlName().getLocalPart()); outfault.setRef(outFaultName); - this.setAddressingAction(outfault, fault, operation); interfaceOperation.addOutfault(outfault); WSDLBindingFault bindingFault = new WSDLBindingFault(wsdlBinding); @@ -348,7 +259,6 @@ // If there is no return parameter, it will most likely be set later with an INOUT or OUT parameter. // Otherwise, a null element means there is a 0 body element part, which is allowed by BP 1.0 interfaceOperation.addOutput(output); - this.setAddressingAction(output, operation); bindingOperation.addOutput(bindingOutput); } @@ -380,7 +290,6 @@ } interfaceOperation.addInput(input); - this.setAddressingAction(input, operation); bindingOperation.addInput(bindingInput); } @@ -427,7 +336,6 @@ } interfaceOperation.addOutput(output); - this.setAddressingAction(output, operation); bindingOperation.addOutput(bindingOutput); } @@ -458,45 +366,9 @@ } interfaceOperation.addInput(input); - this.setAddressingAction(input, operation); bindingOperation.addInput(bindingInput); } - private void setAddressingAction(WSDLInterfaceOperationInput input, OperationMetaData operationMD) - { - AddressingOpMetaExt addrExt = this.getAddressingMD(operationMD); - if (addrExt != null) - { - input.setAction(addrExt.getInboundAction()); - } - } - - private void setAddressingAction(WSDLInterfaceOperationOutput output, OperationMetaData operationMD) - { - AddressingOpMetaExt addrExt = this.getAddressingMD(operationMD); - if (addrExt != null) - { - output.setAction(addrExt.getOutboundAction()); - } - } - - private void setAddressingAction(WSDLInterfaceOperationOutfault fault, FaultMetaData faultMD, OperationMetaData operationMD) - { - AddressingOpMetaExt addrExt = this.getAddressingMD(operationMD); - if (addrExt != null) - { - fault.setAction(addrExt.getFaultAction(faultMD.getXmlName())); - } - } - - private AddressingOpMetaExt getAddressingMD(OperationMetaData operationMD) - { - if (operationMD.getEndpointMetaData().isFeatureEnabled(AddressingFeature.class)) - return (AddressingOpMetaExt)operationMD.getExtension(WSA_PROPERTIES.getNamespaceURI()); - - return null; - } - protected void processService(ServiceMetaData service) { Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -22,19 +22,11 @@ package org.jboss.wsf.stack.jbws; import java.security.Principal; -import java.util.ResourceBundle; import javax.xml.ws.EndpointReference; -import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.http.HTTPBinding; import javax.xml.ws.wsaddressing.W3CEndpointReference; -import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder; -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil; -import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; import org.w3c.dom.Element; @@ -46,7 +38,6 @@ */ public final class NativeWebServiceContext extends ExtensibleWebServiceContext { - private static final ResourceBundle bundle = BundleUtils.getBundle(NativeWebServiceContext.class); public NativeWebServiceContext(final MessageContext messageContext) { super(messageContext); @@ -59,28 +50,7 @@ public <T extends EndpointReference> T getEndpointReference(final Class<T> clazz, final Element... referenceParameters) { - EndpointMetaData endpointMD = ((CommonMessageContext)getMessageContext()).getEndpointMetaData(); - if (endpointMD == null) - { - throw new WebServiceException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_ENDPOINTMD")); - } - if (HTTPBinding.HTTP_BINDING.equals(endpointMD.getBindingId())) - { - throw new UnsupportedOperationException(BundleUtils.getMessage(bundle, "CANNOT_GET_EPR")); - } - W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder(); - String address = endpointMD.getEndpointAddress(); - builder.address(address); - builder.wsdlDocumentLocation(address + "?wsdl"); - builder.serviceName(endpointMD.getServiceMetaData().getServiceName()); - builder.endpointName(endpointMD.getPortName()); - - if (referenceParameters != null && W3CEndpointReference.class.getName().equals(clazz.getName())) - { - for (Element el : referenceParameters) - builder.referenceParameter(el); - } - return EndpointReferenceUtil.transform(clazz, builder.build()); + throw new UnsupportedOperationException(); } @Override 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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -48,10 +48,7 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.soap.SOAPPart; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.JAXWSAConstants; import javax.xml.ws.http.HTTPBinding; -import javax.xml.ws.soap.AddressingFeature; import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; @@ -76,10 +73,8 @@ import org.jboss.ws.core.server.WSDLRequestHandler; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.MessageFactoryImpl; -import org.jboss.ws.core.soap.SOAPConnectionImpl; 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.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -390,7 +385,6 @@ private void sendResponse(Endpoint endpoint, OutputStream output, boolean isFault) throws SOAPException, IOException { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); MessageAbstraction resMessage = msgContext.getMessageAbstraction(); if (resMessage == null) @@ -399,30 +393,7 @@ return; } - String wsaTo = null; - - // Get the destination from the AddressingProperties - AddressingProperties outProps = (AddressingProperties)msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND); - if (outProps != null && outProps.getTo() != null) - { - AddressingConstantsImpl ADDR = new AddressingConstantsImpl(); - wsaTo = outProps.getTo().getURI().toString(); - final AddressingFeature addressing = epMetaData.getFeature(AddressingFeature.class); - final boolean onlyAnonymousAllowed = addressing != null && addressing.getResponses() == AddressingFeature.Responses.ANONYMOUS; - if (wsaTo.equals(ADDR.getAnonymousURI()) || onlyAnonymousAllowed) - wsaTo = null; - } - if (wsaTo != null) - { - if (log.isDebugEnabled()) - log.debug("Sending response to addressing destination: " + wsaTo); - SOAPMessage soapMessage = (SOAPMessage)resMessage; - new SOAPConnectionImpl().callOneWay(soapMessage, wsaTo); - } - else - { - resMessage.writeTo(output); - } + resMessage.writeTo(output); } /** Modified: stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties =================================================================== --- stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2012-03-23 12:14:28 UTC (rev 16015) @@ -2,8 +2,6 @@ urn\:jboss\:jaxws-config\:2.0=schema/jaxws-config_2_0.xsd http\://www.jboss.org/jbossws-tools=schema/jbossws-tool_1_0.xsd http\://java.sun.com/xml/ns/javaee=schema/javaee_web_services_1_2.xsd -http\://www.w3.org/2005/08/addressing=schema/ws-addr-2006-03.xsd -http\://www.w3.org/2007/02/addressing/metadata=schema/ws-addr-metadata-2007-02.xsd http\://www.w3.org/2002/06/soap-encoding=schema/soap-encoding_200206.xsd http\://schemas.xmlsoap.org/soap/encoding/=schema/soap-encoding_1_1.xsd http\://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd=schema/j2ee_web_services_client_1_1.xsd 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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml 2012-03-23 12:14:28 UTC (rev 16015) @@ -7,15 +7,4 @@ <config-name>Standard Client</config-name> </client-config> - <client-config> - <config-name>Standard WSAddressing Client</config-name> - <post-handler-chain> - <handler-chain-name>WSAddressing Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>WSAddressingClientHandler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingClientHandler</j2ee:handler-class> - </handler> - </post-handler-chain> - </client-config> - </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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml 2012-03-23 12:14:28 UTC (rev 16015) @@ -7,15 +7,4 @@ <config-name>Standard Endpoint</config-name> </endpoint-config> - <endpoint-config> - <config-name>Standard WSAddressing Endpoint</config-name> - <pre-handler-chain> - <handler-chain-name>WSAddressing Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>WSAddressing Handler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingServerHandler</j2ee:handler-class> - </handler> - </pre-handler-chain> - </endpoint-config> - </jaxrpc-config> Modified: stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml 2012-03-23 12:14:28 UTC (rev 16015) @@ -17,30 +17,4 @@ <feature><feature-name>http://org.jboss.ws/dispatch/validate</feature-name></feature> </client-config> - <client-config> - <config-name>Standard WSAddressing Client</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - - <client-config> - <config-name>Standard SOAP 1.2 WSAddressing Client</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP12_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - </jaxws-config> Modified: stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2012-03-23 12:14:28 UTC (rev 16015) @@ -25,38 +25,4 @@ <feature><feature-name>http://org.jboss.ws/binding/wsdl/dotnet</feature-name></feature> </endpoint-config> - <endpoint-config> - <config-name>Standard WSAddressing Endpoint</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> - </javaee:handler> - <javaee:handler> - <javaee:handler-name>Recording Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </endpoint-config> - - <endpoint-config> - <config-name>Standard SOAP 1.2 WSAddressing Endpoint</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP12_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> - </javaee:handler> - <javaee:handler> - <javaee:handler-name>Recording Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </endpoint-config> - </jaxws-config> Deleted: stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd =================================================================== --- stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd 2012-03-23 12:14:28 UTC (rev 16015) @@ -1,137 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - W3C XML Schema defined in the Web Services Addressing 1.0 specification - http://www.w3.org/TR/ws-addr-core - - Copyright © 2005 World Wide Web Consortium, - - (Massachusetts Institute of Technology, European Research Consortium for - Informatics and Mathematics, Keio University). All Rights Reserved. This - work is distributed under the W3C® Software License [1] 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. - - [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 - - $Id: ws-addr.xsd,v 1.2 2008/07/23 13:38:16 plehegar Exp $ ---> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2005/08/addressing" targetNamespace="http://www.w3.org/2005/08/addressing" blockDefault="#all" elementFormDefault="qualified" finalDefault="" attributeFormDefault="unqualified"> - - <!-- Constructs from the WS-Addressing Core --> - - <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/> - <xs:complexType name="EndpointReferenceType" mixed="false"> - <xs:sequence> - <xs:element name="Address" type="tns:AttributedURIType"/> - <xs:element ref="tns:ReferenceParameters" minOccurs="0"/> - <xs:element ref="tns:Metadata" minOccurs="0"/> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - - <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType"/> - <xs:complexType name="ReferenceParametersType" mixed="false"> - <xs:sequence> - <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - - <xs:element name="Metadata" type="tns:MetadataType"/> - <xs:complexType name="MetadataType" mixed="false"> - <xs:sequence> - <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - - <xs:element name="MessageID" type="tns:AttributedURIType"/> - <xs:element name="RelatesTo" type="tns:RelatesToType"/> - <xs:complexType name="RelatesToType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:anyURI"> - <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:simpleType name="RelationshipTypeOpenEnum"> - <xs:union memberTypes="tns:RelationshipType xs:anyURI"/> - </xs:simpleType> - - <xs:simpleType name="RelationshipType"> - <xs:restriction base="xs:anyURI"> - <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/> - </xs:restriction> - </xs:simpleType> - - <xs:element name="ReplyTo" type="tns:EndpointReferenceType"/> - <xs:element name="From" type="tns:EndpointReferenceType"/> - <xs:element name="FaultTo" type="tns:EndpointReferenceType"/> - <xs:element name="To" type="tns:AttributedURIType"/> - <xs:element name="Action" type="tns:AttributedURIType"/> - - <xs:complexType name="AttributedURIType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:anyURI"> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <!-- Constructs from the WS-Addressing SOAP binding --> - - <xs:attribute name="IsReferenceParameter" type="xs:boolean"/> - - <xs:simpleType name="FaultCodesOpenEnumType"> - <xs:union memberTypes="tns:FaultCodesType xs:QName"/> - </xs:simpleType> - - <xs:simpleType name="FaultCodesType"> - <xs:restriction base="xs:QName"> - <xs:enumeration value="tns:InvalidAddressingHeader"/> - <xs:enumeration value="tns:InvalidAddress"/> - <xs:enumeration value="tns:InvalidEPR"/> - <xs:enumeration value="tns:InvalidCardinality"/> - <xs:enumeration value="tns:MissingAddressInEPR"/> - <xs:enumeration value="tns:DuplicateMessageID"/> - <xs:enumeration value="tns:ActionMismatch"/> - <xs:enumeration value="tns:MessageAddressingHeaderRequired"/> - <xs:enumeration value="tns:DestinationUnreachable"/> - <xs:enumeration value="tns:ActionNotSupported"/> - <xs:enumeration value="tns:EndpointUnavailable"/> - </xs:restriction> - </xs:simpleType> - - <xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/> - <xs:complexType name="AttributedUnsignedLongType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:unsignedLong"> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/> - <xs:complexType name="AttributedQNameType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:QName"> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:element name="ProblemIRI" type="tns:AttributedURIType"/> - - <xs:element name="ProblemAction" type="tns:ProblemActionType"/> - <xs:complexType name="ProblemActionType" mixed="false"> - <xs:sequence> - <xs:element ref="tns:Action" minOccurs="0"/> - <xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - -</xs:schema> \ No newline at end of file Deleted: stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd =================================================================== --- stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd 2012-03-23 12:14:28 UTC (rev 16015) @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"> -<!-- - W3C XML Schema defined in the Web Services Addressing 1.0 - - Metadata specification - http://www.w3.org/TR/ws-addr-metadata - - Copyright © 2007 World Wide Web Consortium, - - (Massachusetts Institute of Technology, European Research Consortium for - Informatics and Mathematics, Keio University). All Rights Reserved. This - work is distributed under the W3C® Software License [1] 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. - - [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 - - $Id: ws-addr-metadata.xsd,v 1.1 2007/01/31 13:42:59 plehegar Exp $ ---> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2007/02/addressing/metadata" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" targetNamespace="http://www.w3.org/2007/02/addressing/metadata" blockDefault="#all" elementFormDefault="qualified"> - - <xs:element name="ServiceName" type="tns:ServiceNameType"/> - <xs:complexType name="ServiceNameType"> - <xs:simpleContent> - <xs:extension base="xs:QName"> - <xs:attribute name="EndpointName" type="xs:NCName" use="optional"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:element name="InterfaceName" type="tns:AttributedQNameType"/> - <xs:complexType name="AttributedQNameType"> - <xs:simpleContent> - <xs:extension base="xs:QName"> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:attribute name="Action" type="xs:anyURI"/> - - <!-- WS-Policy assertions --> - - <xs:element name="Addressing"> - <xs:complexType> - <xs:sequence> - <xs:element ref="wsp:Policy"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <xs:element name="AnonymousResponses"> - <xs:complexType> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <xs:element name="NonAnonymousResponses"> - <xs:complexType> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - -</xs:schema> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2012-03-23 12:14:28 UTC (rev 16015) @@ -57,8 +57,6 @@ <macro-wstools dest="jaxrpc/samples/oneway/WEB-INF" config="jaxrpc/samples/oneway/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/rpcstyle/WEB-INF" config="jaxrpc/samples/rpcstyle/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/secureejb/META-INF" config="jaxrpc/samples/secureejb/wstools-config.xml"/> - <macro-wstools dest="jaxrpc/samples/wsaddr/hello/WEB-INF" config="jaxrpc/samples/wsaddr/hello/wstools-config.xml"/> - <macro-wstools dest="jaxrpc/samples/wsaddr/replyto/WEB-INF" config="jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/> </target> @@ -68,12 +66,6 @@ <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> - <move todir="${tests.output.dir}/wstools/java"> - <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" includes="org/**"/> - </move> - <move todir="${tests.output.dir}/wstools/java"> - <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/> - </move> <!-- Cannot run javac from tasks 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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-23 12:14:28 UTC (rev 16015) @@ -75,40 +75,6 @@ </fileset> </jar> - <!-- jaxws-epr --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-epr.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/epr/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/epr/*TestCase.class" /> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging,org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </jar> - - <!-- jaxws-handlerlifecycle --> - <war warfile="${tests.output.dir}/test-libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/test-resources/jaxws/handlerlifecycle/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/TrackerEndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.class" /> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/ServerHandler*.class" /> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/PreServerHandler*.class" /> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/PostServerHandler*.class" /> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/HandlerTracker.class" /> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/handlerlifecycle/WEB-INF"> - <include name="jaxws-endpoint-config.xml" /> - </webinf> - </war> - - <jar jarfile="${tests.output.dir}/test-libs/jaxws-handlerlifecycle-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/handlerlifecycle/META-INF"> - <include name="*.xml" /> - </metainf> - </jar> - <!-- jaxws-jaxbintros --> <war warfile="${tests.output.dir}/test-libs/jaxws-jaxbintros.war" webxml="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -187,21 +153,6 @@ </fileset> </jar> - <!-- jaxws-jbws2166--> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2166-A.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws2166/META-INF/MANIFEST.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2166/EndpointA.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2166/EndpointB.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2166/EndpointImplA.class" /> - </fileset> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2166-B.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws2166/META-INF/MANIFEST.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2166/EndpointB.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2166/EndpointImplB.class" /> - </fileset> - </jar> - <!-- jaxws-jbws2187 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2187.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2187/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -386,17 +337,6 @@ </webinf> </war> - <!-- jaxws-jbws2927 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2927.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2927/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2927/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2927/JBWS2927TestCase.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2927/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> - <!-- jaxws-jbws2949 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2949.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2949/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -423,19 +363,6 @@ </webinf> </war> - <!-- jaxws-jbws2978 --> - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2978.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbers.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> - <!-- jaxws-jbws2982 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2982.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2982/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -593,64 +520,6 @@ </webinf> </war> - <!-- jaxws-wsaddressing-action --> - <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/action/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class" /> - </classes> - </war> - - <!-- jaxws-wsaddressing-replyto --> - <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class" /> - </classes> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class" /> - </classes> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class" /> - </classes> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/AddressingHandler.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.class" /> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.wsaddressing.replyto.ApplicationClient" /> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core,org.jboss.ws.common" /> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxws/wsaddressing/appclient/META-INF"> - <include name="application-client.xml" /> - <include name="jboss-client.xml" /> - <include name="jaxrpc-mapping.xml" /> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-wsaddressing-appclient.jar"/> - </fileset> - </jar> - </target> </project> 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 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-03-23 12:14:28 UTC (rev 16015) @@ -545,63 +545,6 @@ </metainf> </jar> - <!-- jaxrpc-samples-wsaddr-hello.war --> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-replyto.war" - webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/replyto/WEB-INF"> - <include name="replyto-jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.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/samples/wsaddr/hello/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/replyto/WEB-INF"> - <include name="replyto-jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-samples-wsaddr-hello-appclient.jar"/> - </fileset> - </jar> - <!-- Please add alphabetically --> </target> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2012-03-23 12:14:28 UTC (rev 16015) @@ -23,45 +23,13 @@ --> <project> - + <!-- ================================================================== --> <!-- Building --> <!-- ================================================================== --> - + <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> - - <mkdir dir="${tests.output.dir}/test-libs"/> - - <!-- jaxws-samples-dar --> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/dar/Bus.class"/> - <include name="org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/dar/DarProcessor.class"/> - <include name="org/jboss/test/ws/jaxws/samples/dar/DarRequest.class"/> - <include name="org/jboss/test/ws/jaxws/samples/dar/DarResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/dar/Route.class"/> - <include name="org/jboss/test/ws/jaxws/samples/dar/ServiceRequest.class"/> - <include name="org/jboss/test/ws/jaxws/samples/dar/Stop.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/META-INF"> - <include name="jboss.xml"/> - </metainf> - </jar> - <!-- jaxws-samples-wsa --> - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/> - </classes> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl" - prefix="WEB-INF/wsdl"/> - </war> - <!-- Please add alphabetically --> </target> Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPMessageWriterTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPMessageWriterTestCase.java 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPMessageWriterTestCase.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -1,67 +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.common.soap; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; - -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPMessage; - -import org.jboss.ws.common.DOMUtils; -import org.jboss.wsf.test.JBossWSTest; - -/** - * Test the DOMWriter - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-Aug-2006 - */ -public class SOAPMessageWriterTestCase extends JBossWSTest -{ - public void testEnvelopeWriter() throws Exception - { - String expEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" - + " <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>" - + " <wsa:To>http://fabrikam123.example/Purchasing</wsa:To>" - + " <wsa:ReplyTo>" - + " <wsa:Address>http://business456.example/client1</wsa:Address>" - + " <wsa:ReferenceParameters>" - + " <ns1:sessionid xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid>" - + " </wsa:ReferenceParameters>" - + " </wsa:ReplyTo>" - + " <wsa:Action>http://fabrikam123.example/SubmitPO</wsa:Action>" - + " <wsa:MessageID>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:MessageID>" - + " </env:Header>" - + " <env:Body/>" - + "</env:Envelope>"; - - MessageFactory factory = MessageFactory.newInstance(); - SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(expEnv.getBytes())); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - soapMessage.writeTo(baos); - String wasEnv = new String(baos.toByteArray()); - - assertEquals(DOMUtils.parse(expEnv), DOMUtils.parse(wasEnv)); - } -} Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2651/EnvelopBuilderTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2651/EnvelopBuilderTestCase.java 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2651/EnvelopBuilderTestCase.java 2012-03-23 12:14:28 UTC (rev 16015) @@ -26,7 +26,6 @@ import java.io.InputStream; import java.io.StringReader; -import javax.xml.soap.SOAPEnvelope; import javax.xml.transform.stream.StreamSource; import junit.framework.TestCase; Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/req1.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/req1.xml 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/req1.xml 2012-03-23 12:14:28 UTC (rev 16015) @@ -1,9 +0,0 @@ -<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> - <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'> - <wsa:To>http://business456.example/client1</wsa:To> - <wsa:Action>http://fabrikam123.example/ReplyPO</wsa:Action> - <wsa:RelatesTo>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:RelatesTo> - <ns1:sessionid wsa:IsReferenceParameter='true' xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid> - </env:Header> - <env:Body/> -</env:Envelope> \ No newline at end of file Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/req3.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/req3.xml 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/req3.xml 2012-03-23 12:14:28 UTC (rev 16015) @@ -1,18 +0,0 @@ -<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> - <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'> - <wsa:To>uri:jbossws-addressing-initial/InitialService</wsa:To> - <wsa:ReplyTo> - <wsa:Address>http://localhost:8080/jbossws-addressing-replyto/ReplyToService</wsa:Address> - </wsa:ReplyTo> - <wsa:FaultTo> - <wsa:Address>http://localhost:8080/jbossws-addressing-faultto/FaultToService</wsa:Address> - </wsa:FaultTo> - <wsa:Action>http://org.jboss.ws/addressing/replyto/action</wsa:Action> - <wsa:MessageID>urn:uuid:fd82cb27-e79-4d44-8e88-e57398058132</wsa:MessageID> - </env:Header> - <env:Body> - <ns1:addItem xmlns:ns1='http://org.jboss.ws/addressing/replyto' xmlns:xsi='http://www..org/2001/XMLSchema-instance'> - <ns1:String_1>Ice Cream</ns1:String_1> - </ns1:addItem> - </env:Body> -</env:Envelope> \ No newline at end of file Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/wsaddr.xsd =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/wsaddr.xsd 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/wsaddr.xsd 2012-03-23 12:14:28 UTC (rev 16015) @@ -1,156 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" - "http://www.w3.org/2001/XMLSchema.dtd"> -<!-- - W3C XML Schema defined in the Web Services Addressing 1.0 specification - http://www.w3.org/TR/ws-addr-core - - Copyright © 2005 World Wide Web Consortium, - - (Massachusetts Institute of Technology, European Research Consortium for - Informatics and Mathematics, Keio University). All Rights Reserved. This - work is distributed under the W3C® Software License [1] 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. - - [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 ---> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:tns="http://www.w3.org/2005/08/addressing" - targetNamespace="http://www.w3.org/2005/08/addressing" - blockDefault="#all" elementFormDefault="qualified" - finalDefault="" attributeFormDefault="unqualified"> - - <!-- Constructs from the WS-Addressing Core --> - - <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/> - <xs:complexType name="EndpointReferenceType" mixed="false"> - <xs:sequence> - <xs:element name="Address" type="xs:anyURI"/> - - <!-- [hb] was not working - xs:element name="Address" type="tns:AttributedURIType"/--> - <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType" minOccurs="0"/> - <xs:element ref="tns:Metadata" minOccurs="0"/> - <!--xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/--> - </xs:sequence> - <!--xs:anyAttribute namespace="##other" processContents="lax"/--> - </xs:complexType> - - <xs:complexType name="ReferenceParametersType" mixed="false"> - <xs:sequence> - <!--xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/--> - <!-- - [hb] workaround for missing wilcard support - --> - <xs:element name="Identifier" type="xs:anyURI" minOccurs="0"/> - </xs:sequence> - <!--xs:anyAttribute namespace="##other" processContents="lax"/--> - </xs:complexType> - - <xs:element name="Metadata" type="tns:MetadataType"/> - <xs:complexType name="MetadataType" mixed="false"> - <xs:sequence> - <!--xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/--> - </xs:sequence> - <!--xs:anyAttribute namespace="##other" processContents="lax"/--> - </xs:complexType> - - <xs:element name="MessageID" type="tns:AttributedURIType"/> - <xs:element name="RelatesTo" type="tns:RelatesToType"/> - <xs:complexType name="RelatesToType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:anyURI"> - <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" - default="http://www.w3.org/2005/08/addressing/reply"/> - <!--xs:anyAttribute namespace="##other" processContents="lax"/--> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:simpleType name="RelationshipTypeOpenEnum"> - <xs:union memberTypes="tns:RelationshipType xs:anyURI"/> - </xs:simpleType> - - <xs:simpleType name="RelationshipType"> - <xs:restriction base="xs:anyURI"> - <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/> - </xs:restriction> - </xs:simpleType> - - <xs:element name="ReplyTo" type="tns:EndpointReferenceType"/> - <xs:element name="From" type="tns:EndpointReferenceType"/> - <xs:element name="FaultTo" type="tns:EndpointReferenceType"/> - <xs:element name="To" type="tns:AttributedURIType"/> - <xs:element name="Action" type="tns:AttributedURIType"/> - - <xs:complexType name="AttributedURIType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:anyURI"> - <!--xs:anyAttribute namespace="##other" processContents="lax"/--> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <!-- Constructs from the WS-Addressing SOAP binding --> - - <xs:attribute name="IsReferenceParameter" type="xs:boolean"/> - - <xs:simpleType name="FaultCodesOpenEnumType"> - <xs:union memberTypes="tns:FaultCodesType xs:QName"/> - </xs:simpleType> - - <xs:simpleType name="FaultCodesType"> - <xs:restriction base="xs:QName"> - <xs:enumeration value="tns:InvalidAddressingHeader"/> - <xs:enumeration value="tns:InvalidAddress"/> - <xs:enumeration value="tns:InvalidEPR"/> - <xs:enumeration value="tns:InvalidCardinality"/> - <xs:enumeration value="tns:MissingAddressInEPR"/> - <xs:enumeration value="tns:DuplicateMessageID"/> - <xs:enumeration value="tns:ActionMismatch"/> - <xs:enumeration value="tns:MessageAddressingHeaderRequired"/> - <xs:enumeration value="tns:DestinationUnreachable"/> - <xs:enumeration value="tns:ActionNotSupported"/> - <xs:enumeration value="tns:EndpointUnavailable"/> - </xs:restriction> - </xs:simpleType> - - <xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/> - <xs:complexType name="AttributedUnsignedLongType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:unsignedLong"> - <!--xs:anyAttribute namespace="##other" processContents="lax"/--> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/> - <xs:complexType name="AttributedQNameType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:QName"> - <!--xs:anyAttribute namespace="##other" processContents="lax"/--> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:element name="ProblemHeader" type="tns:AttributedAnyType"/> - <xs:complexType name="AttributedAnyType" mixed="false"> - <xs:sequence> - <!--xs:any namespace="##any" processContents="lax" minOccurs="1" maxOccurs="1"/--> - </xs:sequence> - <!--xs:anyAttribute namespace="##other" processContents="lax"/--> - </xs:complexType> - - <xs:element name="ProblemIRI" type="tns:AttributedURIType"/> - - <xs:element name="ProblemAction" type="tns:ProblemActionType"/> - <xs:complexType name="ProblemActionType" mixed="false"> - <xs:sequence> - <xs:element ref="tns:Action" minOccurs="0"/> - <xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/> - </xs:sequence> - <!--xs:anyAttribute namespace="##other" processContents="lax"/--> - </xs:complexType> - -</xs:schema> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-03-23 11:18:39 UTC (rev 16014) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-23 12:14:28 UTC (rev 16015) @@ -493,8 +493,6 @@ <!-- # [JBWS-3150] This test causes hudson to freeze --> <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude> - <!-- ////////////////////////// --> <!-- AS7 integration exclusions --> <!-- ////////////////////////// --> @@ -545,7 +543,6 @@ <exclude>org/jboss/test/ws/benchmark/jaxrpc/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude> - <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude> <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude> <!-- # [AS7-1322] Implemented on AS 7.1.0 or greater only --> @@ -685,8 +682,6 @@ <!-- # [JBWS-3150] This test causes hudson to freeze --> <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude> - <!-- ////////////////////////// --> <!-- AS7 integration exclusions --> <!-- ////////////////////////// --> @@ -710,9 +705,6 @@ <!-- # TODO: remote JNDI support (non EJB objects) --> <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude> - <!-- # [JBWS-3234] JNDI over RMI not available on AS7 --> - <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude> - <!-- # Remote JNDI lookup & jaxrpc client issues --> <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase*</exclude> <exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocJSETestCase*</exclude> @@ -796,10 +788,8 @@ <exclude>org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase*</exclude> - <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/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude> <!-- # webservices-description in jboss-web.xml / jboss.xml --> <exclude>org/jboss/test/ws/jaxrpc/jbws1124/JBWS1124TestCase*</exclude> @@ -929,8 +919,6 @@ <!-- # [JBWS-3150] This test causes hudson to freeze --> <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude> - <!-- ////////////////////////// --> <!-- AS7 integration exclusions --> <!-- ////////////////////////// --> @@ -1071,8 +1059,6 @@ <!-- # [JBWS-3150] This test causes hudson to freeze --> <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude> - <!-- ////////////////////////// --> <!-- AS7 integration exclusions --> <!-- ////////////////////////// -->