[seam-commits] Seam SVN: r9893 - trunk/src/main/org/jboss/seam/init.

[seam-commits at lists.jboss.org]

Author: cpopetz
Date: 2009-01-08 09:09:20 -0500 (Thu, 08 Jan 2009)
New Revision: 9893

Modified:
   trunk/src/main/org/jboss/seam/init/Initialization.java
Log:
JBSEAM-3887

Modified: trunk/src/main/org/jboss/seam/init/Initialization.java
===================================================================
--- trunk/src/main/org/jboss/seam/init/Initialization.java	2009-01-08 13:58:58 UTC (rev 9892)
+++ trunk/src/main/org/jboss/seam/init/Initialization.java	2009-01-08 14:09:20 UTC (rev 9893)
@@ -137,6 +137,7 @@
       initPropertiesFromServletContext();
       initPropertiesFromResource();
       initJndiProperties();
+      initPropertiesFromSystem();
       return this;
    }
 
@@ -1010,15 +1011,34 @@
       }
    }
 
+   private void initPropertiesFromSystem()
+   {
+      Properties filtered = new Properties();
+      String prefix = Component.PROPERTIES + ".";
+      for (Map.Entry me : System.getProperties().entrySet())
+      {
+         if (((String)me.getKey()).startsWith(prefix))
+         {
+            filtered.put(((String)me.getKey()).substring(prefix.length()),me.getValue());
+         }
+      }
+      initPropertiesFromMap(filtered);
+   }
+      
    private void initPropertiesFromResource()
    {
-      Properties props = loadFromResource("/seam.properties");
+      initPropertiesFromMap(loadFromResource("/seam.properties"));
+   }
+   
+   private void initPropertiesFromMap(Properties props)
+   {
       for (Map.Entry me : props.entrySet())
       {
          properties.put((String) me.getKey(), new Conversions.FlatPropertyValue((String) me
                   .getValue()));
       }
    }
+   
 
    private void initJndiProperties()
    {