You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2011/03/19 01:40:16 UTC
svn commit: r1083115 - in /db/derby/code/branches/10.7: ./
java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Author: kmarsden
Date: Sat Mar 19 00:40:16 2011
New Revision: 1083115
URL: http://svn.apache.org/viewvc?rev=1083115&view=rev
Log:
DERBY-4853 log derby.properties location and derby.log location to derby.log
Contributed by Mamta Satoor
Modified:
db/derby/code/branches/10.7/ (props changed)
db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Propchange: db/derby/code/branches/10.7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 19 00:40:16 2011
@@ -1 +1 @@
-/db/derby/code/trunk:1035603,1036769,1038514,1038813,1039084,1039268,1040658,1041338,1043227,1043389,1044096,1051026,1053724,1055169,1059888,1060480,1062096,1063809,1065061,1066290,1067250,1067357,1069661,1071463,1076387,1078461,1078693,1081455
+/db/derby/code/trunk:1035603,1036769,1038514,1038813,1039084,1039268,1040658,1041338,1043227,1043389,1044096,1051026,1053724,1055169,1059888,1060480,1062096,1063809,1065061,1066290,1067250,1067357,1069661,1071463,1071886,1076387,1078461,1078693,1081455
Modified: db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=1083115&r1=1083114&r2=1083115&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java (original)
+++ db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java Sat Mar 19 00:40:16 2011
@@ -369,6 +369,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;
@@ -2202,6 +2222,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();