[teiid-commits] teiid SVN: r830 - trunk/common-internal/src/main/java/com/metamatrix/common/config.
Author: vhalbert(a)redhat.com
Date: 2009-04-23 14:25:52 -0400 (Thu, 23 Apr 2009)
New Revision: 830
Modified:
trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java
Log:
Teiid-464 - to support shared installation, need the ability to override the default
property file to load instead of teiid.properties
Modified:
trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java
===================================================================
---
trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-04-23
15:33:20 UTC (rev 829)
+++
trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-04-23
18:25:52 UTC (rev 830)
@@ -26,7 +26,6 @@
import java.io.InputStream;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Properties;
@@ -75,8 +74,9 @@
* </p>
*/
public final class CurrentConfiguration {
-
- public static final String BOOTSTRAP_FILE_NAME = "metamatrix.properties";
//$NON-NLS-1$
+ private static final String BOOTSTRAP_FILE_PROPERTY = "teiid.bootstrap.file";
//$NON-NLS-1$
+
+ public static final String BOOTSTRAP_FILE_NAME = "teiid.properties";
//$NON-NLS-1$
public static final String CONFIGURATION_READER_CLASS_PROPERTY_NAME =
"metamatrix.config.reader"; //$NON-NLS-1$
public static final String CLUSTER_NAME = "metamatrix.cluster.name";
//$NON-NLS-1$
public static final String CONFIGURATION_NAME= "configuration.name";
//$NON-NLS-1$
@@ -330,8 +330,10 @@
Properties systemBootStrapProps = getSystemBootStrapProperties();
Properties bootstrapProps = new Properties(systemBootStrapProps);
InputStream bootstrapPropStream = null;
+
+ String bootstrapfile = systemBootStrapProps.getProperty(BOOTSTRAP_FILE_PROPERTY,
BOOTSTRAP_FILE_NAME);
try {
- bootstrapPropStream =
this.getClass().getClassLoader().getResourceAsStream(BOOTSTRAP_FILE_NAME);
+ bootstrapPropStream =
this.getClass().getClassLoader().getResourceAsStream(bootstrapfile);
if (bootstrapPropStream != null) {
bootstrapProps.load(bootstrapPropStream);
}