You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/06/19 03:57:20 UTC
svn commit: r669359 - in /geronimo/server/branches/2.1/plugins:
activemq/activemq-console-jetty/src/main/plan/
activemq/activemq-console-tomcat/src/main/plan/
console/console-jetty/src/main/plan/
console/console-portal-driver/src/main/webapp/WEB-INF/th...
Author: gawor
Date: Wed Jun 18 18:57:20 2008
New Revision: 669359
URL: http://svn.apache.org/viewvc?rev=669359&view=rev
Log:
console icons are back (GERONIMO-3562)
Modified:
geronimo/server/branches/2.1/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/console/console-jetty/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
geronimo/server/branches/2.1/plugins/console/console-tomcat/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/console/plugin-console-jetty/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java
geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml?rev=669359&r1=669358&r2=669359&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml Wed Jun 18 18:57:20 2008
@@ -41,6 +41,7 @@
<attribute name="pageTitle">Server/JMS Server</attribute>
<attribute name="portletContext">/activemq</attribute>
<attribute name="portletList">[JMSServerManager,JMSConnectorManager]</attribute>
+ <attribute name="icon">/images/ico_servcomp_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -50,6 +51,7 @@
<attribute name="pageTitle">Services/JMS Resources</attribute>
<attribute name="portletContext">/activemq</attribute>
<attribute name="portletList">[JMSWizard]</attribute>
+ <attribute name="icon">/images/ico_beanjar_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
Modified: geronimo/server/branches/2.1/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml?rev=669359&r1=669358&r2=669359&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml Wed Jun 18 18:57:20 2008
@@ -42,6 +42,7 @@
<attribute name="pageTitle">Server/JMS Server</attribute>
<attribute name="portletContext">/activemq</attribute>
<attribute name="portletList">[JMSServerManager,JMSConnectorManager]</attribute>
+ <attribute name="icon">/images/ico_servcomp_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -51,6 +52,7 @@
<attribute name="pageTitle">Services/JMS Resources</attribute>
<attribute name="portletContext">/activemq</attribute>
<attribute name="portletList">[JMSWizard]</attribute>
+ <attribute name="icon">/images/ico_beanjar_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
Modified: geronimo/server/branches/2.1/plugins/console/console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-jetty/src/main/plan/plan.xml?rev=669359&r1=669358&r2=669359&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/console-jetty/src/main/plan/plan.xml Wed Jun 18 18:57:20 2008
@@ -103,6 +103,7 @@
<attribute name="pageTitle">Server/Information</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ServerInfo]</attribute>
+ <attribute name="icon">/images/ico_look_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -111,6 +112,7 @@
<attribute name="pageTitle">Server/Java System Info</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[JavaSysInfo]</attribute>
+ <attribute name="icon">/images/ico_beanjar_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -119,6 +121,7 @@
<attribute name="pageTitle">Server/Server Logs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[LogManager, LogViewer, WebAccessLogViewer]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -127,6 +130,7 @@
<attribute name="pageTitle">Server/Shutdown</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ServerManager]</attribute>
+ <attribute name="icon">/images/ico_x_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -135,6 +139,7 @@
<attribute name="pageTitle">Server/Web Server</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[WebServerManager, ConnectorManager]</attribute>
+ <attribute name="icon">/images/ico_servcomp_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -143,6 +148,7 @@
<attribute name="pageTitle">Server/Thread Pools</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ThreadPool]</attribute>
+ <attribute name="icon">/images/ico_connect_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -151,6 +157,7 @@
<attribute name="pageTitle">Server/Apache HTTP</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ApacheJK]</attribute>
+ <attribute name="icon">/images/ico_servcomp_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -160,6 +167,7 @@
<attribute name="pageTitle">Services/Repository</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[RepositoryViewer]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -168,6 +176,7 @@
<attribute name="pageTitle">Applications/Web App WARs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[WARModules]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -176,6 +185,7 @@
<attribute name="pageTitle">Applications/System Modules</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[SystemModules]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -184,6 +194,7 @@
<attribute name="pageTitle">Applications/Application EARs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[EARModules]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -192,6 +203,7 @@
<attribute name="pageTitle">Applications/EJB JARs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[EJBModules]</attribute>
+ <attribute name="icon">/images/ico_beanjar_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -200,6 +212,7 @@
<attribute name="pageTitle">Applications/J2EE 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>
@@ -208,6 +221,7 @@
<attribute name="pageTitle">Applications/App Clients</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ClientModules]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
Modified: geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp?rev=669359&r1=669358&r2=669359&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp Wed Jun 18 18:57:20 2008
@@ -133,6 +133,10 @@
PageConfig pageConfig = list.get(k);
pageContext.setAttribute("page",pageConfig);
pageName = shortNames.get(pageConfig.getName());
+ String icon = pageConfig.getIcon();
+ if (icon == null || icon.trim().length() == 0) {
+ icon = "/images/ico_doc_16x16.gif";
+ }
%>
<c:choose>
<c:when test="${page == currentPage}">
@@ -146,7 +150,7 @@
<td class="Indent"> </td>
<td class="Middle">
- <img border="0" src="<%=request.getContextPath()%>/images/ico_doc_16x16.gif" alt=""/> <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><fmt:message key="<%=pageName%>"/></a>
+ <img border="0" src="<%=request.getContextPath()%><%=icon%>" alt=""/> <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><fmt:message key="<%=pageName%>"/></a>
</td>
<td class="Right"> </td>
</tr>
Modified: geronimo/server/branches/2.1/plugins/console/console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-tomcat/src/main/plan/plan.xml?rev=669359&r1=669358&r2=669359&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/console-tomcat/src/main/plan/plan.xml Wed Jun 18 18:57:20 2008
@@ -105,6 +105,7 @@
<attribute name="pageTitle">Server/Information</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ServerInfo]</attribute>
+ <attribute name="icon">/images/ico_look_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -113,6 +114,7 @@
<attribute name="pageTitle">Server/Java System Info</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[JavaSysInfo]</attribute>
+ <attribute name="icon">/images/ico_beanjar_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -121,6 +123,7 @@
<attribute name="pageTitle">Server/Server Logs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[LogManager, LogViewer, WebAccessLogViewer]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -129,6 +132,7 @@
<attribute name="pageTitle">Server/Shutdown</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ServerManager]</attribute>
+ <attribute name="icon">/images/ico_x_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -137,6 +141,7 @@
<attribute name="pageTitle">Server/Web Server</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[WebServerManager, ConnectorManager]</attribute>
+ <attribute name="icon">/images/ico_servcomp_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -145,6 +150,7 @@
<attribute name="pageTitle">Server/Thread Pools</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ThreadPool]</attribute>
+ <attribute name="icon">/images/ico_connect_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -153,6 +159,7 @@
<attribute name="pageTitle">Server/Apache HTTP</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ApacheJK]</attribute>
+ <attribute name="icon">/images/ico_servcomp_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -162,6 +169,7 @@
<attribute name="pageTitle">Services/Repository</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[RepositoryViewer]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -170,6 +178,7 @@
<attribute name="pageTitle">Applications/Web App WARs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[WARModules]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -178,6 +187,7 @@
<attribute name="pageTitle">Applications/System Modules</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[SystemModules]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -186,6 +196,7 @@
<attribute name="pageTitle">Applications/Application EARs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[EARModules]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -194,6 +205,7 @@
<attribute name="pageTitle">Applications/EJB JARs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[EJBModules]</attribute>
+ <attribute name="icon">/images/ico_beanjar_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -202,6 +214,7 @@
<attribute name="pageTitle">Applications/J2EE 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>
@@ -210,6 +223,7 @@
<attribute name="pageTitle">Applications/App Clients</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ClientModules]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
Modified: geronimo/server/branches/2.1/plugins/console/plugin-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-console-jetty/src/main/plan/plan.xml?rev=669359&r1=669358&r2=669359&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-console-jetty/src/main/plan/plan.xml Wed Jun 18 18:57:20 2008
@@ -44,6 +44,7 @@
<attribute name="pageTitle">Applications/Deploy New</attribute>
<attribute name="portletContext">/plugin</attribute>
<attribute name="portletList">[Deployment]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -52,6 +53,7 @@
<attribute name="pageTitle">Applications/Plugins</attribute>
<attribute name="portletContext">/plugin</attribute>
<attribute name="portletList">[ImportExport]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -61,6 +63,7 @@
<attribute name="pageTitle">Security/Security Realms</attribute>
<attribute name="portletContext">/plugin</attribute>
<attribute name="portletList">[RealmWizard]</attribute>
+ <attribute name="icon">/images/ico_lock_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
Modified: geronimo/server/branches/2.1/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml?rev=669359&r1=669358&r2=669359&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml Wed Jun 18 18:57:20 2008
@@ -44,6 +44,7 @@
<attribute name="pageTitle">Applications/Deploy New</attribute>
<attribute name="portletContext">/plugin</attribute>
<attribute name="portletList">[Deployment]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -52,6 +53,7 @@
<attribute name="pageTitle">Applications/Plugins</attribute>
<attribute name="portletContext">/plugin</attribute>
<attribute name="portletList">[ImportExport]</attribute>
+ <attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -61,6 +63,7 @@
<attribute name="pageTitle">Security/Security Realms</attribute>
<attribute name="portletContext">/plugin</attribute>
<attribute name="portletList">[RealmWizard]</attribute>
+ <attribute name="icon">/images/ico_lock_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
Modified: geronimo/server/branches/2.1/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml?rev=669359&r1=669358&r2=669359&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml Wed Jun 18 18:57:20 2008
@@ -41,6 +41,7 @@
<attribute name="pageTitle">Debug Views/JMX Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[JMXViewer]</attribute>
+ <attribute name="icon">/images/ico_filetree_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -50,6 +51,7 @@
<attribute name="pageTitle">Debug Views/LDAP Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[LDAPViewer]</attribute>
+ <attribute name="icon">/images/ico_filetree_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -59,6 +61,7 @@
<attribute name="pageTitle">Debug Views/ClassLoader Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[ClassLoaderViewer]</attribute>
+ <attribute name="icon">/images/ico_filetree_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -68,6 +71,7 @@
<attribute name="pageTitle">Debug Views/JNDI Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[JNDIViewer]</attribute>
+ <attribute name="icon">/images/ico_filetree_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -77,6 +81,7 @@
<attribute name="pageTitle">Debug Views/Dependency Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[DependencyViewer]</attribute>
+ <attribute name="icon">/images/ico_filetree_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
Modified: geronimo/server/branches/2.1/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml?rev=669359&r1=669358&r2=669359&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml Wed Jun 18 18:57:20 2008
@@ -42,6 +42,7 @@
<attribute name="pageTitle">Debug Views/JMX Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[JMXViewer]</attribute>
+ <attribute name="icon">/images/ico_filetree_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -51,6 +52,7 @@
<attribute name="pageTitle">Debug Views/LDAP Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[LDAPViewer]</attribute>
+ <attribute name="icon">/images/ico_filetree_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -60,6 +62,7 @@
<attribute name="pageTitle">Debug Views/ClassLoader Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[ClassLoaderViewer]</attribute>
+ <attribute name="icon">/images/ico_filetree_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -69,6 +72,7 @@
<attribute name="pageTitle">Debug Views/JNDI Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[JNDIViewer]</attribute>
+ <attribute name="icon">/images/ico_filetree_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -78,6 +82,7 @@
<attribute name="pageTitle">Debug Views/Dependency Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[DependencyViewer]</attribute>
+ <attribute name="icon">/images/ico_filetree_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
Modified: geronimo/server/branches/2.1/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java?rev=669359&r1=669358&r2=669359&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java (original)
+++ geronimo/server/branches/2.1/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java Wed Jun 18 18:57:20 2008
@@ -46,14 +46,20 @@
private final String pageTitle;
private final String portletContext;
private final ArrayList<String> portletList;
+ private final String icon;
private final PortalContainerServices portletContainerServices;
/* Constructor for GBean */
public AdminConsoleExtensionGBean(String pageTitle, String portletContext, ArrayList<String> portletList, PortalContainerServices portalContainerServices) {
+ this(pageTitle, portletContext, portletList, null, portalContainerServices);
+ }
+
+ public AdminConsoleExtensionGBean(String pageTitle, String portletContext, ArrayList<String> portletList, String icon, PortalContainerServices portalContainerServices) {
super();
this.pageTitle = pageTitle;
this.portletContext = portletContext;
this.portletList = portletList;
+ this.icon = icon;
this.portletContainerServices = portalContainerServices;
}
@@ -138,6 +144,7 @@
PageConfig pageConfig = new PageConfig();
pageConfig.setName(pageTitle);
pageConfig.setUri("/WEB-INF/themes/default-theme.jsp");
+ pageConfig.setIcon(icon);
return pageConfig;
}
@@ -246,11 +253,13 @@
infoFactory.addAttribute("pageTitle", String.class, true, true);
infoFactory.addAttribute("portletContext", String.class, true, true);
infoFactory.addAttribute("portletList", ArrayList.class, true, true);
+ infoFactory.addAttribute("icon", String.class, true, true);
infoFactory.addReference("PortalContainerServices", PortalContainerServices.class, "GBean");
infoFactory.setConstructor(new String[]{
"pageTitle",
"portletContext",
"portletList",
+ "icon",
"PortalContainerServices"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml?rev=669359&r1=669358&r2=669359&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml Wed Jun 18 18:57:20 2008
@@ -41,6 +41,7 @@
<attribute name="pageTitle">Services/Database Pools</attribute>
<attribute name="portletContext">/system-database</attribute>
<attribute name="portletList">[DBWizard]</attribute>
+ <attribute name="icon">/images/ico_db_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -50,6 +51,7 @@
<attribute name="pageTitle">Embedded DB/DB Info</attribute>
<attribute name="portletContext">/system-database</attribute>
<attribute name="portletList">[InternalDB]</attribute>
+ <attribute name="icon">/images/ico_db_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -59,6 +61,7 @@
<attribute name="pageTitle">Embedded DB/DB Manager</attribute>
<attribute name="portletContext">/system-database</attribute>
<attribute name="portletList">[DBViewer,RunSQL]</attribute>
+ <attribute name="icon">/images/ico_servcomp_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
Modified: geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml?rev=669359&r1=669358&r2=669359&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml Wed Jun 18 18:57:20 2008
@@ -42,6 +42,7 @@
<attribute name="pageTitle">Services/Database Pools</attribute>
<attribute name="portletContext">/system-database</attribute>
<attribute name="portletList">[DBWizard]</attribute>
+ <attribute name="icon">/images/ico_db_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -51,6 +52,7 @@
<attribute name="pageTitle">Embedded DB/DB Info</attribute>
<attribute name="portletContext">/system-database</attribute>
<attribute name="portletList">[InternalDB]</attribute>
+ <attribute name="icon">/images/ico_db_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
@@ -60,6 +62,7 @@
<attribute name="pageTitle">Embedded DB/DB Manager</attribute>
<attribute name="portletContext">/system-database</attribute>
<attribute name="portletList">[DBViewer,RunSQL]</attribute>
+ <attribute name="icon">/images/ico_servcomp_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
</reference>
Re: svn commit: r669359 - in /geronimo/server/branches/2.1/plugins: activemq/activemq-console-jetty/src/main/plan/ activemq/activemq-console-tomcat/src/main/plan/ console/console-jetty/src/main/plan/ console/console-portal-driver/src/main/webapp/WEB-INF/th...
Posted by Kevan Miller <ke...@gmail.com>.
On Jun 18, 2008, at 9:57 PM, gawor@apache.org wrote:
> Author: gawor
> Date: Wed Jun 18 18:57:20 2008
> New Revision: 669359
>
> URL: http://svn.apache.org/viewvc?rev=669359&view=rev
> Log:
> console icons are back (GERONIMO-3562)
Cool. Great to have them back. Thanks Jarek!
--kevan