Author: thomas.diesler(a)jboss.com Date: 2007-07-26 06:00:45 -0400 (Thu, 26 Jul 2007) New Revision: 3998 Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicArchiveDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java Log: Add ArchiveDeployment Added: trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (rev 0) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2007-07-26 10:00:45 UTC (rev 3998) @@ -0,0 +1 @@ +org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory \ No newline at end of file Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractDeployerHook.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -75,11 +75,12 @@ return deploymentModelFactory; } - public Deployment createDeployment(ClassLoader initialLoader) + public ArchiveDeployment createDeployment(ClassLoader initialLoader) { try { - return getDeploymentModelFactory().createDeployment(initialLoader); + DeploymentModelFactory factory = getDeploymentModelFactory(); + return (ArchiveDeployment)factory.createDeployment(initialLoader); } catch (Exception ex) { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -27,6 +27,7 @@ import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.BeanMetaData; import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -53,7 +54,7 @@ @Override public Deployment createDeployment(DeploymentInfo di) { - Deployment dep = createDeployment(di.annotationsCl); + ArchiveDeployment dep = createDeployment(di.annotationsCl); dep.setRootFile(new URLLoaderAdapter(di.localUrl)); dep.setRuntimeClassLoader(di.ucl); dep.setType(getDeploymentType()); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -30,6 +30,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -59,7 +60,7 @@ @Override public Deployment createDeployment(DeploymentInfo di) { - Deployment dep = createDeployment(di.annotationsCl); + ArchiveDeployment dep = createDeployment(di.annotationsCl); dep.setRootFile(new URLLoaderAdapter(di.localUrl)); dep.setRuntimeClassLoader(null); dep.setType(getDeploymentType()); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -31,6 +31,7 @@ import org.jboss.ejb3.Ejb3ModuleMBean; import org.jboss.ejb3.stateless.StatelessContainer; import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -54,7 +55,7 @@ @Override public Deployment createDeployment(DeploymentInfo di) { - Deployment dep = createDeployment(di.annotationsCl); + ArchiveDeployment dep = createDeployment(di.annotationsCl); dep.setRootFile(new URLLoaderAdapter(di.localUrl)); dep.setRuntimeClassLoader(di.ucl); dep.setType(getDeploymentType()); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -35,6 +35,7 @@ import org.jboss.deployment.DeploymentInfo; import org.jboss.metadata.WebMetaData; import org.jboss.ws.integration.URLLoaderAdapter; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -58,7 +59,7 @@ @Override public Deployment createDeployment(DeploymentInfo unit) { - Deployment dep = createDeployment(unit.annotationsCl); + ArchiveDeployment dep = createDeployment(unit.annotationsCl); dep.setRootFile(new URLLoaderAdapter(unit.localUrl)); dep.setRuntimeClassLoader(null); dep.setType(getDeploymentType()); Added: trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (rev 0) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2007-07-26 10:00:45 UTC (rev 3998) @@ -0,0 +1 @@ +org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory \ No newline at end of file Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -68,11 +68,12 @@ return deploymentModelFactory; } - public Deployment createDeployment(ClassLoader initialLoader) + public ArchiveDeployment createDeployment(ClassLoader initialLoader) { try { - return getDeploymentModelFactory().createDeployment(initialLoader); + DeploymentModelFactory factory = getDeploymentModelFactory(); + return (ArchiveDeployment)factory.createDeployment(initialLoader); } catch (Exception ex) { Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -27,6 +27,7 @@ import org.jboss.logging.Logger; import org.jboss.metadata.ApplicationMetaData; import org.jboss.metadata.WebMetaData; +import org.jboss.virtual.VirtualFile; import org.jboss.wsf.framework.deployment.WebXMLRewriter; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; @@ -75,10 +76,11 @@ buildDeploymentInfo(dep, udi.getParent(), unit.getParent()); } - udi.setVfRoot(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); + VirtualFile vfsRoot = ((VFSDeploymentUnit)unit).getRoot(); + udi.setVfRoot(new VirtualFileAdaptor(vfsRoot)); udi.setSimpleName(unit.getSimpleName()); - udi.setUrl(udi.getVfRoot().toURL()); + udi.setUrl(vfsRoot.toURL()); buildMetaData(dep, udi, unit); @@ -104,7 +106,7 @@ if (unit.getAttachment(WebMetaData.class) != null) { webMetaDataAdapter.buildUnifiedWebMetaData(dep, udi, unit); - dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, udi.getVfRoot().toURL()); + dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, udi.getUrl()); } else if (unit.getAttachment(Ejb3Deployment.class) != null) { Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -29,6 +29,7 @@ import org.jboss.metadata.BeanMetaData; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; @@ -53,7 +54,7 @@ @Override public Deployment createDeployment(DeploymentUnit unit) { - Deployment dep = createDeployment(unit.getClassLoader()); + ArchiveDeployment dep = createDeployment(unit.getClassLoader()); dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); dep.setRuntimeClassLoader(unit.getClassLoader()); dep.setType(getDeploymentType()); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -29,6 +29,7 @@ import org.jboss.metadata.web.Servlet; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; @@ -56,7 +57,7 @@ @Override public Deployment createDeployment(DeploymentUnit unit) { - Deployment dep = createDeployment(unit.getClassLoader()); + ArchiveDeployment dep = createDeployment(unit.getClassLoader()); dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); dep.setRuntimeClassLoader(null); dep.setType(getDeploymentType()); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -30,6 +30,7 @@ import org.jboss.ejb3.stateless.StatelessContainer; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -55,7 +56,7 @@ @Override public Deployment createDeployment(DeploymentUnit unit) { - Deployment dep = createDeployment(unit.getClassLoader()); + ArchiveDeployment dep = createDeployment(unit.getClassLoader()); dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); dep.setRuntimeClassLoader(unit.getClassLoader()); dep.setType(getDeploymentType()); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -29,6 +29,7 @@ import org.jboss.metadata.web.Servlet; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; @@ -55,7 +56,7 @@ @Override public Deployment createDeployment(DeploymentUnit unit) { - Deployment dep = createDeployment(unit.getClassLoader()); + ArchiveDeployment dep = createDeployment(unit.getClassLoader()); dep.setRootFile(new VirtualFileAdaptor(((VFSDeploymentUnit)unit).getRoot())); dep.setRuntimeClassLoader(null); dep.setType(getDeploymentType()); Added: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory (rev 0) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.deployment.DeploymentModelFactory 2007-07-26 10:00:45 UTC (rev 3998) @@ -0,0 +1 @@ +org.jboss.wsf.framework.deployment.ArchiveDeploymentModelFactory \ No newline at end of file Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -55,22 +55,22 @@ if (dep.getType() == DeploymentType.JAXRPC_JSE) { JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder(); - umd = builder.buildMetaData(dep, (JAXRPCDeployment)udi); + umd = builder.buildMetaData((ArchiveDeployment)dep, (JAXRPCDeployment)udi); } else if (dep.getType() == DeploymentType.JAXRPC_EJB21) { JAXRPCServerMetaDataBuilder builder = new JAXRPCServerMetaDataBuilder(); - umd = builder.buildMetaData(dep, (JAXRPCDeployment)udi); + umd = builder.buildMetaData((ArchiveDeployment)dep, (JAXRPCDeployment)udi); } else if (dep.getType() == DeploymentType.JAXWS_JSE) { JAXWSMetaDataBuilderJSE builder = new JAXWSMetaDataBuilderJSE(); - umd = builder.buildMetaData(dep, udi); + umd = builder.buildMetaData((ArchiveDeployment)dep, udi); } else if (dep.getType() == DeploymentType.JAXWS_EJB3) { JAXWSMetaDataBuilderEJB3 builder = new JAXWSMetaDataBuilderEJB3(); - umd = builder.buildMetaData(dep, udi); + umd = builder.buildMetaData((ArchiveDeployment)dep, udi); } else { Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ArchiveDeploymentModelFactory.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -0,0 +1,49 @@ +/* + * 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 org.jboss.wsf.spi.deployment.DeploymentModelFactory; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Service; +import org.jboss.wsf.spi.deployment.Endpoint; + +/** + * @author Thomas.Diesler(a)jboss.com + * @since 26-Jul-2007 + */ +public class ArchiveDeploymentModelFactory extends DeploymentModelFactory +{ + public Deployment createDeployment(ClassLoader initialLoader) + { + return new BasicArchiveDeployment(initialLoader); + } + + public Service createService() + { + return new BasicService(); + } + + public Endpoint createEndpoint() + { + return new BasicEndpoint(); + } +} Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicArchiveDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicArchiveDeployment.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicArchiveDeployment.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -0,0 +1,55 @@ +/* + * 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; + +//$Id: BasicDeployment.java 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ + +import org.jboss.ws.integration.UnifiedVirtualFile; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; + + +/** + * A general web service deployment that is based on an archive. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public class BasicArchiveDeployment extends BasicDeployment implements ArchiveDeployment +{ + // The root file for this deployment + private UnifiedVirtualFile rootFile; + + BasicArchiveDeployment(ClassLoader classLoader) + { + super(classLoader); + } + + public UnifiedVirtualFile getRootFile() + { + return rootFile; + } + + public void setRootFile(UnifiedVirtualFile rootFile) + { + this.rootFile = rootFile; + } +} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -21,14 +21,12 @@ */ package org.jboss.wsf.framework.deployment; -import org.jboss.ws.integration.UnifiedVirtualFile; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentContext; import org.jboss.wsf.spi.deployment.Service; //$Id$ - /** * A general web service deployment dep. * @@ -41,8 +39,8 @@ { // The context for this deployment dep private DeploymentContext context; - // The root file for this deployment - private UnifiedVirtualFile rootFile; + // The name for this deployment + private String name; // A deployment has one service private Service service; // The type of this deployment @@ -72,36 +70,36 @@ this.context = context; } - public UnifiedVirtualFile getRootFile() + public String getName() { - return rootFile; + return name; } - public void setRootFile(UnifiedVirtualFile rootFile) + public void setName(String name) { - this.rootFile = rootFile; + this.name = name; } public void setInitialClassLoader(ClassLoader classLoader) { this.initialLoader = classLoader; } - + public ClassLoader getInitialClassLoader() { return initialLoader; } - + public void setRuntimeClassLoader(ClassLoader classLoader) { this.runtimeLoader = classLoader; } - + public ClassLoader getRuntimeClassLoader() { return runtimeLoader; } - + public Service getService() { return service; Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -0,0 +1,46 @@ +/* + * 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 org.jboss.ws.integration.UnifiedVirtualFile; + + +// $Id: Deployment.java 3992 2007-07-25 12:48:59Z thomas.diesler(a)jboss.com $ + + +/** + * A general web service deployment dep. + * + * It has no notion of J2EE deployment packages. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public interface ArchiveDeployment extends Deployment +{ + /** Get the root file for this deployment */ + UnifiedVirtualFile getRootFile(); + + /** Set the root file for this deployment */ + void setRootFile(UnifiedVirtualFile root); + +} \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -21,12 +21,8 @@ */ package org.jboss.wsf.spi.deployment; -import org.jboss.ws.integration.UnifiedVirtualFile; - - // $Id$ - /** * A general web service deployment dep. * @@ -47,12 +43,12 @@ UNDEFINED, CREATED, STARTED, STOPPED, DESTROYED }; - /** Get the root file for this deployment */ - UnifiedVirtualFile getRootFile(); - - /** Set the root file for this deployment */ - void setRootFile(UnifiedVirtualFile root); - + /** Get the unique identifier for this deployment */ + String getName(); + + /** Set the unique identifier for this deployment */ + void setName(String name); + /** Get the class loader for this deployment */ ClassLoader getInitialClassLoader(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -42,6 +42,7 @@ import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.JAXRPCDeployment; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; @@ -67,13 +68,13 @@ /** * Build from webservices.xml */ - public UnifiedMetaData buildMetaData(Deployment dep, JAXRPCDeployment udi) + public UnifiedMetaData buildMetaData(ArchiveDeployment dep, JAXRPCDeployment udi) { log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); try { // For every webservice-description build the ServiceMetaData - UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.getVfRoot()); + UnifiedMetaData wsMetaData = new UnifiedMetaData(dep.getRootFile()); wsMetaData.setDeploymentName(udi.getCanonicalName()); wsMetaData.setClassLoader(dep.getInitialClassLoader()); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -31,6 +31,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; @@ -52,12 +53,12 @@ /** Build from webservices.xml */ - public UnifiedMetaData buildMetaData(Deployment dep, UnifiedDeploymentInfo udi) + public UnifiedMetaData buildMetaData(ArchiveDeployment dep, UnifiedDeploymentInfo udi) { - if(log.isDebugEnabled()) log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); + log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); try { - UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.getVfRoot()); + UnifiedMetaData wsMetaData = new UnifiedMetaData(dep.getRootFile()); wsMetaData.setDeploymentName(udi.getCanonicalName()); wsMetaData.setClassLoader(dep.getInitialClassLoader()); @@ -88,7 +89,7 @@ } } - if(log.isDebugEnabled()) log.debug("END buildMetaData: " + wsMetaData); + log.debug("END buildMetaData: " + wsMetaData); return wsMetaData; } catch (RuntimeException rte) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-07-26 09:14:44 UTC (rev 3997) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderJSE.java 2007-07-26 10:00:45 UTC (rev 3998) @@ -25,6 +25,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.metadata.umdm.UnifiedMetaData; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo; @@ -43,12 +44,12 @@ /** Build from annotations */ - public UnifiedMetaData buildMetaData(Deployment dep, UnifiedDeploymentInfo udi) + public UnifiedMetaData buildMetaData(ArchiveDeployment dep, UnifiedDeploymentInfo udi) { log.debug("START buildMetaData: [name=" + udi.getCanonicalName() + "]"); try { - UnifiedMetaData wsMetaData = new UnifiedMetaData(udi.getVfRoot()); + UnifiedMetaData wsMetaData = new UnifiedMetaData(dep.getRootFile()); wsMetaData.setDeploymentName(udi.getCanonicalName()); wsMetaData.setClassLoader(dep.getInitialClassLoader());