[jboss-svn-commits] JBL Code SVN: r12259 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util.

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2007-05-31 08:46:23 -0400 (Thu, 31 May 2007)
New Revision: 12259

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ChainedProperties.java
Log:
JBRULES-895 Chained Properties
-The properties handling has been extended to support chaining.

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ChainedProperties.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ChainedProperties.java	2007-05-31 12:27:11 UTC (rev 12258)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ChainedProperties.java	2007-05-31 12:46:23 UTC (rev 12259)
@@ -28,19 +28,18 @@
         this.defaultProps = new ArrayList();
         
         // Properties added in precedence order
-        //this.chainedProperties = new ChainedProperties();
 
         // System defined properties always get precedence
         addProperties( System.getProperties() );
 
         // System property defined properties file
-        loadProperties( System.getProperty( "drools.packagebuilder.conf" ), this.props );
+        loadProperties( System.getProperty( "drools." + confFileName), this.props );
 
         // User home properties file
-        loadProperties( System.getProperty( "user.home" ) + "/drools.packagebuilder.conf", this.props );
+        loadProperties( System.getProperty( "user.home" ) + "/drools." + confFileName, this.props );
 
         // Working directory properties file
-        loadProperties( "drools.packagebuilder.conf", this.props );
+        loadProperties( "drools." + confFileName, this.props );
 
         // check META-INF directories for all known ClassLoaders
         ClassLoader confClassLoader = classLoader;
@@ -87,7 +86,7 @@
         if ( defaultURL == null ) {
             confClassLoader = ClassLoader.getSystemClassLoader();
             if ( confClassLoader != null && confClassLoader != classLoader ) {
-                defaultURL = confClassLoader.getResource( "META-INF/drools.default.packagebuilder.conf" );
+                defaultURL = confClassLoader.getResource( "META-INF/drools.default." + confFileName );
             }
         }
 
@@ -162,7 +161,7 @@
                 try {
                     loadProperties( file.toURL(), chain );
                 } catch ( MalformedURLException e ) {
-                    throw new IllegalArgumentException( "file.toURL failed for drools.packagebuilder.conf properties value '" + file + "'" );
+                    throw new IllegalArgumentException( "file.toURL() failed for drools.packagebuilder.conf properties value '" + file + "'" );
                 }
             } else {
                 //throw new IllegalArgumentException( "drools.packagebuilder.conf is specified but cannot be found '" + file + "'" );