geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r219976 [9/12] - in /geronimo/trunk: ./ etc/ sandbox/console-core/ sandbox/console-core/src/ sandbox/console-core/src/java/ sandbox/console-core/src/java/org/ sandbox/console-core/src/java/org/apache/ sandbox/console-core/src/java/org/apach...
Date Thu, 21 Jul 2005 01:38:23 GMT
Added: geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java (added)
+++ geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java Wed Jul 20 18:38:12 2005
@@ -0,0 +1,150 @@
+/**
+ *
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed 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.
+ */
+
+package org.apache.geronimo.console.webmanager;
+
+import java.io.IOException;
+
+import javax.management.ObjectName;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
+
+import org.apache.geronimo.console.util.ObjectNameConstants;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelRegistry;
+
+public class WebManagerPortlet extends GenericPortlet {
+
+    private Kernel kernel;
+
+    private PortletRequestDispatcher normalView;
+
+    private PortletRequestDispatcher maximizedView;
+
+    private PortletRequestDispatcher helpView;
+
+    private ObjectName jettyObjectName;
+
+    public void processAction(ActionRequest actionRequest,
+            ActionResponse actionResponse) throws PortletException, IOException {
+        try {
+            String action = actionRequest.getParameter("stats");
+            if (action != null) {
+                Boolean stats = Boolean.valueOf(action);
+                kernel
+                        .setAttribute(jettyObjectName, "collectStatistics",
+                                stats);
+            }
+            if (actionRequest.getParameter("resetStats") != null) {
+                kernel.invoke(jettyObjectName, "resetStatistics");
+            }
+        } catch (Exception e) {
+            throw new PortletException(e);
+        }
+    }
+
+    protected void doView(RenderRequest renderRequest,
+            RenderResponse renderResponse) throws IOException, PortletException {
+        if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
+            return;
+        }
+        try {
+            Boolean statsOn = (Boolean) kernel.getAttribute(jettyObjectName,
+                    "collectStatistics");
+            renderRequest.setAttribute("statsOn", statsOn);
+            if (statsOn.booleanValue()) {
+                renderRequest.setAttribute("connections", (Integer) kernel
+                        .getAttribute(jettyObjectName, "connections"));
+                renderRequest.setAttribute("connectionsOpen", (Integer) kernel
+                        .getAttribute(jettyObjectName, "connectionsOpen"));
+                renderRequest.setAttribute("connectionsOpenMax",
+                        (Integer) kernel.getAttribute(jettyObjectName,
+                                "connectionsOpenMax"));
+                renderRequest.setAttribute("connectionsDurationAve",
+                        (Long) kernel.getAttribute(jettyObjectName,
+                                "connectionsDurationAve"));
+                renderRequest.setAttribute("connectionsDurationMax",
+                        (Long) kernel.getAttribute(jettyObjectName,
+                                "connectionsDurationMax"));
+                renderRequest.setAttribute("connectionsRequestsAve",
+                        (Integer) kernel.getAttribute(jettyObjectName,
+                                "connectionsRequestsAve"));
+                renderRequest.setAttribute("connectionsRequestsMax",
+                        (Integer) kernel.getAttribute(jettyObjectName,
+                                "connectionsRequestsMax"));
+                renderRequest.setAttribute("errors", (Integer) kernel
+                        .getAttribute(jettyObjectName, "errors"));
+                renderRequest.setAttribute("requests", (Integer) kernel
+                        .getAttribute(jettyObjectName, "requests"));
+                renderRequest.setAttribute("requestsActive", (Integer) kernel
+                        .getAttribute(jettyObjectName, "requestsActive"));
+                renderRequest.setAttribute("requestsActiveMax",
+                        (Integer) kernel.getAttribute(jettyObjectName,
+                                "requestsActiveMax"));
+                renderRequest.setAttribute("requestsDurationAve", (Long) kernel
+                        .getAttribute(jettyObjectName, "requestsDurationAve"));
+                renderRequest.setAttribute("requestsDurationMax", (Long) kernel
+                        .getAttribute(jettyObjectName, "requestsDurationMax"));
+            }
+        } catch (Exception e) {
+            throw new PortletException(e);
+        }
+        if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
+            normalView.include(renderRequest, renderResponse);
+        } else {
+            maximizedView.include(renderRequest, renderResponse);
+        }
+    }
+
+    protected void doHelp(RenderRequest renderRequest,
+            RenderResponse renderResponse) throws PortletException, IOException {
+        helpView.include(renderRequest, renderResponse);
+    }
+
+    public void init(PortletConfig portletConfig) throws PortletException {
+        super.init(portletConfig);
+        kernel = KernelRegistry.getSingleKernel();
+        try {
+            jettyObjectName = new ObjectName(
+                    ObjectNameConstants.WEBCONTAINER_OBJECT_NAME);
+        } catch (Exception e) {
+            throw new AssertionError();
+        }
+
+        normalView = portletConfig.getPortletContext().getRequestDispatcher(
+                "/WEB-INF/view/webmanager/normal.jsp");
+        maximizedView = portletConfig.getPortletContext().getRequestDispatcher(
+                "/WEB-INF/view/webmanager/maximized.jsp");
+        helpView = portletConfig.getPortletContext().getRequestDispatcher(
+                "/WEB-INF/view/webmanager/help.jsp");
+    }
+
+    public void destroy() {
+        normalView = null;
+        maximizedView = null;
+        kernel = null;
+        super.destroy();
+    }
+
+}

