geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r830411 - in /geronimo/server/trunk: framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ plugins/console/console-base-portlets/src/main/i18n-resources/ plugins/console/console-base-portlets/src/main/java/org...
Date Wed, 28 Oct 2009 00:23:58 GMT
Author: djencks
Date: Wed Oct 28 00:23:58 2009
New Revision: 830411

URL: http://svn.apache.org/viewvc?rev=830411&view=rev
Log:
GERONIMO-4658 Editor for artifact aliases.  original patch from Victor Fang, with modifications. Merge from 2.2 with little attempt to fix problems

Added:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/artifact/
      - copied from r830386, geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/artifact/
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/artifact/ArtifactViewPortlet.java
      - copied unchanged from r830386, geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/artifact/ArtifactViewPortlet.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/artifact/
      - copied from r830386, geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/artifact/
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/artifact/edit.jsp
      - copied unchanged from r830386, geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/artifact/edit.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/artifact/list.jsp
      - copied unchanged from r830386, geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/artifact/list.jsp
Modified:
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java?rev=830411&r1=830410&r2=830411&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java Wed Oct 28 00:23:58 2009
@@ -149,5 +149,17 @@
         getExplicitResolution().putAll(explicitResolutions);
         saveExplicitResolution(getExplicitResolution(), artifactAliasesFile, serverInfo);
     }
-
+    
+    public synchronized void removeAliases(Properties properties) throws IOException {
+        Map<Artifact, Artifact> explicitResolutions = propertiesToArtifactMap(properties);
+        for (Map.Entry<Artifact, Artifact> entry : explicitResolutions.entrySet()) {
+            getExplicitResolution().remove(entry.getKey());
+        }
+        saveExplicitResolution(getExplicitResolution(), artifactAliasesFile, serverInfo);
+    }
+    
+    public synchronized Properties getProperties() {
+        return artifactMapToProperties(getExplicitResolution());
+    }
+    
 }

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties?rev=830411&r1=830410&r2=830411&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_en.properties Wed Oct 28 00:23:58 2009
@@ -1,4 +1,4 @@
-#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
+#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
 #=====================================================================
 #  Licensed to the Apache Software Foundation (ASF) under one or more
 #  contributor license agreements.  See the NOTICE file distributed with
@@ -787,3 +787,13 @@
 welcome.welcomeNormal.userMaillist   = Users Mailing List Archive
 welcome.welcomeNormal.webServerPorts = Web Server Ports
 welcome.welcomeNormal.wiki           = Wiki
+
+artifact.normal.title                = Name & Artifact-Aliases
+artifact.normal.name		     = Name
+artifact.normal.aliases 	     = Artifact-Aliases
+artifact.normal.actions		     = Actions
+artifact.actions.cancel              = Cancel
+artifact.actions.edit		     = Edit
+artifact.actions.save                = Save
+artifact.actions.remove              = Remove
+artifact.msg.emptyText               = Empty Text

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties?rev=830411&r1=830410&r2=830411&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_ja.properties Wed Oct 28 00:23:58 2009
@@ -1,4 +1,4 @@
-#=====================================================================
+#=====================================================================
 #  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.
@@ -782,3 +782,13 @@
 welcome.welcomeNormal.userMaillist   = 利用者向けメーリングリスト・アーカイブ
 welcome.welcomeNormal.webServerPorts = Web サーバー・ポート
 welcome.welcomeNormal.wiki           = Wiki
+
+artifact.normal.title                = Name & Artifact-Aliases
+artifact.normal.name		     = Name
+artifact.normal.aliases 	     = Artifact-Aliases
+artifact.normal.actions		     = Actions
+artifact.actions.cancel              = Cancel
+artifact.actions.edit		     = Edit
+artifact.actions.save                = Save
+artifact.actions.remove              = Remove
+artifact.msg.emptyText               = Empty Text
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties?rev=830411&r1=830410&r2=830411&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/consolebase_zh.properties Wed Oct 28 00:23:58 2009
@@ -1,4 +1,4 @@
-#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
+#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
 #=====================================================================
 #  Licensed to the Apache Software Foundation (ASF) under one or more
 #  contributor license agreements.  See the NOTICE file distributed with
@@ -784,3 +784,13 @@
 welcome.welcomeNormal.userMaillist   = 用户邮件列表存档
 welcome.welcomeNormal.webServerPorts = Web Server端口
 welcome.welcomeNormal.wiki           = Wiki
