Author: richard.opalka(a)jboss.com Date: 2009-06-29 05:41:06 -0400 (Mon, 29 Jun 2009) New Revision: 10247 Removed: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGeneratorDeploymentAspect.java container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml Log: [JBWS-2332][JBWS-2382] refactoring (WIP) Deleted: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java 2009-06-29 08:12:19 UTC (rev 10246) +++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/deployment/tomcat/ModifyWebMetaDataDeploymentAspect.java 2009-06-29 09:41:06 UTC (rev 10247) @@ -1,55 +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.deployment.tomcat; - -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; -import org.jboss.wsf.spi.deployment.WSFDeploymentException; - -/** - * A deployer that modifies the web.xml meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ModifyWebMetaDataDeploymentAspect extends DeploymentAspect -{ - private WebMetaDataModifier webMetaDataModifier; - - public void setWebMetaDataModifier(WebMetaDataModifier webMetaDataModifier) - { - this.webMetaDataModifier = webMetaDataModifier; - } - - @Override - public void create(Deployment dep) - { - try - { - webMetaDataModifier.modifyMetaData(dep); - } - catch (Exception ex) - { - WSFDeploymentException.rethrow(ex); - } - } -} Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGeneratorDeploymentAspect.java =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGeneratorDeploymentAspect.java 2009-06-29 08:12:19 UTC (rev 10246) +++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/wsf/container/jboss50/transport/WebAppGeneratorDeploymentAspect.java 2009-06-29 09:41:06 UTC (rev 10247) @@ -42,6 +42,7 @@ import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.WSFDeploymentException; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; @@ -71,22 +72,18 @@ @Override public void create(Deployment dep) { - String typeStr = dep.getType().toString(); - if (typeStr.endsWith("EJB21")) + final DeploymentType deploymentType = dep.getType(); + + if (DeploymentType.JAXRPC_EJB21.equals(deploymentType)) { JBossWebMetaData jbwmd = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB21); dep.addAttachment(JBossWebMetaData.class, jbwmd); } - else if (typeStr.endsWith("EJB3")) + else if (DeploymentType.JAXWS_EJB3.equals(deploymentType)) { JBossWebMetaData jbwmd = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB3); dep.addAttachment(JBossWebMetaData.class, jbwmd); } - else - { - JBossWebMetaData jbwmd = generatWebDeployment((ArchiveDeployment)dep, null); - dep.addAttachment(JBossWebMetaData.class, jbwmd); - } } protected JBossWebMetaData generatWebDeployment(ArchiveDeployment dep, SecurityHandler securityHandler) Modified: container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml =================================================================== --- container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-29 08:12:19 UTC (rev 10246) +++ container/jboss50/branches/ropalka-jboss510/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-jboss-beans.xml 2009-06-29 09:41:06 UTC (rev 10247) @@ -254,12 +254,6 @@ <property name="provides">RegisteredEndpoint</property> </bean> - <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.tomcat.ModifyWebMetaDataDeploymentAspect"> - <property name="requires">ContextProperties, StackDescriptor</property> - <property name="provides">WebMetaData</property> - <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property> - </bean> - <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss50.deployment.RuntimeLoaderDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">RuntimeLoader</property> @@ -271,7 +265,8 @@ </bean> <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss50.transport.WebAppDeploymentAspect"> - <property name="requires">WebMetaData, ContextProperties</property> + <property name="requires">WebMetaData, ContextProperties, StackDescriptor</property> + <property name="provides">WebMetaData</property> <property name="webMetaDataModifier"><inject bean="WSWebMetaDataModifier"/></property> </bean> @@ -296,6 +291,7 @@ <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSVirtualHostDeploymentAspect"/> <inject bean="WSInjectionMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> @@ -303,8 +299,9 @@ <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSModifyWebMetaDataDeploymentAspect"/> <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> </set> </property> </bean>