--- a/agent/cli/pom.xml	Wed Apr 06 14:52:26 2016 +0200
+++ b/agent/cli/pom.xml	Fri Apr 08 13:18:48 2016 +0200
@@ -122,11 +122,11 @@
         <configuration>
           <instructions>
             <Bundle-Vendor>Red Hat, Inc.</Bundle-Vendor>
-            <Bundle-Activator>com.redhat.thermostat.agent.cli.impl.Activator</Bundle-Activator>
+            <Bundle-Activator>com.redhat.thermostat.agent.cli.internal.Activator</Bundle-Activator>
             <Bundle-SymbolicName>com.redhat.thermostat.agent.cli</Bundle-SymbolicName>
             <Private-Package>
-              com.redhat.thermostat.agent.cli.impl,
-              com.redhat.thermostat.agent.cli.impl.locale,
+              com.redhat.thermostat.agent.cli.internal,
+              com.redhat.thermostat.agent.cli.internal.locale,
             </Private-Package>
             <!-- Do not autogenerate uses clauses in Manifests -->
             <_nouses>true</_nouses>

--- a/agent/cli/src/main/java/com/redhat/thermostat/agent/cli/impl/Activator.java	Wed Apr 06 14:52:26 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-/*
- * Copyright 2012-2016 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.agent.cli.impl;
-
-import java.util.Map;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
-
-import com.redhat.thermostat.common.ExitStatus;
-import com.redhat.thermostat.common.MultipleServiceTracker;
-import com.redhat.thermostat.common.MultipleServiceTracker.Action;
-import com.redhat.thermostat.common.cli.CommandRegistry;
-import com.redhat.thermostat.common.cli.CommandRegistryImpl;
-import com.redhat.thermostat.shared.config.SSLConfiguration;
-import com.redhat.thermostat.storage.core.StorageCredentials;
-import com.redhat.thermostat.storage.core.WriterID;
-
-public class Activator implements BundleActivator {
-
-    private CommandRegistry reg;
-    private AgentApplication agentApplication;
-    private MultipleServiceTracker tracker;
-    private ServiceTracker<StorageCredentials, StorageCredentials> credsTracker;
-
-    @Override
-    public void start(final BundleContext context) throws Exception {
-        reg = new CommandRegistryImpl(context);
-        
-        Class<?>[] deps = new Class<?>[] {
-                ExitStatus.class,
-                WriterID.class,
-                SSLConfiguration.class
-        };
-        tracker = new MultipleServiceTracker(context, deps, new Action() {
-            
-            @Override
-            public void dependenciesAvailable(Map<String, Object> services) {
-                ExitStatus exitStatus = (ExitStatus) services.get(ExitStatus.class.getName());
-                WriterID writerID = (WriterID) services.get(WriterID.class.getName());
-                SSLConfiguration sslConf = (SSLConfiguration) services.get(SSLConfiguration.class.getName());
-                agentApplication = new AgentApplication(context, exitStatus, writerID, sslConf);
-                reg.registerCommand("service", new ServiceCommand(context));
-                reg.registerCommand("agent", agentApplication);
-            }
-
-            @Override
-            public void dependenciesUnavailable() {
-                agentApplication.shutdown(ExitStatus.EXIT_SUCCESS);
-                reg.unregisterCommands();
-            }
-        });
-        credsTracker = new ServiceTracker<StorageCredentials, StorageCredentials>(
-                context, StorageCredentials.class, new ServiceTrackerCustomizer<StorageCredentials, StorageCredentials>() {
-
-            @Override
-            public StorageCredentials addingService(ServiceReference<StorageCredentials> ref) {
-                StorageCredentials creds = context.getService(ref);
-                agentApplication.setStorageCredentials(creds);
-                return creds;
-            }
-
-            @Override
-            public void modifiedService(ServiceReference<StorageCredentials> ref,
-                    StorageCredentials creds) {
-                // nothing
-            }
-
-            @Override
-            public void removedService(ServiceReference<StorageCredentials> ref,
-                    StorageCredentials arg1) {
-                if (agentApplication != null) {
-                    agentApplication.setStorageCredentials(null); // remove creds
-                }
-                context.ungetService(ref);
-            }
-            
-        });
-        tracker.open();
-        credsTracker.open();
-    }
-
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        if (agentApplication != null) {
-            // Bundle may be shut down *before* deps become available and
-            // app is set.
-            agentApplication.shutdown(ExitStatus.EXIT_SUCCESS);
-        }
-        reg.unregisterCommands();
-        credsTracker.close();
-        tracker.close();
-    }
-}
-

--- a/agent/cli/src/main/java/com/redhat/thermostat/agent/cli/impl/AgentApplication.java	Wed Apr 06 14:52:26 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,393 +0,0 @@
-/*
- * Copyright 2012-2016 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.agent.cli.impl;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-
-import sun.misc.Signal;
-import sun.misc.SignalHandler;
-
-import com.redhat.thermostat.agent.Agent;
-import com.redhat.thermostat.agent.cli.impl.locale.LocaleResources;
-import com.redhat.thermostat.agent.command.ConfigurationServer;
-import com.redhat.thermostat.agent.config.AgentConfigsUtils;
-import com.redhat.thermostat.agent.config.AgentOptionParser;
-import com.redhat.thermostat.agent.config.AgentStartupConfiguration;
-import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool;
-import com.redhat.thermostat.backend.BackendRegistry;
-import com.redhat.thermostat.backend.BackendService;
-import com.redhat.thermostat.common.ExitStatus;
-import com.redhat.thermostat.common.LaunchException;
-import com.redhat.thermostat.common.MultipleServiceTracker;
-import com.redhat.thermostat.common.MultipleServiceTracker.Action;
-import com.redhat.thermostat.common.cli.AbstractStateNotifyingCommand;
-import com.redhat.thermostat.common.cli.Arguments;
-import com.redhat.thermostat.common.cli.CommandContext;
-import com.redhat.thermostat.common.cli.CommandException;
-import com.redhat.thermostat.common.cli.DependencyServices;
-import com.redhat.thermostat.common.tools.ApplicationState;
-import com.redhat.thermostat.common.utils.LoggingUtils;
-import com.redhat.thermostat.shared.config.InvalidConfigurationException;
-import com.redhat.thermostat.shared.config.SSLConfiguration;
-import com.redhat.thermostat.shared.locale.Translate;
-import com.redhat.thermostat.storage.core.Connection.ConnectionListener;
-import com.redhat.thermostat.storage.core.Connection.ConnectionStatus;
-import com.redhat.thermostat.storage.core.ConnectionException;
-import com.redhat.thermostat.storage.core.DbService;
-import com.redhat.thermostat.storage.core.DbServiceFactory;
-import com.redhat.thermostat.storage.core.Storage;
-import com.redhat.thermostat.storage.core.StorageCredentials;
-import com.redhat.thermostat.storage.core.WriterID;
-import com.redhat.thermostat.storage.dao.AgentInfoDAO;
-import com.redhat.thermostat.storage.dao.BackendInfoDAO;
-
-@SuppressWarnings("restriction")
-public final class AgentApplication extends AbstractStateNotifyingCommand {
-
-    /**
-     * Property for turning on verbose mode. This is there so as to be able to
-     * run integration tests independent of log levels.
-     */
-    private static final String VERBOSE_MODE_PROPERTY = "thermostat.agent.verbose";
-    // Messages printed in verbose mode. Integration tests use this. Be careful
-    // when you change those!
-    private static final String VERBOSE_MODE_AGENT_STOPPED_MSG = "Agent stopped.";
-    private static final String VERBOSE_MODE_AGENT_STARTED_MSG = "Agent started.";
-
-    private static final String SIGINT_NAME = "INT";
-    private static final String SIGTERM_NAME = "TERM";
-
-    private static final Logger logger = LoggingUtils.getLogger(AgentApplication.class);
-    private static final Translate<LocaleResources> t = LocaleResources.createLocalizer();
-    
-    private final BundleContext bundleContext;
-    private final ConfigurationCreator configurationCreator;
-
-    private AgentStartupConfiguration configuration;
-    private AgentOptionParser parser;
-    private DbServiceFactory dbServiceFactory;
-    @SuppressWarnings("rawtypes")
-    private ServiceTracker configServerTracker;
-    private MultipleServiceTracker depTracker;
-    private final ExitStatus exitStatus;
-    private final WriterID writerId;
-    private final SSLConfiguration sslConf;
-    private final DependencyServices depServices;
-    private CountDownLatch shutdownLatch;
-
-    private CustomSignalHandler handler;
-
-    public AgentApplication(BundleContext bundleContext, ExitStatus exitStatus, WriterID writerId, SSLConfiguration sslConf) {
-        this(bundleContext, exitStatus, writerId, sslConf, new DependencyServices(), new ConfigurationCreator(), new DbServiceFactory());
-    }
-
-    AgentApplication(BundleContext bundleContext, ExitStatus exitStatus, WriterID writerId, SSLConfiguration sslConf, DependencyServices depServices, ConfigurationCreator configurationCreator, DbServiceFactory dbServiceFactory) {
-        this.bundleContext = bundleContext;
-        this.configurationCreator = configurationCreator;
-        this.dbServiceFactory = dbServiceFactory;
-        this.exitStatus = exitStatus;
-        this.writerId = writerId;
-        this.sslConf = sslConf;
-        this.depServices = depServices;
-    }
-    
-    private void parseArguments(Arguments args) throws InvalidConfigurationException {
-        parser = new AgentOptionParser(configuration, args);
-        parser.parse();
-    }
-    
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    private void runAgent(CommandContext ctx) throws CommandException {
-        long startTime = System.currentTimeMillis();
-        configuration.setStartTime(startTime);
-        
-        StorageCredentials creds = getServiceOrExit(StorageCredentials.class);
-        final DbService dbService = dbServiceFactory.createDbService(
-                configuration.getDBConnectionString(), creds, sslConf);
-        
-        shutdownLatch = new CountDownLatch(1);
-        
-        configServerTracker = new ServiceTracker(bundleContext, ConfigurationServer.class.getName(), null) {
-            @Override
-            public Object addingService(ServiceReference reference) {
-                final ConfigurationServer configServer = (ConfigurationServer) super.addingService(reference);
-                String [] host = configuration.getConfigListenAddress().split(":");
-
-                try {
-                    configServer.startListening(host[0], Integer.valueOf(host[1]));
-
-                    ConnectionListener connectionListener = new ConnectionListener() {
-                        @Override
-                        public void changed(ConnectionStatus newStatus) {
-                            switch (newStatus) {
-                            case DISCONNECTED:
-                                logger.warning("Unexpected disconnect event.");
-                                break;
-                            case CONNECTING:
-                                logger.fine("Connecting to storage.");
-                                break;
-                            case CONNECTED:
-                                logger.fine("Connected to storage");
-                                handleConnected(configServer);
-                                break;
-                            case FAILED_TO_CONNECT:
-                                // ConnectionException will be thrown
-                                break;
-                            default:
-                                logger.warning("Unfamiliar ConnectionStatus value: " + newStatus.toString());
-                            }
-                        }
-                    };
-
-                    dbService.addConnectionListener(connectionListener);
-                    logger.fine("Connecting to storage...");
-                
-                    dbService.connect();
-                } catch (IOException e) {
-                    logger.log(Level.SEVERE, e.getMessage());
-                    // log stack trace as info only
-                    logger.log(Level.INFO, e.getMessage(), e);
-                    shutdown(ExitStatus.EXIT_ERROR);
-                } catch (ConnectionException e) {
-                    logger.log(Level.SEVERE, "Could not connect to storage (" + e.getMessage() + ")");
-                    // log stack trace as info only
-                    logger.log(Level.INFO, "Could not connect to storage", e);
-                    shutdown(ExitStatus.EXIT_ERROR);
-                }
-                
-                return configServer;
-            }
-            
-            @Override
-            public void removedService(ServiceReference reference, Object service) {
-                if (shutdownLatch.getCount() > 0) {
-                    // Lost config server while still running
-                    logger.warning("ConfigurationServer unexpectedly became unavailable");
-                }
-                // Stop listening on command channel
-                ConfigurationServer server = (ConfigurationServer) service;
-                server.stopListening();
-                super.removedService(reference, service);
-            }
-        };
-        configServerTracker.open();
-        
-        try {
-            // Wait for either SIGINT or SIGTERM
-            shutdownLatch.await();
-            logger.fine("terminating agent cmd");
-        } catch (InterruptedException e) {
-            // Ensure proper shutdown if interrupted
-            handler.handle(new Signal(SIGINT_NAME));
-            return;
-        }
-    }
-
-    private StorageCredentials getServiceOrExit(Class<StorageCredentials> clazz) throws CommandException {
-        StorageCredentials creds = depServices.getService(clazz);
-        if (creds == null) {
-            throw new CommandException(t.localize(LocaleResources.STORAGE_CREDS_UNAVAILABLE));
-        }
-        return creds;
-    }
-    
-    void setStorageCredentials(StorageCredentials creds) {
-        if (creds == null) {
-            depServices.removeService(StorageCredentials.class);
-        } else {
-            depServices.addService(StorageCredentials.class, creds);
-        }
-    }
-
-    @Override
-    public void run(CommandContext ctx) throws CommandException {
-        configuration = configurationCreator.create();
-
-        parseArguments(ctx.getArguments());
-        if (!parser.isHelp()) {
-            runAgent(ctx);
-        }
-    }
-    
-    public void shutdown(int shutDownStatus) {
-        // Exit application
-        if (shutdownLatch != null) {
-            shutdownLatch.countDown();
-        }
-        
-        if (depTracker != null) {
-            depTracker.close();
-        }
-        if (configServerTracker != null) {
-            configServerTracker.close();
-        }
-        this.exitStatus.setExitStatus(shutDownStatus);
-        if (shutDownStatus == ExitStatus.EXIT_SUCCESS) {
-            getNotifier().fireAction(ApplicationState.STOP);
-        } else {
-            getNotifier().fireAction(ApplicationState.FAIL);
-        }
-    }
-    
-    private class CustomSignalHandler implements SignalHandler {
-        
-        private Agent agent;
-        private ConfigurationServer configServer;
-
-        public CustomSignalHandler(Agent agent, ConfigurationServer configServer) {
-            this.agent = agent;
-            this.configServer = configServer;
-        }
-        
-        @Override
-        public void handle(Signal arg0) {
-            configServer.stopListening();
-            try {
-                agent.stop();
-            } catch (Exception ex) {
-                // We don't want any exception to hold back the signal handler, otherwise
-                // there will be no way to actually stop Thermostat.
-                ex.printStackTrace();
-            }
-            logger.fine("Agent stopped.");
-            // Hook for integration tests. Print a well known message to stdout
-            // if verbose mode is turned on via the system property.
-            if (Boolean.getBoolean(VERBOSE_MODE_PROPERTY)) {
-                System.out.println(VERBOSE_MODE_AGENT_STOPPED_MSG);
-            }
-            shutdown(ExitStatus.EXIT_SUCCESS);
-        }
-        
-    }
-
-    Agent startAgent(final Storage storage, AgentInfoDAO agentInfoDAO, BackendInfoDAO backendInfoDAO, MXBeanConnectionPool pool) {
-        BackendRegistry backendRegistry = null;
-        try {
-            backendRegistry = new BackendRegistry(bundleContext);
-            
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "Could not get BackendRegistry instance.", e);
-            shutdown(ExitStatus.EXIT_ERROR);
-            // Since this would throw NPE's down the line if we continue in this
-            // method, let's fail right and early :)
-            throw new RuntimeException(e);
-        }
-
-        final Agent agent = new Agent(backendRegistry, configuration, storage, agentInfoDAO, backendInfoDAO, writerId, pool);
-        try {
-            logger.fine("Starting agent.");
-            agent.start();
-            
-            bundleContext.registerService(BackendService.class, new BackendService(), null);
-            
-        } catch (LaunchException le) {
-            logger.log(Level.SEVERE,
-                    "Agent could not start, probably because a configured backend could not be activated.",
-                    le);
-            shutdown(ExitStatus.EXIT_ERROR);
-        }
-        logger.fine("Agent started.");
-        // Hook for integration tests. Print a well known message to stdout
-        // if verbose mode is turned on via the system property.
-        if (Boolean.getBoolean(VERBOSE_MODE_PROPERTY)) {
-            System.out.println(VERBOSE_MODE_AGENT_STARTED_MSG);
-        }
-
-        logger.info("Agent id: " + agent.getId());
-        getNotifier().fireAction(ApplicationState.START, agent.getId());
-        return agent;
-    }
-    
-    private void handleConnected(final ConfigurationServer configServer) {
-        Class<?>[] deps = new Class<?>[] {
-                Storage.class,
-                AgentInfoDAO.class,
-                BackendInfoDAO.class,
-                MXBeanConnectionPool.class
-        };
-        depTracker = new MultipleServiceTracker(bundleContext, deps, new Action() {
-
-            @Override
-            public void dependenciesAvailable(Map<String, Object> services) {
-                Storage storage = (Storage) services.get(Storage.class.getName());
-                AgentInfoDAO agentInfoDAO = (AgentInfoDAO) services
-                        .get(AgentInfoDAO.class.getName());
-                BackendInfoDAO backendInfoDAO = (BackendInfoDAO) services
-                        .get(BackendInfoDAO.class.getName());
-                MXBeanConnectionPool pool = (MXBeanConnectionPool) services
-                        .get(MXBeanConnectionPool.class.getName());
-
-                Agent agent = startAgent(storage, agentInfoDAO, backendInfoDAO, pool);
-                handler = new CustomSignalHandler(agent, configServer);
-                Signal.handle(new Signal(SIGINT_NAME), handler);
-                Signal.handle(new Signal(SIGTERM_NAME), handler);
-            }
-
-            @Override
-            public void dependenciesUnavailable() {
-                if (shutdownLatch.getCount() > 0) {
-                    // In the rare case we lose one of our deps, gracefully shutdown
-                    logger.severe("Storage unexpectedly became unavailable");
-                    shutdown(ExitStatus.EXIT_ERROR);
-                }
-            }
-            
-        });
-        depTracker.open();
-    }
-
-    static class ConfigurationCreator {
-        public AgentStartupConfiguration create() throws InvalidConfigurationException {
-            return AgentConfigsUtils.createAgentConfigs();
-        }
-    }
-
-    @Override
-    public boolean isStorageRequired() {
-        return false;
-    }
-    
-}
-