+
+artifact.normal.title                = 名称-别名
+artifact.normal.name                 = 名称
+artifact.normal.aliases              = 别名
+artifact.normal.actions              = 操作
+artifact.actions.cancel              = 取消
+artifact.actions.edit                = 编辑
+artifact.actions.save                = 保存
+artifact.actions.remove              = 移除
+artifact.msg.emptyText               = 空文本框
\ No newline at end of file

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java?rev=830411&r1=830410&r2=830411&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/repository/RepositoryViewPortlet.java Wed Oct 28 00:23:58 2009
@@ -25,12 +25,15 @@
 import org.slf4j.LoggerFactory;
 import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.kernel.InternalKernelException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.FileWriteMonitor;
 import org.apache.geronimo.kernel.repository.ListableRepository;
 import org.apache.geronimo.kernel.repository.WriteableRepository;
+import org.apache.geronimo.system.resolver.ExplicitDefaultArtifactResolver;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -48,6 +51,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Properties;
 import java.util.SortedSet;
 
 /**
@@ -104,6 +108,7 @@
             String artifact = null;
             String version = null;
             String group = null;
+            String jarName = null;
 
             PortletFileUpload uploader = new PortletFileUpload(new DiskFileItemFactory());
             try {
@@ -161,11 +166,17 @@
                             version = item.getString().trim();
                         } else if ("fileType".equals(fieldName)) {
                             fileType = item.getString().trim();
+                        } else if ("jarName".equals(fieldName)) {
+                            jarName = item.getString().trim();
                         }
                     }
                 }
-
-
+                if (jarName != null) {
+                    ExplicitDefaultArtifactResolver instance = KernelRegistry.getSingleKernel().getGBean(ExplicitDefaultArtifactResolver.class);
+                    Properties set = new Properties();
+                    set.put(jarName, group + "/" + artifact + "/" + version + "/" + fileType);
+                    instance.addAliases(set);
+                }
                 repo.copyToRepository(file, new Artifact(group, artifact, version, fileType), new FileWriteMonitor() {
                     public void writeStarted(String fileDescription, int fileSize) {
                         log.info("Copying into repository " + fileDescription + "...");
@@ -180,6 +191,12 @@
                 });
             } catch (FileUploadException e) {
                 throw new PortletException(e);
+            } catch (GBeanNotFoundException e) {
+                throw new PortletException(e);
+            } catch (InternalKernelException e) {
+                throw new PortletException(e);
+            } catch (IllegalStateException e) {
+                throw new PortletException(e);
             }
         } catch (PortletException e) {
             throw e;
@@ -201,7 +218,7 @@
             request.setAttribute("groupId", parts[0]);
             request.setAttribute("artifactId", parts[1]);
             request.setAttribute("version", parts[2]);
-            request.setAttribute("type", parts[3]);
+            request.setAttribute("type", parts[3]);        
             usageView.include(request, response);
             return;
         }

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=830411&r1=830410&r2=830411&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 Wed Oct 28 00:23:58 2009
@@ -568,4 +568,28 @@
         </init-param>
     </portlet>
 
+     <portlet>
+        <description>Portlet for Artifact-Aliases</description>
+        <portlet-name>Artifact</portlet-name>
+        <display-name>Artifact</display-name>
+        <portlet-class>org.apache.geronimo.console.artifact.ArtifactViewPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>zh</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>portletinfo</resource-bundle>
+        <portlet-info>
+            <title>Artifact-Aliases</title>
+            <short-title>Artifact-Aliases</short-title>
+            <keywords></keywords>
+        </portlet-info>
+        <init-param>
+            <name>config-type</name>
+            <value>CAR</value>
+        </init-param>
+    </portlet>
 </portlet-app>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp?rev=830411&r1=830410&r2=830411&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/repository/normal.jsp Wed Oct 28 00:23:58 2009
@@ -67,7 +67,7 @@
             fileType.focus(); 
             addErrorMessage("<portlet:namespace/>", '<fmt:message key="repository.normal.invalidChar"/>');
             return false;
-        } 
+        }
     }
 
     return true;
@@ -146,6 +146,10 @@
       <td><label for="<portlet:namespace/>fileType"><fmt:message key="consolebase.common.type"/></label>:</td>
       <td><input type="text" name="fileType" id="<portlet:namespace/>fileType" value="${fileType}"/></td>
     </tr>
+    <tr>
+      <td><label for="<portlet:namespace/>jarName"><fmt:message key="consolebase.common.name"/></label>:</td>
+      <td><input type="text" name="jarName" id="<portlet:namespace/>jarName" value="${jarName}"/></td>
+    </tr>
     <tr><td colspan="2"><font size="-2">&nbsp;</font></td></tr>
     <tr>
       <td colspan="2" align="center"><input type="submit" value='<fmt:message key="consolebase.common.install"/>' /></td>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml?rev=830411&r1=830410&r2=830411&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml Wed Oct 28 00:23:58 2009
@@ -252,6 +252,15 @@
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
+        <servlet>
+        <servlet-name>Artifact</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>Artifact</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
 
     <servlet-mapping>
         <servlet-name>dwr-invoker</servlet-name>
@@ -352,6 +361,10 @@
     <servlet-mapping>
         <servlet-name>ClientModules</servlet-name>
         <url-pattern>/PlutoInvoker/ClientModules</url-pattern>
+    </servlet-mapping>    
+    <servlet-mapping>
+        <servlet-name>Artifact</servlet-name>
+        <url-pattern>/PlutoInvoker/Artifact</url-pattern>
     </servlet-mapping>
 
     <security-constraint>

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=830411&r1=830410&r2=830411&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 Wed Oct 28 00:23:58 2009
@@ -22,20 +22,24 @@
 
     <module>
         <web>portal-driver.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2"
+                 xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
             <context-root>/console</context-root>
             <security-realm-name>geronimo-admin</security-realm-name>
-            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
+                   xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="portalPathPrefix">/car-export</attribute>
                 <attribute name="portletContextPath">/plugin</attribute>
                 <attribute name="portletServletPath">/car-export</attribute>
             </gbean>
-            <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
+                   xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="portalPathPrefix">/graphs</attribute>
                 <attribute name="portletContextPath">/console-base</attribute>
                 <attribute name="portletServletPath">/graphs</attribute>
             </gbean>
-            <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
+                   xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="portalPathPrefix">/plan-export</attribute>
                 <attribute name="portletContextPath">/plugin</attribute>
                 <attribute name="portletServletPath">/plan-export</attribute>
@@ -45,122 +49,133 @@
 
     <module>
         <web>base-portlets.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2"
+                 xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
             <context-root>/console-base</context-root>
             <security-realm-name>geronimo-admin</security-realm-name>
-            <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
+            <gbean name="PropertiesLoginManager"
+                   class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
                 <reference name="ServerInfo">
                     <name>ServerInfo</name>
                 </reference>
                 <reference name="LoginModule">
                     <name>properties-login</name>
                 </reference>
-            </gbean> 
+            </gbean>
             <!-- i18n support -->
-            <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <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>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[Welcome]</attribute>
-               <reference name="PortalContainerServices">
-                   <name>PlutoPortalServices</name>
-               </reference>
-           </gbean>
-           <gbean name="ServerInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-               <attribute name="pageTitle">Server/Information</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[ServerInfo]</attribute>
-               <attribute name="icon">/images/ico_servinfo_16x16.gif</attribute>
-               <reference name="PortalContainerServices">
-                   <name>PlutoPortalServices</name>
-               </reference>
-           </gbean>
-           <gbean name="JavaSysInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-               <attribute name="pageTitle">Server/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">Server/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">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>
-           </gbean>
-           <gbean name="WebServer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-               <attribute name="pageTitle">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>
-               <reference name="PortalContainerServices">
-                   <name>PlutoPortalServices</name>
-               </reference>
-           </gbean>
-           <gbean name="ThreadPool" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-               <attribute name="pageTitle">Server/Thread Pools</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[ThreadPool]</attribute>
-               <attribute name="icon">/images/ico_threads_16x16.gif</attribute>
-               <reference name="PortalContainerServices">
-                   <name>PlutoPortalServices</name>
-               </reference>
-           </gbean>
-           <gbean name="ApacheJK" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-               <attribute name="pageTitle">Server/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="RepositoryViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-               <attribute name="pageTitle">Services/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="WARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-               <attribute name="pageTitle">Applications/Web App WARs</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[WARModules]</attribute>
-               <attribute name="icon">/images/ico_webapp_16x16.gif</attribute>
-               <reference name="PortalContainerServices">
-                   <name>PlutoPortalServices</name>
-               </reference>
-           </gbean>
-           <gbean name="SystemModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-               <attribute name="pageTitle">Applications/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>
-           </gbean>
+            <gbean name="Welcome" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Welcome</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[Welcome]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="ServerInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Server/Information</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[ServerInfo]</attribute>
+                <attribute name="icon">/images/ico_servinfo_16x16.gif</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="JavaSysInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Server/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">Server/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">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>
+            </gbean>
+            <gbean name="WebServer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">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>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="ThreadPool" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Server/Thread Pools</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[ThreadPool]</attribute>
+                <attribute name="icon">/images/ico_threads_16x16.gif</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="ApacheJK" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Server/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">Server/JAR Aliases</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[Artifact]</attribute>
+                <attribute name="icon">/images/ico_connect_16x16.gif</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Services/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="WARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Applications/Web App WARs</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[WARModules]</attribute>
+                <attribute name="icon">/images/ico_webapp_16x16.gif</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="SystemModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Applications/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>
+            </gbean>
             <gbean name="EARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                 <attribute name="pageTitle">Applications/Application EARs</attribute>
                 <attribute name="portletContext">/console-base</attribute>
@@ -170,75 +185,76 @@
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
-           <gbean name="EJBModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-               <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>
-           </gbean>
-           <gbean name="RARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-               <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>
-           </gbean>
-           <gbean name="ClientModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-               <attribute name="pageTitle">Applications/App Clients</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[ClientModules]</attribute>
-               <attribute name="icon">/images/ico_jar_16x16.gif</attribute>
-               <reference name="PortalContainerServices">
-                   <name>PlutoPortalServices</name>
-               </reference>
-           </gbean>
-           <gbean name="UsersGroups" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-               <attribute name="pageTitle">Security/Users and Groups</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[SEUsers, SEGroups]</attribute>
-               <attribute name="icon">/images/ico_usergroup_16x16.gif</attribute>
-               <reference name="PortalContainerServices">
-                   <name>PlutoPortalServices</name>
-               </reference>
-           </gbean>
-           <gbean name="Keystores" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-               <attribute name="pageTitle">Security/Keystores</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[Keystores]</attribute>
-               <attribute name="icon">/images/ico_keystore_16x16.gif</attribute>
-               <reference name="PortalContainerServices">
-                   <name>PlutoPortalServices</name>
-               </reference>
-           </gbean>
-           <gbean name="CertificationAuthority" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-               <attribute name="pageTitle">Security/Certificate Authority</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[CertificationAuthority]</attribute>
-               <attribute name="icon">/images/ico_cert_16x16.gif</attribute>
-               <reference name="PortalContainerServices">
-                   <name>PlutoPortalServices</name>
-               </reference>
-           </gbean>
+            <gbean name="EJBModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <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>
+            </gbean>
+            <gbean name="RARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <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>
+            </gbean>
+            <gbean name="ClientModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Applications/App Clients</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[ClientModules]</attribute>
+                <attribute name="icon">/images/ico_jar_16x16.gif</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="UsersGroups" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Security/Users and Groups</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[SEUsers, SEGroups]</attribute>
+                <attribute name="icon">/images/ico_usergroup_16x16.gif</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="Keystores" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Security/Keystores</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[Keystores]</attribute>
+                <attribute name="icon">/images/ico_keystore_16x16.gif</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="CertificationAuthority" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Security/Certificate Authority</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[CertificationAuthority]</attribute>
+                <attribute name="icon">/images/ico_cert_16x16.gif</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
         </web-app>
     </module>
 
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
         <role-mappings>
             <role role-name="admin">
-                <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" />
+                <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin"/>
             </role>
             <role role-name="monitor">
-                <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="monitor" />
+                <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="monitor"/>
             </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"/>
+    <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-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml?rev=830411&r1=830410&r2=830411&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml Wed Oct 28 00:23:58 2009
@@ -42,6 +42,11 @@
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.directwebremoting</groupId>
         <artifactId>dwr</artifactId>
         <type>jar</type>

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=830411&r1=830410&r2=830411&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 Wed Oct 28 00:23:58 2009
@@ -135,6 +135,15 @@
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
+            <gbean name="Aliases" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Server/JAR Aliases</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[Artifact]</attribute>
+                <attribute name="icon">/images/ico_connect_16x16.gif</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
             <gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                 <attribute name="pageTitle">Services/Repository</attribute>
                 <attribute name="portletContext">/console-base</attribute>



Mime
View raw message