Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 78295 invoked from network); 19 Jun 2008 01:57:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Jun 2008 01:57:42 -0000 Received: (qmail 8453 invoked by uid 500); 19 Jun 2008 01:57:44 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 8412 invoked by uid 500); 19 Jun 2008 01:57:44 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 8403 invoked by uid 99); 19 Jun 2008 01:57:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jun 2008 18:57:44 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jun 2008 01:57:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5F27723889C2; Wed, 18 Jun 2008 18:57:21 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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... Date: Thu, 19 Jun 2008 01:57:20 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080619015721.5F27723889C2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ Server/JMS Server /activemq [JMSServerManager,JMSConnectorManager] + /images/ico_servcomp_16x16.gif PlutoPortalServices @@ -50,6 +51,7 @@ Services/JMS Resources /activemq [JMSWizard] + /images/ico_beanjar_16x16.gif PlutoPortalServices 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 @@ Server/JMS Server /activemq [JMSServerManager,JMSConnectorManager] + /images/ico_servcomp_16x16.gif PlutoPortalServices @@ -51,6 +52,7 @@ Services/JMS Resources /activemq [JMSWizard] + /images/ico_beanjar_16x16.gif PlutoPortalServices 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 @@ Server/Information /console-base [ServerInfo] + /images/ico_look_16x16.gif PlutoPortalServices @@ -111,6 +112,7 @@ Server/Java System Info /console-base [JavaSysInfo] + /images/ico_beanjar_16x16.gif PlutoPortalServices @@ -119,6 +121,7 @@ Server/Server Logs /console-base [LogManager, LogViewer, WebAccessLogViewer] + /images/ico_list_16x16.gif PlutoPortalServices @@ -127,6 +130,7 @@ Server/Shutdown /console-base [ServerManager] + /images/ico_x_16x16.gif PlutoPortalServices @@ -135,6 +139,7 @@ Server/Web Server /console-base [WebServerManager, ConnectorManager] + /images/ico_servcomp_16x16.gif PlutoPortalServices @@ -143,6 +148,7 @@ Server/Thread Pools /console-base [ThreadPool] + /images/ico_connect_16x16.gif PlutoPortalServices @@ -151,6 +157,7 @@ Server/Apache HTTP /console-base [ApacheJK] + /images/ico_servcomp_16x16.gif PlutoPortalServices @@ -160,6 +167,7 @@ Services/Repository /console-base [RepositoryViewer] + /images/ico_list_16x16.gif PlutoPortalServices @@ -168,6 +176,7 @@ Applications/Web App WARs /console-base [WARModules] + /images/ico_list_16x16.gif PlutoPortalServices @@ -176,6 +185,7 @@ Applications/System Modules /console-base [SystemModules] + /images/ico_list_16x16.gif PlutoPortalServices @@ -184,6 +194,7 @@ Applications/Application EARs /console-base [EARModules] + /images/ico_list_16x16.gif PlutoPortalServices @@ -192,6 +203,7 @@ Applications/EJB JARs /console-base [EJBModules] + /images/ico_beanjar_16x16.gif PlutoPortalServices @@ -200,6 +212,7 @@ Applications/J2EE Connectors /console-base [RARModules] + /images/ico_connect_16x16.gif PlutoPortalServices @@ -208,6 +221,7 @@ Applications/App Clients /console-base [ClientModules] + /images/ico_list_16x16.gif PlutoPortalServices 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"; + } %> @@ -146,7 +150,7 @@       -   +     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 @@ Server/Information /console-base [ServerInfo] + /images/ico_look_16x16.gif PlutoPortalServices @@ -113,6 +114,7 @@ Server/Java System Info /console-base [JavaSysInfo] + /images/ico_beanjar_16x16.gif PlutoPortalServices @@ -121,6 +123,7 @@ Server/Server Logs /console-base [LogManager, LogViewer, WebAccessLogViewer] + /images/ico_list_16x16.gif PlutoPortalServices @@ -129,6 +132,7 @@ Server/Shutdown /console-base [ServerManager] + /images/ico_x_16x16.gif PlutoPortalServices @@ -137,6 +141,7 @@ Server/Web Server /console-base [WebServerManager, ConnectorManager] + /images/ico_servcomp_16x16.gif PlutoPortalServices @@ -145,6 +150,7 @@ Server/Thread Pools /console-base [ThreadPool] + /images/ico_connect_16x16.gif PlutoPortalServices @@ -153,6 +159,7 @@ Server/Apache HTTP /console-base [ApacheJK] + /images/ico_servcomp_16x16.gif PlutoPortalServices @@ -162,6 +169,7 @@ Services/Repository /console-base [RepositoryViewer] + /images/ico_list_16x16.gif PlutoPortalServices @@ -170,6 +178,7 @@ Applications/Web App WARs /console-base [WARModules] + /images/ico_list_16x16.gif PlutoPortalServices @@ -178,6 +187,7 @@ Applications/System Modules /console-base [SystemModules] + /images/ico_list_16x16.gif PlutoPortalServices @@ -186,6 +196,7 @@ Applications/Application EARs /console-base [EARModules] + /images/ico_list_16x16.gif PlutoPortalServices @@ -194,6 +205,7 @@ Applications/EJB JARs /console-base [EJBModules] + /images/ico_beanjar_16x16.gif PlutoPortalServices @@ -202,6 +214,7 @@ Applications/J2EE Connectors /console-base [RARModules] + /images/ico_connect_16x16.gif PlutoPortalServices @@ -210,6 +223,7 @@ Applications/App Clients /console-base [ClientModules] + /images/ico_list_16x16.gif PlutoPortalServices 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 @@ Applications/Deploy New /plugin [Deployment] + /images/ico_list_16x16.gif PlutoPortalServices @@ -52,6 +53,7 @@ Applications/Plugins /plugin [ImportExport] + /images/ico_list_16x16.gif PlutoPortalServices @@ -61,6 +63,7 @@ Security/Security Realms /plugin [RealmWizard] + /images/ico_lock_16x16.gif PlutoPortalServices 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 @@ Applications/Deploy New /plugin [Deployment] + /images/ico_list_16x16.gif PlutoPortalServices @@ -52,6 +53,7 @@ Applications/Plugins /plugin [ImportExport] + /images/ico_list_16x16.gif PlutoPortalServices @@ -61,6 +63,7 @@ Security/Security Realms /plugin [RealmWizard] + /images/ico_lock_16x16.gif PlutoPortalServices 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 @@ Debug Views/JMX Viewer /debug-views [JMXViewer] + /images/ico_filetree_16x16.gif PlutoPortalServices @@ -50,6 +51,7 @@ Debug Views/LDAP Viewer /debug-views [LDAPViewer] + /images/ico_filetree_16x16.gif PlutoPortalServices @@ -59,6 +61,7 @@ Debug Views/ClassLoader Viewer /debug-views [ClassLoaderViewer] + /images/ico_filetree_16x16.gif PlutoPortalServices @@ -68,6 +71,7 @@ Debug Views/JNDI Viewer /debug-views [JNDIViewer] + /images/ico_filetree_16x16.gif PlutoPortalServices @@ -77,6 +81,7 @@ Debug Views/Dependency Viewer /debug-views [DependencyViewer] + /images/ico_filetree_16x16.gif PlutoPortalServices 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 @@ Debug Views/JMX Viewer /debug-views [JMXViewer] + /images/ico_filetree_16x16.gif PlutoPortalServices @@ -51,6 +52,7 @@ Debug Views/LDAP Viewer /debug-views [LDAPViewer] + /images/ico_filetree_16x16.gif PlutoPortalServices @@ -60,6 +62,7 @@ Debug Views/ClassLoader Viewer /debug-views [ClassLoaderViewer] + /images/ico_filetree_16x16.gif PlutoPortalServices @@ -69,6 +72,7 @@ Debug Views/JNDI Viewer /debug-views [JNDIViewer] + /images/ico_filetree_16x16.gif PlutoPortalServices @@ -78,6 +82,7 @@ Debug Views/Dependency Viewer /debug-views [DependencyViewer] + /images/ico_filetree_16x16.gif PlutoPortalServices 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 portletList; + private final String icon; private final PortalContainerServices portletContainerServices; /* Constructor for GBean */ public AdminConsoleExtensionGBean(String pageTitle, String portletContext, ArrayList portletList, PortalContainerServices portalContainerServices) { + this(pageTitle, portletContext, portletList, null, portalContainerServices); + } + + public AdminConsoleExtensionGBean(String pageTitle, String portletContext, ArrayList 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 @@ Services/Database Pools /system-database [DBWizard] + /images/ico_db_16x16.gif PlutoPortalServices @@ -50,6 +51,7 @@ Embedded DB/DB Info /system-database [InternalDB] + /images/ico_db_16x16.gif PlutoPortalServices @@ -59,6 +61,7 @@ Embedded DB/DB Manager /system-database [DBViewer,RunSQL] + /images/ico_servcomp_16x16.gif PlutoPortalServices 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 @@ Services/Database Pools /system-database [DBWizard] + /images/ico_db_16x16.gif PlutoPortalServices @@ -51,6 +52,7 @@ Embedded DB/DB Info /system-database [InternalDB] + /images/ico_db_16x16.gif PlutoPortalServices @@ -60,6 +62,7 @@ Embedded DB/DB Manager /system-database [DBViewer,RunSQL] + /images/ico_servcomp_16x16.gif PlutoPortalServices