--- a/agent/cli/src/main/java/com/redhat/thermostat/agent/cli/impl/ServiceCommand.java	Wed Apr 06 14:52:26 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,202 +0,0 @@
-/*
- * Copyright 2012-2016 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.agent.cli.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Semaphore;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-import com.redhat.thermostat.agent.cli.impl.locale.LocaleResources;
-import com.redhat.thermostat.common.ActionEvent;
-import com.redhat.thermostat.common.ActionListener;
-import com.redhat.thermostat.common.cli.AbstractStateNotifyingCommand;
-import com.redhat.thermostat.common.cli.CommandContext;
-import com.redhat.thermostat.common.cli.CommandException;
-import com.redhat.thermostat.common.cli.Console;
-import com.redhat.thermostat.common.tools.ApplicationState;
-import com.redhat.thermostat.common.utils.LoggingUtils;
-import com.redhat.thermostat.launcher.Launcher;
-import com.redhat.thermostat.shared.locale.Translate;
-
-/**
- * Simple service that allows starting Agent and DB Backend
- * in a single step.
- */
-public class ServiceCommand extends AbstractStateNotifyingCommand implements ActionListener<ApplicationState> {
-    
-    private static final Translate<LocaleResources> translator = LocaleResources.createLocalizer();
-    private static final Logger logger = LoggingUtils.getLogger(ServiceCommand.class);
-
-    private List<ActionListener<ApplicationState>> listeners;
-    private Semaphore agentBarrier = new Semaphore(0);
-    private BundleContext context;
-    private Launcher launcher;
-    private boolean storageFailed = false;
-    private boolean agentStarted = false;
-    private CommandContext cmdCtx;
-
-    public ServiceCommand(BundleContext context) {
-        this.context = context;
-        listeners = new ArrayList<>();
-        listeners.add(this);
-    }
-
-    @Override
-    public void run(CommandContext ctx) throws CommandException {
-        cmdCtx = ctx;
-        ServiceReference launcherRef = context.getServiceReference(Launcher.class);
-        requireNonNull(launcherRef, translator.localize(LocaleResources.LAUNCHER_UNAVAILABLE));
-        launcher = (Launcher) context.getService(launcherRef);
-        String[] storageStartArgs = new String[] { "storage", "--start" };
-        launcher.run(storageStartArgs, listeners, false);
-        agentBarrier.acquireUninterruptibly();
-        
-        if (storageFailed) {
-            storageFailed = false;
-            context.ungetService(launcherRef);
-            getNotifier().fireAction(ApplicationState.FAIL);
-            throw new CommandException(translator.localize(LocaleResources.SERVICE_FAILED_TO_START_DB));
-        }
-        
-        String[] storageStopArgs = new String[] { "storage", "--stop" };
-        launcher.run(storageStopArgs, false);
-
-        if (agentStarted) {
-            getNotifier().fireAction(ApplicationState.STOP);
-        }
-
-        context.ungetService(launcherRef);
-        cmdCtx = null;
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent<ApplicationState> actionEvent) {
-        if (actionEvent.getSource() instanceof AbstractStateNotifyingCommand) {
-            AbstractStateNotifyingCommand storage = (AbstractStateNotifyingCommand) actionEvent.getSource();
-            // Implementation detail: there is a single StorageCommand instance registered
-            // as an OSGi service.  We remove ourselves as listener so that we don't get
-            // notified in the case that the command is invoked by some other means later.
-            storage.getNotifier().removeActionListener(this);
-            
-            try {
-                switch (actionEvent.getActionId()) {
-                case START:
-                    // Payload is connection URL
-                    Object payload = actionEvent.getPayload();
-                    if (payload == null || !(payload instanceof String)) {
-                        getNotifier().fireAction(ApplicationState.FAIL);
-                        throw new CommandException(translator.localize(LocaleResources.UNEXPECTED_RESULT_STORAGE));
-                    }
-                    String dbUrl = (String) payload;
-                    String[] agentArgs =  new String[] {"agent", "-d", dbUrl};
-                    logger.fine("starting agent now...");
-                    listeners.clear();
-                    listeners.add(new AgentStartedListener(cmdCtx.getConsole()));
-                    launcher.run(agentArgs, listeners, false);
-                    break;
-                case FAIL:
-                    storageFailed = true;
-                    // Payload is exception
-                    payload = actionEvent.getPayload();
-                    if (payload == null || !(payload instanceof Exception)) {
-                        getNotifier().fireAction(ApplicationState.FAIL);
-                        throw new CommandException(translator.localize(LocaleResources.UNEXPECTED_RESULT_STORAGE));
-                    }
-                    Exception ex = (Exception) payload;
-                    cmdCtx.getConsole().getError().println(ex.getMessage());
-                    logger.log(Level.WARNING, ex.getMessage(), ex);
-                    break;
-                }
-            } catch (CommandException e) {
-                cmdCtx.getConsole().getError().println(e.getMessage());
-            } finally {
-                agentBarrier.release();
-            }
-        }
-    }
-
-    @Override
-    public boolean isStorageRequired() {
-        return false;
-    }
-    
-    private class AgentStartedListener implements ActionListener<ApplicationState> {
-
-        private final Console console;
-
-        private AgentStartedListener(Console console) {
-            this.console = console;
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent<ApplicationState> actionEvent) {
-            if (actionEvent.getSource() instanceof AbstractStateNotifyingCommand) {
-                AbstractStateNotifyingCommand agent = (AbstractStateNotifyingCommand) actionEvent.getSource();
-                // Implementation detail: there is a single AgentCommand instance registered
-                // as an OSGi service. We remove ourselves as listener so that we don't get
-                // notified in the case that the command is invoked by some other means later.
-                agent.getNotifier().removeActionListener(this);
-
-                ApplicationState state = actionEvent.getActionId();
-                // propagate the Agent ActionEvent
-                switch (state) {
-                case START:
-                    agentStarted = true;
-                    logger.fine("Agent started via service. Agent ID was: " + actionEvent.getPayload());
-                    getNotifier().fireAction(ApplicationState.START, actionEvent.getPayload());
-                    break;
-                case FAIL:
-                    console.getError().println(translator.localize(LocaleResources.STARTING_AGENT_FAILED).getContents());
-                    getNotifier().fireAction(ApplicationState.FAIL, actionEvent.getPayload());
-                    break;
-                case STOP:
-                    getNotifier().fireAction(ApplicationState.STOP);
-                    break;
-                default:
-                    throw new AssertionError("Unexpected state " + state);
-                }
-            }
-        }
-    }
-
-}
-

