Author: richard.opalka(a)jboss.com Date: 2011-09-10 08:43:38 -0400 (Sat, 10 Sep 2011) New Revision: 14967 Added: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentState.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentType.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointState.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointType.java Removed: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/MDBMetaData.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/EndpointTypeFilter.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationType.java Log: [JBWS-3346] code review 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-09 22:08:35 UTC (rev 14966) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2011-09-10 12:43:38 UTC (rev 14967) @@ -21,7 +21,6 @@ */ package org.jboss.wsf.spi.deployment; - /** * A general web service deployment dep. * @@ -31,12 +30,6 @@ */ public interface Deployment extends Extensible { - - public enum DeploymentState - { - UNDEFINED, STARTED, STOPPED - }; - /** Get the identifier for this deployment */ String getSimpleName(); @@ -55,7 +48,12 @@ /** 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(); @@ -67,4 +65,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-09 22:08:35 UTC (rev 14966) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java 2011-09-10 12:43:38 UTC (rev 14967) @@ -31,7 +31,7 @@ */ public abstract class DeploymentAspectManagerFactory implements SPIView { - //public abstract DeploymentAspectManager getDeploymentAspectManager(Deployment.DeploymentType deploymentType); + public abstract DeploymentAspectManager getDeploymentAspectManager(DeploymentType deploymentType); /** * Get a named instance of a deployment aspect manager Added: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentState.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentState.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentState.java 2011-09-10 12:43:38 UTC (rev 14967) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat, Inc., 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.spi.deployment; + +/** + * WebService deployment state. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public enum DeploymentState +{ + UNDEFINED, STARTED, STOPPED +} \ No newline at end of file Added: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentType.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentType.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentType.java 2011-09-10 12:43:38 UTC (rev 14967) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat, Inc., 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.spi.deployment; + +/** + * WebService deployment type. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public enum DeploymentType +{ + JAXWS, JAXRPC, +} 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-09 22:08:35 UTC (rev 14966) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2011-09-10 12:43:38 UTC (rev 14967) @@ -41,22 +41,13 @@ */ public interface Endpoint extends Extensible { + static final String SEPID_DOMAIN = "jboss.ws"; static final String SEPID_PROPERTY_CONTEXT = "context"; 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 - { - UNDEFINED, STARTED, STOPPED - }; - /** Get the service this endpoint belongs to */ Service getService(); @@ -81,6 +72,12 @@ /** Set the current state for this endpoint */ void setState(EndpointState state); + /** Get endpoint type */ + EndpointType getType(); + + /** Set endpoint type */ + void setType(EndpointType type); + /** Get the endpoint implementation bean */ String getTargetBeanName(); @@ -137,12 +134,5 @@ /** Set security domain context */ void setSecurityDomainContext(SecurityDomainContext context); - - - /** Set endpoint type */ - void setType(EndpointType type); - - /** get endpoint type */ - EndpointType getType(); - + } Added: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointState.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointState.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointState.java 2011-09-10 12:43:38 UTC (rev 14967) @@ -0,0 +1,32 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat, Inc., 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.spi.deployment; + +/** + * WebService endpoint state. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public enum EndpointState { + UNDEFINED, STARTED, STOPPED +} Added: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointType.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointType.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointType.java 2011-09-10 12:43:38 UTC (rev 14967) @@ -0,0 +1,33 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat, Inc., 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.spi.deployment; + +/** + * WebService endpoint type. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public enum EndpointType +{ + JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3 +} Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointTypeFilter.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointTypeFilter.java 2011-09-09 22:08:35 UTC (rev 14966) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointTypeFilter.java 2011-09-10 12:43:38 UTC (rev 14967) @@ -1,9 +1,32 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, 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.spi.deployment; -import org.jboss.wsf.spi.deployment.Endpoint.EndpointType; - +/** + * WebService endpoint type filter. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ 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-09 22:08:35 UTC (rev 14966) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2011-09-10 12:43:38 UTC (rev 14967) @@ -23,8 +23,6 @@ import java.util.List; -import org.jboss.wsf.spi.deployment.Endpoint.EndpointType; - /** * A general service deployment. * @@ -35,6 +33,7 @@ */ public interface Service extends Extensible { + /** Get the deployment this service belongs to */ Deployment getDeployment(); @@ -44,25 +43,25 @@ /** 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*/ + /** Get the list of endpoints */ List<Endpoint> getEndpoints(EndpointTypeFilter filter); - + /** 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); + } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationType.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationType.java 2011-09-09 22:08:35 UTC (rev 14966) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationType.java 2011-09-10 12:43:38 UTC (rev 14967) @@ -25,8 +25,9 @@ * Known invocation types. * * @author Heiko.Braun(a)jboss.com + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ public enum InvocationType { - JAXRPC_JSE, JAXRPC_EJB21, JAXRPC_MDB21, JAXWS_JSE, JAXWS_EJB3, JAXWS_MDB3 + JAXWS_JSE, JAXWS_EJB3, JAXRPC_JSE, JAXRPC_EJB21, } Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/MDBMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/MDBMetaData.java 2011-09-09 22:08:35 UTC (rev 14966) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/MDBMetaData.java 2011-09-10 12:43:38 UTC (rev 14967) @@ -1,43 +0,0 @@ -/* - * 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.spi.metadata.j2ee; - -/** - * The container independent metadata of a message driven bean. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class MDBMetaData extends EJBMetaData -{ - private String destinationJndiName; - - public String getDestinationJndiName() - { - return destinationJndiName; - } - - public void setDestinationJndiName(String destinationJndiName) - { - this.destinationJndiName = destinationJndiName; - } -}