svn commit: r1375335 - in /openejb/trunk/openejb/container: openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java

[dblevins]

Author: dblevins
Date: Mon Aug 20 23:59:50 2012
New Revision: 1375335

URL: http://svn.apache.org/viewvc?rev=1375335&view=rev
Log:
Trim SystemInstance properties inherited from System.getProperties down a bit 
to speed up other properties based work

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
    
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java?rev=1375335&r1=1375334&r2=1375335&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/cli/MainImpl.java
 Mon Aug 20 23:59:50 2012
@@ -176,7 +176,7 @@ public class MainImpl implements Main {
         // so we'll set up all the props in it
         SystemInstance systemInstance = null;
         try {
-            SystemInstance.init(System.getProperties());
+            SystemInstance.init(new Properties());
             OptionsLog.install();
             systemInstance = SystemInstance.get();
         } catch (Exception e) {

Modified: 
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java?rev=1375335&r1=1375334&r2=1375335&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
 Mon Aug 20 23:59:50 2012
@@ -23,6 +23,7 @@ import org.apache.openejb.observer.Obser
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 
 /**
@@ -64,7 +65,21 @@ public class SystemInstance {
     private SystemInstance(final Properties properties) throws Exception {
         this.components = new HashMap<Class, Object>();
 
-        this.internalProperties.putAll(System.getProperties());
+        for (Map.Entry<? extends Object, ? extends Object> e : 
System.getProperties().entrySet()){
+            final String key = e.getKey().toString();
+            if (key.startsWith("sun.")) continue;
+            if (key.startsWith("os.")) continue;
+            if (key.startsWith("user.")) continue;
+            if (key.startsWith("awt.")) continue;
+            if (key.startsWith("java.vm.")) continue;
+            if (key.startsWith("java.runtime.")) continue;
+            if (key.startsWith("java.awt.")) continue;
+            if (key.startsWith("java.specification.")) continue;
+            if (key.startsWith("java.class.")) continue;
+            if (key.startsWith("java.library.")) continue;
+            this.internalProperties.put(e.getKey(), e.getValue());
+        }
+
         this.internalProperties.putAll(properties);
 
         this.options = new Options(internalProperties, new 
Options(System.getProperties()));