You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/01/31 09:49:50 UTC

svn commit: r617070 - in /geronimo/server/trunk/plugins: activemq/activemq-console-jetty/src/main/plan/ activemq/activemq-console-tomcat/src/main/plan/ activemq/activemq-portlets/src/main/resources/ console/console-base-portlets/src/main/resources/ con...

Author: djencks
Date: Thu Jan 31 00:49:38 2008
New Revision: 617070

URL: http://svn.apache.org/viewvc?rev=617070&view=rev
Log:
GERONIMO-1775 2nd internationalization patch from YunFeng Ma, with some spelling corrections

Added:
    geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo.properties   (with props)
    geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo_zh.properties   (with props)
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties   (with props)
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties   (with props)
    geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/
    geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource.java   (with props)
    geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceGBean.java   (with props)
    geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java   (with props)
    geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceSupport.java   (with props)
    geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource_zh.java   (with props)
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties   (with props)
    geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties   (with props)
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo.properties   (with props)
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo_zh.properties   (with props)
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties   (with props)
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties   (with props)
Modified:
    geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
    geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml?rev=617070&r1=617069&r2=617070&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml Thu Jan 31 00:49:38 2008
@@ -29,7 +29,14 @@
             </role>
         </role-mappings>
     </security>
-
+    
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean>
+    
     <gbean name="JMSServerManager" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Server/JMS Server</attribute>
         <attribute name="portletContext">/activemq</attribute>

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml?rev=617070&r1=617069&r2=617070&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml Thu Jan 31 00:49:38 2008
@@ -31,6 +31,13 @@
     </security>
     <cross-context/>
     
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean>
+    
     <gbean name="JMSServerManager" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Server/JMS Server</attribute>
         <attribute name="portletContext">/activemq</attribute>

Added: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo.properties?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo.properties (added)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo.properties Thu Jan 31 00:49:38 2008
@@ -0,0 +1,23 @@
+#=====================================================================
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#=====================================================================
+JMS\ Network\ Listeners = JMS Network Listeners
+
+JMS\ Resources = JMS Resources
+
+JMS\ Server = JMS Server
+
+JMS\ Server\ Manager = JMS Server Manager

Propchange: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo_zh.properties?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo_zh.properties (added)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo_zh.properties Thu Jan 31 00:49:38 2008
@@ -0,0 +1,23 @@
+#=====================================================================
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#=====================================================================
+JMS\ Network\ Listeners = JMS\u7F51\u7EDC\u76D1\u542C\u5668
+
+JMS\ Resources = JMS\u8D44\u6E90
+
+JMS\ Server = JMS\u670D\u52A1\u5668
+
+JMS\ Server\ Manager = JMS\u670D\u52A1\u5668\u7BA1\u7406

