[jbpm-pvm] JBoss JBPM SVN: r455 - in tempranillo/pvm/trunk: test/java/org/jbpm/base and 1 other directory.

[<do-...@jb...>]

Author: tom...@jb...
Date: 2007-10-17 09:58:19 -0400 (Wed, 17 Oct 2007)
New Revision: 455

Modified:
   tempranillo/pvm/trunk/build.xml
   tempranillo/pvm/trunk/test/java/org/jbpm/base/LogInitializer.java
Log:
added logging for user.home

Modified: tempranillo/pvm/trunk/build.xml
===================================================================
--- tempranillo/pvm/trunk/build.xml	2007-10-17 13:52:57 UTC (rev 454)
+++ tempranillo/pvm/trunk/build.xml	2007-10-17 13:58:19 UTC (rev 455)
@@ -14,8 +14,12 @@
       </fileset>
 	  </delete>
 	</target>
-	
 
+	<target name="show.user.home">
+	  <echo message="user home: ${user.home}" />
+	</target>
+
+
   <!-- JAR -->
   <target name="jar" depends="compile, manifest">
     <jar destfile="target/pvm.jar" manifest="target/manifest/MANIFEST.MF">

Modified: tempranillo/pvm/trunk/test/java/org/jbpm/base/LogInitializer.java
===================================================================
--- tempranillo/pvm/trunk/test/java/org/jbpm/base/LogInitializer.java	2007-10-17 13:52:57 UTC (rev 454)
+++ tempranillo/pvm/trunk/test/java/org/jbpm/base/LogInitializer.java	2007-10-17 13:58:19 UTC (rev 455)
@@ -21,6 +21,8 @@
  */
 package org.jbpm.base;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.logging.LogManager;
 
@@ -36,10 +38,26 @@
       isInitialized = true;
 
       try {
-        InputStream inputStream = LogInitializer.class.getClassLoader().getResourceAsStream("logging.properties");
+        InputStream inputStream = null;
+        
+        String userHome = System.getProperty("user.home");
+        System.out.println("user.home: "+userHome);
+        
+        File file = new File(userHome+"pvm/logging.properties");
+        // if logging is configured in ${user.home}/pvm/logging.properties take that one
+        if (file.exists()) {
+          inputStream = new FileInputStream(file);
+        // otherwise, take the one in the test resources
+        } else {
+          inputStream = LogInitializer.class.getClassLoader().getResourceAsStream("logging.properties");
+        }
+        
         if (inputStream!=null) {
           LogManager.getLogManager().readConfiguration(inputStream);
         }
+        
+        inputStream.close();
+        
       } catch (Exception e) {
         e.printStackTrace();
         throw new RuntimeException("couldn't initialize logging properly", e);