You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/02/05 23:39:39 UTC
svn commit: r1240850 -
/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
Author: rmannibucau
Date: Sun Feb 5 22:39:39 2012
New Revision: 1240850
URL: http://svn.apache.org/viewvc?rev=1240850&view=rev
Log:
system.properties is read in SystemInstance
Modified:
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1240850&r1=1240849&r2=1240850&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Sun Feb 5 22:39:39 2012
@@ -49,11 +49,9 @@ import org.apache.tomee.installer.Instal
import org.apache.tomee.installer.Paths;
import org.apache.tomee.loader.TomcatHelper;
-import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
@@ -168,20 +166,6 @@ public class TomcatLoader implements Loa
SystemInstance.get().setProperty("openejb.configuration", tomeeXml.getAbsolutePath());
SystemInstance.get().setProperty("openejb.configuration.class", Tomee.class.getName());
}
-
- //Look for custom system properties
- File file = new File(conf, "system.properties");
- if (file.exists()) {
- System.out.println("Processing conf/system.properties: " + file.toString());
- Properties systemProperties = new Properties();
- fin = new FileInputStream(file);
- InputStream in = new BufferedInputStream(fin);
- systemProperties.load(in);
- System.getProperties().putAll(systemProperties);
- // store the system properties inside SystemInstance otherwise we will lose these properties.
- // i.e. any piece of code which is trying to look for properties inside SystemInstance will not be able to find it.
- SystemInstance.get().getProperties().putAll(systemProperties);
- }
} catch (IOException e) {
System.out.println("Processing conf/system.properties failed: " + e.getMessage());
} finally {