Propchange: geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/portlet.xml?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/portlet.xml (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/portlet.xml Wed Jul 20 18:38:12 2005
@@ -0,0 +1,546 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright 2004 The Apache Software Foundation
+Licensed  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.
+-->
+<portlet-app
+    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+    version="1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
+                        http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
+	<portlet>
+        <description>Portlet for managing applications</description>
+        <portlet-name>Applications</portlet-name>
+        <display-name>Applications Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.configmanager.ConfigManagerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>        
+
+		<portlet-info>
+			<title>Installed Applications</title>
+			<short-title>Applications</short-title>
+			<keywords>Applications</keywords>
+        </portlet-info>
+	</portlet>
+
+	<portlet>
+        <description>Portlet for deploying applications</description>
+        <portlet-name>Deployment</portlet-name>
+        <display-name>Application Deployment Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.configmanager.DeploymentPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>
+
+		<portlet-info>
+			<title>Install New Applications</title>
+			<short-title>Install Application</short-title>
+			<keywords>Deployment</keywords>
+        </portlet-info>
+	</portlet>
+
+	<portlet>
+        <description>Portlet for managing database connections</description>
+        <portlet-name>Databases</portlet-name>
+        <display-name>Database Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.databasemanager.DatabaseManagerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>
+
+		<portlet-info>
+			<title>Database Connections</title>
+			<short-title>Databases</short-title>
+			<keywords>Databases</keywords>
+        </portlet-info>
+	</portlet>
+    <portlet>
+        <description>Portlet for managing JMS connections</description>
+        <portlet-name>JMSConnections</portlet-name>
+        <display-name>JMS Connection Factory Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.jmsmanager.JMSConnectionFactoryManagerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>JMS Connection Factories</title>
+            <short-title>JMS Connection Factories</short-title>
+            <keywords>JMS</keywords>
+        </portlet-info>
+    </portlet>
+    
+    <portlet>
+        <description>Portlet for managing users from the Geronimo Console realm.</description>
+        <portlet-name>SEUsers</portlet-name>
+        <display-name>Geronimo Console Users Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.securitymanager.SEUsersPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>        
+
+		<portlet-info>
+			<title>Console Realm Users</title>
+			<short-title>Users</short-title>
+			<keywords>Console Realm Users</keywords>
+        </portlet-info>
+	</portlet>
+
+
+	<portlet>
+        <description>Portlet for managing groups from the Console realm.</description>
+        <portlet-name>SEGroups</portlet-name>
+        <display-name>Console Realm Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.securitymanager.SEGroupsPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>        
+
+		<portlet-info>
+			<title>Console Realm Groups</title>
+			<short-title>Groups</short-title>
+			<keywords>Console Realm Groups</keywords>
+        </portlet-info>
+	</portlet>
+	
+        <!-- log manager portlets -->
+	<portlet>
+        <description>Portlet for managing Logging.</description>
+        <portlet-name>LogManager</portlet-name>
+        <display-name>Log Manager Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.logmanager.LogManagerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>        
+
+		<portlet-info>
+			<title>Log Manager</title>
+			<short-title>Log Manager</short-title>
+			<keywords>Log, Manager</keywords>
+        </portlet-info>
+	</portlet>
+	<portlet>
+        <description>Portlet for viewing the server logs.</description>
+        <portlet-name>LogViewer</portlet-name>
+        <display-name>Server Log Viewer Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.logmanager.LogViewerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>        
+
+		<portlet-info>
+			<title>Server Log Viewer</title>
+			<short-title>Server Log Viewer</short-title>
+			<keywords>Log, Viewer</keywords>
+        </portlet-info>
+	</portlet>
+	<portlet>
+        <description>Portlet for viewing the derby System database logs.</description>
+        <portlet-name>DerbyLogViewer</portlet-name>
+        <display-name>Derby Log Viewer Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.derbylogmanager.DerbyLogViewerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>        
+
+		<portlet-info>
+			<title>Derby Log Viewer</title>
+			<short-title>Derby Log Viewer</short-title>
+			<keywords>Derby, Log, Viewer</keywords>
+        </portlet-info>
+	</portlet>
+	<portlet>
+        <description>Portlet for viewing the web access logs.</description>
+        <portlet-name>WebAccessLogViewer</portlet-name>
+        <display-name>Web Access Viewer Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.logmanager.WebAccessLogViewerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>        
+
+		<portlet-info>
+			<title>Web Access Log Viewer</title>
+			<short-title>Web Access Log Viewer</short-title>
+			<keywords>Web, Access, Log, Viewer</keywords>
+        </portlet-info>
+	</portlet>
+    <portlet>
+        <description>Portlet for displaying server info</description>
+        <portlet-name>ServerInfo</portlet-name>
+        <display-name>Server Info Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.infomanager.ServerInfoPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			      <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		    </supports>
+
+        <supported-locale>en</supported-locale>
+
+		    <portlet-info>
+			      <title>Server Info</title>
+			      <short-title>ServerInfo</short-title>
+			      <keywords>ServerInfo</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for displaying java system info</description>
+        <portlet-name>JavaSysInfo</portlet-name>
+        <display-name>Java System Info Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.infomanager.JavaSystemInfoPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			      <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		    </supports>
+
+        <supported-locale>en</supported-locale>
+
+		    <portlet-info>
+			      <title>System Property values for the Server JVM</title>
+			      <short-title>System</short-title>
+			      <keywords>System Properties</keywords>
+        </portlet-info>
+    </portlet>
+
+	<!--  JMS Management Portlet -->
+    <portlet>
+        <description>Portlet for managing JMS Topics and Queues.</description>
+        <portlet-name>JMSManager</portlet-name>
+        <display-name>JMS Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.jmsmanager.JMSManagerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+	    <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+	</supports>
+
+        <supported-locale>en</supported-locale>        
+
+		<portlet-info>
+			<title>JMS Destination Manager</title>
+			<short-title>JMSManager</short-title>
+			<keywords>JMS Manager</keywords>
+                </portlet-info>
+    </portlet>
+
+	<portlet>
+        <description>Portlet for managing the web server</description>
+        <portlet-name>WebServerManager</portlet-name>
+        <display-name>Web Server Mangement Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.webmanager.WebManagerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>        
+
+		<portlet-info>
+			<title>Web Server Manager</title>
+			<short-title>Web Servers</short-title>
+			<keywords>Web Servers</keywords>
+        </portlet-info>
+	</portlet>
+	<portlet>
+        <description>Portlet for managing HTTP connectors</description>
+        <portlet-name>HTTPConnectorManager</portlet-name>
+        <display-name>HTTP Connector Mangement Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.webmanager.HttpManagerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>        
+
+		<portlet-info>
+			<title>HTTP Connectors</title>
+			<short-title>HTTP Connectors</short-title>
+			<keywords>HTTP Connectors</keywords>
+        </portlet-info>
+	</portlet>
+	<portlet>
+        <description>Portlet for managing HTTPS connectors</description>
+        <portlet-name>HTTPSConnectorManager</portlet-name>
+        <display-name>HTTPS Connector Mangement Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.webmanager.HttpsManagerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>        
+
+		<portlet-info>
+			<title>HTTPS Connectors</title>
+			<short-title>HTTPS Connectors</short-title>
+			<keywords>HTTPS Connectors</keywords>
+        </portlet-info>
+	</portlet>
+	<portlet>
+        <description>Portlet for managing AJP13 connectors</description>
+        <portlet-name>AJP13ConnectorManager</portlet-name>
+        <display-name>AJP13 Connector Mangement Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.webmanager.AJP13ManagerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>        
+
+		<portlet-info>
+			<title>AJP13 Connectors</title>
+			<short-title>AJP13 Connectors</short-title>
+			<keywords>AJP13 Connectors</keywords>
+        </portlet-info>
+	</portlet>
+
+    <portlet>
+        <description>Portlet for viewing Repository</description>
+        <portlet-name>RepositoryViewer</portlet-name>
+        <display-name>Repository Viewer Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.repository.RepositoryViewPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>
+
+		<portlet-info>
+			<title>Repository Viewer</title>
+			<short-title>Repository Viewer</short-title>
+			<keywords>Repository</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for ManagingServer</description>
+        <portlet-name>ServerManager</portlet-name>
+        <display-name>Server Management Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.servermanager.ServerManagerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+			<mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		</supports>
+
+        <supported-locale>en</supported-locale>
+
+		<portlet-info>
+			<title>Server Manager</title>
+			<short-title>Server Manager</short-title>
+			<keywords>Server</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for displaying internal DB info</description>
+        <portlet-name>InternalDB</portlet-name>
+        <display-name>Internal Database Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.internaldb.InternalDBPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			      <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		    </supports>
+
+        <supported-locale>en</supported-locale>
+
+		    <portlet-info>
+			      <title>DB Info</title>
+			      <short-title>DB Info</short-title>
+			      <keywords>DB Info</keywords>
+        </portlet-info>
+    </portlet>
+    
+    <portlet>
+        <description>Portlet for viewing database contents</description>
+        <portlet-name>DBViewer</portlet-name>
+        <display-name>Database Viewer Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.internaldb.DBViewerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+			      <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+		    </supports>
+
+        <supported-locale>en</supported-locale>
+
+		    <portlet-info>
+			      <title>DB Viewer</title>
+			      <short-title>DB Viewer</short-title>
+			      <keywords>DB Viewer</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for running SQL commands</description>
+        <portlet-name>RunSQL</portlet-name>
+        <display-name>Run SQL Portlet</display-name>
+		
+        <portlet-class>org.apache.geronimo.console.internaldb.RunSQLPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+		        
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+		    <portlet-info>
+			      <title>Run SQL</title>
+			      <short-title>Run SQL</short-title>
+			      <keywords>Run SQL</keywords>
+        </portlet-info>
+    </portlet>
+ </portlet-app>

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/tld/portlet.tld
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/tld/portlet.tld?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/tld/portlet.tld (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/tld/portlet.tld Wed Jul 20 18:38:12 2005
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE taglib PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
+  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<!-- 
+Copyright 2004 The Apache Software Foundation
+Licensed  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>
+    <tlibversion>1.0</tlibversion>
+    <jspversion>1.1</jspversion>
+    <shortname>Tags for portlets</shortname>
+    <tag>
+        <name>defineObjects</name>
+        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
+        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
+        <bodycontent>empty</bodycontent>
+    </tag>
+    <tag>
+        <name>param</name>
+        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
+        <bodycontent>empty</bodycontent>
+        <attribute>
+            <name>name</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>actionURL</name>
+        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
+        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
+        <bodycontent>JSP</bodycontent>
+        <attribute>
+            <name>windowState</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>portletMode</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>secure</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>renderURL</name>
+        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
+        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
+        <bodycontent>JSP</bodycontent>
+        <attribute>
+            <name>windowState</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>portletMode</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>secure</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>namespace</name>
+        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
+        <bodycontent>empty</bodycontent>
+    </tag>
+</taglib>
\ No newline at end of file

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,20 @@
+<%@ page import="java.io.PrintWriter"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<c:if test="${! outcome}"><pre>${outcome}</pre></c:if>
+<form enctype="multipart/form-data" method="POST" action="<portlet:actionURL><portlet:param name="action" value="deploy"/></portlet:actionURL>">
+<table>
+  <tr><th align="right">Archive: </th><td><input type="file" name="module" /></td></tr>
+  <tr><th align="right">Plan: </th><td><input type="file" name="plan" /></td></tr>
+  <tr>
+    <td></td>
+    <td><input name="startApp" type="checkbox" value="yes" checked>Start app after install</td>
+  </tr>
+  <tr>
+    <td></td>
+    <td><input type="submit" value="Install" /></td>
+  </tr>
+</table>
+</form>
\ No newline at end of file

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/deploy.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/deployHelp.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/deployHelp.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/deployHelp.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/deployHelp.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,21 @@
+<portlet:defineObjects/>
+<p>This portlet allows the user to deploy new applications on Geronimo. Web applications require deployment plans, which are either packaged with the war file or kept in a separate file which is typically called geronimo-jetty.xml.<br>
+</p>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong>Archive</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Browse to select the war file in the Archive box. </td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><strong>Plan</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">If the deployment plan is separate from the war file, then browse to select it.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Start app after install</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Check this to automatically start the application when it is installed. Otherwise, the user can start the application by clicking on the associated &quot;Start&quot; toggle in the&quot;Installed Applications&quot; window. By default this checkbox is checked and newly installed applications will automatically be started.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 5px 10px"><img src="/console/images/install.gif" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Click on Install to install the application in the Geronimo server.</td>
+  </tr>
+</table>

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/deployHelp.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/help.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/help.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/help.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,11 @@
+ <p>This page lists the applications that have been installed in the server and whether they are running or stopped. There are four columns; two provide information and the other two allow user action. The first column indicates the state of the application, either &quot;stopped&quot; or &quot;running.&quot; The fourth column shows the configID of the application. The two remaining columns are:</p>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;">Stop/Start</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">The stop/start toggle can be clicked to stop or start an application. If the toggle says &quot;Stop&quot; the application is running so clicking on the Stop toggle will stop the application and vice versa.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;">Uninstall</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">The uninstall link will undeploy/remove the application from Geronimo.</td>
+  </tr>
+</table>

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/maximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/maximized.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/maximized.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/maximized.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,15 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<table width="100%">
+    <c:forEach var="configInfo" items="${configurations}">
+        <tr>
+            <td width="500">${configInfo.state}</td>
+            <td>
+<c:if test="${configInfo.state.running}"><a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="stop"/></portlet:actionURL>">Stop</a></c:if>
+<c:if test="${configInfo.state.stopped}"><a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="start"/></portlet:actionURL>">Start</a></c:if>
+</td>
+            <td>${configInfo.configID}</td>
+        </tr>
+    </c:forEach>
+</table>

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/maximized.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,21 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<table width="100%">
+
+    <br />${messageInstalled} ${messageStatus}
+    <c:forEach var="configInfo" items="${configurations}">
+        <tr>
+            <td width="100">${configInfo.state}</td>
+            <td width="100">
+<c:if test="${configInfo.state.running}"><a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="stop"/></portlet:actionURL>">Stop</a></c:if>
+<c:if test="${configInfo.state.stopped}"><a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="start"/></portlet:actionURL>">Start</a></c:if>
+<c:if test="${configInfo.state.failed}"><a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="stop"/></portlet:actionURL>">Stop</a></c:if>
+            </td>
+            <td width="100">
+              <a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="uninstall"/></portlet:actionURL>">Uninstall</a>
+            </td>
+            <td>${configInfo.configID}</td>
+        </tr>
+    </c:forEach>
+</table>

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/addDS.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/addDS.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/addDS.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/addDS.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,138 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<portlet:defineObjects/>
+<script language="javascript">
+<!--
+	function doCheck(){
+		var poolMax = <portlet:namespace/>.poolMaxSize.value;
+        var poolInit = <portlet:namespace/>.poolInitSize.value;
+        
+        if(isNaN(parseFloat(poolMax))){
+            alert("Please enter a numeric value for Pool Max Capacity.");
+            return false;
+        }
+        if(isNaN(parseFloat(poolInit))){ 
+            alert("Please enter a numeric value for Pool Initial Capacity.");
+            return false;
+        }
+        return true;
+	}
+//-->
+</script>
+
+<form name="<portlet:namespace/>" action="<portlet:actionURL/>" onSubmit="return doCheck();">
+<input type="hidden" name="mode" value="addDS">
+<table width="100%%"  border="0">
+  <tr>
+    <td width="16%"> <div align="right">Name: </div></td>
+    <td width="84%"><input name="dsName" type="text" size="50"></td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td> <p>Name of this JDBC data source.</td>
+  </tr>
+  <tr>
+    <td><div align="right"> JNDI Name: </div></td>
+    <td> <p>
+      <input name="jndiName" type="text" size="50">
+    </td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td> <p> JNDI path to bind this JDBC data source.</td>
+  </tr>
+  <tr>
+    <td> <div align="right">Dependency: </div></td>
+    <td>
+	<select name="dependency">
+	<c:forEach var="item" items="${dependencies}">
+	  <option value="${item}">${item}</option>
+	</c:forEach>	
+    </select>
+	<!--
+	<select name="dependency">
+		<option value="Cloudscape">Cloudscape</option>
+		<option value="DB2">DB2</option>
+		<option value="Informix">Informix</option>
+		<option value="mm-mysql/jars/mysqlconnector-3.0.14.jar">MS SQL Server</option>
+		<option value="MySQL">MySQL</option>
+		<option value="Oracle">Oracle</option>
+		<option value="PointBase" selected>PointBase</option>
+		<option value="PostgreSQL">PostgreSQL</option>
+		<option value="Progress">Progress</option>\
+		<option value="Sybase">Sybase</option>
+    </select>
+	-->
+	</td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td>Dependency jar file of this JDBC data source. To add new file go to <a href="/console/portal/repo">Repository</a>.</td>
+  </tr>
+  <tr>
+    <td> <div align="right">Driver Classname: </div></td>
+    <td><input name="driverClass" type="text" size="50"></td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td> JDBC driver class (use full package name).</td>
+  </tr>
+  <tr>
+    <td> <div align="right">DB URL: </div></td>
+    <td><input name="jdbcUrl" type="text" size="50"></td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td> URL of the database to connect to (check your JDBC driver documentation for proper format).</td>
+  </tr>
+  <tr>
+    <td> <div align="right">DB User Name: </div></td>
+    <td><input name="dbUser" type="text" size="50"></td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td> Database account user name. </td>
+  </tr>
+  <tr>
+    <td><div align="right"> DB Password: </div></td>
+    <td><input name="dbPassword" type="password"></td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td> Database account password. </td>
+  </tr>
+  <!--
+  <tr>
+    <td><div align="right"> DB Properties: </div></td>
+    <td><textarea name="dbProperties" cols="40"></textarea></td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td> List of properties passed to the JDBC driver. List each property=value pair on a separate line. </td>
+  </tr>
+  -->
+  <tr>
+    <td> <div align="right">Pool Max Capacity: </div></td>
+    <td><input name="poolMaxSize" type="text" size="20" value="0"></td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td> Maximum database connection pool size. </td>
+  </tr>
+  <tr>
+    <td> <div align="right">Pool Initial Capacity: </div></td>
+    <td><input name="poolInitSize" type="text" size="20" value="0"></td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td> Initial database connection pool size. </td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td><input name="submit" type="submit" value="Create"></td>
+  </tr>
+</table>
+</form>
+<a href='<portlet:actionURL portletMode="view">
+           <portlet:param name="mode" value="list" />
+         </portlet:actionURL>'>List Datasources</a>
\ No newline at end of file

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/addDS.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/config.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/config.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/config.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/config.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,43 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<script language="javascript">
+<!--
+	function doSave(){
+		document.datasource_form.action="<portlet:actionURL portletMode="view"/>";
+		document.datasource_form.mode.value="save";
+		return true;
+	}
+	function doCancel(){
+		document.datasource_form.action="<portlet:actionURL portletMode="view"/>";
+		document.datasource_form.mode.value="detail";
+		return true;
+	}
+//-->
+</script>
+	
+<form name="datasource_form">
+<input type="hidden" name="name" value="${ds.objectName}" />
+<input type="hidden" name="mode" value="detail" />
+
+<br>
+<strong>Connection Name:</strong>&nbsp;${ds.jndiName}
+<br><br>
+<table width="100%">
+    <tr><td><strong>UserName</strong></td><td><input type="text" name="UserName" value="${ds.userName}" size="75" /></td></tr>
+    <tr><td><strong>Password</strong></td><td><input type="password" name="password1" size="75" /></td></tr>
+    <tr><td><strong>Repeat&nbsp;Password</strong></td><td><input type="password" name="password2" size="75" /></td></tr>
+<c:if test="${badPassword}"><tr><td colspan=2">Passwords did not match</td></tr></c:if>
+    <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
+    <tr><td><strong>Database Name</strong></td><td><input type="text" name="DatabaseName" value="${ds.databaseName}" size="75" /></td></tr>
+    <tr><td><strong>Create Database</strong></td><td><input type="text" name="CreateDatabase" value="${ds.createDatabase}" size="75" /></td></tr>
+    <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
+    <tr><td><strong>Partition Max Size</strong></td><td><input type="text" name="partitionMaxSize" value="${connectionManagerInfo.partitionMaxSize}" size="75" /></td></tr>
+    <tr><td><strong>Partition Min Size</strong></td><td><input type="text" name="partitionMinSize" value="${connectionManagerInfo.partitionMinSize}" size="75" /></td></tr>
+    <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
+    <tr><td><strong>Login Timeout (Seconds)</strong></td><td><input type="text" name="LoginTimeout" value="${ds.loginTimeout}" size="75" /></td></tr>
+    <tr><td><strong>Blocking Timeout (Milliseconds)</strong></td><td><input type="text" name="blockingTimeoutMilliseconds" value="${connectionManagerInfo.blockingTimeoutMilliseconds}" size="75" /></td></tr>
+    <tr><td><strong>Idle Timeout (Minutes)</strong></td><td><input type="text" name="idleTimeoutMinutes" value="${connectionManagerInfo.idleTimeoutMinutes}" size="75" /></td></tr>
+    <tr><td colspan="2"><input type="submit" name="btnSave" value="Save" onClick="doSave();"/><input type="submit" name="btnCancel" value="Cancel" onClick="doCancel();"></td></tr>
+</table>
+</form>
\ No newline at end of file

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/config.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/normal.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/normal.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/normal.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,28 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<br>
+<strong>Connection Name:</strong>&nbsp;${ds.name}
+<br><br>
+<table width="100%">
+    <tr><td><strong>UserName</strong></td><td>${ds.userName}</td></tr>
+    <tr><td><strong>Database Name</strong></td><td>${ds.databaseName}</td></tr>
+    <tr><td><strong>Create Database</strong></td><td>${ds.createDatabase}</td></tr>
+    <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
+    <tr><td><strong>ConnectionCount</strong></td><td>${connectionManagerInfo.connectionCount}</td></tr>
+    <tr><td><strong>IdleConnectionCount</strong></td><td>${connectionManagerInfo.idleConnectionCount}</td></tr>
+    <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
+    <tr><td><strong>PartitionCount</strong></td><td>${connectionManagerInfo.partitionCount}</td></tr>
+    <tr><td><strong>PartitionMaxSize</strong></td><td>${connectionManagerInfo.partitionMaxSize}</td></tr>
+    <tr><td><strong>PartitionMinSize</strong></td><td>${connectionManagerInfo.partitionMinSize}</td></tr>
+    <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
+    <tr><td><strong>Login Timeout (Seconds)</strong></td><td>${ds.loginTimeout}</td></tr>
+    <tr><td><strong>BlockingTimeout (Milliseconds)</strong></td><td>${connectionManagerInfo.blockingTimeoutMilliseconds}</td></tr>
+    <tr><td><strong>Idle Timeout (Minutes)</strong></td><td>${connectionManagerInfo.idleTimeoutMinutes}</td></tr>
+    <tr><td colspan="2" align="center">
+        <a href='<portlet:renderURL><portlet:param name="name" value="${ds.objectName}"/><portlet:param name="mode" value="config"/></portlet:renderURL>'>change</a>
+        &nbsp;
+        <a href='<portlet:renderURL><portlet:param name="mode" value="list"/></portlet:renderURL>'>back</a>
+    </td></tr>
+</table>
+

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/derby/normal.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/generic/config.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/generic/config.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/generic/config.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/generic/config.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,35 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<form name="datasource_form" action="<portlet:actionURL portletMode="view"/>">
+<input type="hidden" name="name" value="add">
+<br>
+<strong>Connection Name:</strong>&nbsp;${attributeMap.name}
+<br><br>
+<table width="100%">
+        <tr>
+            <th>Property</th>
+            <th>Value</th>
+        </tr>
+    <c:forEach var="entry" items="${attributeMap}">
+        <tr>
+            <td><strong>${entry.key}</strong></td>
+            <td><input type="text" name="txt${entry.key}" value="${entry.value}" size="75"></td>
+        </tr>
+    </c:forEach>
+    		<tr>
+    			<td colspan="2">
+    				<table width="100%">
+    					<tr>
+    						<td width="10%">&nbsp</td>
+    						<td>
+    							<input type="submit" name="btnSave" value="Save">
+									<input type="reset" name="btnReset" value="Reset">
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>    			
+</table>
+</form>

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/generic/config.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/generic/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/generic/normal.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/generic/normal.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/generic/normal.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,33 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<form name="datasource_form" action="<portlet:actionURL portletMode="view"/>">
+<br>
+<strong>Connection Name:</strong>&nbsp;${attributeMap.name}
+<br><br>
+<table width="100%">
+        <tr>
+            <th>Property</th>
+            <th>Value</th>
+        </tr>
+    <c:forEach var="entry" items="${attributeMap}">
+        <tr>
+            <td><strong>${entry.key}</strong></td>
+            <td>${entry.value}</td>
+        </tr>
+    </c:forEach>
+    		<tr>
+    			<td colspan="2">
+    				<table width="100%">
+    					<tr>
+    						<td width="10%">&nbsp</td>
+    						<td>
+    							<input type="submit" name="btnBack" value="Back to Datasources">
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>	
+</table>
+<input type="hidden" name="name" value="back">
+</form>
\ No newline at end of file

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/generic/normal.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/help.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/help.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/help.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,95 @@
+This portlet displays the name and the state of installed databases, allows the user to test the database connection, and allows the user to add new datasources.<br>
+<br>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;" width="150" align="right" valign="top">detail</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><p>Each data source has a detail link. Clicking on it will provide detailed information about that database. From the &quot;detail&quot; page the user can<br>
+click on the &quot;change&quot; link to update the fields. For information on the detail page and the database fields, see below.<br>
+      </p>    </td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px" width="150" align="right" valign="top"><strong>Name</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">The name of the database.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px" width="150" align="right" valign="top"><strong> Global JNDI Name</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><p>The global JNDI name is assigned by the site administrator. It is used when trying to connect to the resource (database or queue/topic) from an application client. It should not be used from other server-side components. It should be  unique for every resource deployed in Geronimo. Currently users of Geronimo are not provided a mechanism for entering a value in this field.</p>    </td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px" width="150" align="right" valign="top"><strong>State</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">State of the database, either &quot;running&quot; or &quot;stopped.&quot;</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px" width="150" align="right" valign="top"><strong>Test Result</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><p>Clicking on this link will test the connection  to the database and return a result. If the 
+database is connected, the result will say &quot;Connected.&quot; Otherwise, there will be a &quot;Failed&quot; message with details about the failure.</p>    </td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;" width="150" align="right" valign="top">Add New Datasource</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px"><p>Clicking on this link allows the user to add a new datasource. On the add new datasource form, fill in the fields and click on the Create button to add the new datasource. The fields are defined on the page itself.</p>    </td>
+  </tr>
+</table>
+<p><br>The detail page shows the properties associated with the database. The user (or DB Administrator) can change these properties by clicking on the &quot;change&quot; link. </p>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;" width="150" align="right" valign="top">change</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Allows the user to edit the fields.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; font-size: 10px; color: #546BC7; text-decoration: underline; font-weight: bold;" width="150" align="right" valign="top">back</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Displays the previous screen.</td>
+  </tr>
+</table>
+<p>Clicking on the change link will bring up another page. This page allows the user to change the properties associated with the database. The fields are defined as follows:</p>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px; color: #1E1E52;" width="150" align="right" valign="top"><strong>UserName</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Username that is used to connect to the database.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px; color: #1E1E52;" width="150" align="right" valign="top"><strong>Password</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Password for the database user.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px; color: #1E1E52;" width="150" align="right" valign="top"><strong>Driver</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">The JDBC class name for the database driver. </td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px; color: #1E1E52;" width="150" align="right" valign="top"><strong>ConnectionURL</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">The JDBC URL for connecting to the database.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px; color: #1E1E52;" width="150" align="right" valign="top"><strong>ExceptionSorterClass</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">The class that is responsible for determining whether any given SQL Exception is fatal, and if so, the connection will be closed and released from the pool. Current options for this field are &quot;NoExceptionsAreFatalSorter&quot; or &quot;AllExceptionsAreFatalSorter.&quot;</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px; color: #1E1E52;" width="150" align="right" valign="top"><strong>Partition Count</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">By default set to 1 because there is typically only one partition. The rare circumstances in which this value might change are:<br>
+<br>a.) if application managed security is used, i.e., the user/password is supplied in getConnection(user,pw) call.<br>
+<br>b.) if container managed security is used (mapping the JAAS subject to a db user/pw).</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px; color: #1E1E52;" width="150" align="right" valign="top"><strong>Connection Count</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Total number of connections summed over all partitions.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px; color: #1E1E52;" width="150" align="right" valign="top"><strong>IdleConnectionCount</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Maximum number of idle connections allowed.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px; color: #1E1E52;" width="150" align="right" valign="top"><strong>PartitionMaxSize</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">The maximum number of simultaneous connections allowed to this connection pool.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px; color: #1E1E52;" width="150" align="right" valign="top"><strong>PartitionMinSize</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">The minimum size of the connection pool.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px; color: #1E1E52;" width="150" align="right" valign="top"><strong>BlockingTimeout (ms)</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">If a caller attempts to connect to the database while all the connection pools are in use, the caller will wait this long for an available connection.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 5px 10px; color: #1E1E52;" width="150" align="right" valign="top"><strong> Idle Timeout (minutes)</strong></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">How often the pool is checked for unused connections. If any connection has been unused for this interval, that connection will be closed and removed from the pool.</td>
+  </tr>
+</table>

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/maximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/maximized.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/maximized.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/maximized.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,15 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<table width="100%">
+    <c:forEach var="configInfo" items="${configurations}">
+        <tr>
+            <td width="500">${configInfo.state}</td>
+            <td>
+<c:if test="${configInfo.state.running}"><a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="changeState" value="stop"/></portlet:actionURL>">Stop</a></c:if>
+<c:if test="${configInfo.state.stopped}"><a href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param name="changeState" value="start"/></portlet:actionURL>">Start</a></c:if>
+</td>
+            <td>${configInfo.configID}</td>
+        </tr>
+    </c:forEach>
+</table>

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/maximized.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/config.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/config.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/config.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/config.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,40 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<script language="javascript">
+<!--
+	function doSave(){
+		document.datasource_form.action="<portlet:actionURL portletMode="view"/>";
+		document.datasource_form.mode.value="save";
+		return true;
+	}
+	function doCancel(){
+		document.datasource_form.action="<portlet:actionURL portletMode="view"/>";
+		document.datasource_form.mode.value="detail";
+		return true;
+	}
+//-->
+</script>
+	
+<form name="datasource_form">
+<input type="hidden" name="name" value="${ds.objectName}" />
+<input type="hidden" name="mode" value="detail" />
+
+<br>
+<strong>Connection Name:</strong>&nbsp;${ds.name}
+<br><br>
+<table width="100%">
+    <tr><td><strong>UserName</strong></td><td><input type="text" name="user" value="${ds.user}" size="75" /></td></tr>
+    <tr><td><strong>Password</strong></td><td><input type="password" name="password1" size="75" /></td></tr>
+    <tr><td><strong>Repeat&nbsp;Password</strong></td><td><input type="password" name="password2" size="75" /></td></tr>
+    <c:if test="${badPassword}"><tr><td colspan=2">Passwords did not match</td></tr></c:if>
+    <tr><td><strong>Server Name</strong></td><td><input type="text" name="serverName" value="${ds.serverName}" size="75" /></td></tr>
+    <tr><td><strong>Port no.</strong></td><td><input type="text" name="portNumber" value="${ds.portNumber}" size="75" /></td></tr>
+    <tr><td><strong>DB Name</strong></td><td><input type="text" name="ConnectionURL" value="${ds.databaseName}" size="75" /></td></tr>
+    <!-- <tr><td><strong>Global JNDI Name</strong></td><td><input type="text" name="globalJNDIName" value="${ds.globalJNDIName}" size="75" /></td></tr> -->
+    <tr><td colspan="2">
+      <input type="submit" name="btnSave" value="Save" onClick="doSave();"/>
+      <input type="submit" name="btnCancel" value="Cancel" onClick="doCancel();">
+    </td></tr>
+</table>
+</form>
\ No newline at end of file

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/config.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/normal.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/normal.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/normal.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,20 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<br>
+<strong>Connection Name:</strong>&nbsp;${ds.name}
+<br><br>
+
+<table width="100%">
+    <tr><td><strong>User</strong></td><td>${ds.user}</td></tr>
+    <!-- <tr><td><strong>Password</strong></td><td>${ds.password}</td></tr> -->
+    <tr><td><strong>Server Name</strong></td><td>${ds.serverName}</td></tr>
+    <tr><td><strong>Port no.</strong></td><td>${ds.portNumber}</td></tr>
+    <tr><td><strong>DB Name</strong></td><td>${ds.databaseName}</td></tr>
+    <tr><td><strong>Global JNDI Name</strong></td><td>${ds.globalJNDIName}</td></tr>
+    <tr><td colspan="2" align="center">
+        <a href='<portlet:renderURL><portlet:param name="name" value="${ds.objectName}"/><portlet:param name="mode" value="config"/></portlet:renderURL>'>change</a>
+        &nbsp;
+        <a href='<portlet:renderURL><portlet:param name="mode" value="list"/></portlet:renderURL>'>back</a>
+    </td></tr>
+</table>
\ No newline at end of file

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/mssql/normal.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/normal.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/normal.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/normal.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,42 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<table width="100%">
+    <tr>
+        <th>&nbsp;</th>
+        <th align="left">Name</th>
+        <th align="left">Global JNDI Name</th>
+        <th align="left">State</th>
+        <th align="left">Test Result</th>
+    </tr>
+    <c:forEach var="info" items="${dataSources}"><tr>
+        <td><a href='<portlet:renderURL><portlet:param name="name" value="${info.objectName}"/><portlet:param name="mode" value="detail"/></portlet:renderURL>'>detail</a></td>
+        <td>${info.name}</td>
+        <td>${info.jndiName}</td>
+        <td><c:choose>
+            <c:when test='${info.state == 0}'>Starting</c:when>
+            <c:when test='${info.state == 1}'>Running</c:when>
+            <c:when test='${info.state == 2}'>Stopping</c:when>
+            <c:when test='${info.state == 3}'>Stopped</c:when>
+            <c:when test='${info.state == 4}'>Failed</c:when>
+        </c:choose></td>
+        <td>
+        		<c:if test="${!info.working}">
+        			<a href='<portlet:renderURL>
+        					<portlet:param name="name" value="${info.objectName}"/>
+        					<portlet:param name="mode" value="list"/>
+        					<portlet:param name="check" value="true"/></portlet:renderURL>'>
+        					test connection
+        			</a>
+        		</c:if>
+        		<c:if test="${info.working}">
+        			${info.message}
+        		</c:if>
+        </td>
+        <!--<td><c:if test="${info.working}">Connected</c:if><c:if test="${!info.working}">Failed: ${info.message}</c:if></td>-->
+    </tr></c:forEach>
+</table>
+<br>
+<a href="<portlet:actionURL portletMode="view">
+           <portlet:param name="mode" value="addDS" />
+         </portlet:actionURL>">Add New Datasource</a>

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/normal.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/config.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/config.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/config.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/config.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,42 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<script language="javascript">
+<!--
+	function doSave(){
+		document.datasource_form.action="<portlet:actionURL portletMode="view"/>";
+		document.datasource_form.mode.value="save";
+		return true;
+	}
+	function doCancel(){
+		document.datasource_form.action="<portlet:actionURL portletMode="view"/>";
+		document.datasource_form.mode.value="detail";
+		return true;
+	}
+//-->
+</script>
+	
+<form name="datasource_form">
+<input type="hidden" name="name" value="${ds.objectName}" />
+<input type="hidden" name="mode" value="detail" />
+
+<br>
+<strong>Connection Name:</strong>&nbsp;${ds.jndiName}
+<br><br>
+<table width="100%">
+    <tr><td><strong>UserName</strong></td><td><input type="text" name="UserName" value="${ds.userName}" size="75" /></td></tr>
+    <tr><td><strong>Password</strong></td><td><input type="password" name="password1" size="75" /></td></tr>
+    <tr><td><strong>Repeat&nbsp;Password</strong></td><td><input type="password" name="password2" size="75" /></td></tr>
+<c:if test="${badPassword}"><tr><td colspan=2">Passwords did not match</td></tr></c:if>
+    <tr><td><strong>Driver</strong></td><td><input type="text" name="Driver" value="${ds.driver}" size="75" /></td></tr>
+    <tr><td><strong>ConnectionURL</strong></td><td><input type="text" name="ConnectionURL" value="${ds.connectionURL}" size="75" /></td></tr>
+    <tr><td><strong>ExceptionSorterClass</strong></td><td><input type="text" name="ExceptionSorterClass" value="${ds.exceptionSorterClass}" size="75" /></td></tr>
+
+
+    <tr><td><strong>Partition Max Size</strong></td><td><input type="text" name="partitionMaxSize" value="${connectionManagerInfo.partitionMaxSize}" size="75" /></td></tr>
+    <tr><td><strong>Partition Min Size</strong></td><td><input type="text" name="partitionMinSize" value="${connectionManagerInfo.partitionMinSize}" size="75" /></td></tr>
+    <tr><td><strong>Blocking Timeout (Milliseconds)</strong></td><td><input type="text" name="blockingTimeoutMilliseconds" value="${connectionManagerInfo.blockingTimeoutMilliseconds}" size="75" /></td></tr>
+    <tr><td><strong>Idle Timeout (Minutes)</strong></td><td><input type="text" name="idleTimeoutMinutes" value="${connectionManagerInfo.idleTimeoutMinutes}" size="75" /></td></tr>
+    <tr><td colspan="2"><input type="submit" name="btnSave" value="Save" onClick="doSave();"/><input type="submit" name="btnCancel" value="Cancel" onClick="doCancel();"></td></tr>
+</table>
+</form>
\ No newline at end of file

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/config.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/normal.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/normal.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/normal.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,25 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<br>
+<strong>Connection Name:</strong>&nbsp;${ds.name}
+<br><br>
+<table width="100%">
+    <tr><td><strong>UserName</strong></td><td>${ds.userName}</td></tr>
+    <tr><td><strong>Driver</strong></td><td>${ds.driver}</td></tr>
+    <tr><td><strong>ConnectionURL</strong></td><td>${ds.connectionURL}</td></tr>
+    <tr><td><strong>ExceptionSorterClass</strong></td><td>${ds.exceptionSorterClass}</td></tr>
+    <tr><td><strong>PartitionCount</strong></td><td>${connectionManagerInfo.partitionCount}</td></tr>
+    <tr><td><strong>ConnectionCount</strong></td><td>${connectionManagerInfo.connectionCount}</td></tr>
+    <tr><td><strong>IdleConnectionCount</strong></td><td>${connectionManagerInfo.idleConnectionCount}</td></tr>
+    <tr><td><strong>PartitionMaxSize</strong></td><td>${connectionManagerInfo.partitionMaxSize}</td></tr>
+    <tr><td><strong>PartitionMinSize</strong></td><td>${connectionManagerInfo.partitionMinSize}</td></tr>
+    <tr><td><strong>BlockingTimeout (Milliseconds)</strong></td><td>${connectionManagerInfo.blockingTimeoutMilliseconds}</td></tr>
+    <tr><td><strong>Idle Timeout (Minutes)</strong></td><td>${connectionManagerInfo.idleTimeoutMinutes}</td></tr>
+    <tr><td colspan="2" align="center">
+        <a href='<portlet:renderURL><portlet:param name="name" value="${ds.objectName}"/><portlet:param name="mode" value="config"/></portlet:renderURL>'>change</a>
+        &nbsp;
+        <a href='<portlet:renderURL><portlet:param name="mode" value="list"/></portlet:renderURL>'>back</a>
+    </td></tr>
+</table>
+

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/databasemanager/tranql/normal.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/derbylogmanager/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/derbylogmanager/help.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/derbylogmanager/help.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/derbylogmanager/help.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1 @@
+This portlet views the log file for Geronimo's internal database, Derby.
\ No newline at end of file

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/derbylogmanager/help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,37 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<c:set var="increment" value="10"/>
+<table>
+<tr>
+<td>
+<a href="<portlet:renderURL><portlet:param name="action" value="refresh"/></portlet:renderURL>">Refresh</a> 
+</td>     
+</tr>
+<tr>
+    <td>     
+<c:choose>
+<c:when test="${logs != null && fn:length(logs) > 0}">
+    <table>
+        <tr>
+            <td class="Smaller">
+            <b>${lines} total line(s) in log file.</b>
+            </td>
+        </tr>    
+            
+    <c:forEach var="line" items="${logs}">
+        <tr>
+            <td class="Smaller">
+            ${line}
+            </td>
+        </tr>
+    </c:forEach>
+    </table>
+</c:when>
+<c:otherwise>
+ No logs found.
+</c:otherwise>
+</c:choose>  
+</td>     
+</tr>
+</table>

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysHelp.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysHelp.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysHelp.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysHelp.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1 @@
+This page displays the values of the system properties available to the server process.
\ No newline at end of file

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysHelp.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysMaximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysMaximized.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysMaximized.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysMaximized.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1 @@
+<%@ include file="javaSysNormal.jsp" %>
\ No newline at end of file

Propchange: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/infomanager/javaSysMaximized.jsp
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message