brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject [6/8] incubator-brooklyn git commit: brooklyn-launcher: add org.apache package prefix
Date Fri, 07 Aug 2015 01:09:50 GMT
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f58ef3e/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java b/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
deleted file mode 100644
index 9b46624..0000000
--- a/usage/launcher/src/main/java/brooklyn/launcher/BrooklynWebServer.java
+++ /dev/null
@@ -1,652 +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 brooklyn.launcher;
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.net.URI;
-import java.security.KeyPair;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.EnumSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import javax.servlet.DispatcherType;
-
-import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
-import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
-import org.eclipse.jetty.servlet.FilterHolder;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.eclipse.jetty.util.thread.QueuedThreadPool;
-import org.eclipse.jetty.webapp.WebAppContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Splitter;
-import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
-import com.sun.jersey.api.container.filter.GZIPContentEncodingFilter;
-import com.sun.jersey.api.core.DefaultResourceConfig;
-import com.sun.jersey.api.core.ResourceConfig;
-import com.sun.jersey.spi.container.servlet.ServletContainer;
-
-import brooklyn.BrooklynVersion;
-import brooklyn.config.BrooklynServerPaths;
-import brooklyn.config.BrooklynServiceAttributes;
-import brooklyn.config.ConfigKey;
-import brooklyn.internal.BrooklynInitialization;
-import brooklyn.launcher.config.CustomResourceLocator;
-import brooklyn.location.PortRange;
-import brooklyn.location.basic.LocalhostMachineProvisioningLocation;
-import brooklyn.location.basic.PortRanges;
-import brooklyn.management.ManagementContext;
-import brooklyn.management.internal.ManagementContextInternal;
-import brooklyn.rest.BrooklynRestApi;
-import brooklyn.rest.BrooklynWebConfig;
-import brooklyn.rest.filter.BrooklynPropertiesSecurityFilter;
-import brooklyn.rest.filter.HaHotCheckResourceFilter;
-import brooklyn.rest.filter.HaMasterCheckFilter;
-import brooklyn.rest.filter.LoggingFilter;
-import brooklyn.rest.filter.NoCacheFilter;
-import brooklyn.rest.filter.RequestTaggingFilter;
-import brooklyn.rest.util.ManagementContextProvider;
-import brooklyn.rest.util.ShutdownHandler;
-import brooklyn.rest.util.ShutdownHandlerProvider;
-import brooklyn.util.BrooklynNetworkUtils;
-import brooklyn.util.ResourceUtils;
-import brooklyn.util.collections.MutableMap;
-import brooklyn.util.crypto.FluentKeySigner;
-import brooklyn.util.crypto.SecureKeys;
-import brooklyn.util.exceptions.Exceptions;
-import brooklyn.util.flags.FlagUtils;
-import brooklyn.util.flags.SetFromFlag;
-import brooklyn.util.flags.TypeCoercions;
-import brooklyn.util.io.FileUtil;
-import brooklyn.util.javalang.Threads;
-import brooklyn.util.logging.LoggingSetup;
-import brooklyn.util.os.Os;
-import brooklyn.util.stream.Streams;
-import brooklyn.util.text.Identifiers;
-import brooklyn.util.text.Strings;
-import brooklyn.util.web.ContextHandlerCollectionHotSwappable;
-
-/**
- * Starts the web-app running, connected to the given management context
- */
-public class BrooklynWebServer {
-    private static final Logger log = LoggerFactory.getLogger(BrooklynWebServer.class);
-
-    public static final String BROOKLYN_WAR_URL = "classpath://brooklyn.war";
-    static {
-        // support loading the WAR in dev mode from an alternate location 
-        CustomResourceLocator.registerAlternateLocator(new CustomResourceLocator.SearchingClassPathInDevMode(
-                BROOKLYN_WAR_URL, "/usage/launcher/target", 
-                "/usage/jsgui/target/brooklyn-jsgui-"+BrooklynVersion.get()+".war"));
-    }
-    
-    static {
-        LoggingSetup.installJavaUtilLoggingBridge();
-    }
-    
-    protected Server server;
-
-    private WebAppContext rootContext;
-    
-    /** base port to use, for http if enabled or else https; if not set, it uses httpPort
or httpsPort */
-    @SetFromFlag("port")
-    protected PortRange requestedPort = null;
-    
-    @SetFromFlag
-    protected PortRange httpPort = PortRanges.fromString("8081+");
-    @SetFromFlag
-    protected PortRange httpsPort = PortRanges.fromString("8443+");
-    
-    /** actual port where this gets bound; will be consistent with the "port" passed in
-     * but that might be a range and here it is a single port, or -1 if not yet set */
-    protected volatile int actualPort = -1;
-    /** actual NIC where this is listening; in the case of 0.0.0.0 being passed in as bindAddress,
-     * this will revert to one address (such as localhost) */
-    protected InetAddress actualAddress = null;
-
-    @SetFromFlag
-    protected String war = BROOKLYN_WAR_URL;
-
-    /** IP of NIC where this server should bind, or null to autodetect 
-     * (e.g. 0.0.0.0 if security is configured, or loopback if no security) */
-    @SetFromFlag
-    protected InetAddress bindAddress = null;
-
-    /** The address that this server's management context will be publically available on.
*/
-    @SetFromFlag
-    protected InetAddress publicAddress = null;
-
-    /**
-     * map of context-prefix to file
-     */
-    @SetFromFlag
-    private Map<String, String> wars = new LinkedHashMap<String, String>();
-
-    @SetFromFlag
-    protected boolean ignoreWebappDeploymentFailures = false;
-
-    @SetFromFlag
-    private Map<String, Object> attributes = new LinkedHashMap<String, Object>();
-
-    private ManagementContext managementContext;
-
-    @SetFromFlag
-    private Boolean httpsEnabled;
-
-    @SetFromFlag
-    private String sslCertificate;
-
-    @SetFromFlag
-    private String keystoreUrl;
-
-    @SetFromFlag @Deprecated /** @deprecated use keystoreUrl */
-    private String keystorePath;
-
-    @SetFromFlag
-    private String keystorePassword;
-
-    @SetFromFlag
-    private String keystoreCertAlias;
-
-    @SetFromFlag
-    private String truststorePath;
-
-    @SetFromFlag
-    private String trustStorePassword;
-    
-    @SetFromFlag
-    private String transportProtocols;
-    
-    @SetFromFlag
-    private String transportCiphers;
-
-    private File webappTempDir;
-    
-    private Class<BrooklynPropertiesSecurityFilter> securityFilterClazz;
-
-    private ShutdownHandler shutdownHandler;
-
-    public BrooklynWebServer(ManagementContext managementContext) {
-        this(Maps.newLinkedHashMap(), managementContext);
-    }
-
-    /**
-     * accepts flags:  port,
-     * war (url of war file which is the root),
-     * wars (map of context-prefix to url),
-     * attrs (map of attribute-name : object pairs passed to the servlet)
-     */
-    public BrooklynWebServer(Map<?,?> flags, ManagementContext managementContext) {
-        this.managementContext = managementContext;
-        Map<?,?> leftovers = FlagUtils.setFieldsFromFlags(flags, this);
-        if (!leftovers.isEmpty())
-            log.warn("Ignoring unknown flags " + leftovers);
-        
-        webappTempDir = BrooklynServerPaths.getBrooklynWebTmpDir(managementContext);
-    }
-
-    public BrooklynWebServer(ManagementContext managementContext, int port) {
-        this(managementContext, port, "brooklyn.war");
-    }
-
-    public BrooklynWebServer(ManagementContext managementContext, int port, String warUrl)
{
-        this(MutableMap.of("port", port, "war", warUrl), managementContext);
-    }
-
-    public void setSecurityFilter(Class<BrooklynPropertiesSecurityFilter> filterClazz)
{
-        this.securityFilterClazz = filterClazz;
-    }
-
-    public void setShutdownHandler(@Nullable ShutdownHandler shutdownHandler) {
-        this.shutdownHandler = shutdownHandler;
-    }
-
-    public BrooklynWebServer setPort(Object port) {
-        if (getActualPort()>0)
-            throw new IllegalStateException("Can't set port after port has been assigned
to server (using "+getActualPort()+")");
-        this.requestedPort = TypeCoercions.coerce(port, PortRange.class);
-        return this;
-    }
-
-    @VisibleForTesting
-    File getWebappTempDir() {
-        return webappTempDir;
-    }
-    
-    public BrooklynWebServer setHttpsEnabled(Boolean httpsEnabled) {
-        this.httpsEnabled = httpsEnabled;
-        return this;
-    }
-    
-    public boolean getHttpsEnabled() {
-        return getConfig(httpsEnabled, BrooklynWebConfig.HTTPS_REQUIRED);
-    }
-    
-    public PortRange getRequestedPort() {
-        return requestedPort;
-    }
-    
-    /** returns port where this is running, or -1 if not yet known */
-    public int getActualPort() {
-        return actualPort;
-    }
-
-    /** interface/address where this server is listening;
-     * if bound to 0.0.0.0 (all NICs, e.g. because security is set) this will return one
NIC where this is bound */
-    public InetAddress getAddress() {
-        return actualAddress;
-    }
-    
-    /** URL for accessing this web server (root context) */
-    public String getRootUrl() {
-        String address = (publicAddress != null) ? publicAddress.getHostName() : getAddress().getHostName();
-        if (getActualPort()>0){
-            String protocol = getHttpsEnabled()?"https":"http";
-            return protocol+"://"+address+":"+getActualPort()+"/";
-        } else {
-            return null;
-        }
-    }
-
-      /** sets the WAR to use as the root context (only if server not yet started);
-     * cf deploy("/", url) */
-    public BrooklynWebServer setWar(String url) {
-        this.war = url;
-        return this;
-    }
-
-    /** specifies a WAR to use at a given context path (only if server not yet started);
-     * cf deploy(path, url) */
-    public BrooklynWebServer addWar(String path, String warUrl) {
-        wars.put(path, warUrl);
-        return this;
-    }
-
-    /** InetAddress to which server should bind;
-     * defaults to 0.0.0.0 (although common call path is to set to 127.0.0.1 when security
is not set) */
-    public BrooklynWebServer setBindAddress(InetAddress address) {
-        bindAddress = address;
-        return this;
-    }
-
-    /**
-     * Sets the public address that the server's management context's REST API will be available
on
-     */
-    public BrooklynWebServer setPublicAddress(InetAddress address) {
-        publicAddress = address;
-        return this;
-    }
-
-    /** @deprecated use setAttribute */
-    public BrooklynWebServer addAttribute(String field, Object value) {
-        return setAttribute(field, value);
-    }
-    /** Specifies an attribute passed to deployed webapps 
-     * (in addition to {@link BrooklynServiceAttributes#BROOKLYN_MANAGEMENT_CONTEXT} */
-    public BrooklynWebServer setAttribute(String field, Object value) {
-        attributes.put(field, value);
-        return this;
-    }
-    
-    public <T> BrooklynWebServer configure(ConfigKey<T> key, T value) {
-        return setAttribute(key.getName(), value);
-    }
-
-    /** Specifies attributes passed to deployed webapps 
-     * (in addition to {@link BrooklynServiceAttributes#BROOKLYN_MANAGEMENT_CONTEXT} */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public BrooklynWebServer putAttributes(Map newAttrs) {
-        if (newAttrs!=null) attributes.putAll(newAttrs);
-        return this;
-    }
-
-    public void installAsServletFilter(ServletContextHandler context) {
-        ResourceConfig config = new DefaultResourceConfig();
-        // load all our REST API modules, JSON, and Swagger
-        for (Object r: BrooklynRestApi.getAllResources())
-            config.getSingletons().add(r);
-
-        // Accept gzipped requests and responses, disable caching for dynamic content
-        config.getProperties().put(ResourceConfig.PROPERTY_CONTAINER_REQUEST_FILTERS, GZIPContentEncodingFilter.class.getName());
-        config.getProperties().put(ResourceConfig.PROPERTY_CONTAINER_RESPONSE_FILTERS, ImmutableList.of(GZIPContentEncodingFilter.class,
NoCacheFilter.class));
-        // Checks if appropriate request given HA status
-        config.getProperties().put(ResourceConfig.PROPERTY_RESOURCE_FILTER_FACTORIES, HaHotCheckResourceFilter.class.getName());
-        // configure to match empty path, or any thing which looks like a file path with
/assets/ and extension html, css, js, or png
-        // and treat that as static content
-        config.getProperties().put(ServletContainer.PROPERTY_WEB_PAGE_CONTENT_REGEX, "(/?|[^?]*/assets/[^?]+\\.[A-Za-z0-9_]+)");
-        // and anything which is not matched as a servlet also falls through (but more expensive
than a regex check?)
-        config.getFeatures().put(ServletContainer.FEATURE_FILTER_FORWARD_ON_404, true);
-        // finally create this as a _filter_ which falls through to a web app or something
(optionally)
-        FilterHolder filterHolder = new FilterHolder(new ServletContainer(config));
-
-        context.addFilter(filterHolder, "/*", EnumSet.allOf(DispatcherType.class));
-
-        ManagementContext mgmt = (ManagementContext) context.getAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT);
-        config.getSingletons().add(new ManagementContextProvider(mgmt));
-
-        config.getSingletons().add(new ShutdownHandlerProvider(shutdownHandler));
-    }
-
-    ContextHandlerCollectionHotSwappable handlers = new ContextHandlerCollectionHotSwappable();
-    
-    /**
-     * Starts the embedded web application server.
-     */
-    public synchronized void start() throws Exception {
-        if (server != null) throw new IllegalStateException(""+this+" already running");
-
-        if (actualPort == -1){
-            PortRange portRange = getConfig(requestedPort, BrooklynWebConfig.WEB_CONSOLE_PORT);
-            if (portRange==null) {
-                portRange = getHttpsEnabled() ? httpsPort : httpPort;
-            }
-            actualPort = LocalhostMachineProvisioningLocation.obtainPort(getAddress(), portRange);
-            if (actualPort == -1) 
-                throw new IllegalStateException("Unable to provision port for web console
(wanted "+portRange+")");
-        }
-
-        server = new Server();
-        final Connector connector;
-        if (getHttpsEnabled()) {
-            connector = new SslSelectChannelConnector(createContextFactory());
-        } else {
-            connector = new SelectChannelConnector();
-        }
-        if (bindAddress != null) {
-            connector.setHost(bindAddress.getHostName());
-        }
-        connector.setPort(actualPort);
-        server.setConnectors(new Connector[]{connector});
-
-        if (bindAddress == null || bindAddress.equals(InetAddress.getByAddress(new byte[]
{ 0, 0, 0, 0 }))) {
-            actualAddress = BrooklynNetworkUtils.getLocalhostInetAddress();
-        } else {
-            actualAddress = bindAddress;
-        }
-
-        // use a nice name in the thread pool (otherwise this is exactly the same as Server
defaults)
-        QueuedThreadPool threadPool = new QueuedThreadPool();
-        threadPool.setName("brooklyn-jetty-server-"+actualPort+"-"+threadPool.getName());
-        server.setThreadPool(threadPool);
-
-        if (log.isDebugEnabled())
-            log.debug("Starting Brooklyn console at "+getRootUrl()+", running " + war + (wars
!= null ? " and " + wars.values() : ""));
-        
-        addShutdownHook();
-
-        MutableMap<String, String> allWars = MutableMap.copyOf(wars);
-        String rootWar = allWars.remove("/");
-        if (rootWar==null) rootWar = war;
-        
-        for (Map.Entry<String, String> entry : allWars.entrySet()) {
-            String pathSpec = entry.getKey();
-            String warUrl = entry.getValue();
-            WebAppContext webapp = deploy(pathSpec, warUrl);
-            webapp.setTempDirectory(Os.mkdirs(new File(webappTempDir, newTimestampedDirName("war",
8))));
-        }
-        rootContext = deploy("/", rootWar);
-        rootContext.setTempDirectory(Os.mkdirs(new File(webappTempDir, "war-root")));
-
-        rootContext.addFilter(RequestTaggingFilter.class, "/*", EnumSet.allOf(DispatcherType.class));
-        if (securityFilterClazz != null) {
-            rootContext.addFilter(securityFilterClazz, "/*", EnumSet.allOf(DispatcherType.class));
-        }
-        rootContext.addFilter(LoggingFilter.class, "/*", EnumSet.allOf(DispatcherType.class));
-        rootContext.addFilter(HaMasterCheckFilter.class, "/*", EnumSet.allOf(DispatcherType.class));
-        installAsServletFilter(rootContext);
-
-        server.setHandler(handlers);
-        server.start();
-        //reinit required because some webapps (eg grails) might wipe our language extension
bindings
-        BrooklynInitialization.reinitAll();
-
-        if (managementContext instanceof ManagementContextInternal) {
-            ((ManagementContextInternal) managementContext).setManagementNodeUri(new URI(getRootUrl()));
-        }
-
-        log.info("Started Brooklyn console at "+getRootUrl()+", running " + rootWar + (allWars!=null
&& !allWars.isEmpty() ? " and " + wars.values() : ""));
-    }
-
-    private SslContextFactory createContextFactory() throws KeyStoreException {
-        SslContextFactory sslContextFactory = new SslContextFactory();
-
-        // allow webconsole keystore & related properties to be set in brooklyn.properties
-        String ksUrl = getKeystoreUrl();
-        String ksPassword = getConfig(keystorePassword, BrooklynWebConfig.KEYSTORE_PASSWORD);
-        String ksCertAlias = getConfig(keystoreCertAlias, BrooklynWebConfig.KEYSTORE_CERTIFICATE_ALIAS);
-        String trProtos = getConfig(transportProtocols, BrooklynWebConfig.TRANSPORT_PROTOCOLS);
-        String trCiphers = getConfig(transportCiphers, BrooklynWebConfig.TRANSPORT_CIPHERS);
-        
-        if (ksUrl!=null) {
-            sslContextFactory.setKeyStorePath(getLocalKeyStorePath(ksUrl));
-            if (Strings.isEmpty(ksPassword))
-                throw new IllegalArgumentException("Keystore password is required and non-empty
if keystore is specified.");
-            sslContextFactory.setKeyStorePassword(ksPassword);
-            if (Strings.isNonEmpty(ksCertAlias))
-                sslContextFactory.setCertAlias(ksCertAlias);
-        } else {
-            log.info("No keystore specified but https enabled; creating a default keystore");
-            
-            if (Strings.isEmpty(ksCertAlias))
-                ksCertAlias = "web-console";
-            
-            // if password is blank the process will block and read from stdin !
-            if (Strings.isEmpty(ksPassword)) {
-                ksPassword = Identifiers.makeRandomId(8);
-                log.debug("created random password "+ksPassword+" for ad hoc internal keystore");
-            }
-            
-            KeyStore ks = SecureKeys.newKeyStore();
-            KeyPair key = SecureKeys.newKeyPair();
-            X509Certificate cert = new FluentKeySigner("brooklyn").newCertificateFor("web-console",
key);
-            ks.setKeyEntry(ksCertAlias, key.getPrivate(), ksPassword.toCharArray(),
-                new Certificate[] { cert });
-            
-            sslContextFactory.setKeyStore(ks);
-            sslContextFactory.setKeyStorePassword(ksPassword);
-            sslContextFactory.setCertAlias(ksCertAlias);
-        }
-        if (!Strings.isEmpty(truststorePath)) {
-            sslContextFactory.setTrustStore(checkFileExists(truststorePath, "truststore"));
-            sslContextFactory.setTrustStorePassword(trustStorePassword);
-        }
-
-        if (Strings.isNonBlank(trProtos)) {
-            sslContextFactory.setIncludeProtocols(parseArray(trProtos));
-        }
-        if (Strings.isNonBlank(trCiphers)) {
-            sslContextFactory.setIncludeCipherSuites(parseArray(trCiphers));
-        }
-        return sslContextFactory;
-    }
-
-    private String[] parseArray(String list) {
-        List<String> arr = Splitter.on(",").omitEmptyStrings().trimResults().splitToList(list);
-        return arr.toArray(new String[arr.size()]);
-    }
-
-    private String getKeystoreUrl() {
-        if (keystoreUrl != null) {
-            if (Strings.isNonBlank(keystorePath) && !keystoreUrl.equals(keystorePath))
{
-                log.warn("Deprecated 'keystorePath' supplied with different value than 'keystoreUrl',
preferring the latter: "+
-                        keystorePath+" / "+keystoreUrl);
-            }
-            return keystoreUrl;
-        } else if (Strings.isNonBlank(keystorePath)) {
-            log.warn("Deprecated 'keystorePath' used; callers should use 'keystoreUrl'");
-            return keystorePath;
-        } else {
-            return managementContext.getConfig().getConfig(BrooklynWebConfig.KEYSTORE_URL);
-        }
-    }
-
-    private <T> T getConfig(T override, ConfigKey<T> key) {
-        if (override!=null) {
-            return override;
-        } else {
-            return managementContext.getConfig().getConfig(key);
-        }
-    }
-
-    private String getLocalKeyStorePath(String keystoreUrl) {
-        ResourceUtils res = ResourceUtils.create(this);
-        res.checkUrlExists(keystoreUrl, BrooklynWebConfig.KEYSTORE_URL.getName());
-        if (new File(keystoreUrl).exists()) {
-            return keystoreUrl;
-        } else {
-            InputStream keystoreStream;
-            try {
-                keystoreStream = res.getResourceFromUrl(keystoreUrl);
-            } catch (Exception e) {
-                Exceptions.propagateIfFatal(e);
-                throw new IllegalArgumentException("Unable to access URL: "+keystoreUrl,
e);
-            }
-            File tmp = Os.newTempFile("brooklyn-keystore", "ks");
-            tmp.deleteOnExit();
-            FileUtil.copyTo(keystoreStream, tmp);
-            Streams.closeQuietly(keystoreStream);
-            return tmp.getAbsolutePath();
-        }
-    }
-
-    private String newTimestampedDirName(String prefix, int randomSuffixLength) {
-        return prefix + "-" + new SimpleDateFormat("yyyyMMdd-HHmmss").format(new Date())
+ "-" + Identifiers.makeRandomId(randomSuffixLength);
-    }
-    
-    private String checkFileExists(String path, String name) {
-        if(!new File(path).exists()){
-            throw new IllegalArgumentException("Could not find "+name+": "+path);
-        }
-        return path;
-    }
-
-    /**
-     * Asks the app server to stop and waits for it to finish up.
-     */
-    public synchronized void stop() throws Exception {
-        if (server==null) return;
-        String root = getRootUrl();
-        if (shutdownHook != null) Threads.removeShutdownHook(shutdownHook);
-        if (log.isDebugEnabled())
-            log.debug("Stopping Brooklyn web console at "+root+ " (" + war + (wars != null
? " and " + wars.values() : "") + ")");
-
-        server.stop();
-        try {
-            server.join();
-        } catch (Exception e) {
-            /* NPE may be thrown e.g. if threadpool not started */
-        }
-        server = null;
-        LocalhostMachineProvisioningLocation.releasePort(getAddress(), actualPort);
-        actualPort = -1;
-        if (log.isDebugEnabled())
-            log.debug("Stopped Brooklyn web console at "+root);
-    }
-
-    /** serve given WAR at the given pathSpec; if not yet started, it is simply remembered
until start;
-     * if server already running, the context for this WAR is started.
-     * @return the context created and added as a handler 
-     * (and possibly already started if server is started,
-     * so be careful with any changes you make to it!)  */
-    public WebAppContext deploy(final String pathSpec, final String warUrl) {
-        String cleanPathSpec = pathSpec;
-        while (cleanPathSpec.startsWith("/"))
-            cleanPathSpec = cleanPathSpec.substring(1);
-        boolean isRoot = cleanPathSpec.isEmpty();
-
-        WebAppContext context = new WebAppContext();
-        context.setAttribute(BrooklynServiceAttributes.BROOKLYN_MANAGEMENT_CONTEXT, managementContext);
-        for (Map.Entry<String, Object> attributeEntry : attributes.entrySet()) {
-            context.setAttribute(attributeEntry.getKey(), attributeEntry.getValue());
-        }
-
-        try {
-            File tmpWarFile = Os.writeToTempFile(new CustomResourceLocator(managementContext.getConfig(),
ResourceUtils.create(this)).getResourceFromUrl(warUrl), 
-                    isRoot ? "ROOT" : ("embedded-" + cleanPathSpec), ".war");
-            context.setWar(tmpWarFile.getAbsolutePath());
-        } catch (Exception e) {
-            log.warn("Failed to deploy webapp "+pathSpec+" from "+warUrl
-                + (ignoreWebappDeploymentFailures ? "; launching run without WAR" : " (rethrowing)")
-                + ": "+Exceptions.collapseText(e));
-            if (!ignoreWebappDeploymentFailures) {
-                throw new IllegalStateException("Failed to deploy webapp "+pathSpec+" from
"+warUrl+": "+Exceptions.collapseText(e), e);
-            }
-            log.debug("Detail on failure to deploy webapp: "+e, e);
-            context.setWar("/dev/null");
-        }
-
-        context.setContextPath("/" + cleanPathSpec);
-        context.setParentLoaderPriority(true);
-
-        deploy(context);
-        return context;
-    }
-
-    private Thread shutdownHook = null;
-
-    protected synchronized void addShutdownHook() {
-        if (shutdownHook!=null) return;
-        // some webapps can generate a lot of output if we don't shut down the browser first
-        shutdownHook = Threads.addShutdownHook(new Runnable() {
-            @Override
-            public void run() {
-                log.debug("BrooklynWebServer detected shutdown: stopping web-console");
-                try {
-                    stop();
-                } catch (Exception e) {
-                    log.error("Failure shutting down web-console: "+e, e);
-                }
-            }
-        });
-    }
-
-    public void deploy(WebAppContext context) {
-        try {
-            handlers.updateHandler(context);
-        } catch (Exception e) {
-            Throwables.propagate(e);
-        }
-    }
-    
-    public Server getServer() {
-        return server;
-    }
-    
-    public WebAppContext getRootContext() {
-        return rootContext;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f58ef3e/usage/launcher/src/main/java/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/main/java/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java
b/usage/launcher/src/main/java/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java
deleted file mode 100644
index 3bd4823..0000000
--- a/usage/launcher/src/main/java/brooklyn/launcher/camp/BrooklynCampPlatformLauncher.java
+++ /dev/null
@@ -1,72 +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 brooklyn.launcher.camp;
-
-import io.brooklyn.camp.CampServer;
-import io.brooklyn.camp.spi.PlatformRootSummary;
-import brooklyn.entity.basic.BrooklynShutdownHooks;
-import brooklyn.launcher.BrooklynLauncher;
-import brooklyn.management.ManagementContext;
-import brooklyn.management.internal.LocalManagementContext;
-
-import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform;
-import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherAbstract;
-
-import com.google.common.annotations.Beta;
-
-/** variant of super who also starts a CampServer for convenience */
-@Beta
-public class BrooklynCampPlatformLauncher extends BrooklynCampPlatformLauncherAbstract {
-
-    protected BrooklynLauncher brooklynLauncher;
-    protected CampServer campServer;
-
-    @Override
-    public BrooklynCampPlatformLauncher launch() {
-        assert platform == null;
-
-        mgmt = newManagementContext();
-        
-        // We created the management context, so we are responsible for terminating it
-        BrooklynShutdownHooks.invokeTerminateOnShutdown(mgmt);
-
-        brooklynLauncher = BrooklynLauncher.newInstance().managementContext(mgmt).start();
-        platform = new BrooklynCampPlatform(
-                PlatformRootSummary.builder().name("Brooklyn CAMP Platform").build(),
-                mgmt).setConfigKeyAtManagmentContext();
-        
-        campServer = new CampServer(getCampPlatform(), "").start();
-        
-        return this;
-    }
-    
-    protected ManagementContext newManagementContext() {
-        return new LocalManagementContext();
-    }
-
-    public static void main(String[] args) {
-        new BrooklynCampPlatformLauncher().launch();
-    }
-
-    public void stopServers() throws Exception {
-        brooklynLauncher.getServerDetails().getWebServer().stop();
-        campServer.stop();
-    }
-    
-}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f58ef3e/usage/launcher/src/main/java/brooklyn/launcher/camp/SimpleYamlLauncher.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/main/java/brooklyn/launcher/camp/SimpleYamlLauncher.java b/usage/launcher/src/main/java/brooklyn/launcher/camp/SimpleYamlLauncher.java
deleted file mode 100644
index 0603ded..0000000
--- a/usage/launcher/src/main/java/brooklyn/launcher/camp/SimpleYamlLauncher.java
+++ /dev/null
@@ -1,35 +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 brooklyn.launcher.camp;
-
-import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherAbstract;
-import org.apache.brooklyn.camp.brooklyn.YamlLauncherAbstract;
-
-import com.google.common.annotations.Beta;
-
-/** convenience for launching YAML files directly */
-@Beta
-public class SimpleYamlLauncher extends YamlLauncherAbstract {
-
-    @Override
-    protected BrooklynCampPlatformLauncherAbstract newPlatformLauncher() {
-        return new BrooklynCampPlatformLauncher();
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f58ef3e/usage/launcher/src/main/java/brooklyn/launcher/config/BrooklynGlobalConfig.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/main/java/brooklyn/launcher/config/BrooklynGlobalConfig.java
b/usage/launcher/src/main/java/brooklyn/launcher/config/BrooklynGlobalConfig.java
deleted file mode 100644
index 408c08a..0000000
--- a/usage/launcher/src/main/java/brooklyn/launcher/config/BrooklynGlobalConfig.java
+++ /dev/null
@@ -1,66 +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 brooklyn.launcher.config;
-
-import brooklyn.config.BrooklynServiceAttributes;
-import brooklyn.config.ConfigKey;
-import brooklyn.entity.basic.BrooklynConfigKeys;
-import brooklyn.location.cloud.CloudLocationConfig;
-import brooklyn.management.internal.BrooklynGarbageCollector;
-import brooklyn.rest.BrooklynWebConfig;
-import brooklyn.util.internal.BrooklynSystemProperties;
-import brooklyn.util.internal.StringSystemProperty;
-import brooklyn.util.time.Duration;
-
-/**
- * Convenience collection of popular global configuration values.
- * (Also a handy way to recall where config keys are set.)
- * <p>
- * These can typically be set in brooklyn.properties for global applicability.
- * In some cases (eg SSH_CONFIG_* keys) they can also be set on entities/locations 
- * for behaviour specific to that entity.
- * <p>
- * Also see:
- * <li> {@link BrooklynSystemProperties}
- * <li> {@link BrooklynServiceAttributes}
- * <li> {@link CloudLocationConfig} and classes in that hierarchy.
- */
-public class BrooklynGlobalConfig {
-
-    public static final ConfigKey<Boolean> REQUIRE_HTTPS = BrooklynWebConfig.HTTPS_REQUIRED;
-    
-    public static final ConfigKey<Duration> GC_PERIOD = BrooklynGarbageCollector.GC_PERIOD;
-    public static final ConfigKey<Boolean> DO_SYSTEM_GC = BrooklynGarbageCollector.DO_SYSTEM_GC;
-    public static final ConfigKey<Integer> MAX_TASKS_PER_TAG = BrooklynGarbageCollector.MAX_TASKS_PER_TAG;
-    public static final ConfigKey<Integer> MAX_TASKS_PER_ENTITY = BrooklynGarbageCollector.MAX_TASKS_PER_ENTITY;
-    public static final ConfigKey<Integer> MAX_TASKS_GLOBAL = BrooklynGarbageCollector.MAX_TASKS_GLOBAL;
-    public static final ConfigKey<Duration> MAX_TASK_AGE = BrooklynGarbageCollector.MAX_TASK_AGE;
-
-    public static final StringSystemProperty LOCALHOST_IP_ADDRESS = BrooklynServiceAttributes.LOCALHOST_IP_ADDRESS;
-    
-    // brooklyn.ssh.config.noDeleteAfterExec = true   will cause scripts to be left in situ
for debugging
-    public static final ConfigKey<Boolean> SSH_CONFIG_NO_DELETE_SCRIPT = BrooklynConfigKeys.SSH_CONFIG_NO_DELETE_SCRIPT;
-    
-    public static final ConfigKey<String> SSH_CONFIG_SCRIPT_DIR = BrooklynConfigKeys.SSH_CONFIG_SCRIPT_DIR;
-    public static final ConfigKey<String> SSH_CONFIG_SCRIPT_HEADER = BrooklynConfigKeys.SSH_CONFIG_SCRIPT_HEADER;
-    public static final ConfigKey<String> SSH_CONFIG_DIRECT_HEADER = BrooklynConfigKeys.SSH_CONFIG_DIRECT_HEADER;
-
-    // TODO other constants from elsewhere
-    
-}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f58ef3e/usage/launcher/src/main/java/brooklyn/launcher/config/CustomResourceLocator.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/main/java/brooklyn/launcher/config/CustomResourceLocator.java
b/usage/launcher/src/main/java/brooklyn/launcher/config/CustomResourceLocator.java
deleted file mode 100644
index dfdd643..0000000
--- a/usage/launcher/src/main/java/brooklyn/launcher/config/CustomResourceLocator.java
+++ /dev/null
@@ -1,127 +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 brooklyn.launcher.config;
-
-import java.io.File;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import brooklyn.BrooklynVersion;
-import brooklyn.config.ConfigMap;
-import brooklyn.util.ResourceUtils;
-import brooklyn.util.exceptions.Exceptions;
-import brooklyn.util.os.Os;
-
-/** class which allows non-standard locators to be registered for URL's being loaded */
-public class CustomResourceLocator {
-
-    private static final Logger log = LoggerFactory.getLogger(CustomResourceLocator.class);
-    
-    protected final ResourceUtils r;
-    private ConfigMap config;
-
-    public interface ResourceLocator {
-        public boolean isApplicable(String url, ConfigMap config);
-        public InputStream locate(String url, ConfigMap config, ResourceUtils r);
-    }
-    
-    private static List<ResourceLocator> locators = new ArrayList<ResourceLocator>();
-    
-    public CustomResourceLocator(ConfigMap config, ResourceUtils r) {
-        this.config = config;
-        this.r = r;
-    }
-    
-    public static void registerAlternateLocator(ResourceLocator locator) {
-        locators.add(0, locator);
-    }
-    
-    /** returns the first known locator for the given url/config pair */
-    public static ResourceLocator getLocatorFor(String url, ConfigMap config) {
-        for (ResourceLocator l: locators) {
-            if (l.isApplicable(url, config)) return l;
-        }
-        return null;
-    }
-    
-    /** finds the file indicated at the URL, using some rewrites if necessary to work around
some known issues.
-     * <p>
-     * in particular, eclipse often does not copy WAR files as instructed by maven, so brooklyn.war
might not be found */
-    public InputStream getResourceFromUrl(String url) {
-        // TODO we could allow the source to be overridden from config,
-        // by allowing configuration e.g.
-        // brooklyn.path.override.brooklyn.war=classpath://brooklyn-replacement-webapp.war
-        // (not sure if this is a good idea or not)
-        
-        try {
-            return r.getResourceFromUrl(url);
-        } catch (Exception e) {
-            ResourceLocator locator = getLocatorFor(url, config);
-            if (locator!=null) {
-                log.debug("Unable to load resource from "+url+"; attempting with locator
"+locator);
-                try {
-                    InputStream result = locator.locate(url, config, r);
-                    if (result!=null) return result;
-                    if (result==null)
-                        log.warn("Unable to load resource from "+url+", even with custom
locator; rethrowing original exception");
-                } catch (Exception e2) {
-                    log.warn("Unable to load resource from "+url+", even with custom locator;
rethrowing original exception, new exception is: "+e2);
-                }
-            }
-            throw Exceptions.propagate(e);
-        }
-    }
-
-    public static class SearchingClassPathInDevMode implements ResourceLocator {
-        private final String urlToSearchFor;
-        private final String classpathSuffixToSearchFor;
-        private final String classpathSuffixToUse;
-
-        public SearchingClassPathInDevMode(String urlToSearchFor, String classpathSuffixToSearchFor,
String classpathSuffixToUse) {
-            this.urlToSearchFor = urlToSearchFor;
-            this.classpathSuffixToSearchFor = Os.nativePath(classpathSuffixToSearchFor);
-            this.classpathSuffixToUse = classpathSuffixToUse;
-        }
-        
-        @Override
-        public boolean isApplicable(String url, ConfigMap config) {
-            return BrooklynVersion.isDevelopmentEnvironment() && urlToSearchFor.equals(url);
-        }
-
-        @Override
-        public InputStream locate(String url, ConfigMap config, ResourceUtils r) {
-            String cp = System.getProperty("java.class.path");
-            int cpi = cp.indexOf(classpathSuffixToSearchFor);
-            if (cpi==-1) return null;
-            String path = cp.substring(0, cpi);
-            int lps = path.lastIndexOf(File.pathSeparatorChar);
-            if (lps>=0) path = path.substring(lps+1);
-            path = path + classpathSuffixToUse;
-            log.debug("Looking for "+url+" in revised location "+path);
-            InputStream result = r.getResourceFromUrl(path);
-            log.info("Using "+url+" from revised location "+path);
-            return result;
-        }
-    }
-    
-}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f58ef3e/usage/launcher/src/main/java/brooklyn/launcher/config/StopWhichAppsOnShutdown.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/main/java/brooklyn/launcher/config/StopWhichAppsOnShutdown.java
b/usage/launcher/src/main/java/brooklyn/launcher/config/StopWhichAppsOnShutdown.java
deleted file mode 100644
index 184278b..0000000
--- a/usage/launcher/src/main/java/brooklyn/launcher/config/StopWhichAppsOnShutdown.java
+++ /dev/null
@@ -1,23 +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 brooklyn.launcher.config;
-
-public enum StopWhichAppsOnShutdown {
-    ALL, ALL_IF_NOT_PERSISTED, NONE, THESE, THESE_IF_NOT_PERSISTED
-}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f58ef3e/usage/launcher/src/main/java/brooklyn/util/web/ContextHandlerCollectionHotSwappable.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/main/java/brooklyn/util/web/ContextHandlerCollectionHotSwappable.java
b/usage/launcher/src/main/java/brooklyn/util/web/ContextHandlerCollectionHotSwappable.java
deleted file mode 100644
index 1855c7d..0000000
--- a/usage/launcher/src/main/java/brooklyn/util/web/ContextHandlerCollectionHotSwappable.java
+++ /dev/null
@@ -1,62 +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 brooklyn.util.web;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.handler.ContextHandlerCollection;
-import org.eclipse.jetty.webapp.WebAppContext;
-
-public class ContextHandlerCollectionHotSwappable extends ContextHandlerCollection {
-
-    public synchronized void updateHandler(WebAppContext context) throws Exception {
-        Handler[] hl0 = getHandlers();
-        List<Handler> hl = hl0!=null ? new ArrayList<Handler>(Arrays.asList(hl0))
: new ArrayList<Handler>();
-        // remove any previous version
-        removeContextFromList(hl, context.getContextPath());
-        // have to add before the root war (remove root war then add back)
-        Handler oldRoot = removeContextFromList(hl, "/");
-        // now add and add back any root
-        hl.add(context);
-        if (oldRoot!=null) hl.add(oldRoot);
-        setHandlers(hl.toArray(new Handler[0]));
-        
-        // and if we are already running, start the new context
-        if (isRunning()) {
-            context.start();
-        }
-    }
-
-    public static Handler removeContextFromList(List<Handler> hl, String contextPath)
{
-        Iterator<Handler> hi = hl.iterator();
-        while (hi.hasNext()) {
-            Handler h = hi.next();
-            if ((h instanceof WebAppContext) && ((WebAppContext)h).getContextPath().equals(contextPath))
{
-                hi.remove();
-                return h;
-            }
-        }
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/6f58ef3e/usage/launcher/src/main/java/org/apache/brooklyn/launcher/Activator.java
----------------------------------------------------------------------
diff --git a/usage/launcher/src/main/java/org/apache/brooklyn/launcher/Activator.java b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/Activator.java
new file mode 100644
index 0000000..6215cc7
--- /dev/null
+++ b/usage/launcher/src/main/java/org/apache/brooklyn/launcher/Activator.java
@@ -0,0 +1,39 @@
+/*
+ * 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.brooklyn.launcher;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Activator implements BundleActivator {
+
+    public static final Logger log = LoggerFactory.getLogger(Activator.class);
+
+    public void start(BundleContext context) throws Exception {
+        //does nothing on startup, just makes resources available
+        //TODO maybe it wants to register a service that others could use?
+        log.info("Starting brooklyn-launcher OSGi bundle");
+    }
+
+    public void stop(BundleContext context) throws Exception {
+        log.info("Stopping brooklyn-launcher OSGi bundle");
+    }
+}
\ No newline at end of file


Mime
View raw message