geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r560053 - in /geronimo/sandbox/portals: ./ geronimo-console/src/main/java/org/apache/geronimo/console/logmanager/ geronimo-console/src/main/webapp/WEB-INF/ geronimo-console/src/main/webapp/WEB-INF/view/logmanager/ geronimo-console/src/main/...
Date Fri, 27 Jul 2007 01:34:40 GMT
Author: jbohn
Date: Thu Jul 26 18:34:36 2007
New Revision: 560053

URL: http://svn.apache.org/viewvc?view=rev&rev=560053
Log:
GERONIMO-3345 Enhancements for Extensible Admin Console - thanks Ajay Panagariya, Daniel Larsen, Becky Smith, and Viet Nguyen

Added:
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/add.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/add.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/back.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/back.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/browse.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/browse.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/bullet.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/bullet.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/cancel.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/cancel.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/clear.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/clear.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/collapsed_white.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/collapsed_white.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/create.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/create.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/delete.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/delete.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/expanded_white.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/expanded_white.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/head_bgstretch_1x86.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/head_bgstretch_1x86.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/head_help_60x86.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/head_help_60x86.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/head_left_754x86.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/head_left_754x86.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/head_left_login_586x86.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/head_left_login_586x86.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/head_logout_63x86.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/head_logout_63x86.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_Gstandalone_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_Gstandalone_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_beanjar_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_beanjar_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_connect_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_connect_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_db_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_db_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_doc_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_doc_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_filetree_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_filetree_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_folder_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_folder_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_geronimo_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_geronimo_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_link_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_link_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_list_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_list_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_lock_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_lock_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_look_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_look_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_mail_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_mail_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_servcomp_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_servcomp_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_unlock2_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_unlock2_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_unlock3_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_unlock3_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/ico_x_16x16.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_x_16x16.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/install.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/install.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/joe_logo.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/joe_logo.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/login_lock_64x55.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/login_lock_64x55.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/mgmtconsole.jpg
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/mgmtconsole.jpg
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/powered_by_100x30.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/powered_by_100x30.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/related_links.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/related_links.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/reset.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/reset.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/run_sql.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/run_sql.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/spacer.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/spacer.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/submit.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/submit.gif
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/images/update.gif
      - copied unchanged from r559968, geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/update.gif
Removed:
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/add.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/back.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/browse.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/bullet.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/cancel.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/clear.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/collapsed_white.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/create.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/delete.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/expanded_white.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/head_bgstretch_1x86.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/head_help_60x86.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/head_left_754x86.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/head_left_login_586x86.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/head_logout_63x86.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_Gstandalone_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_beanjar_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_connect_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_db_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_doc_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_filetree_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_folder_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_geronimo_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_link_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_list_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_lock_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_look_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_mail_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_servcomp_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_unlock2_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_unlock3_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/ico_x_16x16.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/install.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/joe_logo.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/login_lock_64x55.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/mgmtconsole.jpg
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/powered_by_100x30.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/related_links.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/reset.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/run_sql.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/spacer.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/submit.gif
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/images/update.gif
Modified:
    geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/logmanager/LogViewerPortlet.java
    geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/logmanager/search.jsp
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/web.xml
    geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServices.java
    geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServicesGBean.java
    geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto-portal-driver-config.xml
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/castor.properties
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/web.xml
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/index.jsp
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/login.jsp
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/pluto.css
    geronimo/sandbox/portals/pom.xml

Modified: geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/logmanager/LogViewerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/logmanager/LogViewerPortlet.java?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/logmanager/LogViewerPortlet.java (original)
+++ geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/logmanager/LogViewerPortlet.java Thu Jul 26 18:34:36 2007
@@ -17,18 +17,22 @@
 
 package org.apache.geronimo.console.logmanager;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
-import java.io.File;
+import java.util.Enumeration;
+import java.util.Map;
 
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletContext;
 import javax.portlet.PortletException;
 import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletSession;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.portlet.WindowState;
-import javax.portlet.PortletSession;
 
 import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.util.PortletManager;
@@ -46,6 +50,14 @@
         helpView.include(renderRequest, renderRespose);
     }
 
+    @Override
+    public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException {
+        
+        //Add all the parameters to the actionResponse Attributes so we can get the back
+        actionResponse.setRenderParameters(actionRequest.getParameterMap());
+     
+    }
+    
     protected void doView(RenderRequest renderRequest,
             RenderResponse renderRespose) throws PortletException, IOException {
         if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {

Modified: geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java (original)
+++ geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/logmanager/WebAccessLogViewerPortlet.java Thu Jul 26 18:34:36 2007
@@ -61,6 +61,8 @@
         helpView.include(renderRequest, renderRespose);
     }
 
+
+    
     protected void doView(RenderRequest renderRequest,
             RenderResponse renderRespose) throws PortletException, IOException {
         if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
@@ -129,9 +131,13 @@
             //todo: currently refreshes on every request; that's pretty slow.
         }
 
-        String fromDateStr = (String) renderRequest.getParameter("fromDate");
-        String toDateStr = (String) renderRequest.getParameter("toDate");
-
+        String fromDateStr = new String();
+        String toDateStr = new String();
+        if (renderRequest.getParameter("ignoreDates") == null){
+            fromDateStr = (String) renderRequest.getParameter("fromDate");
+            toDateStr = (String) renderRequest.getParameter("toDate");
+        }
+        
         Calendar cal1 = Calendar.getInstance(), cal2 = Calendar.getInstance();
         // If not all dates were passed we assume than no fields were passed and just
         // filter on the current date.
@@ -240,6 +246,9 @@
         searchView.include(renderRequest, renderRespose);
     }
 
