[jbossws-commits] JBossWS SVN: r14958 - in container/jboss60/branches/jbossws-jboss600: src/main/java/org/jboss/webservices/integration/deployers and 4 other directories.

Author: jim.ma Date: 2011-09-08 23:26:32 -0400 (Thu, 08 Sep 2011) New Revision: 14958 Removed: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java Modified: container/jboss60/branches/jbossws-jboss600/ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.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/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.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/util/ASHelper.java container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml Log: [JBWS-3351]:Change AS6 Integraiton layer to build and deploy EJB3 endpoint in a war file Property changes on: container/jboss60/branches/jbossws-jboss600 ___________________________________________________________________ Added: svn:mergeinfo + /container/jboss60/branches/jbossws-jboss600-JBWS-3343:14928-14951 Deleted: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2011-09-09 03:03:15 UTC (rev 14957) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2011-09-09 03:26:32 UTC (rev 14958) @@ -1,67 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, 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.deployers.spi.DeploymentException; -import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployer; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.metadata.web.jboss.JBossWebMetaData; -import org.jboss.webservices.integration.deployers.deployment.WSDeploymentBuilder; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; - -/** - * This deployer initializes JBossWS deployment meta data. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public final class WSDeploymentDeployer extends AbstractRealDeployer -{ - /** - * Constructor. - */ - public WSDeploymentDeployer() - { - super(); - - // inputs - this.addInput(JBossWebMetaData.class); - this.addInput(DeploymentType.class); - - // outputs - this.addOutput(JBossWebMetaData.class); - this.addOutput(Deployment.class); - } - - /** - * Creates new Web Service deployment and registers it with deployment unit. - * - * @param unit deployment unit - * @throws DeploymentException if any error occurs - */ - @Override - protected void internalDeploy(final DeploymentUnit unit) throws DeploymentException - { - this.log.trace("Building JBoss agnostic webservices meta data model"); - WSDeploymentBuilder.getInstance().build(unit); - } -} Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-09-09 03:03:15 UTC (rev 14957) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-09-09 03:26:32 UTC (rev 14958) @@ -26,9 +26,11 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.metadata.web.jboss.JBossWebMetaData; +import org.jboss.webservices.integration.WebServiceDeployment; +import org.jboss.webservices.integration.deployers.deployment.WSDeploymentBuilder; import org.jboss.webservices.integration.util.ASHelper; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.webservices.integration.WebServiceDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointType; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** @@ -51,8 +53,8 @@ this.addInput(WebServiceDeployment.class); // outputs - this.addOutput(DeploymentType.class); this.addOutput(JBossWebMetaData.class); + this.addOutput(Deployment.class); } /** @@ -64,25 +66,26 @@ @Override protected void internalDeploy(final DeploymentUnit unit) throws DeploymentException { + if (this.isJaxwsJseDeployment(unit)) { this.log.debug("Detected JAXWS JSE deployment"); - unit.addAttachment(DeploymentType.class, DeploymentType.JAXWS_JSE); + WSDeploymentBuilder.getInstance().build(unit, EndpointType.JAXWS_JSE); } - else if (this.isJaxwsEjbDeployment(unit)) + if (this.isJaxwsEjbDeployment(unit)) { this.log.debug("Detected JAXWS EJB3 deployment"); - unit.addAttachment(DeploymentType.class, DeploymentType.JAXWS_EJB3); + WSDeploymentBuilder.getInstance().build(unit, EndpointType.JAXWS_EJB3); } - else if (this.isJaxrpcJseDeployment(unit)) + if (this.isJaxrpcJseDeployment(unit) && !isJaxwsJseDeployment(unit) && !isJaxwsEjbDeployment(unit)) { this.log.debug("Detected JAXRPC JSE deployment"); - unit.addAttachment(DeploymentType.class, DeploymentType.JAXRPC_JSE); + WSDeploymentBuilder.getInstance().build(unit, EndpointType.JAXRPC_JSE); } - else if (this.isJaxrpcEjbDeployment(unit)) + if (this.isJaxrpcEjbDeployment(unit) && !isJaxwsJseDeployment(unit) && !isJaxwsEjbDeployment(unit)) { this.log.debug("Detected JAXRPC EJB21 deployment"); - unit.addAttachment(DeploymentType.class, DeploymentType.JAXRPC_EJB21); + WSDeploymentBuilder.getInstance().build(unit, EndpointType.JAXRPC_EJB21); } } 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-09-09 03:03:15 UTC (rev 14957) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-09-09 03:26:32 UTC (rev 14958) @@ -39,9 +39,9 @@ import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointType; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; /** @@ -80,12 +80,26 @@ */ public final void newDeploymentModel(final DeploymentUnit unit) { - final ArchiveDeployment dep = this.newDeployment(unit); + final ArchiveDeployment dep; + if (unit.getAttachment(Deployment.class) != null) + { + dep = (ArchiveDeployment) unit.getAttachment(Deployment.class); + } + else + { + try + { + dep = this.newDeployment(unit); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + dep.addAttachment(DeploymentUnit.class, unit); + unit.addAttachment(Deployment.class, dep); + } this.build(dep, unit); - - dep.addAttachment(DeploymentUnit.class, unit); - unit.addAttachment(Deployment.class, dep); } /** @@ -104,7 +118,7 @@ * @param dep deployment * @return WS endpoint */ - protected final Endpoint newHttpEndpoint(final String endpointClass, final String endpointName, final Deployment dep) + protected final Endpoint newHttpEndpoint(final String endpointClass, final String endpointName, final Deployment dep, final EndpointType endpointType) { if (endpointName == null) { @@ -119,7 +133,7 @@ final Endpoint endpoint = this.deploymentModelFactory.newHttpEndpoint(endpointClass); endpoint.setShortName(endpointName); dep.getService().addEndpoint(endpoint); - + endpoint.setType(endpointType); return endpoint; } @@ -131,7 +145,7 @@ * @param dep deployment * @return WS endpoint */ - protected final Endpoint newJMSEndpoint(final String endpointClass, final String endpointName, final Deployment dep) + protected final Endpoint newJMSEndpoint(final String endpointClass, final String endpointName, final Deployment dep, final EndpointType endpointType) { if (endpointName == null) { @@ -146,6 +160,7 @@ final Endpoint endpoint = this.deploymentModelFactory.newJMSEndpoint(endpointClass); endpoint.setShortName(endpointName); dep.getService().addEndpoint(endpoint); + endpoint.setType(endpointType); return endpoint; } @@ -193,8 +208,6 @@ dep.setRootFile(new ResourceLoaderAdapter(unit.getClassLoader())); } dep.setRuntimeClassLoader(unit.getClassLoader()); - final DeploymentType deploymentType = ASHelper.getRequiredAttachment(unit, DeploymentType.class); - dep.setType(deploymentType); return dep; } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-09-09 03:03:15 UTC (rev 14957) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-09-09 03:26:32 UTC (rev 14958) @@ -25,6 +25,7 @@ import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointType; import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; @@ -69,7 +70,7 @@ final String ejbClass = beanMetaData.getEjbClass(); this.log.debug("EJB21 class: " + ejbClass); - this.newHttpEndpoint(ejbClass, ejbName, dep); + this.newHttpEndpoint(ejbClass, ejbName, dep, EndpointType.JAXRPC_EJB21); } } } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-09-09 03:03:15 UTC (rev 14957) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-09-09 03:26:32 UTC (rev 14958) @@ -26,6 +26,7 @@ import org.jboss.metadata.web.spec.ServletMetaData; import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointType; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; @@ -68,7 +69,7 @@ final String servletClass = ASHelper.getEndpointName(servletMD); this.log.debug("JSE class: " + servletClass); - this.newHttpEndpoint(servletClass, servletName, dep); + this.newHttpEndpoint(servletClass, servletName, dep, EndpointType.JAXRPC_JSE); } } } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-09-09 03:03:15 UTC (rev 14957) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-09-09 03:26:32 UTC (rev 14958) @@ -26,6 +26,7 @@ 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.Endpoint.EndpointType; import org.jboss.webservices.integration.WebServiceDeclaration; import org.jboss.webservices.integration.WebServiceDeployment; @@ -64,7 +65,7 @@ final String ejbClass = container.getComponentClassName(); this.log.debug("EJB3 class: " + ejbClass); - final Endpoint ep = this.newHttpEndpoint(ejbClass, ejbName, dep); + final Endpoint ep = this.newHttpEndpoint(ejbClass, ejbName, dep, EndpointType.JAXWS_EJB3); ep.setProperty(ASHelper.CONTAINER_NAME, container.getContainerName()); } } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java 2011-09-09 03:03:15 UTC (rev 14957) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java 2011-09-09 03:26:32 UTC (rev 14958) @@ -28,6 +28,7 @@ import org.jboss.metadata.web.spec.ServletMetaData; import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointType; import org.jboss.wsf.spi.metadata.jms.JMSEndpointMetaData; import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData; @@ -63,7 +64,8 @@ { endpoint.setName(endpoint.getImplementor()); } - this.newJMSEndpoint(endpoint.getImplementor(), endpoint.getName(), dep); + this.newJMSEndpoint(endpoint.getImplementor(), endpoint.getName(), dep, EndpointType.JAXWS_JMS); + } } } \ No newline at end of file Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2011-09-09 03:03:15 UTC (rev 14957) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2011-09-09 03:26:32 UTC (rev 14958) @@ -28,6 +28,7 @@ import org.jboss.metadata.web.spec.ServletMetaData; import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointType; /** * Creates new JAXWS JSE deployment. @@ -64,7 +65,7 @@ final String servletClass = ASHelper.getEndpointName(servlet); this.log.debug("JSE class: " + servletClass); - this.newHttpEndpoint(servletClass, servletName, dep); + this.newHttpEndpoint(servletClass, servletName, dep, EndpointType.JAXWS_JSE); } } } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2011-09-09 03:03:15 UTC (rev 14957) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2011-09-09 03:26:32 UTC (rev 14958) @@ -25,8 +25,7 @@ import java.util.Map; import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.webservices.integration.util.ASHelper; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointType; /** * JBossWS deployment model builder. @@ -39,14 +38,15 @@ private static final WSDeploymentBuilder SINGLETON = new WSDeploymentBuilder(); /** Builders registry. */ - private static final Map<DeploymentType, DeploymentModelBuilder> builders = new HashMap<DeploymentType, DeploymentModelBuilder>();; + private static final Map<EndpointType, DeploymentModelBuilder> builders = new HashMap<EndpointType, DeploymentModelBuilder>(); static { - WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_JSE, new DeploymentModelBuilderJAXWS_JSE()); - WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_JSE, new DeploymentModelBuilderJAXRPC_JSE()); - WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_EJB3, new DeploymentModelBuilderJAXWS_EJB3()); - WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_EJB21, new DeploymentModelBuilderJAXRPC_EJB21()); + WSDeploymentBuilder.builders.put(EndpointType.JAXWS_JSE, new DeploymentModelBuilderJAXWS_JSE()); + WSDeploymentBuilder.builders.put(EndpointType.JAXWS_JMS, new DeploymentModelBuilderJAXWS_JMS()); + WSDeploymentBuilder.builders.put(EndpointType.JAXRPC_JSE, new DeploymentModelBuilderJAXRPC_JSE()); + WSDeploymentBuilder.builders.put(EndpointType.JAXWS_EJB3, new DeploymentModelBuilderJAXWS_EJB3()); + WSDeploymentBuilder.builders.put(EndpointType.JAXRPC_EJB21, new DeploymentModelBuilderJAXRPC_EJB21()); } /** @@ -72,13 +72,12 @@ * * @param unit deployment unit */ - public void build(final DeploymentUnit unit) + public void build(final DeploymentUnit unit, final EndpointType endpointType) { - final DeploymentType deploymentType = ASHelper.getOptionalAttachment(unit, DeploymentType.class); - if (deploymentType != null) + if (endpointType != null) { - WSDeploymentBuilder.builders.get(deploymentType).newDeploymentModel(unit); + WSDeploymentBuilder.builders.get(endpointType).newDeploymentModel(unit); } } } 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-09-09 03:03:15 UTC (rev 14957) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2011-09-09 03:26:32 UTC (rev 14958) @@ -66,13 +66,13 @@ final JSEArchiveMetaData jseMetaData = this.metaDataBuilderJSE.create(dep); dep.addAttachment(JSEArchiveMetaData.class, jseMetaData); } - else if (WSHelper.isJaxwsEjbDeployment(dep)) + if (WSHelper.isJaxwsEjbDeployment(dep)) { this.log.debug("Creating JBoss agnostic EJB3 meta data for deployment: " + dep.getSimpleName()); final EJBArchiveMetaData ejbMetaData = this.metaDataBuilderEJB3.create(dep); dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData); } - else if (WSHelper.isJaxrpcEjbDeployment(dep)) + if (WSHelper.isJaxrpcEjbDeployment(dep) && !WSHelper.isJaxwsJseDeployment(dep) && !WSHelper.isJaxwsEjbDeployment(dep)) { this.log.debug("Creating JBoss agnostic EJB21 meta data for deployment: " + dep.getSimpleName()); final EJBArchiveMetaData ejbMetaData = this.metaDataBuilderEJB21.create(dep); Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-09-09 03:03:15 UTC (rev 14957) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-09-09 03:26:32 UTC (rev 14958) @@ -38,7 +38,7 @@ import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.metadata.web.spec.ServletMetaData; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.webservices.integration.WebServiceDeclaration; import org.jboss.webservices.integration.WebServiceDeployment; @@ -74,118 +74,12 @@ */ public static boolean isWebServiceDeployment(final DeploymentUnit unit) { - return ASHelper.getOptionalAttachment(unit, DeploymentType.class) != null; + return ASHelper.getOptionalAttachment(unit, Deployment.class) != null; } - /** - * Returns true if unit contains JAXRPC EJB deployment. - * - * @param unit deployment unit - * @return true if JAXRPC EJB deployment, false otherwise - */ - public static boolean isJaxrpcEjbDeployment(final DeploymentUnit unit) - { - final DeploymentType deploymentType = ASHelper.getOptionalAttachment(unit, DeploymentType.class); - return DeploymentType.JAXRPC_EJB21.equals(deploymentType); - } /** - * Returns true if unit contains JAXRPC JSE deployment. - * - * @param unit deployment unit - * @return true if JAXRPC JSE deployment, false otherwise - */ - public static boolean isJaxrpcJseDeployment(final DeploymentUnit unit) - { - final DeploymentType deploymentType = ASHelper.getOptionalAttachment(unit, DeploymentType.class); - - return DeploymentType.JAXRPC_JSE.equals(deploymentType); - } - - /** - * Returns true if unit contains JAXWS EJB deployment. - * - * @param unit deployment unit - * @return true if JAXWS EJB deployment, false otherwise - */ - public static boolean isJaxwsEjbDeployment(final DeploymentUnit unit) - { - final DeploymentType deploymentType = ASHelper.getOptionalAttachment(unit, DeploymentType.class); - - return DeploymentType.JAXWS_EJB3.equals(deploymentType); - } - - /** - * Returns true if unit contains JAXWS JSE deployment. - * - * @param unit deployment unit - * @return true if JAXWS JSE deployment, false otherwise - */ - public static boolean isJaxwsJseDeployment(final DeploymentUnit unit) - { - final DeploymentType deploymentType = ASHelper.getOptionalAttachment(unit, DeploymentType.class); - - return DeploymentType.JAXWS_JSE.equals(deploymentType); - } - - /** - * Returns true if unit contains either JAXWS JSE or JAXRPC JSE deployment. - * - * @param unit deployment unit - * @return true if either JAXWS JSE or JAXRPC JSE deployment, false otherwise. - */ - public static boolean isJseDeployment(final DeploymentUnit unit) - { - final boolean isJaxwsJse = ASHelper.isJaxwsJseDeployment(unit); - final boolean isJaxrpcJse = ASHelper.isJaxrpcJseDeployment(unit); - - return isJaxwsJse || isJaxrpcJse; - } - - /** - * Returns true if unit contains either JAXWS EJB or JAXRPC EJB deployment. - * - * @param unit deployment unit - * @return true if either JAXWS EJB or JAXRPC EJB deployment, false otherwise - */ - public static boolean isEjbDeployment(final DeploymentUnit unit) - { - final boolean isJaxwsEjb = ASHelper.isJaxwsEjbDeployment(unit); - final boolean isJaxrpcEjb = ASHelper.isJaxrpcEjbDeployment(unit); - - return isJaxwsEjb || isJaxrpcEjb; - } - - /** - * Returns true if unit contains either JAXWS EJB or JAXWS JSE deployment. - * - * @param unit deployment unit - * @return true if either JAXWS EJB or JAXWS JSE deployment, false otherwise - */ - public static boolean isJaxwsDeployment(final DeploymentUnit unit) - { - final boolean isJaxwsEjb = ASHelper.isJaxwsEjbDeployment(unit); - final boolean isJaxwsJse = ASHelper.isJaxwsJseDeployment(unit); - - return isJaxwsEjb || isJaxwsJse; - } - - /** - * Returns true if unit contains either JAXRPC EJB or JAXRPC JSE deployment. - * - * @param unit deployment unit - * @return true if either JAXRPC EJB or JAXRPC JSE deployment, false otherwise - */ - public static boolean isJaxrpcDeployment(final DeploymentUnit unit) - { - final boolean isJaxrpcEjb = ASHelper.isJaxrpcEjbDeployment(unit); - final boolean isJaxrpcJse = ASHelper.isJaxrpcJseDeployment(unit); - - return isJaxrpcEjb || isJaxrpcJse; - } - - /** * Gets list of JAXWS servlets meta data. * * @param unit deployment unit 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-09-09 03:03:15 UTC (rev 14957) +++ container/jboss60/branches/jbossws-jboss600/src/main/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2011-09-09 03:26:32 UTC (rev 14958) @@ -62,8 +62,6 @@ <bean name="WSTypeDeployer" class="org.jboss.webservices.integration.deployers.WSTypeDeployer"/> - <bean name="WSDeploymentDeployer" class="org.jboss.webservices.integration.deployers.WSDeploymentDeployer"/> - <!-- WSDeploymentAspectDeployers factory --> <bean name="WSAspectizedDeployersFactory" class="org.jboss.webservices.integration.deployers.WSAspectizedDeployersFactory"> <constructor>