January 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15501 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws: metadata/umdm and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2012-01-19 10:13:47 -0500 (Thu, 19 Jan 2012) New Revision: 15501 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java Log: Checking in changes from patch JBWS-2975 for one-off JBPAPP-7821 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java 2012-01-19 15:10:26 UTC (rev 15500) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/core/jaxws/CustomizableJAXBContextFactory.java 2012-01-19 15:13:47 UTC (rev 15501) @@ -87,16 +87,35 @@ public JAXBContext createContext(Class[] clazzes, BindingCustomization bcust) throws WSException { + JAXBContext jaxbCtx = null; try { - JAXBContext jaxbCtx = JAXBContext.newInstance(clazzes, bcust); - incrementContextCount(); - return jaxbCtx; + jaxbCtx = JAXBContext.newInstance(clazzes, bcust); + incrementContextCount(); } catch (JAXBException e) - { - throw new WSException("Failed to create JAXBContext", e); + { + if (bcust != null && bcust.get("com.sun.xml.bind.defaultNamespaceRemap") != null) + { + String dns = (String) bcust.get("com.sun.xml.bind.defaultNamespaceRemap"); + bcust.remove("com.sun.xml.bind.defaultNamespaceRemap"); + bcust.put("com.sun.xml.internal.bind.defaultNamespaceRemap", dns); + try + { + jaxbCtx = JAXBContext.newInstance(clazzes, bcust); + incrementContextCount(); + } + catch (JAXBException ex) + { + throw new WSException("Failed to create JAXBContext", ex); + } + } + else + { + throw new WSException("Failed to create JAXBContext", e); + } } + return jaxbCtx; } public JAXBRIContext createContext(Class[] classes, Collection<TypeReference> refs, String defaultNS, boolean c14n, BindingCustomization bcust) Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2012-01-19 15:10:26 UTC (rev 15500) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2012-01-19 15:13:47 UTC (rev 15501) @@ -23,19 +23,26 @@ // $Id$ +import java.lang.reflect.Method; + import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.Unmarshaller; +import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.namespace.QName; import javax.xml.transform.Source; import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.ComplexTypeDeserializer; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.TypeMappingImpl; +import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl; +import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.wsf.spi.binding.BindingCustomization; /** @@ -94,9 +101,32 @@ JAXBContext context = cache.get(types); if(null==context) { + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); + String defaultNS = epMetaData.getPortTypeName().getNamespaceURI(); BindingCustomization bindingCustomization = getBindingCustomization(); + for (Class<?> clz : types) + { + if (clz.getName().endsWith("ObjectFactory")) + { + for (Method meth : clz.getMethods()) + { + XmlElementDecl elementDecl = meth.getAnnotation(XmlElementDecl.class); + if (elementDecl != null && XmlElementDecl.GLOBAL.class.equals(elementDecl.scope()) + && elementDecl.namespace() != null && elementDecl.namespace().length() > 0) + { + defaultNS = null; + } + } + } + } + if (defaultNS != null) + { + if (bindingCustomization == null) + bindingCustomization = new JAXBBindingCustomization(); + bindingCustomization.put("com.sun.xml.bind.defaultNamespaceRemap", defaultNS); + } context = JAXBContextFactory.newInstance().createContext(types, bindingCustomization); - cache.add(types, context); } return context; } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2012-01-19 15:10:26 UTC (rev 15500) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2012-01-19 15:13:47 UTC (rev 15501) @@ -23,23 +23,29 @@ // $Id$ +import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; import javax.xml.bind.Marshaller; +import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import javax.xml.transform.Result; import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.BufferedStreamResult; import org.jboss.ws.core.binding.ComplexTypeSerializer; import org.jboss.ws.core.binding.SerializationContext; +import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl; +import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.wsf.spi.binding.BindingCustomization; import org.w3c.dom.NamedNodeMap; @@ -119,9 +125,33 @@ private JAXBContext getJAXBContext(Class[] types){ JAXBContextCache cache = JAXBContextCache.getContextCache(); JAXBContext context = cache.get(types); - if(null==context) - { + if(null == context) + { + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); + String defaultNS = epMetaData.getPortTypeName().getNamespaceURI(); BindingCustomization bindingCustomization = getBindingCustomization(); + for (Class<?> clz : types) + { + if (clz.getName().endsWith("ObjectFactory")) + { + for (Method meth : clz.getMethods()) + { + XmlElementDecl elementDecl = meth.getAnnotation(XmlElementDecl.class); + if (elementDecl != null && XmlElementDecl.GLOBAL.class.equals(elementDecl.scope()) + && elementDecl.namespace() != null && elementDecl.namespace().length() > 0) + { + defaultNS = null; + } + } + } + } + if (defaultNS != null) + { + if (bindingCustomization == null) + bindingCustomization = new JAXBBindingCustomization(); + bindingCustomization.put("com.sun.xml.bind.defaultNamespaceRemap", defaultNS); + } context = JAXBContextFactory.newInstance().createContext(types, bindingCustomization); cache.add(types, context); } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-01-19 15:10:26 UTC (rev 15500) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-01-19 15:13:47 UTC (rev 15501) @@ -44,6 +44,7 @@ import javax.jws.soap.SOAPBinding.ParameterStyle; import javax.xml.bind.JAXBContext; +import javax.xml.bind.annotation.XmlElementDecl; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; import javax.xml.ws.Service.Mode; @@ -58,6 +59,7 @@ import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPArrayDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPArraySerializerFactory; +import org.jboss.ws.core.jaxws.JAXBBindingCustomization; import org.jboss.ws.core.jaxws.JAXBContextCache; import org.jboss.ws.core.jaxws.JAXBContextFactory; import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; @@ -661,6 +663,28 @@ try { Class[] classes = getRegisteredTypes().toArray(new Class[0]); + String defaultNS = portTypeName.getNamespaceURI(); + for (Class<?> clz : classes) + { + if (clz.getName().endsWith("ObjectFactory")) + { + for (Method method : clz.getMethods()) + { + XmlElementDecl elementDecl = method.getAnnotation(XmlElementDecl.class); + if (elementDecl != null && XmlElementDecl.GLOBAL.class.equals(elementDecl.scope()) + && elementDecl.namespace() != null && elementDecl.namespace().length() > 0) + { + defaultNS = null; + } + } + } + } + if (defaultNS != null) + { + if (bindingCustomization == null) + bindingCustomization = new JAXBBindingCustomization(); + bindingCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, defaultNS); + } JAXBContext context = JAXBContextFactory.newInstance().createContext(classes, bindingCustomization); jaxbCache.add(classes, context); }

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15500 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2012-01-19 10:10:26 -0500 (Thu, 19 Jan 2012) New Revision: 15500 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-7821/ Log: Creating one-off branch

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15499 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-01-18 12:59:28 -0500 (Wed, 18 Jan 2012) New Revision: 15499 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: [AS7-3324] Enabling test Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-01-18 17:58:34 UTC (rev 15498) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-01-18 17:59:28 UTC (rev 15499) @@ -1221,9 +1221,6 @@  <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude> -  - <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> - </excludes> </configuration> </plugin>

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15498 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-01-18 12:58:34 -0500 (Wed, 18 Jan 2012) New Revision: 15498 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [AS7-3324] Enabling test Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-01-18 13:25:30 UTC (rev 15497) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-01-18 17:58:34 UTC (rev 15498) @@ -1351,10 +1351,6 @@ <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> - </excludes> </configuration> </plugin>

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15497 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3140.

by jbossws-commits＠lists.jboss.org

Author: rsvoboda(a)redhat.com Date: 2012-01-18 08:25:30 -0500 (Wed, 18 Jan 2012) New Revision: 15497 Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140AddrResponsesTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140MtomAddrFeatureTestCase.java Log: JBPAPP-7951 - more details in assertion messages Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140AddrResponsesTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140AddrResponsesTestCase.java 2012-01-18 13:16:19 UTC (rev 15496) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140AddrResponsesTestCase.java 2012-01-18 13:25:30 UTC (rev 15497) @@ -43,9 +43,9 @@ { HttpURLConnection connection = (HttpURLConnection) new URL(servletClientURL + "?mtom=small").openConnection(); String result = readConnection(connection).toString(); - assertTrue("SOAPFaultException is expected", result.indexOf("SOAPFaultException") > -1); + assertTrue("SOAPFaultException is expected but received: " + result, result.indexOf("SOAPFaultException") > -1); String expectedDetail = "A header representing a Message Addressing Property is not valid"; - assertTrue("Expected error message " + expectedDetail , result.indexOf(expectedDetail) > -1); + assertTrue("Expected message wasn't found in response: " + result, result.indexOf(expectedDetail) > -1); } private ByteArrayOutputStream readConnection(HttpURLConnection connection) Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140MtomAddrFeatureTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140MtomAddrFeatureTestCase.java 2012-01-18 13:16:19 UTC (rev 15496) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140MtomAddrFeatureTestCase.java 2012-01-18 13:25:30 UTC (rev 15497) @@ -75,7 +75,7 @@ HttpURLConnection connection = (HttpURLConnection) new URL(servletClientURL + "?mtom=small").openConnection(); String result = readConnection(connection).toString(); String expected ="--ClientMTOMEnabled--ServerMTOMEnabled--ServerAddressingEnabled--ClientAddressingEnabled"; - assertTrue(result.indexOf(expected) > -1); + assertTrue("Expected string wasn't found in response: " + result, result.indexOf(expected) > -1); } private ByteArrayOutputStream readConnection(HttpURLConnection connection)

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15496 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/publish/WEB-INF/wsdl and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-01-18 08:16:19 -0500 (Wed, 18 Jan 2012) New Revision: 15496 Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl4.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/WEB-INF/wsdl/EndpointImpl4.xml Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl3.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/WEB-INF/wsdl/EndpointImpl3.xml shared-testsuite/trunk/testsuite/src/test/resources/publish/WEB-INF/wsdl/EndpointImpl3.xml Log: [AS7-3324] Extending testcase Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java 2012-01-18 13:14:06 UTC (rev 15495) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl2.java 2012-01-18 13:16:19 UTC (rev 15496) @@ -25,7 +25,7 @@ import org.jboss.logging.Logger; -@WebService(serviceName="EndpointService2", portName="EndpointPort", endpointInterface = "org.jboss.test.ws.publish.Endpoint") +@WebService(serviceName="EndpointService2", portName="EndpointPort2", endpointInterface = "org.jboss.test.ws.publish.Endpoint") public class EndpointImpl2 { // Provide logging Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl3.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl3.java 2012-01-18 13:14:06 UTC (rev 15495) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl3.java 2012-01-18 13:16:19 UTC (rev 15496) @@ -33,7 +33,7 @@ import org.w3c.dom.NodeList; @WebServiceProvider(serviceName="EndpointService3", - portName="EndpointPort", + portName="EndpointPort3", targetNamespace = "http://publish.ws.test.jboss.org/", wsdlLocation = "./WEB-INF/wsdl/EndpointImpl3.xml") @ServiceMode(value = Service.Mode.MESSAGE) Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl4.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl4.java (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointImpl4.java 2012-01-18 13:16:19 UTC (rev 15496) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2012, 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.publish; + +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.Provider; +import javax.xml.ws.Service; +import javax.xml.ws.ServiceMode; +import javax.xml.ws.WebServiceProvider; + +import org.jboss.logging.Logger; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +@WebServiceProvider +@ServiceMode(value = Service.Mode.MESSAGE) +public class EndpointImpl4 implements Provider<SOAPMessage> +{ + // Provide logging + private static Logger log = Logger.getLogger(EndpointImpl4.class); + + public SOAPMessage invoke(SOAPMessage request) + { + log.info("echo (4): " + request); + try { + SOAPBody sb = request.getSOAPBody(); + NodeList nl = sb.getElementsByTagName("arg0"); + if (nl.getLength() != 1) { + throw new IllegalArgumentException("Unexpected input!"); + } + Node ret = sb.getOwnerDocument().createElement("return"); + Node arg0 = nl.item(0); + ret.appendChild(arg0.getFirstChild().cloneNode(true)); + Node parent = arg0.getParentNode(); + parent.removeChild(arg0); + parent.appendChild(ret); + } catch (Exception e) { + throw new RuntimeException(e); + } + return request; + } +} Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2012-01-18 13:14:06 UTC (rev 15495) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2012-01-18 13:16:19 UTC (rev 15496) @@ -43,6 +43,9 @@ import org.jboss.wsf.spi.classloading.ClassLoaderProvider; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; import org.jboss.wsf.spi.publish.Context; import org.jboss.wsf.spi.publish.EndpointPublisher; import org.jboss.wsf.spi.publish.EndpointPublisherFactory; @@ -74,8 +77,10 @@ map.put("/pattern", "org.jboss.test.ws.publish.EndpointImpl"); map.put("/pattern2", "org.jboss.test.ws.publish.EndpointImpl2"); map.put("/pattern3", "org.jboss.test.ws.publish.EndpointImpl3"); + map.put("/pattern4", "org.jboss.test.ws.publish.EndpointImpl4"); - ctx = publisher.publish("ep-publish-test", Thread.currentThread().getContextClassLoader(), map); + ctx = publisher.publish("ep-publish-test", Thread.currentThread().getContextClassLoader(), map, createMetaData()); + for (Endpoint ep : ctx.getEndpoints()) { System.out.println("State: " + ep.getState()); System.out.println("Address: " + ep.getAddress()); @@ -86,6 +91,7 @@ invoke(new URL("http://localhost:8080/ep-publish-test/pattern?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService")); invoke(new URL("http://localhost:8080/ep-publish-test/pattern2?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService2")); invoke(new URL("http://localhost:8080/ep-publish-test/pattern3?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService3")); + invoke(new URL("http://localhost:8080/ep-publish-test/pattern4?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService4")); res.getWriter().print("1"); } @@ -112,6 +118,20 @@ } } + private WebservicesMetaData createMetaData() { + WebservicesMetaData metadata = new WebservicesMetaData(); + WebserviceDescriptionMetaData webserviceDescription = new WebserviceDescriptionMetaData(metadata); + metadata.addWebserviceDescription(webserviceDescription); + webserviceDescription.setWsdlFile("WEB-INF/wsdl/EndpointImpl4.xml"); + PortComponentMetaData portComponent = new PortComponentMetaData(webserviceDescription); + portComponent.setPortComponentName("PortComponent4"); //unique ID + portComponent.setServiceEndpointInterface("org.jboss.test.ws.publish.EndpointImpl4"); + portComponent.setWsdlPort(new QName("http://publish.ws.test.jboss.org/", "EndpointPort4")); + portComponent.setWsdlService(new QName("http://publish.ws.test.jboss.org/", "EndpointService4")); + webserviceDescription.addPortComponent(portComponent); + return metadata; + } + private static void invoke(URL wsdlURL, QName serviceName) throws Exception { Service service = Service.create(wsdlURL, serviceName); org.jboss.test.ws.publish.Endpoint port = service.getPort(org.jboss.test.ws.publish.Endpoint.class); Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/WEB-INF/wsdl/EndpointImpl3.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/WEB-INF/wsdl/EndpointImpl3.xml 2012-01-18 13:14:06 UTC (rev 15495) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/WEB-INF/wsdl/EndpointImpl3.xml 2012-01-18 13:16:19 UTC (rev 15496) @@ -1,4 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?><wsdl:definitions name="EndpointService3" targetNamespace="http://publish.ws.test.jboss.org/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://publish.ws.test.jboss.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> +<?xml version='1.0' encoding='UTF-8'?> +<wsdl:definitions name="EndpointService3" targetNamespace="http://publish.ws.test.jboss.org/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://publish.ws.test.jboss.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <wsdl:message name="echoStringResponse"> <wsdl:part name="return" type="xsd:string"> </wsdl:part> @@ -28,7 +29,7 @@ </wsdl:operation> </wsdl:binding> <wsdl:service name="EndpointService3"> - <wsdl:port binding="tns:EndpointService3SoapBinding" name="EndpointPort"> + <wsdl:port binding="tns:EndpointService3SoapBinding" name="EndpointPort3"> <soap:address location="http://localhost:8080/ep-publish-test/pattern3"/> </wsdl:port> </wsdl:service> Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/WEB-INF/wsdl/EndpointImpl4.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/WEB-INF/wsdl/EndpointImpl4.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/publish/WEB-INF/wsdl/EndpointImpl4.xml 2012-01-18 13:16:19 UTC (rev 15496) @@ -0,0 +1,35 @@ +<?xml version='1.0' encoding='UTF-8'?><wsdl:definitions name="EndpointService3" targetNamespace="http://publish.ws.test.jboss.org/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://publish.ws.test.jboss.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <wsdl:message name="echoStringResponse"> + <wsdl:part name="return" type="xsd:string"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="echoString"> + <wsdl:part name="arg0" type="xsd:string"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="Endpoint"> + <wsdl:operation name="echoString"> + <wsdl:input message="tns:echoString" name="echoString"> + </wsdl:input> + <wsdl:output message="tns:echoStringResponse" name="echoStringResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="EndpointService4SoapBinding" type="tns:Endpoint"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="echoString"> + <soap:operation soapAction="urn:EchoString" style="rpc"/> + <wsdl:input name="echoString"> + <soap:body namespace="http://publish.ws.test.jboss.org/" use="literal"/> + </wsdl:input> + <wsdl:output name="echoStringResponse"> + <soap:body namespace="http://publish.ws.test.jboss.org/" use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="EndpointService4"> + <wsdl:port binding="tns:EndpointService4SoapBinding" name="EndpointPort4"> + <soap:address location="http://localhost:8080/ep-publish-test/pattern4"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Modified: shared-testsuite/trunk/testsuite/src/test/resources/publish/WEB-INF/wsdl/EndpointImpl3.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/publish/WEB-INF/wsdl/EndpointImpl3.xml 2012-01-18 13:14:06 UTC (rev 15495) +++ shared-testsuite/trunk/testsuite/src/test/resources/publish/WEB-INF/wsdl/EndpointImpl3.xml 2012-01-18 13:16:19 UTC (rev 15496) @@ -1,4 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?><wsdl:definitions name="EndpointService3" targetNamespace="http://publish.ws.test.jboss.org/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://publish.ws.test.jboss.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> +<?xml version='1.0' encoding='UTF-8'?> +<wsdl:definitions name="EndpointService3" targetNamespace="http://publish.ws.test.jboss.org/" xmlns:ns1="http://schemas.xmlsoap.org/soap/http" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://publish.ws.test.jboss.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <wsdl:message name="echoStringResponse"> <wsdl:part name="return" type="xsd:string"> </wsdl:part> @@ -28,7 +29,7 @@ </wsdl:operation> </wsdl:binding> <wsdl:service name="EndpointService3"> - <wsdl:port binding="tns:EndpointService3SoapBinding" name="EndpointPort"> + <wsdl:port binding="tns:EndpointService3SoapBinding" name="EndpointPort3"> <soap:address location="http://localhost:8080/ep-publish-test/pattern3"/> </wsdl:port> </wsdl:service>

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15495 - spi/trunk/src/main/java/org/jboss/wsf/spi/publish.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-01-18 08:14:06 -0500 (Wed, 18 Jan 2012) New Revision: 15495 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/publish/EndpointPublisher.java Log: [AS7-3324] Adding method using WebServicesMetadata in EndpointPublisher Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/publish/EndpointPublisher.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/publish/EndpointPublisher.java 2012-01-18 12:59:55 UTC (rev 15494) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/publish/EndpointPublisher.java 2012-01-18 13:14:06 UTC (rev 15495) @@ -20,6 +20,8 @@ import java.util.Map; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; + /** * EndpointPublisher defines the interface for facilities allowing to publish/destroy * WS endpoints on top of the running JBoss Application Server container. @@ -30,5 +32,7 @@ { public Context publish(String contextRoot, ClassLoader loader, Map<String, String> urlPatternToClassNameMap) throws Exception; + public Context publish(String contextRoot, ClassLoader loader, Map<String, String> urlPatternToClassNameMap, WebservicesMetaData metadata) throws Exception; + public void destroy(Context context) throws Exception; }

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15494 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-01-18 07:59:55 -0500 (Wed, 18 Jan 2012) New Revision: 15494 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: [AS7-3324] Excluding test Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-01-18 12:59:32 UTC (rev 15493) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-01-18 12:59:55 UTC (rev 15494) @@ -1221,6 +1221,9 @@  <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude> +  + <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> + </excludes> </configuration> </plugin>

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15493 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-01-18 07:59:32 -0500 (Wed, 18 Jan 2012) New Revision: 15493 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [AS7-3324] Excluding test Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-01-18 12:57:33 UTC (rev 15492) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-01-18 12:59:32 UTC (rev 15493) @@ -1351,6 +1351,10 @@ <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude> <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase*</exclude> + +  + <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> + </excludes> </configuration> </plugin>

12 years, 3 months

1
0
0 / 0

JBossWS SVN: r15492 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-01-18 07:57:33 -0500 (Wed, 18 Jan 2012) New Revision: 15492 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.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/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java Log: - [JBWS-3415] Move processWSDDContribution(..) method to JAXWSServerMetaDataBuilder and invoke it from JAXWSProviderMetaDataBuilder too - [JBWS-3416] Re-use WebServiceMetadata from AS integration layer - [JBWS-3417] Process wsdl file/location override through WebServicesMetadata Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2012-01-18 11:38:32 UTC (rev 15491) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2012-01-18 12:57:33 UTC (rev 15492) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, 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. * @@ -57,6 +57,7 @@ * * @author Thomas.Diesler(a)jboss.org * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @author alessio.soldano(a)jboss.com * @since 23-Jul-2005 */ public class JAXWSProviderMetaDataBuilder extends JAXWSServerMetaDataBuilder @@ -134,6 +135,9 @@ // process handler chain processHandlerChain(sepMetaData, sepClass); + + //process webservices.xml contributions + processWSDDContribution(dep, sepMetaData); // process config processEndpointConfig(dep, sepMetaData, sepClass, linkName); 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-01-18 11:38:32 UTC (rev 15491) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2012-01-18 12:57:33 UTC (rev 15492) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, 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. * @@ -26,23 +26,36 @@ import java.util.ResourceBundle; import javax.jws.WebService; +import javax.xml.ws.RespectBindingFeature; import javax.xml.ws.WebServiceProvider; +import javax.xml.ws.soap.AddressingFeature; +import javax.xml.ws.soap.MTOMFeature; import org.jboss.ws.api.annotation.EndpointConfig; import org.jboss.ws.api.annotation.WebContext; import org.jboss.ws.api.util.BundleUtils; +import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +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; /** * Builds ServiceEndpointMetaData for a JAX-WS endpoint. * * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> * @author Thomas.Diesler(a)jboss.com + * @author alessio.soldano(a)jboss.com */ public abstract class JAXWSServerMetaDataBuilder extends JAXWSMetaDataBuilder { @@ -169,4 +182,94 @@ // secure wsdl access sepMetaData.setSecureWSDLAccess(anWebContext.secureWSDLAccess()); } + + /** + * With JAX-WS the use of webservices.xml is optional since the annotations can be used + * to specify most of the information specified in this deployment descriptor file. + * The deployment descriptors are only used to override or augment the annotation member attributes. + * @param sepMetaData + */ + protected void processWSDDContribution(Deployment dep, ServerEndpointMetaData sepMetaData) + { + WebservicesMetaData webservices = dep.getAttachment(WebservicesMetaData.class); + if (webservices != null) + { + for (WebserviceDescriptionMetaData wsDesc : webservices.getWebserviceDescriptions()) + { + for (PortComponentMetaData portComp : wsDesc.getPortComponents()) + { + // We match portComp's by SEI first and portQName second + // In the first case the portComp may override the portQName that derives from the annotation + String portCompSEI = portComp.getServiceEndpointInterface(); + boolean doesMatch = portCompSEI != null ? portCompSEI.equals(sepMetaData.getServiceEndpointInterfaceName()) : false; + if (!doesMatch) + { + doesMatch = portComp.getWsdlPort().equals(sepMetaData.getPortName()); + } + + if (doesMatch) + { + + log.debug("Processing 'webservices.xml' contributions on EndpointMetaData"); + + // PortQName overrides + if (portComp.getWsdlPort() != null) + { + if (log.isDebugEnabled()) + log.debug("Override EndpointMetaData portName " + sepMetaData.getPortName() + " with " + portComp.getWsdlPort()); + sepMetaData.setPortName(portComp.getWsdlPort()); + } + + // HandlerChain contributions + UnifiedHandlerChainsMetaData chainWrapper = portComp.getHandlerChains(); + if (chainWrapper != null) + { + for (UnifiedHandlerChainMetaData handlerChain : chainWrapper.getHandlerChains()) + { + for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers()) + { + if (log.isDebugEnabled()) + log.debug("Contribute handler from webservices.xml: " + uhmd.getHandlerName()); + HandlerMetaDataJAXWS hmd = HandlerMetaDataJAXWS.newInstance(uhmd, HandlerType.ENDPOINT); + sepMetaData.addHandler(hmd); + } + } + } + + // MTOM settings + if (portComp.isMtomEnabled()) + { + log.debug("Enabling MTOM"); + MTOMFeature feature = new MTOMFeature(true, portComp.getMtomThreshold()); + sepMetaData.getFeatures().addFeature(feature); + } + + if (portComp.isAddressingEnabled()) + { log.debug("Enabling Addressing"); + AddressingFeature.Responses responses = getAddressFeatureResponses(portComp.getAddressingResponses()); + AddressingFeature feature = new AddressingFeature(true, portComp.isAddressingRequired(), responses); + sepMetaData.getFeatures().addFeature(feature); + } + + if (portComp.isRespectBindingEnabled()) + { + log.debug("Enabling RespectBinding Feature"); + RespectBindingFeature feature = new RespectBindingFeature(true); + sepMetaData.getFeatures().addFeature(feature); + } + + //wsdlLocation override + String wsdlFile = portComp.getWebserviceDescription().getWsdlFile(); + if (wsdlFile != null) + { + if (log.isDebugEnabled()) + log.debug("Override wsdlFile location with " + wsdlFile); + sepMetaData.getServiceMetaData().setWsdlFile(wsdlFile); + } + } + } + } + + } + } } Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-01-18 11:38:32 UTC (rev 15491) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2012-01-18 12:57:33 UTC (rev 15492) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2012, 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. * @@ -35,10 +35,7 @@ import javax.jws.soap.SOAPMessageHandlers; import javax.management.ObjectName; import javax.xml.namespace.QName; -import javax.xml.ws.RespectBindingFeature; import javax.xml.ws.WebServiceProvider; -import javax.xml.ws.soap.AddressingFeature; -import javax.xml.ws.soap.MTOMFeature; import org.jboss.ws.WSException; import org.jboss.ws.annotation.Documentation; @@ -49,7 +46,6 @@ import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.metadata.builder.MetaDataBuilder; import org.jboss.ws.metadata.umdm.EndpointMetaData; -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.umdm.UnifiedMetaData; @@ -71,14 +67,6 @@ import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -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; /** * An abstract annotation meta data builder. @@ -86,6 +74,7 @@ * @author Thomas.Diesler(a)jboss.org * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> * @author Heiko.Braun(a)jboss.org + * @author alessio.soldano(a)jboss.com * * @since 15-Oct-2005 */ @@ -214,7 +203,7 @@ processHandlerChain(sepMetaData, seiClass); // process webservices.xml contributions - processWSDDContribution(sepMetaData); + processWSDDContribution(dep, sepMetaData); //setup web service feature contributions epFeatureProcessor.setupEndpointFeatures(sepMetaData); @@ -323,88 +312,6 @@ return wsdlEndpoint; } - /** - * With JAX-WS the use of webservices.xml is optional since the annotations can be used - * to specify most of the information specified in this deployment descriptor file. - * The deployment descriptors are only used to override or augment the annotation member attributes. - * @param sepMetaData - */ - private void processWSDDContribution(ServerEndpointMetaData sepMetaData) - { - WebservicesMetaData webservices = WebservicesFactory.loadFromVFSRoot(sepMetaData.getRootFile()); - if (webservices != null) - { - for (WebserviceDescriptionMetaData wsDesc : webservices.getWebserviceDescriptions()) - { - for (PortComponentMetaData portComp : wsDesc.getPortComponents()) - { - // We match portComp's by SEI first and portQName second - // In the first case the portComp may override the portQName that derives from the annotation - String portCompSEI = portComp.getServiceEndpointInterface(); - boolean doesMatch = portCompSEI != null ? portCompSEI.equals(sepMetaData.getServiceEndpointInterfaceName()) : false; - if (!doesMatch) - { - doesMatch = portComp.getWsdlPort().equals(sepMetaData.getPortName()); - } - - if (doesMatch) - { - - log.debug("Processing 'webservices.xml' contributions on EndpointMetaData"); - - // PortQName overrides - if (portComp.getWsdlPort() != null) - { - if (log.isDebugEnabled()) - log.debug("Override EndpointMetaData portName " + sepMetaData.getPortName() + " with " + portComp.getWsdlPort()); - sepMetaData.setPortName(portComp.getWsdlPort()); - } - - // HandlerChain contributions - UnifiedHandlerChainsMetaData chainWrapper = portComp.getHandlerChains(); - if (chainWrapper != null) - { - for (UnifiedHandlerChainMetaData handlerChain : chainWrapper.getHandlerChains()) - { - for (UnifiedHandlerMetaData uhmd : handlerChain.getHandlers()) - { - if (log.isDebugEnabled()) - log.debug("Contribute handler from webservices.xml: " + uhmd.getHandlerName()); - HandlerMetaDataJAXWS hmd = HandlerMetaDataJAXWS.newInstance(uhmd, HandlerType.ENDPOINT); - sepMetaData.addHandler(hmd); - } - } - } - - // MTOM settings - if (portComp.isMtomEnabled()) - { - log.debug("Enabling MTOM"); - MTOMFeature feature = new MTOMFeature(true, portComp.getMtomThreshold()); - sepMetaData.getFeatures().addFeature(feature); - } - - if (portComp.isAddressingEnabled()) - { log.debug("Enabling Addressing"); - AddressingFeature.Responses responses = getAddressFeatureResponses(portComp.getAddressingResponses()); - AddressingFeature feature = new AddressingFeature(true, portComp.isAddressingRequired(), responses); - sepMetaData.getFeatures().addFeature(feature); - } - - if (portComp.isRespectBindingEnabled()) - { - log.debug("Enabling RespectBinding Feature"); - RespectBindingFeature feature = new RespectBindingFeature(true); - sepMetaData.getFeatures().addFeature(feature); - } - - } - } - } - - } - } - private EndpointResult processWebService(Deployment dep, UnifiedMetaData wsMetaData, Class<?> sepClass, String linkName) throws ClassNotFoundException, IOException { WebService anWebService = sepClass.getAnnotation(WebService.class);

12 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits January 2012