+
+    
+    @Override
     public void init(PortletConfig portletConfig) throws PortletException {
         PortletContext pc = portletConfig.getPortletContext();
         searchView = pc.getRequestDispatcher("/WEB-INF/view/webaccesslogmanager/view.jsp");
@@ -247,9 +256,13 @@
         super.init(portletConfig);
     }
 
+    @Override
     public void processAction(ActionRequest actionRequest,
             ActionResponse actionResponse) throws PortletException, IOException {
         //todo: according to portlet spec, all forms should submit to Action not Render
+
+        actionResponse.setRenderParameters(actionRequest.getParameterMap());
+        
     }
 
 }

Modified: geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/geronimo-web.xml Thu Jul 26 18:34:36 2007
@@ -87,6 +87,7 @@
   </dep:environment>
 
   <context-root>/console</context-root>
+ <security-realm-name>geronimo-admin</security-realm-name>
 
   <container-config>
     <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0">
@@ -113,6 +114,19 @@
       <attribute name="portletServletPath">/plan-export</attribute>
   </gbean>
 -->
+    <security xmlns="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
+        <!--<default-subject>-->
+            <!--<realm>geronimo-admin</realm>-->
+            <!--<id>system</id>-->
+        <!--</default-subject>-->
+    	<role-mappings>
+    		<role role-name="admin">
+    				<principal
+    					class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
+    					name="admin"/>
+    		</role>
+    	</role-mappings>
+    </security>
 
             <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
                 <reference name="ServerInfo">

Modified: geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/logmanager/search.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/logmanager/search.jsp?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/logmanager/search.jsp (original)
+++ geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/logmanager/search.jsp Thu Jul 26 18:34:36 2007
@@ -72,7 +72,7 @@
 </tr>
 <tr>
     <td class="Smaller" valign="middle">
-    <form action="<portlet:renderURL/>" name="<portlet:namespace/>searchForm" onsubmit="return <portlet:namespace/>validateForm();">
+    <form action="<portlet:actionURL/>" name="<portlet:namespace/>searchForm" onsubmit="return <portlet:namespace/>validateForm();">
     <b>Filter results:</b>
     <input type="hidden" value="search" name="action"/>
     File <select name="logFile">

Modified: geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp (original)
+++ geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp Thu Jul 26 18:34:36 2007
@@ -54,7 +54,7 @@
 </tr>
 <tr>
     <td>
-    <form action="<portlet:renderURL/>" name="<portlet:namespace/>searchForm" method="post" onSubmit="return <portlet:namespace/>validateForm();">
+    <form action="<portlet:actionURL/>" name="<portlet:namespace/>searchForm" method="post" onSubmit="return <portlet:namespace/>validateForm();">
     <b>Filter results:</b>
     <table width="680">
     <c:choose>

Modified: geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp (original)
+++ geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp Thu Jul 26 18:34:36 2007
@@ -19,7 +19,7 @@
 <portlet:defineObjects/>
 
 
-<table>
+<table style="width:100%"> <!-- an IE rendering fix -->
     <tr>
 
         <!-- Body -->
@@ -69,12 +69,11 @@
                     </td>
                 </tr>
                 <tr>
+                    <td bgcolor="#FFFFFF" nowrap>
+                        &nbsp;<br />
                         <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_list_16x16.gif")%>' alt=""/><a href="${pageContext.request.contextPath}/Deployment">Deploy Applications</a><br />
-
                         <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_servcomp_16x16.gif")%>' alt=""/><a href="${pageContext.request.contextPath}/WebServerManager">Web Server Ports</a><br />
-
-                        <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_look_16x16.gif")%>' alt=""/><a href="${pageContext.request.contextPath}/ServerInfo">Server Information</a>
-
+                        <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_look_16x16.gif")%>' alt=""/><a href="${pageContext.request.contextPath}/ServerInfo">Server Information</a><br />
                         &nbsp;<br />
                     </td>
                 </tr>

Modified: geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/web.xml?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/web.xml Thu Jul 26 18:34:36 2007
@@ -433,6 +433,33 @@
         <url-pattern>/PlutoInvoker/ImportExport</url-pattern>
     </servlet-mapping>
 
+    <security-constraint>
+        <web-resource-collection>
+            <web-resource-name></web-resource-name>
+            
+            <!--<url-pattern>/</url-pattern>-->
+            <url-pattern>/PlutoInvoker/*</url-pattern>
+            <url-pattern>/dwr/*</url-pattern>
+            <url-pattern>/car-export</url-pattern>
+            <url-pattern>/maven-repo/*</url-pattern>
+            <url-pattern>/plan-export</url-pattern>
+            
+            <http-method>GET</http-method>
+            <http-method>POST</http-method>
+            <http-method>PUT</http-method>
+        </web-resource-collection>
+        <auth-constraint>
+            <role-name>admin</role-name>
+        </auth-constraint>
+    </security-constraint>
+    <login-config>
+        <auth-method>BASIC</auth-method>
+        <realm-name>geronimo-admin</realm-name>
+    </login-config>
+    <security-role>
+        <role-name>admin</role-name>
+    </security-role>
+
     <!--
     For security reasons requests to the dwr servlet go through
     the "pluto" web-app context. The purpose of dwr-filter is

Modified: geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServices.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServices.java?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServices.java (original)
+++ geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServices.java Thu Jul 26 18:34:36 2007
@@ -17,6 +17,7 @@
  */
 package org.apache.geronimo.pluto;
 
