Author: jim.ma Date: 2011-09-08 22:33:17 -0400 (Thu, 08 Sep 2011) New Revision: 14955 Added: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointTypeFilter.java Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java Log: [JBWS-3346]:Add EndpointType and remove the context root from service 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 2011-09-08 08:14:19 UTC (rev 14954) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2011-09-09 02:33:17 UTC (rev 14955) @@ -21,6 +21,7 @@ */ package org.jboss.wsf.spi.deployment; + /** * A general web service deployment dep. * @@ -30,11 +31,7 @@ */ public interface Deployment extends Extensible { - public enum DeploymentType - { - JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3, @Deprecated JAXWS_JMS; - }; - + public enum DeploymentState { UNDEFINED, STARTED, STOPPED @@ -58,12 +55,7 @@ /** Set the runtime class loader for this deployment */ void setRuntimeClassLoader(ClassLoader loader); - /** Get the deployment type */ - DeploymentType getType(); - /** Set the deployment type */ - void setType(DeploymentType type); - /** Get the current deployment state */ DeploymentState getState(); @@ -75,4 +67,4 @@ /** Set the service associated with this deployment */ void setService(Service service); -} +} \ No newline at end of file Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java 2011-09-08 08:14:19 UTC (rev 14954) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java 2011-09-09 02:33:17 UTC (rev 14955) @@ -31,7 +31,7 @@ */ public abstract class DeploymentAspectManagerFactory implements SPIView { - public abstract DeploymentAspectManager getDeploymentAspectManager(Deployment.DeploymentType deploymentType); + //public abstract DeploymentAspectManager getDeploymentAspectManager(Deployment.DeploymentType deploymentType); /** * Get a named instance of a deployment aspect manager 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 2011-09-08 08:14:19 UTC (rev 14954) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2011-09-09 02:33:17 UTC (rev 14955) @@ -46,6 +46,11 @@ static final String SEPID_PROPERTY_ENDPOINT = "endpoint"; static final String SEPID_DOMAIN_ENDPOINT = SEPID_DOMAIN + "." + SEPID_PROPERTY_ENDPOINT; + + public enum EndpointType + { + JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3, JAXWS_JMS; + }; public enum EndpointState { @@ -132,4 +137,12 @@ /** Set security domain context */ void setSecurityDomainContext(SecurityDomainContext context); + + + /** Set endpoint type */ + void setType(EndpointType type); + + /** get endpoint type */ + EndpointType getType(); + } Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointTypeFilter.java (from rev 14951, spi/branches/JBWS-3343/src/main/java/org/jboss/wsf/spi/deployment/EndpointTypeFilter.java) =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointTypeFilter.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointTypeFilter.java 2011-09-09 02:33:17 UTC (rev 14955) @@ -0,0 +1,9 @@ +package org.jboss.wsf.spi.deployment; + +import org.jboss.wsf.spi.deployment.Endpoint.EndpointType; + +public interface EndpointTypeFilter +{ + boolean accept(EndpointType type); + +} Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2011-09-08 08:14:19 UTC (rev 14954) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2011-09-09 02:33:17 UTC (rev 14955) @@ -23,6 +23,8 @@ import java.util.List; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointType; + /** * A general service deployment. * @@ -42,22 +44,31 @@ /** Add an endpoint to the service */ void addEndpoint(Endpoint endpoint); - /** Get the list of endpoints */ + /** Get the list of endpoints*/ List<Endpoint> getEndpoints(); + /** Get the list of endpoints with EndpointTypeFilter*/ + List<Endpoint> getEndpoints(EndpointTypeFilter filter); + + /** Get the endpoint type list */ + List<EndpointType> getEndpointTypes(); + + /** Add endpoint type */ + void addEndpointType(EndpointType type); + /** Get an endpoint by name */ Endpoint getEndpointByName(String simpleName); + /** Get the virtual hosts for this service */ + List<String> getVirtualHosts(); + + /** Set the virtual hosts for this service */ + void setVirtualHosts(List<String> virtualHosts); + /** Get the context root for this service */ String getContextRoot(); /** Set the context root for this service */ void setContextRoot(String contextRoot); - /** Get the virtual hosts for this service */ - List<String> getVirtualHosts(); - - /** Set the virtual hosts for this service */ - void setVirtualHosts(List<String> virtualHosts); - }