/ - Diff - EDIT - EDIT Project Management

      * The contents of this file are subject to the Mozilla Public License Version 1.1
      * See LICENSE.TXT at the top of this package for the full license terms.
      */
     package eu.etaxonomy.cdm.server;
     import static eu.etaxonomy.cdm.server.AssumedMemoryRequirements.KB;
-...
     import eu.etaxonomy.cdm.server.logging.LoggingConfigurator;
     import eu.etaxonomy.cdm.server.win32service.Win32Service;
     /**
      * A bootstrap class for starting Jetty Runner using an embedded war.
+     *
-...
         /* end of singleton implementation */
         /**
          * @param input
          * @param output
          * @param bufferSize
          * @return
          * @throws IOException
          */
         public int writeStreamTo(final InputStream input, final OutputStream output, int bufferSize) throws IOException {
             int available = Math.min(input.available(), 256 * KB);
             byte[] buffer = new byte[Math.max(bufferSize, available)];
-...
             return answer;
+        }
         public void parseCommandOptions(String[] args) throws ParseException {
             CommandLineParser parser = new GnuParser();
-...
+             }
+        }
         /**
          * Finds the named war file either in the resources known to the class loader
          * or in a target folder if the bootloader is started from within a maven project.
-...
         public String getCdmlibServicesLastModified() {
             return cdmlibServicesLastModified;
+        }
         /**
          * @param extractWar
          * @return
          * @throws IOException
          */
         private File unzip(File extractWar) throws IOException {
             UnzipUtility unzip = new UnzipUtility();
-...
             return destDirectory;
+        }
         /**
          * MAIN METHOD
+         *
-...
         public static void main(String[] args) throws Exception {
             Bootloader bootloader = Bootloader.getBootloader();
             bootloader.parseCommandOptions(args);
             bootloader.startServer();
+        }
         public void startServer() throws IOException,
                 FileNotFoundException, Exception, InterruptedException {

src/main/java/eu/etaxonomy/cdm/server/CommandOptions.java
6	6	* The contents of this file are subject to the Mozilla Public License Version 1.1
7	7	* See LICENSE.TXT at the top of this package for the full license terms.
8	8	*/
9
10	9	package eu.etaxonomy.cdm.server;
11	10
12	11	import org.apache.commons.cli.Option;

      */
     public class JvmManager {
         public static final Logger logger = Logger.getLogger(JvmManager.class);
         // Java > 8
         private static final String SUFFIX_META = "Metaspace";
         public static final Logger logger = Logger.getLogger(JvmManager.class);
         public static MemoryUsage getMetaSpaceUsage(){
             return getMemoryPoolUsage(SUFFIX_META);
+        }
-...
         public static MemoryUsage getHeapMemoryUsage(){
                 MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
                 if(memoryMXBean != null){
                     logger.debug("NonHeapMemoryUsage: "+memoryMXBean.getHeapMemoryUsage());
                     return memoryMXBean.getHeapMemoryUsage();
+                }
                 return null;
             MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
             if(memoryMXBean != null){
                 logger.debug("NonHeapMemoryUsage: "+memoryMXBean.getHeapMemoryUsage());
                 return memoryMXBean.getHeapMemoryUsage();
+            }
             return null;
+        }
         /**
+         *

     /**
      * @author andreas
      * @date Jul 17, 2012
+     *
      */
     public class OsChecker {
-...
+        }
         public boolean isLinux() {
             if (isMac())
             if (isMac()) {
                 return false;
+            }
             try {
                 Runtime.getRuntime().exec(new String[] { "sh", "-c", "ls" }).waitFor();
                 return true;

      * This utility extracts files and directories of a standard zip file to
      * a destination directory.
      * @author www.codejava.net
+     *
      */
     public class UnzipUtility {
         private static final Logger logger = Logger.getLogger(UnzipUtility.class);
         /**

     /**
      * Copyright (C) 2009 EDIT
      * European Distributed Institute of Taxonomy
      * http://www.e-taxonomy.eu
+     *
      * The contents of this file are subject to the Mozilla Public License Version 1.1
      * See LICENSE.TXT at the top of this package for the full license terms.
      */
     package eu.etaxonomy.cdm.server.instance;
     import java.lang.reflect.InvocationTargetException;
-...
     import com.mchange.v2.c3p0.DataSources;
     public class CdmInstance implements Listener {
         private static final Logger logger = Logger.getLogger(CdmInstance.class);
-...
         public List<String> getProblems() {
             if (problems == null) {
                 problems = new ArrayList<String>();
                 problems = new ArrayList<>();
+            }
             return problems;
+        }
-...
             return status.equals(Status.error);
+        }
         /**
          * @param status
          *            the status to set
          */
         public void setStatus(Status status) {
             this.status = status;
+        }
         /**
          * @return the status
          */
         public Status getStatus() {
             return status;
+        }
-...
         public Configuration getConfiguration() {
             return configuration;
+        }
         /**
          * @return the configuration
          */
         public void setConfiguration(Configuration configuration) {
             this.configuration = configuration;
+        }
-...
         public WebAppContext getWebAppContext() {
             return webAppContext;
+        }
         /**
          * @return the webAppContext
          */
         public void setWebAppContext(WebAppContext webAppContext) {
             this.webAppContext = webAppContext;
+        }
-...
                 // never override Status.removed !!!
                 setStatus(Status.stopped);
+            }
+        }
         @Override
-...
         public boolean bindJndiDataSource() {
             try {
                 Class<DataSource> dsCass = (Class<DataSource>) Thread.currentThread().getContextClassLoader().loadClass("com.mchange.v2.c3p0.ComboPooledDataSource");
                 DataSource datasource = dsCass.newInstance();
                 dsCass.getMethod("setDriverClass", new Class[] {String.class}).invoke(datasource, new Object[] {configuration.getDriverClass()});
                 dsCass.getMethod("setJdbcUrl", new Class[] {String.class}).invoke(datasource, new Object[] {configuration.getDataSourceUrl()});
                 dsCass.getMethod("setUser", new Class[] {String.class}).invoke(datasource, new Object[] {configuration.getUsername()});
                 dsCass.getMethod("setPassword", new Class[] {String.class}).invoke(datasource, new Object[] {configuration.getPassword()});
                 Class<DataSource> datasourceClass = (Class<DataSource>) Thread.currentThread().getContextClassLoader().loadClass("com.mchange.v2.c3p0.ComboPooledDataSource");
                 DataSource datasource = datasourceClass.newInstance();
                 datasourceClass.getMethod("setDriverClass", new Class[] {String.class}).invoke(datasource, new Object[] {configuration.getDriverClass()});
                 datasourceClass.getMethod("setJdbcUrl", new Class[] {String.class}).invoke(datasource, new Object[] {configuration.getDataSourceUrl()});
                 datasourceClass.getMethod("setUser", new Class[] {String.class}).invoke(datasource, new Object[] {configuration.getUsername()});
                 datasourceClass.getMethod("setPassword", new Class[] {String.class}).invoke(datasource, new Object[] {configuration.getPassword()});
                 Connection connection = null;
                 String sqlerror = null;
-...
                     connection = datasource.getConnection();
                     connection.close();
                 } catch (SQLException e) {
                     sqlerror = "Can not establish connection to data base " + configuration.getDataSourceUrl() + " [sql error code: "+ e.getSQLState() + "]";
                     sqlerror = "Can not establish connection to database " + configuration.getDataSourceUrl() + " [sql error code: "+ e.getSQLState() + "]";
                     getProblems().add(sqlerror);
                     setStatus(Status.error);
                     if(connection !=  null){

      * The contents of this file are subject to the Mozilla Public License Version 1.1
      * See LICENSE.TXT at the top of this package for the full license terms.
      */
     package eu.etaxonomy.cdm.server.instance;
     import org.apache.log4j.Logger;
-...
     /**
      * @author a.kohlbecker
      * @date May 10, 2013
+     *
      */
     public class Configuration {
     	public static final Logger logger = Logger.getLogger(Configuration.class);
     	private static final Logger logger = Logger.getLogger(Configuration.class);
     	private String instanceName;
     	private String password;
-...
     	public String getPassword() {
     		return password;
+    	}
     	public void setPassword(String password) {
     		this.password = password;
+    	}
-...
     	public String getUsername() {
     		return username;
+    	}
     	public void setUsername(String username) {
     		this.username = username;
+    	}
-...
     	public String getDataSourceUrl() {
     		return dataSourceUrl;
+    	}
     	public void setDataSourceUrl(String url) {
     		this.dataSourceUrl = url;
+    	}
-...
     	public String getDriverClass() {
     		return driverClass;
+    	}
     	public void setDriverClass(String driverClass) {
     		this.driverClass = driverClass;
+    	}

     /**
      * @author a.kohlbecker
      * @date 30.03.2010
+     *
      */
     public class DataSourcePropertyParser {
-...
         public static List<Configuration> parseDataSourceConfigs(File datasourcesFile){
             logger.info("loading bean definition file: " + datasourcesFile.getAbsolutePath());
             List<Configuration> configList = new ArrayList<Configuration>();
             Set<String> idSet = new HashSet<String>();
             List<Configuration> configList = new ArrayList<>();
             Set<String> idSet = new HashSet<>();
             try {
                 DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
                 Document doc = builder.parse(datasourcesFile);
-...
                     } else {
                         logger.error("instance with name '"+ conf.getInstanceName() + "' alreaddy exists");
+                    }
+                }
             } catch (SAXException e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
-...
+            }
             return null;
+        }
+    }
+    }

                 // instance.bindJndiDataSource();
                 if (!instance.bindJndiDataSource()) {
                     // a problem with the datasource occurred skip this webapp
                     logger.error("a problem with the datasource occurred -> aboarding startup of /" + instance.getName());
                     logger.error("a problem with the datasource occurred -> aborting startup of /" + instance.getName());
                     instance.setStatus(Status.error);
                 } else {
                     // ready for startup add to queue

         private final Logger logger = Logger.getLogger(InstanceManager.class);
         Set<CdmInstance> instancesStartingUp = new HashSet<CdmInstance>();
         Set<CdmInstance> instancesStartingUp = new HashSet<>();
         private int parallelStartUps = 1;
         /**
          * @return the parallelStartUps
          */
         public int getParallelStartUps() {
             return parallelStartUps;
+        }
         /**
          * @param parallelStartUps
          *            the parallelStartUps to set
          */
         public void setParallelStartUps(int parallelStartUps) {
             this.parallelStartUps = parallelStartUps;
+        }
         /**
          * {@inheritDoc}
          */
         @Override
         public boolean add(CdmInstance e) {
             boolean result = super.add(e);
-...
             return result;
+        }
         /**
          * {@inheritDoc}
          */
         @Override
         public void addFirst(CdmInstance e) {
             super.addFirst(e);
             registerAt(e);
+        }
         /**
          * {@inheritDoc}
          */
         @Override
         public void addLast(CdmInstance e) {
             super.addLast(e);
-...
             startNextInstances();
+        }
         /**
+         *
          */
         private void startNextInstances() {
             logger.debug("startNextInstances()");
             while(instancesStartingUp.size() < parallelStartUps && !isEmpty()) {
-...
+            }
+        }
         /**
          * @param e
          */
         @SuppressWarnings("unused")
         private void registerAt(CdmInstance e) {
             new InstanceListener(e);
-...
                 instance.getWebAppContext().addLifeCycleListener(this);
+            }
             /**
              * {@inheritDoc}
              */
             @Override
             public void lifeCycleStarting(LifeCycle event) {
                 // IGNORE
+            }
             /**
              * {@inheritDoc}
              */
             @Override
             public void lifeCycleStarted(LifeCycle event) {
                 notifyInstanceStartedUp(instance);
-...
                 instance = null;
+            }
             /**
              * {@inheritDoc}
              */
             @Override
             public void lifeCycleFailure(LifeCycle event, Throwable cause) {
                 notifyInstanceFailed(instance);
-...
                 instance = null;
+            }
             /**
              * {@inheritDoc}
              */
             @Override
             public void lifeCycleStopping(LifeCycle event) {
                 // IGNORE
+            }
             /**
              * {@inheritDoc}
              */
             @Override
             public void lifeCycleStopped(LifeCycle event) {
                 // IGNORE
+            }
+        }
         class StartupThread extends Thread{
-...
                 } finally {
                     MDC.clear();
+                }
+            }
+        }
+    }
+    }

src/main/java/eu/etaxonomy/cdm/server/instance/Status.java
3	3	import org.eclipse.jetty.util.component.LifeCycle;
4	4
5	5	public enum Status{
	6
6	7	/**
7	8	* New instances are uninitialized
8	9	*/

      * The contents of this file are subject to the Mozilla Public License Version 1.1
      * See LICENSE.TXT at the top of this package for the full license terms.
      */
     package eu.etaxonomy.cdm.server.jsvc;
     import eu.etaxonomy.cdm.server.Bootloader;
     public class ServiceWrapper {
         /**
          * Method required by jsvc. jsvc is being used by the linux start up script
          * @param args
-...
        public void destroy() throws Exception {
            Bootloader.getBootloader().getServer().destroy();
+        }
+    }
+    }

      */
     public class InstanceLogWrapper extends HandlerWrapper {
         /**
          * Key under which the instance name stored in the
          * Mapped Diagnostic Context (MDC)
-...
+        }
         @Override
         public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
+        {
         public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
                     throws IOException, ServletException {
             // Collect Info for NDC/MDC
             MDC.put(CDM_INSTANCE, instanceName);
             try
+            {
             try {
                 super.handle(target, baseRequest, request, response);
+            }
             finally
+            {
             finally {
                 // Pop info out / clear the NDC/MDC
                 MDC.clear();
+            }
+        }
+    }
+    }

      * ------------------------------------------------------------------------
      * Licensed 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
      * 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,
-...
      * limitations under the License.
      * ========================================================================
      */
     package eu.etaxonomy.cdm.server.win32service;
-...
      * @date 26.10.2010
+     *
      */
     public class CDMServerWrapperListener implements WrapperListener
+    {
     public class CDMServerWrapperListener implements WrapperListener {
         private static final Logger logger = Logger.getLogger(CDMServerWrapperListener.class);
         private static Server __server = null;
         public static final Logger logger = Logger.getLogger(CDMServerWrapperListener.class);
         public CDMServerWrapperListener()
+        {
         public CDMServerWrapperListener(){
+        }
         /* (non-Javadoc)
          * @see org.tanukisoftware.wrapper.WrapperListener#controlEvent(int)
          */
         public void controlEvent(int event)
+        {
             if (!WrapperManager.isControlledByNativeWrapper())
+            {
                 if ((event == WrapperManager.WRAPPER_CTRL_C_EVENT) || (event == WrapperManager.WRAPPER_CTRL_CLOSE_EVENT) || (event == WrapperManager.WRAPPER_CTRL_SHUTDOWN_EVENT))
+                {
         @Override
         public void controlEvent(int event) {
             if (!WrapperManager.isControlledByNativeWrapper()) {
                 if ((event == WrapperManager.WRAPPER_CTRL_C_EVENT)
                         || (event == WrapperManager.WRAPPER_CTRL_CLOSE_EVENT)
                         || (event == WrapperManager.WRAPPER_CTRL_SHUTDOWN_EVENT)){
                     WrapperManager.stop(0);
+                }
+            }
+        }
         /* (non-Javadoc)
          * @see org.tanukisoftware.wrapper.WrapperListener#start(java.lang.String[])
          */
         public Integer start(String[] args)
+        {
             for(int i=0; i<args.length; i++)
+            {
         @Override
         public Integer start(String[] args) {
             for(int i=0; i<args.length; i++) {
             	logger.info("ARG[" + i + "] = " + args[i]);
+            }
             try {
-...
             return null;
+        }
         /* (non-Javadoc)
          * @see org.tanukisoftware.wrapper.WrapperListener#stop(int)
          */
         public int stop(int code)
+        {
             try
+            {
         @Override
         public int stop(int code) {
             try {
             	logger.info("Stopping CDM Server!!!");
                 __server.stop();
                 logger.info("CDM Server Stopped!!!");
                 return code;
+            }
             catch (Exception e)
+            {
             catch (Exception e) {
             	logger.error("Stop Server Error", e);
                 return -1;
+            }
+        }
         /**
          * @param server
          */
         public static void setServer(Server server)
+        {
         public static void setServer(Server server) {
             __server = server;
+        }
         /**
          * @return
          */
         public static Server getServer()
+        {
         public static Server getServer() {
             return __server;
+        }
         public static void main(String[] args)
+        {
         public static void main(String[] args) {
             String newStrArgs[] = new String[args.length + 1];
             newStrArgs[0] = System.getProperty("jetty.home") + "etc/jetty-win32-service.xml";
             for(int i=0; i<args.length; i++)
+            {
             for(int i=0; i<args.length; i++) {
                 newStrArgs[i+1] = args[i];
+            }
             WrapperManager.start(new CDMServerWrapperListener(), newStrArgs);
+        }
+    }
+    }

      * ------------------------------------------------------------------------
      * Licensed 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
      * 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,
-...
      * limitations under the License.
      * ========================================================================
      */
     package eu.etaxonomy.cdm.server.win32service;
     import org.apache.log4j.Logger;
     import org.eclipse.jetty.server.Server;
     import org.eclipse.jetty.util.component.AbstractLifeCycle;
     /**
      * @author a.kohlbecker
      * @date 26.10.2010
+     *
      */
     public class Win32Service extends AbstractLifeCycle implements Runnable
+    {
     	public static final Logger logger = Logger.getLogger(Win32Service.class);
     public class Win32Service extends AbstractLifeCycle implements Runnable {
     	private static final Logger logger = Logger.getLogger(Win32Service.class);
         private Server server;
         public void doStart()
+        {
         @Override
         public void doStart() {
         	logger.info("doStart");
             CDMServerWrapperListener.setServer(server);
+        }
         public void doStop()
+        {
         	logger.info("Listener is stopping CDM Server Instance!!!");
         @Override
         public void doStop() {
         	logger.info("Listener is stopping CDM Server Instance!!!");
+        }
         public void run()
+        {
         @Override
         public void run() {
             doStop();
+        }
         public void stopServer()
+        {
             try
+            {
         public void stopServer() {
             try {
             	logger.info("Thread Test Stopper!!!");
                 server.stop();
                 //WrapperManager.stop(0);
+            }
             catch (Exception e)
+            {
             catch (Exception e) {
                 e.printStackTrace();
+            }
+        }
         public Server getServer()
+        {
         public Server getServer() {
             return server;
+        }
         public void setServer(Server server)
+        {
         public void setServer(Server server) {
             this.server = server;
+        }
+    }
+    }

       <!-- ~~~~~~ "disabling" loggers unwanted at INFO level ~~~~~~ -->
       <!-- avoid vast amount of "getCitation not yet implemented" & "getProblems not yet implemented" messages -->
       <logger name="eu.etaxonomy.cdm.model.name.TaxonNameBase" level="ERROR" />
       <logger name="eu.etaxonomy.cdm.model.name.TaxonName" level="ERROR" />
       <logger name="eu.etaxonomy.cdm.persistence.dao.initializer" level="ERROR" />
       <logger name="eu.etaxonomy.cdm.cache.CdmTransientEntityCacher" level="WARN" />
       <logger name="eu.etaxonomy.cdm.remote.controller.interceptor" level="WARN" />

Project

General

Profile

EDIT

Revision d8a13c97

Added by Andreas Müller over 2 years ago