+import org.apache.pluto.driver.config.AdminConfiguration;
 import org.apache.pluto.driver.config.DriverConfiguration;
 import org.apache.pluto.driver.services.portal.PropertyConfigService;
 import org.apache.pluto.driver.services.portal.RenderConfigService;
@@ -29,6 +30,9 @@
  * @version $Rev$ $Date$
  */
 public interface PortalContainerServices {
+    
+    AdminConfiguration getAdminConfiguration();
+    void setAdminConfiguration(AdminConfiguration adminConfiguration);
     
     RenderConfigService getRenderConfigService();
     void setRenderConfigService(RenderConfigService renderConfigService);

Modified: geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServicesGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServicesGBean.java?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServicesGBean.java (original)
+++ geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServicesGBean.java Thu Jul 26 18:34:36 2007
@@ -20,8 +20,10 @@
 
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.pluto.driver.config.AdminConfiguration;
 import org.apache.pluto.driver.config.DriverConfiguration;
 import org.apache.pluto.driver.services.portal.PropertyConfigService;
 import org.apache.pluto.driver.services.portal.RenderConfigService;
@@ -30,12 +32,34 @@
 /*
  * a gbean that provides access to pluto's container services.
  */
-public class PortalContainerServicesGBean implements PortalContainerServices {
+public class PortalContainerServicesGBean implements PortalContainerServices, GBeanLifecycle {
     private RenderConfigService renderConfigService;
     private PortalCallbackService portalCallbackService;
     private PropertyConfigService propertyConfigService;
     private DriverConfiguration driverConfiguration;
+    private AdminConfiguration adminConfiguration;
 
+
+    public void doStart() throws Exception {
+        
+    }
+    
+    public void doStop() throws Exception {
+        
+    }
+    
+    public void doFail() {
+        
+    }
+    
+    public AdminConfiguration getAdminConfiguration() {
+        return adminConfiguration;
+    }
+
+    public void setAdminConfiguration(AdminConfiguration adminConfiguration) {
+        this.adminConfiguration = adminConfiguration;
+    }
+    
     public RenderConfigService getRenderConfigService() {
         return renderConfigService;
     }

Modified: geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto-portal-driver-config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto-portal-driver-config.xml?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto-portal-driver-config.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto-portal-driver-config.xml Thu Jul 26 18:34:36 2007
@@ -38,97 +38,83 @@
 
   <!-- Render configuration which defines the portal pages. -->
   <render-config default="Welcome">
-    <page name="Welcome" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+    <page name="Welcome" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console" name="Welcome"/>
     </page>
 
-    <page name="Server Info" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+<!-- SERVER -->
+    <page name="Server/Information" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console" name="ServerInfo"/>
     </page>
 
-    <page name="Java System Info" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+    <page name="Server/Java System Info" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console" name="JavaSysInfo"/>
     </page>
 
-    <page name="Log Manager" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+    <page name="Server/Server Logs" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console" name="LogManager"/>
       <portlet context="/console" name="LogViewer"/>
       <portlet context="/console" name="WebAccessLogViewer"/>
     </page>
 
-    <page name="ServerManager" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+    <page name="Server/Shutdown" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console" name="ServerManager"/>
     </page>
 
-    <page name="Web Server" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+    <page name="Server/Web Server" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console" name="WebServerManager"/>
       <portlet context="/console" name="ConnectorManager"/>
     </page>
 
-    <page name="Thread Pool" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+    <page name="Server/Thread Pools" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console" name="ThreadPool"/>
     </page>
 
-    <page name="Repository" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-      <portlet context="/console" name="RepositoryViewer"/>
-    </page>
-
-    <page name="Security Realms" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-      <portlet context="/console" name="RealmWizard"/>
-    </page>
-
-    <page name="Apache Mod JK" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+    <page name="Server/Apache HTTP" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console" name="ApacheJK"/>
     </page>
 
-    <page name="Keystores" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-      <portlet context="/console" name="Keystores"/>
-    </page>
-
-    <page name="Certification Authority" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-      <portlet context="/console" name="CertificationAuthority"/>
+<!-- SERVICES -->
+    <page name="Services/Repository" uri="/WEB-INF/themes/default-theme.jsp">
+      <portlet context="/console" name="RepositoryViewer"/>
     </page>
 
-    <page name="Deploy New" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+<!-- APPLICATIONS -->
+    <page name="Applications/Deploy New" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console" name="Deployment"/>
     </page>
 
-    <page name="EAR Modules" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-      <portlet context="/console" name="EARModules"/>
-    </page>
-
-    <page name="WAR Modules" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+    <page name="Applications/Web App WARs" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console" name="WARModules"/>
     </page>
 
-    <page name="RAR Modules" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-      <portlet context="/console" name="RARModules"/>
-    </page>
-
-    <page name="Client Modules" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-      <portlet context="/console" name="ClientModules"/>
-    </page>
-
-    <page name="System Modules" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+    <page name="Applications/System Modules" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console" name="SystemModules"/>
     </page>
 
-    <page name="Plugins" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+    <page name="Applications/Plugins" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console" name="ImportExport"/>
     </page>
 
-    <page name="Users and Groups" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+<!-- SECURITY -->
+    <page name="Security/Users and Groups" uri="/WEB-INF/themes/default-theme.jsp">
       <portlet context="/console" name="SEUsers"/>
       <portlet context="/console" name="SEGroups"/>
     </page>
 
-    <page name="Pluto Tests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-      <portlet context="/testsuite" name="TestPortlet1"/>
+    <page name="Security/Security Realms" uri="/WEB-INF/themes/default-theme.jsp">
+      <portlet context="/console" name="RealmWizard"/>
     </page>
 
-    <page name="Pluto Admin" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-      <portlet context="/pluto" name="AboutPortlet"/>
+    <page name="Security/Keystores" uri="/WEB-INF/themes/default-theme.jsp">
+      <portlet context="/console" name="Keystores"/>
     </page>
+
+    <page name="Security/Certificate Authority" uri="/WEB-INF/themes/default-theme.jsp">
+      <portlet context="/console" name="CertificationAuthority"/>
+    </page>
+
+<!-- OTHER -->
 
   </render-config>
   

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/castor.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/castor.properties?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/castor.properties (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/castor.properties Thu Jul 26 18:34:36 2007
@@ -4,7 +4,7 @@
 # this work for additional information regarding copyright ownership.
 # The ASF licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at 
+# the License.  You may obtain a copy of the License at
 # 
 #   http://www.apache.org/licenses/LICENSE-2.0
 # 
@@ -24,3 +24,5 @@
 org.exolab.castor.parser.namespaces=true
 org.exolab.castor.indent=true
 org.exolab.castor.debug=false
+
+

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml Thu Jul 26 18:34:36 2007
@@ -40,11 +40,26 @@
   </dep:environment>
 
   <context-root>/pluto</context-root>
-
+ <security-realm-name>geronimo-admin</security-realm-name>
+ 
   <container-config>
     <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0">
       <cross-context/>
     </tomcat>
   </container-config>
 
+
+    <security xmlns="http://geronimo.apache.org/xml/ns/security-${geronimoSchemaVersion}">
+        <!--<default-subject>-->
+            <!--<realm>geronimo-admin</realm>-->
+            <!--<id>system</id>-->
+        <!--</default-subject>-->
+    	<role-mappings>
+    		<role role-name="admin">
+    				<principal
+    					class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
+    					name="admin"/>
+    		</role>
+    	</role-mappings>
+    </security>
 </web-app>

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml Thu Jul 26 18:34:36 2007
@@ -140,6 +140,7 @@
       <property name="portalCallbackService"><ref bean="PortalCallbackService"/></property>
       <property name="propertyConfigService"><ref bean="PropertyConfigService"/></property>
       <property name="driverConfiguration"><ref bean="DriverConfiguration"/></property>
-    </bean>
+	<property name="adminConfiguration"><ref bean="AdminConfiguration"/></property>   
+ </bean>
 
 </beans>

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp Thu Jul 26 18:34:36 2007
@@ -19,31 +19,147 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
 
-<div id="navigation">
-    <h2>Navigation:</h2>
-    <ul>
-<!--
-        <li>
-        <a href='<c:out value="${pageContext.request.contextPath}"/>/about.jsp'>About Pluto</a>
-        </li>
--->
-        <c:forEach var="page" items="${driverConfig.pages}">
-            <c:choose>
-                <c:when test="${page == currentPage}">
-                    <li class="selected">
-                        <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'>
-                            <c:out value="${page.name}"/>
-                        </a>
-                    </li>
-                </c:when>
-                <c:otherwise>
-                    <li>
-                        <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'>
-                            <c:out value="${page.name}"/>
-                        </a>
-                    </li>
-                </c:otherwise>
-            </c:choose>
-        </c:forEach>
-    </ul>
-</div>
+<%@ page import="java.util.ArrayList,java.util.HashMap,org.apache.pluto.driver.services.portal.PageConfig" %>
+
+
+<%
+    //Get everything into the map and ready.
+    String delim = "/";
+    int delim_len = delim.length();
+
+    HashMap<String, ArrayList<PageConfig>> categories = new HashMap<String, ArrayList<PageConfig>>();
+    ArrayList<String> catNames = new ArrayList<String>();
+    HashMap<String, String> shortNames = new HashMap<String, String>();
+    PageConfig welcomePageConfig = null;
+    String welcomePageName = "Welcome";
+%>        
+    <c:forEach var="page" items="${driverConfig.pages}">
+    <%
+        PageConfig pageConfig = (PageConfig)(pageContext.getAttribute("page"));
+        String str = pageConfig.getName();
+        String cat;
+        String pageName;
+        
+        if(!str.equals(welcomePageName)){
+            int index = str.indexOf(delim);
+            if(index != -1){
+                cat = str.substring(0, index);
+                pageName = str.substring(index+delim_len);
+            }else{
+                cat = "Other";
+                pageName = str;
+            }
+            
+            if(categories.get(cat)==null){
+                categories.put(cat, new ArrayList<PageConfig>());
+                catNames.add(cat);
+            }
+            categories.get(cat).add(pageConfig);
+            shortNames.put(str,pageName);
+        }else{
+            welcomePageConfig = pageConfig;
+        }
+    %>
+    </c:forEach>
+
+
+
+
+<table width="200px" border="0" cellpadding="0" cellspacing="0"> 
+    <tr><td CLASS="ReallyDarkBackground"><strong>&nbsp;Console Navigation</strong></td></tr>
+    <tr><td><div class="Selection">
+        <table width="100%" border="0" cellpadding="0" cellspacing="0">
+            <tr>
+                <td class="CollapsedLeft"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"/></td>
+                <td class="Indent"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"/></td>
+                <td class="TopMiddle"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"/></td>
+                <td class="CollapsedRight"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"/></td> 
+            </tr>
+        </table>
+    </div></td></tr>
+    
+    <%
+    if(welcomePageConfig!=null){
+        pageContext.setAttribute("page",welcomePageConfig);
+        pageContext.setAttribute("pageName",welcomePageName);
+    %>
+        <!-- Add the Welcome Link -->
+        <c:choose>
+            <c:when test="${page == currentPage}">
+                <tr><td><div class="SelectedSubselection Selection"></c:when>
+            <c:otherwise>
+                <tr><td><div class="Selection"></c:otherwise>
+        </c:choose>
+                <table width="100%" border="0" cellpadding="1" cellspacing="0"> 
+                    <tr>
+                        <td class="CollapsedLeft">&nbsp;</td>
+                        <td class="Indent">&nbsp;</td>
+                        <td class="TopMiddle">
+                            <img border="0" src="<%=request.getContextPath()%>/images/ico_geronimo_16x16.gif"/>&nbsp;<a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><c:out value="${pageName}"/></a>
+                        </td>
+                        <td class="CollapsedRight">&nbsp;</td> 
+                    </tr> 
+                </table>
+            </div></td></tr>
+        <%}
+    %>
+<%
+    //generate the output tree
+    int catNames_len = catNames.size();
+    for(int i=0;i<catNames_len;i++){
+        String catName = catNames.get(i);
+        pageContext.setAttribute("catName",catName);
+        %>
+        <tr><td><div class="Selection">
+            <table width="100%" border="0" cellpadding="1" cellspacing="0">
+                <tr>
+                    <td class="CollapsedLeft">&nbsp;</td>
+                    <td class="Indent">&nbsp;</td>
+                    <td class="TopMiddle">
+                        <img border="0" src="<%=request.getContextPath()%>/images/ico_folder_16x16.gif"/>&nbsp;<c:out value="${catName}"/>
+                    </td>
+                    <td class="CollapsedRight">&nbsp;</td> 
+                </tr>
+            </table>
+        </div></td></tr>
+        <%
+        ArrayList<PageConfig> list = categories.get(catName);
+        int list_len = list.size();
+        for(int k=0;k<list_len;k++){
+            //System.out.println("\t"+list.get(k));
+            PageConfig pageConfig = list.get(k);
+            pageContext.setAttribute("page",pageConfig);
+            pageContext.setAttribute("pageName",shortNames.get(pageConfig.getName()));
+    %>
+    <c:choose>
+        <c:when test="${page == currentPage}">
+            <tr><td><div class="SelectedSubselection Subselection"></c:when>
+        <c:otherwise>
+            <tr><td><div class="Subselection"></c:otherwise>
+    </c:choose>
+                <table width="100%" border="0" cellpadding="1" cellspacing="0"> 
+                    <tr>
+                        <td class="Left">&nbsp;</td> 
+                        <td class="Indent">&nbsp;</td> 
+                        <td class="Middle">
+                            &nbsp;&nbsp;&nbsp;
+                            <img border="0" src="<%=request.getContextPath()%>/images/ico_doc_16x16.gif"/>&nbsp;<a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><c:out value="${pageName}"/></a>
+                        </td> 
+                        <td class="Right">&nbsp;</td> 
+                    </tr> 
+                </table>
+            </div></td></tr>
+            <%
+        }
+    }
+%>
+    <tr><td><div class="Selection"><table width="100%" border="0" cellpadding="0" cellspacing="0">
+        <tr>
+            <td class="CollapsedLeft"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"/></td>
+            <td class="Indent"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"/></td>
+            <td class="TopMiddle"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"/></td>
+            <td class="CollapsedRight"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1"/></td> 
+        </tr>
+    </table></div></td></tr>
+</table>
+

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp Thu Jul 26 18:34:36 2007
@@ -1,82 +0,0 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed  under the  License is distributed on an "AS IS" BASIS,
-WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
-
-<!--
-Portal page template for default theme used by the Pluto Portal Driver.
-This template divides all portlets into two groups (div blocks): the first
-group (the left column) displays portlets with odd IDs, while the second group
-(the right column) displays portlets with even IDs.
--->
-
-<html>
-
-<head>
-    <title>Pluto Portal</title>
-    <style type="text/css" title="currentStyle" media="screen">
-        @import "<c:out value="${pageContext.request.contextPath}"/>/pluto.css";
-        @import "<c:out value="${pageContext.request.contextPath}"/>/portlet-spec-1.0.css";
-    </style>
-    <script type="text/javascript" src="<c:out value="${pageContext.request.contextPath}"/>/pluto.js"></script>
-</head>
-
-<body>
-
-<div id="portal">
-
-    <!-- Header block: the Apache Pluto banner image and description -->
-    <div id="header">
-        <h1>Apache Pluto</h1>
-        <p>An Apache Portals Project</p>
-    </div>
-
-    <!-- Logout link -->
-    <div id="logout">
-        <a href="<c:url value='/Logout'/>">Logout</a>
-    </div>
-
-    <!-- Navigation block: links to portal pages -->
-    <jsp:include page="navigation.jsp"/>
-
-    <!-- Content block: portlets are divided into two columns/groups -->
-    <div id="content">
-        <pluto:isMaximized var="isMax"/>
-
-        <!-- Left column -->
-                    <c:forEach var="portlet" varStatus="status"
-                               items="${currentPage.portletIds}">
-                        <c:set var="portlet" value="${portlet}" scope="request"/>
-                        <jsp:include page="portlet-skin.jsp"/>
-                    </c:forEach>
-
-    </div>
-
-    <!-- Footer block: copyright -->
-    <div id="footer">
-        &copy; 2003-2005 Apache Software Foundation
-    </div>
-
-</div>
-
-</body>
-
-</html>
-
-

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp Thu Jul 26 18:34:36 2007
@@ -16,6 +16,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 --%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 <%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
 
 <!-- Use pluto portlet tag to render the portlet -->

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/web.xml?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/web.xml Thu Jul 26 18:34:36 2007
@@ -96,36 +96,6 @@
     </init-param>
   </servlet>
 
-  <servlet>
-    <servlet-name>AboutPortlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>AboutPortlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>AdminPortlet</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>AdminPortlet</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>PlutoPageAdmin</servlet-name>
-    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-    <init-param>
-      <param-name>portlet-name</param-name>
-      <param-value>PlutoPageAdmin</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
   <servlet-mapping>
     <servlet-name>dwr-forward</servlet-name>
     <url-pattern>/dwr/*</url-pattern>
@@ -135,7 +105,12 @@
     <servlet-name>plutoPortalDriver</servlet-name>
     <url-pattern>/portal/*</url-pattern>
   </servlet-mapping>
-
+    
+    <servlet-mapping>
+        <servlet-name>plutoPortalDriver</servlet-name>
+        <url-pattern>/secure/*</url-pattern>
+    </servlet-mapping>
+    
   <servlet-mapping>
     <servlet-name>plutoPortalDriverLogout</servlet-name>
     <url-pattern>/Logout</url-pattern>
@@ -151,21 +126,6 @@
     <url-pattern>/tck/*</url-pattern>
   </servlet-mapping>
 
-  <servlet-mapping>
-    <servlet-name>AboutPortlet</servlet-name>
-    <url-pattern>/PlutoInvoker/AboutPortlet</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>AdminPortlet</servlet-name>
-    <url-pattern>/PlutoInvoker/AdminPortlet</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>PlutoPageAdmin</servlet-name>
-    <url-pattern>/PlutoInvoker/PlutoPageAdmin</url-pattern>
-  </servlet-mapping>
-
   <taglib>
     <taglib-uri>http://java.sun.com/portlet</taglib-uri>
     <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
@@ -181,7 +141,6 @@
     <taglib-location>/WEB-INF/tld/pluto.tld</taglib-location>
   </taglib>
 
-<!--
   <security-constraint>
     <web-resource-collection>
       <web-resource-name>portal</web-resource-name>
@@ -192,22 +151,37 @@
       <http-method>PUT</http-method>
     </web-resource-collection>
     <auth-constraint>
-      <role-name>pluto</role-name>
+      <role-name>admin</role-name>
     </auth-constraint>
   </security-constraint>
-
+	<security-constraint>
+	    <web-resource-collection>
+	        <web-resource-name>Login and HTTPS Required</web-resource-name>
+	        <url-pattern>/secure/*</url-pattern>
+	        <http-method>GET</http-method>
+	        <http-method>POST</http-method>
+	        <http-method>PUT</http-method>
+	    </web-resource-collection>
+	    <auth-constraint>
+	        <role-name>admin</role-name>
+	    </auth-constraint>
+	    <user-data-constraint>
+	        <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+	    </user-data-constraint>
+	</security-constraint>
   <login-config>
     <auth-method>FORM</auth-method>
+    <realm-name>geronimo-admin</realm-name>
     <form-login-config>
       <form-login-page>/login.jsp</form-login-page>
-      <form-error-page>/login.jsp?error=1</form-error-page>
+      <form-error-page>/loginerror.jsp</form-error-page>
     </form-login-config>
   </login-config>
 
-  <security-role>
-    <role-name>pluto</role-name>
+    <security-role>
+    <role-name>admin</role-name>
   </security-role>
--->
+
 
 </web-app>
 

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/index.jsp?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/index.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/index.jsp Thu Jul 26 18:34:36 2007
@@ -1,20 +1,22 @@
+<%@ page language="java" 
+         contentType="text/html; charset=UTF-8" %>
 <%--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 --%>
+
 <%
-  // Redirect to the portal driver servlet.
-  response.sendRedirect("portal");
+    response.sendRedirect("./portal/Welcome");
 %>

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/login.jsp?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/login.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/login.jsp Thu Jul 26 18:34:36 2007
@@ -1,72 +1,168 @@
+<%@ page language="java" 
+         contentType="text/html; charset=UTF-8" %>
 <%--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 --%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
+<%-- $Rev$ $Date$ --%>
 
 <html>
-  
-  <head>
-    <title>Pluto Portal</title>
-    <style type="text/css" title="currentStyle" media="screen">
-      @import "<c:out value="${pageContext.request.contextPath}"/>/pluto.css";
-    </style>
-    <script type="text/javascript"
-            src="<c:out value="${pageContext.request.contextPath}"/>/pluto.js">
-    </script>
-  </head>
-
-  <body>
-    <div id="portal" style="width: 600px;">
-      <div id="header">
-        <h1>Apache Pluto</h1>
-        <p>A Apache Portals Project</p>
-      </div>
-      <div id="content">
-        <c:if test='${param.error == "1"}'>
-          <p style="color:red;text-align:center">
-            Invalid credentials. Please try again
-          </p>
-        </c:if>
-        <form method="POST" action="j_security_check">
-          <fieldset>
-            <legend>Login to Pluto</legend>
-            <div>
-              <label for="j_username">User Name</label>
-              <input type="text" name="j_username" id="j_username"/>
-            </div>
-            <div>
-              <label for="j_password">Password</label>
-              <input type="password" name="j_password" id="j_password"/>
-            </div>
-            <div>
-              <label for="j_login"></label>
-              <input type="submit" value="Login" name="login" id="j_login"/>
-            </div>
-          </fieldset>
-        </form>
-      </div>
-      
-      <div id="footer">
-        &copy; 2003-2007 Apache Software Foundation
-      </div>
-      
-    </div>
-  
-  </body>
-  
+<head>
+<title>Geronimo Console Login</title>
+<link href="<%=request.getContextPath()%>/main.css" rel="stylesheet" type="text/css"/>
+<link rel="SHORTCUT ICON" href="<%=request.getContextPath()%>/favicon.ico" type="image/x-icon"/>
+</head>
+
+<body onload="document.login.j_username.focus()" leftmargin="0" topmargin="0" rightmargin="0">
+
+<form name="login" action="j_security_check" method="POST">
+  <%--  Top table is the banner --%>
+      <TABLE width="100%" HEIGHT="86" BORDER="0" CELLSPACING="0" CELLPADDING="0">
+        <TR>
+          <td height="86" class="LoginLogo" border="0"></td>
+          <td height="86" class="Top" border="0">&nbsp; </TD>
+          <td height="86" class="Top" border="0" width="40">
+          </td>
+        </TR>
+        <TR>
+          <td>&nbsp;</td>
+          <td>&nbsp;</td>
+        </TR>
+        <TR>
+          <td>&nbsp;</td>
+          <td>&nbsp;</td>
+        </TR>
+      </TABLE>
+
+  <%--  Main body --%>
+  <table WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0">
+    <TR CLASS="Content">
+      <td width="30%" >&nbsp;</td>
+
+      <td class="Body" align="CENTER" height="300" valign="top">
+      <TABLE border>
+      <TR>
+      <TD>
+      <table width="550" cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="ReallyDarkBackground"><strong>&nbsp;Log In to the Geronimo Console</td>
+        </tr>
+        <tr>
+          <td class="MediumBackground">&nbsp;</td>
+        </tr>
+        <tr>
+          <td>
+          <table width="100%"  border="0" cellspacing="0" cellpadding="0">
+              <tr>
+                <td width="25%" class="MediumBackground">&nbsp;</td> 
+                <td align="right" class="MediumBackground">&nbsp;</td>
+                <td width="6" class="MediumBackground">&nbsp;</td>
+                <td width="1" class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td width="25%" class="MediumBackground">&nbsp;</td>
+              </tr>
+              <tr>
+                <td class="MediumBackground" ROWSPAN=3 ALIGN="center" ><img border="0" align="center" src="<%=request.getContextPath()%>/images/login_lock_64x55.gif"/></td> 
+                <td align="right" class="MediumBackground"><strong>Username</strong></td>
+                <td class="MediumBackground"><strong>:</strong></td>
+                <td width="1" class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground"><input name="j_username" type="text" class="InputField" value="" size="20px"/></td>
+                <td width="17" class="MediumBackground">&nbsp;</td>
+              </tr>
+              <tr>
+                <td align="right" class="MediumBackground"><strong>Password</strong></td>
+                <td class="MediumBackground"><strong>:</strong></td>
+                <td width="1" class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground"><input name="j_password" type="password" class="InputField" value="" size="20px"/></td>
+                <td class="MediumBackground">&nbsp;</td>
+              </tr>
+              <tr>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+              </tr>
+              <tr>
+                <td class="MediumBackground">&nbsp;</td>
+                <td colspan="4" align="center" class="MediumBackground">
+                   <script>
+                   if (document.cookie == "") {
+                     document.writeln('<font color="red"><strong>Note: Logging onto the Geronimo Console requires cookies to be enabled in your web browser.</strong></font><br>');
+                   }
+                   </script>
+                   <input name="submit" type="submit" value="Login"/>
+                </td>
+                <td class="MediumBackground">&nbsp;</td>
+              </tr>
+              <tr>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+                <td class="MediumBackground">&nbsp;</td>
+              </tr>
+          </table>
+          </td>
+        </tr>
+
+        <tr>
+          <td><font size="1"><STRONG>Welcome to the Geronimo&#8482; Console</FONT></td>
+        </TR>
+        <tr>
+          <TD>
+          <table width="100%"  border="0" cellspacing="1" cellpadding="5">
+            <tr>
+              <td width="5">&nbsp;</td>
+              <td> <strong>GERONIMO&#8482;</strong> is a Java-certified, production-grade platform designed to allow developers to rapidly deploy and manage their applications. The result is an integrated, highly functional application platform that leverages the latest innovations from the open source community and simplifies application deployment and maintenance. </td>
+              <td width="5">&nbsp;</td>
+            </tr>
+
+            <tr>
+              <td>&nbsp;</td>
+              <td>&nbsp;</td>
+              <td>&nbsp;</td>
+            </tr>
+
+            <tr>
+              <td>&nbsp;</td>
+              <td> <strong>Geronimo&#8482;</strong> has integrated the following components:<BR/>
+                &nbsp;&nbsp;&#149;&nbsp; Application server (Apache Geronimo)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Web server and servlet engine (Tomcat)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Web server and servlet engine (Jetty)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; JSP compiler (Jasper)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Relational database (Apache Derby)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Messaging (ActiveMQ)<br/>
+                &nbsp;&nbsp;&#149;&nbsp; User management services<br/>
+                &nbsp;&nbsp;&#149;&nbsp; Centralized administration console<br/>
+              <td>&nbsp;</td>
+            </tr>
+          </table>
+          </TD>
+        </TR>
+      </table>
+      </TD>
+      </TR>
+      </TABLE>
+      </td>
+
+      <td width="30%" >&nbsp;</td>
+    </tr>
+  </table>
+</form>
+</body>
 </html>
-
-

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/pluto.css
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/pluto.css?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/pluto.css (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/pluto.css Thu Jul 26 18:34:36 2007
@@ -15,9 +15,9 @@
 * limitations under the License.
 */
 body, th, td {
-  background-color: #FFFFFF;
-  font-family: Arial, Helvetica, Sans-serif;
-  font-size: 95%;
+    color:#1E1E52;
+    font-family:Verdana,Tahoma,Arial,Helvetica,sans-serif;
+    font-size:12px;
 }
 
 /** 'tooltip' block **/
@@ -31,7 +31,7 @@
 }
 
 a.tooltip:hover {
-     z-index:25; 
+     z-index:25;
      background-color:#ff0;
 }
 
@@ -41,7 +41,7 @@
 
 a.tooltip:hover span.tooltip {
     display:block;
-    position:float;
+    position:float;  /*this line is wrong and ignored. what was it supposed to do? (options are: absolute, fixed, inherit, relative, static)? */
     top:-2em; left:28em; width:5em;
     border:1px solid #0cf;
     background-color:#cff; color:#000;
@@ -58,7 +58,8 @@
 /** 'header' block **/
 
 #header {
-  background: #8DB7DF url('images/banner.png') no-repeat top left;;
+/**  background: #8DB7DF url('images/banner.png') no-repeat top left;; **/
+  background: #8DB7DF url('imagesG/head_left_754x86.gif') no-repeat top left;;
   border-bottom: 1px solid #2E6794;
   width: auto;
   height: 50px;
@@ -155,7 +156,7 @@
 }
 
 .portlet {
-  margin: 10px 0px 10px 0px;
+  margin: 0px 0px 10px 0px;
   padding: 0px;
   border: 1px solid #2E6794;
 }
@@ -163,7 +164,7 @@
 .portlet .header {
   white-space: nowrap;
   padding-left: 0.25em;
-  background-color: #8DB7DF;
+  background-color: #000000;
   color: #FFFFFF;
   font-weight: bold;
   border-width: 0px 0px 1px 0px;
@@ -172,11 +173,15 @@
 }
 
 .portlet .header h2 {
-  margin: 0px;
-  padding: 0px;
-  font-family: "Trebuchet MS", Trebuchet, Arial, Helvetica, Sans-serif;
-  font-size: 100%;
-  float: none;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    /*font-size: 12px;*/
+    height: 18px;
+    line-height: 18px;
+    margin: 0px;
+    padding: 0px;
+    /*font-family: "Trebuchet MS", Trebuchet, Arial, Helvetica, Sans-serif;*/
+    font-size: 100%;
+    float: none;
 }
 
 .portlet .header span {
@@ -255,7 +260,7 @@
   text-align: right;
   margin: 0px 5px 10px 0px;
 }
-
+/*
 input {
   color: #2E6794;
   background-color: #8DB7DF;
@@ -264,7 +269,7 @@
   border-style: solid;
   border-color: #2E6794;
 }
-
+*/
 
 
 

Modified: geronimo/sandbox/portals/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pom.xml?view=diff&rev=560053&r1=560052&r2=560053
==============================================================================
--- geronimo/sandbox/portals/pom.xml (original)
+++ geronimo/sandbox/portals/pom.xml Thu Jul 26 18:34:36 2007
@@ -480,7 +480,6 @@
                 <module>geronimo-pluto</module>
                 <module>pluto-container</module>
                 <module>pluto-portal</module>
-                <module>pluto-testsuite</module>
                 <module>geronimo-console</module>
             </modules>
         </profile>



Mime
View raw message