2006-05-21 Raif S. Naffah <raif@swiftdsl.com.au>

	* doc/tools.texinfo: Replaced references to MessageBundle.properties
	to messages.properties.
	* resource/gnu/classpath/tools/jarsigner/MessageBundle.properties:
	Renamed to messages.properties.
	* resource/gnu/classpath/tools/keytool/MessageBundle.properties:
	Likewise.
	* resource/gnu/classpath/tools/jarsigner/messages.properties:
	Renamed from MessageBundle.properties.
	Added copyright notice.
	* resource/gnu/classpath/tools/keytool/messages.properties:
	Likewise.
	* tools/gnu/classpath/tools/jarsigner/Messages.java
	(BUNDLE_NAME): Use messages instead of MessageBundle properties file.
	(getFormattedString): Fixed a spelling mistake.
	* tools/gnu/classpath/tools/keytool/Messages.java: Likewise.

6 files changed, 109 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 967f15d8f..37ae4a3fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2006-05-21  Raif S. Naffah  <raif@swiftdsl.com.au>
+
+	* doc/tools.texinfo: Replaced references to MessageBundle.properties
+	to messages.properties.
+	* resource/gnu/classpath/tools/jarsigner/MessageBundle.properties:
+	Renamed to messages.properties.
+	* resource/gnu/classpath/tools/keytool/MessageBundle.properties:
+	Likewise.
+	* resource/gnu/classpath/tools/jarsigner/messages.properties:
+	Renamed from MessageBundle.properties.
+	Added copyright notice.
+	* resource/gnu/classpath/tools/keytool/messages.properties:
+	Likewise.
+	* tools/gnu/classpath/tools/jarsigner/Messages.java
+	(BUNDLE_NAME): Use messages instead of MessageBundle properties file.
+	(getFormattedString): Fixed a spelling mistake.
+	* tools/gnu/classpath/tools/keytool/Messages.java: Likewise.
+
 2006-05-20  Sven de Marothy  <sven@physto.se>
 
 	* gnu/java/awt/font/opentype/NameDecoder.java
diff --git a/doc/tools.texinfo b/doc/tools.texinfo
index 53eadfaae..ad61f6f74 100644
--- a/doc/tools.texinfo
+++ b/doc/tools.texinfo
@@ -721,7 +721,7 @@ Command.23=A correct key password MUST be provided
 
 When the tool needs to signal a mandatory but missing key password, it would reference the property named @code{Command.23} and the message "@kbd{A correct key password MUST be provided}" will be used instead. This indirect referencing of "resources" permits replacing, as late as possible, the English strings with strings in other languages, provided of course @i{Resource Bundles} in those languages are provided.
 
-For the GNU Classpath Tools described in this Guide, the @i{Resource Bundles} are files named @file{MessageBundle[_ll[_CC[_VV]]].properties} where:
+For the GNU Classpath Tools described in this Guide, the @i{Resource Bundles} are files named @file{messages[_ll[_CC[_VV]]].properties} where:
 
 @ftable @var
 @item ll
@@ -746,16 +746,16 @@ The location of the @i{Resource Bundles} for the GNU Classpath Tools is specific
 The collection of @i{Resource Bundles} in a location act as an inverted tree with a parent-child relationship. For example suppose in the @file{gnu/classpath/tools/keytool} there are 3 message bundles named:
 
 @enumerate
-@item @code{MessageBundle.properties}
-@item @code{MessageBundle_fr.properties}
-@item @code{MessageBundle_fr_FR.properties}
+@item @code{messages.properties}
+@item @code{messages_fr.properties}
+@item @code{messages_fr_FR.properties}
 @end enumerate
 
