Moving current trunk modules to contrib, before starting the Equinox branch merge

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@718812 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 0 insertions, 758 deletions

diff --git a/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java b/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
deleted file mode 100644
index 4f5bfb3c62..0000000000
--- a/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyDefaultServlet.java
+++ /dev/null
@@ -1,90 +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.jetty;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.mortbay.jetty.servlet.DefaultServlet;
-import org.mortbay.resource.Resource;
-import org.mortbay.resource.URLResource;
-
-/**
- * Customizes the Jetty default Servlet.
- *
- * @version $Rev$ $Date$
- */
-public class JettyDefaultServlet extends DefaultServlet {
-    private static final long serialVersionUID = 7000218247190209353L;
-
-    private String documentRoot;
-    private String servletPath;
-    
-    public JettyDefaultServlet(String servletPath, String documentRoot) {
-        this.servletPath = servletPath + '/';
-        this.documentRoot = documentRoot;
-    }
-
-    @Override
-    public Resource getResource(String pathInContext) {
-        if (pathInContext.startsWith(servletPath)) {
-            if (pathInContext.length() > servletPath.length()) {
-                pathInContext = pathInContext.substring(servletPath.length());
-            } else {
-                pathInContext = "";
-            }
-        } else {
-            if ((pathInContext + "/").equals(servletPath)) {
-                pathInContext = "";
-            }
-        }
-        
-        try {
-            URL url = new URL(documentRoot + "/" + pathInContext);
-            return new URLResource(url, url.openConnection()) {
-                private static final long serialVersionUID = 8560952113883507717L;
-                
-                @Override
-                public File getFile() throws IOException {
-                    return null;
-                }
-                
-            };
-        } catch (MalformedURLException e) {
-            return null;
-        } catch (IOException e) {
-            return null;
-        }
-    }
-    
-    @Override
-    public String getInitParameter(String name) {
-        if ("resourceBase".equals(name)) {
-            return documentRoot;
-        } else if ("redirectWelcome".equals(name)) {
-            return "true";
-        } else {
-            return super.getInitParameter(name);
-        }
-    }
-    
-}
diff --git a/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java b/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
deleted file mode 100644
index 1ecf1bca1b..0000000000
--- a/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyLogger.java
+++ /dev/null
@@ -1,87 +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.jetty;
-
-import org.mortbay.log.Logger;
-
-/**
- * Replaces Jetty's logging mechanism
- * 
- * @version $Rev$ $Date$
- */
-public class JettyLogger implements Logger {
-
-    private boolean debugEnabled;
-
-    public boolean isDebugEnabled() {
-        return debugEnabled;
-    }
-
-    public void setDebugEnabled(boolean debugEnabled) {
-        this.debugEnabled = debugEnabled;
-    }
-
-    public void info(String msg, Object arg0, Object arg1) {
-        if (debugEnabled) {
-            System.err.println(":INFO:  " + format(msg, arg0, arg1));
-        }
-    }
-
-    public void debug(String msg, Throwable th) {
-        if (debugEnabled) {
-            System.err.println(":DEBUG:  " + msg);
-            th.printStackTrace();
-        }
-    }
-
-    public void debug(String msg, Object arg0, Object arg1) {
-        if (debugEnabled) {
-            System.err.println(":DEBUG: " + format(msg, arg0, arg1));
-        }
-    }
-
-    public void warn(String msg, Object arg0, Object arg1) {
-        if (debugEnabled) {
-            System.err.println(":WARN: " + format(msg, arg0, arg1));
-        }
-    }
-
-    public void warn(String msg, Throwable th) {
-        if (debugEnabled) {
-            System.err.println(":WARN: " + msg);
-            th.printStackTrace();
-        }
-    }
-
-    public Logger getLogger(String name) {
-        return this;
-    }
-
-    private String format(String msg, Object arg0, Object arg1) {
-        int i0 = msg.indexOf("{}");
-        int i1 = i0 < 0 ? -1 : msg.indexOf("{}", i0 + 2);
-        if (arg1 != null && i1 >= 0) {
-            msg = msg.substring(0, i1) + arg1 + msg.substring(i1 + 2);
-        }
-        if (arg0 != null && i0 >= 0) {
-            msg = msg.substring(0, i0) + arg0 + msg.substring(i0 + 2);
-        }
-        return msg;
-    }
-}
diff --git a/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java b/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
deleted file mode 100644
index dfb34f11a5..0000000000
--- a/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyServer.java
+++ /dev/null
@@ -1,486 +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.jetty;
-
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.security.AccessController;
-import java.security.KeyStore;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-import java.util.logging.Logger;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-
-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;
-import org.mortbay.jetty.handler.ContextHandler;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.security.SslSocketConnector;
-import org.mortbay.jetty.servlet.DefaultServlet;
-import org.mortbay.jetty.servlet.ServletHandler;
-import org.mortbay.jetty.servlet.ServletHolder;
-import org.mortbay.jetty.servlet.ServletMapping;
-import org.mortbay.jetty.servlet.SessionHandler;
-import org.mortbay.thread.ThreadPool;
-
-/**
- * Implements an HTTP transport service using Jetty.
- *
- * @version $Rev$ $Date$
- */
-public class JettyServer implements ServletHost {
-    private static final Logger logger = Logger.getLogger(JettyServer.class.getName());
-
-    private final Object joinLock = new Object();
-    private String trustStore;
-    private String truststorePassword;
-    private String keyStore;
-    private String keyStorePassword;
-
-    private String keyStoreType;
-    private String trustStoreType;
-
-    
-    private boolean sendServerVersion;
-    private WorkScheduler workScheduler;
-    private int defaultPort = 8080;
-
-    /**
-     * Represents a port and the server that serves it.
-     */
-    private class Port {
-        private Server server;
-        private ServletHandler servletHandler;
-        
-        private Port(Server server, ServletHandler servletHandler) {
-            this.server = server;
-            this.servletHandler = servletHandler;
-        }
-
-        public Server getServer() {
-            return server;
-        }
-        
-        public ServletHandler getServletHandler() {
-            return servletHandler;
-        }
-    }
-    
-    private Map<Integer, Port> ports = new HashMap<Integer, Port>();
-
-    private String contextPath = "/";
-
-    static {
-        // Hack to replace the static Jetty logger
-        System.setProperty("org.mortbay.log.class", JettyLogger.class.getName());
-    }
-
-    public JettyServer(WorkScheduler workScheduler) {
-        this.workScheduler = workScheduler;
-        AccessController.doPrivileged(new PrivilegedAction<Object>() {
-            public Object run() {
-                trustStore = System.getProperty("javax.net.ssl.trustStore");
-                truststorePassword = System.getProperty("javax.net.ssl.trustStorePassword");
-                keyStore = System.getProperty("javax.net.ssl.keyStore");
-                keyStorePassword = System.getProperty("javax.net.ssl.keyStorePassword");
-
-                keyStoreType = System.getProperty("javax.net.ssl.keyStoreType", KeyStore.getDefaultType());
-                trustStoreType = System.getProperty("javax.net.ssl.trustStoreType", KeyStore.getDefaultType());
-                return null;
-            }
-        });
-    }
-    
-    public void setDefaultPort(int port) {
-        defaultPort = port;
-    }
-    
-    public int getDefaultPort() {
-        return defaultPort;
-    }
-
-    public void setSendServerVersion(boolean sendServerVersion) {
-        this.sendServerVersion = sendServerVersion;
-    }
-
-    /**
-     * Stop all the started servers.
-     */
-    public void stop() {
-        synchronized (joinLock) {
-            joinLock.notifyAll();
-        }
-        try {
-            Set<Entry<Integer, Port>> entries = new HashSet<Entry<Integer, Port>>(ports.entrySet());
-            for (Entry<Integer, Port> entry: entries) {
-                Port port = entry.getValue();
-                port.getServer().stop();
-                ports.remove(entry.getKey());
-            }
-        } catch (Exception e) {
-            throw new ServletMappingException(e);
-        }
-    }
-    
-    private void configureSSL(SslSocketConnector connector) {
-        connector.setProtocol("TLS");
-        connector.setKeystore(keyStore);
-        connector.setKeyPassword(keyStorePassword);
-        connector.setKeystoreType(keyStoreType);
-
-        connector.setTruststore(trustStore);
-        connector.setTrustPassword(truststorePassword);
-        connector.setTruststoreType(trustStoreType);
-
-        connector.setPassword(keyStorePassword);
-        if (trustStore != null) {
-            connector.setNeedClientAuth(true);
-        }
-
-    }
-
-    public void addServletMapping(String suri, Servlet servlet) throws ServletMappingException {
-        URI uri = URI.create(suri);
-        
-        // Get the URI scheme and port
-        String scheme = uri.getScheme();
-        if (scheme == null) {
-            scheme = "http";
-        }
-        int portNumber = uri.getPort();
-        if (portNumber == -1) {
-            portNumber = defaultPort;
-        }
-
-        // Get the port object associated with the given port number
-        Port port = ports.get(portNumber);
-        if (port == null) {
-
-            // Create and start a new server
-            try {
-                Server server = new Server();
-                server.setThreadPool(new WorkSchedulerThreadPool());
-                if ("https".equals(scheme)) {
-//                    Connector httpConnector = new SelectChannelConnector();
-//                    httpConnector.setPort(portNumber);
-                    SslSocketConnector sslConnector = new SslSocketConnector();
-                    sslConnector.setPort(portNumber);
-                    configureSSL(sslConnector);
-                    server.setConnectors(new Connector[] {sslConnector});
-                } else {
-                    SelectChannelConnector selectConnector = new SelectChannelConnector();
-                    selectConnector.setPort(portNumber);
-                    server.setConnectors(new Connector[] {selectConnector});
-                }
-    
-                ContextHandler contextHandler = new ContextHandler();
-                //contextHandler.setContextPath(contextPath);
-                contextHandler.setContextPath("/");
-                server.setHandler(contextHandler);
-    
-                SessionHandler sessionHandler = new SessionHandler();
-                ServletHandler servletHandler = new ServletHandler();
-                sessionHandler.addHandler(servletHandler);
-    
-                contextHandler.setHandler(sessionHandler);
-    
-                server.setStopAtShutdown(true);
-                server.setSendServerVersion(sendServerVersion);
-                server.start();
-                
-                // Keep track of the new server and Servlet handler 
-                port = new Port(server, servletHandler);
-                ports.put(portNumber, port);
-                
-            } catch (Exception e) {
-                throw new ServletMappingException(e);
-            }
-        }
-
-        // Register the Servlet mapping
-        ServletHandler servletHandler = port.getServletHandler();
-        ServletHolder holder;
-        if (servlet instanceof DefaultResourceServlet) {
-            
-            // Optimize the handling of resource requests, use the Jetty default Servlet
-            // instead of our default resource Servlet
-            String servletPath = uri.getPath();
-            if (servletPath.endsWith("*")) {
-                servletPath = servletPath.substring(0, servletPath.length()-1);
-            }
-            if (servletPath.endsWith("/")) {
-                servletPath = servletPath.substring(0, servletPath.length()-1);
-            }          
-            if (!servletPath.startsWith("/")) {
-                servletPath = '/' + servletPath;
-            }     
-       
-            DefaultResourceServlet resourceServlet = (DefaultResourceServlet)servlet;
-            DefaultServlet defaultServlet = new JettyDefaultServlet(servletPath, resourceServlet.getDocumentRoot());
-            holder = new ServletHolder(defaultServlet);
-            
-        } else {
-            holder = new ServletHolder(servlet);
-        }
-        servletHandler.addServlet(holder);
-        
-        ServletMapping mapping = new ServletMapping();
-        mapping.setServletName(holder.getName());
-        String path = uri.getPath();
-        
-        if (!path.startsWith("/")) {
-            path = '/' + path;
-        }
-        
-        if (!path.startsWith(contextPath)) {
-            path = contextPath + path;
-        }  
-                
-        mapping.setPathSpec(path);
-        servletHandler.addServletMapping(mapping);
-        
-        // Compute the complete URL
-        String host;
-        try {
-            host = InetAddress.getLocalHost().getHostName();
-        } catch (UnknownHostException e) {
-            host = "localhost";
-        }
-        URL addedURL;
-        try {
-            addedURL = new URL(scheme, host, portNumber, path);
-        } catch (MalformedURLException e) {
-            throw new ServletMappingException(e);
-        }
-        logger.info("Added Servlet mapping: " + addedURL);
-    }
-    
-    public URL getURLMapping(String suri) throws ServletMappingException {
-        URI uri = URI.create(suri);
-
-        // Get the URI scheme and port
-        String scheme = uri.getScheme();
-        if (scheme == null) {
-            scheme = "http";
-        }
-        int portNumber = uri.getPort();
-        if (portNumber == -1) {
-            portNumber = defaultPort;
-        }
-        
-        // Get the host
-        String host;
-        try {
-            host = InetAddress.getLocalHost().getHostName();
-        } catch (UnknownHostException e) {
-            host = "localhost";
-        }
-        
-        // Construct the URL
-        String path = uri.getPath();
-
-       
-        if (!path.startsWith("/")) {
-            path = '/' + path;
-        }
-
-        if (!path.startsWith(contextPath)) {
-            path = contextPath + path;
-        }
-        
-
-        URL url;
-        try {
-            url = new URL(scheme, host, portNumber, path);
-        } catch (MalformedURLException e) {
-            throw new ServletMappingException(e);
-        }
-        return url;
-    }
-        
-    public Servlet getServletMapping(String suri) throws ServletMappingException {
-        
-        if (suri == null){
-            return null;
-        }
-        
-        URI uri = URI.create(suri);
-        
-        // Get the URI port
-        int portNumber = uri.getPort();
-        if (portNumber == -1) {
-            portNumber = defaultPort;
-        }
-
-        // Get the port object associated with the given port number
-        Port port = ports.get(portNumber);
-        if (port == null) {
-            return null;
-        }
-        
-        // Remove the Servlet mapping for the given Servlet 
-        ServletHandler servletHandler = port.getServletHandler();
-        Servlet servlet = null;
-        List<ServletMapping> mappings =
-            new ArrayList<ServletMapping>(Arrays.asList(servletHandler.getServletMappings()));
-        String path = uri.getPath();
-        
-        if (!path.startsWith("/")) {
-            path = '/' + path;
-        }
-        
-        if (!path.startsWith(contextPath)) {
-            path = contextPath + path;
-        }
-        
-        for (ServletMapping mapping : mappings) {
-            if (Arrays.asList(mapping.getPathSpecs()).contains(path)) {
-                try {
-                    servlet = servletHandler.getServlet(mapping.getServletName()).getServlet();
-                } catch (ServletException e) {
-                    throw new IllegalStateException(e);
-                }
-                break;
-            }
-        }
-        return servlet;
-    }
-
-    public Servlet removeServletMapping(String suri) {
-        URI uri = URI.create(suri);
-        
-        // Get the URI port
-        int portNumber = uri.getPort();
-        if (portNumber == -1) {
-            portNumber = defaultPort;
-        }
-
-        // Get the port object associated with the given port number
-        Port port = ports.get(portNumber);
-        if (port == null) {
-            throw new IllegalStateException("No servlet registered at this URI: " + suri);
-        }
-        
-        // Remove the Servlet mapping for the given Servlet 
-        ServletHandler servletHandler = port.getServletHandler();
-        Servlet removedServlet = null;
-        List<ServletMapping> mappings =
-            new ArrayList<ServletMapping>(Arrays.asList(servletHandler.getServletMappings()));
-        String path = uri.getPath();
-        
-        if (!path.startsWith("/")) {
-            path = '/' + path;
-        }
-        
-        if (!path.startsWith(contextPath)) {
-            path = contextPath + path;
-        }
-        
-        for (ServletMapping mapping : mappings) {
-            if (Arrays.asList(mapping.getPathSpecs()).contains(path)) {
-                try {
-                    removedServlet = servletHandler.getServlet(mapping.getServletName()).getServlet();
-                } catch (ServletException e) {
-                    throw new IllegalStateException(e);
-                }
-                mappings.remove(mapping);
-                logger.info("Removed Servlet mapping: " + path);
-                break;
-            }
-        }
-        if (removedServlet != null) {
-            servletHandler.setServletMappings(mappings.toArray(new ServletMapping[mappings.size()]));
-            
-            // Stop the port if there are no servlet mappings on it anymore
-            if (mappings.size() == 0) {
-                try {
-                    port.getServer().stop();
-                } catch (Exception e) {
-                    throw new IllegalStateException(e);
-                }
-                ports.remove(portNumber);
-            }
-            
-        } else {
-            logger.warning("Trying to Remove servlet mapping: " + path + " where mapping is not registered");
-        }
-        
-        return removedServlet;
-    }
-
-    public RequestDispatcher getRequestDispatcher(String suri) throws ServletMappingException {
-        //FIXME implement this later
-        return null;
-    }
-    
-    public String getContextPath() {
-        return contextPath;
-    }
-    
-    public void setContextPath(String path) {
-        this.contextPath = path;
-    }
-
-    /**
-     * A wrapper to enable use of a WorkScheduler with Jetty
-     */
-    private class WorkSchedulerThreadPool implements ThreadPool {
-
-        public boolean dispatch(Runnable work) {
-            workScheduler.scheduleWork(work);
-            return true;
-        }
-
-        public void join() throws InterruptedException {
-            synchronized (joinLock) {
-                joinLock.wait();
-            }
-        }
-
-        public int getThreads() {
-            throw new UnsupportedOperationException();
-        }
-
-        public int getIdleThreads() {
-            throw new UnsupportedOperationException();
-        }
-
-        public boolean isLowOnThreads() {
-            return false;
-        }
-    }
-
-}
diff --git a/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java b/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
deleted file mode 100644
index 884c8a4cce..0000000000
--- a/java/sca/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
+++ /dev/null
@@ -1,77 +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.jetty.module;
-
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.ModuleActivator;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.http.jetty.JettyServer;
-import org.apache.tuscany.sca.work.WorkScheduler;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JettyRuntimeModuleActivator implements ModuleActivator {
-    private static final Logger logger = Logger.getLogger(JettyRuntimeModuleActivator.class.getName());
-
-    private JettyServer server;
-
-    public void start(ExtensionPointRegistry extensionPointRegistry) {
-
-        // Register a Jetty Servlet host
-        ServletHostExtensionPoint servletHosts =
-            extensionPointRegistry.getExtensionPoint(ServletHostExtensionPoint.class);
-        
-        if (servletHosts.getServletHosts().size() < 1) {
-            UtilityExtensionPoint utilities = extensionPointRegistry.getExtensionPoint(UtilityExtensionPoint.class);
-            final WorkScheduler workScheduler = utilities.getUtility(WorkScheduler.class);
-            // Allow privileged access to start MBeans. Requires MBeanPermission in security policy.
-            try {
-                server = AccessController.doPrivileged(new PrivilegedAction<JettyServer>() {
-                    public JettyServer run() {
-                        return new JettyServer(workScheduler);
-                     }
-                });        
-                servletHosts.addServletHost(server);
-            } catch (Exception e) {
-                logger.log(Level.WARNING, "Exception creating JettyServer", e);
-            }
-        }
-    }
-
-    public void stop(ExtensionPointRegistry registry) {
-        // Allow privileged access to stop MBeans. Requires MBeanPermission in security policy.
-        AccessController.doPrivileged(new PrivilegedAction<Object>() {
-            public Object run() {
-                if (server != null) {
-                    server.stop();
-                }
-                return null;
-            }
-        });            
-    }
-
-}
diff --git a/java/sca/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/java/sca/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
deleted file mode 100644
index f61708de90..0000000000
--- a/java/sca/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ /dev/null
@@ -1,18 +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.

-# Implementation class for the ModuleActivator

-org.apache.tuscany.sca.http.jetty.module.JettyRuntimeModuleActivator