[teiid-commits] teiid SVN: r832 - trunk/common-internal/src/main/java/com/metamatrix/common/config/model.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2009-04-23 14:34:17 -0400 (Thu, 23 Apr 2009)
New Revision: 832

Modified:
   trunk/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationModelContainerImpl.java
Log:
Teiid - 528 - changed so that when the configuration model is loaded, that the configuration object is loaded with its defaults and its overrides.

Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationModelContainerImpl.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationModelContainerImpl.java	2009-04-23 18:28:52 UTC (rev 831)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/model/ConfigurationModelContainerImpl.java	2009-04-23 18:34:17 UTC (rev 832)
@@ -521,6 +521,7 @@
         
         Properties allprops = this.getDefaultPropertyValues(this.configuration.getComponentTypeID());
         allprops.putAll(this.configuration.getProperties());
+        allprops.putAll(System.getProperties());
         
         this.configuration.setProperties(allprops);