-In the above example, bundle #1 will act as the parent of bundle #2, which in turn will act as the parent for bundle #3. This ordering is used by the Java runtime to choose which file to load based on the set Locale. For example if the Locale is @code{fr_CH}, @code{MessageBundle_fr.properties} will be used because (a) @code{MessageBundle_fr_CH.properties} does not exist, but (b) @code{MessageBundle_fr.properties} is the parent for the required bundle, and it exists. As another example, suppose the Locale was set to @code{en_AU}; then the tool will end up using @code{MessageBundle.properties} because (a) @code{MessageBundle_en_AU.properties} does not exist, (b) @code{MessageBundle_en.properties} which is the parent for the required bundle does not exist, but (c) @code{MessageBundle.properties} exists and is the root of the hierarchy.
+In the above example, bundle #1 will act as the parent of bundle #2, which in turn will act as the parent for bundle #3. This ordering is used by the Java runtime to choose which file to load based on the set Locale. For example if the Locale is @code{fr_CH}, @code{messages_fr.properties} will be used because (a) @code{messages_fr_CH.properties} does not exist, but (b) @code{messages_fr.properties} is the parent for the required bundle, and it exists. As another example, suppose the Locale was set to @code{en_AU}; then the tool will end up using @code{messages.properties} because (a) @code{messages_en_AU.properties} does not exist, (b) @code{messages_en.properties} which is the parent for the required bundle does not exist, but (c) @code{messages.properties} exists and is the root of the hierarchy.
 
-You can see from the examples above that @file{MessageBundle.properties} is the safety net that the Java runtime falls back to when failing to find a specific bunlde and its parent(s). This file is always provided with the Tool. In time, more localized versions will be included to cater for other languages.
+You can see from the examples above that @file{messages.properties} is the safety net that the Java runtime falls back to when failing to find a specific bunlde and its parent(s). This file is always provided with the Tool. In time, more localized versions will be included to cater for other languages.
 
-In the meantime, if you are willing to contribute localized versions of these resources, grab the @file{MessageBundle.properties} for a specific tool; translate it; save it with the appropriate language and region suffix and mail it to @code{classpath@@gnu.org}.
+In the meantime, if you are willing to contribute localized versions of these resources, grab the @file{messages.properties} for a specific tool; translate it; save it with the appropriate language and region suffix and mail it to @code{classpath@@gnu.org}.
 
 @comment ----------------------------------------------------------------------
 
@@ -763,7 +763,7 @@ In the meantime, if you are willing to contribute localized versions of these re
 @comment node-name, next, previous, up
 @section Message Formats
 
-If you open any of the @file{MessageBundle.properties} described in the previous section, you may see properties that look like so:
+If you open any of the @file{messages.properties} described in the previous section, you may see properties that look like so:
 
 @example
 Command.67=Issuer: @{0@}
@@ -774,7 +774,7 @@ Command.70=\ \ \ \ \ until: @{0,date,full@} - @{0,time,full@}
 
 These are @i{Message Formats} used by the tools to customize a text string that will then be used either as a prompt for User input or as output.
 
-If you are translating a @file{MessageBundle.properties} be careful not to alter text between curly braces.
+If you are translating a @file{messages.properties} be careful not to alter text between curly braces.
 
 @comment ----------------------------------------------------------------------
 
diff --git a/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties b/resource/gnu/classpath/tools/jarsigner/messages.properties
index 565041f21..4383256de 100644
--- a/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties
+++ b/resource/gnu/classpath/tools/jarsigner/messages.properties
@@ -1,4 +1,42 @@
-# default locale messages for gnu.classpath.tools.jarsigner package
+# messages.properties -- English language messages and message formats
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is part of GNU Classpath.
+#
+# GNU Classpath is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Classpath is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Classpath; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
+#
+# Linking this library statically or dynamically with other modules is
+# making a combined work based on this library.  Thus, the terms and
+# conditions of the GNU General Public License cover the whole
+# combination.
+#
+# As a special exception, the copyright holders of this library give you
+# permission to link this library with independent modules to produce an
+# executable, regardless of the license terms of these independent
+# modules, and to copy and distribute the resulting executable under
+# terms of your choice, provided that you also meet, for each linked
+# independent module, the terms and conditions of the license of that
+# module.  An independent module is a module which is not derived from
+# or based on this library.  If you modify this library, you may extend
+# this exception to your version of the library, but you are not
+# obligated to do so.  If you do not wish to do so, delete this
+# exception statement from your version.
+#
+# for gnu.classpath.tools.jarsigner package
+#
 
 Main.7=jarsigner: 
 Main.9=jarsigner error: 