--- a/agent/cli/src/main/java/com/redhat/thermostat/agent/cli/impl/locale/LocaleResources.java	Wed Apr 06 14:52:26 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright 2012-2016 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.agent.cli.impl.locale;
-
-import com.redhat.thermostat.shared.locale.Translate;
-
-public enum LocaleResources {
-
-    SERVICE_FAILED_TO_START_DB,
-    LAUNCHER_UNAVAILABLE,
-    UNEXPECTED_RESULT_STORAGE,
-    STARTING_AGENT_FAILED,
-    STORAGE_CREDS_UNAVAILABLE,
-    ;
-
-    static final String RESOURCE_BUNDLE = "com.redhat.thermostat.agent.cli.impl.strings";
-
-    public static Translate<LocaleResources> createLocalizer() {
-        return new Translate<>(RESOURCE_BUNDLE, LocaleResources.class);
-    }
-
-}
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/agent/cli/src/main/java/com/redhat/thermostat/agent/cli/internal/Activator.java	Fri Apr 08 13:18:48 2016 +0200
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2012-2016 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.agent.cli.internal;
+
+import java.util.Map;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
+
+import com.redhat.thermostat.common.ExitStatus;
+import com.redhat.thermostat.common.MultipleServiceTracker;
+import com.redhat.thermostat.common.MultipleServiceTracker.Action;
+import com.redhat.thermostat.common.cli.CommandRegistry;
+import com.redhat.thermostat.common.cli.CommandRegistryImpl;
+import com.redhat.thermostat.shared.config.SSLConfiguration;
+import com.redhat.thermostat.storage.core.StorageCredentials;
+import com.redhat.thermostat.storage.core.WriterID;
+
+public class Activator implements BundleActivator {
+
+    private CommandRegistry reg;
+    private AgentApplication agentApplication;
+    private MultipleServiceTracker tracker;
+    private ServiceTracker<StorageCredentials, StorageCredentials> credsTracker;
+
+    @Override
+    public void start(final BundleContext context) throws Exception {
+        reg = new CommandRegistryImpl(context);
+        
+        Class<?>[] deps = new Class<?>[] {
+                ExitStatus.class,
+                WriterID.class,
+                SSLConfiguration.class
+        };
+        tracker = new MultipleServiceTracker(context, deps, new Action() {
+            
+            @Override
+            public void dependenciesAvailable(Map<String, Object> services) {
+                ExitStatus exitStatus = (ExitStatus) services.get(ExitStatus.class.getName());
+                WriterID writerID = (WriterID) services.get(WriterID.class.getName());
+                SSLConfiguration sslConf = (SSLConfiguration) services.get(SSLConfiguration.class.getName());
+                agentApplication = new AgentApplication(context, exitStatus, writerID, sslConf);
+                reg.registerCommand("service", new ServiceCommand(context));
+                reg.registerCommand("agent", agentApplication);
+            }
+
+            @Override
+            public void dependenciesUnavailable() {
+                agentApplication.shutdown(ExitStatus.EXIT_SUCCESS);
+                reg.unregisterCommands();
+            }
+        });
+        credsTracker = new ServiceTracker<StorageCredentials, StorageCredentials>(
+                context, StorageCredentials.class, new ServiceTrackerCustomizer<StorageCredentials, StorageCredentials>() {
+
+            @Override
+            public StorageCredentials addingService(ServiceReference<StorageCredentials> ref) {
+                StorageCredentials creds = context.getService(ref);
+                agentApplication.setStorageCredentials(creds);
+                return creds;
+            }
+
+            @Override
+            public void modifiedService(ServiceReference<StorageCredentials> ref,
+                    StorageCredentials creds) {
+                // nothing
+            }
+
+            @Override
+            public void removedService(ServiceReference<StorageCredentials> ref,
+                    StorageCredentials arg1) {
+                if (agentApplication != null) {
+                    agentApplication.setStorageCredentials(null); // remove creds
+                }
+                context.ungetService(ref);
+            }
+            
+        });
+        tracker.open();
+        credsTracker.open();
+    }
+
+    @Override
+    public void stop(BundleContext context) throws Exception {
+        if (agentApplication != null) {
+            // Bundle may be shut down *before* deps become available and
+            // app is set.
+            agentApplication.shutdown(ExitStatus.EXIT_SUCCESS);
+        }
+        reg.unregisterCommands();
+        credsTracker.close();
+        tracker.close();
+    }
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/agent/cli/src/main/java/com/redhat/thermostat/agent/cli/internal/AgentApplication.java	Fri Apr 08 13:18:48 2016 +0200
@@ -0,0 +1,393 @@
+/*
+ * Copyright 2012-2016 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.agent.cli.internal;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+
+import sun.misc.Signal;
+import sun.misc.SignalHandler;
+
+import com.redhat.thermostat.agent.Agent;
+import com.redhat.thermostat.agent.cli.internal.locale.LocaleResources;
+import com.redhat.thermostat.agent.command.ConfigurationServer;
+import com.redhat.thermostat.agent.config.AgentConfigsUtils;
+import com.redhat.thermostat.agent.config.AgentOptionParser;
+import com.redhat.thermostat.agent.config.AgentStartupConfiguration;
+import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool;
+import com.redhat.thermostat.backend.BackendRegistry;
+import com.redhat.thermostat.backend.BackendService;
+import com.redhat.thermostat.common.ExitStatus;
+import com.redhat.thermostat.common.LaunchException;
+import com.redhat.thermostat.common.MultipleServiceTracker;
+import com.redhat.thermostat.common.MultipleServiceTracker.Action;
+import com.redhat.thermostat.common.cli.AbstractStateNotifyingCommand;
+import com.redhat.thermostat.common.cli.Arguments;
+import com.redhat.thermostat.common.cli.CommandContext;
+import com.redhat.thermostat.common.cli.CommandException;
+import com.redhat.thermostat.common.cli.DependencyServices;
+import com.redhat.thermostat.common.tools.ApplicationState;
+import com.redhat.thermostat.common.utils.LoggingUtils;
+import com.redhat.thermostat.shared.config.InvalidConfigurationException;
+import com.redhat.thermostat.shared.config.SSLConfiguration;
+import com.redhat.thermostat.shared.locale.Translate;
+import com.redhat.thermostat.storage.core.Connection.ConnectionListener;
+import com.redhat.thermostat.storage.core.Connection.ConnectionStatus;
+import com.redhat.thermostat.storage.core.ConnectionException;
+import com.redhat.thermostat.storage.core.DbService;
+import com.redhat.thermostat.storage.core.DbServiceFactory;
+import com.redhat.thermostat.storage.core.Storage;
+import com.redhat.thermostat.storage.core.StorageCredentials;
+import com.redhat.thermostat.storage.core.WriterID;
+import com.redhat.thermostat.storage.dao.AgentInfoDAO;
+import com.redhat.thermostat.storage.dao.BackendInfoDAO;
+
+@SuppressWarnings("restriction")
+public final class AgentApplication extends AbstractStateNotifyingCommand {
+
+    /**
+     * Property for turning on verbose mode. This is there so as to be able to
+     * run integration tests independent of log levels.
+     */
+    private static final String VERBOSE_MODE_PROPERTY = "thermostat.agent.verbose";
+    // Messages printed in verbose mode. Integration tests use this. Be careful
+    // when you change those!
+    private static final String VERBOSE_MODE_AGENT_STOPPED_MSG = "Agent stopped.";
+    private static final String VERBOSE_MODE_AGENT_STARTED_MSG = "Agent started.";
+
+    private static final String SIGINT_NAME = "INT";
+    private static final String SIGTERM_NAME = "TERM";
+
+    private static final Logger logger = LoggingUtils.getLogger(AgentApplication.class);
+    private static final Translate<LocaleResources> t = LocaleResources.createLocalizer();
+    
+    private final BundleContext bundleContext;
+    private final ConfigurationCreator configurationCreator;
+
+    private AgentStartupConfiguration configuration;
+    private AgentOptionParser parser;
+    private DbServiceFactory dbServiceFactory;
+    @SuppressWarnings("rawtypes")
+    private ServiceTracker configServerTracker;
+    private MultipleServiceTracker depTracker;
+    private final ExitStatus exitStatus;
+    private final WriterID writerId;
+    private final SSLConfiguration sslConf;
+    private final DependencyServices depServices;
+    private CountDownLatch shutdownLatch;
+
+    private CustomSignalHandler handler;
+
+    public AgentApplication(BundleContext bundleContext, ExitStatus exitStatus, WriterID writerId, SSLConfiguration sslConf) {
+        this(bundleContext, exitStatus, writerId, sslConf, new DependencyServices(), new ConfigurationCreator(), new DbServiceFactory());
+    }
+
+    AgentApplication(BundleContext bundleContext, ExitStatus exitStatus, WriterID writerId, SSLConfiguration sslConf, DependencyServices depServices, ConfigurationCreator configurationCreator, DbServiceFactory dbServiceFactory) {
+        this.bundleContext = bundleContext;
+        this.configurationCreator = configurationCreator;
+        this.dbServiceFactory = dbServiceFactory;
+        this.exitStatus = exitStatus;
+        this.writerId = writerId;
+        this.sslConf = sslConf;
+        this.depServices = depServices;
+    }
+    
+    private void parseArguments(Arguments args) throws InvalidConfigurationException {
+        parser = new AgentOptionParser(configuration, args);
+        parser.parse();
+    }
+    
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    private void runAgent(CommandContext ctx) throws CommandException {
+        long startTime = System.currentTimeMillis();
+        configuration.setStartTime(startTime);
+        
+        StorageCredentials creds = getServiceOrExit(StorageCredentials.class);
+        final DbService dbService = dbServiceFactory.createDbService(
+                configuration.getDBConnectionString(), creds, sslConf);
+        
+        shutdownLatch = new CountDownLatch(1);
+        
+        configServerTracker = new ServiceTracker(bundleContext, ConfigurationServer.class.getName(), null) {
+            @Override
+            public Object addingService(ServiceReference reference) {
+                final ConfigurationServer configServer = (ConfigurationServer) super.addingService(reference);
+                String [] host = configuration.getConfigListenAddress().split(":");
+
+                try {
+                    configServer.startListening(host[0], Integer.valueOf(host[1]));
+
+                    ConnectionListener connectionListener = new ConnectionListener() {
+                        @Override
+                        public void changed(ConnectionStatus newStatus) {
+                            switch (newStatus) {
+                            case DISCONNECTED:
+                                logger.warning("Unexpected disconnect event.");
+                                break;
+                            case CONNECTING:
+                                logger.fine("Connecting to storage.");
+                                break;
+                            case CONNECTED:
+                                logger.fine("Connected to storage");
+                                handleConnected(configServer);
+                                break;
+                            case FAILED_TO_CONNECT:
+                                // ConnectionException will be thrown
+                                break;
+                            default:
+                                logger.warning("Unfamiliar ConnectionStatus value: " + newStatus.toString());
+                            }
+                        }
+                    };
+
+                    dbService.addConnectionListener(connectionListener);
+                    logger.fine("Connecting to storage...");
+                
+                    dbService.connect();
+                } catch (IOException e) {
+                    logger.log(Level.SEVERE, e.getMessage());
+                    // log stack trace as info only
+                    logger.log(Level.INFO, e.getMessage(), e);
+                    shutdown(ExitStatus.EXIT_ERROR);
+                } catch (ConnectionException e) {
+                    logger.log(Level.SEVERE, "Could not connect to storage (" + e.getMessage() + ")");
+                    // log stack trace as info only
+                    logger.log(Level.INFO, "Could not connect to storage", e);
+                    shutdown(ExitStatus.EXIT_ERROR);
+                }
+                
+                return configServer;
+            }
+            
+            @Override
+            public void removedService(ServiceReference reference, Object service) {
+                if (shutdownLatch.getCount() > 0) {
+                    // Lost config server while still running
+                    logger.warning("ConfigurationServer unexpectedly became unavailable");
+                }
+                // Stop listening on command channel
+                ConfigurationServer server = (ConfigurationServer) service;
+                server.stopListening();
+                super.removedService(reference, service);
+            }
+        };
+        configServerTracker.open();
+        
+        try {
+            // Wait for either SIGINT or SIGTERM
+            shutdownLatch.await();
+            logger.fine("terminating agent cmd");
+        } catch (InterruptedException e) {
+            // Ensure proper shutdown if interrupted
+            handler.handle(new Signal(SIGINT_NAME));
+            return;
+        }
+    }
+
+    private StorageCredentials getServiceOrExit(Class<StorageCredentials> clazz) throws CommandException {
+        StorageCredentials creds = depServices.getService(clazz);
+        if (creds == null) {
+            throw new CommandException(t.localize(LocaleResources.STORAGE_CREDS_UNAVAILABLE));
+        }
+        return creds;
+    }
+    
+    void setStorageCredentials(StorageCredentials creds) {
+        if (creds == null) {
+            depServices.removeService(StorageCredentials.class);
+        } else {
+            depServices.addService(StorageCredentials.class, creds);
+        }
+    }
+
+    @Override
+    public void run(CommandContext ctx) throws CommandException {
+        configuration = configurationCreator.create();
+
+        parseArguments(ctx.getArguments());
+        if (!parser.isHelp()) {
+            runAgent(ctx);
+        }
+    }
+    
+    public void shutdown(int shutDownStatus) {
+        // Exit application
+        if (shutdownLatch != null) {
+            shutdownLatch.countDown();
+        }
+        
+        if (depTracker != null) {
+            depTracker.close();
+        }
+        if (configServerTracker != null) {
+            configServerTracker.close();
+        }
+        this.exitStatus.setExitStatus(shutDownStatus);
+        if (shutDownStatus == ExitStatus.EXIT_SUCCESS) {
+            getNotifier().fireAction(ApplicationState.STOP);
+        } else {
+            getNotifier().fireAction(ApplicationState.FAIL);
+        }
+    }
+    
+    private class CustomSignalHandler implements SignalHandler {
+        
+        private Agent agent;
+        private ConfigurationServer configServer;
+
+        public CustomSignalHandler(Agent agent, ConfigurationServer configServer) {
+            this.agent = agent;
+            this.configServer = configServer;
+        }
+        
+        @Override
+        public void handle(Signal arg0) {
+            configServer.stopListening();
+            try {
+                agent.stop();
+            } catch (Exception ex) {
+                // We don't want any exception to hold back the signal handler, otherwise
+                // there will be no way to actually stop Thermostat.
+                ex.printStackTrace();
+            }
+            logger.fine("Agent stopped.");
+            // Hook for integration tests. Print a well known message to stdout
+            // if verbose mode is turned on via the system property.
+            if (Boolean.getBoolean(VERBOSE_MODE_PROPERTY)) {
+                System.out.println(VERBOSE_MODE_AGENT_STOPPED_MSG);
+            }
+            shutdown(ExitStatus.EXIT_SUCCESS);
+        }
+        
+    }
+
+    Agent startAgent(final Storage storage, AgentInfoDAO agentInfoDAO, BackendInfoDAO backendInfoDAO, MXBeanConnectionPool pool) {
+        BackendRegistry backendRegistry = null;
+        try {
+            backendRegistry = new BackendRegistry(bundleContext);
+            
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "Could not get BackendRegistry instance.", e);
+            shutdown(ExitStatus.EXIT_ERROR);
+            // Since this would throw NPE's down the line if we continue in this
+            // method, let's fail right and early :)
+            throw new RuntimeException(e);
+        }
+
+        final Agent agent = new Agent(backendRegistry, configuration, storage, agentInfoDAO, backendInfoDAO, writerId, pool);
+        try {
+            logger.fine("Starting agent.");
+            agent.start();
+            
+            bundleContext.registerService(BackendService.class, new BackendService(), null);
+            
+        } catch (LaunchException le) {
+            logger.log(Level.SEVERE,
+                    "Agent could not start, probably because a configured backend could not be activated.",
+                    le);
+            shutdown(ExitStatus.EXIT_ERROR);
+        }
+        logger.fine("Agent started.");
+        // Hook for integration tests. Print a well known message to stdout
+        // if verbose mode is turned on via the system property.
+        if (Boolean.getBoolean(VERBOSE_MODE_PROPERTY)) {
+            System.out.println(VERBOSE_MODE_AGENT_STARTED_MSG);
+        }
+
+        logger.info("Agent id: " + agent.getId());
+        getNotifier().fireAction(ApplicationState.START, agent.getId());
+        return agent;
+    }
+    
+    private void handleConnected(final ConfigurationServer configServer) {
+        Class<?>[] deps = new Class<?>[] {
+                Storage.class,
+                AgentInfoDAO.class,
+                BackendInfoDAO.class,
+                MXBeanConnectionPool.class
+        };
+        depTracker = new MultipleServiceTracker(bundleContext, deps, new Action() {
+
+            @Override
+            public void dependenciesAvailable(Map<String, Object> services) {
+                Storage storage = (Storage) services.get(Storage.class.getName());
+                AgentInfoDAO agentInfoDAO = (AgentInfoDAO) services
+                        .get(AgentInfoDAO.class.getName());
+                BackendInfoDAO backendInfoDAO = (BackendInfoDAO) services
+                        .get(BackendInfoDAO.class.getName());
+                MXBeanConnectionPool pool = (MXBeanConnectionPool) services
+                        .get(MXBeanConnectionPool.class.getName());
+
+                Agent agent = startAgent(storage, agentInfoDAO, backendInfoDAO, pool);
+                handler = new CustomSignalHandler(agent, configServer);
+                Signal.handle(new Signal(SIGINT_NAME), handler);
+                Signal.handle(new Signal(SIGTERM_NAME), handler);
+            }
+
+            @Override
+            public void dependenciesUnavailable() {
+                if (shutdownLatch.getCount() > 0) {
+                    // In the rare case we lose one of our deps, gracefully shutdown
+                    logger.severe("Storage unexpectedly became unavailable");
+                    shutdown(ExitStatus.EXIT_ERROR);
+                }
+            }
+            
+        });
+        depTracker.open();
+    }
+
+    static class ConfigurationCreator {
+        public AgentStartupConfiguration create() throws InvalidConfigurationException {
+            return AgentConfigsUtils.createAgentConfigs();
+        }
+    }
+
+    @Override
+    public boolean isStorageRequired() {
+        return false;
+    }
+    
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/agent/cli/src/main/java/com/redhat/thermostat/agent/cli/internal/ServiceCommand.java	Fri Apr 08 13:18:48 2016 +0200
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2012-2016 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.agent.cli.internal;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Semaphore;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+import com.redhat.thermostat.agent.cli.internal.locale.LocaleResources;
+import com.redhat.thermostat.common.ActionEvent;
+import com.redhat.thermostat.common.ActionListener;
+import com.redhat.thermostat.common.cli.AbstractStateNotifyingCommand;
+import com.redhat.thermostat.common.cli.CommandContext;
+import com.redhat.thermostat.common.cli.CommandException;
+import com.redhat.thermostat.common.cli.Console;
+import com.redhat.thermostat.common.tools.ApplicationState;
+import com.redhat.thermostat.common.utils.LoggingUtils;
+import com.redhat.thermostat.launcher.Launcher;
+import com.redhat.thermostat.shared.locale.Translate;
+
+/**
+ * Simple service that allows starting Agent and DB Backend
+ * in a single step.
+ */
+public class ServiceCommand extends AbstractStateNotifyingCommand implements ActionListener<ApplicationState> {
+    
+    private static final Translate<LocaleResources> translator = LocaleResources.createLocalizer();
+    private static final Logger logger = LoggingUtils.getLogger(ServiceCommand.class);
+
+    private List<ActionListener<ApplicationState>> listeners;
+    private Semaphore agentBarrier = new Semaphore(0);
+    private BundleContext context;
+    private Launcher launcher;
+    private boolean storageFailed = false;
+    private boolean agentStarted = false;
+    private CommandContext cmdCtx;
+
+    public ServiceCommand(BundleContext context) {
+        this.context = context;
+        listeners = new ArrayList<>();
+        listeners.add(this);
+    }
+
+    @Override
+    public void run(CommandContext ctx) throws CommandException {
+        cmdCtx = ctx;
+        ServiceReference launcherRef = context.getServiceReference(Launcher.class);
+        requireNonNull(launcherRef, translator.localize(LocaleResources.LAUNCHER_UNAVAILABLE));
+        launcher = (Launcher) context.getService(launcherRef);
+        String[] storageStartArgs = new String[] { "storage", "--start" };
+        launcher.run(storageStartArgs, listeners, false);
+        agentBarrier.acquireUninterruptibly();
+        
+        if (storageFailed) {
+            storageFailed = false;
+            context.ungetService(launcherRef);
+            getNotifier().fireAction(ApplicationState.FAIL);
+            throw new CommandException(translator.localize(LocaleResources.SERVICE_FAILED_TO_START_DB));
+        }
+        
+        String[] storageStopArgs = new String[] { "storage", "--stop" };
+        launcher.run(storageStopArgs, false);
+
+        if (agentStarted) {
+            getNotifier().fireAction(ApplicationState.STOP);
+        }
+
+        context.ungetService(launcherRef);
+        cmdCtx = null;
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent<ApplicationState> actionEvent) {
+        if (actionEvent.getSource() instanceof AbstractStateNotifyingCommand) {
+            AbstractStateNotifyingCommand storage = (AbstractStateNotifyingCommand) actionEvent.getSource();
+            // Implementation detail: there is a single StorageCommand instance registered
+            // as an OSGi service.  We remove ourselves as listener so that we don't get
+            // notified in the case that the command is invoked by some other means later.
+            storage.getNotifier().removeActionListener(this);
+            
+            try {
+                switch (actionEvent.getActionId()) {
+                case START:
+                    // Payload is connection URL
+                    Object payload = actionEvent.getPayload();
+                    if (payload == null || !(payload instanceof String)) {
+                        getNotifier().fireAction(ApplicationState.FAIL);
+                        throw new CommandException(translator.localize(LocaleResources.UNEXPECTED_RESULT_STORAGE));
+                    }
+                    String dbUrl = (String) payload;
+                    String[] agentArgs =  new String[] {"agent", "-d", dbUrl};
+                    logger.fine("starting agent now...");
+                    listeners.clear();
+                    listeners.add(new AgentStartedListener(cmdCtx.getConsole()));
+                    launcher.run(agentArgs, listeners, false);
+                    break;
+                case FAIL:
+                    storageFailed = true;
+                    // Payload is exception
+                    payload = actionEvent.getPayload();
+                    if (payload == null || !(payload instanceof Exception)) {
+                        getNotifier().fireAction(ApplicationState.FAIL);
+                        throw new CommandException(translator.localize(LocaleResources.UNEXPECTED_RESULT_STORAGE));
+                    }
+                    Exception ex = (Exception) payload;
+                    cmdCtx.getConsole().getError().println(ex.getMessage());
+                    logger.log(Level.WARNING, ex.getMessage(), ex);
+                    break;
+                }
+            } catch (CommandException e) {
+                cmdCtx.getConsole().getError().println(e.getMessage());
+            } finally {
+                agentBarrier.release();
+            }
+        }
+    }
+
+    @Override
+    public boolean isStorageRequired() {
+        return false;
+    }
+    
+    private class AgentStartedListener implements ActionListener<ApplicationState> {
+
+        private final Console console;
+
+        private AgentStartedListener(Console console) {
+            this.console = console;
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent<ApplicationState> actionEvent) {
+            if (actionEvent.getSource() instanceof AbstractStateNotifyingCommand) {
+                AbstractStateNotifyingCommand agent = (AbstractStateNotifyingCommand) actionEvent.getSource();
+                // Implementation detail: there is a single AgentCommand instance registered
+                // as an OSGi service. We remove ourselves as listener so that we don't get
+                // notified in the case that the command is invoked by some other means later.
+                agent.getNotifier().removeActionListener(this);
+
+                ApplicationState state = actionEvent.getActionId();
+                // propagate the Agent ActionEvent
+                switch (state) {
+                case START:
+                    agentStarted = true;
+                    logger.fine("Agent started via service. Agent ID was: " + actionEvent.getPayload());
+                    getNotifier().fireAction(ApplicationState.START, actionEvent.getPayload());
+                    break;
+                case FAIL:
+                    console.getError().println(translator.localize(LocaleResources.STARTING_AGENT_FAILED).getContents());
+                    getNotifier().fireAction(ApplicationState.FAIL, actionEvent.getPayload());
+                    break;
+                case STOP:
+                    getNotifier().fireAction(ApplicationState.STOP);
+                    break;
+                default:
+                    throw new AssertionError("Unexpected state " + state);
+                }
+            }
+        }
+    }
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/agent/cli/src/main/java/com/redhat/thermostat/agent/cli/internal/locale/LocaleResources.java	Fri Apr 08 13:18:48 2016 +0200
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2012-2016 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.agent.cli.internal.locale;
+
+import com.redhat.thermostat.shared.locale.Translate;
+
+public enum LocaleResources {
+
+    SERVICE_FAILED_TO_START_DB,
+    LAUNCHER_UNAVAILABLE,
+    UNEXPECTED_RESULT_STORAGE,
+    STARTING_AGENT_FAILED,
+    STORAGE_CREDS_UNAVAILABLE,
+    ;
+
+    static final String RESOURCE_BUNDLE = "com.redhat.thermostat.agent.cli.internal.strings";
+
+    public static Translate<LocaleResources> createLocalizer() {
+        return new Translate<>(RESOURCE_BUNDLE, LocaleResources.class);
+    }
+
+}
+

--- a/agent/cli/src/main/resources/com/redhat/thermostat/agent/cli/impl/strings.properties	Wed Apr 06 14:52:26 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-SERVICE_FAILED_TO_START_DB = Service failed to start due to error starting storage.
-LAUNCHER_UNAVAILABLE = Launcher is not available
-UNEXPECTED_RESULT_STORAGE = Unexpected result from storage.
-STARTING_AGENT_FAILED = Thermostat agent failed to start. See logs for details.
-STORAGE_CREDS_UNAVAILABLE = StorageCredentials are not available

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/agent/cli/src/main/resources/com/redhat/thermostat/agent/cli/internal/strings.properties	Fri Apr 08 13:18:48 2016 +0200
@@ -0,0 +1,5 @@
+SERVICE_FAILED_TO_START_DB = Service failed to start due to error starting storage.
+LAUNCHER_UNAVAILABLE = Launcher is not available
+UNEXPECTED_RESULT_STORAGE = Unexpected result from storage.
+STARTING_AGENT_FAILED = Thermostat agent failed to start. See logs for details.
+STORAGE_CREDS_UNAVAILABLE = StorageCredentials are not available

--- a/agent/cli/src/test/java/com/redhat/thermostat/agent/cli/impl/ActivatorTest.java	Wed Apr 06 14:52:26 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright 2012-2016 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.agent.cli.impl;
-
-import static com.redhat.thermostat.testutils.Asserts.assertCommandIsRegistered;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-
-import org.junit.Test;
-
-import com.redhat.thermostat.common.ExitStatus;
-import com.redhat.thermostat.shared.config.SSLConfiguration;
-import com.redhat.thermostat.storage.core.WriterID;
-import com.redhat.thermostat.testutils.StubBundleContext;
-
-public class ActivatorTest {
-
-    @Test
-    public void verifyActivatorRegistersCommands() throws Exception {        
-        StubBundleContext bundleContext = new StubBundleContext();
-
-        ExitStatus exitStatus = mock(ExitStatus.class);
-        WriterID writerID = mock(WriterID.class);
-        bundleContext.registerService(WriterID.class, writerID, null);
-        bundleContext.registerService(ExitStatus.class, exitStatus, null);
-        bundleContext.registerService(SSLConfiguration.class, mock(SSLConfiguration.class), null);
-        
-        Activator activator = new Activator();
-
-        assertEquals(0, bundleContext.getServiceListeners().size());
-        
-        activator.start(bundleContext);
-        
-        assertEquals(4, bundleContext.getServiceListeners().size());
-        
-        assertCommandIsRegistered(bundleContext, "agent", AgentApplication.class);
-        assertCommandIsRegistered(bundleContext, "service", ServiceCommand.class);
-
-        activator.stop(bundleContext);
-
-        assertEquals(0, bundleContext.getServiceListeners().size());
-        assertEquals(3, bundleContext.getAllServices().size());
-    }
-}
-

--- a/agent/cli/src/test/java/com/redhat/thermostat/agent/cli/impl/AgentApplicationTest.java	Wed Apr 06 14:52:26 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,292 +0,0 @@
-/*
- * Copyright 2012-2016 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.agent.cli.impl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.powermock.api.mockito.PowerMockito.whenNew;
-
-import java.io.IOException;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import com.redhat.thermostat.agent.Agent;
-import com.redhat.thermostat.agent.cli.impl.AgentApplication.ConfigurationCreator;
-import com.redhat.thermostat.agent.command.ConfigurationServer;
-import com.redhat.thermostat.agent.config.AgentStartupConfiguration;
-import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool;
-import com.redhat.thermostat.backend.BackendRegistry;
-import com.redhat.thermostat.common.ExitStatus;
-import com.redhat.thermostat.common.LaunchException;
-import com.redhat.thermostat.common.cli.Arguments;
-import com.redhat.thermostat.common.cli.CommandContext;
-import com.redhat.thermostat.common.cli.CommandException;
-import com.redhat.thermostat.common.cli.DependencyServices;
-import com.redhat.thermostat.shared.config.InvalidConfigurationException;
-import com.redhat.thermostat.shared.config.SSLConfiguration;
-import com.redhat.thermostat.storage.core.Connection.ConnectionListener;
-import com.redhat.thermostat.storage.core.Connection.ConnectionStatus;
-import com.redhat.thermostat.storage.core.ConnectionException;
-import com.redhat.thermostat.storage.core.DbService;
-import com.redhat.thermostat.storage.core.DbServiceFactory;
-import com.redhat.thermostat.storage.core.Storage;
-import com.redhat.thermostat.storage.core.StorageCredentials;
-import com.redhat.thermostat.storage.core.WriterID;
-import com.redhat.thermostat.storage.dao.AgentInfoDAO;
-import com.redhat.thermostat.storage.dao.BackendInfoDAO;
-import com.redhat.thermostat.testutils.StubBundleContext;
-
-@RunWith(PowerMockRunner.class)
-public class AgentApplicationTest {
-
-    private static final String COMMAND_CHANNLE_BIND_HOST = "test";
-    private static final int COMMAND_CHANNEL_BIND_PORT = 10101;
-
-    private StubBundleContext context;
-
-    private ConfigurationServer configServer;
-    private DbService dbService;
-    private ConfigurationCreator configCreator;
-    private ExitStatus exitStatus;
-    private DbServiceFactory dbServiceFactory;
-    private WriterID writerId;
-    
-    @Before
-    public void setUp() throws InvalidConfigurationException {
-        
-        context = new StubBundleContext();
-        
-        AgentStartupConfiguration config = mock(AgentStartupConfiguration.class);
-        when(config.getDBConnectionString()).thenReturn("test string; please ignore");
-        when(config.getConfigListenAddress()).thenReturn(COMMAND_CHANNLE_BIND_HOST + ":" + COMMAND_CHANNEL_BIND_PORT);
-
-        configCreator = mock(ConfigurationCreator.class);
-        when(configCreator.create()).thenReturn(config);
-
-        Storage storage = mock(Storage.class);
-        context.registerService(Storage.class, storage, null);
-        AgentInfoDAO agentInfoDAO = mock(AgentInfoDAO.class);
-        context.registerService(AgentInfoDAO.class.getName(), agentInfoDAO, null);
-        BackendInfoDAO backendInfoDAO = mock(BackendInfoDAO.class);
-        context.registerService(BackendInfoDAO.class.getName(), backendInfoDAO, null);
-        configServer = mock(ConfigurationServer.class);
-        context.registerService(ConfigurationServer.class.getName(), configServer, null);
-        dbServiceFactory = mock(DbServiceFactory.class);
-        dbService = mock(DbService.class);
-        writerId = mock(WriterID.class);
-        when(dbServiceFactory.createDbService(anyString(), any(StorageCredentials.class), any(SSLConfiguration.class))).thenReturn(dbService);
-
-        exitStatus = mock(ExitStatus.class);
-    }
-
-    @After
-    public void tearDown() {
-        context = null;
-        configServer = null;
-        dbService = null;
-        configCreator = null;
-        dbServiceFactory = null;
-        exitStatus = null;
-    }
-
-    @Test
-    public void testAgentStartup() throws CommandException, InterruptedException {
-        final AgentApplication agent = new AgentApplication(context, exitStatus, writerId, mock(SSLConfiguration.class), new DependencyServices(), configCreator, dbServiceFactory);
-        agent.setStorageCredentials(mock(StorageCredentials.class));
-        final CountDownLatch latch = new CountDownLatch(1);
-        final CommandException[] ce = new CommandException[1];
-        final long timeoutMillis = 5000L;
-        
-        startAgentRunThread(timeoutMillis, agent, ce, latch);
-        
-        boolean ret = latch.await(timeoutMillis, TimeUnit.MILLISECONDS);
-        if (ce[0] != null) {
-            throw ce[0];
-        }
-        if (!ret) {
-            fail("Timeout expired!");
-        }
-        
-    }
-    
-    @Test
-    public void testAgentStartupConnectFailure() throws CommandException, InterruptedException {
-        final AgentApplication agent = new AgentApplication(context, exitStatus, writerId, mock(SSLConfiguration.class), new DependencyServices(), configCreator, dbServiceFactory);
-        agent.setStorageCredentials(mock(StorageCredentials.class));
-        
-        Arguments args = mock(Arguments.class);
-        final CommandContext commandContext = mock(CommandContext.class);
-        when(commandContext.getArguments()).thenReturn(args);
-        
-        // Throw a ConnectionException when we try to connect to storage
-        doThrow(new ConnectionException()).when(dbService).connect();
-        
-        agent.run(commandContext);
-        
-        // Ensure we shut down command channel server
-        verify(configServer).stopListening();
-    }
-    
-    /*
-     * Having the PrepareForTest annotation on method level does not seem to
-     * deadlock the test, which seems to be more or less reliably reproducible
-     * if this annotation is at class level instead. Steps to reproduce the
-     * deadlock is:
-     * 1. Attach the PrepareForTest annotation to the class (over the test
-     *    method)
-     * 2. Run the test multiple times. 5-20 times seemed sufficient for me to
-     *    make the deadlock show up. This deadlock does not seem to happen
-     *    otherwise (can run up to 30 times head-to-head without deadlock).
-     *    
-     */
-    @PrepareForTest({ AgentApplication.class })
-    @SuppressWarnings("unchecked")
-    @Test
-    public void verifyBackendRegistryProblemsSetsExitStatus() throws Exception {
-        whenNew(BackendRegistry.class).withParameterTypes(BundleContext.class)
-                .withArguments(any(BundleContext.class))
-                .thenThrow(InvalidSyntaxException.class);
-        final AgentApplication agent = new AgentApplication(context,
-                exitStatus, writerId,  mock(SSLConfiguration.class),
-                mock(DependencyServices.class), configCreator, dbServiceFactory);
-        try {
-            agent.startAgent(null, null, null, null);
-        } catch (RuntimeException e) {
-            assertEquals(InvalidSyntaxException.class, e.getCause().getClass());
-        }
-        verify(exitStatus).setExitStatus(ExitStatus.EXIT_ERROR);
-    }
-    
-    @PrepareForTest({ AgentApplication.class })
-    @Test
-    public void verifyAgentLaunchExceptionSetsExitStatus() throws Exception {
-        whenNew(BackendRegistry.class).withParameterTypes(BundleContext.class)
-                .withArguments(any(BundleContext.class))
-                .thenReturn(mock(BackendRegistry.class));
-        Agent mockAgent = mock(Agent.class);
-        whenNew(Agent.class).withParameterTypes(BackendRegistry.class,
-                AgentStartupConfiguration.class, Storage.class,
-                AgentInfoDAO.class, BackendInfoDAO.class, WriterID.class, 
-                MXBeanConnectionPool.class).withArguments(
-                any(BackendRegistry.class),
-                any(AgentStartupConfiguration.class), any(Storage.class),
-                any(AgentInfoDAO.class), any(BackendInfoDAO.class), any(WriterID.class), 
-                any(MXBeanConnectionPool.class)).thenReturn(mockAgent);
-        doThrow(LaunchException.class).when(mockAgent).start();
-        final AgentApplication agent = new AgentApplication(context,
-                exitStatus, writerId,  mock(SSLConfiguration.class),
-                mock(DependencyServices.class), configCreator, dbServiceFactory);
-        try {
-            agent.startAgent(null, null, null, null);
-        } catch (RuntimeException e) {
-            fail("Should not have thrown RuntimeException");
-        }
-        verify(exitStatus).setExitStatus(ExitStatus.EXIT_ERROR);
-    }
-
-    private void startAgentRunThread(final long timoutMillis, final AgentApplication agent, final CommandException[] ce, final CountDownLatch latch) {
-        Arguments args = mock(Arguments.class);
-        final CommandContext commandContext = mock(CommandContext.class);
-        when(commandContext.getArguments()).thenReturn(args);
-        
-        // Immediately switch to CONNECTED state on dbService.connect
-        final ArgumentCaptor<ConnectionListener> listenerCaptor = ArgumentCaptor.forClass(ConnectionListener.class);
-        doNothing().when(dbService).addConnectionListener(listenerCaptor.capture());
-        
-        doAnswer(new Answer<Void>() {
-
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                ConnectionListener listener = listenerCaptor.getValue();
-                listener.changed(ConnectionStatus.CONNECTED);
-                return null;
-            }
-            
-        }).when(dbService).connect();
-
-        // Run agent in a new thread so we can timeout on failure
-        Thread t = new Thread(new Runnable() {
-            
-            @Override
-            public void run() {
-                // Finish when config server starts listening
-                try {
-                    doAnswer(new Answer<Void>() {
-
-                        @Override
-                        public Void answer(InvocationOnMock invocation) throws Throwable {
-                            latch.countDown();
-                            return null;
-                        }
-                    }).when(configServer).startListening(COMMAND_CHANNLE_BIND_HOST, COMMAND_CHANNEL_BIND_PORT);
-                } catch (IOException e1) {
-                    fail("a mock should not throw an exception");
-                }
-                
-                try {
-                    agent.run(commandContext);
-                } catch (CommandException e) {
-                    ce[0] = e;
-                }
-            }
-        });
-        
-        t.start();
-    }
-
-}
-

