Author: vhalbert(a)redhat.com
Date: 2009-04-23 17:24:27 -0400 (Thu, 23 Apr 2009)
New Revision: 836
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
20:57:07 UTC (rev 835)
+++
trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-04-23
21:24:27 UTC (rev 836)
@@ -74,7 +74,10 @@
* </p>
*/
public final class CurrentConfiguration {
- private static final String BOOTSTRAP_FILE_PROPERTY = "teiid.bootstrap.file";
//$NON-NLS-1$
+ /*
+ * This property enables the overriding of the default {@link BOOTSTRAP_FILE_NAME}
+ */
+ public static final String BOOTSTRAP_FILE_PROPERTY_OVERRIDE =
"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$
@@ -331,7 +334,7 @@
Properties bootstrapProps = new Properties(systemBootStrapProps);
InputStream bootstrapPropStream = null;
- String bootstrapfile = systemBootStrapProps.getProperty(BOOTSTRAP_FILE_PROPERTY,
BOOTSTRAP_FILE_NAME);
+ String bootstrapfile =
systemBootStrapProps.getProperty(BOOTSTRAP_FILE_PROPERTY_OVERRIDE, BOOTSTRAP_FILE_NAME);
try {
bootstrapPropStream =
this.getClass().getClassLoader().getResourceAsStream(bootstrapfile);
if (bootstrapPropStream != null) {
Show replies by date