[teiid-commits] teiid SVN: r1302 - in trunk: runtime/src/main/java/com/metamatrix/jdbc and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2009-09-01 15:41:31 -0400 (Tue, 01 Sep 2009)
New Revision: 1302

Modified:
   trunk/build/kit-runtime/deploy/log4j.xml
   trunk/runtime/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java
Log:
TEIID-812: configured to place the log file in the ${teiid.home} location, this sets up a system property, but there seems to be any other alternative to configure this. In the embedded case in given VM Teiid only allows single instance this should be acceptable. 

Modified: trunk/build/kit-runtime/deploy/log4j.xml
===================================================================
--- trunk/build/kit-runtime/deploy/log4j.xml	2009-09-01 17:58:00 UTC (rev 1301)
+++ trunk/build/kit-runtime/deploy/log4j.xml	2009-09-01 19:41:31 UTC (rev 1302)
@@ -7,7 +7,7 @@
    </appender>
 
    <appender name="FILE" class="org.apache.log4j.RollingFileAppender">
-     <param name="File" value="log/teiid.log"/>
+     <param name="File" value="${teiid.home}/log/teiid.log"/>
      <param name="MaxFileSize" value="1000KB"/>
      <param name="MaxBackupIndex" value="25"/>
 

Modified: trunk/runtime/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java
===================================================================
--- trunk/runtime/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java	2009-09-01 17:58:00 UTC (rev 1301)
+++ trunk/runtime/src/main/java/com/metamatrix/jdbc/EmbeddedConnectionFactoryImpl.java	2009-09-01 19:41:31 UTC (rev 1302)
@@ -119,6 +119,10 @@
         	bootstrapURL = URLHelper.buildURL(props.getProperty(DQPEmbeddedProperties.BOOTURL));
 	        // Create a temporary workspace directory
 			String teiidHome = props.getProperty(DQPEmbeddedProperties.TEIID_HOME);
+			if (System.getProperty(DQPEmbeddedProperties.TEIID_HOME) == null) {
+				System.setProperty(DQPEmbeddedProperties.TEIID_HOME, teiidHome);
+			}
+			
 	        this.workspaceDirectory = createWorkspace(teiidHome, props.getProperty(DQPEmbeddedProperties.DQP_WORKDIR, "work"), processName); //$NON-NLS-1$
 	        props.setProperty(DQPEmbeddedProperties.DQP_WORKDIR, this.workspaceDirectory);