--- a/agent/cli/src/test/java/com/redhat/thermostat/agent/cli/impl/ServiceCommandTest.java	Wed Apr 06 14:52:26 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,412 +0,0 @@
-/*
- * Copyright 2012-2016 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.agent.cli.impl;
-
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.Collection;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-import com.redhat.thermostat.common.ActionEvent;
-import com.redhat.thermostat.common.ActionListener;
-import com.redhat.thermostat.common.ActionNotifier;
-import com.redhat.thermostat.common.cli.AbstractStateNotifyingCommand;
-import com.redhat.thermostat.common.cli.CommandContext;
-import com.redhat.thermostat.common.cli.CommandException;
-import com.redhat.thermostat.common.cli.Console;
-import com.redhat.thermostat.common.tools.ApplicationState;
-import com.redhat.thermostat.launcher.Launcher;
-import com.redhat.thermostat.testutils.StubBundleContext;
-
-public class ServiceCommandTest {
-
-    private ByteArrayOutputStream stdErrOut;
-    private Launcher mockLauncher;
-    private ServiceCommand serviceCommand;
-    private CommandContext mockCommandContext;
-
-    private static ActionEvent<ApplicationState> mockActionEvent;
-    private static Collection<ActionListener<ApplicationState>> listeners;
-
-    private static final String[] STORAGE_START_ARGS = { "storage", "--start" };
-    private static final String[] STORAGE_STOP_ARGS = { "storage", "--stop" };
-    private static final String[] AGENT_ARGS = {"agent", "-d", "Test String"};
-    private static final String AGENT_ID = "Test ID";
-
-    @SuppressWarnings("unchecked")
-    @Before
-    public void setUp() {
-        StubBundleContext bundleContext = new StubBundleContext();
-        mockLauncher = mock(Launcher.class);
-        bundleContext.registerService(Launcher.class, mockLauncher, null);
-        serviceCommand = new ServiceCommand(bundleContext);
-        
-        AbstractStateNotifyingCommand mockStorageCommand = mock(AbstractStateNotifyingCommand.class);
-        mockActionEvent = mock(ActionEvent.class);
-        when(mockActionEvent.getSource()).thenReturn(mockStorageCommand);
-        mockCommandContext = mock(CommandContext.class);
-        Console console = mock(Console.class);
-        stdErrOut = new ByteArrayOutputStream();
-        PrintStream err = new PrintStream(stdErrOut);
-        when(console.getError()).thenReturn(err);
-        when(mockCommandContext.getConsole()).thenReturn(console);
-        
-        ActionNotifier<ApplicationState> mockNotifier = mock(ActionNotifier.class);
-        when(mockStorageCommand.getNotifier()).thenReturn(mockNotifier);
-        when(mockActionEvent.getPayload()).thenReturn(new String("Test String"));
-    }
-
-    @After
-    public void tearDown() {
-        listeners = null;
-        mockLauncher = null;
-        serviceCommand = null;
-        mockActionEvent = null;
-        mockCommandContext = null;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test(timeout=1000)
-    public void testRunOnce() throws CommandException, InterruptedException {
-        doAnswer(new Answer<Void>() {
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                listeners = (Collection<ActionListener<ApplicationState>>)args[1];
-                
-                when(mockActionEvent.getActionId()).thenReturn(ApplicationState.START);
-                
-                for(ActionListener<ApplicationState> listener : listeners) {
-                    listener.actionPerformed(mockActionEvent);
-                }
-                return null;
-            }
-        }).when(mockLauncher).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
-
-        doAnswer(new Answer<Void>() {
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                listeners = (Collection<ActionListener<ApplicationState>>)args[1];
-
-                when(mockActionEvent.getActionId()).thenReturn(ApplicationState.START);
-                when(mockActionEvent.getPayload()).thenReturn(AGENT_ID);
-
-                for(ActionListener<ApplicationState> listener : listeners) {
-                    listener.actionPerformed(mockActionEvent);
-                }
-                return null;
-            }
-        }).when(mockLauncher).run(eq(AGENT_ARGS), isA(Collection.class), anyBoolean());
-
-        final boolean[] result = new boolean[2];
-        final String[] agentIdFound = new String[1];
-        serviceCommand.getNotifier().addActionListener(new ActionListener<ApplicationState>() {
-            @SuppressWarnings("incomplete-switch")
-            @Override
-            public void actionPerformed(ActionEvent<ApplicationState> actionEvent) {
-                switch (actionEvent.getActionId()) {
-                    case FAIL:
-                        result[0] = false;
-                        break;
-                    case START:
-                        result[0] = true;
-                        agentIdFound[0] = (String) actionEvent.getPayload();
-                        break;
-                    case STOP:
-                        result[1] = true;
-                        break;
-                }
-            }
-        });
-
-        boolean exTriggered = false;
-        try {
-            serviceCommand.run(mockCommandContext);
-        } catch (CommandException e) { 
-            exTriggered = true;
-        }
-        Assert.assertFalse(exTriggered);
-        Assert.assertTrue("Agent expected to fire START event", result[0]);
-        Assert.assertTrue("Agent expected to fire STOP event", result[1]);
-        Assert.assertEquals("Payload does not contain AgentId matching the agent started", agentIdFound[0], AGENT_ID);
-
-        verify(mockLauncher, times(1)).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
-        verify(mockLauncher, times(1)).run(eq(STORAGE_STOP_ARGS), anyBoolean());
-        verify(mockLauncher, times(1)).run(eq(AGENT_ARGS), isA(Collection.class), anyBoolean());
-        verify(mockActionEvent, times(2)).getActionId();
-    }
-
-    @Test(timeout=1000)
-    public void testStorageStartUnknownPath()  throws CommandException {
-        doAnswer(new Answer<Void>() {
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                listeners = (Collection<ActionListener<ApplicationState>>)args[1];
-
-                when(mockActionEvent.getActionId()).thenReturn(ApplicationState.START);
-                // Return a null payload in order to trigger unknown path
-                when(mockActionEvent.getPayload()).thenReturn(null);
-
-                for(ActionListener<ApplicationState> listener : listeners) {
-                    listener.actionPerformed(mockActionEvent);
-                }
-                return null;
-            }
-        }).when(mockLauncher).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
-
-        final boolean[] result = new boolean[1];
-        serviceCommand.getNotifier().addActionListener(new ActionListener<ApplicationState>() {
-            @SuppressWarnings("incomplete-switch")
-            @Override
-            public void actionPerformed(ActionEvent<ApplicationState> actionEvent) {
-                switch (actionEvent.getActionId()) {
-                    case FAIL:
-                        result[0] = true;
-                        break;
-                    case START:
-                        result[0] = false;
-                        break;
-                    case STOP:
-                        result[0] = false;
-                        break;
-                }
-            }
-        });
-
-        boolean exTriggered = false;
-        try {
-            serviceCommand.run(mockCommandContext);
-        } catch (CommandException e) {
-            exTriggered = true;
-        }
-        Assert.assertFalse(exTriggered);
-        Assert.assertEquals("Unexpected result from storage.\n", stdErrOut.toString());
-        Assert.assertTrue("Agent expected to fire FAIL event", result[0]);
-
-        verify(mockLauncher, times(1)).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
-        verify(mockLauncher, times(1)).run(eq(STORAGE_STOP_ARGS), anyBoolean());
-        verify(mockLauncher, never()).run(eq(AGENT_ARGS), isA(Collection.class), anyBoolean());
-        verify(mockActionEvent, times(1)).getActionId();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test(timeout=1000)
-    public void testStorageFailStart() throws CommandException, InterruptedException {
-        doAnswer(new Answer<Void>() {
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                listeners = (Collection<ActionListener<ApplicationState>>)args[1];
-                
-                when(mockActionEvent.getActionId()).thenReturn(ApplicationState.FAIL);
-                when(mockActionEvent.getPayload()).thenReturn(new Exception("Test Exception"));
-                
-                for(ActionListener<ApplicationState> listener : listeners) {
-                    listener.actionPerformed(mockActionEvent);
-                }
-                return null;
-            }
-        }).when(mockLauncher).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
-
-        final boolean[] result = new boolean[1];
-        serviceCommand.getNotifier().addActionListener(new ActionListener<ApplicationState>() {
-            @SuppressWarnings("incomplete-switch")
-            @Override
-            public void actionPerformed(ActionEvent<ApplicationState> actionEvent) {
-                switch (actionEvent.getActionId()) {
-                    case FAIL:
-                        result[0] = true;
-                        break;
-                    case START:
-                        result[0] = false;
-                        break;
-                    case STOP:
-                        result[0] = false;
-                        break;
-                }
-            }
-        });
-
-        boolean exTriggered = false;
-        try {
-            serviceCommand.run(mockCommandContext);
-        } catch (CommandException e) {
-            exTriggered = true;
-        }
-        Assert.assertTrue(exTriggered);
-        Assert.assertEquals("Test Exception\n", stdErrOut.toString());
-        Assert.assertTrue("Agent expected to fire FAIL event", result[0]);
-
-        verify(mockLauncher, times(1)).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
-        verify(mockLauncher, never()).run(eq(STORAGE_STOP_ARGS), anyBoolean());
-        verify(mockLauncher, never()).run(eq(AGENT_ARGS), isA(Collection.class), anyBoolean());
-        verify(mockActionEvent, times(1)).getActionId();
-    }
-
-    @Test(timeout=1000)
-    public void testStorageFailStartUnknownPath()  throws CommandException {
-        doAnswer(new Answer<Void>() {
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                listeners = (Collection<ActionListener<ApplicationState>>)args[1];
-
-                when(mockActionEvent.getActionId()).thenReturn(ApplicationState.FAIL);
-                // Return a null payload in order to trigger unknown path
-                when(mockActionEvent.getPayload()).thenReturn(null);
-
-                for(ActionListener<ApplicationState> listener : listeners) {
-                    listener.actionPerformed(mockActionEvent);
-                }
-                return null;
-            }
-        }).when(mockLauncher).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
-
-        final boolean[] result = new boolean[1];
-        serviceCommand.getNotifier().addActionListener(new ActionListener<ApplicationState>() {
-            @SuppressWarnings("incomplete-switch")
-            @Override
-            public void actionPerformed(ActionEvent<ApplicationState> actionEvent) {
-                switch (actionEvent.getActionId()) {
-                    case FAIL:
-                        result[0] = true;
-                        break;
-                    case START:
-                        result[0] = false;
-                        break;
-                    case STOP:
-                        result[0] = false;
-                        break;
-                }
-            }
-        });
-
-        boolean exTriggered = false;
-        try {
-            serviceCommand.run(mockCommandContext);
-        } catch (CommandException e) {
-            exTriggered = true;
-        }
-        Assert.assertTrue(exTriggered);
-        Assert.assertEquals("Unexpected result from storage.\n", stdErrOut.toString());
-        Assert.assertTrue("Agent expected to fire FAIL event", result[0]);
-
-        verify(mockLauncher, times(1)).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
-        verify(mockLauncher, never()).run(eq(STORAGE_STOP_ARGS), anyBoolean());
-        verify(mockLauncher, never()).run(eq(AGENT_ARGS), isA(Collection.class), anyBoolean());
-        verify(mockActionEvent, times(1)).getActionId();
-    }
-    
-    @Test
-    public void testAgentStartFail()  throws CommandException {
-        doAnswer(new Answer<Void>() {
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                listeners = (Collection<ActionListener<ApplicationState>>)args[1];
-
-                when(mockActionEvent.getActionId()).thenReturn(ApplicationState.START);
-
-                for(ActionListener<ApplicationState> listener : listeners) {
-                    listener.actionPerformed(mockActionEvent);
-                }
-                return null;
-            }
-        }).when(mockLauncher).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
-        doAnswer(new Answer<Void>() {
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                Object[] args = invocation.getArguments();
-                listeners = (Collection<ActionListener<ApplicationState>>)args[1];
-
-                when(mockActionEvent.getActionId()).thenReturn(ApplicationState.FAIL);
-
-                for(ActionListener<ApplicationState> listener : listeners) {
-                    listener.actionPerformed(mockActionEvent);
-                }
-                return null;
-            }
-        }).when(mockLauncher).run(eq(AGENT_ARGS), isA(Collection.class), anyBoolean());
-
-        final boolean[] result = new boolean[1];
-        serviceCommand.getNotifier().addActionListener(new ActionListener<ApplicationState>() {
-            @SuppressWarnings("incomplete-switch")
-            @Override
-            public void actionPerformed(ActionEvent<ApplicationState> actionEvent) {
-                switch (actionEvent.getActionId()) {
-                    case FAIL:
-                        result[0] = true;
-                        break;
-                    case START:
-                        result[0] = false;
-                        break;
-                    case STOP:
-                        result[0] = false;
-                        break;
-                }
-            }
-        });
-
-        boolean exTriggered = false;
-        try {
-            serviceCommand.run(mockCommandContext);
-        } catch (CommandException e) {
-            exTriggered = true;
-        }
-        Assert.assertFalse(exTriggered);
-        Assert.assertEquals("Thermostat agent failed to start. See logs for details.\n", stdErrOut.toString());
-        Assert.assertTrue("Agent expected to fire FAIL event", result[0]);
-
-        verify(mockLauncher, times(1)).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
-        verify(mockLauncher, times(1)).run(eq(STORAGE_STOP_ARGS), anyBoolean());
-        verify(mockLauncher, times(1)).run(eq(AGENT_ARGS), isA(Collection.class), anyBoolean());
-        verify(mockActionEvent, times(2)).getActionId();
-    }
-
-}
-

--- a/agent/cli/src/test/java/com/redhat/thermostat/agent/cli/impl/locale/TranslateTest.java	Wed Apr 06 14:52:26 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright 2012-2016 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.agent.cli.impl.locale;
-
-import java.io.IOException;
-import java.util.Locale;
-import java.util.Properties;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class TranslateTest {
-
-    private Locale lang;
-
-    @Before
-    public void setUp() {
-        this.lang = Locale.getDefault();
-        Locale.setDefault(Locale.US);
-    }
-
-    @After
-    public void tearDown() {
-        Locale.setDefault(lang);
-    }
-
-    @Test
-    public void testLocalizedStringsArePresent() throws IOException {
-
-        String stringsResource = "/" + LocaleResources.RESOURCE_BUNDLE.replace(".", "/") + ".properties";
-
-        Properties props = new Properties();
-        props.load(getClass().getResourceAsStream(stringsResource));
-
-        Assert.assertEquals(LocaleResources.values().length, props.values().size());
-        for (LocaleResources resource : LocaleResources.values()) {
-            Assert.assertTrue("missing property from resource bound file: " + resource,
-                              props.containsKey(resource.name()));
-        }
-    }
-}
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/agent/cli/src/test/java/com/redhat/thermostat/agent/cli/internal/ActivatorTest.java	Fri Apr 08 13:18:48 2016 +0200
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2012-2016 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.agent.cli.internal;
+
+import static com.redhat.thermostat.testutils.Asserts.assertCommandIsRegistered;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+import org.junit.Test;
+
+import com.redhat.thermostat.common.ExitStatus;
+import com.redhat.thermostat.shared.config.SSLConfiguration;
+import com.redhat.thermostat.storage.core.WriterID;
+import com.redhat.thermostat.testutils.StubBundleContext;
+
+public class ActivatorTest {
+
+    @Test
+    public void verifyActivatorRegistersCommands() throws Exception {        
+        StubBundleContext bundleContext = new StubBundleContext();
+
+        ExitStatus exitStatus = mock(ExitStatus.class);
+        WriterID writerID = mock(WriterID.class);
+        bundleContext.registerService(WriterID.class, writerID, null);
+        bundleContext.registerService(ExitStatus.class, exitStatus, null);
+        bundleContext.registerService(SSLConfiguration.class, mock(SSLConfiguration.class), null);
+        
+        Activator activator = new Activator();
+
+        assertEquals(0, bundleContext.getServiceListeners().size());
+        
+        activator.start(bundleContext);
+        
+        assertEquals(4, bundleContext.getServiceListeners().size());
+        
+        assertCommandIsRegistered(bundleContext, "agent", AgentApplication.class);
+        assertCommandIsRegistered(bundleContext, "service", ServiceCommand.class);
+
+        activator.stop(bundleContext);
+
+        assertEquals(0, bundleContext.getServiceListeners().size());
+        assertEquals(3, bundleContext.getAllServices().size());
+    }
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/agent/cli/src/test/java/com/redhat/thermostat/agent/cli/internal/AgentApplicationTest.java	Fri Apr 08 13:18:48 2016 +0200
@@ -0,0 +1,292 @@
+/*
+ * Copyright 2012-2016 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.agent.cli.internal;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.whenNew;
+
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import com.redhat.thermostat.agent.Agent;
+import com.redhat.thermostat.agent.cli.internal.AgentApplication.ConfigurationCreator;
+import com.redhat.thermostat.agent.command.ConfigurationServer;
+import com.redhat.thermostat.agent.config.AgentStartupConfiguration;
+import com.redhat.thermostat.agent.utils.management.MXBeanConnectionPool;
+import com.redhat.thermostat.backend.BackendRegistry;
+import com.redhat.thermostat.common.ExitStatus;
+import com.redhat.thermostat.common.LaunchException;
+import com.redhat.thermostat.common.cli.Arguments;
+import com.redhat.thermostat.common.cli.CommandContext;
+import com.redhat.thermostat.common.cli.CommandException;
+import com.redhat.thermostat.common.cli.DependencyServices;
+import com.redhat.thermostat.shared.config.InvalidConfigurationException;
+import com.redhat.thermostat.shared.config.SSLConfiguration;
+import com.redhat.thermostat.storage.core.Connection.ConnectionListener;
+import com.redhat.thermostat.storage.core.Connection.ConnectionStatus;
+import com.redhat.thermostat.storage.core.ConnectionException;
+import com.redhat.thermostat.storage.core.DbService;
+import com.redhat.thermostat.storage.core.DbServiceFactory;
+import com.redhat.thermostat.storage.core.Storage;
+import com.redhat.thermostat.storage.core.StorageCredentials;
+import com.redhat.thermostat.storage.core.WriterID;
+import com.redhat.thermostat.storage.dao.AgentInfoDAO;
+import com.redhat.thermostat.storage.dao.BackendInfoDAO;
+import com.redhat.thermostat.testutils.StubBundleContext;
+
+@RunWith(PowerMockRunner.class)
+public class AgentApplicationTest {
+
+    private static final String COMMAND_CHANNLE_BIND_HOST = "test";
+    private static final int COMMAND_CHANNEL_BIND_PORT = 10101;
+
+    private StubBundleContext context;
+
+    private ConfigurationServer configServer;
+    private DbService dbService;
+    private ConfigurationCreator configCreator;
+    private ExitStatus exitStatus;
+    private DbServiceFactory dbServiceFactory;
+    private WriterID writerId;
+    
+    @Before
+    public void setUp() throws InvalidConfigurationException {
+        
+        context = new StubBundleContext();
+        
+        AgentStartupConfiguration config = mock(AgentStartupConfiguration.class);
+        when(config.getDBConnectionString()).thenReturn("test string; please ignore");
+        when(config.getConfigListenAddress()).thenReturn(COMMAND_CHANNLE_BIND_HOST + ":" + COMMAND_CHANNEL_BIND_PORT);
+
+        configCreator = mock(ConfigurationCreator.class);
+        when(configCreator.create()).thenReturn(config);
+
+        Storage storage = mock(Storage.class);
+        context.registerService(Storage.class, storage, null);
+        AgentInfoDAO agentInfoDAO = mock(AgentInfoDAO.class);
+        context.registerService(AgentInfoDAO.class.getName(), agentInfoDAO, null);
+        BackendInfoDAO backendInfoDAO = mock(BackendInfoDAO.class);
+        context.registerService(BackendInfoDAO.class.getName(), backendInfoDAO, null);
+        configServer = mock(ConfigurationServer.class);
+        context.registerService(ConfigurationServer.class.getName(), configServer, null);
+        dbServiceFactory = mock(DbServiceFactory.class);
+        dbService = mock(DbService.class);
+        writerId = mock(WriterID.class);
+        when(dbServiceFactory.createDbService(anyString(), any(StorageCredentials.class), any(SSLConfiguration.class))).thenReturn(dbService);
+
+        exitStatus = mock(ExitStatus.class);
+    }
+
+    @After
+    public void tearDown() {
+        context = null;
+        configServer = null;
+        dbService = null;
+        configCreator = null;
+        dbServiceFactory = null;
+        exitStatus = null;
+    }
+
+    @Test
+    public void testAgentStartup() throws CommandException, InterruptedException {
+        final AgentApplication agent = new AgentApplication(context, exitStatus, writerId, mock(SSLConfiguration.class), new DependencyServices(), configCreator, dbServiceFactory);
+        agent.setStorageCredentials(mock(StorageCredentials.class));
+        final CountDownLatch latch = new CountDownLatch(1);
+        final CommandException[] ce = new CommandException[1];
+        final long timeoutMillis = 5000L;
+        
+        startAgentRunThread(timeoutMillis, agent, ce, latch);
+        
+        boolean ret = latch.await(timeoutMillis, TimeUnit.MILLISECONDS);
+        if (ce[0] != null) {
+            throw ce[0];
+        }
+        if (!ret) {
+            fail("Timeout expired!");
+        }
+        
+    }
+    
+    @Test
+    public void testAgentStartupConnectFailure() throws CommandException, InterruptedException {
+        final AgentApplication agent = new AgentApplication(context, exitStatus, writerId, mock(SSLConfiguration.class), new DependencyServices(), configCreator, dbServiceFactory);
+        agent.setStorageCredentials(mock(StorageCredentials.class));
+        
+        Arguments args = mock(Arguments.class);
+        final CommandContext commandContext = mock(CommandContext.class);
+        when(commandContext.getArguments()).thenReturn(args);
+        
+        // Throw a ConnectionException when we try to connect to storage
+        doThrow(new ConnectionException()).when(dbService).connect();
+        
+        agent.run(commandContext);
+        
+        // Ensure we shut down command channel server
+        verify(configServer).stopListening();
+    }
+    
+    /*
+     * Having the PrepareForTest annotation on method level does not seem to
+     * deadlock the test, which seems to be more or less reliably reproducible
+     * if this annotation is at class level instead. Steps to reproduce the
+     * deadlock is:
+     * 1. Attach the PrepareForTest annotation to the class (over the test
+     *    method)
+     * 2. Run the test multiple times. 5-20 times seemed sufficient for me to
+     *    make the deadlock show up. This deadlock does not seem to happen
+     *    otherwise (can run up to 30 times head-to-head without deadlock).
+     *    
+     */
+    @PrepareForTest({ AgentApplication.class })
+    @SuppressWarnings("unchecked")
+    @Test
+    public void verifyBackendRegistryProblemsSetsExitStatus() throws Exception {
+        whenNew(BackendRegistry.class).withParameterTypes(BundleContext.class)
+                .withArguments(any(BundleContext.class))
+                .thenThrow(InvalidSyntaxException.class);
+        final AgentApplication agent = new AgentApplication(context,
+                exitStatus, writerId,  mock(SSLConfiguration.class),
+                mock(DependencyServices.class), configCreator, dbServiceFactory);
+        try {
+            agent.startAgent(null, null, null, null);
+        } catch (RuntimeException e) {
+            assertEquals(InvalidSyntaxException.class, e.getCause().getClass());
+        }
+        verify(exitStatus).setExitStatus(ExitStatus.EXIT_ERROR);
+    }
+    
+    @PrepareForTest({ AgentApplication.class })
+    @Test
+    public void verifyAgentLaunchExceptionSetsExitStatus() throws Exception {
+        whenNew(BackendRegistry.class).withParameterTypes(BundleContext.class)
+                .withArguments(any(BundleContext.class))
+                .thenReturn(mock(BackendRegistry.class));
+        Agent mockAgent = mock(Agent.class);
+        whenNew(Agent.class).withParameterTypes(BackendRegistry.class,
+                AgentStartupConfiguration.class, Storage.class,
+                AgentInfoDAO.class, BackendInfoDAO.class, WriterID.class, 
+                MXBeanConnectionPool.class).withArguments(
+                any(BackendRegistry.class),
+                any(AgentStartupConfiguration.class), any(Storage.class),
+                any(AgentInfoDAO.class), any(BackendInfoDAO.class), any(WriterID.class), 
+                any(MXBeanConnectionPool.class)).thenReturn(mockAgent);
+        doThrow(LaunchException.class).when(mockAgent).start();
+        final AgentApplication agent = new AgentApplication(context,
+                exitStatus, writerId,  mock(SSLConfiguration.class),
+                mock(DependencyServices.class), configCreator, dbServiceFactory);
+        try {
+            agent.startAgent(null, null, null, null);
+        } catch (RuntimeException e) {
+            fail("Should not have thrown RuntimeException");
+        }
+        verify(exitStatus).setExitStatus(ExitStatus.EXIT_ERROR);
+    }
+
+    private void startAgentRunThread(final long timoutMillis, final AgentApplication agent, final CommandException[] ce, final CountDownLatch latch) {
+        Arguments args = mock(Arguments.class);
+        final CommandContext commandContext = mock(CommandContext.class);
+        when(commandContext.getArguments()).thenReturn(args);
+        
+        // Immediately switch to CONNECTED state on dbService.connect
+        final ArgumentCaptor<ConnectionListener> listenerCaptor = ArgumentCaptor.forClass(ConnectionListener.class);
+        doNothing().when(dbService).addConnectionListener(listenerCaptor.capture());
+        
+        doAnswer(new Answer<Void>() {
+
+            @Override
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                ConnectionListener listener = listenerCaptor.getValue();
+                listener.changed(ConnectionStatus.CONNECTED);
+                return null;
+            }
+            
+        }).when(dbService).connect();
+
+        // Run agent in a new thread so we can timeout on failure
+        Thread t = new Thread(new Runnable() {
+            
+            @Override
+            public void run() {
+                // Finish when config server starts listening
+                try {
+                    doAnswer(new Answer<Void>() {
+
+                        @Override
+                        public Void answer(InvocationOnMock invocation) throws Throwable {
+                            latch.countDown();
+                            return null;
+                        }
+                    }).when(configServer).startListening(COMMAND_CHANNLE_BIND_HOST, COMMAND_CHANNEL_BIND_PORT);
+                } catch (IOException e1) {
+                    fail("a mock should not throw an exception");
+                }
+                
+                try {
+                    agent.run(commandContext);
+                } catch (CommandException e) {
+                    ce[0] = e;
+                }
+            }
+        });
+        
+        t.start();
+    }
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/agent/cli/src/test/java/com/redhat/thermostat/agent/cli/internal/ServiceCommandTest.java	Fri Apr 08 13:18:48 2016 +0200
@@ -0,0 +1,412 @@
+/*
+ * Copyright 2012-2016 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.agent.cli.internal;
+
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.Collection;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import com.redhat.thermostat.common.ActionEvent;
+import com.redhat.thermostat.common.ActionListener;
+import com.redhat.thermostat.common.ActionNotifier;
+import com.redhat.thermostat.common.cli.AbstractStateNotifyingCommand;
+import com.redhat.thermostat.common.cli.CommandContext;
+import com.redhat.thermostat.common.cli.CommandException;
+import com.redhat.thermostat.common.cli.Console;
+import com.redhat.thermostat.common.tools.ApplicationState;
+import com.redhat.thermostat.launcher.Launcher;
+import com.redhat.thermostat.testutils.StubBundleContext;
+
+public class ServiceCommandTest {
+
+    private ByteArrayOutputStream stdErrOut;
+    private Launcher mockLauncher;
+    private ServiceCommand serviceCommand;
+    private CommandContext mockCommandContext;
+
+    private static ActionEvent<ApplicationState> mockActionEvent;
+    private static Collection<ActionListener<ApplicationState>> listeners;
+
+    private static final String[] STORAGE_START_ARGS = { "storage", "--start" };
+    private static final String[] STORAGE_STOP_ARGS = { "storage", "--stop" };
+    private static final String[] AGENT_ARGS = {"agent", "-d", "Test String"};
+    private static final String AGENT_ID = "Test ID";
+
+    @SuppressWarnings("unchecked")
+    @Before
+    public void setUp() {
+        StubBundleContext bundleContext = new StubBundleContext();
+        mockLauncher = mock(Launcher.class);
+        bundleContext.registerService(Launcher.class, mockLauncher, null);
+        serviceCommand = new ServiceCommand(bundleContext);
+        
+        AbstractStateNotifyingCommand mockStorageCommand = mock(AbstractStateNotifyingCommand.class);
+        mockActionEvent = mock(ActionEvent.class);
+        when(mockActionEvent.getSource()).thenReturn(mockStorageCommand);
+        mockCommandContext = mock(CommandContext.class);
+        Console console = mock(Console.class);
+        stdErrOut = new ByteArrayOutputStream();
+        PrintStream err = new PrintStream(stdErrOut);
+        when(console.getError()).thenReturn(err);
+        when(mockCommandContext.getConsole()).thenReturn(console);
+        
+        ActionNotifier<ApplicationState> mockNotifier = mock(ActionNotifier.class);
+        when(mockStorageCommand.getNotifier()).thenReturn(mockNotifier);
+        when(mockActionEvent.getPayload()).thenReturn(new String("Test String"));
+    }
+
+    @After
+    public void tearDown() {
+        listeners = null;
+        mockLauncher = null;
+        serviceCommand = null;
+        mockActionEvent = null;
+        mockCommandContext = null;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test(timeout=1000)
+    public void testRunOnce() throws CommandException, InterruptedException {
+        doAnswer(new Answer<Void>() {
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                listeners = (Collection<ActionListener<ApplicationState>>)args[1];
+                
+                when(mockActionEvent.getActionId()).thenReturn(ApplicationState.START);
+                
+                for(ActionListener<ApplicationState> listener : listeners) {
+                    listener.actionPerformed(mockActionEvent);
+                }
+                return null;
+            }
+        }).when(mockLauncher).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
+
+        doAnswer(new Answer<Void>() {
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                listeners = (Collection<ActionListener<ApplicationState>>)args[1];
+
+                when(mockActionEvent.getActionId()).thenReturn(ApplicationState.START);
+                when(mockActionEvent.getPayload()).thenReturn(AGENT_ID);
+
+                for(ActionListener<ApplicationState> listener : listeners) {
+                    listener.actionPerformed(mockActionEvent);
+                }
+                return null;
+            }
+        }).when(mockLauncher).run(eq(AGENT_ARGS), isA(Collection.class), anyBoolean());
+
+        final boolean[] result = new boolean[2];
+        final String[] agentIdFound = new String[1];
+        serviceCommand.getNotifier().addActionListener(new ActionListener<ApplicationState>() {
+            @SuppressWarnings("incomplete-switch")
+            @Override
+            public void actionPerformed(ActionEvent<ApplicationState> actionEvent) {
+                switch (actionEvent.getActionId()) {
+                    case FAIL:
+                        result[0] = false;
+                        break;
+                    case START:
+                        result[0] = true;
+                        agentIdFound[0] = (String) actionEvent.getPayload();
+                        break;
+                    case STOP:
+                        result[1] = true;
+                        break;
+                }
+            }
+        });
+
+        boolean exTriggered = false;
+        try {
+            serviceCommand.run(mockCommandContext);
+        } catch (CommandException e) { 
+            exTriggered = true;
+        }
+        Assert.assertFalse(exTriggered);
+        Assert.assertTrue("Agent expected to fire START event", result[0]);
+        Assert.assertTrue("Agent expected to fire STOP event", result[1]);
+        Assert.assertEquals("Payload does not contain AgentId matching the agent started", agentIdFound[0], AGENT_ID);
+
+        verify(mockLauncher, times(1)).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
+        verify(mockLauncher, times(1)).run(eq(STORAGE_STOP_ARGS), anyBoolean());
+        verify(mockLauncher, times(1)).run(eq(AGENT_ARGS), isA(Collection.class), anyBoolean());
+        verify(mockActionEvent, times(2)).getActionId();
+    }
+
+    @Test(timeout=1000)
+    public void testStorageStartUnknownPath()  throws CommandException {
+        doAnswer(new Answer<Void>() {
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                listeners = (Collection<ActionListener<ApplicationState>>)args[1];
+
+                when(mockActionEvent.getActionId()).thenReturn(ApplicationState.START);
+                // Return a null payload in order to trigger unknown path
+                when(mockActionEvent.getPayload()).thenReturn(null);
+
+                for(ActionListener<ApplicationState> listener : listeners) {
+                    listener.actionPerformed(mockActionEvent);
+                }
+                return null;
+            }
+        }).when(mockLauncher).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
+
+        final boolean[] result = new boolean[1];
+        serviceCommand.getNotifier().addActionListener(new ActionListener<ApplicationState>() {
+            @SuppressWarnings("incomplete-switch")
+            @Override
+            public void actionPerformed(ActionEvent<ApplicationState> actionEvent) {
+                switch (actionEvent.getActionId()) {
+                    case FAIL:
+                        result[0] = true;
+                        break;
+                    case START:
+                        result[0] = false;
+                        break;
+                    case STOP:
+                        result[0] = false;
+                        break;
+                }
+            }
+        });
+
+        boolean exTriggered = false;
+        try {
+            serviceCommand.run(mockCommandContext);
+        } catch (CommandException e) {
+            exTriggered = true;
+        }
+        Assert.assertFalse(exTriggered);
+        Assert.assertEquals("Unexpected result from storage.\n", stdErrOut.toString());
+        Assert.assertTrue("Agent expected to fire FAIL event", result[0]);
+
+        verify(mockLauncher, times(1)).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
+        verify(mockLauncher, times(1)).run(eq(STORAGE_STOP_ARGS), anyBoolean());
+        verify(mockLauncher, never()).run(eq(AGENT_ARGS), isA(Collection.class), anyBoolean());
+        verify(mockActionEvent, times(1)).getActionId();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test(timeout=1000)
+    public void testStorageFailStart() throws CommandException, InterruptedException {
+        doAnswer(new Answer<Void>() {
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                listeners = (Collection<ActionListener<ApplicationState>>)args[1];
+                
+                when(mockActionEvent.getActionId()).thenReturn(ApplicationState.FAIL);
+                when(mockActionEvent.getPayload()).thenReturn(new Exception("Test Exception"));
+                
+                for(ActionListener<ApplicationState> listener : listeners) {
+                    listener.actionPerformed(mockActionEvent);
+                }
+                return null;
+            }
+        }).when(mockLauncher).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
+
+        final boolean[] result = new boolean[1];
+        serviceCommand.getNotifier().addActionListener(new ActionListener<ApplicationState>() {
+            @SuppressWarnings("incomplete-switch")
+            @Override
+            public void actionPerformed(ActionEvent<ApplicationState> actionEvent) {
+                switch (actionEvent.getActionId()) {
+                    case FAIL:
+                        result[0] = true;
+                        break;
+                    case START:
+                        result[0] = false;
+                        break;
+                    case STOP:
+                        result[0] = false;
+                        break;
+                }
+            }
+        });
+
+        boolean exTriggered = false;
+        try {
+            serviceCommand.run(mockCommandContext);
+        } catch (CommandException e) {
+            exTriggered = true;
+        }
+        Assert.assertTrue(exTriggered);
+        Assert.assertEquals("Test Exception\n", stdErrOut.toString());
+        Assert.assertTrue("Agent expected to fire FAIL event", result[0]);
+
+        verify(mockLauncher, times(1)).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
+        verify(mockLauncher, never()).run(eq(STORAGE_STOP_ARGS), anyBoolean());
+        verify(mockLauncher, never()).run(eq(AGENT_ARGS), isA(Collection.class), anyBoolean());
+        verify(mockActionEvent, times(1)).getActionId();
+    }
+
+    @Test(timeout=1000)
+    public void testStorageFailStartUnknownPath()  throws CommandException {
+        doAnswer(new Answer<Void>() {
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                listeners = (Collection<ActionListener<ApplicationState>>)args[1];
+
+                when(mockActionEvent.getActionId()).thenReturn(ApplicationState.FAIL);
+                // Return a null payload in order to trigger unknown path
+                when(mockActionEvent.getPayload()).thenReturn(null);
+
+                for(ActionListener<ApplicationState> listener : listeners) {
+                    listener.actionPerformed(mockActionEvent);
+                }
+                return null;
+            }
+        }).when(mockLauncher).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
+
+        final boolean[] result = new boolean[1];
+        serviceCommand.getNotifier().addActionListener(new ActionListener<ApplicationState>() {
+            @SuppressWarnings("incomplete-switch")
+            @Override
+            public void actionPerformed(ActionEvent<ApplicationState> actionEvent) {
+                switch (actionEvent.getActionId()) {
+                    case FAIL:
+                        result[0] = true;
+                        break;
+                    case START:
+                        result[0] = false;
+                        break;
+                    case STOP:
+                        result[0] = false;
+                        break;
+                }
+            }
+        });
+
+        boolean exTriggered = false;
+        try {
+            serviceCommand.run(mockCommandContext);
+        } catch (CommandException e) {
+            exTriggered = true;
+        }
+        Assert.assertTrue(exTriggered);
+        Assert.assertEquals("Unexpected result from storage.\n", stdErrOut.toString());
+        Assert.assertTrue("Agent expected to fire FAIL event", result[0]);
+
+        verify(mockLauncher, times(1)).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
+        verify(mockLauncher, never()).run(eq(STORAGE_STOP_ARGS), anyBoolean());
+        verify(mockLauncher, never()).run(eq(AGENT_ARGS), isA(Collection.class), anyBoolean());
+        verify(mockActionEvent, times(1)).getActionId();
+    }
+    
+    @Test
+    public void testAgentStartFail()  throws CommandException {
+        doAnswer(new Answer<Void>() {
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                listeners = (Collection<ActionListener<ApplicationState>>)args[1];
+
+                when(mockActionEvent.getActionId()).thenReturn(ApplicationState.START);
+
+                for(ActionListener<ApplicationState> listener : listeners) {
+                    listener.actionPerformed(mockActionEvent);
+                }
+                return null;
+            }
+        }).when(mockLauncher).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
+        doAnswer(new Answer<Void>() {
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                Object[] args = invocation.getArguments();
+                listeners = (Collection<ActionListener<ApplicationState>>)args[1];
+
+                when(mockActionEvent.getActionId()).thenReturn(ApplicationState.FAIL);
+
+                for(ActionListener<ApplicationState> listener : listeners) {
+                    listener.actionPerformed(mockActionEvent);
+                }
+                return null;
+            }
+        }).when(mockLauncher).run(eq(AGENT_ARGS), isA(Collection.class), anyBoolean());
+
+        final boolean[] result = new boolean[1];
+        serviceCommand.getNotifier().addActionListener(new ActionListener<ApplicationState>() {
+            @SuppressWarnings("incomplete-switch")
+            @Override
+            public void actionPerformed(ActionEvent<ApplicationState> actionEvent) {
+                switch (actionEvent.getActionId()) {
+                    case FAIL:
+                        result[0] = true;
+                        break;
+                    case START:
+                        result[0] = false;
+                        break;
+                    case STOP:
+                        result[0] = false;
+                        break;
+                }
+            }
+        });
+
+        boolean exTriggered = false;
+        try {
+            serviceCommand.run(mockCommandContext);
+        } catch (CommandException e) {
+            exTriggered = true;
+        }
+        Assert.assertFalse(exTriggered);
+        Assert.assertEquals("Thermostat agent failed to start. See logs for details.\n", stdErrOut.toString());
+        Assert.assertTrue("Agent expected to fire FAIL event", result[0]);
+
+        verify(mockLauncher, times(1)).run(eq(STORAGE_START_ARGS), isA(Collection.class), anyBoolean());
+        verify(mockLauncher, times(1)).run(eq(STORAGE_STOP_ARGS), anyBoolean());
+        verify(mockLauncher, times(1)).run(eq(AGENT_ARGS), isA(Collection.class), anyBoolean());
+        verify(mockActionEvent, times(2)).getActionId();
+    }
+
+}
+