Author: thomas.diesler(a)jboss.com Date: 2007-07-31 11:08:50 -0400 (Tue, 31 Jul 2007) New Revision: 4037 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml trunk/integration/native/src/main/resources/jbossws-native-config.xml trunk/integration/spi/src/main/java/org/jboss/ws/integration/CommonServiceRefBinder.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/DummyServiceRefBinderJAXRPC.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefBinderJAXRPC.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java Log: More on Endpoint API Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapter.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -35,7 +35,7 @@ import org.jboss.webservice.metadata.serviceref.InitParamMetaData; import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -25,7 +25,7 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; -import org.jboss.ws.integration.KernelLocator; +import org.jboss.wsf.common.KernelLocator; /** * @author Thomas.Diesler(a)jboss.org Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceClientDeployer.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -23,23 +23,24 @@ // $Id$ +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Iterator; + +import javax.naming.Context; + import org.jboss.deployment.DeploymentException; import org.jboss.deployment.DeploymentInfo; import org.jboss.system.ServiceMBeanSupport; import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData; -import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.integration.ServiceRefHandler; import org.jboss.ws.integration.ServiceRefHandlerFactory; -import org.jboss.ws.integration.URLLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import javax.naming.Context; -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Iterator; - /** * Binds a JAXRPC Service object in the client's ENC for every service-ref element in the * deployment descriptor. @@ -66,14 +67,14 @@ ServiceRefMetaData serviceRef = (ServiceRefMetaData)serviceRefs.next(); String serviceRefName = serviceRef.getServiceRefName(); - UnifiedVirtualFile vfRoot = new ResourceLoaderAdapter(di.localCl); // Why this? + UnifiedVirtualFile vfRoot = new ResourceLoaderAdapter(di.localCl); // Why this? UnifiedServiceRefMetaData usr = ServiceRefMetaDataAdapterFactory.newInstance().buildServiceRefMetaData(vfRoot, serviceRef); URLLoaderAdapter urlLoaderAdapter = new URLLoaderAdapter(getDeploymentURL(di)); usr.setVfsRoot(urlLoaderAdapter); ServiceRefHandler serviceRefHandler = ServiceRefHandlerFactory.getServiceRefHandler(); - serviceRefHandler.bindServiceRef(envCtx, serviceRefName, urlLoaderAdapter , di.ucl, usr); - + serviceRefHandler.bindServiceRef(envCtx, serviceRefName, urlLoaderAdapter, di.ucl, usr); + log.debug("Webservice binding: java:comp/env/" + serviceRefName); } } @@ -82,7 +83,7 @@ throw new DeploymentException("Cannot bind webservice to client environment", e); } } - + private URL getDeploymentURL(DeploymentInfo di) { URL deploymentURL = (di.localUrl != null ? di.localUrl : di.url); Modified: trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-31 15:08:50 UTC (rev 4037) @@ -1,6 +1,6 @@ <!-- Locate the single instance of the kernel --> - <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> + <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> </bean> @@ -85,12 +85,15 @@ <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> <property name="name">WSDeploymentAspectManagerEJB</property> </bean> + <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEndpointAPI</property> + </bean> <!-- The container deployment aspects --> <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect"> - <property name="provides">ContainerMetaData</property> + <property name="provides">ContainerMetaData, VFSRoot</property> <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property> </bean> @@ -99,12 +102,15 @@ <property name="provides">ContextRoot</property> </bean> - <!-- TODO: Move to framework code --> <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointAddress</property> </bean> + <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> + <property name="provides">ContainerMetaData, URLPattern, VFSRoot</property> + </bean> + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> <property name="provides">ContainerEndpointHandler</property> </bean> @@ -203,3 +209,19 @@ </set> </property> </bean> + <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointAPIDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -28,8 +28,8 @@ import org.jboss.deployment.DeploymentException; import org.jboss.deployment.DeploymentInfo; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.WSFDeploymentException; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -23,15 +23,14 @@ //$Id: JBossHttpServer.java 1786 2007-01-04 14:30:04Z thomas.diesler(a)jboss.com $ -import javax.enterprise.deploy.spi.factories.DeploymentFactory; import javax.xml.ws.Endpoint; import javax.xml.ws.WebServiceException; -import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.framework.DefaultExtensible; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspectManager; import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.Service; @@ -39,7 +38,6 @@ import org.jboss.wsf.spi.http.HttpContext; import org.jboss.wsf.spi.http.HttpContextFactory; import org.jboss.wsf.spi.http.HttpServer; -import org.w3c.dom.Element; /** * A HTTP Server that uses DeploymentAspects @@ -73,23 +71,22 @@ // Get the deployment model factory SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); DeploymentModelFactory depModelFactory = spiProvider.getSPI(DeploymentModelFactory.class); - + // Create/Setup the deployment Deployment dep = depModelFactory.newDeployment("endpoint-deployment", implClass.getClassLoader()); - + // Create/Setup the service Service service = dep.getService(); service.setContextRoot(context.getContextRoot()); - + // Create/Setup the endpoint org.jboss.wsf.spi.deployment.Endpoint ep = depModelFactory.newEndpoint(implClass.getName()); - ep.setURLPattern("/*"); service.addEndpoint(ep); - + // Deploy using deployment aspects DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class); - depManagerFactory.getDeploymentAspectManager(DeploymentType.JAXWS_JSE); - + DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI"); + depManager.deploy(dep); } catch (RuntimeException rte) { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -26,7 +26,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; -import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -29,7 +29,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; -import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -30,7 +30,7 @@ import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.Ejb3ModuleMBean; import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -34,7 +34,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; -import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -23,6 +23,10 @@ // $Id: WebAppDeployerDeployer.java 3183 2007-05-22 13:06:13Z thomas.diesler(a)jboss.com $ +import java.net.URL; + +import javax.management.MBeanServer; + import org.jboss.deployment.DeploymentInfo; import org.jboss.deployment.MainDeployerMBean; import org.jboss.logging.Logger; @@ -33,9 +37,6 @@ import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import javax.management.MBeanServer; -import java.net.URL; - /** * Publish the HTTP service endpoint to Tomcat * @@ -56,29 +57,28 @@ public void create(Deployment dep) { - if (dep.getType().toString().endsWith("EJB21") || dep.getType().toString().endsWith("EJB3")) + URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url"); + if (warURL == null) + throw new IllegalStateException("Cannot obtain webapp URL"); + + log.debug("publishServiceEndpoint: " + warURL); + try { - URL warURL = (URL)dep.getProperty("org.jboss.ws.webapp.url"); + webXMLRewriter.rewriteWebXml(dep); + + DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss()); - log.debug("publishServiceEndpoint: " + warURL); - try - { - DeploymentInfo di = dep.getAttachment(DeploymentInfo.class); - if (di == null) - throw new IllegalStateException("Cannot obtain DeploymentInfo from context"); + // Preserve the repository config + DeploymentInfo di = dep.getAttachment(DeploymentInfo.class); + if (di != null) + auxdi.repositoryConfig = di.getTopRepositoryConfig(); - webXMLRewriter.rewriteWebXml(dep); - - // Preserve the repository config - DeploymentInfo auxdi = new DeploymentInfo(warURL, null, MBeanServerLocator.locateJBoss()); - auxdi.repositoryConfig = di.getTopRepositoryConfig(); - getMainDeployer().deploy(auxdi); - } - catch (Exception ex) - { - WSFDeploymentException.rethrow(ex); - } + getMainDeployer().deploy(auxdi); } + catch (Exception ex) + { + WSFDeploymentException.rethrow(ex); + } } public void destroy(Deployment dep) Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-31 15:08:50 UTC (rev 4037) @@ -1,6 +1,6 @@ <!-- Locate the single instance of the kernel --> - <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> + <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> </bean> @@ -8,8 +8,10 @@ <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/> <!-- The HTTPServer used by the JAXWS Endpoint API --> - <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.WebAppDeployingHttpServer"> + <!--bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.WebAppDeployingHttpServer"> <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + </bean--> + <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"> </bean> <!-- @@ -93,7 +95,7 @@ The container deployment aspects --> <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect"> - <property name="provides">ContainerMetaData</property> + <property name="provides">ContainerMetaData, VFSRoot</property> <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property> </bean> @@ -102,6 +104,10 @@ <property name="provides">ContextRoot</property> </bean> + <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> + <property name="provides">ContainerMetaData, URLPattern, VFSRoot</property> + </bean> + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointAddress</property> @@ -208,13 +214,13 @@ <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointAPIDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> <inject bean="WSEndpointLifecycleDeploymentAspect"/> <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSURLPatternDeploymentAspect"/> <inject bean="WSWebAppDeploymentAspect"/> <inject bean="WSWebAppGeneratorDeploymentAspect"/> </set> Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -27,7 +27,7 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.virtual.VirtualFile; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/VirtualFileAdaptor.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -22,7 +22,7 @@ package org.jboss.wsf.container.jboss50; import org.jboss.virtual.VirtualFile; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import java.io.IOException; import java.net.URL; Modified: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-31 15:08:50 UTC (rev 4037) @@ -3,7 +3,7 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0"> <!-- Locate the single instance of the kernel --> - <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> + <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator"> <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> </bean> @@ -145,7 +145,7 @@ The container deployment aspects --> <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.ContainerMetaDataDeploymentAspect"> - <property name="provides">ContainerMetaData</property> + <property name="provides">ContainerMetaData, VFSRoot</property> </bean> <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> Modified: trunk/integration/native/src/main/resources/jbossws-native-config.xml =================================================================== --- trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/native/src/main/resources/jbossws-native-config.xml 2007-07-31 15:08:50 UTC (rev 4037) @@ -84,7 +84,7 @@ </bean> <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> - <property name="requires">ContainerMetaData, URLPattern</property> + <property name="requires">ContainerMetaData, URLPattern, VFSRoot</property> <property name="provides">UnifiedMetaDataModel, StackDescriptor</property> </bean> @@ -116,4 +116,18 @@ </set> </property> </bean> + <bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSNativeContextPropertiesDeploymentAspect"/> + <inject bean="WSNativeEagerInitializeDeploymentAspect"/> + <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> + <inject bean="WSNativeEventingDeploymentAspect"/> + <inject bean="WSNativePublishContractDeploymentAspect"/> + <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> + </set> + </property> + </bean> \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/CommonServiceRefBinder.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/CommonServiceRefBinder.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/CommonServiceRefBinder.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -21,30 +21,30 @@ */ package org.jboss.ws.integration; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.wsf.spi.WSFException; -import org.jboss.ws.integration.ServiceRefBinder; -import org.jboss.util.naming.Util; -import org.jboss.logging.Logger; +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import javax.jws.HandlerChain; import javax.naming.Context; import javax.naming.NamingException; import javax.naming.Referenceable; -import javax.xml.ws.WebServiceRef; -import javax.xml.ws.WebServiceRefs; +import javax.xml.namespace.QName; import javax.xml.ws.Service; import javax.xml.ws.WebServiceClient; -import javax.xml.namespace.QName; -import javax.jws.HandlerChain; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.annotation.Annotation; -import java.util.List; -import java.util.ArrayList; -import java.net.URL; -import java.net.MalformedURLException; +import javax.xml.ws.WebServiceRef; +import javax.xml.ws.WebServiceRefs; +import org.jboss.logging.Logger; +import org.jboss.util.naming.Util; +import org.jboss.wsf.spi.WSFException; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + /** * A generic ServiceRefBinder that knows how to deal with JAX-WS services. * Subclasses need to provide a stack specific {@link Referenceable} that can be bound into JNDI. @@ -62,19 +62,17 @@ // logging support private static Logger log = Logger.getLogger(CommonServiceRefBinder.class); - private ClassLoader loader = null; - public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException { WebServiceRef wsref = null; - if(null == loader) + if (null == loader) throw new IllegalArgumentException("There needs to be a classloader available"); // Build the list of @WebServiceRef relevant annotations List<WebServiceRef> wsrefList = new ArrayList<WebServiceRef>(); - if(anElement!=null) + if (anElement != null) { for (Annotation an : anElement.getAnnotations()) { @@ -118,7 +116,7 @@ } else { - if( wsref!=null && (wsref.type() != Object.class) ) + if (wsref != null && (wsref.type() != Object.class)) targetClass = wsref.type(); } @@ -148,7 +146,6 @@ if (wsref != null && wsref.type() != Object.class) targetClassName = wsref.type().getName(); - // #2 Use the target ref type if (targetClassName == null && targetClass != null && Service.class.isAssignableFrom(targetClass) == false) targetClassName = targetClass.getName(); @@ -190,15 +187,15 @@ } // Extract service QName for target service - if(null == serviceRef.getServiceQName()) + if (null == serviceRef.getServiceQName()) { try { Class serviceClass = loader.loadClass(serviceImplClass); - if(serviceClass.getAnnotation(WebServiceClient.class) !=null) + if (serviceClass.getAnnotation(WebServiceClient.class) != null) { WebServiceClient clientDecl = (WebServiceClient)serviceClass.getAnnotation(WebServiceClient.class); - serviceRef.setServiceQName( new QName(clientDecl.targetNamespace(), clientDecl.name())); + serviceRef.setServiceQName(new QName(clientDecl.targetNamespace(), clientDecl.name())); } } catch (ClassNotFoundException e) @@ -223,7 +220,5 @@ * @return a Referenceable that can be used by a stack specific {@link javax.naming.spi.ObjectFactory} on the client side * to create a web service stub * */ - protected abstract Referenceable buildServiceReferenceable( - String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef - ); + protected abstract Referenceable buildServiceReferenceable(String serviceImplClass, String targetClassName, UnifiedServiceRefMetaData serviceRef); } Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -26,10 +26,8 @@ import org.jboss.kernel.Kernel; /** - * Locate the single instance of the kernel - * - * @author Thomas.Diesler(a)jboss.org - * @since 12-May-2006 + * @deprecated + * @see org.jboss.wsf.common.KernelLocator */ public class KernelLocator { Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ResourceLoaderAdapter.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -23,96 +23,20 @@ // $Id$ -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; - -import org.jboss.ws.integration.UnifiedVirtualFile; - - /** - * The default file adapter loads resources through an associated classloader. - * If no classload is set, the the thread context classloader will be used. - * - * @author Heiko.Braun(a)jboss.org - * @since 25.01.2007 + * @deprecated + * @see org.jboss.wsf.common.ResourceLoaderAdapter */ -public class ResourceLoaderAdapter implements UnifiedVirtualFile +public class ResourceLoaderAdapter extends org.jboss.wsf.common.ResourceLoaderAdapter implements UnifiedVirtualFile { - private URL resourceURL; - private ClassLoader loader; - + @Deprecated public ResourceLoaderAdapter() { - this(Thread.currentThread().getContextClassLoader()); } - + + @Deprecated public ResourceLoaderAdapter(ClassLoader loader) { - this.loader = loader; + super(loader); } - - private ResourceLoaderAdapter(ClassLoader loader, URL resourceURL) - { - this.resourceURL = resourceURL; - this.loader = loader; - } - - public UnifiedVirtualFile findChild(String resourcePath) throws IOException - { - URL resourceURL = null; - if (resourcePath != null) - { - // Try the child as URL - try - { - resourceURL = new URL(resourcePath); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try the filename as File - if (resourceURL == null) - { - try - { - File file = new File(resourcePath); - if (file.exists()) - resourceURL = file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - } - - // Try the filename as Resource - if (resourceURL == null) - { - try - { - resourceURL = loader.getResource(resourcePath); - } - catch (Exception ex) - { - // ignore - } - } - } - - if (resourceURL == null) - throw new IOException("Cannot get URL for: " + resourcePath); - - return new ResourceLoaderAdapter(loader, resourceURL); - } - - public URL toURL() - { - if (null == this.resourceURL) - throw new IllegalStateException("UnifiedVirtualFile not initialized"); - return resourceURL; - } } Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -26,6 +26,7 @@ import javax.naming.Context; import javax.naming.NamingException; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerFactory.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -21,13 +21,13 @@ */ package org.jboss.ws.integration; +//$Id$ + import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; import org.jboss.wsf.common.ServiceLoader; -// $Id$ - /** * A factory for the ServiceRefHandler * Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandlerImpl.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -23,20 +23,22 @@ // $Id$ +import java.io.File; +import java.lang.reflect.AnnotatedElement; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.naming.Context; +import javax.naming.NamingException; + import org.jboss.logging.Logger; +import org.jboss.wsf.common.URLLoaderAdapter; import org.jboss.wsf.spi.WSFException; -import org.jboss.ws.integration.ServiceRefBinder; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; -import javax.naming.Context; -import javax.naming.NamingException; -import java.io.File; -import java.lang.reflect.AnnotatedElement; -import java.net.MalformedURLException; -import java.net.URL; - /** * Bind service refs in the client's ENC * for every service-ref element in the deployment descriptor. Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/URLLoaderAdapter.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -23,102 +23,17 @@ // $Id$ -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; import java.net.URL; -import java.net.URLClassLoader; /** - * Load resources through a URLClassLoader.<br> - * NOTE: The associated classloader doesn't do parent delegation. - * - * - * @author Heiko.Braun(a)jboss.org - * @since 25.01.2007 + * @deprecated + * @see org.jboss.wsf.common.URLLoaderAdapter */ -public class URLLoaderAdapter implements UnifiedVirtualFile +public class URLLoaderAdapter extends org.jboss.wsf.common.URLLoaderAdapter implements UnifiedVirtualFile { - private URL rootURL; - private URL resourceURL; - private transient URLClassLoader loader; - + @Deprecated public URLLoaderAdapter(URL rootURL) { - this.rootURL = rootURL; + super(rootURL); } - - private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL) - { - this.rootURL = rootURL; - this.resourceURL = resourceURL; - this.loader = loader; - } - - public UnifiedVirtualFile findChild(String resourcePath) throws IOException - { - URL resourceURL = null; - if (resourcePath != null) - { - // Try the child as URL - try - { - resourceURL = new URL(resourcePath); - } - catch (MalformedURLException ex) - { - // ignore - } - - // Try the filename as File - if (resourceURL == null) - { - try - { - File file = new File(resourcePath); - if (file.exists()) - resourceURL = file.toURL(); - } - catch (MalformedURLException e) - { - // ignore - } - } - - // Try the filename as Resource - if (resourceURL == null) - { - try - { - resourceURL = getResourceLoader().getResource(resourcePath); - } - catch (Exception ex) - { - // ignore - } - } - } - - if (resourceURL == null) - throw new IOException("Cannot get URL for: " + resourcePath); - - return new URLLoaderAdapter(rootURL, loader, resourceURL); - } - - public URL toURL() - { - if (resourceURL != null) - return resourceURL; - else - return rootURL; - } - - private URLClassLoader getResourceLoader() - { - if (loader == null) - { - loader = new URLClassLoader(new URL[]{rootURL}); - } - return loader; - } } Modified: trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/ws/integration/UnifiedVirtualFile.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -23,20 +23,10 @@ // $Id$ -import java.io.IOException; -import java.io.Serializable; -import java.net.URL; - /** - * An adaptor to a VirtualFile from jboss-vfs.jar - * jboss-vfs cannot be used in jboss-4.x because of its dependeny on jboss-common-core.jar - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 + * @deprecated + * @see org.jboss.wsf.spi.deployment.UnifiedVirtualFile */ -public interface UnifiedVirtualFile extends Serializable +public interface UnifiedVirtualFile extends org.jboss.wsf.spi.deployment.UnifiedVirtualFile { - UnifiedVirtualFile findChild(String child) throws IOException; - - URL toURL(); } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -24,7 +24,7 @@ import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; -import org.jboss.ws.integration.KernelLocator; +import org.jboss.wsf.common.KernelLocator; /** * @author Heiko.Braun(a)jboss.com Added: trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.common; + +//$Id: KernelLocator.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ + +import org.jboss.kernel.Kernel; + +/** + * Locate the single instance of the kernel + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2006 + */ +public class KernelLocator +{ + private static Kernel kernel; + + public static Kernel getKernel() + { + return KernelLocator.kernel; + } + + public void setKernel(Kernel kernel) + { + KernelLocator.kernel = kernel; + } +} Added: trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/ResourceLoaderAdapter.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -0,0 +1,117 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.common; + +// $Id: ResourceLoaderAdapter.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; + +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; + +/** + * The default file adapter loads resources through an associated classloader. + * If no classload is set, the the thread context classloader will be used. + * + * @author Heiko.Braun(a)jboss.org + * @since 25.01.2007 + */ +public class ResourceLoaderAdapter implements UnifiedVirtualFile +{ + private URL resourceURL; + private ClassLoader loader; + + public ResourceLoaderAdapter() + { + this(Thread.currentThread().getContextClassLoader()); + } + + public ResourceLoaderAdapter(ClassLoader loader) + { + this.loader = loader; + } + + private ResourceLoaderAdapter(ClassLoader loader, URL resourceURL) + { + this.resourceURL = resourceURL; + this.loader = loader; + } + + public UnifiedVirtualFile findChild(String resourcePath) throws IOException + { + URL resourceURL = null; + if (resourcePath != null) + { + // Try the child as URL + try + { + resourceURL = new URL(resourcePath); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (resourceURL == null) + { + try + { + File file = new File(resourcePath); + if (file.exists()) + resourceURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (resourceURL == null) + { + try + { + resourceURL = loader.getResource(resourcePath); + } + catch (Exception ex) + { + // ignore + } + } + } + + if (resourceURL == null) + throw new IOException("Cannot get URL for: " + resourcePath); + + return new ResourceLoaderAdapter(loader, resourceURL); + } + + public URL toURL() + { + if (null == this.resourceURL) + throw new IllegalStateException("UnifiedVirtualFile not initialized"); + return resourceURL; + } +} Added: trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/URLLoaderAdapter.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -0,0 +1,126 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.common; + +// $Id: URLLoaderAdapter.java 3830 2007-07-09 17:01:33Z heiko.braun(a)jboss.com $ + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; + +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; + +/** + * Load resources through a URLClassLoader.<br> + * NOTE: The associated classloader doesn't do parent delegation. + * + * + * @author Heiko.Braun(a)jboss.org + * @since 25.01.2007 + */ +public class URLLoaderAdapter implements UnifiedVirtualFile +{ + private URL rootURL; + private URL resourceURL; + private transient URLClassLoader loader; + + public URLLoaderAdapter(URL rootURL) + { + this.rootURL = rootURL; + } + + private URLLoaderAdapter(URL rootURL, URLClassLoader loader, URL resourceURL) + { + this.rootURL = rootURL; + this.resourceURL = resourceURL; + this.loader = loader; + } + + public UnifiedVirtualFile findChild(String resourcePath) throws IOException + { + URL resourceURL = null; + if (resourcePath != null) + { + // Try the child as URL + try + { + resourceURL = new URL(resourcePath); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (resourceURL == null) + { + try + { + File file = new File(resourcePath); + if (file.exists()) + resourceURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (resourceURL == null) + { + try + { + resourceURL = getResourceLoader().getResource(resourcePath); + } + catch (Exception ex) + { + // ignore + } + } + } + + if (resourceURL == null) + throw new IOException("Cannot get URL for: " + resourcePath); + + return new URLLoaderAdapter(rootURL, loader, resourceURL); + } + + public URL toURL() + { + if (resourceURL != null) + return resourceURL; + else + return rootURL; + } + + private URLClassLoader getResourceLoader() + { + if (loader == null) + { + loader = new URLClassLoader(new URL[] { rootURL }); + } + return loader; + } +} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentImpl.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -27,10 +27,9 @@ import java.net.MalformedURLException; import java.net.URL; -import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; - /** * A general web service deployment that is based on an archive. * @@ -102,23 +101,23 @@ } /* - if (resourceURL == null) - { - String deploymentPath = getUrl().toExternalForm(); + if (resourceURL == null) + { + String deploymentPath = getUrl().toExternalForm(); - if (deploymentPath.startsWith("jar:") && deploymentPath.endsWith("!/") == false) - deploymentPath += "!/"; + if (deploymentPath.startsWith("jar:") && deploymentPath.endsWith("!/") == false) + deploymentPath += "!/"; - if (deploymentPath.startsWith("war:") && deploymentPath.endsWith("!/") == false) - deploymentPath += "!/"; + if (deploymentPath.startsWith("war:") && deploymentPath.endsWith("!/") == false) + deploymentPath += "!/"; - if (deploymentPath.endsWith("/") == false) - deploymentPath += "/"; + if (deploymentPath.endsWith("/") == false) + deploymentPath += "/"; - // assign a relative URL - resourceURL = new URL(deploymentPath + resourcePath); - } - */ + // assign a relative URL + resourceURL = new URL(deploymentPath + resourcePath); + } + */ } return resourceURL; } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DeploymentAspectManagerImpl.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -109,17 +109,8 @@ } if (allAspects.size() != 0) - { - Set<String> providedConditions = new HashSet<String>(); - for (int i = 0; i < sortedAspects.size(); i++) - { - DeploymentAspect sortedAspect = sortedAspects.get(i); - providedConditions.addAll(sortedAspect.getProvidesAsSet()); - } + throwSortException(allAspects); - throw new IllegalStateException("Cannot add: " + allAspects + "\n provided: " + providedConditions); - } - for (DeploymentAspect aspect : sortedAspects) log.debug(name + ": " + aspect); } @@ -127,6 +118,26 @@ return sortedAspects; } + private void throwSortException(List<DeploymentAspect> allAspects) + { + Set<String> providedConditions = new HashSet<String>(); + for (int i = 0; i < sortedAspects.size(); i++) + { + DeploymentAspect sortedAspect = sortedAspects.get(i); + providedConditions.addAll(sortedAspect.getProvidesAsSet()); + } + + String exmsg = "Cannot add deployment aspect(s)"; + StringBuilder str = new StringBuilder(exmsg + "\nProvided Conditions are: " + providedConditions); + for (DeploymentAspect da : allAspects) + { + str.append("\n " + da.getClass().getName() + ", requires: " + da.getRequires()); + } + + log.error(str); + throw new IllegalStateException(exmsg); + } + private int getAspectIndex(DeploymentAspect aspect) { int index = -1; Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointAPIDeploymentAspect.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.framework.deployment; + +//$Id: EndpointAddressDeploymentAspect.java 4018 2007-07-27 06:31:03Z thomas.diesler(a)jboss.com $ + +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; + +/** + * A deployment aspect for JAXWS Endpoint API endpoints. + * + * @author Thomas.Diesler(a)jboss.org + * @since 31-Jul-2007 + */ +public class EndpointAPIDeploymentAspect extends DeploymentAspect +{ + @Override + public void create(Deployment dep) + { + dep.setType(DeploymentType.JAXWS_JSE); + + if (dep instanceof ArchiveDeployment) + { + ArchiveDeployment arc = (ArchiveDeployment)dep; + UnifiedVirtualFile rootFile = arc.getRootFile(); + if (rootFile == null) + { + rootFile = new ResourceLoaderAdapter(dep.getInitialClassLoader()); + arc.setRootFile(rootFile); + } + } + + ClassLoader rtcl = dep.getRuntimeClassLoader(); + if (rtcl == null) + dep.setRuntimeClassLoader(dep.getInitialClassLoader()); + + for (Endpoint ep : dep.getService().getEndpoints()) + { + if (ep.getShortName() == null) + { + String name = ep.getTargetBeanName(); + String shortName = name.substring(name.lastIndexOf('.') + 1); + ep.setShortName(shortName); + } + + if (ep.getURLPattern() == null) + { + ep.setURLPattern("/*"); + } + } + } +} \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -73,16 +73,22 @@ @Override public void create(Deployment dep) { - if (dep.getType().toString().endsWith("EJB21")) + String typeStr = dep.getType().toString(); + if (typeStr.endsWith("EJB21")) { URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB21); dep.setProperty("org.jboss.ws.webapp.url", webAppURL); } - else if (dep.getType().toString().endsWith("EJB3")) + else if (typeStr.endsWith("EJB3")) { URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB3); dep.setProperty("org.jboss.ws.webapp.url", webAppURL); } + else + { + URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, null); + dep.setProperty("org.jboss.ws.webapp.url", webAppURL); + } } private URL generatWebDeployment(ArchiveDeployment dep, SecurityHandler securityHandler) @@ -238,7 +244,7 @@ } // Optional login-config/auth-method - if (authMethod != null) + if (authMethod != null && securityHandler != null) { Element loginConfig = webApp.addElement("login-config"); loginConfig.addElement("auth-method").addText(authMethod); @@ -263,7 +269,8 @@ */ Element jbossWeb = document.addElement("jboss-web"); - securityHandler.addSecurityDomain(jbossWeb, dep); + if (securityHandler != null) + securityHandler.addSecurityDomain(jbossWeb, dep); // Get the context root for this deployment String contextRoot = dep.getService().getContextRoot(); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -21,15 +21,11 @@ */ package org.jboss.wsf.spi.deployment; +//$Id: Deployment.java 3992 2007-07-25 12:48:59Z thomas.diesler(a)jboss.com $ + import java.io.IOException; import java.net.URL; -import org.jboss.ws.integration.UnifiedVirtualFile; - - -// $Id: Deployment.java 3992 2007-07-25 12:48:59Z thomas.diesler(a)jboss.com $ - - /** * A general web service deployment dep. * Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -31,7 +31,7 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; import org.jboss.logging.Logger; -import org.jboss.ws.integration.KernelLocator; +import org.jboss.wsf.common.KernelLocator; /** * A deployment aspect that does nothing. Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedVirtualFile.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.spi.deployment; + +// $Id: UnifiedVirtualFile.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ + +import java.io.IOException; +import java.io.Serializable; +import java.net.URL; + +/** + * An adaptor to a VirtualFile from jboss-vfs.jar + * jboss-vfs cannot be used in jboss-4.x because of its dependeny on jboss-common-core.jar + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public interface UnifiedVirtualFile extends Serializable +{ + UnifiedVirtualFile findChild(String child) throws IOException; + + URL toURL(); +} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -34,7 +34,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.integration.ServiceRefMetaData; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.w3c.dom.Element; /** @@ -124,7 +124,8 @@ log.warn("Cannot find port component ref: [sei=" + seiName + ",port=" + portQName + "]"); if (seiName != null) addPortComponentRef(pcref); - else log.warn("Ingore port component ref without SEI declaration: " + pcref); + else + log.warn("Ingore port component ref without SEI declaration: " + pcref); targetPCRef = pcref; } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebservicesFactory.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -30,7 +30,7 @@ import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; 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; Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/DummyServiceRefBinderJAXRPC.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/DummyServiceRefBinderJAXRPC.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/DummyServiceRefBinderJAXRPC.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -21,20 +21,21 @@ */ package org.jboss.wsf.stack.sunri.client; -import org.jboss.ws.integration.ServiceRefBinder; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import java.lang.reflect.AnnotatedElement; import javax.naming.Context; import javax.naming.NamingException; -import java.lang.reflect.AnnotatedElement; +import org.jboss.ws.integration.ServiceRefBinder; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + /** * @author Heiko.Braun(a)jboss.com * Created: Jul 12, 2007 */ public class DummyServiceRefBinderJAXRPC implements ServiceRefBinder { - public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException + public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException { throw new IllegalArgumentException("The Sun-RI stack doesnt support JAX-RPC service-ref deployments"); } Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/log/JBossLogHandler.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -24,7 +24,6 @@ import java.util.Map; import java.util.logging.ErrorManager; import java.util.logging.Handler; -import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.SimpleFormatter; @@ -72,7 +71,7 @@ } String level = levelMap.get(record.getLevel().getName()); - level = level == null ? levelMap.get(record.getLevel().getName().toUpperCase()): level; + level = level == null ? levelMap.get(record.getLevel().getName().toUpperCase()) : level; level = level == null ? defaultLevel : level; if ("info".equalsIgnoreCase(level)) { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -54,8 +54,7 @@ import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; @@ -65,6 +64,7 @@ import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** @@ -208,7 +208,7 @@ if (epMetaData == null) { ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); - ResourceLoaderAdapter vfsRoot = new ResourceLoaderAdapter(); + UnifiedVirtualFile vfsRoot = new ResourceLoaderAdapter(); UnifiedMetaData wsMetaData = new UnifiedMetaData(vfsRoot); wsMetaData.setClassLoader(ctxLoader); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -53,7 +53,7 @@ import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; -import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefBinderJAXRPC.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefBinderJAXRPC.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceRefBinderJAXRPC.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -28,8 +28,8 @@ import org.jboss.logging.Logger; import org.jboss.util.naming.Util; +import org.jboss.ws.integration.ServiceRefBinder; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.ws.integration.ServiceRefBinder; import java.lang.reflect.AnnotatedElement; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceReferenceable.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -37,7 +37,7 @@ import javax.naming.StringRefAddr; import org.jboss.logging.Logger; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.wsf.spi.management.ServerConfig; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -56,8 +56,8 @@ import org.jboss.ws.core.jaxws.client.DispatchImpl; import org.jboss.ws.core.jaxws.client.ServiceObjectFactoryJAXWS; import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilder; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -2,7 +2,7 @@ import org.jboss.kernel.spi.registry.KernelRegistry; import org.jboss.kernel.spi.registry.KernelRegistryEntry; -import org.jboss.ws.integration.KernelLocator; +import org.jboss.wsf.common.KernelLocator; /** * @author Heiko Braun, <heiko(a)openj.net&gt; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -37,7 +37,7 @@ import org.jboss.ws.extensions.policy.annotation.PolicyAttachment; import org.jboss.ws.extensions.policy.deployer.PolicyDeployer; import org.jboss.ws.extensions.policy.deployer.exceptions.UnsupportedPolicy; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ExtensibleMetaData; import org.jboss.ws.metadata.wsdl.WSDLBinding; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -35,7 +35,7 @@ import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.WSSecurityDispatcher; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -38,7 +38,7 @@ import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; import org.jboss.ws.extensions.security.Constants; import org.jboss.ws.extensions.security.WSSecurityDispatcher; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -46,8 +46,8 @@ import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -51,8 +51,8 @@ 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.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/config/JBossWSConfigFactory.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -32,8 +32,8 @@ import org.jboss.ws.metadata.config.binding.OMFactoryJAXWS; import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; import org.jboss.ws.metadata.config.jaxws.ConfigRootJAXWS; -import org.jboss.ws.integration.ResourceLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.common.DOMUtils; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.Unmarshaller; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -57,7 +57,7 @@ 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.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.ws.metadata.config.CommonConfig; import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.config.ConfigurationProvider; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/OperationMetaData.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -38,7 +38,7 @@ import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; -import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.wsf.common.JavaUtils; import org.w3c.dom.Element; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -50,7 +50,7 @@ import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -30,9 +30,9 @@ import java.util.StringTokenizer; import org.jboss.logging.Logger; -import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; /** * The top level meta data. @@ -95,6 +95,11 @@ return classLoader; } + public void setRootFile(UnifiedVirtualFile vfsRoot) + { + this.vfsRoot = vfsRoot; + } + public UnifiedVirtualFile getRootFile() { return vfsRoot; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -30,7 +30,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; /** * Create a WSSecurityConfiguration Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -28,7 +28,7 @@ import java.net.URLClassLoader; import org.jboss.ws.WSException; -import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.wsf.common.ResourceLoaderAdapter; import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.SPIProvider; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ToolsUnifiedMetaDataBuilder.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -37,7 +37,7 @@ import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.Configuration.OperationConfig; -import org.jboss.ws.integration.ResourceLoaderAdapter; +import org.jboss.wsf.common.ResourceLoaderAdapter; /** * Builder class that builds the Tools Meta Data Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-07-31 14:47:35 UTC (rev 4036) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/wspolicy/PolicyMetaDataBuilderTestCase.java 2007-07-31 15:08:50 UTC (rev 4037) @@ -36,8 +36,8 @@ import org.jboss.ws.extensions.policy.deployer.domainAssertion.NopAssertionDeployer; import org.jboss.ws.extensions.policy.metadata.PolicyMetaDataBuilder; import org.jboss.ws.extensions.policy.metadata.PolicyMetaExtension; -import org.jboss.ws.integration.URLLoaderAdapter; -import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.common.URLLoaderAdapter; +import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData;