Project

General

Profile

« Previous | Next » 

Revision ea1f5604

Added by Andreas Müller almost 4 years ago

cleanup

View differences:

src/main/java/eu/etaxonomy/cdm/server/Bootloader.java
77 77
 * @version $Revision$
78 78
 */
79 79
public final class Bootloader {
80
    /**
81
     *
82
     */
83
    private static final String SPRING_PROFILES_ACTIVE = "spring.profiles.active";
84 80

  
85
    /**
86
     *
87
     */
88
    private static final String VERSION_PROPERTIES_FILE = "version.properties";
81
    private static final Logger logger = Logger.getLogger(Bootloader.class);
89 82

  
90 83
    //private static final String DEFAULT_WARFILE = "target/";
91 84

  
92

  
93

  
94
    private static final Logger logger = Logger.getLogger(Bootloader.class);
95

  
96 85
    private static final String DATASOURCE_BEANDEF_FILE = "datasources.xml";
97 86
    private static final String REALM_PROPERTIES_FILE = "cdm-server-realm.properties";
98 87

  
......
110 99
    private static final File DEFAULT_WEBAPP_TEMP_FOLDER = new File(TMP_PATH + DEFAULT_WEBAPP_WAR_NAME);
111 100
    private static final File CDM_WEBAPP_TEMP_FOLDER = new File(TMP_PATH + CDM_WEBAPP);
112 101

  
102
    private static final String SPRING_PROFILES_ACTIVE = "spring.profiles.active";
103
    private static final String VERSION_PROPERTIES_FILE = "version.properties";
104

  
113 105
    private final InstanceManager instanceManager = new InstanceManager(new File(USERHOME_CDM_LIBRARY_PATH, DATASOURCE_BEANDEF_FILE));
114 106

  
115 107
    public List<CdmInstance> getCdmInstances() {
src/main/java/eu/etaxonomy/cdm/server/JvmManager.java
19 19
/**
20 20
 * @author a.kohlbecker
21 21
 * @date 30.07.2010
22
 *
23 22
 */
24 23
public class JvmManager {
25 24

  
src/main/java/eu/etaxonomy/cdm/server/instance/InstanceManager.java
282 282
        serverIsRunning = false;
283 283
    }
284 284

  
285
    /**
286
    *
287
    */
288 285
    private void verifyMemoryRequirements() {
289 286

  
290 287
        verifyMemoryRequirement("HeapSpace", HEAP_CDMSERVER, HEAP_PER_INSTANCE, JvmManager.getHeapMemoryUsage()
......
306 303
            String message = memoryName + " (" + (availableSpace / MB) + "MB) insufficient for "
307 304
                    + numOfConfiguredInstances() + " instances. Increase " + memoryName + " to "
308 305
                    + (recommendedMinimumSpace / MB) + "MB";
309
            ;
306

  
310 307
            logger.error(message + " => disabling some instances!!!");
311 308

  
312 309
            // disabling some instances

Also available in: Unified diff