1 files changed, 0 insertions, 220 deletions
diff --git a/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java b/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
deleted file mode 100644
index 3ead50c8e4..0000000000
--- a/branches/sca-java-0.90/modules/http-tomcat/src/main/java/org/apache/tuscany/sca/http/tomcat/TomcatServer.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * 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.    
- */
-package org.apache.tuscany.sca.http.tomcat;
-
-import java.net.URI;
-import java.util.concurrent.Executor;
-
-import javax.servlet.Servlet;
-
-import org.apache.catalina.Context;
-import org.apache.catalina.Lifecycle;
-import org.apache.catalina.Wrapper;
-import org.apache.catalina.connector.Connector;
-import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.core.StandardEngine;
-import org.apache.catalina.core.StandardHost;
-import org.apache.catalina.startup.ContextConfig;
-import org.apache.coyote.http11.Http11Protocol;
-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.ServletHost;
-import org.apache.tuscany.sca.http.ServletMappingException;
-import org.apache.tuscany.sca.work.WorkScheduler;
-
-/**
- * A Tomcat based implementation of ServletHost.
- * 
- * @version $Rev$ $Date$
- */
-@SuppressWarnings("deprecation")
-public class TomcatServer implements ServletHost {
-
-    private static final int DEFAULT_PORT = 8080;
-    private StandardEngine engine;
-    private StandardHost host;
-    private Connector connector;
-    private WorkScheduler workScheduler;
-    
-    /**
-     * A custom connector that uses our WorkScheduler to schedule
-     * worker threads.
-     */
-    private class CustomConnector extends Connector {
-
-        private class CustomHttpProtocolHandler extends Http11Protocol {
-
-            /**
-             * An Executor wrappering our WorkScheduler
-             */
-            private class WorkSchedulerExecutor implements Executor {
-                public void execute(Runnable command) {
-                    workScheduler.scheduleWork(command);
-                }
-            }
-
-            /**
-             * A custom Endpoint that waits for its acceptor thread to
-             * terminate before stopping.
-             */
-            private class CustomEndpoint extends JIoEndpoint {
-                private Thread acceptorThread;
-
-                private class CustomAcceptor extends Acceptor {
-                    CustomAcceptor() {
-                        super();
-                    }
-                }
-                
-                public void start() throws Exception {
-                    if (!initialized)
-                        init();
-                    if (!running) {
-                        running = true;
-                        paused = false;
-                        acceptorThread = new Thread(new CustomAcceptor(), getName() + "-Acceptor-" + 0);
-                        acceptorThread.setPriority(threadPriority);
-                        acceptorThread.setDaemon(daemon);
-                        acceptorThread.start();
-                    }
-                }
-                
-                public void stop() {
-                    super.stop();
-                    try {
-                        acceptorThread.join();
-                    } catch (InterruptedException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-                
-                public int getCurrentThreadsBusy() {
-                    return 0;
-                }
-            }
-            
-            CustomHttpProtocolHandler() {
-                endpoint = new CustomEndpoint();
-                endpoint.setExecutor(new WorkSchedulerExecutor());
-            }
-        }
-        
-        CustomConnector() throws Exception {
-            protocolHandler = new CustomHttpProtocolHandler();
-        }
-    }
-
-    /**
-     * Constructs a new embedded Tomcat server.
-     * 
-     * @param workScheduler the WorkScheduler to use to process requests.
-     */
-    public TomcatServer(WorkScheduler workScheduler) {
-        this.workScheduler = workScheduler;
-    }
-    
-    public void init() throws ServletMappingException {
-
-        // Create an engine
-        engine = new StandardEngine();
-        engine.setBaseDir("");
-        engine.setDefaultHost("localhost");
-
-        // Create a host
-        host = new StandardHost();
-        host.setAppBase("");
-        host.setName("localhost");
-        engine.addChild(host);
-
-        // Create the root context
-        StandardContext context = new StandardContext();
-        context.setDocBase("");
-        context.setPath("");
-        ContextConfig config = new ContextConfig();
-        ((Lifecycle)context).addLifecycleListener(config);
-        host.addChild(context);
-    }
-
-    public void destroy() throws ServletMappingException {
-
-        // Stop the server
-        try {
-            if (connector !=null) {
-                connector.stop();
-                engine.stop();
-            }
-        } catch (Exception e) {
-            throw new ServletMappingException(e);
-        }
-    }
-
-    public void addServletMapping(String uri, Servlet servlet) {
-        
-        // TODO: use the port from the uri, but thats a bit harder to do 
-        int port = DEFAULT_PORT;
-        
-        // Install a default HTTP connector
-        if (connector == null) {
-            //TODO support multiple connectors on different ports
-            try {
-                engine.start();
-                connector = new CustomConnector();
-                connector.setPort(port);
-                connector.setContainer(engine);
-                connector.initialize();
-                connector.start();
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        // Register the servlet mapping
-        String mapping = URI.create(uri).getPath();
-        Context context = host.map(mapping);
-        Wrapper wrapper = new ServletWrapper(servlet);
-        wrapper.setName(mapping);
-        wrapper.addMapping(mapping);
-        context.addChild(wrapper);
-        context.addServletMapping(mapping, mapping);
-        connector.getMapper().addWrapper("localhost", "", mapping, wrapper);
-    }
-
-    public Servlet removeServletMapping(String uri) {
-        String mapping = URI.create(uri).getPath();
-        Context context = host.map(mapping);
-        MappingData md = new MappingData();
-        MessageBytes mb = MessageBytes.newInstance();
-        mb.setString(mapping);
-        try {
-            context.getMapper().map(mb, md);
-        } catch (Exception e) {
-            return null;
-        }
-        if (md.wrapper instanceof ServletWrapper) {
-            ServletWrapper servletWrapper = (ServletWrapper)md.wrapper;
-            context.removeServletMapping(mapping);
-            context.removeChild(servletWrapper);
-            return servletWrapper.getServlet();
-        } else {
-            return null;
-        }
-    }
-
-}