Author: thomas.diesler(a)jboss.com Date: 2007-06-26 18:15:44 -0400 (Tue, 26 Jun 2007) New Revision: 3737 Modified: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java Log: Associate ServerEndpointMetaData with Endpoint Modified: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java =================================================================== --- branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -90,7 +90,7 @@ Endpoint ep = createEndpoint(); ep.setShortName(ejbLink); ep.setService(service); - ep.setTargetBean(ejbClass); + ep.setTargetBeanName(ejbClass); service.addEndpoint(ep); } Modified: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -107,7 +107,7 @@ Endpoint ep = createEndpoint(); ep.setShortName(servletLink); ep.setService(service); - ep.setTargetBean(servletClass); + ep.setTargetBeanName(servletClass); service.addEndpoint(ep); } Modified: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -76,7 +76,7 @@ Endpoint ep = createEndpoint(); ep.setShortName(ejbName); ep.setService(service); - ep.setTargetBean(epBean); + ep.setTargetBeanName(epBean); service.addEndpoint(ep); } Modified: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -82,7 +82,7 @@ Endpoint ep = createEndpoint(); ep.setShortName(servletName); ep.setService(service); - ep.setTargetBean(servletClass); + ep.setTargetBeanName(servletClass); service.addEndpoint(ep); } Modified: branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java =================================================================== --- branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -57,14 +57,14 @@ // <servlet-class> originally contained a javax.servlet.Servlet for (Endpoint ep : dep.getService().getEndpoints()) { - if (ep.getTargetBean() == null) + if (ep.getTargetBeanName() == null) { String servletName = ep.getShortName(); String beanClassName = results.sepTargetMap.get(servletName); if (beanClassName == null) throw new IllegalStateException("Cannot obtain target bean for: " + servletName); - ep.setTargetBean(beanClassName); + ep.setTargetBeanName(beanClassName); } } } Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java =================================================================== --- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -89,7 +89,7 @@ Endpoint ep = createEndpoint(); ep.setShortName(ejbLink); ep.setService(service); - ep.setTargetBean(ejbClass); + ep.setTargetBeanName(ejbClass); service.addEndpoint(ep); } Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java =================================================================== --- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -89,7 +89,7 @@ Endpoint ep = createEndpoint(); ep.setShortName(servletLink); ep.setService(service); - ep.setTargetBean(servletClass); + ep.setTargetBeanName(servletClass); service.addEndpoint(ep); } Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java =================================================================== --- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -82,7 +82,7 @@ Endpoint ep = createEndpoint(); ep.setShortName(ejbName); ep.setService(service); - ep.setTargetBean(epBean); + ep.setTargetBeanName(epBean); service.addEndpoint(ep); } Modified: branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java =================================================================== --- branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -79,7 +79,7 @@ Endpoint ep = createEndpoint(); ep.setShortName(servletName); ep.setService(service); - ep.setTargetBean(servletClass); + ep.setTargetBeanName(servletClass); service.addEndpoint(ep); } Modified: branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java =================================================================== --- branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataAssociationDeployer.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -52,9 +52,11 @@ if (sepMetaData == null) { sepMetaData = getEndpointMetaData(umd, ep); + sepMetaData.setEndpoint(ep); + ep.addAttachment(ServerEndpointMetaData.class, sepMetaData); - String targetBean = ep.getTargetBean(); + String targetBean = ep.getTargetBeanName(); if (targetBean != null) sepMetaData.setServiceEndpointImplName(targetBean); } Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/BasicEndpoint.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -67,12 +67,12 @@ this.service = service; } - public String getTargetBean() + public String getTargetBeanName() { return targetBean; } - public void setTargetBean(String targetBean) + public void setTargetBeanName(String targetBean) { this.targetBean = targetBean; } Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -75,10 +75,10 @@ void setState(EndpointState state); /** Get the endpoint implementation bean */ - String getTargetBean(); + String getTargetBeanName(); /** Set the endpoint implementation bean */ - void setTargetBean(String epImpl); + void setTargetBeanName(String epImpl); /** Use the deployment classloader to load the bean */ Class getTargetBeanClass(); Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppGeneratorDeployer.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -136,7 +136,7 @@ { Element servlet = webApp.addElement("servlet"); servlet.addElement("servlet-name").addText(ep.getShortName()); - servlet.addElement("servlet-class").addText(ep.getTargetBean()); + servlet.addElement("servlet-class").addText(ep.getTargetBeanName()); } /* Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ClientEndpointMetaData.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -26,6 +26,7 @@ import javax.xml.namespace.QName; import org.jboss.ws.metadata.config.ConfigurationProvider; +import org.jboss.wsf.spi.binding.jaxb.CachingJAXBContextFactory; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** @@ -39,12 +40,12 @@ public ClientEndpointMetaData(ServiceMetaData service, QName qname, QName portTypeName, Type type) { super(service, qname, portTypeName, type); - super.configName = ConfigurationProvider.DEFAULT_CLIENT_CONFIG_NAME; + configName = ConfigurationProvider.DEFAULT_CLIENT_CONFIG_NAME; if (type == Type.JAXRPC) - super.configFile = ConfigurationProvider.DEFAULT_JAXRPC_CLIENT_CONFIG_FILE; + configFile = ConfigurationProvider.DEFAULT_JAXRPC_CLIENT_CONFIG_FILE; else - super.configFile = ConfigurationProvider.DEFAULT_JAXWS_CLIENT_CONFIG_FILE; + configFile = ConfigurationProvider.DEFAULT_JAXWS_CLIENT_CONFIG_FILE; } public String toString() Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -55,12 +55,12 @@ import org.jboss.ws.core.jaxws.client.DispatchBinding; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; +import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.config.CommonConfig; import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.ws.metadata.config.EndpointFeature; import org.jboss.ws.metadata.config.JBossWSConfigFactory; -import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.binding.jaxb.CachingJAXBContextFactory; import org.jboss.wsf.spi.binding.jaxb.JAXBContextFactory; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; @@ -142,7 +142,7 @@ private ConfigObservable configObservable = new ConfigObservable(); - private JAXBContextFactory jaxbContextFactory = new CachingJAXBContextFactory(); + protected JAXBContextFactory jaxbContextFactory = new CachingJAXBContextFactory(); private List<UnifiedPortComponentRefMetaData> serviceRefContrib = new ArrayList<UnifiedPortComponentRefMetaData>(); @@ -326,6 +326,11 @@ return type; } + public JAXBContextFactory getJAXBContextFactory() + { + return jaxbContextFactory; + } + public String getAuthMethod() { return authMethod; @@ -602,11 +607,6 @@ } } - public JAXBContextFactory getJAXBContextFactory() - { - return jaxbContextFactory; - } - // --------------------------------------------------------------- // Configuration provider impl @@ -638,7 +638,7 @@ { DispatchBinding dpb = (DispatchBinding)configurable; dpb.setValidateDispatch(config.hasFeature(EndpointFeature.VALIDATE_DISPATCH)); - } + } } public UnifiedVirtualFile getRootFile() Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-06-26 22:04:36 UTC (rev 3736) +++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-06-26 22:15:44 UTC (rev 3737) @@ -28,6 +28,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.metadata.config.ConfigurationProvider; +import org.jboss.wsf.spi.binding.jaxb.JAXBContextFactory; +import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** @@ -44,7 +46,10 @@ public static final String SEPID_DOMAIN = "jboss.ws"; public static final String SEPID_PROPERTY_CONTEXT = "context"; public static final String SEPID_PROPERTY_ENDPOINT = "endpoint"; - + + // The associated SPI endpoint + private Endpoint endpoint; + // The REQUIRED link name private String linkName; // Legacy JSR-109 port component name @@ -75,6 +80,16 @@ configFile = ConfigurationProvider.DEFAULT_JAXWS_ENDPOINT_CONFIG_FILE; } + public Endpoint getEndpoint() + { + return endpoint; + } + + public void setEndpoint(Endpoint endpoint) + { + this.endpoint = endpoint; + } + public String getLinkName() { return linkName;