[teiid-commits] teiid SVN: r1288 - trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2009-08-28 16:43:58 -0400 (Fri, 28 Aug 2009)
New Revision: 1288

Modified:
   trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java
Log:
TEIID-809: Configuration file by default will be loaded from the classloader, the previous property "dqp.configFile" still be supported for legacy and testing purposes.

Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java
===================================================================
--- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java	2009-08-28 15:49:01 UTC (rev 1287)
+++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java	2009-08-28 20:43:58 UTC (rev 1288)
@@ -220,7 +220,7 @@
      * @see com.metamatrix.dqp.service.ConfigurationService#getConfigFile()
      */
     public URL getConfigFile() {
-        String configFile = getUserPreferences().getProperty(DQPEmbeddedProperties.DQP_CONFIGFILE, "configuration.xml"); //$NON-NLS-1$
+        String configFile = getUserPreferences().getProperty(DQPEmbeddedProperties.DQP_CONFIGFILE);
         if (valid(configFile)) {
             return getFullyQualifiedPath(configFile);
         }