Author: richard.opalka(a)jboss.com Date: 2009-08-21 01:56:03 -0400 (Fri, 21 Aug 2009) New Revision: 10577 Added: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java Removed: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java Log: ensuring JBossWS class name convention Added: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java (rev 0) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -0,0 +1,57 @@ +package org.jboss.webservices.integration.deployers.deployment; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +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.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; + +/** + * Creates new JAXRPC EJB21 deployment. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +final class DeploymentModelBuilderJAXRPC_EJB21 extends AbstractDeploymentModelBuilder +{ + + /** + * Constructor. + */ + DeploymentModelBuilderJAXRPC_EJB21() + { + super(); + } + + /** + * Creates new JAXRPC EJB21 deployment and registers it with deployment unit. + * + * @param dep webservice deployment + * @param unit deployment unit + */ + @Override + protected void build(final Deployment dep, final DeploymentUnit unit) + { + final JBossMetaData jbmd = this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); + final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); + this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); + + this.log.debug("Creating JAXRPC EJB21 endpoints meta data model"); + for (final WebserviceDescriptionMetaData webserviceDescriptionMD : wsMetaData.getWebserviceDescriptions()) + { + for (final PortComponentMetaData portComponentMD : webserviceDescriptionMD.getPortComponents()) + { + final String ejbName = portComponentMD.getEjbLink(); + this.log.debug("EJB21 name: " + ejbName); + final JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbName); + final String ejbClass = beanMetaData.getEjbClass(); + this.log.debug("EJB21 class: " + ejbClass); + + this.newEndpoint(ejbClass, ejbName, dep); + } + } + } + +} Added: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java (rev 0) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -0,0 +1,56 @@ +package org.jboss.webservices.integration.deployers.deployment; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.metadata.web.jboss.JBossWebMetaData; +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.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; + +/** + * Creates new JAXRPC JSE deployment. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +final class DeploymentModelBuilderJAXRPC_JSE extends AbstractDeploymentModelBuilder +{ + + /** + * Constructor. + */ + DeploymentModelBuilderJAXRPC_JSE() + { + super(); + } + + /** + * Creates new JAXRPC JSE deployment and registers it with deployment unit. + * + * @param dep webservice deployment + * @param unit deployment unit + */ + @Override + protected void build(final Deployment dep, final DeploymentUnit unit) + { + final JBossWebMetaData webMetaData = this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); + final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); + + this.log.debug("Creating JAXRPC JSE endpoints meta data model"); + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + final String servletName = pcmd.getServletLink(); + this.log.debug("JSE name: " + servletName); + final ServletMetaData servletMD = ASHelper.getServletForName(webMetaData, servletName); + final String servletClass = ASHelper.getEndpointName(servletMD); + this.log.debug("JSE class: " + servletClass); + + this.newEndpoint(servletClass, servletName, dep); + } + } + } + +} Added: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java (rev 0) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -0,0 +1,52 @@ +package org.jboss.webservices.integration.deployers.deployment; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.metadata.ejb.jboss.JBossMetaData; +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; + +/** + * Creates new JAXWS EJB3 deployment. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +final class DeploymentModelBuilderJAXWS_EJB3 extends AbstractDeploymentModelBuilder +{ + + /** + * Constructor. + */ + DeploymentModelBuilderJAXWS_EJB3() + { + super(); + } + + /** + * Creates new JAXWS EJB3 deployment and registers it with deployment unit. + * + * @param dep webservice deployment + * @param unit deployment unit + */ + @Override + protected void build(final Deployment dep, final DeploymentUnit unit) + { + this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); + this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); + + this.log.debug("Creating JAXWS EJB3 endpoints meta data model"); + for (final WebServiceDeclaration container : ASHelper.getJaxwsEjbs(unit)) + { + final String ejbName = container.getComponentName(); + this.log.debug("EJB3 name: " + ejbName); + final String ejbClass = container.getComponentClassName(); + this.log.debug("EJB3 class: " + ejbClass); + + final Endpoint ep = this.newEndpoint(ejbClass, ejbName, dep); + ep.setProperty(ASHelper.CONTAINER_NAME, container.getContainerName()); + } + } + +} Added: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java (rev 0) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -0,0 +1,51 @@ +package org.jboss.webservices.integration.deployers.deployment; + +import java.util.List; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.metadata.web.jboss.JBossWebMetaData; +import org.jboss.metadata.web.spec.ServletMetaData; +import org.jboss.webservices.integration.util.ASHelper; +import org.jboss.wsf.spi.deployment.Deployment; + +/** + * Creates new JAXWS JSE deployment. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +final class DeploymentModelBuilderJAXWS_JSE extends AbstractDeploymentModelBuilder +{ + + /** + * Constructor. + */ + DeploymentModelBuilderJAXWS_JSE() + { + super(); + } + + /** + * Creates new JAXWS JSE deployment and registers it with deployment unit. + * + * @param dep webservice deployment + * @param unit deployment unit + */ + @Override + protected void build(final Deployment dep, final DeploymentUnit unit) + { + this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); + + this.log.debug("Creating JAXWS JSE endpoints meta data model"); + final List<ServletMetaData> servlets = ASHelper.getJaxwsServlets(unit); + for (ServletMetaData servlet : servlets) + { + final String servletName = servlet.getName(); + this.log.debug("JSE name: " + servletName); + final String servletClass = ASHelper.getEndpointName(servlet); + this.log.debug("JSE class: " + servletClass); + + this.newEndpoint(servletClass, servletName, dep); + } + } + +} Deleted: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -1,57 +0,0 @@ -package org.jboss.webservices.integration.deployers.deployment; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -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.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; - -/** - * Creates new JAXRPC EJB21 deployment. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -final class JaxrpcEjbDeploymentModelBuilder extends AbstractDeploymentModelBuilder -{ - - /** - * Constructor. - */ - JaxrpcEjbDeploymentModelBuilder() - { - super(); - } - - /** - * Creates new JAXRPC EJB21 deployment and registers it with deployment unit. - * - * @param dep webservice deployment - * @param unit deployment unit - */ - @Override - protected void build(final Deployment dep, final DeploymentUnit unit) - { - final JBossMetaData jbmd = this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); - final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); - this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); - - this.log.debug("Creating JAXRPC EJB21 endpoints meta data model"); - for (final WebserviceDescriptionMetaData webserviceDescriptionMD : wsMetaData.getWebserviceDescriptions()) - { - for (final PortComponentMetaData portComponentMD : webserviceDescriptionMD.getPortComponents()) - { - final String ejbName = portComponentMD.getEjbLink(); - this.log.debug("EJB21 name: " + ejbName); - final JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbName); - final String ejbClass = beanMetaData.getEjbClass(); - this.log.debug("EJB21 class: " + ejbClass); - - this.newEndpoint(ejbClass, ejbName, dep); - } - } - } - -} Deleted: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -1,56 +0,0 @@ -package org.jboss.webservices.integration.deployers.deployment; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.metadata.web.jboss.JBossWebMetaData; -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.metadata.webservices.PortComponentMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; - -/** - * Creates new JAXRPC JSE deployment. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -final class JaxrpcJseDeploymentModelBuilder extends AbstractDeploymentModelBuilder -{ - - /** - * Constructor. - */ - JaxrpcJseDeploymentModelBuilder() - { - super(); - } - - /** - * Creates new JAXRPC JSE deployment and registers it with deployment unit. - * - * @param dep webservice deployment - * @param unit deployment unit - */ - @Override - protected void build(final Deployment dep, final DeploymentUnit unit) - { - final JBossWebMetaData webMetaData = this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); - final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); - - this.log.debug("Creating JAXRPC JSE endpoints meta data model"); - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - final String servletName = pcmd.getServletLink(); - this.log.debug("JSE name: " + servletName); - final ServletMetaData servletMD = ASHelper.getServletForName(webMetaData, servletName); - final String servletClass = ASHelper.getEndpointName(servletMD); - this.log.debug("JSE class: " + servletClass); - - this.newEndpoint(servletClass, servletName, dep); - } - } - } - -} Deleted: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -1,52 +0,0 @@ -package org.jboss.webservices.integration.deployers.deployment; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.metadata.ejb.jboss.JBossMetaData; -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; - -/** - * Creates new JAXWS EJB3 deployment. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -final class JaxwsEjbDeploymentModelBuilder extends AbstractDeploymentModelBuilder -{ - - /** - * Constructor. - */ - JaxwsEjbDeploymentModelBuilder() - { - super(); - } - - /** - * Creates new JAXWS EJB3 deployment and registers it with deployment unit. - * - * @param dep webservice deployment - * @param unit deployment unit - */ - @Override - protected void build(final Deployment dep, final DeploymentUnit unit) - { - this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); - this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); - - this.log.debug("Creating JAXWS EJB3 endpoints meta data model"); - for (final WebServiceDeclaration container : ASHelper.getJaxwsEjbs(unit)) - { - final String ejbName = container.getComponentName(); - this.log.debug("EJB3 name: " + ejbName); - final String ejbClass = container.getComponentClassName(); - this.log.debug("EJB3 class: " + ejbClass); - - final Endpoint ep = this.newEndpoint(ejbClass, ejbName, dep); - ep.setProperty(ASHelper.CONTAINER_NAME, container.getContainerName()); - } - } - -} Deleted: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -1,51 +0,0 @@ -package org.jboss.webservices.integration.deployers.deployment; - -import java.util.List; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.metadata.web.jboss.JBossWebMetaData; -import org.jboss.metadata.web.spec.ServletMetaData; -import org.jboss.webservices.integration.util.ASHelper; -import org.jboss.wsf.spi.deployment.Deployment; - -/** - * Creates new JAXWS JSE deployment. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -final class JaxwsJseDeploymentModelBuilder extends AbstractDeploymentModelBuilder -{ - - /** - * Constructor. - */ - JaxwsJseDeploymentModelBuilder() - { - super(); - } - - /** - * Creates new JAXWS JSE deployment and registers it with deployment unit. - * - * @param dep webservice deployment - * @param unit deployment unit - */ - @Override - protected void build(final Deployment dep, final DeploymentUnit unit) - { - this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); - - this.log.debug("Creating JAXWS JSE endpoints meta data model"); - final List<ServletMetaData> servlets = ASHelper.getJaxwsServlets(unit); - for (ServletMetaData servlet : servlets) - { - final String servletName = servlet.getName(); - this.log.debug("JSE name: " + servletName); - final String servletClass = ASHelper.getEndpointName(servlet); - this.log.debug("JSE class: " + servletClass); - - this.newEndpoint(servletClass, servletName, dep); - } - } - -} Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -44,10 +44,10 @@ static { - WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_JSE, new JaxwsJseDeploymentModelBuilder()); - WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_JSE, new JaxrpcJseDeploymentModelBuilder()); - WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_EJB3, new JaxwsEjbDeploymentModelBuilder()); - WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_EJB21, new JaxrpcEjbDeploymentModelBuilder()); + 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()); } /** Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java (rev 0) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -0,0 +1,57 @@ +package org.jboss.webservices.integration.deployers.deployment; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +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.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; + +/** + * Creates new JAXRPC EJB21 deployment. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +final class DeploymentModelBuilderJAXRPC_EJB21 extends AbstractDeploymentModelBuilder +{ + + /** + * Constructor. + */ + DeploymentModelBuilderJAXRPC_EJB21() + { + super(); + } + + /** + * Creates new JAXRPC EJB21 deployment and registers it with deployment unit. + * + * @param dep webservice deployment + * @param unit deployment unit + */ + @Override + protected void build(final Deployment dep, final DeploymentUnit unit) + { + final JBossMetaData jbmd = this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); + final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); + this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); + + this.log.debug("Creating JAXRPC EJB21 endpoints meta data model"); + for (final WebserviceDescriptionMetaData webserviceDescriptionMD : wsMetaData.getWebserviceDescriptions()) + { + for (final PortComponentMetaData portComponentMD : webserviceDescriptionMD.getPortComponents()) + { + final String ejbName = portComponentMD.getEjbLink(); + this.log.debug("EJB21 name: " + ejbName); + final JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbName); + final String ejbClass = beanMetaData.getEjbClass(); + this.log.debug("EJB21 class: " + ejbClass); + + this.newEndpoint(ejbClass, ejbName, dep); + } + } + } + +} Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java (rev 0) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -0,0 +1,56 @@ +package org.jboss.webservices.integration.deployers.deployment; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.metadata.web.jboss.JBossWebMetaData; +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.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; + +/** + * Creates new JAXRPC JSE deployment. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +final class DeploymentModelBuilderJAXRPC_JSE extends AbstractDeploymentModelBuilder +{ + + /** + * Constructor. + */ + DeploymentModelBuilderJAXRPC_JSE() + { + super(); + } + + /** + * Creates new JAXRPC JSE deployment and registers it with deployment unit. + * + * @param dep webservice deployment + * @param unit deployment unit + */ + @Override + protected void build(final Deployment dep, final DeploymentUnit unit) + { + final JBossWebMetaData webMetaData = this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); + final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); + + this.log.debug("Creating JAXRPC JSE endpoints meta data model"); + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + final String servletName = pcmd.getServletLink(); + this.log.debug("JSE name: " + servletName); + final ServletMetaData servletMD = ASHelper.getServletForName(webMetaData, servletName); + final String servletClass = ASHelper.getEndpointName(servletMD); + this.log.debug("JSE class: " + servletClass); + + this.newEndpoint(servletClass, servletName, dep); + } + } + } + +} Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java (rev 0) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -0,0 +1,52 @@ +package org.jboss.webservices.integration.deployers.deployment; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.metadata.ejb.jboss.JBossMetaData; +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; + +/** + * Creates new JAXWS EJB3 deployment. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +final class DeploymentModelBuilderJAXWS_EJB3 extends AbstractDeploymentModelBuilder +{ + + /** + * Constructor. + */ + DeploymentModelBuilderJAXWS_EJB3() + { + super(); + } + + /** + * Creates new JAXWS EJB3 deployment and registers it with deployment unit. + * + * @param dep webservice deployment + * @param unit deployment unit + */ + @Override + protected void build(final Deployment dep, final DeploymentUnit unit) + { + this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); + this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); + + this.log.debug("Creating JAXWS EJB3 endpoints meta data model"); + for (final WebServiceDeclaration container : ASHelper.getJaxwsEjbs(unit)) + { + final String ejbName = container.getComponentName(); + this.log.debug("EJB3 name: " + ejbName); + final String ejbClass = container.getComponentClassName(); + this.log.debug("EJB3 class: " + ejbClass); + + final Endpoint ep = this.newEndpoint(ejbClass, ejbName, dep); + ep.setProperty(ASHelper.CONTAINER_NAME, container.getContainerName()); + } + } + +} Added: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java (rev 0) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -0,0 +1,51 @@ +package org.jboss.webservices.integration.deployers.deployment; + +import java.util.List; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.metadata.web.jboss.JBossWebMetaData; +import org.jboss.metadata.web.spec.ServletMetaData; +import org.jboss.webservices.integration.util.ASHelper; +import org.jboss.wsf.spi.deployment.Deployment; + +/** + * Creates new JAXWS JSE deployment. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +final class DeploymentModelBuilderJAXWS_JSE extends AbstractDeploymentModelBuilder +{ + + /** + * Constructor. + */ + DeploymentModelBuilderJAXWS_JSE() + { + super(); + } + + /** + * Creates new JAXWS JSE deployment and registers it with deployment unit. + * + * @param dep webservice deployment + * @param unit deployment unit + */ + @Override + protected void build(final Deployment dep, final DeploymentUnit unit) + { + this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); + + this.log.debug("Creating JAXWS JSE endpoints meta data model"); + final List<ServletMetaData> servlets = ASHelper.getJaxwsServlets(unit); + for (ServletMetaData servlet : servlets) + { + final String servletName = servlet.getName(); + this.log.debug("JSE name: " + servletName); + final String servletClass = ASHelper.getEndpointName(servlet); + this.log.debug("JSE class: " + servletClass); + + this.newEndpoint(servletClass, servletName, dep); + } + } + +} Deleted: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -1,57 +0,0 @@ -package org.jboss.webservices.integration.deployers.deployment; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -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.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; - -/** - * Creates new JAXRPC EJB21 deployment. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -final class JaxrpcEjbDeploymentModelBuilder extends AbstractDeploymentModelBuilder -{ - - /** - * Constructor. - */ - JaxrpcEjbDeploymentModelBuilder() - { - super(); - } - - /** - * Creates new JAXRPC EJB21 deployment and registers it with deployment unit. - * - * @param dep webservice deployment - * @param unit deployment unit - */ - @Override - protected void build(final Deployment dep, final DeploymentUnit unit) - { - final JBossMetaData jbmd = this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); - final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); - this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); - - this.log.debug("Creating JAXRPC EJB21 endpoints meta data model"); - for (final WebserviceDescriptionMetaData webserviceDescriptionMD : wsMetaData.getWebserviceDescriptions()) - { - for (final PortComponentMetaData portComponentMD : webserviceDescriptionMD.getPortComponents()) - { - final String ejbName = portComponentMD.getEjbLink(); - this.log.debug("EJB21 name: " + ejbName); - final JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbName); - final String ejbClass = beanMetaData.getEjbClass(); - this.log.debug("EJB21 class: " + ejbClass); - - this.newEndpoint(ejbClass, ejbName, dep); - } - } - } - -} Deleted: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -1,56 +0,0 @@ -package org.jboss.webservices.integration.deployers.deployment; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.metadata.web.jboss.JBossWebMetaData; -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.metadata.webservices.PortComponentMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; - -/** - * Creates new JAXRPC JSE deployment. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -final class JaxrpcJseDeploymentModelBuilder extends AbstractDeploymentModelBuilder -{ - - /** - * Constructor. - */ - JaxrpcJseDeploymentModelBuilder() - { - super(); - } - - /** - * Creates new JAXRPC JSE deployment and registers it with deployment unit. - * - * @param dep webservice deployment - * @param unit deployment unit - */ - @Override - protected void build(final Deployment dep, final DeploymentUnit unit) - { - final JBossWebMetaData webMetaData = this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); - final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); - - this.log.debug("Creating JAXRPC JSE endpoints meta data model"); - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - final String servletName = pcmd.getServletLink(); - this.log.debug("JSE name: " + servletName); - final ServletMetaData servletMD = ASHelper.getServletForName(webMetaData, servletName); - final String servletClass = ASHelper.getEndpointName(servletMD); - this.log.debug("JSE class: " + servletClass); - - this.newEndpoint(servletClass, servletName, dep); - } - } - } - -} Deleted: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -1,52 +0,0 @@ -package org.jboss.webservices.integration.deployers.deployment; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.metadata.ejb.jboss.JBossMetaData; -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; - -/** - * Creates new JAXWS EJB3 deployment. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -final class JaxwsEjbDeploymentModelBuilder extends AbstractDeploymentModelBuilder -{ - - /** - * Constructor. - */ - JaxwsEjbDeploymentModelBuilder() - { - super(); - } - - /** - * Creates new JAXWS EJB3 deployment and registers it with deployment unit. - * - * @param dep webservice deployment - * @param unit deployment unit - */ - @Override - protected void build(final Deployment dep, final DeploymentUnit unit) - { - this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); - this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); - - this.log.debug("Creating JAXWS EJB3 endpoints meta data model"); - for (final WebServiceDeclaration container : ASHelper.getJaxwsEjbs(unit)) - { - final String ejbName = container.getComponentName(); - this.log.debug("EJB3 name: " + ejbName); - final String ejbClass = container.getComponentClassName(); - this.log.debug("EJB3 class: " + ejbClass); - - final Endpoint ep = this.newEndpoint(ejbClass, ejbName, dep); - ep.setProperty(ASHelper.CONTAINER_NAME, container.getContainerName()); - } - } - -} Deleted: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -1,51 +0,0 @@ -package org.jboss.webservices.integration.deployers.deployment; - -import java.util.List; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.metadata.web.jboss.JBossWebMetaData; -import org.jboss.metadata.web.spec.ServletMetaData; -import org.jboss.webservices.integration.util.ASHelper; -import org.jboss.wsf.spi.deployment.Deployment; - -/** - * Creates new JAXWS JSE deployment. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -final class JaxwsJseDeploymentModelBuilder extends AbstractDeploymentModelBuilder -{ - - /** - * Constructor. - */ - JaxwsJseDeploymentModelBuilder() - { - super(); - } - - /** - * Creates new JAXWS JSE deployment and registers it with deployment unit. - * - * @param dep webservice deployment - * @param unit deployment unit - */ - @Override - protected void build(final Deployment dep, final DeploymentUnit unit) - { - this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); - - this.log.debug("Creating JAXWS JSE endpoints meta data model"); - final List<ServletMetaData> servlets = ASHelper.getJaxwsServlets(unit); - for (ServletMetaData servlet : servlets) - { - final String servletName = servlet.getName(); - this.log.debug("JSE name: " + servletName); - final String servletClass = ASHelper.getEndpointName(servlet); - this.log.debug("JSE class: " + servletClass); - - this.newEndpoint(servletClass, servletName, dep); - } - } - -} Modified: container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss501/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -44,10 +44,10 @@ static { - WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_JSE, new JaxwsJseDeploymentModelBuilder()); - WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_JSE, new JaxrpcJseDeploymentModelBuilder()); - WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_EJB3, new JaxwsEjbDeploymentModelBuilder()); - WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_EJB21, new JaxrpcEjbDeploymentModelBuilder()); + 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()); } /** Added: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java =================================================================== --- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java (rev 0) +++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -0,0 +1,57 @@ +package org.jboss.webservices.integration.deployers.deployment; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +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.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; + +/** + * Creates new JAXRPC EJB21 deployment. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +final class DeploymentModelBuilderJAXRPC_EJB21 extends AbstractDeploymentModelBuilder +{ + + /** + * Constructor. + */ + DeploymentModelBuilderJAXRPC_EJB21() + { + super(); + } + + /** + * Creates new JAXRPC EJB21 deployment and registers it with deployment unit. + * + * @param dep webservice deployment + * @param unit deployment unit + */ + @Override + protected void build(final Deployment dep, final DeploymentUnit unit) + { + final JBossMetaData jbmd = this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); + final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); + this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); + + this.log.debug("Creating JAXRPC EJB21 endpoints meta data model"); + for (final WebserviceDescriptionMetaData webserviceDescriptionMD : wsMetaData.getWebserviceDescriptions()) + { + for (final PortComponentMetaData portComponentMD : webserviceDescriptionMD.getPortComponents()) + { + final String ejbName = portComponentMD.getEjbLink(); + this.log.debug("EJB21 name: " + ejbName); + final JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbName); + final String ejbClass = beanMetaData.getEjbClass(); + this.log.debug("EJB21 class: " + ejbClass); + + this.newEndpoint(ejbClass, ejbName, dep); + } + } + } + +} Added: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java (rev 0) +++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -0,0 +1,56 @@ +package org.jboss.webservices.integration.deployers.deployment; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.metadata.web.jboss.JBossWebMetaData; +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.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; + +/** + * Creates new JAXRPC JSE deployment. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +final class DeploymentModelBuilderJAXRPC_JSE extends AbstractDeploymentModelBuilder +{ + + /** + * Constructor. + */ + DeploymentModelBuilderJAXRPC_JSE() + { + super(); + } + + /** + * Creates new JAXRPC JSE deployment and registers it with deployment unit. + * + * @param dep webservice deployment + * @param unit deployment unit + */ + @Override + protected void build(final Deployment dep, final DeploymentUnit unit) + { + final JBossWebMetaData webMetaData = this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); + final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); + + this.log.debug("Creating JAXRPC JSE endpoints meta data model"); + for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) + { + for (PortComponentMetaData pcmd : wsd.getPortComponents()) + { + final String servletName = pcmd.getServletLink(); + this.log.debug("JSE name: " + servletName); + final ServletMetaData servletMD = ASHelper.getServletForName(webMetaData, servletName); + final String servletClass = ASHelper.getEndpointName(servletMD); + this.log.debug("JSE class: " + servletClass); + + this.newEndpoint(servletClass, servletName, dep); + } + } + } + +} Added: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java =================================================================== --- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java (rev 0) +++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -0,0 +1,52 @@ +package org.jboss.webservices.integration.deployers.deployment; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.metadata.ejb.jboss.JBossMetaData; +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; + +/** + * Creates new JAXWS EJB3 deployment. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +final class DeploymentModelBuilderJAXWS_EJB3 extends AbstractDeploymentModelBuilder +{ + + /** + * Constructor. + */ + DeploymentModelBuilderJAXWS_EJB3() + { + super(); + } + + /** + * Creates new JAXWS EJB3 deployment and registers it with deployment unit. + * + * @param dep webservice deployment + * @param unit deployment unit + */ + @Override + protected void build(final Deployment dep, final DeploymentUnit unit) + { + this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); + this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); + + this.log.debug("Creating JAXWS EJB3 endpoints meta data model"); + for (final WebServiceDeclaration container : ASHelper.getJaxwsEjbs(unit)) + { + final String ejbName = container.getComponentName(); + this.log.debug("EJB3 name: " + ejbName); + final String ejbClass = container.getComponentClassName(); + this.log.debug("EJB3 class: " + ejbClass); + + final Endpoint ep = this.newEndpoint(ejbClass, ejbName, dep); + ep.setProperty(ASHelper.CONTAINER_NAME, container.getContainerName()); + } + } + +} Added: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java (rev 0) +++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -0,0 +1,51 @@ +package org.jboss.webservices.integration.deployers.deployment; + +import java.util.List; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.metadata.web.jboss.JBossWebMetaData; +import org.jboss.metadata.web.spec.ServletMetaData; +import org.jboss.webservices.integration.util.ASHelper; +import org.jboss.wsf.spi.deployment.Deployment; + +/** + * Creates new JAXWS JSE deployment. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +final class DeploymentModelBuilderJAXWS_JSE extends AbstractDeploymentModelBuilder +{ + + /** + * Constructor. + */ + DeploymentModelBuilderJAXWS_JSE() + { + super(); + } + + /** + * Creates new JAXWS JSE deployment and registers it with deployment unit. + * + * @param dep webservice deployment + * @param unit deployment unit + */ + @Override + protected void build(final Deployment dep, final DeploymentUnit unit) + { + this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); + + this.log.debug("Creating JAXWS JSE endpoints meta data model"); + final List<ServletMetaData> servlets = ASHelper.getJaxwsServlets(unit); + for (ServletMetaData servlet : servlets) + { + final String servletName = servlet.getName(); + this.log.debug("JSE name: " + servletName); + final String servletClass = ASHelper.getEndpointName(servlet); + this.log.debug("JSE class: " + servletClass); + + this.newEndpoint(servletClass, servletName, dep); + } + } + +} Deleted: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -1,57 +0,0 @@ -package org.jboss.webservices.integration.deployers.deployment; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -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.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; - -/** - * Creates new JAXRPC EJB21 deployment. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -final class JaxrpcEjbDeploymentModelBuilder extends AbstractDeploymentModelBuilder -{ - - /** - * Constructor. - */ - JaxrpcEjbDeploymentModelBuilder() - { - super(); - } - - /** - * Creates new JAXRPC EJB21 deployment and registers it with deployment unit. - * - * @param dep webservice deployment - * @param unit deployment unit - */ - @Override - protected void build(final Deployment dep, final DeploymentUnit unit) - { - final JBossMetaData jbmd = this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); - final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); - this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); - - this.log.debug("Creating JAXRPC EJB21 endpoints meta data model"); - for (final WebserviceDescriptionMetaData webserviceDescriptionMD : wsMetaData.getWebserviceDescriptions()) - { - for (final PortComponentMetaData portComponentMD : webserviceDescriptionMD.getPortComponents()) - { - final String ejbName = portComponentMD.getEjbLink(); - this.log.debug("EJB21 name: " + ejbName); - final JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbName); - final String ejbClass = beanMetaData.getEjbClass(); - this.log.debug("EJB21 class: " + ejbClass); - - this.newEndpoint(ejbClass, ejbName, dep); - } - } - } - -} Deleted: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -1,56 +0,0 @@ -package org.jboss.webservices.integration.deployers.deployment; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.metadata.web.jboss.JBossWebMetaData; -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.metadata.webservices.PortComponentMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; - -/** - * Creates new JAXRPC JSE deployment. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -final class JaxrpcJseDeploymentModelBuilder extends AbstractDeploymentModelBuilder -{ - - /** - * Constructor. - */ - JaxrpcJseDeploymentModelBuilder() - { - super(); - } - - /** - * Creates new JAXRPC JSE deployment and registers it with deployment unit. - * - * @param dep webservice deployment - * @param unit deployment unit - */ - @Override - protected void build(final Deployment dep, final DeploymentUnit unit) - { - final JBossWebMetaData webMetaData = this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); - final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep); - - this.log.debug("Creating JAXRPC JSE endpoints meta data model"); - for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) - { - for (PortComponentMetaData pcmd : wsd.getPortComponents()) - { - final String servletName = pcmd.getServletLink(); - this.log.debug("JSE name: " + servletName); - final ServletMetaData servletMD = ASHelper.getServletForName(webMetaData, servletName); - final String servletClass = ASHelper.getEndpointName(servletMD); - this.log.debug("JSE class: " + servletClass); - - this.newEndpoint(servletClass, servletName, dep); - } - } - } - -} Deleted: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -1,52 +0,0 @@ -package org.jboss.webservices.integration.deployers.deployment; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.metadata.ejb.jboss.JBossMetaData; -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; - -/** - * Creates new JAXWS EJB3 deployment. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -final class JaxwsEjbDeploymentModelBuilder extends AbstractDeploymentModelBuilder -{ - - /** - * Constructor. - */ - JaxwsEjbDeploymentModelBuilder() - { - super(); - } - - /** - * Creates new JAXWS EJB3 deployment and registers it with deployment unit. - * - * @param dep webservice deployment - * @param unit deployment unit - */ - @Override - protected void build(final Deployment dep, final DeploymentUnit unit) - { - this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep); - this.getAndPropagateAttachment(JBossMetaData.class, unit, dep); - - this.log.debug("Creating JAXWS EJB3 endpoints meta data model"); - for (final WebServiceDeclaration container : ASHelper.getJaxwsEjbs(unit)) - { - final String ejbName = container.getComponentName(); - this.log.debug("EJB3 name: " + ejbName); - final String ejbClass = container.getComponentClassName(); - this.log.debug("EJB3 class: " + ejbClass); - - final Endpoint ep = this.newEndpoint(ejbClass, ejbName, dep); - ep.setProperty(ASHelper.CONTAINER_NAME, container.getContainerName()); - } - } - -} Deleted: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -1,51 +0,0 @@ -package org.jboss.webservices.integration.deployers.deployment; - -import java.util.List; - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.metadata.web.jboss.JBossWebMetaData; -import org.jboss.metadata.web.spec.ServletMetaData; -import org.jboss.webservices.integration.util.ASHelper; -import org.jboss.wsf.spi.deployment.Deployment; - -/** - * Creates new JAXWS JSE deployment. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -final class JaxwsJseDeploymentModelBuilder extends AbstractDeploymentModelBuilder -{ - - /** - * Constructor. - */ - JaxwsJseDeploymentModelBuilder() - { - super(); - } - - /** - * Creates new JAXWS JSE deployment and registers it with deployment unit. - * - * @param dep webservice deployment - * @param unit deployment unit - */ - @Override - protected void build(final Deployment dep, final DeploymentUnit unit) - { - this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep); - - this.log.debug("Creating JAXWS JSE endpoints meta data model"); - final List<ServletMetaData> servlets = ASHelper.getJaxwsServlets(unit); - for (ServletMetaData servlet : servlets) - { - final String servletName = servlet.getName(); - this.log.debug("JSE name: " + servletName); - final String servletClass = ASHelper.getEndpointName(servlet); - this.log.debug("JSE class: " + servletClass); - - this.newEndpoint(servletClass, servletName, dep); - } - } - -} Modified: container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java =================================================================== --- container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2009-08-20 09:41:29 UTC (rev 10576) +++ container/jboss50/branches/jbossws-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/WSDeploymentBuilder.java 2009-08-21 05:56:03 UTC (rev 10577) @@ -44,10 +44,10 @@ static { - WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_JSE, new JaxwsJseDeploymentModelBuilder()); - WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_JSE, new JaxrpcJseDeploymentModelBuilder()); - WSDeploymentBuilder.builders.put(DeploymentType.JAXWS_EJB3, new JaxwsEjbDeploymentModelBuilder()); - WSDeploymentBuilder.builders.put(DeploymentType.JAXRPC_EJB21, new JaxrpcEjbDeploymentModelBuilder()); + 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()); } /**