Author: richard.opalka(a)jboss.com Date: 2011-05-06 16:09:37 -0400 (Fri, 06 May 2011) New Revision: 14287 Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory Log: [JBWS-3289] refactoring packages: org.jboss.wsf.common -> org.jboss.ws.common; org.jboss.wsf.framework -> org.jboss.ws.common Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -28,8 +28,8 @@ import javax.management.JMException; import javax.management.ObjectName; -import org.jboss.wsf.common.management.AbstractServerConfig; -import org.jboss.wsf.common.management.AbstractServerConfigMBean; +import org.jboss.ws.common.management.AbstractServerConfig; +import org.jboss.ws.common.management.AbstractServerConfigMBean; /** * AS specific ServerConfig. Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -29,7 +29,7 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.webservices.integration.util.ASHelper; -import org.jboss.wsf.common.integration.JMSDeploymentAspect; +import org.jboss.ws.common.integration.JMSDeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -32,7 +32,7 @@ import org.jboss.vfs.VirtualFile; import org.jboss.webservices.integration.injection.VirtualFileAdaptor; import org.jboss.webservices.integration.util.ASHelper; -import org.jboss.wsf.common.ResourceLoaderAdapter; +import org.jboss.ws.common.ResourceLoaderAdapter; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.ArchiveDeployment; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -25,7 +25,7 @@ import org.apache.log4j.Logger; import org.hornetq.jms.client.HornetQDestination; -import org.jboss.wsf.framework.management.DefaultJMSEndpointResolver; +import org.jboss.ws.common.management.DefaultJMSEndpointResolver; /** * A JMS endpoint resolver meant for working with HornetQ destination implementation Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -29,7 +29,7 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.ejb3.ejbref.resolver.spi.EjbReference; import org.jboss.ejb3.ejbref.resolver.spi.EjbReferenceResolver; -import org.jboss.wsf.common.injection.resolvers.AbstractReferenceResolver; +import org.jboss.ws.common.injection.resolvers.AbstractReferenceResolver; /** * EJB reference resolver. @@ -72,7 +72,7 @@ } /** - * @see org.jboss.wsf.common.injection.resolvers.AbstractReferenceResolver#resolveField(java.lang.reflect.Field) + * @see org.jboss.ws.common.injection.resolvers.AbstractReferenceResolver#resolveField(java.lang.reflect.Field) * * @param field to be resolved * @return JNDI name of referenced EJB object @@ -88,7 +88,7 @@ } /** - * @see org.jboss.wsf.common.injection.resolvers.AbstractReferenceResolver#resolveMethod(java.lang.reflect.Method) + * @see org.jboss.ws.common.injection.resolvers.AbstractReferenceResolver#resolveMethod(java.lang.reflect.Method) * * @param method to be resolved * @return JNDI name of referenced EJB object Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -41,8 +41,8 @@ import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData; import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.webservices.integration.util.ASHelper; -import org.jboss.wsf.common.injection.resolvers.ResourceReferenceResolver; -import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.ws.common.injection.resolvers.ResourceReferenceResolver; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -51,7 +51,7 @@ import org.jboss.wsf.spi.metadata.injection.InjectionMetaData; import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData; import org.jboss.wsf.spi.metadata.injection.ReferenceResolver; -import org.jboss.wsf.common.integration.AbstractDeploymentAspect; +import org.jboss.ws.common.integration.AbstractDeploymentAspect; /** * Deployment aspect that builds injection meta data. Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -29,7 +29,7 @@ import org.jboss.switchboard.javaee.jboss.environment.JBossResourceEnvRefType; import org.jboss.switchboard.mc.spi.MCBasedResourceProvider; import org.jboss.switchboard.spi.Resource; -import org.jboss.wsf.common.injection.ThreadLocalAwareWebServiceContext; +import org.jboss.ws.common.injection.ThreadLocalAwareWebServiceContext; /** * WebServiceContext resource provider. Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -37,9 +37,9 @@ import org.jboss.invocation.InvocationType; import org.jboss.invocation.PayloadKey; import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.wsf.common.ObjectNameFactory; -import org.jboss.wsf.common.integration.WSHelper; -import org.jboss.wsf.common.invocation.AbstractInvocationHandler; +import org.jboss.ws.common.ObjectNameFactory; +import org.jboss.ws.common.integration.WSHelper; +import org.jboss.ws.common.invocation.AbstractInvocationHandler; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Deployment; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -34,8 +34,8 @@ import org.jboss.ejb3.EJBContainer; import org.jboss.ejb3.context.CurrentEJBContext; import org.jboss.webservices.integration.util.ASHelper; -import org.jboss.wsf.common.injection.ThreadLocalAwareWebServiceContext; -import org.jboss.wsf.common.invocation.AbstractInvocationHandler; +import org.jboss.ws.common.injection.ThreadLocalAwareWebServiceContext; +import org.jboss.ws.common.invocation.AbstractInvocationHandler; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Endpoint; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -21,8 +21,8 @@ */ package org.jboss.webservices.integration.invocation; -import org.jboss.wsf.common.invocation.InvocationHandlerJAXRPC; -import org.jboss.wsf.common.invocation.InvocationHandlerJAXWS; +import org.jboss.ws.common.invocation.InvocationHandlerJAXRPC; +import org.jboss.ws.common.invocation.InvocationHandlerJAXWS; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.InvocationHandlerFactory; import org.jboss.wsf.spi.invocation.InvocationType; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -21,7 +21,7 @@ */ package org.jboss.webservices.integration.invocation; -import org.jboss.wsf.common.invocation.AbstractInvocationHandlerJSE; +import org.jboss.ws.common.invocation.AbstractInvocationHandlerJSE; /** * Handles invocations on MDB EJB21 endpoints. Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -21,7 +21,7 @@ */ package org.jboss.webservices.integration.invocation; -import org.jboss.wsf.common.invocation.AbstractInvocationHandlerJSE; +import org.jboss.ws.common.invocation.AbstractInvocationHandlerJSE; /** * Handles invocations on MDB EJB3 endpoints. Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -30,7 +30,7 @@ import org.jboss.metadata.ejb.jboss.WebservicesMetaData; import org.jboss.webservices.integration.util.ASHelper; import org.jboss.ws.Constants; -import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -21,11 +21,11 @@ */ package org.jboss.webservices.integration.metadata; -import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; -import org.jboss.wsf.common.integration.AbstractDeploymentAspect; +import org.jboss.ws.common.integration.AbstractDeploymentAspect; /** * An aspect that builds container independent meta data. Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -29,7 +29,7 @@ import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData; import org.jboss.metadata.javaee.spec.PortComponent; -import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -27,7 +27,7 @@ import javax.ejb.ActivationConfigProperty; import javax.ejb.MessageDriven; -import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration; import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -42,8 +42,8 @@ import org.jboss.metadata.web.spec.WebResourceCollectionMetaData; import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData; import org.jboss.webservices.integration.util.ASHelper; -import org.jboss.wsf.common.integration.WSConstants; -import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.ws.common.integration.WSConstants; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -26,9 +26,9 @@ import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.web.WebPermissionMapping; -import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.common.integration.AbstractDeploymentAspect; +import org.jboss.ws.common.integration.AbstractDeploymentAspect; /** * Generates JACC permissions. (This is temporary and really hacky solution). Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -21,7 +21,7 @@ */ package org.jboss.webservices.integration.tomcat; -import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -24,7 +24,7 @@ import org.jboss.metadata.common.ejb.IAssemblyDescriptorMetaData; import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.metadata.javaee.spec.SecurityRolesMetaData; -import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -29,7 +29,7 @@ import org.jboss.metadata.javaee.spec.SecurityRoleMetaData; import org.jboss.metadata.javaee.spec.SecurityRolesMetaData; import org.jboss.ws.api.annotation.WebContext; -import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -21,9 +21,9 @@ */ package org.jboss.webservices.integration.tomcat; -import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.common.integration.AbstractDeploymentAspect; +import org.jboss.ws.common.integration.AbstractDeploymentAspect; /** * A deployment aspect that generates web app meta data for EJB endpoints. Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -34,7 +34,7 @@ import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData; import org.jboss.webservices.integration.util.ASHelper; import org.jboss.webservices.integration.util.WebMetaDataHelper; -import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -29,8 +29,8 @@ import org.jboss.metadata.web.spec.ServletMetaData; import org.jboss.webservices.integration.util.ASHelper; import org.jboss.webservices.integration.util.WebMetaDataHelper; -import org.jboss.wsf.common.integration.WSConstants; -import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.ws.common.integration.WSConstants; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.ServletClassProvider; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -22,7 +22,7 @@ package org.jboss.webservices.integration.tomcat; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.common.integration.AbstractDeploymentAspect; +import org.jboss.ws.common.integration.AbstractDeploymentAspect; /** * Modifies web meta data to configure webservice stack endpoints and properties. Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -23,8 +23,8 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.weld.integration.deployer.DeployersUtils; -import org.jboss.wsf.common.integration.AbstractDeploymentAspect; -import org.jboss.wsf.common.integration.WSHelper; +import org.jboss.ws.common.integration.AbstractDeploymentAspect; +import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java 2011-05-06 20:09:37 UTC (rev 14287) @@ -26,7 +26,7 @@ import org.jboss.weld.integration.injection.NonContextualObjectInjectionHelper; import org.jboss.weld.manager.api.WeldManager; -import org.jboss.wsf.common.invocation.AbstractInvocationHandlerJSE; +import org.jboss.ws.common.invocation.AbstractInvocationHandlerJSE; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.spi.invocation.InvocationHandler; Modified: container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2011-05-06 20:09:37 UTC (rev 14287) @@ -20,7 +20,7 @@ </bean> <!-- Locate the single instance of the MBeanServer --> - <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"> + <bean name="WSMBeanServerLocator" class="org.jboss.ws.common.management.MBeanServerLocator"> <constructor> <parameter> <inject bean="JMXKernel" property="mbeanServer"/> @@ -54,7 +54,7 @@ </bean> <!-- stack agnostic webservices.xml processor --> - <bean name="WSDescriptorProcessor" class="org.jboss.wsf.framework.deployment.jms.WebservicesDescriptorProcessorImpl"> + <bean name="WSDescriptorProcessor" class="org.jboss.ws.common.deployment.jms.WebservicesDescriptorProcessorImpl"> <property name="validating">true</property> <property name="descriptorName">webservices.xml</property> </bean> @@ -102,41 +102,41 @@ <property name="provides">JACCPermisions</property> </bean> - <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> + <bean name="WSContextRootDeploymentAspect" class="org.jboss.ws.common.deployment.BackwardCompatibleContextRootDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">ContextRoot</property> </bean> - <bean name="WSVirtualHostDeploymentAspect" class="org.jboss.wsf.framework.deployment.VirtualHostDeploymentAspect"> + <bean name="WSVirtualHostDeploymentAspect" class="org.jboss.ws.common.deployment.VirtualHostDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">VirtualHosts</property> </bean> - <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointAddressDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointAddress</property> </bean> - <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> + <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointLifecycleDeploymentAspect"> <property name="provides">LifecycleHandler</property> <property name="last">true</property> </bean> - <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect"> + <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointMetricsDeploymentAspect"> <property name="provides">EndpointMetrics</property> </bean> - <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect"> + <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointNameDeploymentAspect"> <property name="requires">URLPattern</property> <property name="provides">EndpointName</property> </bean> - <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect"> + <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointRegistryDeploymentAspect"> <property name="requires">EndpointName, EndpointAddress</property> <property name="provides">RegisteredEndpoint</property> </bean> - <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.URLPatternDeploymentAspect"> + <bean name="WSURLPatternDeploymentAspect" class="org.jboss.ws.common.deployment.URLPatternDeploymentAspect"> <property name="requires">ContextRoot, ContainerMetaData</property> <property name="provides">URLPattern</property> </bean> Modified: container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2011-05-06 20:06:47 UTC (rev 14286) +++ container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2011-05-06 20:09:37 UTC (rev 14287) @@ -1 +1 @@ -org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory \ No newline at end of file +org.jboss.ws.common.deployment.ArchiveDeploymentModelFactory \ No newline at end of file