db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lily...@apache.org
Subject svn commit: r967304 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/services/i18n/MessageService.java impl/store/raw/data/BaseDataFileFactory.java loc/messages.xml
Date Fri, 23 Jul 2010 23:37:56 GMT
Author: lilywei
Date: Fri Jul 23 23:37:56 2010
New Revision: 967304

URL: http://svn.apache.org/viewvc?rev=967304&view=rev
Log:
DERBY-4715 Write jvm information and path of derby.jar to derby.log

Change hard-code English message, message order and take out space 
at front of boot messagae

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java?rev=967304&r1=967303&r2=967304&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java
Fri Jul 23 23:37:56 2010
@@ -81,6 +81,9 @@ public final class MessageService {
 	public static String getTextMessage(String messageID, Object a1, Object a2, Object a3, Object
a4) {
 		return getCompleteMessage(messageID, new Object[]{a1, a2, a3, a4});
 	}
+    public static String getTextMessage(String messageID, Object a1, Object a2, Object a3,
Object a4, Object a5) {
+        return getCompleteMessage(messageID, new Object[]{a1, a2, a3, a4, a5});
+    }
 
 	/**
 	  Transform the message from messageID to the actual error, warning, or

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java?rev=967304&r1=967303&r2=967304&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
Fri Jul 23 23:37:56 2010
@@ -374,10 +374,12 @@ public class BaseDataFileFactory
                                              jbmsVersion,
                                              identifier,
                                              // cast to Object so we get object hash code
+                                             dataDirectory + " " + readOnlyMsg,
                                              (Object) this.getClass().getClassLoader(),
-                                             dataDirectory + " " + readOnlyMsg 
-                                             +"\nLoaded from " + jarCPath + "\n" +jvmVersion
+                                             jarCPath
                                              ));
+		//Log the JVM version info
+		logMsg(jvmVersion);
 
         if (logBootTrace)
            Monitor.logThrowable(new Throwable("boot trace"));

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml?rev=967304&r1=967303&r2=967304&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml Fri Jul 23 23:37:56
2010
@@ -7488,13 +7488,14 @@ MessageId.java.
             <msg>
                 <name>D001</name>
                 <text>:
- Booting Derby version {0}: instance {1} 
-on database directory {2}  with class loader {3}
-</text>
+Booting Derby version {0}: instance {1} 
+on database directory {2} with class loader {3} 
+Loaded from {4}</text>
                 <arg>derbyVersion</arg>
                 <arg>id</arg>
                 <arg>directoryName</arg>
                 <arg>classloader</arg>
+                <arg>JarClassPath</arg>
             </msg>
 
             <msg>



Mime
View raw message