http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/java/org/apache/usergrid/launcher/Server.java
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/java/org/apache/usergrid/launcher/Server.java 
b/stack/launcher/src/main/java/org/apache/usergrid/launcher/Server.java
deleted file mode 100644
index 52dc6e6..0000000
--- a/stack/launcher/src/main/java/org/apache/usergrid/launcher/Server.java
+++ /dev/null
@@ -1,620 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.usergrid.launcher;
-
-
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.Options;
-
-
-public class Server implements 
org.springframework.context.ApplicationContextAware {
-
-    public static final boolean INSTALL_JSP_SERVLETS = true;
-
-    private static final org.slf4j.Logger logger = 
org.slf4j.LoggerFactory.getLogger( Server.class );
-
-    public static Server instance = null;
-
-    org.apache.commons.cli.CommandLine line = null;
-
-    boolean initializeDatabaseOnStart = false;
-    boolean startDatabaseWithServer = false;
-
-    org.glassfish.grizzly.http.server.HttpServer httpServer;
-    org.glassfish.grizzly.servlet.ServletHandler handler;
-    EmbeddedServerHelper embeddedCassandra = null;
-
-    protected org.apache.usergrid.persistence.EntityManagerFactory emf;
-
-    protected org.apache.usergrid.services.ServiceManagerFactory smf;
-
-    protected org.apache.usergrid.management.ManagementService management;
-
-    protected java.util.Properties properties;
-
-    protected org.apache.usergrid.mq.QueueManagerFactory qmf;
-
-    int port = 
org.glassfish.grizzly.http.server.NetworkListener.DEFAULT_NETWORK_PORT;
-
-    boolean daemon = true;
-
-
-    public Server() {
-        instance = this;
-    }
-
-
-    public static void main( String[] args ) {
-        instance = new Server();
-        instance.startServerFromCommandLine( args );
-    }
-
-
-    public static Server getInstance() {
-        return instance;
-    }
-
-
-    public void startServerFromCommandLine( String[] args ) {
-        org.apache.commons.cli.CommandLineParser parser = new 
org.apache.commons.cli.GnuParser();
-        line = null;
-        try {
-            line = parser.parse( createOptions(), args );
-        }
-        catch ( org.apache.commons.cli.ParseException exp ) {
-            printCliHelp( "Parsing failed.  Reason: " + exp.getMessage() );
-        }
-
-        if ( line == null ) {
-            return;
-        }
-
-        startDatabaseWithServer = line.hasOption( "db" );
-        initializeDatabaseOnStart = line.hasOption( "init" );
-
-        if ( line.hasOption( "port" ) ) {
-            try {
-                port = ( ( Number ) line.getParsedOptionValue( "port" ) 
).intValue();
-            }
-            catch ( org.apache.commons.cli.ParseException exp ) {
-                printCliHelp( "Parsing failed.  Reason: " + exp.getMessage() );
-                return;
-            }
-        }
-        startServer();
-    }
-
-
-    @SuppressWarnings("InfiniteLoopStatement")
-    public synchronized void startServer() {
-
-        if ( startDatabaseWithServer ) {
-            startCassandra();
-        }
-
-        httpServer = 
org.glassfish.grizzly.http.server.HttpServer.createSimpleServer( ".", port );
-
-        handler = new org.glassfish.grizzly.servlet.ServletHandler();
-
-        handler.addContextParameter( 
com.sun.jersey.spi.spring.container.servlet.SpringServlet.CONTEXT_CONFIG_LOCATION,
-                "classpath:/usergrid-standalone-context.xml" );
-
-        handler.addServletListener( 
org.springframework.web.context.ContextLoaderListener.class.getName() );
-        handler.addServletListener( 
org.springframework.web.context.request.RequestContextListener.class.getName() 
);
-
-        com.sun.jersey.api.json.JSONConfiguration.badgerFish();
-
-        handler.addInitParameter( 
com.sun.jersey.api.core.PackagesResourceConfig.PROPERTY_PACKAGES, 
"org.apache.usergrid" );
-        handler.addInitParameter( 
com.sun.jersey.api.json.JSONConfiguration.FEATURE_POJO_MAPPING, "true" );
-        handler.addInitParameter( 
com.sun.jersey.api.core.ResourceConfig.PROPERTY_CONTAINER_REQUEST_FILTERS,
-                
"org.apache.usergrid.rest.filters.MeteringFilter,org.apache.usergrid.rest.filters.JSONPCallbackFilter,"
 +
-                        
"org.apache.usergrid.rest.security.shiro.filters.OAuth2AccessTokenSecurityFilter,"
 +
-                        
"org.apache.usergrid.rest.security.shiro.filters.BasicAuthSecurityFilter," +
-                        
"org.apache.usergrid.rest.security.shiro.filters.ClientCredentialsSecurityFilter"
 );
-        handler.addInitParameter( 
com.sun.jersey.api.core.ResourceConfig.PROPERTY_CONTAINER_RESPONSE_FILTERS,
-                
"org.apache.usergrid.rest.security.CrossOriginRequestFilter,org.apache.usergrid.rest.filters.MeteringFilter"
 );
-        handler.addInitParameter( 
com.sun.jersey.api.core.ResourceConfig.PROPERTY_RESOURCE_FILTER_FACTORIES,
-                
"org.apache.usergrid.rest.security.SecuredResourceFilterFactory,com.sun.jersey.api.container.filter"
-                        + ".RolesAllowedResourceFilterFactory" );
-        handler.addInitParameter( 
com.sun.jersey.api.core.ResourceConfig.FEATURE_DISABLE_WADL, "true" );
-        handler.addInitParameter( 
com.sun.jersey.spi.container.servlet.ServletContainer.JSP_TEMPLATES_BASE_PATH, 
"/WEB-INF/jsp" );
-        handler.addInitParameter( 
com.sun.jersey.spi.container.servlet.ServletContainer.PROPERTY_WEB_PAGE_CONTENT_REGEX,
-                "/(((images|css|js|jsp|WEB-INF/jsp)/.*)|(favicon\\.ico))" );
-
-        handler.setServletInstance( new 
com.sun.jersey.spi.spring.container.servlet.SpringServlet() );
-        // handler.setServletPath("/ROOT");
-        // handler.setContextPath("/ROOT");
-
-        handler.setProperty( "load-on-startup", 1 );
-
-        java.util.Map<String, String> initParameters = new 
java.util.HashMap<String, String>();
-        initParameters.put( "targetFilterLifecycle", "true" );
-        handler.addFilter( new 
org.apache.usergrid.rest.filters.ContentTypeFilter(), "contentTypeFilter", 
java.util.Collections.EMPTY_MAP );
-
-        handler.addFilter( new 
org.springframework.web.filter.DelegatingFilterProxy(), "shiroFilter", 
initParameters );
-
-        handler.addFilter( new org.apache.usergrid.rest.SwaggerServlet(), 
"swagger", null );
-
-        // handler.addFilter(new SpringServlet(), "spring", null);
-
-        setupJspMappings();
-
-        httpServer.getServerConfiguration().addHttpHandler( handler, "/*" );
-
-        // TODO: find replacement ClasspathStaticHandler, because we had to 
remove it for ASF policy reasons 
-//        ClasspathStaticHttpHandler static_handler = new 
ClasspathStaticHttpHandler( "/html/css/" );
-//        httpServer.getServerConfiguration().addHttpHandler( static_handler, 
"/css/*" );
-
-        httpServer.getServerConfiguration().setJmxEnabled( true );
-
-        setThreadSize();
-
-        try {
-            httpServer.start();
-        }
-        catch ( java.io.IOException e ) {
-            e.printStackTrace();
-        }
-
-        if ( daemon ) {
-            while ( true ) {
-                try {
-                    Thread.sleep( Long.MAX_VALUE );
-                }
-                catch ( InterruptedException e ) {
-                    logger.warn( "Interrupted" );
-                }
-            }
-        }
-    }
-
-
-    private int getThreadSizeFromSystemProperties() {
-        // the default value is number of cpu core * 2.
-        // see 
org.glassfich.grizzly.strategies.AbstractIOStrategy.createDefaultWorkerPoolconfig()
-        int threadSize = Runtime.getRuntime().availableProcessors() * 2;
-
-        String threadSizeString = System.getProperty( "server.threadSize" );
-        if ( threadSizeString != null ) {
-            try {
-                threadSize = Integer.parseInt( threadSizeString );
-            }
-            catch ( Exception e ) {
-                // ignore all Exception
-            }
-        }
-        else {
-            try {
-                threadSize = Integer.parseInt( System.getProperty( 
"server.threadSizeScale" ) ) * Runtime.getRuntime()
-                                                                               
                          .availableProcessors();
-            }
-            catch ( Exception e ) {
-                // ignore all Exception
-            }
-        }
-
-        return threadSize;
-    }
-
-
-    private void setThreadSize() {
-
-        int threadSize = getThreadSizeFromSystemProperties();
-
-        
java.util.Collection<org.glassfish.grizzly.http.server.NetworkListener> 
listeners = httpServer.getListeners();
-        for ( org.glassfish.grizzly.http.server.NetworkListener listener : 
listeners ) {
-            listener.getTransport().getKernelThreadPoolConfig();
-            org.glassfish.grizzly.nio.transport.TCPNIOTransportBuilder builder 
= org.glassfish.grizzly.nio.transport
-                    .TCPNIOTransportBuilder.newInstance();
-            org.glassfish.grizzly.threadpool.ThreadPoolConfig config = 
builder.getWorkerThreadPoolConfig();
-            config.setCorePoolSize( threadSize );
-            config.setMaxPoolSize( threadSize );
-            org.glassfish.grizzly.nio.transport.TCPNIOTransport transport = 
builder.build();
-            listener.setTransport( transport );
-        }
-
-        logger.info( "thread size set as {}", threadSize );
-    }
-
-
-    private void setupJspMappings() {
-        if ( !INSTALL_JSP_SERVLETS ) {
-            return;
-        }
-
-        org.apache.jasper.runtime.JspFactoryImpl factory = new 
org.apache.jasper.runtime.JspFactoryImpl();
-        javax.servlet.jsp.JspFactory.setDefaultFactory( factory );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.TestResource.error_jsp",
-                "/WEB-INF/jsp/org/apache/usergrid/rest/TestResource/error.jsp" 
);
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.TestResource.test_jsp",
-                "/WEB-INF/jsp/org/apache/usergrid/rest/TestResource/test.jsp" 
);
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.users.UsersResource.error_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UsersResource/error.jsp"
 );
