Author: richard.opalka(a)jboss.com Date: 2011-08-17 05:11:01 -0400 (Wed, 17 Aug 2011) New Revision: 14887 Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java Removed: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java Modified: container/jboss60/branches/jbossws-jboss610/pom.xml container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java Log: fixing compilation issues Modified: container/jboss60/branches/jbossws-jboss610/pom.xml =================================================================== --- container/jboss60/branches/jbossws-jboss610/pom.xml 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/pom.xml 2011-08-17 09:11:01 UTC (rev 14887) @@ -35,7 +35,7 @@ <jboss.picketbox.version>3.0.0.CR2</jboss.picketbox.version> <jboss.vfs.version>3.0.1.GA</jboss.vfs.version> <jboss.cl.version>2.2.1.GA</jboss.cl.version> - <jboss.weld.version>1.1.2.Final</jboss.weld.version> + <jboss.weld.version>1.1.Beta2</jboss.weld.version> <jboss.hornetq.version>2.2.5.Final</jboss.hornetq.version> <jboss.jaxws.api.version>1.0.0.Final</jboss.jaxws.api.version> </properties> Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java (rev 0) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.webservices.integration; + +import javax.naming.Context; + +/** + * A minimum web service meta data representation that offers a generic + * way to access more fine grained meta data through {@link #getAnnotation(Class)} + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public interface WebServiceDeclaration +{ + /** + * A distinct identifier across deployments.<br> + * In case of EJB3 this would be the <code>ObjectName</code> under which get's registered with the MC. + * @return + */ + String getContainerName(); + + /** + * An identifier within a deployment. + * In case of EJB3 this would be the <code>ejb-name</code>. + * @return a name, that can be used to susequently address the service impl. + */ + String getComponentName(); + + /** + * Web service endpoint implementation class + * @return + */ + String getComponentClassName(); + + /** + * Get a unified meta data view represented by an annotation. + * + * @param t + * @return + */ + <T extends java.lang.annotation.Annotation> T getAnnotation(Class<T> t); +} Added: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java (rev 0) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.webservices.integration; + +import java.util.List; + +/** + * A web service deployment contains {@link WebServiceDeclaration} declarations. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public interface WebServiceDeployment +{ + List<WebServiceDeclaration> getServiceEndpoints(); +} Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/AbstractDescriptorDeployer.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -23,24 +23,17 @@ import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; -import org.jboss.vfs.VFSInputSource; import org.jboss.vfs.VirtualFile; import org.jboss.wsf.spi.metadata.DescriptorParser; -import org.jboss.wsf.spi.metadata.DescriptorProcessor; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.xml.sax.InputSource; /** * Abstract descriptor deployer which deploys only if particular DD processor is available. * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ -abstract class AbstractDescriptorDeployer<P extends DescriptorProcessor<T>, Q extends DescriptorParser<T>, T> extends AbstractVFSParsingDeployer<T> +abstract class AbstractDescriptorDeployer<P extends DescriptorParser<T>, T> extends AbstractVFSParsingDeployer<T> { - private P ddProcessor; - private Q ddParser; + private P ddParser; AbstractDescriptorDeployer(Class<T> output) { @@ -56,35 +49,14 @@ { return this.ddParser.parse(file.toURL()); } - else if (this.ddProcessor != null) - { - InputSource source = new VFSInputSource(file); - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - unmarshaller.setValidation(this.ddProcessor.isValidating()); - ObjectModelFactory factory = this.ddProcessor.getFactory(file.toURL()); - return (T)unmarshaller.unmarshal(source, factory, root); - } return null; } /** - * MC incallback method. It will be invoked each time subclass specific DescriptorProcessor bean will be installed. - */ - @Deprecated - protected void setProcessor(final P ddProcessor) - { - if (this.ddProcessor != null) - throw new IllegalStateException("Only one " + this.ddProcessor.getClass() + " instance can be installed in MC"); - - this.ddProcessor = ddProcessor; - this.setName(this.ddProcessor.getDescriptorName()); - } - - /** * MC incallback method. It will be invoked each time subclass specific DescriptorParser bean will be installed. */ - protected void setParser(final Q ddParser) + protected void setParser(final P ddParser) { if (this.ddParser != null) throw new IllegalStateException("Only one " + this.ddParser.getClass() + " instance can be installed in MC"); Deleted: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/JMSDescriptorDeployer.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -1,63 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.webservices.integration.deployers; - -import org.jboss.wsf.spi.metadata.jms.JMSDescriptorParser; -import org.jboss.wsf.spi.metadata.jms.JMSDescriptorProcessor; -import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData; - -/** - * Stack agnostic JMS descriptor deployer. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public final class JMSDescriptorDeployer extends AbstractDescriptorDeployer<JMSDescriptorProcessor, JMSDescriptorParser, JMSEndpointsMetaData> -{ - /** - * Constructor. - */ - public JMSDescriptorDeployer() - { - super(JMSEndpointsMetaData.class); - } - - /** - * MC incallback method. It will be invoked each time JMSDescriptorProcessor bean will be installed. - * @param processor the processor - */ - @Override - @Deprecated - public void setProcessor(final JMSDescriptorProcessor processor) - { - super.setProcessor(processor); - } - - /** - * MC incallback method. It will be invoked each time JMSDescriptorParser bean will be installed. - * @param parser the parser - */ - @Override - public void setParser(final JMSDescriptorParser parser) - { - super.setParser(parser); - } -} Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -22,7 +22,6 @@ package org.jboss.webservices.integration.deployers; import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorParser; -import org.jboss.wsf.spi.metadata.webservices.WebservicesDescriptorProcessor; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** @@ -30,7 +29,7 @@ * * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ -public final class WSDescriptorDeployer extends AbstractDescriptorDeployer<WebservicesDescriptorProcessor, WebservicesDescriptorParser, WebservicesMetaData> +public final class WSDescriptorDeployer extends AbstractDescriptorDeployer<WebservicesDescriptorParser, WebservicesMetaData> { /** * Constructor. @@ -41,17 +40,6 @@ } /** - * MC incallback method. It will be invoked each time WebservicesDescriptorProcessor bean will be installed. - * @param processor the processor - */ - @Override - @Deprecated - public void setProcessor(final WebservicesDescriptorProcessor processor) - { - super.setProcessor(processor); - } - - /** * MC incallback method. It will be invoked each time WebservicesDescriptorParser bean will be installed. * @param parser the parser */ Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -38,8 +38,8 @@ import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.webservices.integration.util.ASHelper; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; +import org.jboss.webservices.integration.WebServiceDeclaration; +import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -27,8 +27,8 @@ import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.webservices.integration.util.ASHelper; +import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -24,8 +24,8 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; import org.jboss.metadata.ejb.jboss.JBossMetaData; +import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -26,8 +26,8 @@ import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; +import org.jboss.webservices.integration.WebServiceDeclaration; +import org.jboss.webservices.integration.WebServiceDeployment; /** * Creates new JAXWS EJB3 deployment. Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/endpoint/HornetQJMSResolver.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -41,17 +41,17 @@ 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; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; +import org.jboss.webservices.integration.WebServiceDeclaration; +import org.jboss.webservices.integration.WebServiceDeployment; 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-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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. @@ -74,7 +74,7 @@ { return this.target; } - + @Override public Collection<?> getInvocationDependencies() { Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerFactoryImpl.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB21.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerMDB3.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -29,8 +29,8 @@ import org.jboss.metadata.ejb.jboss.JBossMetaData; 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.Constants; +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-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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.ws.common.integration.AbstractDeploymentAspect; 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; /** * An aspect that builds container independent meta data. Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -27,10 +27,10 @@ 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; +import org.jboss.webservices.integration.WebServiceDeclaration; +import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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.ws.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.common.integration.AbstractDeploymentAspect; /** * Generates JACC permissions. (This is temporary and really hacky solution). Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -28,12 +28,12 @@ import org.jboss.ejb3.annotation.SecurityDomain; import org.jboss.metadata.javaee.spec.SecurityRoleMetaData; import org.jboss.metadata.javaee.spec.SecurityRolesMetaData; -import org.jboss.wsf.common.integration.WSHelper; -import org.jboss.wsf.spi.annotation.WebContext; +import org.jboss.ws.common.integration.WSHelper; +import org.jboss.ws.api.annotation.WebContext; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; +import org.jboss.webservices.integration.WebServiceDeclaration; +import org.jboss.webservices.integration.WebServiceDeployment; /** * Creates web app security meta data for EJB 3 deployment. Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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.ws.common.integration.AbstractDeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.common.integration.AbstractDeploymentAspect; /** * A deployment aspect that generates web app meta data for EJB endpoints. Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -34,9 +34,10 @@ 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; +import org.jboss.wsf.spi.deployment.HttpEndpoint; /** * Creator of web app meta data for EJB endpoints. @@ -189,7 +190,7 @@ for (final Endpoint ep : dep.getService().getEndpoints()) { final String endpointName = ep.getShortName(); - final List<String> urlPatterns = WebMetaDataHelper.getUrlPatterns(ep.getURLPattern()); + final List<String> urlPatterns = WebMetaDataHelper.getUrlPatterns(((HttpEndpoint)ep).getURLPattern()); this.log.debug("Servlet name: " + endpointName + ", URL patterns: " + urlPatterns); WebMetaDataHelper.newServletMapping(endpointName, urlPatterns, servletMappings); @@ -245,7 +246,7 @@ final WebResourceCollectionsMetaData webResourceCollections = WebMetaDataHelper .getWebResourceCollections(securityConstraint); final String endpointName = ejbEndpoint.getShortName(); - final String urlPattern = ejbEndpoint.getURLPattern(); + final String urlPattern = ((HttpEndpoint)ejbEndpoint).getURLPattern(); this.log.debug("Creating web resource collection for endpoint: " + endpointName + ", URL pattern: " + urlPattern); WebMetaDataHelper.newWebResourceCollection(endpointName, urlPattern, secureWsdlAccess, Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -29,11 +29,10 @@ 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; /** * The modifier of jboss web meta data. @@ -121,31 +120,13 @@ */ private String getTransportClassName(final Deployment dep) { - String transportClassName = null; - String transportClassProviderName = (String) dep.getProperty(WSConstants.STACK_TRANSPORT_CLASS_PROVIDER); - if (transportClassProviderName != null) - { - try - { - ServletClassProvider scp = (ServletClassProvider)(Class.forName(transportClassProviderName).newInstance()); - transportClassName = scp.getServletClassName(); - } - catch (Exception e) - { - log.warn("Cannot get transport class name from " + WSConstants.STACK_TRANSPORT_CLASS_PROVIDER, e); - } - } + String transportClassName = (String) dep.getProperty(WSConstants.STACK_TRANSPORT_CLASS); if (transportClassName == null) { - transportClassName = (String) dep.getProperty(WSConstants.STACK_TRANSPORT_CLASS); + throw new IllegalStateException("Cannot obtain deployment property:" + WSConstants.STACK_TRANSPORT_CLASS); } - if (transportClassName == null) - { - throw new IllegalStateException("Cannot obtain deployment property : " + WSConstants.STACK_TRANSPORT_CLASS); - } - return transportClassName; } } Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -37,8 +37,8 @@ import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.metadata.web.spec.ServletMetaData; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; +import org.jboss.webservices.integration.WebServiceDeclaration; +import org.jboss.webservices.integration.WebServiceDeployment; /** * JBoss AS integration helper class. Modified: container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java =================================================================== --- container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java 2011-08-17 08:18:10 UTC (rev 14886) +++ container/jboss60/branches/jbossws-jboss610/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java 2011-08-17 09:11:01 UTC (rev 14887) @@ -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;