Author: thomas.diesler(a)jboss.com Date: 2007-05-22 11:39:58 -0400 (Tue, 22 May 2007) New Revision: 3186 Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicService.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedEjbPortComponentMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeployer.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/DocWrappedServiceImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/PurchaseOrder.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/PurchaseOrderAck.java trunk/jbossws-core/src/test/resources/jaxrpc/enventry/META-INF/jboss-client.xml trunk/jbossws-core/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml Log: REmove duplicate processing of contextRoot, urlPattern Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ServiceEndpointInterceptor.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -26,10 +26,10 @@ import javax.xml.rpc.handler.soap.SOAPMessageContext; import org.jboss.ejb.plugins.AbstractInterceptor; -import org.jboss.invocation.Invocation; import org.jboss.invocation.InvocationKey; import org.jboss.logging.Logger; import org.jboss.wsf.spi.invocation.HandlerCallback; +import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** @@ -50,24 +50,23 @@ /** Before and after we call the service endpoint bean, we process the handler chains. */ - public Object invoke(final Invocation mi) throws Exception + public Object invoke(final org.jboss.invocation.Invocation jbInv) throws Exception { // If no msgContext, it's not for us - SOAPMessageContext msgContext = (SOAPMessageContext)mi.getPayloadValue(InvocationKey.SOAP_MESSAGE_CONTEXT); + SOAPMessageContext msgContext = (SOAPMessageContext)jbInv.getPayloadValue(InvocationKey.SOAP_MESSAGE_CONTEXT); if (msgContext == null) { - return getNext().invoke(mi); + return getNext().invoke(jbInv); } // Get the endpoint invocation - org.jboss.wsf.spi.invocation.Invocation epInv = (org.jboss.wsf.spi.invocation.Invocation)mi - .getValue(org.jboss.wsf.spi.invocation.Invocation.class.getName()); + Invocation wsInv = (Invocation)jbInv.getValue(Invocation.class.getName()); // Get the handler callback - HandlerCallback callback = (HandlerCallback)mi.getValue(HandlerCallback.class.getName()); + HandlerCallback callback = (HandlerCallback)jbInv.getValue(HandlerCallback.class.getName()); // Handlers need to be Tx. Therefore we must invoke the handler chain after the TransactionInterceptor. - if (callback != null && epInv != null) + if (callback != null && wsInv != null) { try { @@ -81,13 +80,13 @@ // The SOAPContentElements stored in the EndpointInvocation might have changed after // handler processing. Get the updated request payload. This should be a noop if request // handlers did not modify the incomming SOAP message. - Object[] reqParams = epInv.getArgs(); - mi.setArguments(reqParams); - Object resObj = getNext().invoke(mi); + Object[] reqParams = wsInv.getArgs(); + jbInv.setArguments(reqParams); + Object resObj = getNext().invoke(jbInv); // Setting the message to null should trigger binding of the response message msgContext.setMessage(null); - epInv.setReturnValue(resObj); + wsInv.setReturnValue(resObj); } // call the response handlers @@ -95,7 +94,7 @@ handlersPass = handlersPass && callback.callResponseHandlerChain(HandlerType.ENDPOINT); // update the return value after response handler processing - Object resObj = epInv.getReturnValue(); + Object resObj = wsInv.getReturnValue(); return resObj; } @@ -121,7 +120,7 @@ else { log.warn("Handler callback not available"); - return getNext().invoke(mi); + return getNext().invoke(jbInv); } } } Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ServiceEndpointInterceptor.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -26,10 +26,10 @@ import javax.xml.rpc.handler.soap.SOAPMessageContext; import org.jboss.ejb.plugins.AbstractInterceptor; -import org.jboss.invocation.Invocation; import org.jboss.invocation.InvocationKey; import org.jboss.logging.Logger; import org.jboss.wsf.spi.invocation.HandlerCallback; +import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** @@ -50,24 +50,23 @@ /** Before and after we call the service endpoint bean, we process the handler chains. */ - public Object invoke(final Invocation mi) throws Exception + public Object invoke(final org.jboss.invocation.Invocation jbInv) throws Exception { // If no msgContext, it's not for us - SOAPMessageContext msgContext = (SOAPMessageContext)mi.getPayloadValue(InvocationKey.SOAP_MESSAGE_CONTEXT); + SOAPMessageContext msgContext = (SOAPMessageContext)jbInv.getPayloadValue(InvocationKey.SOAP_MESSAGE_CONTEXT); if (msgContext == null) { - return getNext().invoke(mi); + return getNext().invoke(jbInv); } // Get the endpoint invocation - org.jboss.wsf.spi.invocation.Invocation epInv = (org.jboss.wsf.spi.invocation.Invocation)mi - .getValue(org.jboss.wsf.spi.invocation.Invocation.class.getName()); + Invocation wsInv = (Invocation)jbInv.getValue(Invocation.class.getName()); // Get the handler callback - HandlerCallback callback = (HandlerCallback)mi.getValue(HandlerCallback.class.getName()); + HandlerCallback callback = (HandlerCallback)jbInv.getValue(HandlerCallback.class.getName()); // Handlers need to be Tx. Therefore we must invoke the handler chain after the TransactionInterceptor. - if (callback != null && epInv != null) + if (callback != null && wsInv != null) { try { @@ -81,13 +80,13 @@ // The SOAPContentElements stored in the EndpointInvocation might have changed after // handler processing. Get the updated request payload. This should be a noop if request // handlers did not modify the incomming SOAP message. - Object[] reqParams = epInv.getArgs(); - mi.setArguments(reqParams); - Object resObj = getNext().invoke(mi); + Object[] reqParams = wsInv.getArgs(); + jbInv.setArguments(reqParams); + Object resObj = getNext().invoke(jbInv); // Setting the message to null should trigger binding of the response message msgContext.setMessage(null); - epInv.setReturnValue(resObj); + wsInv.setReturnValue(resObj); } // call the response handlers @@ -95,7 +94,7 @@ handlersPass = handlersPass && callback.callResponseHandlerChain(HandlerType.ENDPOINT); // update the return value after response handler processing - Object resObj = epInv.getReturnValue(); + Object resObj = wsInv.getReturnValue(); return resObj; } @@ -121,7 +120,7 @@ else { log.warn("Handler callback not available"); - return getNext().invoke(mi); + return getNext().invoke(jbInv); } } } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicService.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicService.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicService.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -76,4 +76,21 @@ { this.contextRoot = contextRoot; } + + public Endpoint getEndpointByName(String shortName) + { + if (shortName == null) + throw new IllegalArgumentException("shortName cannot be null"); + + Endpoint retEndpoint = null; + for (Endpoint ep : endpoints) + { + if (ep.getShortName().equals(shortName)) + { + retEndpoint = ep; + break; + } + } + return retEndpoint; + } } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ContextRootDeployer.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -24,7 +24,9 @@ //$Id$ import org.jboss.wsf.spi.annotation.WebContext; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** * A deployer that assigns the context root to the service @@ -40,7 +42,6 @@ String contextRoot = null; // #1 Use the explicit context root from the web meta data - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class); if (webMetaData != null) contextRoot = webMetaData.getContextRoot(); @@ -62,15 +63,23 @@ } } - // #3 Use the implicit context root derived from the deployment name + // #3 Use the explicit context root from webservices/context-root + UnifiedApplicationMetaData appMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + if (contextRoot == null && appMetaData != null) + { + contextRoot = appMetaData.getWebServiceContextRoot(); + } + + // #4 Use the implicit context root derived from the deployment name if (contextRoot == null) { - String name = udi.simpleName; - contextRoot = name.substring(0, name.length() - 4); + UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); + String simpleName = udi.simpleName; + contextRoot = simpleName.substring(0, simpleName.length() - 4); if (udi.parent != null) { - name = udi.parent.simpleName; - contextRoot = name.substring(0, name.length() - 4) + "-" + contextRoot; + simpleName = udi.parent.simpleName; + contextRoot = simpleName.substring(0, simpleName.length() - 4) + "-" + contextRoot; } } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -53,4 +53,7 @@ /** Set the context root for this service */ void setContextRoot(String contextRoot); + + /** Get the Endpoint for a give short name */ + Endpoint getEndpointByName(String shortName); } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/URLPatternDeployer.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -24,6 +24,9 @@ //$Id$ import org.jboss.wsf.spi.annotation.WebContext; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; /** @@ -49,7 +52,6 @@ String urlPattern = null; // #1 For JSE lookup the url-pattern from the servlet mappings - UnifiedDeploymentInfo udi = dep.getContext().getAttachment(UnifiedDeploymentInfo.class); UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class); if (webMetaData != null) { @@ -59,7 +61,19 @@ throw new IllegalStateException("Cannot obtain servlet mapping for: " + epName); } - // #2 For EJB use @WebContext.urlPattern + // #2 Use the explicit urlPattern from port-component/port-component-uri + UnifiedApplicationMetaData appMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + if (appMetaData != null && appMetaData.getBeanByEjbName(ep.getShortName()) != null) + { + UnifiedBeanMetaData bmd = appMetaData.getBeanByEjbName(ep.getShortName()); + UnifiedEjbPortComponentMetaData pcmd = bmd.getPortComponent(); + if (pcmd != null) + { + urlPattern = pcmd.getPortComponentURI(); + } + } + + // #3 For EJB use @WebContext.urlPattern if (urlPattern == null) { Class beanClass = ep.getTargetBeanClass(); @@ -68,7 +82,7 @@ urlPattern = anWebContext.urlPattern(); } - // #3 Fallback to the ejb-name + // #4 Fallback to the ejb-name if (urlPattern == null) { urlPattern = "/" + ep.getShortName(); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedEjbPortComponentMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedEjbPortComponentMetaData.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedEjbPortComponentMetaData.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -59,16 +59,6 @@ this.portComponentURI = portComponentURI; } - public String getURLPattern() - { - String pattern = "/*"; - if (portComponentURI != null) - { - return portComponentURI; - } - return pattern; - } - public String getAuthMethod() { return authMethod; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -31,13 +31,11 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.StringTokenizer; import javax.management.ObjectName; import javax.wsdl.Definition; import javax.wsdl.Import; import javax.wsdl.Port; -import javax.wsdl.Service; import javax.wsdl.extensions.soap.SOAPAddress; import javax.wsdl.extensions.soap12.SOAP12Address; import javax.xml.namespace.QName; @@ -67,12 +65,13 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; @@ -128,79 +127,36 @@ } } - protected void initEndpointAddress(UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData) + protected void initEndpointAddress(Deployment dep, UnifiedDeploymentInfo udi, ServerEndpointMetaData sepMetaData) { - // For JAXWS these may have been set by @WebContext attributes - String contextRoot = sepMetaData.getContextRoot(); - String urlPattern = sepMetaData.getURLPattern(); - String linkName = sepMetaData.getLinkName(); + String contextRoot = dep.getService().getContextRoot(); + String urlPattern = null; - if (udi.metaData instanceof UnifiedWebMetaData) + // Get the URL pattern from the endpoint + String linkName = sepMetaData.getLinkName(); + if (linkName != null && dep.getService().getEndpointByName(linkName) != null) { - UnifiedWebMetaData webMetaData = (UnifiedWebMetaData)udi.metaData; - String jbwebContextRoot = webMetaData.getContextRoot(); - if (jbwebContextRoot != null) - contextRoot = jbwebContextRoot; - - Map<String, String> servletMappings = webMetaData.getServletMappings(); - urlPattern = (String)servletMappings.get(linkName); - if (urlPattern == null) - throw new WSException("Cannot obtain url pattern for servlet name: " + linkName); + Endpoint endpoint = dep.getService().getEndpointByName(linkName); + urlPattern = endpoint.getURLPattern(); } - if (udi.metaData instanceof UnifiedApplicationMetaData) - { - UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData; - UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(linkName); - if (beanMetaData == null) - throw new WSException("Cannot obtain meta data for ejb link: " + linkName); - - String wsContextRoot = applMetaData.getWebServiceContextRoot(); - if (wsContextRoot != null) - contextRoot = wsContextRoot; - - String ejbClass = beanMetaData.getEjbClass(); - String ejbClassName = WSDLUtils.getJustClassName(ejbClass); - - UnifiedEjbPortComponentMetaData ejbpcMetaData = beanMetaData.getPortComponent(); - if (ejbpcMetaData != null && ejbpcMetaData.getPortComponentURI() != null) - { - String pcUrlPattern = ejbpcMetaData.getPortComponentURI(); - if (pcUrlPattern != null) - { - urlPattern = pcUrlPattern; - StringTokenizer st = new StringTokenizer(urlPattern, "/"); - if (contextRoot == null && st.countTokens() > 1) - { - contextRoot = st.nextToken(); - urlPattern = st.nextToken(); - while (st.hasMoreTokens()) - urlPattern += "/" + st.nextToken(); - } - } - } - - if (contextRoot == null) - contextRoot = ejbClassName + "Service"; - if (urlPattern == null) - urlPattern = ejbClassName; - } - // If not, derive the context root from the deployment if (contextRoot == null) { - contextRoot = "/"; + String simpleName = udi.simpleName; + contextRoot = simpleName.substring(0, simpleName.indexOf('.')); if (udi.parent != null) { - String shortName = udi.parent.simpleName; - shortName = shortName.substring(0, shortName.indexOf('.')); - contextRoot += shortName + "-"; + simpleName = udi.parent.simpleName; + simpleName = simpleName.substring(0, simpleName.indexOf('.')); + contextRoot = simpleName + "-" + contextRoot; } - String shortName = udi.simpleName; - shortName = shortName.substring(0, shortName.indexOf('.')); - contextRoot += shortName; } + // Default to "/*" + if (urlPattern == null) + urlPattern = "/*"; + if (contextRoot.startsWith("/") == false) contextRoot = "/" + contextRoot; if (urlPattern.startsWith("/") == false) @@ -413,7 +369,7 @@ Iterator itServices = services.values().iterator(); while (itServices.hasNext()) { - Service wsdlOneOneService = (Service)itServices.next(); + javax.wsdl.Service wsdlOneOneService = (javax.wsdl.Service)itServices.next(); Map wsdlOneOnePorts = wsdlOneOneService.getPorts(); Iterator itPorts = wsdlOneOnePorts.keySet().iterator(); while (itPorts.hasNext()) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -42,6 +42,7 @@ import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; +import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.JAXRPCDeployment; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; @@ -66,7 +67,7 @@ /** * Build from webservices.xml */ - public UnifiedMetaData buildMetaData(JAXRPCDeployment udi) + public UnifiedMetaData buildMetaData(Deployment dep, JAXRPCDeployment udi) { log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); try @@ -139,7 +140,7 @@ initEndpointEncodingStyle(sepMetaData); - initEndpointAddress(udi, sepMetaData); + initEndpointAddress(dep, udi, sepMetaData); if (udi.metaData instanceof UnifiedApplicationMetaData) { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -360,7 +360,7 @@ // Conformance 3.18, the default value must be the same as the method name if (requestWrapperType == null) { - String packageName = JavaUtils.getPackageName(method.getDeclaringClass()) + ".jaxws"; + String packageName = JavaUtils.getPackageName(method.getDeclaringClass()); requestWrapperType = packageName + "." + JavaUtils.capitalize(method.getName()); } @@ -393,7 +393,7 @@ if (responseWrapperType == null) { - String packageName = JavaUtils.getPackageName(method.getDeclaringClass()) + ".jaxws"; + String packageName = JavaUtils.getPackageName(method.getDeclaringClass()); responseWrapperType = packageName + "." + JavaUtils.capitalize(method.getName()) + "Response"; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -31,6 +31,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; @@ -51,7 +52,7 @@ /** Build from webservices.xml */ - public UnifiedMetaData buildMetaData(UnifiedDeploymentInfo udi) + public UnifiedMetaData buildMetaData(Deployment dep, UnifiedDeploymentInfo udi) { if(log.isDebugEnabled()) log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); try @@ -74,7 +75,7 @@ if (beanClass.isAnnotationPresent(WebService.class) || beanClass.isAnnotationPresent(WebServiceProvider.class)) { String ejbLink = beanMetaData.getEjbName(); - JAXWSServerMetaDataBuilder.setupProviderOrWebService(wsMetaData, udi, beanClass, ejbLink); + JAXWSServerMetaDataBuilder.setupProviderOrWebService(dep, wsMetaData, udi, beanClass, ejbLink); // setup the security domain if (beanClass.isAnnotationPresent(SecurityDomain.class)) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -27,6 +27,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; @@ -44,7 +45,7 @@ /** Build from annotations */ - public UnifiedMetaData buildMetaData(UnifiedDeploymentInfo udi) + public UnifiedMetaData buildMetaData(Deployment dep, UnifiedDeploymentInfo udi) { if(log.isDebugEnabled()) log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); try @@ -65,7 +66,7 @@ try { Class beanClass = udi.classLoader.loadClass(servletClassName); - JAXWSServerMetaDataBuilder.setupProviderOrWebService(wsMetaData, udi, beanClass, servletName); + JAXWSServerMetaDataBuilder.setupProviderOrWebService(dep, wsMetaData, udi, beanClass, servletName); } catch (ClassNotFoundException ex) { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -47,6 +47,7 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.wsdl.WSDLUtils; +import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.utils.JavaUtils; @@ -59,7 +60,7 @@ */ public class JAXWSProviderMetaDataBuilder extends JAXWSServerMetaDataBuilder { - public ServerEndpointMetaData buildProviderMetaData(UnifiedMetaData wsMetaData, UnifiedDeploymentInfo udi, Class<?> sepClass, String linkName) throws IOException + public ServerEndpointMetaData buildProviderMetaData(Deployment dep, UnifiedMetaData wsMetaData, UnifiedDeploymentInfo udi, Class<?> sepClass, String linkName) throws IOException { // 5.3 Conformance (Provider implementation): A Provider based service endpoint implementation MUST // implement a typed Provider interface. @@ -137,7 +138,7 @@ processWebContext(udi, sepClass, linkName, sepMetaData); // Init the endpoint address - initEndpointAddress(udi, sepMetaData); + initEndpointAddress(dep, udi, sepMetaData); // A provider may not have a WSDL file if (sepMetaData.getServiceMetaData().getWsdlLocation() != null) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -30,6 +30,7 @@ import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.annotation.WebContext; +import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; @@ -41,17 +42,17 @@ */ public abstract class JAXWSServerMetaDataBuilder extends JAXWSMetaDataBuilder { - static void setupProviderOrWebService(UnifiedMetaData umd, UnifiedDeploymentInfo udi, Class<?> beanClass, String beanName) throws Exception + static void setupProviderOrWebService(Deployment dep, UnifiedMetaData umd, UnifiedDeploymentInfo udi, Class<?> beanClass, String beanName) throws Exception { if (beanClass.isAnnotationPresent(WebService.class)) { JAXWSWebServiceMetaDataBuilder builder = new JAXWSWebServiceMetaDataBuilder(); - builder.buildWebServiceMetaData(umd, udi, beanClass, beanName); + builder.buildWebServiceMetaData(dep, umd, udi, beanClass, beanName); } else if (beanClass.isAnnotationPresent(WebServiceProvider.class)) { JAXWSProviderMetaDataBuilder builder = new JAXWSProviderMetaDataBuilder(); - builder.buildProviderMetaData(umd, udi, beanClass, beanName); + builder.buildProviderMetaData(dep, umd, udi, beanClass, beanName); } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -54,6 +54,7 @@ import org.jboss.ws.tools.wsdl.WSDLGenerator; import org.jboss.ws.tools.wsdl.WSDLWriter; import org.jboss.ws.tools.wsdl.WSDLWriterResolver; +import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; @@ -95,7 +96,7 @@ this.generateWsdl = generateWsdl; } - public ServerEndpointMetaData buildWebServiceMetaData(UnifiedMetaData wsMetaData, UnifiedDeploymentInfo udi, Class<?> sepClass, String linkName) + public ServerEndpointMetaData buildWebServiceMetaData(Deployment dep, UnifiedMetaData wsMetaData, UnifiedDeploymentInfo udi, Class<?> sepClass, String linkName) { try { @@ -169,7 +170,7 @@ processWSDDContribution(sepMetaData); // Init the endpoint address - initEndpointAddress(udi, sepMetaData); + initEndpointAddress(dep, udi, sepMetaData); // Process an optional @SOAPMessageHandlers annotation if (sepClass.isAnnotationPresent(SOAPMessageHandlers.class) || seiClass.isAnnotationPresent(SOAPMessageHandlers.class)) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/WSContractProviderImpl.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -34,6 +34,9 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.tools.jaxws.api.WSContractProvider; import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.BasicDeployment; +import org.jboss.wsf.spi.deployment.BasicEndpoint; +import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; @@ -112,7 +115,14 @@ messageStream.println("Generating WSDL:"); UnifiedDeploymentInfo udi = createUDI(endpointClass, loader); - builder.buildWebServiceMetaData(umd, udi, endpointClass, null); + + Deployment dep = new BasicDeployment(); + dep.getContext().addAttachment(UnifiedDeploymentInfo.class, udi); + BasicEndpoint ep = new BasicEndpoint(); + ep.setTargetBean(endpointClass.getName()); + dep.getService().addEndpoint(ep); + + builder.buildWebServiceMetaData(dep, umd, udi, endpointClass, null); try { generator.write(); Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeployer.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeployer.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeployer.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -54,22 +54,22 @@ if (udi.type == DeploymentType.JAXRPC_JSE) { JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder(); - umd = builder.buildMetaData((JAXRPCDeployment)udi); + umd = builder.buildMetaData(dep, (JAXRPCDeployment)udi); } else if (udi.type == DeploymentType.JAXRPC_EJB21) { JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder(); - umd = builder.buildMetaData((JAXRPCDeployment)udi); + umd = builder.buildMetaData(dep, (JAXRPCDeployment)udi); } else if (udi.type == DeploymentType.JAXWS_JSE) { JAXWSMetaDataBuilderJSE builder = new JAXWSMetaDataBuilderJSE(); - umd = builder.buildMetaData(udi); + umd = builder.buildMetaData(dep, udi); } else if (udi.type == DeploymentType.JAXWS_EJB3) { JAXWSMetaDataBuilderEJB3 builder = new JAXWSMetaDataBuilderEJB3(); - umd = builder.buildMetaData(udi); + umd = builder.buildMetaData(dep, udi); } else { Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1427/JBWS1427TestCase.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -66,7 +66,7 @@ QName serviceName = new QName("http://za.co.testws.interfaces", "ProcessClaim"); Service service = factory.createService(wsdlURL, serviceName , mappingURL); port = (RequestService)service.getPort(RequestService.class); - ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/RequestServiceEJBService/RequestServiceEJB"); + ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1427/SubmitRequestEJB"); } } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/DocWrappedServiceImpl.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/DocWrappedServiceImpl.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/DocWrappedServiceImpl.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -33,7 +33,7 @@ * @since 16-Oct-2005 */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.soapbinding.DocWrapped", name="DocWrapped") +@WebService(endpointInterface = "org.jboss.test.ws.tools.jaxws.DocWrapped", name="DocWrapped") public class DocWrappedServiceImpl implements DocWrapped { // Provide logging Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/PurchaseOrder.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/PurchaseOrder.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/PurchaseOrder.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -28,10 +28,10 @@ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "PurchaseOrderType", namespace="http://soapbinding.samples.jaxws.ws.test.jboss.org/";, propOrder = { "product" }) +@XmlType(name = "PurchaseOrderType", namespace="http://jaxws.tools.ws.test.jboss.org/";, propOrder = { "product" }) public class PurchaseOrder { - @XmlElement(namespace="http://soapbinding.samples.jaxws.ws.test.jboss.org/", required = true) + @XmlElement(namespace="http://jaxws.tools.ws.test.jboss.org/", required = true) private String product; public PurchaseOrder() Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/PurchaseOrderAck.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/PurchaseOrderAck.java 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jaxws/PurchaseOrderAck.java 2007-05-22 15:39:58 UTC (rev 3186) @@ -28,10 +28,10 @@ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "PurchaseOrderAckType", namespace="http://soapbinding.samples.jaxws.ws.test.jboss.org/";, propOrder = { "product" }) +@XmlType(name = "PurchaseOrderAckType", namespace="http://jaxws.tools.ws.test.jboss.org/";, propOrder = { "product" }) public class PurchaseOrderAck { - @XmlElement(namespace="http://soapbinding.samples.jaxws.ws.test.jboss.org/", required = true) + @XmlElement(namespace="http://jaxws.tools.ws.test.jboss.org/", required = true) private String product; public PurchaseOrderAck() Modified: trunk/jbossws-core/src/test/resources/jaxrpc/enventry/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxrpc/enventry/META-INF/jboss-client.xml 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/test/resources/jaxrpc/enventry/META-INF/jboss-client.xml 2007-05-22 15:39:58 UTC (rev 3186) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-enventry/EnvEntryBeanEJB?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-enventry/TestService?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: trunk/jbossws-core/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml 2007-05-22 13:40:41 UTC (rev 3185) +++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws723/META-INF/jboss.xml 2007-05-22 15:39:58 UTC (rev 3186) @@ -12,7 +12,7 @@ <jndi-name>ejb/RoleSecuredSLSB</jndi-name> <port-component> <port-component-name>RoleSecured</port-component-name> - <port-component-uri>/jaxrpc-jbws723/RoleSecured</port-component-uri> + <port-component-uri>/RoleSecured</port-component-uri> <auth-method>BASIC</auth-method> <transport-guarantee>NONE</transport-guarantee> <!-- default secure-wsdl-access (false for jaxrpc) --> @@ -23,7 +23,7 @@ <jndi-name>ejb/BasicSecuredSLSB</jndi-name> <port-component> <port-component-name>BasicSecured</port-component-name> - <port-component-uri>/jaxrpc-jbws723/BasicSecured</port-component-uri> + <port-component-uri>/BasicSecured</port-component-uri> <auth-method>BASIC</auth-method> <transport-guarantee>NONE</transport-guarantee> <secure-wsdl-access>true</secure-wsdl-access> @@ -34,7 +34,7 @@ <jndi-name>ejb/ConfidentialSLSB</jndi-name> <port-component> <port-component-name>ConfidentialSecured</port-component-name> - <port-component-uri>/jaxrpc-jbws723/ConfidentialSecured</port-component-uri> + <port-component-uri>/ConfidentialSecured</port-component-uri> <transport-guarantee>CONFIDENTIAL</transport-guarantee> <secure-wsdl-access>false</secure-wsdl-access> </port-component>