Modified: incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHost.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHost.java?rev=568682&r1=568681&r2=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHost.java (original) +++ incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHost.java Wed Aug 22 09:16:10 2007 @@ -18,71 +18,13 @@ */ package org.apache.tuscany.sca.rmi; -import java.rmi.Remote; /** * RMI Service hosting interface to be implemented by host environments that allows SCA Components * to register RMI Services to handle inbound service requests over RMI to SCA Components + * + * @deprecated */ -public interface RMIHost { - int RMI_DEFAULT_PORT = 1099; - - /** - * Register an RMI service with the given name and port - * - * @param serviceName against which the server is to be registered - * @param port the port against which the server is to be registered - * @param serviceObject the server object to be registered - * @throws RMIHostException - * @throws RMIHostRuntimeException - */ - void registerService(String serviceName, int port, Remote serviceObject) throws RMIHostException, - RMIHostRuntimeException; - - /** - * Register an RMI service with the given name and default port (1099) - * - * @param serviceName serviceName against which the server is to be registered - * @param serviceObject the server object to be registered - * @throws RMIHostException - * @throws RMIHostRuntimeException - */ - void registerService(String serviceName, Remote serviceObject) throws RMIHostException, - RMIHostRuntimeException; - - /** - * Unregister a service registered under the given service name and port number - * - * @param serviceName serviceName against which the server is to be registered - * @param port the port against which the server is to be registered - * @throws RMIHostException - * @throws RMIHostRuntimeException - */ - void unregisterService(String serviceName, int port) throws RMIHostException, - RMIHostRuntimeException; - - /** - * Unregister a service registered under the given service name and defalut port number (1099) - * - * @param serviceName the name of the service that has to be unregistered - * @throws RMIHostException - * @throws RMIHostRuntimeException - */ - void unregisterService(String serviceName) throws RMIHostException, - RMIHostRuntimeException; - - - /** - * find a remote service hosted on the given host, port and service name - * - * @param host the name of the host on which the rmi service to be unregistered is running - * @param port the port against which the server is to be unregistered is running - * @param svcName serviceName against which the server is to be unregistered is running - * @return the RMI server object - * @throws RMIHostException - * @throws RMIHostRuntimeException - */ - Remote findService(String host, String port, String svcName) throws RMIHostException, - RMIHostRuntimeException; - [EMAIL PROTECTED] +public interface RMIHost extends org.apache.tuscany.sca.host.rmi.RMIHost { }
Modified: incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostException.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostException.java?rev=568682&r1=568681&r2=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostException.java (original) +++ incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostException.java Wed Aug 22 09:16:10 2007 @@ -21,25 +21,12 @@ /** * This exception will relate to situations where the end applicaition's input is the cause of the exception + * + * @deprecated * * @version $Rev: 486986 $ $Date: 2006-12-14 11:48:28 +0530 (Thu, 14 Dec 2006) $ */ -public class RMIHostException extends RuntimeException { - - private static final long serialVersionUID = 3378300080918544410L; - - public RMIHostException() { - } - - public RMIHostException(String message) { - super(message); - } - - public RMIHostException(Throwable e) { - super(e); - } - - public RMIHostException(String message, Throwable cause) { - super(message, cause); - } [EMAIL PROTECTED] +public class RMIHostException extends org.apache.tuscany.sca.host.rmi.RMIHostException { + private static final long serialVersionUID = -3357830119983238735L; } Modified: incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostExtensionPoint.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostExtensionPoint.java?rev=568682&r1=568681&r2=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostExtensionPoint.java (original) +++ incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostExtensionPoint.java Wed Aug 22 09:16:10 2007 @@ -18,34 +18,14 @@ */ package org.apache.tuscany.sca.rmi; -import java.util.List; /** * An extension point for RMI hosts. * + * @deprecated + * * @version $Rev$ $Date$ */ -public interface RMIHostExtensionPoint { - - /** - * Adds a servlet host extension. - * - * @param rmiHost - */ - void addRMIHost(RMIHost rmiHost); - - /** - * Removes a servlet host extension. - * - * @param rmiHost - */ - void removeRMIHost(RMIHost rmiHost); - - /** - * Returns a list of servlet host extensions. - * - * @return - */ - List<RMIHost> getRMIHosts(); - [EMAIL PROTECTED] +public interface RMIHostExtensionPoint extends org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint { } Modified: incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostRuntimeException.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostRuntimeException.java?rev=568682&r1=568681&r2=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostRuntimeException.java (original) +++ incubator/tuscany/java/sca/modules/host-rmi/src/main/java/org/apache/tuscany/sca/rmi/RMIHostRuntimeException.java Wed Aug 22 09:16:10 2007 @@ -23,23 +23,9 @@ * This exception relates to cases where there is a problem with the * Host runtime * + * @deprecated */ -public class RMIHostRuntimeException extends RuntimeException { - - private static final long serialVersionUID = -2639598547028423686L; - - public RMIHostRuntimeException() { - } - - public RMIHostRuntimeException(String message) { - super(message); - } - - public RMIHostRuntimeException(Throwable e) { - super(e); - } - - public RMIHostRuntimeException(String message, Throwable cause) { - super(message, cause); - } [EMAIL PROTECTED] +public class RMIHostRuntimeException extends org.apache.tuscany.sca.host.rmi.RMIHostRuntimeException { + private static final long serialVersionUID = 446663906959900578L; } Added: incubator/tuscany/java/sca/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint?rev=568682&view=auto ============================================================================== --- incubator/tuscany/java/sca/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint (added) +++ incubator/tuscany/java/sca/modules/host-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint Wed Aug 22 09:16:10 2007 @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +org.apache.tuscany.sca.host.rmi.DefaultRMIHostExtensionPoint Modified: incubator/tuscany/java/sca/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java?rev=568682&r1=568229&r2=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java (original) +++ incubator/tuscany/java/sca/modules/host-rmi/src/test/java/org/apache/tuscany/sca/host/rmi/RMIHostImplTestCase.java Wed Aug 22 09:16:10 2007 @@ -16,9 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tuscany.sca.rmi; +package org.apache.tuscany.sca.host.rmi; import java.rmi.Remote; + +import org.apache.tuscany.sca.host.rmi.DefaultRMIHost; +import org.apache.tuscany.sca.host.rmi.RMIHostException; +import org.apache.tuscany.sca.host.rmi.RMIHostRuntimeException; import junit.framework.TestCase; Copied: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java (from r568229, incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/HotUpdateContextListener.java) URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java?p2=incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java&p1=incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/HotUpdateContextListener.java&r1=568229&r2=568682&rev=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/HotUpdateContextListener.java (original) +++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/HotUpdateContextListener.java Wed Aug 22 09:16:10 2007 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.tuscany.sca.webapp; +package org.apache.tuscany.sca.host.webapp; import java.io.File; Copied: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java (from r568229, incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java) URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java?p2=incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java&p1=incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java&r1=568229&r2=568682&rev=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/SCADomainHelper.java (original) +++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/SCADomainHelper.java Wed Aug 22 09:16:10 2007 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.tuscany.sca.webapp; +package org.apache.tuscany.sca.host.webapp; import java.io.File; import java.net.MalformedURLException; Copied: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java (from r568229, incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/TuscanyContextListener.java) URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java?p2=incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java&p1=incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/TuscanyContextListener.java&r1=568229&r2=568682&rev=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/TuscanyContextListener.java (original) +++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyContextListener.java Wed Aug 22 09:16:10 2007 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.tuscany.sca.webapp; +package org.apache.tuscany.sca.host.webapp; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; Copied: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java (from r568229, incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/TuscanyServlet.java) URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java?p2=incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java&p1=incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/TuscanyServlet.java&r1=568229&r2=568682&rev=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/TuscanyServlet.java (original) +++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/TuscanyServlet.java Wed Aug 22 09:16:10 2007 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.tuscany.sca.webapp; +package org.apache.tuscany.sca.host.webapp; import java.io.IOException; Copied: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java (from r568229, incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/WebAppModuleActivator.java) URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java?p2=incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java&p1=incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/WebAppModuleActivator.java&r1=568229&r2=568682&rev=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/WebAppModuleActivator.java (original) +++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppModuleActivator.java Wed Aug 22 09:16:10 2007 @@ -17,11 +17,11 @@ * under the License. */ -package org.apache.tuscany.sca.webapp; +package org.apache.tuscany.sca.host.webapp; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.ModuleActivator; -import org.apache.tuscany.sca.http.ServletHostExtensionPoint; +import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; /** * Activates the webapp host by registering the webapp ServletHost impl Copied: incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java (from r568229, incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/WebAppServletHost.java) URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java?p2=incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java&p1=incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/WebAppServletHost.java&r1=568229&r2=568682&rev=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/webapp/WebAppServletHost.java (original) +++ incubator/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/WebAppServletHost.java Wed Aug 22 09:16:10 2007 @@ -17,19 +17,20 @@ * under the License. */ -package org.apache.tuscany.sca.webapp; +package org.apache.tuscany.sca.host.webapp; import java.net.URI; import java.util.HashMap; import java.util.Map; +import java.util.logging.Logger; import javax.servlet.Servlet; import javax.servlet.ServletConfig; import javax.servlet.ServletException; -import org.apache.tuscany.sca.http.DefaultResourceServlet; -import org.apache.tuscany.sca.http.ServletHost; -import org.apache.tuscany.sca.http.ServletMappingException; +import org.apache.tuscany.sca.host.http.DefaultResourceServlet; +import org.apache.tuscany.sca.host.http.ServletHost; +import org.apache.tuscany.sca.host.http.ServletMappingException; /** * ServletHost impl singleton thats shared between the SCADomain @@ -40,7 +41,7 @@ * */ public class WebAppServletHost implements ServletHost { - + private static final Logger logger = Logger.getLogger(WebAppServletHost.class.getName()); private static WebAppServletHost instance = new WebAppServletHost(); private Map<String, Servlet> servlets; @@ -64,7 +65,7 @@ // For webapps just use the path and ignore the host and port servlets.put(pathURI.getPath(), servlet); - System.out.println("addServletMapping: " + pathURI.getPath()); + logger.info("addServletMapping: " + pathURI.getPath()); } public Servlet removeServletMapping(String path) throws ServletMappingException { Modified: incubator/tuscany/java/sca/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator?rev=568682&r1=568681&r2=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (original) +++ incubator/tuscany/java/sca/modules/host-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator Wed Aug 22 09:16:10 2007 @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. # Implementation class for the ModuleActivator -org.apache.tuscany.sca.webapp.WebAppModuleActivator +org.apache.tuscany.sca.host.webapp.WebAppModuleActivator Modified: incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java?rev=568682&r1=568681&r2=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java (original) +++ incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java Wed Aug 22 09:16:10 2007 @@ -32,9 +32,9 @@ import javax.servlet.Servlet; import javax.servlet.ServletException; -import org.apache.tuscany.sca.http.DefaultResourceServlet; -import org.apache.tuscany.sca.http.ServletHost; -import org.apache.tuscany.sca.http.ServletMappingException; +import org.apache.tuscany.sca.host.http.DefaultResourceServlet; +import org.apache.tuscany.sca.host.http.ServletHost; +import org.apache.tuscany.sca.host.http.ServletMappingException; import org.apache.tuscany.sca.work.WorkScheduler; import org.mortbay.jetty.Connector; import org.mortbay.jetty.Server; Modified: incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java?rev=568682&r1=568681&r2=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java (original) +++ incubator/tuscany/java/sca/modules/http-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java Wed Aug 22 09:16:10 2007 @@ -21,7 +21,7 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.ModuleActivator; -import org.apache.tuscany.sca.http.ServletHostExtensionPoint; +import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; import org.apache.tuscany.sca.http.jetty.JettyServer; import org.apache.tuscany.sca.work.WorkScheduler; Modified: incubator/tuscany/java/sca/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java?rev=568682&r1=568681&r2=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java (original) +++ incubator/tuscany/java/sca/modules/http-jetty/src/test/java/org/apache/tuscany/sca/http/jetty/JettyServerTestCase.java Wed Aug 22 09:16:10 2007 @@ -33,7 +33,7 @@ import junit.framework.TestCase; -import org.apache.tuscany.sca.http.DefaultResourceServlet; +import org.apache.tuscany.sca.host.http.DefaultResourceServlet; import org.apache.tuscany.sca.work.NotificationListener; import org.apache.tuscany.sca.work.WorkScheduler; Modified: incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java?rev=568682&r1=568681&r2=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java (original) +++ incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java Wed Aug 22 09:16:10 2007 @@ -41,9 +41,9 @@ import org.apache.tomcat.util.buf.MessageBytes; import org.apache.tomcat.util.http.mapper.MappingData; import org.apache.tomcat.util.net.JIoEndpoint; -import org.apache.tuscany.sca.http.DefaultResourceServlet; -import org.apache.tuscany.sca.http.ServletHost; -import org.apache.tuscany.sca.http.ServletMappingException; +import org.apache.tuscany.sca.host.http.DefaultResourceServlet; +import org.apache.tuscany.sca.host.http.ServletHost; +import org.apache.tuscany.sca.host.http.ServletMappingException; import org.apache.tuscany.sca.work.WorkScheduler; /** Modified: incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java?rev=568682&r1=568681&r2=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java (original) +++ incubator/tuscany/java/sca/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/module/TomcatRuntimeModuleActivator.java Wed Aug 22 09:16:10 2007 @@ -21,7 +21,7 @@ import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.ModuleActivator; -import org.apache.tuscany.sca.http.ServletHostExtensionPoint; +import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; import org.apache.tuscany.sca.http.tomcat.TomcatServer; import org.apache.tuscany.sca.work.WorkScheduler; Modified: incubator/tuscany/java/sca/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java?rev=568682&r1=568681&r2=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java (original) +++ incubator/tuscany/java/sca/modules/http-tomcat/src/test/java/org/apache/tuscany/sca/http/tomcat/TomcatServerTestCase.java Wed Aug 22 09:16:10 2007 @@ -32,7 +32,7 @@ import junit.framework.TestCase; -import org.apache.tuscany.sca.http.DefaultResourceServlet; +import org.apache.tuscany.sca.host.http.DefaultResourceServlet; import org.apache.tuscany.sca.work.NotificationListener; import org.apache.tuscany.sca.work.WorkScheduler; Modified: incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/provider/HTTPResourceBindingProviderFactory.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/provider/HTTPResourceBindingProviderFactory.java?rev=568682&r1=568681&r2=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/provider/HTTPResourceBindingProviderFactory.java (original) +++ incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/provider/HTTPResourceBindingProviderFactory.java Wed Aug 22 09:16:10 2007 @@ -21,8 +21,8 @@ import org.apache.tuscany.sca.binding.resource.HTTPResourceBinding; import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.http.ServletHost; -import org.apache.tuscany.sca.http.ServletHostExtensionPoint; +import org.apache.tuscany.sca.host.http.ServletHost; +import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; import org.apache.tuscany.sca.provider.BindingProviderFactory; import org.apache.tuscany.sca.provider.ReferenceBindingProvider; import org.apache.tuscany.sca.provider.ServiceBindingProvider; Modified: incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/provider/HTTPResourceServiceBindingProvider.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/provider/HTTPResourceServiceBindingProvider.java?rev=568682&r1=568681&r2=568682&view=diff ============================================================================== --- incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/provider/HTTPResourceServiceBindingProvider.java (original) +++ incubator/tuscany/java/sca/modules/implementation-resource/src/main/java/org/apache/tuscany/sca/binding/resource/provider/HTTPResourceServiceBindingProvider.java Wed Aug 22 09:16:10 2007 @@ -23,8 +23,8 @@ import org.apache.tuscany.sca.assembly.Implementation; import org.apache.tuscany.sca.binding.resource.HTTPResourceBinding; -import org.apache.tuscany.sca.http.DefaultResourceServlet; -import org.apache.tuscany.sca.http.ServletHost; +import org.apache.tuscany.sca.host.http.DefaultResourceServlet; +import org.apache.tuscany.sca.host.http.ServletHost; import org.apache.tuscany.sca.implementation.resource.ResourceImplementation; import org.apache.tuscany.sca.interfacedef.InterfaceContract; import org.apache.tuscany.sca.provider.ServiceBindingProvider; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
