May 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r6911 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-06 09:51:21 -0400 (Tue, 06 May 2008) New Revision: 6911 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java Log: Enable testWebServiceEndpointInterfaceTest Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java 2008-05-06 13:50:53 UTC (rev 6910) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java 2008-05-06 13:51:21 UTC (rev 6911) @@ -65,7 +65,7 @@ } } - public void WebServiceEndpointInterfaceTest() throws Exception + public void testWebServiceEndpointInterfaceTest() throws Exception { deploy("jaxws-samples-webservice03-ejb3.jar"); try

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6910 - in stack/metro/trunk/modules: management and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-06 09:50:53 -0400 (Tue, 06 May 2008) New Revision: 6910 Modified: stack/metro/trunk/modules/client/pom.xml stack/metro/trunk/modules/management/pom.xml stack/metro/trunk/modules/server/pom.xml stack/metro/trunk/modules/testsuite/framework-tests/pom.xml stack/metro/trunk/modules/testsuite/metro-tests/pom.xml stack/metro/trunk/modules/testsuite/pom.xml stack/metro/trunk/modules/wsit/pom.xml Log: fixing parent poms relative paths Modified: stack/metro/trunk/modules/client/pom.xml =================================================================== --- stack/metro/trunk/modules/client/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) +++ stack/metro/trunk/modules/client/pom.xml 2008-05-06 13:50:53 UTC (rev 6910) @@ -10,6 +10,7 @@ <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent>  Modified: stack/metro/trunk/modules/management/pom.xml =================================================================== --- stack/metro/trunk/modules/management/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) +++ stack/metro/trunk/modules/management/pom.xml 2008-05-06 13:50:53 UTC (rev 6910) @@ -10,6 +10,7 @@ <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <build> Modified: stack/metro/trunk/modules/server/pom.xml =================================================================== --- stack/metro/trunk/modules/server/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) +++ stack/metro/trunk/modules/server/pom.xml 2008-05-06 13:50:53 UTC (rev 6910) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent>  Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) +++ stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-06 13:50:53 UTC (rev 6910) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro-testsuite</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent>  Modified: stack/metro/trunk/modules/testsuite/metro-tests/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) +++ stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2008-05-06 13:50:53 UTC (rev 6910) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro-testsuite</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent>  Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-05-06 13:50:53 UTC (rev 6910) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent>  Modified: stack/metro/trunk/modules/wsit/pom.xml =================================================================== --- stack/metro/trunk/modules/wsit/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) +++ stack/metro/trunk/modules/wsit/pom.xml 2008-05-06 13:50:53 UTC (rev 6910) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent>

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6909 - in stack/native/trunk/modules: core and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-06 09:50:40 -0400 (Tue, 06 May 2008) New Revision: 6909 Modified: stack/native/trunk/modules/client/pom.xml stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/embedded/pom.xml stack/native/trunk/modules/jaxrpc/pom.xml stack/native/trunk/modules/jaxws-ext/pom.xml stack/native/trunk/modules/jaxws/pom.xml stack/native/trunk/modules/management/pom.xml stack/native/trunk/modules/saaj/pom.xml stack/native/trunk/modules/testsuite/framework-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/pom.xml Log: fixing parent poms relative paths Modified: stack/native/trunk/modules/client/pom.xml =================================================================== --- stack/native/trunk/modules/client/pom.xml 2008-05-06 13:32:27 UTC (rev 6908) +++ stack/native/trunk/modules/client/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent>  Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2008-05-06 13:32:27 UTC (rev 6908) +++ stack/native/trunk/modules/core/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent>  Modified: stack/native/trunk/modules/embedded/pom.xml =================================================================== --- stack/native/trunk/modules/embedded/pom.xml 2008-05-06 13:32:27 UTC (rev 6908) +++ stack/native/trunk/modules/embedded/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent>  Modified: stack/native/trunk/modules/jaxrpc/pom.xml =================================================================== --- stack/native/trunk/modules/jaxrpc/pom.xml 2008-05-06 13:32:27 UTC (rev 6908) +++ stack/native/trunk/modules/jaxrpc/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent>  Modified: stack/native/trunk/modules/jaxws/pom.xml =================================================================== --- stack/native/trunk/modules/jaxws/pom.xml 2008-05-06 13:32:27 UTC (rev 6908) +++ stack/native/trunk/modules/jaxws/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent>  Modified: stack/native/trunk/modules/jaxws-ext/pom.xml =================================================================== --- stack/native/trunk/modules/jaxws-ext/pom.xml 2008-05-06 13:32:27 UTC (rev 6908) +++ stack/native/trunk/modules/jaxws-ext/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent>  Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2008-05-06 13:32:27 UTC (rev 6908) +++ stack/native/trunk/modules/management/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) @@ -10,6 +10,7 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> <build> Modified: stack/native/trunk/modules/saaj/pom.xml =================================================================== --- stack/native/trunk/modules/saaj/pom.xml 2008-05-06 13:32:27 UTC (rev 6908) +++ stack/native/trunk/modules/saaj/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> </project> Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-06 13:32:27 UTC (rev 6908) +++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent>  Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-06 13:32:27 UTC (rev 6908) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent>  Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-05-06 13:32:27 UTC (rev 6908) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-06 13:50:40 UTC (rev 6909) @@ -11,6 +11,7 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> <version>3.0.2-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent>

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6908 - in container/jboss50/branches/jbossws-jboss500: src/main/java/org/jboss/wsf/container/jboss50 and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-05-06 09:32:27 -0400 (Tue, 06 May 2008) New Revision: 6908 Added: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java Modified: container/jboss50/branches/jbossws-jboss500/pom.xml container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookEJB.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPreJSE.java container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml Log: Update to SPI 3.0 Modified: container/jboss50/branches/jbossws-jboss500/pom.xml =================================================================== --- container/jboss50/branches/jbossws-jboss500/pom.xml 2008-05-06 13:08:31 UTC (rev 6907) +++ container/jboss50/branches/jbossws-jboss500/pom.xml 2008-05-06 13:32:27 UTC (rev 6908) @@ -33,6 +33,11 @@ <version>5.0.0.Beta4</version> </dependency> <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-metadata</artifactId> + <version>5.0.0.Beta4</version> + </dependency> + <dependency> <groupId>org.jboss.security</groupId> <artifactId>jboss-security-spi-bare</artifactId> <version></version> @@ -163,7 +168,7 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> </dependency> - +  <dependency> <groupId>org.jboss.jbossas</groupId> @@ -171,6 +176,10 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-metadata</artifactId> + </dependency> + <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-deployers-structure-spi</artifactId> <scope>provided</scope> Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2008-05-06 13:08:31 UTC (rev 6907) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHook.java 2008-05-06 13:32:27 UTC (rev 6908) @@ -25,6 +25,8 @@ import org.jboss.logging.Logger; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.WSFRuntime; +import org.jboss.wsf.spi.WSFRuntimeLocator; import org.jboss.wsf.spi.deployment.*; //$Id$ @@ -43,28 +45,37 @@ // provide logging protected final Logger log = Logger.getLogger(getClass()); - private DeploymentAspectManager deploymentAspectManager; + protected String runtimeName; + private WSFRuntime wsfRuntime; + private DeploymentModelFactory deploymentModelFactory; - protected String deploymentManagerName; + public String getRuntimeName() + { + return runtimeName; + } - /** MC provided property **/ - public void setDeploymentManagerName(String deploymentManagerName) + public void setRuntimeName(String runtimeName) { - this.deploymentManagerName = deploymentManagerName; + this.runtimeName = runtimeName; } - public DeploymentAspectManager getDeploymentAspectManager() + public WSFRuntime getWsfRuntime() { - if(null == deploymentAspectManager) + if(null == wsfRuntime) { SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - deploymentAspectManager = spiProvider.getSPI(DeploymentAspectManagerFactory.class).getDeploymentAspectManager( deploymentManagerName ); + wsfRuntime = spiProvider.getSPI(WSFRuntimeLocator.class).locateRuntime(runtimeName); } - return deploymentAspectManager; + return wsfRuntime; } + public void setWsfRuntime(WSFRuntime wsfRuntime) + { + this.wsfRuntime = wsfRuntime; + } + public DeploymentModelFactory getDeploymentModelFactory() { if(null == deploymentModelFactory) Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookEJB.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookEJB.java 2008-05-06 13:08:31 UTC (rev 6907) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/AbstractDeployerHookEJB.java 2008-05-06 13:32:27 UTC (rev 6908) @@ -21,6 +21,10 @@ */ package org.jboss.wsf.container.jboss50; +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.wsf.spi.deployment.Deployment; + //$Id$ /** @@ -31,4 +35,20 @@ */ public abstract class AbstractDeployerHookEJB extends ArchiveDeployerHook { + public void deploy(DeploymentUnit unit) throws DeploymentException + { + if(!ignoreDeployment(unit) && isWebServiceDeployment(unit)) + { + super.deploy(unit); // Calls create + + Deployment dep = unit.getAttachment(Deployment.class); + if(null==dep || Deployment.DeploymentState.CREATED != dep.getState()) + throw new DeploymentException("Create step failed"); + + // execute the 'start' step + getWsfRuntime().start(dep); + + } + + } } Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2008-05-06 13:08:31 UTC (rev 6907) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2008-05-06 13:32:27 UTC (rev 6908) @@ -91,7 +91,7 @@ dep.addAttachment(DeploymentUnit.class, unit); } - getDeploymentAspectManager().create(dep, null); + getWsfRuntime().create(dep); unit.addAttachment(Deployment.class, dep); } } @@ -105,8 +105,8 @@ if (dep != null) { log.debug("undeploy: " + unit.getName()); - getDeploymentAspectManager().stop(dep, null); - getDeploymentAspectManager().destroy(dep, null); + getWsfRuntime().stop(dep); + getWsfRuntime().destroy(dep); } } Added: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java (rev 0) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java 2008-05-06 13:32:27 UTC (rev 6908) @@ -0,0 +1,172 @@ +/* + * 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; + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.ComposableRuntime; +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.WSFRuntime; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspectManager; +import org.jboss.wsf.spi.invocation.InvocationHandlerFactory; +import org.jboss.wsf.spi.invocation.RequestHandlerFactory; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; +import org.jboss.wsf.spi.transport.TransportManagerFactory; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class BareWSFRuntime implements WSFRuntime, ComposableRuntime +{ + private static final Logger log = Logger.getLogger(BareWSFRuntime.class); + + private String runtimeName; + + private DeploymentAspectManager deploymentManager; + + private EndpointRegistry endpointRegistry; + + private RequestHandlerFactory requestHandlerFactory; + + private InvocationHandlerFactory invocationHandlerFactory; + + private TransportManagerFactory transportManagerFactory; + + boolean initialized; + + public String getRuntimeName() + { + return runtimeName; + } + + public void setRuntimeName(String runtimeName) + { + this.runtimeName = runtimeName; + } + + // --------------------------------------------------------------------------------- + + + public void create(Deployment deployment) + { + init(); + deploymentManager.create(deployment, this); + } + + private void init() + { + if(!initialized) + { + SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + this.endpointRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); + this.requestHandlerFactory = spiProvider.getSPI(RequestHandlerFactory.class); + this.invocationHandlerFactory = spiProvider.getSPI(InvocationHandlerFactory.class); + initialized = true; + } + } + + public void start(Deployment deployment) + { + deploymentManager.start(deployment, this); + } + + public void stop(Deployment deployment) + { + deploymentManager.stop(deployment, this); + } + + public void destroy(Deployment deployment) + { + deploymentManager.destroy(deployment, this); + } + + // --------------------------------------------------------------------------------- + + + public void setTransportManagerFactory(TransportManagerFactory factory) + { + assert factory!=null; + log.info(runtimeName + " -> TransportManagerFactory: " + factory); + this.transportManagerFactory = factory; + } + + public TransportManagerFactory getTransportManagerFactory() + { + return this.transportManagerFactory; + } + + public void setEndpointRegistry(EndpointRegistry endpointRegistry) + { + assert endpointRegistry!=null; + log.info(runtimeName + " -> EndpointRegistry: " + endpointRegistry); + this.endpointRegistry = endpointRegistry; + } + + public EndpointRegistry getEndpointRegistry() + { + return this.endpointRegistry; + } + + public void setDeploymentAspectManager(DeploymentAspectManager deploymentManager) + { + assert deploymentManager!=null; + log.info(runtimeName + " -> DeploymentAspectManager: " + deploymentManager); + this.deploymentManager = deploymentManager; + } + + public DeploymentAspectManager getDeploymentAspectManager() + { + return this.deploymentManager; + } + + public void setRequestHandlerFactory(RequestHandlerFactory factory) + { + assert factory!=null; + log.info(runtimeName + " -> RequestHandlerFactory: "+ factory); + this.requestHandlerFactory = factory; + } + + + public RequestHandlerFactory getRequestHandlerFactory() + { + return this.requestHandlerFactory; + } + + public void setInvocationHandlerFactory(InvocationHandlerFactory factory) + { + assert factory!=null; + log.info(runtimeName + " -> InvocationHandlerFactory: "+ factory); + this.invocationHandlerFactory = factory; + } + + public InvocationHandlerFactory getInvocationHandlerFactory() + { + return this.invocationHandlerFactory; + } + + public String toString() + { + return this.runtimeName+ " :" + super.toString(); + } +} Property changes on: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/BareWSFRuntime.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java 2008-05-06 13:08:31 UTC (rev 6907) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookPreJSE.java 2008-05-06 13:32:27 UTC (rev 6908) @@ -46,6 +46,11 @@ */ public class JAXRPCDeployerHookPreJSE extends AbstractDeployerHookJSE { + public void undeploy(DeploymentUnit unit) + { + // the JAXRPCDeployerHookPostJSE deals with undeployments + } + /** Get the deployemnt type this deployer can handle */ public DeploymentType getDeploymentType() Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java 2008-05-06 13:08:31 UTC (rev 6907) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPostJSE.java 2008-05-06 13:32:27 UTC (rev 6908) @@ -24,6 +24,7 @@ // $Id$ import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.deployers.spi.DeploymentException; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; @@ -33,6 +34,25 @@ */ public class JAXWSDeployerHookPostJSE extends DeployerHookPostJSE { + /** + * Expects the 'create' step to be executed in + * {@link org.jboss.wsf.container.jboss50.JAXWSDeployerHookPreJSE} and + * executes the 'start' step. + * + */ + public void deploy(DeploymentUnit unit) throws DeploymentException + { + if (!ignoreDeployment(unit) && isWebServiceDeployment(unit)) + { + Deployment dep = getDeployment(unit); + if (null == dep || Deployment.DeploymentState.CREATED != dep.getState()) + throw new DeploymentException("Create step failed"); + + // execute the 'start' step + getWsfRuntime().start(dep); + } + } + /** Get the deployment type this deployer can handle */ public Deployment.DeploymentType getDeploymentType() Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPreJSE.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPreJSE.java 2008-05-06 13:08:31 UTC (rev 6907) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookPreJSE.java 2008-05-06 13:32:27 UTC (rev 6908) @@ -47,6 +47,12 @@ */ public class JAXWSDeployerHookPreJSE extends AbstractDeployerHookJSE { + + public void undeploy(DeploymentUnit unit) + { + // the JAXWSDeployerHookPostJSE deals with undeployment + } + /** Get the deployment type this deployer can handle */ public DeploymentType getDeploymentType() Modified: container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2008-05-06 13:08:31 UTC (rev 6907) +++ container/jboss50/branches/jbossws-jboss500/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2008-05-06 13:32:27 UTC (rev 6908) @@ -1,350 +1,367 @@ <?xml version="1.0" encoding="UTF-8"?> <deployment xmlns="urn:jboss:bean-deployer:2.0"> - -  - <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> - <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> - </bean> - -  - <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"> - <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> - </bean> - -  - <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss50.DeploymentAspectHttpServer"/> - -  - -  - <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.WebServiceDeployerEJB"> - <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property> - <property name="relOrderEJB3"><inject bean="Ejb3Deployer" property="relativeOrder"/></property> - <depends>EJB2xDeployer</depends> - <depends>Ejb3Deployer</depends> - </bean> - -  - <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerPreJSE"> - <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> - <depends>WebAppParsingDeployer</depends> - </bean> -  - <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerPostJSE"> - <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> - <depends>WebAppParsingDeployer</depends> - </bean> - -  +  + <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> -  - <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookPreJSE"> - <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> - <install bean="WebServiceDeployerPreJSE" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerPreJSE" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerPreJSE</depends> - </bean> -  - <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookPostJSE"> - <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> - <install bean="WebServiceDeployerPostJSE" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerPostJSE" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerPostJSE</depends> - </bean> +  + <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> - <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookEJB21"> - <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> - <install bean="WebServiceDeployerEJB" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerEJB</depends> - </bean> +  + <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss50.DeploymentAspectHttpServer"/> -  - <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookPreJSE"> - <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> - <install bean="WebServiceDeployerPreJSE" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerPreJSE" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerPreJSE</depends> - </bean> -  - <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookPostJSE"> - <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> - <install bean="WebServiceDeployerPostJSE" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerPostJSE" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerPostJSE</depends> - </bean> +  + <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + </bean> - <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookEJB3"> - <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> - <install bean="WebServiceDeployerEJB" method="addDeployerHook"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook"> - <parameter> - <this/> - </parameter> - </uninstall> - <depends>WebServiceDeployerEJB</depends> - </bean> - -  - <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="name">WSDeploymentAspectManagerPreJSE</property> - </bean> - <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> - <property name="name">WSDeploymentAspectManagerPostJSE</property> - </bean> - <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="name">WSDeploymentAspectManagerEJB</property> - </bean> - <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> - <property name="name">WSDeploymentAspectManagerEndpointAPI</property> - </bean> - -  - <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.ContainerMetaDataDeploymentAspect"> - <property name="provides">ContainerMetaData, VFSRoot</property> - </bean> - - <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">ContextRoot</property> - </bean> - - <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> - <property name="requires">URLPattern</property> - <property name="provides">EndpointAddress</property> - </bean> - - <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> - <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property> - </bean> - - <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">ContainerEndpointHandler</property> - </bean> +  - <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB21"/> - <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB3"/> - <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss50.DefaultWebAppDesciptorModifierImpl"/> - <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss50.WebXMLRewriterImpl"> - <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> - </bean> - -  + Each WebServiceDeployer has a number of DeployerHooks registered with it -  - <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> - <property name="sortAspectsOnCreate">false</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSContainerMetaDataDeploymentAspect"/> - <inject bean="WSContextRootDeploymentAspect"/> - <inject bean="WSEndpointAddressDeploymentAspect"/> - <inject bean="WSEndpointHandlerDeploymentAspect"/> - <inject bean="WSEndpointMetricsDeploymentAspect"/> - <inject bean="WSEndpointNameDeploymentAspect"/> - <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSModifyWebMetaDataDeploymentAspect"/> - <inject bean="WSURLPatternDeploymentAspect"/> - </set> - </property> - </bean> + - WebServiceDeployerEJB + - WSDeployerHook_JAXRPC_EJB21 + - WSDeployerHook_JAXWS_EJB3 -  - <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> - <property name="sortAspectsOnCreate">false</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSEndpointLifecycleDeploymentAspect"/> - <inject bean="WSRuntimeLoaderDeploymentAspect"/> - </set> - </property> - </bean> - - <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> - <property name="sortAspectsOnCreate">false</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSContainerMetaDataDeploymentAspect"/> - <inject bean="WSContextRootDeploymentAspect"/> - <inject bean="WSEndpointAddressDeploymentAspect"/> - <inject bean="WSEndpointHandlerDeploymentAspect"/> - <inject bean="WSEndpointLifecycleDeploymentAspect"/> - <inject bean="WSEndpointMetricsDeploymentAspect"/> - <inject bean="WSEndpointNameDeploymentAspect"/> - <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSURLPatternDeploymentAspect"/> - <inject bean="WSRuntimeLoaderDeploymentAspect"/> - <inject bean="WSWebAppDeploymentAspect"/> - <inject bean="WSWebAppGeneratorDeploymentAspect"/> - </set> - </property> - </bean> - - <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> - <property name="sortAspectsOnCreate">false</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> - <inject bean="WSEndpointAPIDeploymentAspect"/> - <inject bean="WSEndpointAddressDeploymentAspect"/> - <inject bean="WSEndpointHandlerDeploymentAspect"/> - <inject bean="WSEndpointLifecycleDeploymentAspect"/> - <inject bean="WSEndpointMetricsDeploymentAspect"/> - <inject bean="WSEndpointNameDeploymentAspect"/> - <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSWebAppDeploymentAspect"/> - <inject bean="WSWebAppGeneratorDeploymentAspect"/> - </set> - </property> - </bean> - + - WebServiceDeployerPreJSE + - WSDeployerHook_JAXRPC_JSE + - WSDeployerHook_JAXWS_JSE + + Conceptually, each of these hooks implements the following pattern: + + DeployerHook.deploy(unit) + if(isWebServiceDeployment) + Deployment dep = createDeployment(unit) + DeploymentAspectManager.deploy(dep) + + DeployerHook.undeploy(unit) + Deployment dep = getDeployment(unit) + DeploymentAspectManager.undeploy(dep) + + Each deployer hook has a web service DeploymentAspectManager injected into it. + A web service DeploymentAspectManager maintains a list of DeploymentAspects, each of which + handles a single aspect of web service deployment. + + Finally, each Endpoint is registered with the EndpointRegistry. + + ********************************************************************************************************************* + --> + +  + <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.WebServiceDeployerEJB"> + <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property> + <property name="relOrderEJB3"><inject bean="Ejb3Deployer" property="relativeOrder"/></property> + <depends>EJB2xDeployer</depends> + <depends>Ejb3Deployer</depends> + </bean> + +  + <bean name="WebServiceDeployerPreJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerPreJSE"> + <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> + <depends>WebAppParsingDeployer</depends> + </bean> + +  + <bean name="WebServiceDeployerPostJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerPostJSE"> + <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> + <depends>WebAppParsingDeployer</depends> + </bean> + +  + +  + <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookPreJSE"> + <property name="runtimeName">WebserviceJSERuntime</property> + <install bean="WebServiceDeployerPreJSE" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerPreJSE" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerPreJSE</depends> + </bean> +  + <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookPostJSE"> + <property name="runtimeName">WebserviceJSERuntime</property> + <install bean="WebServiceDeployerPostJSE" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerPostJSE" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerPostJSE</depends> + </bean> + + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss50.JAXRPCDeployerHookEJB21"> + <property name="runtimeName">WebserviceEJBRuntime</property> + <install bean="WebServiceDeployerEJB" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerEJB</depends> + </bean> + +  + <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookPreJSE"> + <property name="runtimeName">WebserviceJSERuntime</property> + <install bean="WebServiceDeployerPreJSE" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerPreJSE" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerPreJSE</depends> + </bean> +  + <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookPostJSE"> + <property name="runtimeName">WebserviceJSERuntime</property> + <install bean="WebServiceDeployerPostJSE" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerPostJSE" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerPostJSE</depends> + </bean> + + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss50.JAXWSDeployerHookEJB3"> + <property name="runtimeName">WebserviceEJBRuntime</property> + <install bean="WebServiceDeployerEJB" method="addDeployerHook"> + <parameter> + <this/> + </parameter> + </install> + <uninstall bean="WebServiceDeployerEJB" method="removeDeployerHook"> + <parameter> + <this/> + </parameter> + </uninstall> + <depends>WebServiceDeployerEJB</depends> + </bean> + +  + + <bean name="WebserviceJSERuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime"> + <property name="runtimeName">WebserviceJSERuntime</property> + <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + </bean> + + <bean name="WebserviceEJBRuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime"> + <property name="runtimeName">WebserviceEJBRuntime</property> + <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEJB"/></property> + </bean> + + <bean name="EndpointAPIRuntime" class="org.jboss.wsf.container.jboss50.BareWSFRuntime"> + <property name="runtimeName">EndpointAPIRuntime</property> + <property name="deploymentAspectManager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + </bean> + + +  + + <bean name="WSDeploymentAspectManagerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerJSE</property> + </bean> + <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEJB</property> + </bean> + <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEndpointAPI</property> + </bean> + +  + <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.ContainerMetaDataDeploymentAspect"> + <property name="provides">ContainerMetaData, VFSRoot</property> + </bean> + + <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContextRoot</property> + </bean> + + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointAddress</property> + </bean> + + <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> + <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property> + </bean> + + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContainerEndpointHandler</property> + </bean> + + <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> + <property name="requires">LAST_DEPLOYMENT_ASPECT</property> + </bean> + + <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect"> + <property name="provides">EndpointMetrics</property> + </bean> + + <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointName</property> + </bean> + + <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect"> + <property name="requires">EndpointName</property> + <property name="provides">RegisteredEndpoint</property> + </bean> + + <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeploymentAspect"> + <property name="requires">ContextProperties, StackDescriptor</property> + </bean> + + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss50.RuntimeLoaderDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">RuntimeLoader</property> + </bean> + + <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> + <property name="requires">ContextRoot, ContainerMetaData</property> + <property name="provides">URLPattern</property> + </bean> + + <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss50.WebAppDeploymentAspect"> + <property name="requires">WebMetaData, ContextProperties</property> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + <property name="mainDeployer"><inject bean="MainDeployer"/></property> + </bean> + + <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.container.jboss50.WebApp50GeneratorDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">WebMetaData</property> + <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> + <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> + </bean> + +  + <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB21"/> + <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss50.SecurityHandlerEJB3"/> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss50.DefaultWebAppDesciptorModifierImpl"/> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss50.WebXMLRewriterImpl"> + <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> + </bean> + +  + +  + <bean name="WSDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSModifyWebMetaDataDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + +  + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + </set> + </property> + </bean> + + + <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> + + <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointAPIDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> + </deployment>

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6907 - stack/metro/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-06 09:08:31 -0400 (Tue, 06 May 2008) New Revision: 6907 Modified: stack/metro/trunk/ Log: svn:ignore Property changes on: stack/metro/trunk ___________________________________________________________________ Name: svn:ignore - .settings target ant.properties target.properties + .settings target target.properties profiles.xml

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6906 - in stack/metro/trunk: src/main/scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-06 08:54:33 -0400 (Tue, 06 May 2008) New Revision: 6906 Modified: stack/metro/trunk/build.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: <groupId>org.jboss.ws.metro</groupId> Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-05-06 12:03:01 UTC (rev 6905) +++ stack/metro/trunk/build.xml 2008-05-06 12:54:33 UTC (rev 6906) @@ -120,7 +120,7 @@   - <target name="clean" depends="prepare" description="Cleans up most generated files."> + <target name="clean" description="Cleans up most generated files."> <echo message="*************************************"/> <echo message="* mvn clean *"/> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-06 12:03:01 UTC (rev 6905) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-06 12:54:33 UTC (rev 6906) @@ -51,8 +51,8 @@ <moduleSets> <moduleSet> <includes> - <include>org.jboss.ws:jbossws-metro-client</include> - <include>org.jboss.ws:jbossws-metro-server</include> + <include>org.jboss.ws.metro:jbossws-metro-client</include> + <include>org.jboss.ws.metro:jbossws-metro-server</include> </includes> <binaries> <outputDirectory>lib</outputDirectory> @@ -105,7 +105,7 @@ </moduleSet> <moduleSet> <includes> - <include>org.jboss.ws:jbossws-metro-management</include> + <include>org.jboss.ws.metro:jbossws-metro-management</include> </includes> <binaries> <outputDirectory>lib</outputDirectory>

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6905 - in stack/metro/trunk/modules/testsuite: metro-tests and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-06 08:03:01 -0400 (Tue, 06 May 2008) New Revision: 6905 Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml stack/metro/trunk/modules/testsuite/metro-tests/pom.xml Log: <groupId>org.jboss.ws.metro</groupId> Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-06 12:00:11 UTC (rev 6904) +++ stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-06 12:03:01 UTC (rev 6905) @@ -8,7 +8,7 @@  <parent> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro-testsuite</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> Modified: stack/metro/trunk/modules/testsuite/metro-tests/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2008-05-06 12:00:11 UTC (rev 6904) +++ stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2008-05-06 12:03:01 UTC (rev 6905) @@ -8,7 +8,7 @@  <parent> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro-testsuite</artifactId> <version>3.0.2-SNAPSHOT</version> </parent>

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6904 - in stack/metro/trunk: modules/client and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-06 08:00:11 -0400 (Tue, 06 May 2008) New Revision: 6904 Modified: stack/metro/trunk/modules/client/pom.xml stack/metro/trunk/modules/management/pom.xml stack/metro/trunk/modules/server/pom.xml stack/metro/trunk/modules/testsuite/pom.xml stack/metro/trunk/modules/wsit/pom.xml stack/metro/trunk/pom.xml Log: <groupId>org.jboss.ws.metro</groupId> Modified: stack/metro/trunk/modules/client/pom.xml =================================================================== --- stack/metro/trunk/modules/client/pom.xml 2008-05-06 11:55:41 UTC (rev 6903) +++ stack/metro/trunk/modules/client/pom.xml 2008-05-06 12:00:11 UTC (rev 6904) @@ -7,7 +7,7 @@ <packaging>jar</packaging> <parent> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> Modified: stack/metro/trunk/modules/management/pom.xml =================================================================== --- stack/metro/trunk/modules/management/pom.xml 2008-05-06 11:55:41 UTC (rev 6903) +++ stack/metro/trunk/modules/management/pom.xml 2008-05-06 12:00:11 UTC (rev 6904) @@ -7,7 +7,7 @@ <packaging>war</packaging> <parent> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> Modified: stack/metro/trunk/modules/server/pom.xml =================================================================== --- stack/metro/trunk/modules/server/pom.xml 2008-05-06 11:55:41 UTC (rev 6903) +++ stack/metro/trunk/modules/server/pom.xml 2008-05-06 12:00:11 UTC (rev 6904) @@ -8,7 +8,7 @@  <parent> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-05-06 11:55:41 UTC (rev 6903) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-05-06 12:00:11 UTC (rev 6904) @@ -8,7 +8,7 @@  <parent> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> @@ -54,7 +54,7 @@ <artifactId>servlet-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro-client</artifactId> <version>${version}</version> </dependency> Modified: stack/metro/trunk/modules/wsit/pom.xml =================================================================== --- stack/metro/trunk/modules/wsit/pom.xml 2008-05-06 11:55:41 UTC (rev 6903) +++ stack/metro/trunk/modules/wsit/pom.xml 2008-05-06 12:00:11 UTC (rev 6904) @@ -8,7 +8,7 @@  <parent> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2008-05-06 11:55:41 UTC (rev 6903) +++ stack/metro/trunk/pom.xml 2008-05-06 12:00:11 UTC (rev 6904) @@ -16,7 +16,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack Metro</name> - <groupId>org.jboss.ws</groupId> + <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> <packaging>pom</packaging>

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6903 - in container/jboss50/branches/jbossws-jboss500: src/main/java/org/jboss/wsf/container/jboss50 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-05-06 07:55:41 -0400 (Tue, 06 May 2008) New Revision: 6903 Modified: container/jboss50/branches/jbossws-jboss500/pom.xml container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataDeploymentAspect.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectHttpServer.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java Log: added missing ejb3-core dependency Modified: container/jboss50/branches/jbossws-jboss500/pom.xml =================================================================== --- container/jboss50/branches/jbossws-jboss500/pom.xml 2008-05-06 11:38:47 UTC (rev 6902) +++ container/jboss50/branches/jbossws-jboss500/pom.xml 2008-05-06 11:55:41 UTC (rev 6903) @@ -19,7 +19,7 @@ <properties>  </properties> @@ -27,8 +27,12 @@  <dependencyManagement> <dependencies> - <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <version>5.0.0.Beta4</version> + </dependency> + <dependency> <groupId>org.jboss.security</groupId> <artifactId>jboss-security-spi-bare</artifactId> <version></version> @@ -43,6 +47,7 @@ <artifactId>jboss-common-core</artifactId> <version>2.2.3.GA</version> </dependency> + <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3</artifactId> @@ -54,6 +59,12 @@ <version>0.1.2.Beta1</version> </dependency> <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3-core</artifactId> + <version>0.1.2.Beta1</version> + </dependency> + + <dependency> <groupId>org.jboss.aop</groupId> <artifactId>jboss-aop</artifactId> <version>2.0.0.CR7</version> @@ -78,6 +89,7 @@ <artifactId>jboss-as-j2se</artifactId> <version>5.0.0.Beta4</version> </dependency> + <dependency> <groupId>jboss.jbossws</groupId> <artifactId>jboss-jaxws</artifactId> @@ -88,11 +100,23 @@ <artifactId>jboss-saaj</artifactId> <version>2.0.3.GA</version> </dependency> + <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>3.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <version>3.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> - <version>2.0.3.GA</version> + <version>3.0.2-SNAPSHOT</version> </dependency> + <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-deployers-spi</artifactId> @@ -113,17 +137,8 @@ <artifactId>jboss-deployers-core-spi</artifactId> <version>2.0.0.Beta10</version> </dependency> + <dependency> - <groupId>jboss</groupId> - <artifactId>jbossws-spi</artifactId> - <version>1.0.1.GA</version> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jbossws-common</artifactId> - <version>1.0.3.GA</version> - </dependency> - <dependency> <groupId>org.jboss.security</groupId> <artifactId>jbosssx-client</artifactId> <version>2.0.2.Beta4</version> @@ -133,11 +148,6 @@ <artifactId>jboss-deployers-vfs-spi</artifactId> <version>2.0.0.Beta10</version> </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-server</artifactId> - <version>5.0.0.Beta4</version> - </dependency> </dependencies> </dependencyManagement> @@ -146,11 +156,11 @@  <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common</artifactId> </dependency> <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> </dependency> @@ -168,20 +178,22 @@ <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3</artifactId> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-ejb3-ext-API</artifactId> - <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-ejb3-core</artifactId> + </dependency> + <dependency> <groupId>org.jboss.security</groupId> <artifactId>jbosssx-client</artifactId> </dependency> <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> </dependency> Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2008-05-06 11:38:47 UTC (rev 6902) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2008-05-06 11:55:41 UTC (rev 6903) @@ -31,7 +31,6 @@ import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.deployment.WSFDeploymentException; import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; @@ -92,7 +91,7 @@ dep.addAttachment(DeploymentUnit.class, unit); } - getDeploymentAspectManager().deploy(dep); + getDeploymentAspectManager().create(dep, null); unit.addAttachment(Deployment.class, dep); } } @@ -106,7 +105,8 @@ if (dep != null) { log.debug("undeploy: " + unit.getName()); - getDeploymentAspectManager().undeploy(dep); + getDeploymentAspectManager().stop(dep, null); + getDeploymentAspectManager().destroy(dep, null); } } Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataDeploymentAspect.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataDeploymentAspect.java 2008-05-06 11:38:47 UTC (rev 6902) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataDeploymentAspect.java 2008-05-06 11:55:41 UTC (rev 6903) @@ -26,6 +26,7 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.WSFRuntime; /** * A deployer that builds the UnifiedDeploymentInfo @@ -43,7 +44,7 @@ } @Override - public void create(Deployment dep) + public void create(Deployment dep, WSFRuntime runtime) { DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class); if (unit == null) Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectHttpServer.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectHttpServer.java 2008-05-06 11:38:47 UTC (rev 6902) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/DeploymentAspectHttpServer.java 2008-05-06 11:55:41 UTC (rev 6903) @@ -86,7 +86,8 @@ // Deploy using deployment aspects DeploymentAspectManagerFactory depManagerFactory = spiProvider.getSPI(DeploymentAspectManagerFactory.class); DeploymentAspectManager depManager = depManagerFactory.getDeploymentAspectManager("WSDeploymentAspectManagerEndpointAPI"); - depManager.deploy(dep); + depManager.create(dep, null); + depManager.start(dep, null); } catch (RuntimeException rte) { Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2008-05-06 11:38:47 UTC (rev 6902) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2008-05-06 11:55:41 UTC (rev 6903) @@ -34,6 +34,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.WSFRuntime; /** * A deployer that modifies the web.xml meta data @@ -44,7 +45,7 @@ public class ModifyWebMetaDataDeploymentAspect extends DeploymentAspect { @Override - public void create(Deployment dep) + public void create(Deployment dep, WSFRuntime runtime) { String servletClass = (String)dep.getProperty(WebAppDesciptorModifier.PROPERTY_WEBAPP_SERVLET_CLASS); if (servletClass == null) Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java 2008-05-06 11:38:47 UTC (rev 6902) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java 2008-05-06 11:55:41 UTC (rev 6903) @@ -27,6 +27,7 @@ import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; +import org.jboss.wsf.spi.WSFRuntime; import org.jboss.ejb3.Ejb3Deployment; /** @@ -38,7 +39,7 @@ public class RuntimeLoaderDeploymentAspect extends DeploymentAspect { - public void create(Deployment dep) + public void start(Deployment dep, WSFRuntime runtime) { // JSE endpoints Modified: container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java =================================================================== --- container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2008-05-06 11:38:47 UTC (rev 6902) +++ container/jboss50/branches/jbossws-jboss500/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2008-05-06 11:55:41 UTC (rev 6903) @@ -36,6 +36,7 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.WSFDeploymentException; +import org.jboss.wsf.spi.WSFRuntime; /** * Publish the HTTP service endpoint to Tomcat @@ -62,7 +63,7 @@ this.webXMLRewriter = serviceEndpointPublisher; } - public void create(Deployment dep) + public void create(Deployment dep, WSFRuntime runtime) { URL warURL = (URL)dep.getProperty(WebAppDesciptorModifier.PROPERTY_WEBAPP_URL); if (warURL == null) @@ -88,7 +89,7 @@ } } - public void destroy(Deployment dep) + public void destroy(Deployment dep, WSFRuntime runtime) { URL warURL = (URL)dep.getProperty(WebAppDesciptorModifier.PROPERTY_WEBAPP_URL); if (warURL == null)

16 years, 8 months

1
0
0 / 0

JBossWS SVN: r6902 - stack/metro/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-06 07:38:47 -0400 (Tue, 06 May 2008) New Revision: 6902 Modified: stack/metro/trunk/modules/testsuite/pom.xml Log: Fix hudson profile Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-05-06 11:38:43 UTC (rev 6901) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-05-06 11:38:47 UTC (rev 6902) @@ -151,6 +151,24 @@ <profiles>  + <profile> + <id>hudson</id> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <testFailureIgnore>true</testFailureIgnore> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +  @@ -301,28 +319,6 @@ </properties> </profile> -  - <profile> - <id>test-failure-ignore</id> - <activation> - <property> - <name>hudson</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <testFailureIgnore>true</testFailureIgnore> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project>

16 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2008