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

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2009-04-01 23:40:16 -0400 (Wed, 01 Apr 2009)
New Revision: 692

Modified:
   trunk/pom.xml
   trunk/server/src/main/java/com/metamatrix/server/Main.java
Log:
TEIID-453, TEIID-442, TEIID-441, TEIID-136 simplifies configuration to only a current configuration.

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2009-04-02 01:19:18 UTC (rev 691)
+++ trunk/pom.xml	2009-04-02 03:40:16 UTC (rev 692)
@@ -140,6 +140,10 @@
 					</excludes>
 					<systemProperties>
 						<property>
+							<name>user.dir</name>
+							<value>${basedir}/target</value>
+						</property>
+						<property>
 							<name>java.io.tmpdir</name>
 							<value>${basedir}/target</value>
 						</property>

Modified: trunk/server/src/main/java/com/metamatrix/server/Main.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/server/Main.java	2009-04-02 01:19:18 UTC (rev 691)
+++ trunk/server/src/main/java/com/metamatrix/server/Main.java	2009-04-02 03:40:16 UTC (rev 692)
@@ -75,7 +75,7 @@
 
 		final Host host = CurrentConfiguration.getInstance().getDefaultHost();        
 		
-		Thread t = new Thread(new Runnable() {
+		Thread t = new Thread("Main Info Thread") { //$NON-NLS-1$
 			@Override
 			public void run() {
 				try {
@@ -86,7 +86,7 @@
 				// write info log
 				writeInfoLog(host, processName);
 			}
-		}, "Main Info Thread"); //$NON-NLS-1$
+		};
 		t.start();
 		        
 		createTempDirectory();                    
@@ -148,11 +148,13 @@
 	}   
 
     private static void saveCurrentConfigurationToFile(Host host, String processName) throws ConfigurationException {
-        FilePersistentUtil.writeModel(CONFIG_PREFIX+FileLimitSizeLogWriter.getDate()+".xml", host.getConfigDirectory(),  //$NON-NLS-1$ 
+    	String configDir = host.getConfigDirectory();
+    	File f = new File(configDir);
+    	f.mkdirs();
+        FilePersistentUtil.writeModel(CONFIG_PREFIX+FileLimitSizeLogWriter.getDate()+".xml", configDir,  //$NON-NLS-1$ 
         CurrentConfiguration.getInstance().getConfigurationModel(), 
                         processName);
         //remove old instances
-        File f = new File(host.getConfigDirectory());
         String[] result = f.list(new FilenameFilter() {
         	@Override
         	public boolean accept(File dir, String name) {