Author: vhalbert(a)redhat.com
Date: 2009-04-23 14:52:50 -0400 (Thu, 23 Apr 2009)
New Revision: 834
Modified:
trunk/server/src/main/java/com/metamatrix/platform/config/util/CurrentConfigHelper.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/server/src/main/java/com/metamatrix/platform/config/util/CurrentConfigHelper.java
===================================================================
---
trunk/server/src/main/java/com/metamatrix/platform/config/util/CurrentConfigHelper.java 2009-04-23
18:36:01 UTC (rev 833)
+++
trunk/server/src/main/java/com/metamatrix/platform/config/util/CurrentConfigHelper.java 2009-04-23
18:52:50 UTC (rev 834)
@@ -25,7 +25,6 @@
package com.metamatrix.platform.config.util;
import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
import java.util.Properties;
@@ -51,7 +50,8 @@
public void loadMetaMatrixPropertiesIntoSystem(String filename) throws Exception {
Properties bootstrapProps = new Properties();
- InputStream bootstrapPropStream = new FileInputStream(new File(filename));
+ InputStream bootstrapPropStream =
this.getClass().getClassLoader().getResourceAsStream(filename);
+
bootstrapProps.load(bootstrapPropStream);
bootstrapProps.remove(CurrentConfiguration.CONFIGURATION_READER_CLASS_PROPERTY_NAME);
Show replies by date