-
-        mapServlet(
-                
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.users.UsersResource.resetpw_005femail_005fform_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UsersResource/resetpw_email_form.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.users.UsersResource"
-                + ".resetpw_005femail_005fsuccess_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UsersResource/resetpw_email_success.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.users.UserResource.activate_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/activate.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.users.UserResource.confirm_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/confirm.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.users.UserResource.error_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/error.jsp" 
);
-
-        mapServlet(
-                
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.users.UserResource.resetpw_005femail_005fform_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/resetpw_email_form.jsp"
 );
-
-        mapServlet(
-                
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.users.UserResource.resetpw_005femail_005fsuccess_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/resetpw_email_success.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.users.UserResource.resetpw_005fset_005fform_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/resetpw_set_form.jsp"
 );
-
-        mapServlet(
-                
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.users.UserResource.resetpw_005fset_005fsuccess_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/users/UserResource/resetpw_set_success.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.organizations.OrganizationResource.activate_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/organizations/OrganizationResource/activate.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.organizations.OrganizationResource.confirm_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/organizations/OrganizationResource/confirm.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.organizations.OrganizationResource.error_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/organizations/OrganizationResource/error.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.ManagementResource.authorize_005fform_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/ManagementResource/authorize_form.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.management.ManagementResource.error_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/management/ManagementResource/error.jsp" 
);
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.applications.users.UsersResource.error_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UsersResource/error.jsp"
 );
-
-        mapServlet(
-                
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.applications.users.UsersResource.resetpw_005femail_005fform_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UsersResource/resetpw_email_form.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.applications.users.UsersResource"
-                + ".resetpw_005femail_005fsuccess_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UsersResource/resetpw_email_success.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.applications.users.UserResource.activate_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/activate.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.applications.users.UserResource.confirm_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/confirm.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.applications.users.UserResource.error_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/error.jsp"
 );
-
-        mapServlet(
-                
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.applications.users.UserResource.resetpw_005femail_005fform_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/resetpw_email_form.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.applications.users.UserResource"
-                + ".resetpw_005femail_005fsuccess_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/resetpw_email_success.jsp"
 );
-
-        mapServlet(
-                
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.applications.users.UserResource.resetpw_005fset_005fform_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/resetpw_set_form.jsp"
 );
-
-        mapServlet(
-                
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.applications.users.UserResource.resetpw_005fset_005fsuccess_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/applications/users/UserResource/resetpw_set_success.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.applications.ApplicationResource.authorize_005fform_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/applications/ApplicationResource/authorize_form.jsp"
 );
-
-        mapServlet( 
"jsp.WEB_002dINF.jsp.org.apache.usergrid.rest.applications.ApplicationResource.error_jsp",
-                
"/WEB-INF/jsp/org/apache/usergrid/rest/applications/ApplicationResource/error.jsp"
 );
