db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r1083129 - in /db/derby/code/branches/10.6: ./ java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Date Sat, 19 Mar 2011 02:14:53 GMT
Author: kmarsden
Date: Sat Mar 19 02:14:53 2011
New Revision: 1083129

URL: http://svn.apache.org/viewvc?rev=1083129&view=rev
Log:
DERBY-4853 log derby.properties location and derby.log location to derby.log

Contributed by Mamta Satoor

merged revison 1071886 	from trunk.


Modified:
    db/derby/code/branches/10.6/   (props changed)
    db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java

Propchange: db/derby/code/branches/10.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 19 02:14:53 2011
@@ -1,2 +1,2 @@
-/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,957902,958163,958257,958264,958508,958522,958555,958618,958939,959550,961892,962716,963206,963705,964039,964115,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,990292,997325,998170,999119,999479,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1028716,1030043,1033485,1033864,1038514,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1078461,1081455
+/db/derby/code/trunk:938547,938796,938959,939231,940462,940469,941627,942031,942286,942476,942480,942587,944152,946794,948045,948069,951346,951366,952138,952237,952581,954344,954421,954544,954748,955001,955540,955634,956075,956234,956445,956569,956659,957260,957902,958163,958257,958264,958508,958522,958555,958618,958939,959550,961892,962716,963206,963705,964039,964115,964402,965647,966393,967201,967304,980089,980684,986689,986834,987539,989099,990292,997325,998170,999119,999479,999485,1002291,1002682,1002853,1021426,1024511,1024528,1025615,1025795,1028716,1030043,1033485,1033864,1038514,1040658,1053724,1055169,1062096,1063809,1065061,1067250,1069661,1071886,1078461,1081455
 /db/derby/docs/trunk:954344

Modified: db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=1083129&r1=1083128&r2=1083129&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
(original)
+++ db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Sat Mar 19 02:14:53 2011
@@ -382,6 +382,26 @@ public class BaseDataFileFactory
 		//Log the JVM version info
 		logMsg(jvmVersion);
 
+		//Log derby.system.home It will have null value if user didn't set it
+		logMsg(Property.SYSTEM_HOME_PROPERTY+"=" + 
+				PropertyUtil.getSystemProperty(Property.SYSTEM_HOME_PROPERTY));
+		
+		//Log properties related to redirection of derby.log 
+		String target = 
+			PropertyUtil.getSystemProperty(Property.ERRORLOG_FILE_PROPERTY);
+		if (target != null)
+			logMsg(Property.ERRORLOG_FILE_PROPERTY+"=" + target);
+		
+		target = 
+			PropertyUtil.getSystemProperty(Property.ERRORLOG_METHOD_PROPERTY);
+		if (target != null)
+			logMsg(Property.ERRORLOG_METHOD_PROPERTY+"=" + target);
+		
+		target = 
+			PropertyUtil.getSystemProperty(Property.ERRORLOG_FIELD_PROPERTY);
+		if (target != null)
+			logMsg(Property.ERRORLOG_FIELD_PROPERTY+"=" + target);
+
         if (logBootTrace)
            Monitor.logThrowable(new Throwable("boot trace"));
 		uf = null;
@@ -2216,6 +2236,8 @@ public class BaseDataFileFactory
                      jvmversion += "\njava.runtime.version=" + currentProp;
                  if ((currentProp = PropertyUtil.getSystemProperty("java.fullversion")) !=
null)
                      jvmversion += "\njava.fullversion=" + currentProp ;         
+                 if ((currentProp = PropertyUtil.getSystemProperty("user.dir")) != null)
+                     jvmversion += "\nuser.dir=" + currentProp ;         
               }
               catch (SecurityException se) {
                    return se.getMessage();



Mime
View raw message