Author: heiko.braun(a)jboss.com Date: 2007-07-18 10:07:43 -0400 (Wed, 18 Jul 2007) New Revision: 3933 Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java Removed: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeploymentAspect.java Log: Move WebAppDesciptorModifier to framework package Modified: branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2007-07-18 14:07:42 UTC (rev 3932) +++ branches/hbraun/trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeploymentAspect.java 2007-07-18 14:07:43 UTC (rev 3933) @@ -26,7 +26,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; import org.jboss.wsf.framework.deployment.WebXMLRewriter; /** Modified: branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-18 14:07:42 UTC (rev 3932) +++ branches/hbraun/trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-18 14:07:43 UTC (rev 3933) @@ -35,7 +35,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; /** * A deployer that modifies the web.xml meta data Added: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java (rev 0) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java 2007-07-18 14:07:43 UTC (rev 3933) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.framework.deployment; + +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + +import org.dom4j.Document; +import org.jboss.wsf.spi.deployment.Deployment; + +/** + * Modifies the web app according to the stack requirements. + * + * @author Thomas.Diesler(a)jboss.org + * @since 19-May-2007 + */ +public interface WebAppDesciptorModifier +{ + final String SERVLET_CONTEXT_LISTENER = "ServletContextListener"; + final String CONTEXT_PARAMETER_MAP = "ContextParameterMap"; + final String SERVLET_CLASS = "ServletClass"; + + // The results of the URL rewriting + class RewriteResults + { + // The URL to the rewrittn web.xml + public URL webXML; + // Maps the servlet name to the target bean + public Map<String, String> sepTargetMap = new HashMap<String, String>(); + } + + RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException; +} \ No newline at end of file Property changes on: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifier.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java 2007-07-18 14:07:42 UTC (rev 3932) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java 2007-07-18 14:07:43 UTC (rev 3933) @@ -27,7 +27,6 @@ import org.dom4j.Document; import org.dom4j.Element; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; Modified: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java 2007-07-18 14:07:42 UTC (rev 3932) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriter.java 2007-07-18 14:07:43 UTC (rev 3933) @@ -33,8 +33,7 @@ import org.dom4j.io.OutputFormat; import org.dom4j.io.SAXReader; import org.dom4j.io.XMLWriter; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier.RewriteResults; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier.RewriteResults; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.framework.utils.IOUtils; Deleted: branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java =================================================================== --- branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java 2007-07-18 14:07:42 UTC (rev 3932) +++ branches/hbraun/trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/WebAppDesciptorModifier.java 2007-07-18 14:07:43 UTC (rev 3933) @@ -1,52 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.spi.deployment; - -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import org.dom4j.Document; - -/** - * Modifies the web app according to the stack requirements. - * - * @author Thomas.Diesler(a)jboss.org - * @since 19-May-2007 - */ -public interface WebAppDesciptorModifier -{ - final String SERVLET_CONTEXT_LISTENER = "ServletContextListener"; - final String CONTEXT_PARAMETER_MAP = "ContextParameterMap"; - final String SERVLET_CLASS = "ServletClass"; - - // The results of the URL rewriting - class RewriteResults - { - // The URL to the rewrittn web.xml - public URL webXML; - // Maps the servlet name to the target bean - public Map<String, String> sepTargetMap = new HashMap<String, String>(); - } - - RewriteResults modifyDescriptor(Deployment dep, Document webXml) throws ClassNotFoundException; -} \ No newline at end of file Modified: branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java 2007-07-18 14:07:42 UTC (rev 3932) +++ branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java 2007-07-18 14:07:43 UTC (rev 3933) @@ -32,7 +32,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoint; import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoints; Modified: branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java =================================================================== --- branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java 2007-07-18 14:07:42 UTC (rev 3932) +++ branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java 2007-07-18 14:07:43 UTC (rev 3933) @@ -27,7 +27,7 @@ import org.dom4j.Element; import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoints; /** Modified: branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java =================================================================== --- branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-07-18 14:07:42 UTC (rev 3932) +++ branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-07-18 14:07:43 UTC (rev 3933) @@ -27,7 +27,7 @@ import org.dom4j.Element; import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; /** Modified: branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeploymentAspect.java =================================================================== --- branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeploymentAspect.java 2007-07-18 14:07:42 UTC (rev 3932) +++ branches/hbraun/trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/XFireServicesDeploymentAspect.java 2007-07-18 14:07:43 UTC (rev 3933) @@ -30,7 +30,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.WebAppDesciptorModifier; +import org.jboss.wsf.framework.deployment.WebAppDesciptorModifier; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.stack.xfire.metadata.services.DDBean; import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; @@ -46,7 +46,7 @@ { // provide logging private static final Logger log = Logger.getLogger(XFireServicesDeploymentAspect.class); - + private String serviceFactory; private String invokerEJB3; private String invokerJSE; @@ -72,7 +72,7 @@ DeploymentType depType = dep.getType(); if (depType != DeploymentType.JAXWS_EJB3 && depType != DeploymentType.JAXWS_JSE) throw new IllegalStateException("Unsupported deployment type: " + depType); - + DDBeans dd = new DDBeans(); for (Endpoint ep : dep.getService().getEndpoints()) { @@ -81,14 +81,14 @@ DDService ddser = new DDService(epName, targetBean); ddser.setServiceFactory(serviceFactory); - + if (depType == DeploymentType.JAXWS_EJB3 && invokerEJB3 != null) { String beanName = "InvokerBeanEJB3"; dd.addBean(new DDBean(beanName, invokerEJB3)); ddser.setInvoker("#" + beanName); } - + if (depType == DeploymentType.JAXWS_JSE && invokerJSE != null) { String beanName = "InvokerBeanJSE"; @@ -100,7 +100,7 @@ dd.addService(ddser); } dep.getContext().addAttachment(DDBeans.class, dd); - + String propKey = WebAppDesciptorModifier.CONTEXT_PARAMETER_MAP; Map<String, String> contextParams = (Map<String, String>)dep.getContext().getProperty(propKey); if (contextParams == null)