diff --git a/resource/gnu/classpath/tools/keytool/MessageBundle.properties b/resource/gnu/classpath/tools/keytool/messages.properties
index 2362d6a84..475e80b84 100644
--- a/resource/gnu/classpath/tools/keytool/MessageBundle.properties
+++ b/resource/gnu/classpath/tools/keytool/messages.properties
@@ -1,4 +1,42 @@
-# default locale messages for gnu.classpath.tools.keytool package
+# messages.properties -- English language messages and message formats
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is part of GNU Classpath.
+#
+# GNU Classpath is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Classpath is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Classpath; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
+#
+# Linking this library statically or dynamically with other modules is
+# making a combined work based on this library.  Thus, the terms and
+# conditions of the GNU General Public License cover the whole
+# combination.
+#
+# As a special exception, the copyright holders of this library give you
+# permission to link this library with independent modules to produce an
+# executable, regardless of the license terms of these independent
+# modules, and to copy and distribute the resulting executable under
+# terms of your choice, provided that you also meet, for each linked
+# independent module, the terms and conditions of the license of that
+# module.  An independent module is a module which is not derived from
+# or based on this library.  If you modify this library, you may extend
+# this exception to your version of the library, but you are not
+# obligated to do so.  If you do not wish to do so, delete this
+# exception statement from your version.
+#
+# for gnu.classpath.tools.keytool package
+#
 
 Main.6=keytool: {0}
 Main.8=keytool error: {0}
diff --git a/tools/gnu/classpath/tools/jarsigner/Messages.java b/tools/gnu/classpath/tools/jarsigner/Messages.java
index 284639115..35f461669 100644
--- a/tools/gnu/classpath/tools/jarsigner/Messages.java
+++ b/tools/gnu/classpath/tools/jarsigner/Messages.java
@@ -54,7 +54,7 @@ import java.util.logging.Logger;
 class Messages
 {
   private static final Logger log = Logger.getLogger(Messages.class.getName());
-  private static final String BUNDLE_NAME = "gnu.classpath.tools.jarsigner.MessageBundle"; //$NON-NLS-1$
+  private static final String BUNDLE_NAME = "gnu.classpath.tools.jarsigner.messages";
   private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
   private static final Map CACHED_FORMATS = new HashMap(5);
 
@@ -88,7 +88,7 @@ class Messages
           CACHED_FORMATS.put(key, mf);
       }
 
-    // if the argument is not an array, then build one consisiting of the
+    // if the argument is not an array, then build one consisting of the
     // sole argument before passing it to the format() method
     try
       {
diff --git a/tools/gnu/classpath/tools/keytool/Messages.java b/tools/gnu/classpath/tools/keytool/Messages.java
index e3308e021..7ecaa1c37 100644
--- a/tools/gnu/classpath/tools/keytool/Messages.java
+++ b/tools/gnu/classpath/tools/keytool/Messages.java
@@ -54,7 +54,7 @@ import java.util.logging.Logger;
 class Messages
 {
   private static final Logger log = Logger.getLogger(Messages.class.getName());
-  private static final String BUNDLE_NAME = "gnu.classpath.tools.keytool.MessageBundle"; //$NON-NLS-1$
+  private static final String BUNDLE_NAME = "gnu.classpath.tools.keytool.messages";
   private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
   private static final Map CACHED_FORMATS = new HashMap(5);
 
@@ -88,7 +88,7 @@ class Messages
           CACHED_FORMATS.put(key, mf);
       }
 
-    // if the argument is not an array, then build one consisiting of the
+    // if the argument is not an array, then build one consisting of the
     // sole argument before passing it to the format() method
     try
       {