Author: richard.opalka(a)jboss.com Date: 2009-06-29 04:12:19 -0400 (Mon, 29 Jun 2009) New Revision: 10246 Removed: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java Log: [JBWS-2332][JBWS-2382] refactoring (WIP) Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java 2009-06-26 16:31:41 UTC (rev 10245) +++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/AbstractDeployerHook.java 2009-06-29 08:12:19 UTC (rev 10246) @@ -21,23 +21,24 @@ */ package org.jboss.wsf.container.jboss50.deployer; +import org.jboss.deployers.spi.DeploymentException; import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.logging.Logger; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.*; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; /** * An abstract web service deployer. * * @author Thomas.Diesler(a)jboss.org * @author Heiko.Braun(a)jboss.com - * - * @since 25-Apr-2007 + * @author <a href=&quot;ropalka(a)redhat.com&quot;&gt;Richard Opalka</a> */ public abstract class AbstractDeployerHook implements DeployerHook { - // provide logging + protected final Logger log = Logger.getLogger(getClass()); private DeploymentAspectManager deploymentAspectManager; @@ -61,15 +62,38 @@ return deploymentAspectManager; } - /** Return true if this deployment should be ignored - */ - public boolean ignoreDeployment(DeploymentUnit unit) + public void deploy( final DeploymentUnit unit ) throws DeploymentException { - String name = unit.getName(); - return (name.startsWith("jboss:id=") && name.indexOf("service=jacc") > 0); + if ( this.isWebServiceDeployment( unit ) ) + { + log.debug( "deploy: " + unit.getName() ); + final Deployment dep = this.getDeployment( unit ); + unit.addAttachment( Deployment.class, dep ); + this.getDeploymentAspectManager().deploy( dep ); + } } - /** Get the deployment type this deployer can handle - */ + public void undeploy( final DeploymentUnit unit ) + { + final Deployment dep = this.getDeployment( unit ); + if ( dep != null ) + { + log.debug( "undeploy: " + unit.getName() ); + this.getDeploymentAspectManager().undeploy( dep ); + } + } + + private boolean isWebServiceDeployment( final DeploymentUnit unit ) + { + final DeploymentType deploymentType = unit.getAttachment( DeploymentType.class ); + return this.getDeploymentType().equals( deploymentType ); + } + + private Deployment getDeployment( final DeploymentUnit unit ) + { + return this.isWebServiceDeployment( unit ) ? unit.getAttachment( Deployment.class ) : null; + } + public abstract Deployment.DeploymentType getDeploymentType(); + } Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java 2009-06-26 16:31:41 UTC (rev 10245) +++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/ArchiveDeployerHook.java 2009-06-29 08:12:19 UTC (rev 10246) @@ -1,91 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.container.jboss50.deployer; - -import org.jboss.deployers.spi.DeploymentException; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; - -/** - * An abstract web service deployer. - * - * deploy(unit) - * if(isWebServiceDeployment) - * dep = createDeployment(unit) - * deploy(dep) - * - * undeploy(unit) - * dep = getDeployment(unit) - * undeploy(dep) - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class ArchiveDeployerHook extends AbstractDeployerHook -{ - - public void deploy(DeploymentUnit unit) throws DeploymentException - { - if (ignoreDeployment(unit)) - return; - - if (isWebServiceDeployment(unit)) - { - log.debug("deploy: " + unit.getName()); - Deployment dep = getDeployment(unit); - unit.addAttachment(Deployment.class, dep); - getDeploymentAspectManager().deploy(dep); - } - } - - public void undeploy(DeploymentUnit unit) - { - if (ignoreDeployment(unit)) - return; - - Deployment dep = getDeployment(unit); - if (dep != null) - { - log.debug("undeploy: " + unit.getName()); - getDeploymentAspectManager().undeploy(dep); - } - } - - /** Depending on the type of deployment, this method should return true - * if the deployment contains web service endpoints. - */ - public boolean isWebServiceDeployment(DeploymentUnit unit) - { - final DeploymentType deploymentType = unit.getAttachment( DeploymentType.class ); - return this.getDeploymentType().equals( deploymentType ); - } - - /** Get the Deployment for a given DeploymentUnit - */ - public Deployment getDeployment(DeploymentUnit unit) - { - Deployment dep = unit.getAttachment(Deployment.class); - return (dep != null && dep.getType() == getDeploymentType() ? dep : null); - } - -} Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java 2009-06-26 16:31:41 UTC (rev 10245) +++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookEJB21.java 2009-06-29 08:12:19 UTC (rev 10246) @@ -29,7 +29,7 @@ * @author Thomas.Diesler(a)jboss.org * @author <a href=&quot;ropalka(a)redhat.com&quot;&gt;Richard Opalka</a> */ -public class JAXRPCDeployerHookEJB21 extends ArchiveDeployerHook +public class JAXRPCDeployerHookEJB21 extends AbstractDeployerHook { /** Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java 2009-06-26 16:31:41 UTC (rev 10245) +++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPostJSE.java 2009-06-29 08:12:19 UTC (rev 10246) @@ -29,7 +29,7 @@ * @author Thomas.Diesler(a)jboss.org * @author <a href=&quot;ropalka(a)redhat.com&quot;&gt;Richard Opalka</a> */ -public class JAXRPCDeployerHookPostJSE extends ArchiveDeployerHook +public class JAXRPCDeployerHookPostJSE extends AbstractDeployerHook { /** Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java 2009-06-26 16:31:41 UTC (rev 10245) +++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXRPCDeployerHookPreJSE.java 2009-06-29 08:12:19 UTC (rev 10246) @@ -29,7 +29,7 @@ * @author Thomas.Diesler(a)jboss.org * @author <a href=&quot;ropalka(a)redhat.com&quot;&gt;Richard Opalka</a> */ -public class JAXRPCDeployerHookPreJSE extends ArchiveDeployerHook +public class JAXRPCDeployerHookPreJSE extends AbstractDeployerHook { /** Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java 2009-06-26 16:31:41 UTC (rev 10245) +++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookEJB3.java 2009-06-29 08:12:19 UTC (rev 10246) @@ -29,7 +29,7 @@ * @author Thomas.Diesler(a)jboss.org * @author <a href=&quot;ropalka(a)redhat.com&quot;&gt;Richard Opalka</a> */ -public class JAXWSDeployerHookEJB3 extends ArchiveDeployerHook +public class JAXWSDeployerHookEJB3 extends AbstractDeployerHook { /** Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java 2009-06-26 16:31:41 UTC (rev 10245) +++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPostJSE.java 2009-06-29 08:12:19 UTC (rev 10246) @@ -29,7 +29,7 @@ * @author Heiko.Braun(a)jboss.com * @author <a href=&quot;ropalka(a)redhat.com&quot;&gt;Richard Opalka</a> */ -public class JAXWSDeployerHookPostJSE extends ArchiveDeployerHook +public class JAXWSDeployerHookPostJSE extends AbstractDeployerHook { /** Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java 2009-06-26 16:31:41 UTC (rev 10245) +++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployer/JAXWSDeployerHookPreJSE.java 2009-06-29 08:12:19 UTC (rev 10246) @@ -29,7 +29,7 @@ * @author Thomas.Diesler(a)jboss.org * @author <a href=&quot;ropalka(a)redhat.com&quot;&gt;Richard Opalka</a> */ -public class JAXWSDeployerHookPreJSE extends ArchiveDeployerHook +public class JAXWSDeployerHookPreJSE extends AbstractDeployerHook { /**