db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davi...@apache.org
Subject svn commit: r370880 - in /db/derby/code/trunk: ./ java/build/org/apache/derbyBuild/ java/client/org/apache/derby/client/am/ java/client/org/apache/derby/loc/
Date Fri, 20 Jan 2006 19:04:16 GMT
Author: davidvc
Date: Fri Jan 20 11:03:14 2006
New Revision: 370880

URL: http://svn.apache.org/viewcvs?rev=370880&view=rev
Log:
DERBY-838: refinement - get rid of dash in "client-messages" to be
consistent with names of other properties files in Derby

Added:
    db/derby/code/trunk/java/client/org/apache/derby/loc/clientmessage_en.properties
      - copied unchanged from r370815, db/derby/code/trunk/java/client/org/apache/derby/loc/client-messages_en.properties
    db/derby/code/trunk/java/client/org/apache/derby/loc/clientmessages.properties
      - copied, changed from r370815, db/derby/code/trunk/java/client/org/apache/derby/loc/client-messages.properties
Removed:
    db/derby/code/trunk/java/client/org/apache/derby/loc/client-messages.properties
    db/derby/code/trunk/java/client/org/apache/derby/loc/client-messages_en.properties
Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/build.xml?rev=370880&r1=370879&r2=370880&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Fri Jan 20 11:03:14 2006
@@ -1127,7 +1127,7 @@
 			org/apache/derby/client/jdbc/Client**,org/apache/derby/jdbc/Client**,org/apache/derby/iapi/services/info/**,
                          org/apache/derby/shared/**,
                          org/apache/derby/info/dnc.properties,
-                         org/apache/derby/loc/client-messages*.properties"
+                         org/apache/derby/loc/clientmessages*.properties"
                excludes="org/apache/derby/shared/common/reference/**"/>
       <fileset dir="${derby.jar.dir}/lists"
                includes="META-INF/**"/>

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java?rev=370880&r1=370879&r2=370880&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java Fri Jan 20 11:03:14
2006
@@ -89,7 +89,7 @@
         // Open the client properties file for the given locale
         // from the client locales directory, and then intialize
         // clientProps with what we find in there
-        String clientPropsFileName = "client-messages" + locale + ".properties";
+        String clientPropsFileName = "clientmessages" + locale + ".properties";
         try
         {
             InputStream clientInStream = new FileInputStream(
@@ -155,7 +155,7 @@
         {
             // Save the English messages as the base
             clientOutStream = new BufferedOutputStream(
-                new FileOutputStream(new File(dir, "client-messages.properties")), 
+                new FileOutputStream(new File(dir, "clientmessages.properties")), 
                 16 * 1024);
 
             clientProps.save(clientOutStream, (String)null);

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java?rev=370880&r1=370879&r2=370880&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/SqlException.java Fri Jan 20
11:03:14 2006
@@ -61,7 +61,7 @@
     private String batchPositionLabel_; // for batched exceptions only
     
     public static String CLIENT_MESSAGE_RESOURCE_NAME =
-        "org.apache.derby.loc.client-messages";
+        "org.apache.derby.loc.clientmessages";
     
     // The message utility instance we use to find messages
     // It's primed with the name of the client message bundle so that

Copied: db/derby/code/trunk/java/client/org/apache/derby/loc/clientmessages.properties (from
r370815, db/derby/code/trunk/java/client/org/apache/derby/loc/client-messages.properties)
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/loc/clientmessages.properties?p2=db/derby/code/trunk/java/client/org/apache/derby/loc/clientmessages.properties&p1=db/derby/code/trunk/java/client/org/apache/derby/loc/client-messages.properties&r1=370815&r2=370880&rev=370880&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/loc/client-messages.properties (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/loc/clientmessages.properties Fri Jan
20 11:03:14 2006
@@ -1,7 +1,7 @@
 !
 !
 !
-! ALL ENGLISH MESSAGES ARE IN client-messages_en.properties
+! ALL ENGLISH MESSAGES ARE IN clientmessages_en.properties
 !
 ! DO NOT ADD ANYTHING TO THIS FILE
 !



Mime
View raw message