-    }
-
-
-    private void mapServlet( String cls, String mapping ) {
-
-        try {
-            javax.servlet.Servlet servlet = ( javax.servlet.Servlet ) 
org.glassfish.grizzly.http.server.util
-                    .ClassLoaderUtil.load( cls );
-            if ( servlet != null ) {
-                org.glassfish.grizzly.servlet.ServletHandler handler = new 
org.glassfish.grizzly.servlet.ServletHandler( servlet );
-                handler.setServletPath( mapping );
-                httpServer.getServerConfiguration().addHttpHandler( handler, 
mapping );
-            }
-        }
-        catch ( Exception e ) {
-            logger.error( "Unable to add JSP page: " + mapping );
-        }
-
-        logger.info( "jsp: " + 
javax.servlet.jsp.JspFactory.getDefaultFactory() );
-    }
-
-
-    public synchronized void stopServer() {
-        
java.util.Collection<org.glassfish.grizzly.http.server.NetworkListener> 
listeners = httpServer.getListeners();
-        for ( org.glassfish.grizzly.http.server.NetworkListener listener : 
listeners ) {
-            try {
-                listener.stop();
-            }
-            catch ( java.io.IOException e ) {
-                e.printStackTrace();
-            }
-        }
-
-        if ( httpServer != null ) {
-            httpServer.stop();
-            httpServer = null;
-        }
-
-        if ( embeddedCassandra != null ) {
-            stopCassandra();
-            embeddedCassandra = null;
-        }
-
-        if ( ctx instanceof 
org.springframework.web.context.support.XmlWebApplicationContext ) {
-            ( ( 
org.springframework.web.context.support.XmlWebApplicationContext ) ctx 
).close();
-        }
-    }
-
-
-    public void setDaemon( boolean daemon ) {
-        this.daemon = daemon;
-    }
-
-
-    public boolean isRunning() {
-        return ( httpServer != null );
-    }
-
-
-    static void printCliHelp( String message ) {
-        System.out.println( message );
-        org.apache.commons.cli.HelpFormatter formatter = new 
org.apache.commons.cli.HelpFormatter();
-        formatter.printHelp( "java -jar usergrid-standalone-0.0.1-SNAPSHOT.jar 
", createOptions() );
-        System.exit( -1 );
-    }
-
-
-    static Options createOptions() {
-        // the nogui option will be required due to combining the graphical
-        // launcher with this standalone CLI based server
-        Options options = new Options();
-        OptionBuilder.withDescription( "Start launcher without UI" );
-        OptionBuilder.isRequired( true );
-        Option noguiOption = OptionBuilder.create( "nogui" );
-
-        OptionBuilder.isRequired( false );
-        OptionBuilder.withDescription( "Initialize database" );
-        Option initOption = OptionBuilder.create( "init" );
-
-        OptionBuilder.withDescription( "Start database" );
-        Option dbOption = OptionBuilder.create( "db" );
-
-        OptionBuilder.withDescription( "Http port (without UI)" );
-        OptionBuilder.hasArg();
-        OptionBuilder.withArgName( "PORT" );
-        OptionBuilder.withLongOpt( "port" );
-        OptionBuilder.withType( Number.class );
-        Option portOption = OptionBuilder.create( 'p' );
-
-        options.addOption( initOption );
-        options.addOption( dbOption );
-        options.addOption( portOption );
-        options.addOption( noguiOption );
-
-        return options;
-    }
-
-
-    public synchronized void startCassandra() {
-        if ( embeddedCassandra == null ) {
-            embeddedCassandra = new EmbeddedServerHelper();
-
-            if ( initializeDatabaseOnStart ) {
-                logger.info( "Initializing Cassandra" );
-                try {
-                    embeddedCassandra.setup();
-                }
-                catch ( Exception e ) {
-                    logger.error( "Unable to initialize Cassandra", e );
-                    System.exit( 0 );
-                }
-            }
-        }
-        logger.info( "Starting Cassandra" );
-        try {
-            embeddedCassandra.start();
-        }
-        catch ( Exception e ) {
-            logger.error( "Unable to start Cassandra", e );
-            System.exit( 0 );
-        }
-    }
-
-
-    public synchronized void stopCassandra() {
-        logger.info( "Stopping Cassandra" );
-        embeddedCassandra.stop();
-    }
-
-
-    public org.apache.usergrid.persistence.EntityManagerFactory 
getEntityManagerFactory() {
-        return emf;
-    }
-
-
-    @org.springframework.beans.factory.annotation.Autowired
-    public void setEntityManagerFactory( 
org.apache.usergrid.persistence.EntityManagerFactory emf ) {
-        this.emf = emf;
-    }
-
-
-    public org.apache.usergrid.services.ServiceManagerFactory 
getServiceManagerFactory() {
-        return smf;
-    }
-
-
-    @org.springframework.beans.factory.annotation.Autowired
-    public void setServiceManagerFactory( 
org.apache.usergrid.services.ServiceManagerFactory smf ) {
-        this.smf = smf;
-    }
-
-
-    public org.apache.usergrid.management.ManagementService 
getManagementService() {
-        return management;
-    }
-
-
-    @org.springframework.beans.factory.annotation.Autowired
-    public void setManagementService( 
org.apache.usergrid.management.ManagementService management ) {
-        this.management = management;
-    }
-
-
-    public java.util.Properties getProperties() {
-        return properties;
-    }
-
-
-    @org.springframework.beans.factory.annotation.Autowired
-    public void setProperties( java.util.Properties properties ) {
-        this.properties = properties;
-    }
-
-
-    public org.apache.usergrid.mq.QueueManagerFactory getQueueManagerFactory() 
{
-        return qmf;
-    }
-
-
-    @org.springframework.beans.factory.annotation.Autowired
-    public void setQueueManagerFactory( 
org.apache.usergrid.mq.QueueManagerFactory qmf ) {
-        this.qmf = qmf;
-    }
-
-
-    public boolean isInitializeDatabaseOnStart() {
-        return initializeDatabaseOnStart;
-    }
-
-
-    public void setInitializeDatabaseOnStart( boolean 
initializeDatabaseOnStart ) {
-        this.initializeDatabaseOnStart = initializeDatabaseOnStart;
-    }
-
-
-    public boolean isStartDatabaseWithServer() {
-        return startDatabaseWithServer;
-    }
-
-
-    public void setStartDatabaseWithServer( boolean startDatabaseWithServer ) {
-        this.startDatabaseWithServer = startDatabaseWithServer;
-    }
-
-
-    boolean databaseInitializationPerformed = false;
-
-
-    public void springInit() {
-        logger.info( "Initializing server with Spring" );
-
-        // If we're running an embedded Cassandra, we always need to initialize
-        // it since Hector wipes the data on startup.
-        //
-        if ( initializeDatabaseOnStart ) {
-
-            if ( databaseInitializationPerformed ) {
-                logger.info( "Can only attempt to initialized database once 
per JVM process" );
-                return;
-            }
-            databaseInitializationPerformed = true;
-
-            logger.info( "Initializing Cassandra database" );
-            java.util.Map<String, String> properties = 
emf.getServiceProperties();
-            if ( properties != null ) {
-                logger.error( "System properties are initialized, database is 
set up already." );
-                return;
-            }
-
-            try {
-                emf.setup();
-            }
-            catch ( Exception e ) {
-                logger.error( "Unable to complete core database setup, 
possibly due to it being setup already", e );
-            }
-
-            try {
-                management.setup();
-            }
-            catch ( Exception e ) {
-                logger.error( "Unable to complete management database setup, 
possibly due to it being setup already",
-                        e );
-            }
-
-            logger.info( "Usergrid schema setup" );
-        }
-    }
-
-
-    org.springframework.context.ApplicationContext ctx;
-
-
-    @Override
-    public void setApplicationContext( 
org.springframework.context.ApplicationContext ctx ) throws 
org.springframework.beans.BeansException {
-        this.ctx = ctx;
-    }
-
-
-    public String getAccessTokenForAdminUser( String email ) {
-        try {
-            org.apache.usergrid.management.UserInfo user = 
management.getAdminUserByEmail( email );
-            return management.getAccessTokenForAdminUser( user.getUuid(), 0 );
-        }
-        catch ( Exception e ) {
-            logger.error( "Unable to get user: " + email );
-        }
-        return null;
-    }
-
-
-    public java.util.UUID getAdminUUID( String email ) {
-        try {
-            org.apache.usergrid.management.UserInfo user = 
management.getAdminUserByEmail( email );
-            return user.getUuid();
-        }
-        catch ( Exception e ) {
-            logger.error( "Unable to get user: " + email );
-        }
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.server.impl.model.method.dispatch.ResourceMethodDispatchProvider
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.server.impl.model.method.dispatch.ResourceMethodDispatchProvider
 
b/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.server.impl.model.method.dispatch.ResourceMethodDispatchProvider
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.HeaderDelegateProvider
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.HeaderDelegateProvider
 
b/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.HeaderDelegateProvider
deleted file mode 100644
index 4905c35..0000000
--- 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.HeaderDelegateProvider
+++ /dev/null
@@ -1,9 +0,0 @@
-com.sun.jersey.core.impl.provider.header.LocaleProvider
-com.sun.jersey.core.impl.provider.header.EntityTagProvider
-com.sun.jersey.core.impl.provider.header.MediaTypeProvider
-com.sun.jersey.core.impl.provider.header.CacheControlProvider
-com.sun.jersey.core.impl.provider.header.NewCookieProvider
-com.sun.jersey.core.impl.provider.header.CookieProvider
-com.sun.jersey.core.impl.provider.header.URIProvider
-com.sun.jersey.core.impl.provider.header.DateProvider
-com.sun.jersey.core.impl.provider.header.StringProvider

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.StringReaderProvider
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.StringReaderProvider
 
b/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.StringReaderProvider
deleted file mode 100644
index e73eb3d..0000000
--- 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.StringReaderProvider
+++ /dev/null
@@ -1,6 +0,0 @@
-com.sun.jersey.server.impl.model.parameter.multivalued.StringReaderProviders$TypeFromStringEnum
-com.sun.jersey.server.impl.model.parameter.multivalued.StringReaderProviders$TypeValueOf
-com.sun.jersey.server.impl.model.parameter.multivalued.StringReaderProviders$TypeFromString
-com.sun.jersey.server.impl.model.parameter.multivalued.StringReaderProviders$StringConstructor
-com.sun.jersey.server.impl.model.parameter.multivalued.StringReaderProviders$DateProvider
-com.sun.jersey.server.impl.model.parameter.multivalued.JAXBStringReaderProviders$RootElementProvider

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ContainerProvider
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ContainerProvider
 
b/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ContainerProvider
deleted file mode 100644
index 6af76c1..0000000
--- 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ContainerProvider
+++ /dev/null
@@ -1,2 +0,0 @@
-com.sun.jersey.server.impl.container.httpserver.HttpHandlerContainerProvider
-com.sun.jersey.server.impl.container.grizzly2.GrizzlyContainerProvider

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ContainerRequestFilter
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ContainerRequestFilter
 
b/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ContainerRequestFilter
deleted file mode 100644
index a25c3d8..0000000
--- 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ContainerRequestFilter
+++ /dev/null
@@ -1 +0,0 @@
-com.sun.jersey.server.impl.container.filter.NormalizeFilter

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ContainerResponseFilter
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ContainerResponseFilter
 
b/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ContainerResponseFilter
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ResourceMethodCustomInvokerDispatchProvider
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ResourceMethodCustomInvokerDispatchProvider
 
b/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ResourceMethodCustomInvokerDispatchProvider
deleted file mode 100644
index 7ce0bcb..0000000
--- 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ResourceMethodCustomInvokerDispatchProvider
+++ /dev/null
@@ -1,7 +0,0 @@
-com.sun.jersey.server.impl.model.method.dispatch.VoidVoidDispatchProvider
-com.sun.jersey.server.impl.model.method.dispatch.HttpReqResDispatchProvider
-com.sun.jersey.server.impl.model.method.dispatch.MultipartFormDispatchProvider
-com.sun.jersey.server.impl.model.method.dispatch.FormDispatchProvider
-com.sun.jersey.server.impl.model.method.dispatch.EntityParamDispatchProvider
-com.sun.jersey.multipart.impl.FormDataMultiPartDispatchProvider
-

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ResourceMethodDispatchProvider
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ResourceMethodDispatchProvider
 
b/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ResourceMethodDispatchProvider
deleted file mode 100644
index 63914d8..0000000
--- 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.ResourceMethodDispatchProvider
+++ /dev/null
@@ -1,6 +0,0 @@
-com.sun.jersey.server.impl.model.method.dispatch.VoidVoidDispatchProvider
-com.sun.jersey.server.impl.model.method.dispatch.HttpReqResDispatchProvider
-com.sun.jersey.server.impl.model.method.dispatch.MultipartFormDispatchProvider
-com.sun.jersey.server.impl.model.method.dispatch.FormDispatchProvider
-com.sun.jersey.server.impl.model.method.dispatch.EntityParamDispatchProvider
-com.sun.jersey.multipart.impl.FormDataMultiPartDispatchProvider

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.WebApplicationProvider
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.WebApplicationProvider
 
b/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.WebApplicationProvider
deleted file mode 100644
index a8d59db..0000000
--- 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.container.WebApplicationProvider
+++ /dev/null
@@ -1 +0,0 @@
-com.sun.jersey.server.impl.container.WebApplicationProviderImpl

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.inject.InjectableProvider
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.inject.InjectableProvider
 
b/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.inject.InjectableProvider
deleted file mode 100644
index d8cf6bb..0000000
--- 
a/stack/launcher/src/main/resources/META-INF/services/com.sun.jersey.spi.inject.InjectableProvider
+++ /dev/null
@@ -1,6 +0,0 @@
-com.sun.jersey.core.impl.provider.xml.SAXParserContextProvider
-com.sun.jersey.core.impl.provider.xml.XMLStreamReaderContextProvider
-com.sun.jersey.core.impl.provider.xml.DocumentBuilderFactoryProvider
-com.sun.jersey.core.impl.provider.xml.TransformerFactoryProvider
-com.sun.jersey.multipart.impl.MultiPartConfigProvider
-

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
 
b/stack/launcher/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
deleted file mode 100644
index 4222d19..0000000
--- 
a/stack/launcher/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ /dev/null
@@ -1 +0,0 @@
-com.sun.jersey.server.impl.cdi.CDIExtension
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
 
b/stack/launcher/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
deleted file mode 100644
index 26f35bb..0000000
--- 
a/stack/launcher/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
+++ /dev/null
@@ -1 +0,0 @@
-com.sun.jersey.server.impl.container.servlet.JerseyServletContainerInitializer
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader
 
b/stack/launcher/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader
deleted file mode 100644
index 58387a2..0000000
--- 
a/stack/launcher/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader
+++ /dev/null
@@ -1,47 +0,0 @@
-com.sun.jersey.core.impl.provider.entity.StringProvider
-com.sun.jersey.core.impl.provider.entity.ByteArrayProvider
-com.sun.jersey.core.impl.provider.entity.FileProvider
-com.sun.jersey.core.impl.provider.entity.InputStreamProvider
-com.sun.jersey.core.impl.provider.entity.DataSourceProvider
-com.sun.jersey.core.impl.provider.entity.RenderedImageProvider
-com.sun.jersey.core.impl.provider.entity.MimeMultipartProvider
-com.sun.jersey.core.impl.provider.entity.FormProvider
-com.sun.jersey.core.impl.provider.entity.FormMultivaluedMapProvider
-com.sun.jersey.core.impl.provider.entity.XMLRootElementProvider$App
-com.sun.jersey.core.impl.provider.entity.XMLRootElementProvider$Text
-com.sun.jersey.core.impl.provider.entity.XMLRootElementProvider$General
-com.sun.jersey.core.impl.provider.entity.XMLJAXBElementProvider$App
-com.sun.jersey.core.impl.provider.entity.XMLJAXBElementProvider$Text
-com.sun.jersey.core.impl.provider.entity.XMLJAXBElementProvider$General
-com.sun.jersey.core.impl.provider.entity.XMLListElementProvider$App
-com.sun.jersey.core.impl.provider.entity.XMLListElementProvider$Text
-com.sun.jersey.core.impl.provider.entity.XMLListElementProvider$General
-com.sun.jersey.core.impl.provider.entity.ReaderProvider
-com.sun.jersey.core.impl.provider.entity.DocumentProvider
-com.sun.jersey.core.impl.provider.entity.SourceProvider$StreamSourceReader
-com.sun.jersey.core.impl.provider.entity.SourceProvider$SAXSourceReader
-com.sun.jersey.core.impl.provider.entity.SourceProvider$DOMSourceReader
-com.sun.jersey.core.impl.provider.entity.XMLRootObjectProvider$App
-com.sun.jersey.core.impl.provider.entity.XMLRootObjectProvider$Text
-com.sun.jersey.core.impl.provider.entity.XMLRootObjectProvider$General
-com.sun.jersey.core.impl.provider.entity.EntityHolderReader
-com.sun.jersey.atom.rome.impl.provider.entity.AtomFeedProvider
-com.sun.jersey.atom.rome.impl.provider.entity.AtomEntryProvider
-com.sun.jersey.json.impl.provider.entity.JSONRootElementProvider$App
-com.sun.jersey.json.impl.provider.entity.JSONRootElementProvider$General
-com.sun.jersey.json.impl.provider.entity.JSONJAXBElementProvider$App
-com.sun.jersey.json.impl.provider.entity.JSONJAXBElementProvider$General
-com.sun.jersey.json.impl.provider.entity.JSONListElementProvider$App
-com.sun.jersey.json.impl.provider.entity.JSONListElementProvider$General
-com.sun.jersey.json.impl.provider.entity.JSONArrayProvider$App
-com.sun.jersey.json.impl.provider.entity.JSONArrayProvider$General
-com.sun.jersey.json.impl.provider.entity.JSONObjectProvider$App
-com.sun.jersey.json.impl.provider.entity.JSONObjectProvider$General
-com.sun.jersey.json.impl.provider.entity.JacksonProviderProxy
-
-com.sun.jersey.fastinfoset.impl.provider.entity.FastInfosetRootElementProvider
-com.sun.jersey.fastinfoset.impl.provider.entity.FastInfosetJAXBElementProvider
-com.sun.jersey.fastinfoset.impl.provider.entity.FastInfosetListElementProvider
-
-com.sun.jersey.multipart.impl.MultiPartReaderClientSide
-com.sun.jersey.multipart.impl.MultiPartReaderServerSide

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter
 
b/stack/launcher/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter
deleted file mode 100644
index 972b417..0000000
--- 
a/stack/launcher/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter
+++ /dev/null
@@ -1,41 +0,0 @@
-com.sun.jersey.core.impl.provider.entity.StringProvider
-com.sun.jersey.core.impl.provider.entity.ByteArrayProvider
-com.sun.jersey.core.impl.provider.entity.FileProvider
-com.sun.jersey.core.impl.provider.entity.InputStreamProvider
-com.sun.jersey.core.impl.provider.entity.DataSourceProvider
-com.sun.jersey.core.impl.provider.entity.RenderedImageProvider
-com.sun.jersey.core.impl.provider.entity.MimeMultipartProvider
-com.sun.jersey.core.impl.provider.entity.FormProvider
-com.sun.jersey.core.impl.provider.entity.FormMultivaluedMapProvider
-com.sun.jersey.core.impl.provider.entity.XMLRootElementProvider$App
-com.sun.jersey.core.impl.provider.entity.XMLRootElementProvider$Text
-com.sun.jersey.core.impl.provider.entity.XMLRootElementProvider$General
-com.sun.jersey.core.impl.provider.entity.XMLJAXBElementProvider$App
-com.sun.jersey.core.impl.provider.entity.XMLJAXBElementProvider$Text
-com.sun.jersey.core.impl.provider.entity.XMLJAXBElementProvider$General
-com.sun.jersey.core.impl.provider.entity.XMLListElementProvider$App
-com.sun.jersey.core.impl.provider.entity.XMLListElementProvider$Text
-com.sun.jersey.core.impl.provider.entity.XMLListElementProvider$General
-com.sun.jersey.core.impl.provider.entity.ReaderProvider
-com.sun.jersey.core.impl.provider.entity.DocumentProvider
-com.sun.jersey.core.impl.provider.entity.StreamingOutputProvider
-com.sun.jersey.core.impl.provider.entity.SourceProvider$SourceWriter
-com.sun.jersey.server.impl.template.ViewableMessageBodyWriter
-com.sun.jersey.atom.rome.impl.provider.entity.AtomFeedProvider
-com.sun.jersey.atom.rome.impl.provider.entity.AtomEntryProvider
-com.sun.jersey.json.impl.provider.entity.JSONRootElementProvider$App
-com.sun.jersey.json.impl.provider.entity.JSONRootElementProvider$General
-com.sun.jersey.json.impl.provider.entity.JSONJAXBElementProvider$App
-com.sun.jersey.json.impl.provider.entity.JSONJAXBElementProvider$General
-com.sun.jersey.json.impl.provider.entity.JSONListElementProvider$App
-com.sun.jersey.json.impl.provider.entity.JSONListElementProvider$General
-com.sun.jersey.json.impl.provider.entity.JSONArrayProvider$App
-com.sun.jersey.json.impl.provider.entity.JSONArrayProvider$General
-com.sun.jersey.json.impl.provider.entity.JSONObjectProvider$App
-com.sun.jersey.json.impl.provider.entity.JSONObjectProvider$General
-com.sun.jersey.json.impl.provider.entity.JSONWithPaddingProvider
-com.sun.jersey.json.impl.provider.entity.JacksonProviderProxy
-com.sun.jersey.fastinfoset.impl.provider.entity.FastInfosetRootElementProvider
-com.sun.jersey.fastinfoset.impl.provider.entity.FastInfosetJAXBElementProvider
-com.sun.jersey.fastinfoset.impl.provider.entity.FastInfosetListElementProvider
-com.sun.jersey.multipart.impl.MultiPartWriter

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate
 
b/stack/launcher/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate
deleted file mode 100644
index 0d2c36f..0000000
--- 
a/stack/launcher/src/main/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate
+++ /dev/null
@@ -1 +0,0 @@
-com.sun.jersey.server.impl.provider.RuntimeDelegateImpl

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
 
b/stack/launcher/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
deleted file mode 100644
index 89a65d7..0000000
--- 
a/stack/launcher/src/main/resources/META-INF/services/org.jclouds.apis.ApiMetadata
+++ /dev/null
@@ -1,2 +0,0 @@
-org.jclouds.s3.S3ApiMetadata
-org.jclouds.blobstore.TransientApiMetadata
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/spring.handlers
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/resources/META-INF/spring.handlers 
b/stack/launcher/src/main/resources/META-INF/spring.handlers
deleted file mode 100644
index 3c05180..0000000
--- a/stack/launcher/src/main/resources/META-INF/spring.handlers
+++ /dev/null
@@ -1,8 +0,0 @@
-http\://www.springframework.org/schema/aop=org.springframework.aop.config.AopNamespaceHandler
-http\://www.springframework.org/schema/context=org.springframework.context.config.ContextNamespaceHandler
-http\://www.springframework.org/schema/jee=org.springframework.ejb.config.JeeNamespaceHandler
-http\://www.springframework.org/schema/lang=org.springframework.scripting.config.LangNamespaceHandler
-http\://www.springframework.org/schema/p=org.springframework.beans.factory.xml.SimplePropertyNamespaceHandler
-http\://www.springframework.org/schema/task=org.springframework.scheduling.config.TaskNamespaceHandler
-http\://www.springframework.org/schema/util=org.springframework.beans.factory.xml.UtilNamespaceHandler
-http\://www.hazelcast.com/schema/config=com.hazelcast.spring.HazelcastNamespaceHandler

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/META-INF/spring.schemas
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/resources/META-INF/spring.schemas 
b/stack/launcher/src/main/resources/META-INF/spring.schemas
deleted file mode 100644
index 97aece9..0000000
--- a/stack/launcher/src/main/resources/META-INF/spring.schemas
+++ /dev/null
@@ -1,29 +0,0 @@
-http\://www.springframework.org/schema/aop/spring-aop-2.0.xsd=org/springframework/aop/config/spring-aop-2.0.xsd
-http\://www.springframework.org/schema/aop/spring-aop-2.5.xsd=org/springframework/aop/config/spring-aop-2.5.xsd
-http\://www.springframework.org/schema/aop/spring-aop-3.0.xsd=org/springframework/aop/config/spring-aop-3.0.xsd
-http\://www.springframework.org/schema/aop/spring-aop.xsd=org/springframework/aop/config/spring-aop-3.0.xsd
-http\://www.springframework.org/schema/beans/spring-beans-2.0.xsd=org/springframework/beans/factory/xml/spring-beans-2.0.xsd
-http\://www.springframework.org/schema/beans/spring-beans-2.5.xsd=org/springframework/beans/factory/xml/spring-beans-2.5.xsd
-http\://www.springframework.org/schema/beans/spring-beans-3.0.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd
-http\://www.springframework.org/schema/beans/spring-beans.xsd=org/springframework/beans/factory/xml/spring-beans-3.0.xsd
-http\://www.springframework.org/schema/context/spring-context-2.5.xsd=org/springframework/context/config/spring-context-2.5.xsd
-http\://www.springframework.org/schema/context/spring-context-3.0.xsd=org/springframework/context/config/spring-context-3.0.xsd
-http\://www.springframework.org/schema/context/spring-context.xsd=org/springframework/context/config/spring-context-3.0.xsd
-http\://www.springframework.org/schema/jee/spring-jee-2.0.xsd=org/springframework/ejb/config/spring-jee-2.0.xsd
-http\://www.springframework.org/schema/jee/spring-jee-2.5.xsd=org/springframework/ejb/config/spring-jee-2.5.xsd
-http\://www.springframework.org/schema/jee/spring-jee-3.0.xsd=org/springframework/ejb/config/spring-jee-3.0.xsd
-http\://www.springframework.org/schema/jee/spring-jee.xsd=org/springframework/ejb/config/spring-jee-3.0.xsd
-http\://www.springframework.org/schema/lang/spring-lang-2.0.xsd=org/springframework/scripting/config/spring-lang-2.0.xsd
-http\://www.springframework.org/schema/lang/spring-lang-2.5.xsd=org/springframework/scripting/config/spring-lang-2.5.xsd
-http\://www.springframework.org/schema/lang/spring-lang-3.0.xsd=org/springframework/scripting/config/spring-lang-3.0.xsd
-http\://www.springframework.org/schema/lang/spring-lang.xsd=org/springframework/scripting/config/spring-lang-3.0.xsd
-http\://www.springframework.org/schema/task/spring-task-3.0.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd
-http\://www.springframework.org/schema/task/spring-task.xsd=org/springframework/scheduling/config/spring-task-3.0.xsd
-http\://www.springframework.org/schema/tool/spring-tool-2.0.xsd=org/springframework/beans/factory/xml/spring-tool-2.0.xsd
-http\://www.springframework.org/schema/tool/spring-tool-2.5.xsd=org/springframework/beans/factory/xml/spring-tool-2.5.xsd
-http\://www.springframework.org/schema/tool/spring-tool-3.0.xsd=org/springframework/beans/factory/xml/spring-tool-3.0.xsd
-http\://www.springframework.org/schema/tool/spring-tool.xsd=org/springframework/beans/factory/xml/spring-tool-3.0.xsd
-http\://www.springframework.org/schema/util/spring-util-2.0.xsd=org/springframework/beans/factory/xml/spring-util-2.0.xsd
-http\://www.springframework.org/schema/util/spring-util-2.5.xsd=org/springframework/beans/factory/xml/spring-util-2.5.xsd
-http\://www.springframework.org/schema/util/spring-util-3.0.xsd=org/springframework/beans/factory/xml/spring-util-3.0.xsd
-http\://www.springframework.org/schema/util/spring-util.xsd=org/springframework/beans/factory/xml/spring-util-3.0.xsd

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/cassandra.yaml
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/resources/cassandra.yaml 
b/stack/launcher/src/main/resources/cassandra.yaml
deleted file mode 100644
index 56678cf..0000000
--- a/stack/launcher/src/main/resources/cassandra.yaml
+++ /dev/null
@@ -1,715 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Cassandra storage config YAML
-
-# NOTE:
-#   See http://wiki.apache.org/cassandra/StorageConfiguration for
-#   full explanations of configuration directives
-# /NOTE
-
-# The name of the cluster. This is mainly used to prevent machines in
-# one logical cluster from joining another.
-cluster_name: 'Test Cluster'
-
-# This defines the number of tokens randomly assigned to this node on the ring
-# The more tokens, relative to other nodes, the larger the proportion of data
-# that this node will store. You probably want all nodes to have the same 
number
-# of tokens assuming they have equal hardware capability.
-#
-# If you leave this unspecified, Cassandra will use the default of 1 token for 
legacy compatibility,
-# and will use the initial_token as described below.
-#
-# Specifying initial_token will override this setting.
-#
-# If you already have a cluster with 1 token per node, and wish to migrate to 
-# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations
-# num_tokens: 256
-
-# If you haven't specified num_tokens, or have set it to the default of 1 then
-# you should always specify InitialToken when setting up a production
-# cluster for the first time, and often when adding capacity later.
-# The principle is that each node should be given an equal slice of
-# the token ring; see http://wiki.apache.org/cassandra/Operations
-# for more details.
-#
-# If blank, Cassandra will request a token bisecting the range of
-# the heaviest-loaded existing node.  If there is no load information
-# available, such as is the case with a new cluster, it will pick
-# a random token, which will lead to hot spots.
-initial_token:
-
-# See http://wiki.apache.org/cassandra/HintedHandoff
-hinted_handoff_enabled: true
-# this defines the maximum amount of time a dead host will have hints
-# generated.  After it has been dead this long, new hints for it will not be
-# created until it has been seen alive and gone down again.
-max_hint_window_in_ms: 10800000 # 3 hours
-# Maximum throttle in KBs per second, per delivery thread.  This will be
-# reduced proportionally to the number of nodes in the cluster.  (If there
-# are two nodes in the cluster, each delivery thread will use the maximum
-# rate; if there are three, each will throttle to half of the maximum,
-# since we expect two nodes to be delivering hints simultaneously.)
-hinted_handoff_throttle_in_kb: 1024
-# Number of threads with which to deliver hints;
-# Consider increasing this number when you have multi-dc deployments, since
-# cross-dc handoff tends to be slower
-max_hints_delivery_threads: 2
-
-# The following setting populates the page cache on memtable flush and 
compaction
-# WARNING: Enable this setting only when the whole node's data fits in memory.
-# Defaults to: false
-# populate_io_cache_on_flush: false
-
-# Authentication backend, implementing IAuthenticator; used to identify users
-# Out of the box, Cassandra provides 
org.apache.cassandra.auth.{AllowAllAuthenticator,
-# PasswordAuthenticator}.
-#
-# - AllowAllAuthenticator performs no checks - set it to disable 
authentication.
-# - PasswordAuthenticator relies on username/password pairs to authenticate
-#   users. It keeps usernames and hashed passwords in system_auth.credentials 
table.
-#   Please increase system_auth keyspace replication factor if you use this 
authenticator.
-authenticator: AllowAllAuthenticator
-
-# Authorization backend, implementing IAuthorizer; used to limit 
access/provide permissions
-# Out of the box, Cassandra provides 
org.apache.cassandra.auth.{AllowAllAuthorizer,
-# CassandraAuthorizer}.
-#
-# - AllowAllAuthorizer allows any action to any user - set it to disable 
authorization.
-# - CassandraAuthorizer stores permissions in system_auth.permissions table. 
Please
-#   increase system_auth keyspace replication factor if you use this 
authorizer.
-authorizer: AllowAllAuthorizer
-
-# Validity period for permissions cache (fetching permissions can be an
-# expensive operation depending on the authorizer, CassandraAuthorizer is
-# one example). Defaults to 2000, set to 0 to disable.
-# Will be disabled automatically for AllowAllAuthorizer.
-permissions_validity_in_ms: 2000
-
-# The partitioner is responsible for distributing rows (by key) across
-# nodes in the cluster.  Any IPartitioner may be used, including your
-# own as long as it is on the classpath.  Out of the box, Cassandra
-# provides org.apache.cassandra.dht.{Murmur3Partitioner, RandomPartitioner
-# ByteOrderedPartitioner, OrderPreservingPartitioner (deprecated)}.
-# 
-# - RandomPartitioner distributes rows across the cluster evenly by md5.
-#   This is the default prior to 1.2 and is retained for compatibility.
-# - Murmur3Partitioner is similar to RandomPartioner but uses Murmur3_128
-#   Hash Function instead of md5.  When in doubt, this is the best option.
-# - ByteOrderedPartitioner orders rows lexically by key bytes.  BOP allows
-#   scanning rows in key order, but the ordering can generate hot spots
-#   for sequential insertion workloads.
-# - OrderPreservingPartitioner is an obsolete form of BOP, that stores
-# - keys in a less-efficient format and only works with keys that are
-#   UTF8-encoded Strings.
-# - CollatingOPP collates according to EN,US rules rather than lexical byte
-#   ordering.  Use this as an example if you need custom collation.
-#
-# See http://wiki.apache.org/cassandra/Operations for more on
-# partitioners and token selection.
-partitioner: org.apache.cassandra.dht.Murmur3Partitioner
-
-# Directories where Cassandra should store data on disk.  Cassandra
-# will spread data evenly across them, subject to the granularity of
-# the configured compaction strategy.
-data_file_directories:
-    - ./tmp/data
-
-# commit log
-commitlog_directory: ./tmp/commitlog
-
-# policy for data disk failures:
-# stop: shut down gossip and Thrift, leaving the node effectively dead, but
-#       can still be inspected via JMX.
-# best_effort: stop using the failed disk and respond to requests based on
-#              remaining available sstables.  This means you WILL see obsolete
-#              data at CL.ONE!
-# ignore: ignore fatal errors and let requests fail, as in pre-1.2 Cassandra
-disk_failure_policy: stop
-
-# Maximum size of the key cache in memory.
-#
-# Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the
-# minimum, sometimes more. The key cache is fairly tiny for the amount of
-# time it saves, so it's worthwhile to use it at large numbers.
-# The row cache saves even more time, but must contain the entire row,
-# so it is extremely space-intensive. It's best to only use the
-# row cache if you have hot rows or static rows.
-#
-# NOTE: if you reduce the size, you may not get you hottest keys loaded on 
startup.
-#
-# Default value is empty to make it "auto" (min(5% of Heap (in MB), 100MB)). 
Set to 0 to disable key cache.
-key_cache_size_in_mb:
-
-# Duration in seconds after which Cassandra should
-# save the key cache. Caches are saved to saved_caches_directory as
-# specified in this configuration file.
-#
-# Saved caches greatly improve cold-start speeds, and is relatively cheap in
-# terms of I/O for the key cache. Row cache saving is much more expensive and
-# has limited use.
-#
-# Default is 14400 or 4 hours.
-key_cache_save_period: 14400
-
-# Number of keys from the key cache to save
-# Disabled by default, meaning all keys are going to be saved
-# key_cache_keys_to_save: 100
-
-# Maximum size of the row cache in memory.
-# NOTE: if you reduce the size, you may not get you hottest keys loaded on 
startup.
-#
-# Default value is 0, to disable row caching.
-row_cache_size_in_mb: 0
-
-# Duration in seconds after which Cassandra should
-# safe the row cache. Caches are saved to saved_caches_directory as specified
-# in this configuration file.
-#
-# Saved caches greatly improve cold-start speeds, and is relatively cheap in
-# terms of I/O for the key cache. Row cache saving is much more expensive and
-# has limited use.
-#
-# Default is 0 to disable saving the row cache.
-row_cache_save_period: 0
-
-# Number of keys from the row cache to save
-# Disabled by default, meaning all keys are going to be saved
-# row_cache_keys_to_save: 100
-
-# The provider for the row cache to use.
-#
-# Supported values are: ConcurrentLinkedHashCacheProvider, 
SerializingCacheProvider
-#
-# SerializingCacheProvider serialises the contents of the row and stores
-# it in native memory, i.e., off the JVM Heap. Serialized rows take
-# significantly less memory than "live" rows in the JVM, so you can cache
-# more rows in a given memory footprint.  And storing the cache off-heap
-# means you can use smaller heap sizes, reducing the impact of GC pauses.
-# Note however that when a row is requested from the row cache, it must be
-# deserialized into the heap for use.
-#
-# It is also valid to specify the fully-qualified class name to a class
-# that implements org.apache.cassandra.cache.IRowCacheProvider.
-#
-# Defaults to SerializingCacheProvider
-row_cache_provider: SerializingCacheProvider
-
-# saved caches
-saved_caches_directory: ./tmp/saved_caches
-
-# commitlog_sync may be either "periodic" or "batch." 
-# When in batch mode, Cassandra won't ack writes until the commit log
-# has been fsynced to disk.  It will wait up to
-# commitlog_sync_batch_window_in_ms milliseconds for other writes, before
-# performing the sync.
-#
-# commitlog_sync: batch
-# commitlog_sync_batch_window_in_ms: 50
-#
-# the other option is "periodic" where writes may be acked immediately
-# and the CommitLog is simply synced every commitlog_sync_period_in_ms
-# milliseconds.  By default this allows 1024*(CPU cores) pending
-# entries on the commitlog queue.  If you are writing very large blobs,
-# you should reduce that; 16*cores works reasonably well for 1MB blobs.
-# It should be at least as large as the concurrent_writes setting.
-commitlog_sync: periodic
-commitlog_sync_period_in_ms: 10000
-# commitlog_periodic_queue_size:
-
-# The size of the individual commitlog file segments.  A commitlog
-# segment may be archived, deleted, or recycled once all the data
-# in it (potentially from each columnfamily in the system) has been
-# flushed to sstables.  
-#
-# The default size is 32, which is almost always fine, but if you are
-# archiving commitlog segments (see commitlog_archiving.properties),
-# then you probably want a finer granularity of archiving; 8 or 16 MB
-# is reasonable.
-commitlog_segment_size_in_mb: 32
-
-# any class that implements the SeedProvider interface and has a
-# constructor that takes a Map<String, String> of parameters will do.
-seed_provider:
-    # Addresses of hosts that are deemed contact points. 
-    # Cassandra nodes use this list of hosts to find each other and learn
-    # the topology of the ring.  You must change this if you are running
-    # multiple nodes!
-    - class_name: org.apache.cassandra.locator.SimpleSeedProvider
-      parameters:
-          # seeds is actually a comma-delimited list of addresses.
-          # Ex: "<ip1>,<ip2>,<ip3>"
-          - seeds: "127.0.0.1"
-
-# emergency pressure valve: each time heap usage after a full (CMS)
-# garbage collection is above this fraction of the max, Cassandra will
-# flush the largest memtables.  
-#
-# Set to 1.0 to disable.  Setting this lower than
-# CMSInitiatingOccupancyFraction is not likely to be useful.
-#
-# RELYING ON THIS AS YOUR PRIMARY TUNING MECHANISM WILL WORK POORLY:
-# it is most effective under light to moderate load, or read-heavy
-# workloads; under truly massive write load, it will often be too
-# little, too late.
-flush_largest_memtables_at: 0.75
-
-# emergency pressure valve #2: the first time heap usage after a full
-# (CMS) garbage collection is above this fraction of the max,
-# Cassandra will reduce cache maximum _capacity_ to the given fraction
-# of the current _size_.  Should usually be set substantially above
-# flush_largest_memtables_at, since that will have less long-term
-# impact on the system.  
-# 
-# Set to 1.0 to disable.  Setting this lower than
-# CMSInitiatingOccupancyFraction is not likely to be useful.
-reduce_cache_sizes_at: 0.85
-reduce_cache_capacity_to: 0.6
-
-# For workloads with more data than can fit in memory, Cassandra's
-# bottleneck will be reads that need to fetch data from
-# disk. "concurrent_reads" should be set to (16 * number_of_drives) in
-# order to allow the operations to enqueue low enough in the stack
-# that the OS and drives can reorder them.
-#
-# On the other hand, since writes are almost never IO bound, the ideal
-# number of "concurrent_writes" is dependent on the number of cores in
-# your system; (8 * number_of_cores) is a good rule of thumb.
-concurrent_reads: 32
-concurrent_writes: 32
-
-# Total memory to use for memtables.  Cassandra will flush the largest
-# memtable when this much memory is used.
-# If omitted, Cassandra will set it to 1/3 of the heap.
-# memtable_total_space_in_mb: 2048
-
-# Total space to use for commitlogs.  Since commitlog segments are
-# mmapped, and hence use up address space, the default size is 32
-# on 32-bit JVMs, and 1024 on 64-bit JVMs.
-#
-# If space gets above this value (it will round up to the next nearest
-# segment multiple), Cassandra will flush every dirty CF in the oldest
-# segment and remove it.  So a small total commitlog space will tend
-# to cause more flush activity on less-active columnfamilies.
-# commitlog_total_space_in_mb: 4096
-
-# This sets the amount of memtable flush writer threads.  These will
-# be blocked by disk io, and each one will hold a memtable in memory
-# while blocked. If you have a large heap and many data directories,
-# you can increase this value for better flush performance.
-# By default this will be set to the amount of data directories defined.
-#memtable_flush_writers: 1
-
-# the number of full memtables to allow pending flush, that is,
-# waiting for a writer thread.  At a minimum, this should be set to
-# the maximum number of secondary indexes created on a single CF.
-memtable_flush_queue_size: 4
-
-# Whether to, when doing sequential writing, fsync() at intervals in
-# order to force the operating system to flush the dirty
-# buffers. Enable this to avoid sudden dirty buffer flushing from
-# impacting read latencies. Almost always a good idea on SSDs; not
-# necessarily on platters.
-trickle_fsync: false
-trickle_fsync_interval_in_kb: 10240
-
-# TCP port, for commands and data
-storage_port: 7000
-
-# SSL port, for encrypted communication.  Unused unless enabled in
-# encryption_options
-ssl_storage_port: 7001
-
-# Address to bind to and tell other Cassandra nodes to connect to. You
-# _must_ change this if you want multiple nodes to be able to
-# communicate!
-# 
-# Leaving it blank leaves it up to InetAddress.getLocalHost(). This
-# will always do the Right Thing _if_ the node is properly configured
-# (hostname, name resolution, etc), and the Right Thing is to use the
-# address associated with the hostname (it might not be).
-#
-# Setting this to 0.0.0.0 is always wrong.
-listen_address: localhost
-
-# Address to broadcast to other Cassandra nodes
-# Leaving this blank will set it to the same value as listen_address
-# broadcast_address: 1.2.3.4
-
-# Internode authentication backend, implementing IInternodeAuthenticator;
-# used to allow/disallow connections from peer nodes.
-# internode_authenticator: 
org.apache.cassandra.auth.AllowAllInternodeAuthenticator
-
-# Whether to start the native transport server.
-# Please note that the address on which the native transport is bound is the
-# same as the rpc_address. The port however is different and specified below.
-start_native_transport: true
-# port for the CQL native transport to listen for clients on
-native_transport_port: 9042
-# The minimum and maximum threads for handling requests when the native
-# transport is used. They are similar to rpc_min_threads and rpc_max_threads,
-# though the defaults differ slightly.
-# NOTE: native_transport_min_threads is now deprecated and ignored (but kept
-# in the 1.2.x series for compatibility sake).
-# native_transport_min_threads: 16
-# native_transport_max_threads: 128
-
-# Whether to start the thrift rpc server.
-start_rpc: true
-
-# The address to bind the Thrift RPC service and native transport
-# server -- clients connect here.
-#
-# Leaving this blank has the same effect it does for ListenAddress,
-# (i.e. it will be based on the configured hostname of the node).
-#
-# Note that unlike ListenAddress above, it is allowed to specify 0.0.0.0
-# here if you want to listen on all interfaces but is not best practice
-# as it is known to confuse the node auto-discovery features of some
-# client drivers.
-rpc_address: localhost
-# port for Thrift to listen for clients on
-rpc_port: 9160
-
-# enable or disable keepalive on rpc connections
-rpc_keepalive: true
-
-# Cassandra provides three out-of-the-box options for the RPC Server:
-#
-# sync  -> One thread per thrift connection. For a very large number of 
clients, memory
-#          will be your limiting factor. On a 64 bit JVM, 180KB is the minimum 
stack size
-#          per thread, and that will correspond to your use of virtual memory 
(but physical memory
-#          may be limited depending on use of stack space).
-#
-# hsha  -> Stands for "half synchronous, half asynchronous." All thrift 
clients are handled
-#          asynchronously using a small number of threads that does not vary 
with the amount
-#          of thrift clients (and thus scales well to many clients). The rpc 
requests are still
-#          synchronous (one thread per active request).
-#
-# The default is sync because on Windows hsha is about 30% slower.  On Linux,
-# sync/hsha performance is about the same, with hsha of course using less 
memory.
-#
-# Alternatively,  can provide your own RPC server by providing the 
fully-qualified class name
-# of an o.a.c.t.TServerFactory that can create an instance of it.
-rpc_server_type: sync
-
-# Uncomment rpc_min|max_thread to set request pool size limits.
-#
-# Regardless of your choice of RPC server (see above), the number of maximum 
requests in the
-# RPC thread pool dictates how many concurrent requests are possible (but if 
you are using the sync
-# RPC server, it also dictates the number of clients that can be connected at 
all).
-#
-# The default is unlimited and thus provides no protection against clients 
overwhelming the server. You are
-# encouraged to set a maximum that makes sense for you in production, but do 
keep in mind that
-# rpc_max_threads represents the maximum number of client requests this server 
may execute concurrently.
-#
-# rpc_min_threads: 16
-# rpc_max_threads: 2048
-
-# uncomment to set socket buffer sizes on rpc connections
-# rpc_send_buff_size_in_bytes:
-# rpc_recv_buff_size_in_bytes:
-
-# Uncomment to set socket buffer size for internode communication
-# Note that when setting this, the buffer size is limited by net.core.wmem_max
-# and when not setting it it is defined by net.ipv4.tcp_wmem
-# See:
-# /proc/sys/net/core/wmem_max
-# /proc/sys/net/core/rmem_max
-# /proc/sys/net/ipv4/tcp_wmem
-# /proc/sys/net/ipv4/tcp_wmem
-# and: man tcp
-# internode_send_buff_size_in_bytes:
-# internode_recv_buff_size_in_bytes:
-
-# Frame size for thrift (maximum message length).
-thrift_framed_transport_size_in_mb: 15
-
-# Set to true to have Cassandra create a hard link to each sstable
-# flushed or streamed locally in a backups/ subdirectory of the
-# keyspace data.  Removing these links is the operator's
-# responsibility.
-incremental_backups: false
-
-# Whether or not to take a snapshot before each compaction.  Be
-# careful using this option, since Cassandra won't clean up the
-# snapshots for you.  Mostly useful if you're paranoid when there
-# is a data format change.
-snapshot_before_compaction: false
-
-# Whether or not a snapshot is taken of the data before keyspace truncation
-# or dropping of column families. The STRONGLY advised default of true 
-# should be used to provide data safety. If you set this flag to false, you 
will
-# lose data on truncation or drop.
-auto_snapshot: true
-
-# Add column indexes to a row after its contents reach this size.
-# Increase if your column values are large, or if you have a very large
-# number of columns.  The competing causes are, Cassandra has to
-# deserialize this much of the row to read a single column, so you want
-# it to be small - at least if you do many partial-row reads - but all
-# the index data is read for each access, so you don't want to generate
-# that wastefully either.
-column_index_size_in_kb: 64
-
-# Size limit for rows being compacted in memory.  Larger rows will spill
-# over to disk and use a slower two-pass compaction process.  A message
-# will be logged specifying the row key.
-in_memory_compaction_limit_in_mb: 64
-
-# Number of simultaneous compactions to allow, NOT including
-# validation "compactions" for anti-entropy repair.  Simultaneous
-# compactions can help preserve read performance in a mixed read/write
-# workload, by mitigating the tendency of small sstables to accumulate
-# during a single long running compactions. The default is usually
-# fine and if you experience problems with compaction running too
-# slowly or too fast, you should look at
-# compaction_throughput_mb_per_sec first.
-#
-# concurrent_compactors defaults to the number of cores.
-# Uncomment to make compaction mono-threaded, the pre-0.8 default.
-#concurrent_compactors: 1
-
-# Multi-threaded compaction. When enabled, each compaction will use
-# up to one thread per core, plus one thread per sstable being merged.
-# This is usually only useful for SSD-based hardware: otherwise, 
-# your concern is usually to get compaction to do LESS i/o (see:
-# compaction_throughput_mb_per_sec), not more.
-multithreaded_compaction: false
-
-# Throttles compaction to the given total throughput across the entire
-# system. The faster you insert data, the faster you need to compact in
-# order to keep the sstable count down, but in general, setting this to
-# 16 to 32 times the rate you are inserting data is more than sufficient.
-# Setting this to 0 disables throttling. Note that this account for all types
-# of compaction, including validation compaction.
-compaction_throughput_mb_per_sec: 16
-
-# Track cached row keys during compaction, and re-cache their new
-# positions in the compacted sstable.  Disable if you use really large
-# key caches.
-compaction_preheat_key_cache: true
-
-# Throttles all outbound streaming file transfers on this node to the
-# given total throughput in Mbps. This is necessary because Cassandra does
-# mostly sequential IO when streaming data during bootstrap or repair, which
-# can lead to saturating the network connection and degrading rpc performance.
-# When unset, the default is 200 Mbps or 25 MB/s.
-# stream_throughput_outbound_megabits_per_sec: 200
-
-# How long the coordinator should wait for read operations to complete
-read_request_timeout_in_ms: 10000
-# How long the coordinator should wait for seq or index scans to complete
-range_request_timeout_in_ms: 10000
-# How long the coordinator should wait for writes to complete
-write_request_timeout_in_ms: 10000
-# How long the coordinator should wait for truncates to complete
-# (This can be much longer, because unless auto_snapshot is disabled
-# we need to flush first so we can snapshot before removing the data.)
-truncate_request_timeout_in_ms: 60000
-# The default timeout for other, miscellaneous operations
-request_timeout_in_ms: 10000
-
-# Enable operation timeout information exchange between nodes to accurately
-# measure request timeouts, If disabled cassandra will assuming the request
-# was forwarded to the replica instantly by the coordinator
-#
-# Warning: before enabling this property make sure to ntp is installed
-# and the times are synchronized between the nodes.
-cross_node_timeout: false
-
-# Enable socket timeout for streaming operation.
-# When a timeout occurs during streaming, streaming is retried from the start
-# of the current file. This _can_ involve re-streaming an important amount of
-# data, so you should avoid setting the value too low.
-# Default value is 0, which never timeout streams.
-# streaming_socket_timeout_in_ms: 0
-
-# phi value that must be reached for a host to be marked down.
-# most users should never need to adjust this.
-# phi_convict_threshold: 8
-
-# endpoint_snitch -- Set this to a class that implements
-# IEndpointSnitch.  The snitch has two functions:
-# - it teaches Cassandra enough about your network topology to route
-#   requests efficiently
-# - it allows Cassandra to spread replicas around your cluster to avoid
-#   correlated failures. It does this by grouping machines into
-#   "datacenters" and "racks."  Cassandra will do its best not to have
-#   more than one replica on the same "rack" (which may not actually
-#   be a physical location)
-#
-# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER,
-# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS
-# ARE PLACED.
-#
-# Out of the box, Cassandra provides
-#  - SimpleSnitch:
-#    Treats Strategy order as proximity. This improves cache locality
-#    when disabling read repair, which can further improve throughput.
-#    Only appropriate for single-datacenter deployments.
-#  - PropertyFileSnitch:
-#    Proximity is determined by rack and data center, which are
-#    explicitly configured in cassandra-topology.properties.
-#  - GossipingPropertyFileSnitch
-#    The rack and datacenter for the local node are defined in
-#    cassandra-rackdc.properties and propagated to other nodes via gossip.  If
-#    cassandra-topology.properties exists, it is used as a fallback, allowing
-#    migration from the PropertyFileSnitch.
-#  - RackInferringSnitch:
-#    Proximity is determined by rack and data center, which are
-#    assumed to correspond to the 3rd and 2nd octet of each node's
-#    IP address, respectively.  Unless this happens to match your
-#    deployment conventions (as it did Facebook's), this is best used
-#    as an example of writing a custom Snitch class.
-#  - Ec2Snitch:
-#    Appropriate for EC2 deployments in a single Region. Loads Region
-#    and Availability Zone information from the EC2 API. The Region is
-#    treated as the datacenter, and the Availability Zone as the rack.
-#    Only private IPs are used, so this will not work across multiple
-#    Regions.
-#  - Ec2MultiRegionSnitch:
-#    Uses public IPs as broadcast_address to allow cross-region
-#    connectivity.  (Thus, you should set seed addresses to the public
-#    IP as well.) You will need to open the storage_port or
-#    ssl_storage_port on the public IP firewall.  (For intra-Region
-#    traffic, Cassandra will switch to the private IP after
-#    establishing a connection.)
-#
-# You can use a custom Snitch by setting this to the full class name
-# of the snitch, which will be assumed to be on your classpath.
-endpoint_snitch: SimpleSnitch
-
-# controls how often to perform the more expensive part of host score
-# calculation
-dynamic_snitch_update_interval_in_ms: 100 
-# controls how often to reset all host scores, allowing a bad host to
-# possibly recover
-dynamic_snitch_reset_interval_in_ms: 600000
-# if set greater than zero and read_repair_chance is < 1.0, this will allow
-# 'pinning' of replicas to hosts in order to increase cache capacity.
-# The badness threshold will control how much worse the pinned host has to be
-# before the dynamic snitch will prefer other replicas over it.  This is
-# expressed as a double which represents a percentage.  Thus, a value of
-# 0.2 means Cassandra would continue to prefer the static snitch values
-# until the pinned host was 20% worse than the fastest.
-dynamic_snitch_badness_threshold: 0.1
-
-# request_scheduler -- Set this to a class that implements
-# RequestScheduler, which will schedule incoming client requests
-# according to the specific policy. This is useful for multi-tenancy
-# with a single Cassandra cluster.
-# NOTE: This is specifically for requests from the client and does
-# not affect inter node communication.
-# org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place
-# org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of
-# client requests to a node with a separate queue for each
-# request_scheduler_id. The scheduler is further customized by
-# request_scheduler_options as described below.
-request_scheduler: org.apache.cassandra.scheduler.NoScheduler
-
-# Scheduler Options vary based on the type of scheduler
-# NoScheduler - Has no options
-# RoundRobin
-#  - throttle_limit -- The throttle_limit is the number of in-flight
-#                      requests per client.  Requests beyond 
-#                      that limit are queued up until
-#                      running requests can complete.
-#                      The value of 80 here is twice the number of
-#                      concurrent_reads + concurrent_writes.
-#  - default_weight -- default_weight is optional and allows for
-#                      overriding the default which is 1.
-#  - weights -- Weights are optional and will default to 1 or the
-#               overridden default_weight. The weight translates into how
-#               many requests are handled during each turn of the
-#               RoundRobin, based on the scheduler id.
-#
-# request_scheduler_options:
-#    throttle_limit: 80
-#    default_weight: 5
-#    weights:
-#      Keyspace1: 1
-#      Keyspace2: 5
-
-# request_scheduler_id -- An identifier based on which to perform
-# the request scheduling. Currently the only valid option is keyspace.
-# request_scheduler_id: keyspace
-
-# index_interval controls the sampling of entries from the primrary
-# row index in terms of space versus time.  The larger the interval,
-# the smaller and less effective the sampling will be.  In technicial
-# terms, the interval coresponds to the number of index entries that
-# are skipped between taking each sample.  All the sampled entries
-# must fit in memory.  Generally, a value between 128 and 512 here
-# coupled with a large key cache size on CFs results in the best trade
-# offs.  This value is not often changed, however if you have many
-# very small rows (many to an OS page), then increasing this will
-# often lower memory usage without a impact on performance.
-index_interval: 128
-
-# Enable or disable inter-node encryption
-# Default settings are TLS v1, RSA 1024-bit keys (it is imperative that
-# users generate their own keys) TLS_RSA_WITH_AES_128_CBC_SHA as the cipher
-# suite for authentication, key exchange and encryption of the actual data 
transfers.
-# NOTE: No custom encryption options are enabled at the moment
-# The available internode options are : all, none, dc, rack
-#
-# If set to dc cassandra will encrypt the traffic between the DCs
-# If set to rack cassandra will encrypt the traffic between the racks
-#
-# The passwords used in these options must match the passwords used when 
generating
-# the keystore and truststore.  For instructions on generating these files, 
see:
-# 
http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CreateKeystore
-#
-server_encryption_options:
-    internode_encryption: none
-    keystore: conf/.keystore
-    keystore_password: cassandra
-    truststore: conf/.truststore
-    truststore_password: cassandra
-    # More advanced defaults below:
-    # protocol: TLS
-    # algorithm: SunX509
-    # store_type: JKS
-    # cipher_suites: 
[TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA]
-    # require_client_auth: false
-
-# enable or disable client/server encryption.
-client_encryption_options:
-    enabled: false
-    keystore: conf/.keystore
-    keystore_password: cassandra
-    # require_client_auth: false
-    # Set trustore and truststore_password if require_client_auth is true
-    # truststore: conf/.truststore
-    # truststore_password: cassandra
-    # More advanced defaults below:
-    # protocol: TLS
-    # algorithm: SunX509
-    # store_type: JKS
-    # cipher_suites: 
[TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA]
-
-# internode_compression controls whether traffic between nodes is
-# compressed.
-# can be:  all  - all traffic is compressed
-#          dc   - traffic between different datacenters is compressed
-#          none - nothing is compressed.
-internode_compression: all
-
-# Enable or disable tcp_nodelay for inter-dc communication.
-# Disabling it will result in larger (but fewer) network packets being sent,
-# reducing overhead from the TCP protocol itself, at the cost of increasing
-# latency if you block for cross-datacenter responses.
-inter_dc_tcp_nodelay: true

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/log4j-server.properties
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/resources/log4j-server.properties 
b/stack/launcher/src/main/resources/log4j-server.properties
deleted file mode 100644
index cf22bca..0000000
--- a/stack/launcher/src/main/resources/log4j-server.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# for production, you should probably set pattern to %c instead of %l.  
-# (%l is slower.)
-
-# output messages into a rolling log file as well as stdout
-log4j.rootLogger=INFO,stdout
-
-# stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n
-
-
-# Application logging options
-#log4j.logger.org.apache.cassandra=DEBUG
-#log4j.logger.org.apache.cassandra.db=DEBUG
-#log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG
-
-# Adding this to avoid thrift logging disconnect errors.
-log4j.logger.org.apache.thrift.server.TNonblockingServer=ERROR

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/stack/launcher/src/main/resources/log4j.properties 
b/stack/launcher/src/main/resources/log4j.properties
deleted file mode 100644
index 5527973..0000000
--- a/stack/launcher/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# for production, you should probably set the root to INFO
-# and the pattern to %c instead of %l.  (%l is slower.)
-
-# output messages into a rolling log file as well as stdout
-log4j.rootLogger=INFO,stdout
-
-# stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-#log4j.appender.stdout.layout=org.apache.log4j.SimpleLayout
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p (%t) [%c] - %m%n
-
-log4j.category.org.apache=ERROR, stdout
-
-log4j.logger.org.apache.usergrid.persistence.cassandra.DB=WARN, stdout
-log4j.logger.org.apache.usergrid.persistence.cassandra.BATCH=WARN, stdout
-log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl=WARN,
 stdout
-log4j.logger.org.apache.usergrid.persistence.cassandra.DaoUtils=WARN, stdout
-log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerImpl=WARN, 
stdout
-log4j.logger.org.apache.usergrid.persistence.cassandra.ConnectionRefImpl=WARN, 
stdout
-log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=WARN, stdout
-log4j.logger.org.apache.usergrid.rest.security.AllowAjaxFilter=WARN, stdout
-log4j.logger.me.prettyprint.hector.api.beans.AbstractComposite=ERROR, stdout
-
-
-#log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG, stdout
-

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/org/apache/usergrid/launcher/dock_icon.png
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/org/apache/usergrid/launcher/dock_icon.png 
b/stack/launcher/src/main/resources/org/apache/usergrid/launcher/dock_icon.png
deleted file mode 100644
index e745910..0000000
Binary files 
a/stack/launcher/src/main/resources/org/apache/usergrid/launcher/dock_icon.png 
and /dev/null differ

http://git-wip-us.apache.org/repos/asf/usergrid/blob/6df86b4a/stack/launcher/src/main/resources/org/apache/usergrid/launcher/icon_16.png
----------------------------------------------------------------------
diff --git 
a/stack/launcher/src/main/resources/org/apache/usergrid/launcher/icon_16.png 
b/stack/launcher/src/main/resources/org/apache/usergrid/launcher/icon_16.png
deleted file mode 100644
index d23fcbe..0000000
Binary files 
a/stack/launcher/src/main/resources/org/apache/usergrid/launcher/icon_16.png 
and /dev/null differ

Reply via email to