Return-Path: 
 <scm-return-31691-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 67095 invoked from network); 14 Sep 2008 08:04:08 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 14 Sep 2008 08:04:08 -0000
Received: (qmail 17359 invoked by uid 500); 14 Sep 2008 08:04:05 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 17313 invoked by uid 500); 14 Sep 2008 08:04:05 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 17304 invoked by uid 99); 14 Sep 2008 08:04:05 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Sep 2008 01:04:05 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Sep 2008 08:03:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 810D323889B7; Sun, 14 Sep 2008 01:03:47 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r695136 -
 /geronimo/gshell/trunk/gshell-support/gshell-i18n/src/main/java/org/apache/geronimo/gshell/i18n/ResourceBundleMessageSource.java
Date: Sun, 14 Sep 2008 08:03:47 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080914080347.810D323889B7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jdillon
Date: Sun Sep 14 01:03:46 2008
New Revision: 695136

URL: http://svn.apache.org/viewvc?rev=695136&view=rev
Log:
Fixed to load resources from the correct classloader

Modified:
    geronimo/gshell/trunk/gshell-support/gshell-i18n/src/main/java/org/apache/geronimo/gshell/i18n/ResourceBundleMessageSource.java

Modified: geronimo/gshell/trunk/gshell-support/gshell-i18n/src/main/java/org/apache/geronimo/gshell/i18n/ResourceBundleMessageSource.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-i18n/src/main/java/org/apache/geronimo/gshell/i18n/ResourceBundleMessageSource.java?rev=695136&r1=695135&r2=695136&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-i18n/src/main/java/org/apache/geronimo/gshell/i18n/ResourceBundleMessageSource.java (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-i18n/src/main/java/org/apache/geronimo/gshell/i18n/ResourceBundleMessageSource.java Sun Sep 14 01:03:46 2008
@@ -20,74 +20,43 @@
 package org.apache.geronimo.gshell.i18n;
 
 import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import org.codehaus.plexus.util.StringUtils;
-
 /**
- * Message source backed up by one or more {@link ResourceBundle} instances for simple i18n support.
+ * Message source backed up by one or more {@link ResourceBundle} instances.
  *
  * @version $Rev$ $Date$
  */
 public class ResourceBundleMessageSource
     implements MessageSource
 {
-    private final String[] bundleNames;
-
-    private ResourceBundle[] cachedBundles;
+    private final List<ResourceBundle> bundles = new ArrayList<ResourceBundle>();
 
-    public ResourceBundleMessageSource(final String[] names) {
-        assert names != null;
-        assert names.length != 0;
-
-        this.bundleNames = names;
-    }
+    private final Locale locale;
 
-    public ResourceBundleMessageSource(final String name) {
-        this(new String[] { name });
-    }
-
-    private static String[] classNames(final Class[] types) {
+    public ResourceBundleMessageSource(final Class[] types) {
         assert types != null;
-        assert types.length != 0;
 
-        String[] names = new String[types.length];
+        locale = Locale.getDefault();
 
-        for (int i=0; i<types.length; i++) {
-            assert types[i] != null;
-
-            names[i] = types[i].getName();
+        for (Class type : types) {
+            loadBundle(type);
         }
-
-        return names;
-    }
-
-    public ResourceBundleMessageSource(final Class[] types) {
-        this(classNames(types));
     }
 
     public ResourceBundleMessageSource(final Class type) {
-        this(new String[] { type.getName() });
+        this(new Class[] { type });
     }
 
-    private ResourceBundle[] createBundles() {
-        ResourceBundle[] bundles = new ResourceBundle[bundleNames.length];
+    private void loadBundle(final Class type) {
+        assert type != null;
 
-        for (int i=0; i<bundleNames.length; i++) {
-            assert bundleNames[i] != null;
-            
-            bundles[i] = ResourceBundle.getBundle(bundleNames[i]);
-        }
-
-        return bundles;
-    }
-
-    private ResourceBundle[] getBundles() {
-        if (cachedBundles == null) {
-            cachedBundles = createBundles();
-        }
-        return cachedBundles;
+        ResourceBundle bundle = ResourceBundle.getBundle(type.getName(), locale, type.getClassLoader());
+        bundles.add(bundle);
     }
 
     /**
@@ -96,7 +65,7 @@
     public String getMessage(final String code) {
         assert code != null;
 
-        for (ResourceBundle bundle : getBundles()) {
+        for (ResourceBundle bundle : bundles) {
             try {
                 return bundle.getString(code);
             }
@@ -119,26 +88,19 @@
         return MessageFormat.format(pattern, args);
     }
 
-    /**
-     * @see #getMessage(String)
-     */
-    public Object getProperty(final String name) {
-        return getMessage(name);
-    }
-
     //
     // ResourceNotFoundException
     //
 
-    private static String notFoundMessage(final String code, final String[] bundleNames) {
-        return "Resource not found for code: " + code + " in bundles: " + StringUtils.join(bundleNames, ", ");
-    }
-
     public class ResourceNotFoundException
         extends RuntimeException
     {
         public ResourceNotFoundException(final String code) {
-            super(notFoundMessage(code, bundleNames));
+            //
+            // TODO: Include the resource bundle names
+            //
+            
+            super("Resource not found for code: " + code);
         }
     }
 }