Author: richard.opalka(a)jboss.com Date: 2009-07-29 07:57:51 -0400 (Wed, 29 Jul 2009) New Revision: 10415 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java Log: [JBWS-2332] svn merge -r 10169:10303 https://svn.jboss.org/repos/jbossws/spi/branches/ropalka Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2009-07-29 11:51:55 UTC (rev 10414) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2009-07-29 11:57:51 UTC (rev 10415) @@ -27,19 +27,17 @@ * It has no notion of J2EE deployment packages. * * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 */ public interface Deployment extends Extensible { public enum DeploymentType { - JAXRPC_CLIENT, JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3, - @Deprecated JAXRPC_EJB3 + JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3, }; public enum DeploymentState { - UNDEFINED, CREATED, STARTED, STOPPED, DESTROYED + UNDEFINED, STARTED, STOPPED }; /** Get the identifier for this deployment */ Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2009-07-29 11:51:55 UTC (rev 10414) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2009-07-29 11:57:51 UTC (rev 10415) @@ -45,7 +45,19 @@ private String provides; private String requires; + private int relativeOrder; + private boolean isLast; + public void setLast(boolean isLast) + { + this.isLast = isLast; + } + + public boolean isLast() + { + return this.isLast; + } + public String getProvides() { return provides; @@ -65,13 +77,15 @@ { this.requires = requires; } - - public void create(Deployment dep) + + public void setRelativeOrder(int relativeOrder) { + this.relativeOrder = relativeOrder; } - - public void destroy(Deployment dep) + + public int getRelativeOrder() { + return this.relativeOrder; } public void start(Deployment dep) @@ -87,7 +101,7 @@ Set<String> condset = new HashSet<String>(); if (provides != null) { - StringTokenizer st = new StringTokenizer(provides, ", "); + StringTokenizer st = new StringTokenizer(provides, ", \r\n\t"); while (st.hasMoreTokens()) condset.add(st.nextToken()); } @@ -99,7 +113,7 @@ Set<String> condset = new HashSet<String>(); if (requires != null) { - StringTokenizer st = new StringTokenizer(requires, ", "); + StringTokenizer st = new StringTokenizer(requires, ", \r\n\t"); while (st.hasMoreTokens()) condset.add(st.nextToken()); } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2009-07-29 11:51:55 UTC (rev 10414) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2009-07-29 11:57:51 UTC (rev 10415) @@ -47,7 +47,7 @@ public enum EndpointState { - UNDEFINED, CREATED, STARTED, STOPPED, DESTROYED + UNDEFINED, STARTED, STOPPED }; /** Get the service this endpoint belongs to */ Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java 2009-07-29 11:51:55 UTC (rev 10414) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/LifecycleHandler.java 2009-07-29 11:57:51 UTC (rev 10415) @@ -29,15 +29,9 @@ */ public interface LifecycleHandler { - /** Handle the create step of an endpoint */ - void create(Endpoint endpoint); - /** Handle the start step of an endpoint */ void start(Endpoint endpoint); /** Handle the stop step of an endpoint */ void stop(Endpoint endpoint); - - /** Handle the destroy step of an endpoint */ - void destroy(Endpoint endpoint); }