Author: richard.opalka(a)jboss.com Date: 2008-11-03 04:10:04 -0500 (Mon, 03 Nov 2008) New Revision: 8612 Removed: spi/trunk/src/main/java/org/jboss/wsf/spi/ComposableRuntime.java spi/trunk/src/main/java/org/jboss/wsf/spi/RuntimeAware.java spi/trunk/src/main/java/org/jboss/wsf/spi/WSFRuntime.java spi/trunk/src/main/java/org/jboss/wsf/spi/WSFRuntimeLocator.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentLifecycle.java spi/trunk/src/main/java/org/jboss/wsf/spi/transport/ Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java Log: [JBWS-2338] svn merge -r 8564:8565 https://svn.jboss.org/repos/jbossws/spi/branches/ropalka Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/ComposableRuntime.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/ComposableRuntime.java 2008-10-31 09:07:06 UTC (rev 8611) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/ComposableRuntime.java 2008-11-03 09:10:04 UTC (rev 8612) @@ -1,58 +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; - -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.transport.TransportManager; -import org.jboss.wsf.spi.transport.TransportManagerFactory; - -import java.util.List; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public interface ComposableRuntime -{ - void setTransportManagerFactory(TransportManagerFactory factory); - - TransportManagerFactory getTransportManagerFactory(); - - void setEndpointRegistry(EndpointRegistry endpointRegistry); - - EndpointRegistry getEndpointRegistry(); - - void setDeploymentAspectManager(DeploymentAspectManager deploymentManager); - - DeploymentAspectManager getDeploymentAspectManager(); - - void setRequestHandlerFactory(RequestHandlerFactory factory); - - RequestHandlerFactory getRequestHandlerFactory(); - - void setInvocationHandlerFactory(InvocationHandlerFactory factory); - - InvocationHandlerFactory getInvocationHandlerFactory(); - -} Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/RuntimeAware.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/RuntimeAware.java 2008-10-31 09:07:06 UTC (rev 8611) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/RuntimeAware.java 2008-11-03 09:10:04 UTC (rev 8612) @@ -1,30 +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; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public interface RuntimeAware -{ - void setRuntimeAssociation(WSFRuntime runtime); -} Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/WSFRuntime.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/WSFRuntime.java 2008-10-31 09:07:06 UTC (rev 8611) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/WSFRuntime.java 2008-11-03 09:10:04 UTC (rev 8612) @@ -1,35 +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; - -import org.jboss.wsf.spi.deployment.Deployment; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public interface WSFRuntime extends ComposableRuntime -{ - void create(Deployment deployment); - void start(Deployment deployment); - void stop(Deployment deployment); - void destroy(Deployment deployment); -} Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/WSFRuntimeLocator.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/WSFRuntimeLocator.java 2008-10-31 09:07:06 UTC (rev 8611) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/WSFRuntimeLocator.java 2008-11-03 09:10:04 UTC (rev 8612) @@ -1,35 +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; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public interface WSFRuntimeLocator -{ - /** - * Locate a web service runtime by logical name - * @param runtimeName - * @return - */ - WSFRuntime locateRuntime(String runtimeName); -} 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 2008-10-31 09:07:06 UTC (rev 8611) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2008-11-03 09:10:04 UTC (rev 8612) @@ -26,8 +26,6 @@ import java.util.StringTokenizer; import org.jboss.logging.Logger; -import org.jboss.wsf.spi.WSFRuntime; -import org.jboss.wsf.spi.RuntimeAware; /** * A deployment aspect that does nothing. @@ -38,7 +36,7 @@ * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ -public abstract class DeploymentAspect implements DeploymentLifecycle +public abstract class DeploymentAspect { // provide logging protected final Logger log = Logger.getLogger(getClass()); @@ -68,21 +66,20 @@ this.requires = requires; } - public void create(Deployment dep, WSFRuntime runtime) + public void create(Deployment dep) { - } - public void destroy(Deployment dep, WSFRuntime runtime) + public void destroy(Deployment dep) { } - public void start(Deployment dep, WSFRuntime runtime) + public void start(Deployment dep) { } - public void stop(Deployment dep, WSFRuntime runtime) - { + public void stop(Deployment dep) + { } public Set<String> getProvidesAsSet() Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java 2008-10-31 09:07:06 UTC (rev 8611) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java 2008-11-03 09:10:04 UTC (rev 8612) @@ -24,15 +24,13 @@ import java.util.List; /** - * Process an ordered chain of {@link org.jboss.wsf.spi.deployment.DeploymentAspect}'s - * on a {@link org.jboss.wsf.spi.deployment.DeploymentLifecycle} + * A general service deployment manager. * * @author Thomas.Diesler(a)jboss.com - * @author Heiko.Braun(a)jboss.com * * @since 20-Apr-2007 */ -public interface DeploymentAspectManager extends DeploymentLifecycle +public interface DeploymentAspectManager { /** Get the name for this aspect manager */ String getName(); @@ -48,5 +46,10 @@ /** Set the list of registered deployment aspects */ void setDeploymentAspects(List<DeploymentAspect> aspects); + + /** Deploy a web service */ + void deploy(Deployment dep); + + /** Undeploy a web service */ + void undeploy(Deployment dep); } - Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentLifecycle.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentLifecycle.java 2008-10-31 09:07:06 UTC (rev 8611) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentLifecycle.java 2008-11-03 09:10:04 UTC (rev 8612) @@ -1,38 +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.deployment; - -import org.jboss.wsf.spi.WSFRuntime; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -public interface DeploymentLifecycle -{ - void create(Deployment dep, WSFRuntime runtime); - - void start(Deployment dep, WSFRuntime runtime); - - void stop(Deployment dep, WSFRuntime runtime); - - void destroy(Deployment dep, WSFRuntime runtime); -}