You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2011/08/25 05:06:37 UTC
svn commit: r1161370 - in /geronimo/server/trunk/plugins/console:
console-base-portlets/src/main/i18n-resources/
console-base-portlets/src/main/webapp/WEB-INF/ console-jetty/src/main/plan/
console-tomcat/src/main/plan/
Author: rwonly
Date: Thu Aug 25 03:06:37 2011
New Revision: 1161370
URL: http://svn.apache.org/viewvc?rev=1161370&view=rev
Log:
GERONIMO-6059 rename "J2EE Connectors" to "Java EE Connectors" in console.
Modified:
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_ja.properties
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_zh.properties
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties?rev=1161370&r1=1161369&r2=1161370&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_en.properties Thu Aug 25 03:06:37 2011
@@ -48,7 +48,7 @@ Installed\ Applications = Installed Appl
Installed\ EJB\ JARs = Installed EJB JARs
-Installed\ J2EE\ Connectors = Installed J2EE Connectors
+Installed\ Java\ EE\ Connectors = Installed Java EE Connectors
Installed\ Security\ Realms = Installed Security Realms
@@ -56,7 +56,8 @@ Installed\ System\ Modules = Installed S
Installed\ Web\ Applications = Installed Web Applications
-J2EE\ Connectors = J2EE Connectors
+Java\ EE\ Connectors = Java EE Connectors
+
JAR\ Aliases = JAR Aliases
Java\ System\ Info = Java System Info
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_ja.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_ja.properties?rev=1161370&r1=1161369&r2=1161370&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_ja.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_ja.properties Thu Aug 25 03:06:37 2011
@@ -49,7 +49,7 @@ Installed\ Applications = ã¤ã³ã
Installed\ EJB\ JARs = ã¤ã³ã¹ãã¼ã«æ¸ã¿ã® EJB JAR
-Installed\ J2EE\ Connectors = ã¤ã³ã¹ãã¼ã«æ¸ã¿ã® J2EE ã³ãã¯ã¿ã¼
+Installed\ Java\ EE\ Connectors = ã¤ã³ã¹ãã¼ã«æ¸ã¿ã® Java EE ã³ãã¯ã¿ã¼
Installed\ Security\ Realms = ã¤ã³ã¹ãã¼ã«æ¸ã¿ã®ã»ãã¥ãªãã£ã¼ã»ã¬ã«ã
@@ -57,7 +57,7 @@ Installed\ System\ Modules = ã¤ã�
Installed\ Web\ Applications = ã¤ã³ã¹ãã¼ã«æ¸ã¿ã® WEB ã¢ããªã±ã¼ã·ã§ã³
-J2EE\ Connectors = J2EE ã³ãã¯ã¿ã¼
+Java\ EE\ Connectors = Java EE ã³ãã¯ã¿ã¼
JAR\ Aliases = JAR å¥å
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_zh.properties?rev=1161370&r1=1161369&r2=1161370&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/portletinfo_zh.properties Thu Aug 25 03:06:37 2011
@@ -49,7 +49,7 @@ Installed\ Applications = å®è£
ç
Installed\ EJB\ JARs = å®è£
çEJBåºç¨
-Installed\ J2EE\ Connectors = å®è£
çJ2EEè¿æ¥å¨åºç¨
+Installed\ Java\ EE\ Connectors = å®è£
çJava EEè¿æ¥å¨åºç¨
Installed\ Security\ Realms = å®è£
çå®å
¨å
@@ -57,7 +57,7 @@ Installed\ System\ Modules = å®è£�
Installed\ Web\ Applications = å®è£
çWeb模å
-J2EE\ Connectors = J2EEè¿æ¥å¨
+Java\ EE\ Connectors = Java EEè¿æ¥å¨
JAR\ Aliases = JAR Aliases
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=1161370&r1=1161369&r2=1161370&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml Thu Aug 25 03:06:37 2011
@@ -577,7 +577,7 @@ limitations under the License.
<supported-locale>ja</supported-locale>
<resource-bundle>portletinfo</resource-bundle>
<portlet-info>
- <title>Installed J2EE Connectors</title>
+ <title>Installed Java EE Connectors</title>
<short-title>RARModules</short-title>
<keywords></keywords>
</portlet-info>
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=1161370&r1=1161369&r2=1161370&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 Aug 25 03:06:37 2011
@@ -84,34 +84,7 @@
<attribute name="pageTitle">1-1-2/Application Server/System Information/Java System Info</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[JavaSysInfo]</attribute>
- <attribute name="icon">/images/ico_info_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
- <gbean name="Logs" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">5-2-1/Monitoring and Troubleshooting/Logs/Server Logs</attribute>
- <attribute name="portletContext">/console-base</attribute>
- <attribute name="portletList">[LogManager, LogViewer, WebAccessLogViewer]</attribute>
- <attribute name="icon">/images/ico_look_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
- <gbean name="Shutdown" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">1-6/Application Server/Shutdown</attribute>
- <attribute name="portletContext">/console-base</attribute>
- <attribute name="portletList">[ServerManager]</attribute>
- <attribute name="icon">/images/ico_shutdown_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
- <gbean name="WebServer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">1-2/Application Server/Web Server</attribute>
- <attribute name="portletContext">/console-base</attribute>
- <attribute name="portletList">[WebServerManager, ConnectorManager]</attribute>
- <attribute name="icon">/images/ico_webserv_16x16.gif</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -125,38 +98,20 @@
<name>PlutoPortalServices</name>
</reference>
</gbean>
- <gbean name="ApacheJK" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">3-6/Resources/Apache HTTP</attribute>
- <attribute name="portletContext">/console-base</attribute>
- <attribute name="portletList">[ApacheJK]</attribute>
- <attribute name="icon">/images/ico_web_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
- <gbean name="Aliases" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">3-4/Resources/JAR Aliases</attribute>
- <attribute name="portletContext">/console-base</attribute>
- <attribute name="portletList">[Artifact]</attribute>
- <attribute name="icon">/images/ico_alias_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
- <gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">3-5/Resources/Repository</attribute>
+ <gbean name="WebServer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">1-2/Application Server/Web Server</attribute>
<attribute name="portletContext">/console-base</attribute>
- <attribute name="portletList">[RepositoryViewer]</attribute>
- <attribute name="icon">/images/ico_repo_16x16.gif</attribute>
+ <attribute name="portletList">[WebServerManager, ConnectorManager]</attribute>
+ <attribute name="icon">/images/ico_webserv_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
</gbean>
- <gbean name="SystemModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">3-7/Resources/System Modules</attribute>
+ <gbean name="Shutdown" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">1-6/Application Server/Shutdown</attribute>
<attribute name="portletContext">/console-base</attribute>
- <attribute name="portletList">[SystemModules]</attribute>
- <attribute name="icon">/images/ico_car_16x16.gif</attribute>
+ <attribute name="portletList">[ServerManager]</attribute>
+ <attribute name="icon">/images/ico_shutdown_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -199,31 +154,67 @@
<name>PlutoPortalServices</name>
</reference>
</gbean>
+ <gbean name="RARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">2-2-5/Applications/User Assets/Java EE Connectors</attribute>
+ <attribute name="portletContext">/console-base</attribute>
+ <attribute name="portletList">[RARModules]</attribute>
+ <attribute name="icon">/images/ico_connect_16x16.gif</attribute>
+ <reference name="PortalContainerServices">
+ <name>PlutoPortalServices</name>
+ </reference>
+ </gbean>
<gbean name="EBAModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">2-2-6/Applications/User Assets/OSGi Applications (EBA)</attribute>
+ <attribute name="pageTitle">2-2-6/Applications/User Assets/Aries Applications (EBA)</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[EBAModules]</attribute>
- <attribute name="icon">/images/ico_ear_16x16.gif</attribute>
+ <attribute name="icon">/images/ico_ariesapp_16x16.gif</attribute>
<attribute name="mode">basic</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
- </gbean>
- <gbean name="WABModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">2-2-5/Applications/User Assets/OSGi Web Apps (WAB)</attribute>
+ </gbean>
+ <gbean name="OSGiBundles" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">3-3/Resources/OSGi Bundles</attribute>
<attribute name="portletContext">/console-base</attribute>
- <attribute name="portletList">[WABModules]</attribute>
- <attribute name="icon">/images/ico_webapp_16x16.gif</attribute>
+ <attribute name="portletList">[BundleManagerPortlet]</attribute>
+ <attribute name="icon">/images/ico_osgibundles_16x16.gif</attribute>
<attribute name="mode">basic</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
</gbean>
- <gbean name="RARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">3-3/Resources/J2EE Connectors</attribute>
+ <gbean name="Aliases" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">3-4/Resources/JAR Aliases</attribute>
<attribute name="portletContext">/console-base</attribute>
- <attribute name="portletList">[RARModules]</attribute>
- <attribute name="icon">/images/ico_connect_16x16.gif</attribute>
+ <attribute name="portletList">[Artifact]</attribute>
+ <attribute name="icon">/images/ico_alias_16x16.gif</attribute>
+ <reference name="PortalContainerServices">
+ <name>PlutoPortalServices</name>
+ </reference>
+ </gbean>
+ <gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">3-5/Resources/Repository</attribute>
+ <attribute name="portletContext">/console-base</attribute>
+ <attribute name="portletList">[RepositoryViewer]</attribute>
+ <attribute name="icon">/images/ico_repo_16x16.gif</attribute>
+ <reference name="PortalContainerServices">
+ <name>PlutoPortalServices</name>
+ </reference>
+ </gbean>
+ <gbean name="ApacheJK" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">3-6/Resources/Apache HTTP</attribute>
+ <attribute name="portletContext">/console-base</attribute>
+ <attribute name="portletList">[ApacheJK]</attribute>
+ <attribute name="icon">/images/ico_web_16x16.gif</attribute>
+ <reference name="PortalContainerServices">
+ <name>PlutoPortalServices</name>
+ </reference>
+ </gbean>
+ <gbean name="SystemModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">3-7/Resources/System Modules</attribute>
+ <attribute name="portletContext">/console-base</attribute>
+ <attribute name="portletList">[SystemModules]</attribute>
+ <attribute name="icon">/images/ico_car_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -255,6 +246,15 @@
<name>PlutoPortalServices</name>
</reference>
</gbean>
+ <gbean name="Logs" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">5-2-1/Monitoring and Troubleshooting/Logs/Server Logs</attribute>
+ <attribute name="portletContext">/console-base</attribute>
+ <attribute name="portletList">[LogManager, LogViewer, WebAccessLogViewer]</attribute>
+ <attribute name="icon">/images/ico_look_16x16.gif</attribute>
+ <reference name="PortalContainerServices">
+ <name>PlutoPortalServices</name>
+ </reference>
+ </gbean>
</web-app>
</module>
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=1161370&r1=1161369&r2=1161370&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 Aug 25 03:06:37 2011
@@ -157,7 +157,7 @@
</reference>
</gbean>
<gbean name="RARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">2-2-5/Applications/User Assets/J2EE Connectors</attribute>
+ <attribute name="pageTitle">2-2-5/Applications/User Assets/Java EE Connectors</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[RARModules]</attribute>
<attribute name="icon">/images/ico_connect_16x16.gif</attribute>