Propchange: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties (added)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties Thu Jan 31 00:49:38 2008
@@ -0,0 +1,108 @@
+#=====================================================================
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#=====================================================================
+
+Apache\ HTTP = Apache HTTP
+
+Apache\ mod_jk\ Configuration = Apache mod_jk Configuration
+
+App\ Clients = App Clients
+
+Application\ EARs = Application EARs
+
+Applications = Applications
+
+Certificate\ Authority = Certificate Authority
+
+Certification\ Authority = Certification Authority
+
+Console\ Navigation = Console Navigation
+
+Console\ Realm\ Groups = Console Realm Groups
+
+Console\ Realm\ Users = Console Realm Users
+
+EJB\ JARs = EJB JARs
+
+Information = Information
+
+Installed\ Application\ Clients = Installed Application Clients
+
+Installed\ Application\ EARs = Installed Application EARs
+
+Installed\ Applications = Installed Applications
+
+Installed\ EJB\ JARs = Installed EJB JARs
+
+Installed\ J2EE\ Connectors = Installed J2EE Connectors
+
+Installed\ Security\ Realms = Installed Security Realms
+
+Installed\ System\ Modules = Installed System Modules
+
+Installed\ Web\ Applications = Installed Web Applications
+
+J2EE\ Connectors = J2EE Connectors
+
+Java\ System\ Info = Java System Info
+
+Keystore\ Configuration = Keystore Configuration
+
+Keystores = Keystores
+
+Log\ Manager = Log Manager
+
+Network\ Listeners = Network Listeners
+
+Repository = Repository
+
+Repository\ Viewer = Repository Viewer
+
+Security = Security
+
+Server = Server
+
+Server\ Info = Server Info
+
+Server\ Log\ Viewer = Server Log Viewer
+
+Server\ Logs = Server Logs
+
+Server\ Manager = Server Manager
+
+Services = Services
+
+Shutdown = Shutdown
+
+System\ Modules = System Modules
+
+System\ Property\ values\ for\ the\ Server\ JVM = System Property values for the Server JVM
+
+Thread\ Pool\ Configuration = Thread Pool Configuration
+
+Thread\ Pools = Thread Pools
+
+Users\ and\ Groups = Users and Groups
+
+Web\ Access\ Log\ Viewer = Web Access Log Viewer
+
+Web\ App\ WARs = Web App WARs
+
+Web\ Server = Web Server
+
+Web\ Server\ Manager = Web Server Manager
+
+Welcome = Welcome

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties (added)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties Thu Jan 31 00:49:38 2008
@@ -0,0 +1,108 @@
+#=====================================================================
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#=====================================================================
+
+Apache\ HTTP = Apache HTTP
+
+Apache\ mod_jk\ Configuration = Apache mod_jk \u914D\u7F6E
+
+App\ Clients = \u5BA2\u6237\u7AEF\u5E94\u7528\u7A0B\u5E8F
+
+Application\ EARs = EAR\u5E94\u7528\u7A0B\u5E8F
+
+Applications = \u5E94\u7528
+
+Certificate\ Authority = \u8BC1\u4E66\u673A\u6784
+
+Certification\ Authority = \u8BC1\u4E66\u673A\u6784
+
+Console\ Navigation = \u7BA1\u7406\u63A7\u5236\u53F0\u5BFC\u822A\u680F
+
+Console\ Realm\ Groups = \u63A7\u5236\u53F0\u7528\u6237\u7EC4
+
+Console\ Realm\ Users = \u63A7\u5236\u53F0\u7528\u6237
+
+EJB\ JARs = EJB\u5E94\u7528
+
+Information = \u4FE1\u606F
+
+Installed\ Application\ Clients = \u5B89\u88C5\u7684\u5BA2\u6237\u7AEF\u5E94\u7528\u7A0B\u5E8F
+
+Installed\ Application\ EARs = \u5B89\u88C5\u7684EAR\u5E94\u7528\u7A0B\u5E8F
+
+Installed\ Applications = \u5B89\u88C5\u7684\u5E94\u7528\u7A0B\u5E8F
+
+Installed\ EJB\ JARs = \u5B89\u88C5\u7684EJB\u5E94\u7528
+
+Installed\ J2EE\ Connectors = \u5B89\u88C5\u7684J2EE\u8FDE\u63A5\u5668\u5E94\u7528
+
+Installed\ Security\ Realms = \u5B89\u88C5\u7684\u5B89\u5168\u57DF
+
+Installed\ System\ Modules = \u5B89\u88C5\u7684\u7CFB\u7EDF\u6A21\u5757
+
+Installed\ Web\ Applications = \u5B89\u88C5\u7684Web\u6A21\u5757
+
+J2EE\ Connectors = J2EE\u8FDE\u63A5\u5668
+
+Java\ System\ Info = Java\u7CFB\u7EDF\u4FE1\u606F
+
+Keystore\ Configuration = \u5BC6\u94A5\u5E93\u914D\u7F6E
+
+Keystores = \u5BC6\u94A5\u5E93
+
+Log\ Manager = \u65E5\u5FD7\u7BA1\u7406
+
+Network\ Listeners = \u7F51\u7EDC\u76D1\u542C\u5668
+
+Repository = JAR\u4ED3\u5E93
+
+Repository\ Viewer = \u67E5\u770BJAR\u4ED3\u5E93
+
+Security = \u5B89\u5168
+
+Server = \u670D\u52A1\u5668
+
+Server\ Info = \u670D\u52A1\u5668\u4FE1\u606F
+
+Server\ Log\ Viewer = \u67E5\u770B\u670D\u52A1\u5668\u65E5\u5FD7
+
+Server\ Logs = \u670D\u52A1\u5668\u65E5\u5FD7
+
+Server\ Manager = \u670D\u52A1\u5668\u7BA1\u7406
+
+Services = \u670D\u52A1
+
+Shutdown = \u5173\u95ED
+
+System\ Modules = \u7CFB\u7EDF\u6A21\u5757
+
+System\ Property\ values\ for\ the\ Server\ JVM = \u67E5\u770BJVM\u7684\u7CFB\u7EDF\u5C5E\u6027
+
+Thread\ Pool\ Configuration = \u7EBF\u7A0B\u6C60\u914D\u7F6E
+
+Thread\ Pools = \u7EBF\u7A0B\u6C60
+
+Users\ and\ Groups = \u7528\u6237\u548C\u7EC4
+
+Web\ Access\ Log\ Viewer = \u67E5\u770BWeb\u8BBF\u95EE\u65E5\u5FD7
+
+Web\ App\ WARs = Web\u5E94\u7528\u7A0B\u5E8F
+
+Web\ Server = Web\u670D\u52A1\u5668
+
+Web\ Server\ Manager = Web\u670D\u52A1\u5668\u7BA1\u7406
+
+Welcome = \u6B22\u8FCE

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource.java?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource.java (added)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource.java Thu Jan 31 00:49:38 2008
@@ -0,0 +1,29 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.console.i18n;
+
+
+/**
+ * Default resource. 
+ * Nothing to do with this class, all functions are implemented in 
+ * ConsoleResourceSupport.
+ * See Java Doc of class java.util.ResourceBundle
+ */
+public class ConsoleResource extends ConsoleResourceSupport {
+
+}

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceGBean.java?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceGBean.java (added)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceGBean.java Thu Jan 31 00:49:38 2008
@@ -0,0 +1,83 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.console.i18n;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
+
+/**
+ * This GBean provides a way for console extension to register its classloader to
+ * ConsoleResourceRegistry. ConsoleResourceRegistry will use the classloaders to
+ * load the resource bundle.
+ */
+public class ConsoleResourceGBean implements GBeanLifecycle {
+    private static final Log log = LogFactory.getLog(ConsoleResourceGBean.class);
+    public static final GBeanInfo GBEAN_INFO;
+    private ClassLoader classloader;
+    private ConsoleResourceRegistry consoleResourceRegistry;
+
+    public ConsoleResourceGBean(ClassLoader classloader, ConsoleResourceRegistry consoleResourceRegistry) {
+        this.classloader = classloader;
+        this.consoleResourceRegistry = consoleResourceRegistry;
+    }
+
+    /*
+    * Called when the GBean is started
+    * @see org.apache.geronimo.gbean.GBeanLifecycle#doStart()
+    */
+    public synchronized void doStart() throws Exception {
+        consoleResourceRegistry.registerConsoleResource(classloader);
+    }
+
+    /*
+     * Called when the GBean is stopped
+     * @see org.apache.geronimo.gbean.GBeanLifecycle#doStop()
+     */
+    public synchronized void doStop() throws Exception {
+        consoleResourceRegistry.removeConsoleResource(classloader);
+    }
+
+    /*
+    * Called when the GBean fails
+    * @see org.apache.geronimo.gbean.GBeanLifecycle#doFail()
+    */
+    public synchronized void doFail() {
+        log.warn("AdminConsoleExtensionGBean for failed.");
+    }
+
+    /*
+    * Standard GBean information
+    */
+    static {
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("ConsoleResourceGBean", ConsoleResourceGBean.class);
+
+        infoFactory.addAttribute("classLoader", ClassLoader.class, false);
+        infoFactory.addReference("ConsoleResourceRegistry", ConsoleResourceRegistry.class, null);
+        infoFactory.setConstructor(new String[]{
+                "classLoader",
+                "ConsoleResourceRegistry"});
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java (added)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java Thu Jan 31 00:49:38 2008
@@ -0,0 +1,92 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.console.i18n;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+
+/**
+ * Each console extension will register its classloader to this GBean, then
+ * console-portal-driver can load the resource bundle for the above classloader.
+ */
+public class ConsoleResourceRegistry {
+
+    private List<ClassLoader> classloaders = new ArrayList<ClassLoader>();
+
+    /**
+     * Register the classloader of the console extension
+     *
+     * @param classloader console plugin classloader to register
+     */
+    public void registerConsoleResource(ClassLoader classloader) {
+        classloaders.add(classloader);
+    }
+
+    /**
+     * Remove the classloader of the console extension
+     * @param classloader console plugin classloader to unregister
+     */
+    public void removeConsoleResource(ClassLoader classloader) {
+        classloaders.remove(classloader);
+    }
+
+    /**
+     * Iterate the classloaders of the console extensions to find the value
+     * related to the key.
+     * @param basename name of the bundle
+     * @param locale locale desired
+     * @param key key for desired string
+     */
+    public String handleGetObject(String basename, Locale locale, String key) {
+        for (ClassLoader classloader : classloaders) {
+            ResourceBundle rb = ResourceBundle.getBundle(basename, locale, classloader);
+            try {
+                if (rb != null) {
+                    String value = rb.getString(key);
+                    if (value != null) {
+                        return value;
+                    }
+                }
+            } catch (MissingResourceException e) {
+                //nothing to do
+            }
+        }
+
+        return null;
+    }
+
+    /*
+    * Standard GBean information
+    */
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("ConsoleResourceRegistry", ConsoleResourceRegistry.class);
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceRegistry.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceSupport.java?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceSupport.java (added)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceSupport.java Thu Jan 31 00:49:38 2008
@@ -0,0 +1,52 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.console.i18n;
+
+import java.util.Enumeration;
+import java.util.ResourceBundle;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.console.util.PortletManager;
+
+/**
+ * This class provide the common functions for its subclasses.
+ */
+public class ConsoleResourceSupport extends ResourceBundle {
+    private static final Log log = LogFactory.getLog(ConsoleResourceSupport.class);
+    private static final String BASENAME = "portletinfo";
+
+    @Override
+    public Enumeration<String> getKeys() {
+        //TODO should we return the keys?
+        return null;
+    }
+
+    @Override
+    protected Object handleGetObject(String key) {
+        try {
+            ConsoleResourceRegistry resourceRegistry = (ConsoleResourceRegistry) PortletManager.getKernel().getGBean(ConsoleResourceRegistry.class);
+            String value = resourceRegistry.handleGetObject(BASENAME, getLocale(), key);
+            return value == null ? key : value;
+        } catch (Exception e) {
+            log.error("Cannot get the console resource registery service", e);
+        }
+        return null;
+    }
+
+}

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceSupport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceSupport.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResourceSupport.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource_zh.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource_zh.java?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource_zh.java (added)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource_zh.java Thu Jan 31 00:49:38 2008
@@ -0,0 +1,28 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.console.i18n;
+
+/**
+ * Resource for Chinese.
+ * Nothing to do with this class, all functions are implemented in 
+ * ConsoleResourceSupport.
+ * See Java Doc of class java.util.ResourceBundle
+ */
+public class ConsoleResource_zh extends ConsoleResourceSupport {
+
+}

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource_zh.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource_zh.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/i18n/ConsoleResource_zh.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml?rev=617070&r1=617069&r2=617070&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml Thu Jan 31 00:49:38 2008
@@ -81,6 +81,13 @@
                 <reference name="LoginModule">
                     <name>properties-login</name>
                 </reference>
+            </gbean> 
+             
+            <!-- i18n support -->
+            <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <reference name="ConsoleResourceRegistry">
+                    <name>ConsoleResourceRegistry</name>
+                </reference>
             </gbean>
 
            <gbean name="Welcome" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
@@ -241,5 +248,7 @@
         </role-mappings>
     </security>
 
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceRegistry" class="org.apache.geronimo.console.i18n.ConsoleResourceRegistry" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2"/>
 
 </application>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp?rev=617070&r1=617069&r2=617070&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp Thu Jan 31 00:49:38 2008
@@ -18,6 +18,8 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
+<fmt:setBundle basename="org.apache.geronimo.console.i18n.ConsoleResource"/>
 
 <%@ page import="java.util.ArrayList,java.util.HashMap,org.apache.pluto.driver.services.portal.PageConfig" %>
 
@@ -66,7 +68,7 @@
 
 
 <table width="200px" border="0" cellpadding="0" cellspacing="0"> 
-    <tr><td CLASS="ReallyDarkBackground"><strong>&nbsp;Console Navigation</strong></td></tr>
+    <tr><td CLASS="ReallyDarkBackground"><strong>&nbsp;<fmt:message key="Console Navigation"/></strong></td></tr>
     <tr><td><div class="Selection">
         <table width="100%" border="0" cellpadding="0" cellspacing="0">
             <tr>
@@ -79,9 +81,10 @@
     </div></td></tr>
     
     <%
+    String pageName;
     if(welcomePageConfig!=null){
         pageContext.setAttribute("page",welcomePageConfig);
-        pageContext.setAttribute("pageName",welcomePageName);
+        pageName = welcomePageName;
     %>
         <!-- Add the Welcome Link -->
         <c:choose>
@@ -95,7 +98,7 @@
                         <td class="CollapsedLeft">&nbsp;</td>
                         <td class="Indent">&nbsp;</td>
                         <td class="TopMiddle">
-                            <img border="0" src="<%=request.getContextPath()%>/images/ico_geronimo_16x16.gif"/>&nbsp;<a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><c:out value="${pageName}"/></a>
+                            <img border="0" src="<%=request.getContextPath()%>/images/ico_geronimo_16x16.gif"/>&nbsp;<a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><fmt:message key="<%=pageName%>"/></a>
                         </td>
                         <td class="CollapsedRight">&nbsp;</td> 
                     </tr> 
@@ -116,7 +119,7 @@
                     <td class="CollapsedLeft">&nbsp;</td>
                     <td class="Indent">&nbsp;</td>
                     <td class="TopMiddle">
-                        <img border="0" src="<%=request.getContextPath()%>/images/ico_folder_16x16.gif"/>&nbsp;<c:out value="${catName}"/>
+                        <img border="0" src="<%=request.getContextPath()%>/images/ico_folder_16x16.gif"/>&nbsp;<fmt:message key="<%=catName%>"/>
                     </td>
                     <td class="CollapsedRight">&nbsp;</td> 
                 </tr>
@@ -129,7 +132,7 @@
             //System.out.println("\t"+list.get(k));
             PageConfig pageConfig = list.get(k);
             pageContext.setAttribute("page",pageConfig);
-            pageContext.setAttribute("pageName",shortNames.get(pageConfig.getName()));
+            pageName = shortNames.get(pageConfig.getName());
     %>
     <c:choose>
         <c:when test="${page == currentPage}">
@@ -143,7 +146,7 @@
                         <td class="Indent">&nbsp;</td> 
                         <td class="Middle">
                             &nbsp;&nbsp;&nbsp;
-                            <img border="0" src="<%=request.getContextPath()%>/images/ico_doc_16x16.gif"/>&nbsp;<a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><c:out value="${pageName}"/></a>
+                            <img border="0" src="<%=request.getContextPath()%>/images/ico_doc_16x16.gif"/>&nbsp;<a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><fmt:message key="<%=pageName%>"/></a>
                         </td> 
                         <td class="Right">&nbsp;</td> 
                     </tr> 

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp?rev=617070&r1=617069&r2=617070&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlet-skin.jsp Thu Jan 31 00:49:38 2008
@@ -18,6 +18,8 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
+<fmt:setBundle basename="org.apache.geronimo.console.i18n.ConsoleResource"/>
 
 <!-- Use pluto portlet tag to render the portlet -->
 <pluto:portlet portletId="${portlet}">
@@ -37,7 +39,7 @@
       <a href="<pluto:url windowState="maximized"/>"><span class="max"></span></a>
       <a href="<pluto:url windowState="normal"/>"><span class="norm"></span></a>
       <!-- Portlet Title -->
-      <h2 class="title"><pluto:title/></h2>
+      <h2 class="title"><fmt:message key="<%=(String)request.getAttribute( org.apache.pluto.driver.AttributeKeys.PORTLET_TITLE )%>"/></h2>
     </div>
     <div class="body">
       <pluto:render/>

Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml?rev=617070&r1=617069&r2=617070&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml Thu Jan 31 00:49:38 2008
@@ -84,6 +84,13 @@
                     <name>properties-login</name>
                 </reference>
             </gbean>
+             
+            <!-- i18n support -->
+            <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <reference name="ConsoleResourceRegistry">
+                    <name>ConsoleResourceRegistry</name>
+                </reference>
+            </gbean>
 
             <gbean name="Welcome" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                 <attribute name="pageTitle">Welcome</attribute>
@@ -242,5 +249,8 @@
             </role>
         </role-mappings>
     </security>
+
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceRegistry" class="org.apache.geronimo.console.i18n.ConsoleResourceRegistry" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2"/>
 
 </application>

Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml?rev=617070&r1=617069&r2=617070&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml Thu Jan 31 00:49:38 2008
@@ -31,6 +31,13 @@
             </role>
         </role-mappings>
     </security>
+     
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean>
 
     <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
     <gbean name="Deployment" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">

Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml?rev=617070&r1=617069&r2=617070&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml Thu Jan 31 00:49:38 2008
@@ -32,6 +32,13 @@
         </role-mappings>
     </security>
 
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean> 
+
     <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
     <gbean name="Deployment" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Applications/Deploy New</attribute>

Added: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties (added)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties Thu Jan 31 00:49:38 2008
@@ -0,0 +1,25 @@
+#=====================================================================
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#=====================================================================
+Create\ and\ Install\ Plugins = Create and Install Plugins
+
+Deploy\ New = Deploy New
+
+Install\ New\ Applications = Install New Applications
+
+Plugins = Plugins
+
+Security\ Realms = Security Realms

Propchange: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties (added)
+++ geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties Thu Jan 31 00:49:38 2008
@@ -0,0 +1,25 @@
+#=====================================================================
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#=====================================================================
+Create\ and\ Install\ Plugins = \u521B\u5EFA/\u5B89\u88C5\u63D2\u4EF6
+
+Deploy\ New = \u90E8\u7F72\u65B0\u5E94\u7528
+
+Install\ New\ Applications = \u5B89\u88C5\u65B0\u7684\u5E94\u7528
+
+Plugins = \u63D2\u4EF6
+
+Security\ Realms = \u5B89\u5168\u57DF

Propchange: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/console/plugin-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml?rev=617070&r1=617069&r2=617070&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml Thu Jan 31 00:49:38 2008
@@ -30,6 +30,13 @@
         </role-mappings>
     </security>
     
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean>
+    
     <gbean name="JMXViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/JMX Viewer</attribute>
         <attribute name="portletContext">/debug-views</attribute>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml?rev=617070&r1=617069&r2=617070&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml Thu Jan 31 00:49:38 2008
@@ -31,6 +31,13 @@
     </security>
     <cross-context/>
     
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean>
+
     <gbean name="JMXViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/JMX Viewer</attribute>
         <attribute name="portletContext">/debug-views</attribute>

Added: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo.properties?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo.properties (added)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo.properties Thu Jan 31 00:49:38 2008
@@ -0,0 +1,27 @@
+#=====================================================================
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#=====================================================================
+ClassLoader\ Viewer = ClassLoader Viewer
+
+Debug\ Views = Debug Views
+
+Dependency\ Viewer = Dependency Viewer
+
+JMX\ Viewer = JMX Viewer
+
+JNDI\ Viewer = JNDI Viewer
+
+LDAP\ Viewer = LDAP Viewer

Propchange: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo_zh.properties?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo_zh.properties (added)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo_zh.properties Thu Jan 31 00:49:38 2008
@@ -0,0 +1,27 @@
+#=====================================================================
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#=====================================================================
+ClassLoader\ Viewer = \u7C7B\u52A0\u8F7D\u67E5\u770B\u5668
+
+Debug\ Views = \u8C03\u8BD5\u4FE1\u606F
+
+Dependency\ Viewer = \u4F9D\u8D56\u67E5\u770B\u5668
+
+JMX\ Viewer = JMX\u67E5\u770B\u5668
+
+JNDI\ Viewer = JNDI\u67E5\u770B\u5668
+
+LDAP\ Viewer = LDAP\u67E5\u770B\u5668

Propchange: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml?rev=617070&r1=617069&r2=617070&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml Thu Jan 31 00:49:38 2008
@@ -30,6 +30,13 @@
         </role-mappings>
     </security>
     
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean>
+    
     <gbean name="DBWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Services/Database Pools</attribute>
         <attribute name="portletContext">/system-database</attribute>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml?rev=617070&r1=617069&r2=617070&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml Thu Jan 31 00:49:38 2008
@@ -31,6 +31,13 @@
     </security>
     <cross-context/>
     
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean>
+    
     <gbean name="DBWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Services/Database Pools</attribute>
         <attribute name="portletContext">/system-database</attribute>

Added: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties (added)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties Thu Jan 31 00:49:38 2008
@@ -0,0 +1,29 @@
+#=====================================================================
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#=====================================================================
+DB\ Info = DB Info
+
+DB\ Manager = DB Manager
+
+DB\ Viewer = DB Viewer
+
+Database\ Pools = Database Pools
+
+Derby\ Log\ Viewer = Derby Log Viewer
+
+Embedded\ DB = Embedded DB
+
+Run\ SQL = Run SQL

Propchange: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties?rev=617070&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties (added)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties Thu Jan 31 00:49:38 2008
@@ -0,0 +1,29 @@
+#=====================================================================
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#=====================================================================
+DB\ Info = \u6570\u636E\u5E93\u4FE1\u606F
+
+DB\ Manager = \u6570\u636E\u5E93\u7BA1\u7406
+
+DB\ Viewer = \u6570\u636E\u5E93\u67E5\u770B\u5668
+
+Database\ Pools = \u6570\u636E\u5E93\u8FDE\u63A5\u6C60
+
+Derby\ Log\ Viewer = Derby\u65E5\u5FD7\u67E5\u770B\u5668
+
+Embedded\ DB = \u5185\u7F6E\u6570\u636E\u5E93
+
+Run\ SQL = \u8FD0\u884CSQL

Propchange: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/resources/portletinfo_zh.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain