geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r393787 [21/22] - in /geronimo/trunk/applications: ./ console/ console/console-core/ console/console-core/src/ console/console-core/src/java/ console/console-core/src/java/org/ console/console-core/src/java/org/apache/ console/console-core/...
Date Thu, 13 Apr 2006 11:36:26 GMT
Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,11 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<br />
+<%--   Removed until a better mechanism for rebooting the server is created
+<p>This portlet allows a warm reboot of the server or a shutdown of it.</p>
+<p>A warm reboot will shutdown all applications and services and reboot the Geronimo kernel within the same process. The Geronimo Console session will be disconnected. Reconnect after the server is back up.</p>
+--%>
+<p>This portlet give the admin the ability to remotely shutdown the Geronimo server.</p>
+<p>A shutdown will shutdown the server and cause the JVM to exit. To continue using the Geronimo Console after a shutdown, Geronimo must be restarted.</p>
+<br />

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

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,23 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<br />
+<p><font face="Verdana" size="+1" COLOR=DARKRED><center><b>WARNING: A shutdown of the server will disable this Web Console!</b></center></font></p>
+<p><center>Proceed only if you are certain you want to terminate the server.</center></p>
+<br />
+<%--   Removed until a better mechanism for rebooting the server is created
+<table width="100%">
+<form action="<portlet:actionURL/>">
+<tr><td align="center"><input type="submit" value="Reboot" name="reboot"/></td></tr>
+</form>
+</table>
+--%>
+<br />
+<table width="100%">
+<form action="<portlet:renderURL/>">
+<tr><td align="center"><input type="submit" value="Shutdown" name="shutdown"
+onClick="return confirm('Are you sure you want to shutdown the server (last chance)?');"/></td></tr>
+</form>
+</table>
+<br />
+<br />

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

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,3 @@
+<BR />
+<p><font face="Verdana" size="+1" COLOR=DARKRED><center><b>Server shutdown has been issued.</b></center></font></p>
+<BR />

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

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/help.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/help.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/help.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,31 @@
+This portlet displays and filters the Jetty log file. The Jetty log file contains HTTP accesses and messages from JSP and servlet applications that are running on Geronimo. By default this portlet displays the contents of the log file for the current date. The user can apply filtering criteria to view only data of interest. The user may enter information into any/all/none of the fields, which are defined next.</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; font-weight: bold; text-decoration: underline;">Refresh</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Retrieves the latest lines from the log file while retaining the user's filtering criteria. </td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">From/To</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Display log output from the dates specified.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"> Ignore Dates</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">If this checkbox is checked, filtering will not be done using the date. All log lines that match the other filtering criteria will be displayed regardless of the date.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"> Remote Address</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">A specific remote host can be entered in this field using it's IP address, e.g., 192.168.1.1. </td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Authenticated User</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">A username, such as &quot;system.&quot; </td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"> Request Method</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">This drop-down box allows the user to filter on &quot;ANY&quot;, &quot;POST&quot; and &quot;GET&quot; methods.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;"> Requested URI</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Filtering can be done on the Requested URI field by entering a URI, such as, http://localhost:8080/cviewer/jsp/viewclass.jsp</td>
+  </tr>
+</table>

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

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/help.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/help.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,243 @@
+<%@ 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"%>
+<%!
+java.util.Calendar cal = java.util.Calendar.getInstance();
+int startYear = 1990;
+int currentYear = cal.get(java.util.Calendar.YEAR);
+%>
+<script language="Javascript">
+
+function <portlet:namespace/>loadDates(monthElemName,dateElemName,yearElemName){
+    var yearElem = eval("document.<portlet:namespace/>searchForm." + yearElemName);
+    var monthElem = eval("document.<portlet:namespace/>searchForm." + monthElemName);
+    var dateElem = eval("document.<portlet:namespace/>searchForm." + dateElemName);
+    var monthIndex = parseInt(monthElem.options[monthElem.selectedIndex].value);
+    var selectedYear = parseInt(yearElem.options[yearElem.selectedIndex].value);
+    var totalDays = 0;
+    // February
+    if(monthIndex == 1){
+        totalDays = (isLeapYear(selectedYear)? 29 : 28) 
+    }else if(monthIndex == 0 || monthIndex == 2 || monthIndex == 4 || monthIndex == 6 || monthIndex == 7 ||
+            monthIndex == 9 || monthIndex == 11){
+        totalDays = 31;
+    }else{
+        totalDays = 30;
+    }
+    dateElem.options.length = 0;
+    for(i = 0; i < totalDays; i++){
+        dateElem.options.length += 1; 
+        dateElem.options[i].text = dateElem.options[i].value = i+1;        
+    }            
+}
+
+function isLeapYear(year) {
+    return (year%4 == 0 && (year % 100 != 0 || year % 400 == 0));
+}
+function <portlet:namespace/>refresh(){
+    document.<portlet:namespace/>searchForm.action="<portlet:renderURL><portlet:param name="action" value="refresh"/></portlet:renderURL>";
+    document.<portlet:namespace/>searchForm.submit();
+}
+</script>
+<table>
+<tr>
+<td>
+<a href="javascript:<portlet:namespace/>refresh()">Refresh</a>
+</td>     
+</tr>
+<tr>
+    <td>
+    <form action="<portlet:renderURL/>" name="<portlet:namespace/>searchForm" method="post">
+    <b>Filter results:</b>
+    <table width="680">
+    <c:choose>
+      <c:when test="${fn:length(webContainers) > 1}">
+        <tr>
+            <td colspan="4" class="DarkBackground"><b>Container:</b></td>
+        </tr>
+        <tr>
+            <td>Search Web Container:</td>
+            <td>
+              <select name="selectedContainer">
+            <c:forEach var="webContainer" items="${webContainers}">
+                <option value="${webContainer.value}"<c:if test="${webContainer.value eq selectedContainer}"> selected</c:if>>${webContainer.key}</option>
+            </c:forEach>
+              </select>
+            </td>
+        </tr>
+      </c:when>
+      <c:otherwise>
+      <c:forEach var="webContainer" items="${webContainers}">
+        <tr><td><input type="hidden" name="selectedContainer" value="${webContainer.value}" /></td></tr>
+      </c:forEach>
+      </c:otherwise>
+    </c:choose>
+    <%-- todo: When the user changes the selected container, we need to change the log selection options!!!
+         need some AJAX here.  :)  --%>
+    <c:choose>
+      <c:when test="${fn:length(webLogs) > 1}">
+        <tr>
+            <td colspan="4" class="DarkBackground"><b>Log:</b></td>
+        </tr>
+        <tr>
+            <td>Search Web Log:</td>
+            <td>
+              <select name="selectedLog">
+            <c:forEach var="webLog" items="${webLogs}">
+                <option<c:if test="${webLog eq selectedLog}"> selected</c:if>>${webLog}</option>
+            </c:forEach>
+              </select>
+            </td>
+        </tr>
+      </c:when>
+      <c:otherwise>
+      <c:forEach var="webLog" items="${webLogs}">
+        <tr><td><input type="hidden" name="selectedLog" value="${webLog}" /></td></tr>
+      </c:forEach>
+      </c:otherwise>
+    </c:choose>
+        <tr>
+            <td colspan="4" class="DarkBackground"><b>Date:</b></td>
+        </tr>
+        <tr>
+            <td>From:</td>
+            <td>
+                <select name="startMonth" onchange="<portlet:namespace/>loadDates('startMonth','startDate','startYear');">
+                    <option value="0">January</option><option value="1">February</option>
+                    <option value="2">March</option><option value="3">April</option>
+                    <option value="4">May</option><option value="5">June</option>
+                    <option value="6">July</option><option value="7">August</option>
+                    <option value="8">September</option><option value="9">October</option>
+                    <option value="10">November</option><option value="11">December</option>
+                </select>
+                /
+                <select name="startDate">
+                </select>
+                /
+                <select name="startYear">
+                <%
+                for(int i = startYear;i <= currentYear; i++){
+                %>
+                <option value="<%=i%>"><%=i%></option>
+                <%}%>
+                </select>
+            </td>
+            <td>To:</td>
+            <td>
+                <select name="endMonth" onchange="<portlet:namespace/>loadDates('endMonth','endDate','endYear');">
+                    <option value="0">January</option><option value="1">February</option>
+                    <option value="2">March</option><option value="3">April</option>
+                    <option value="4">May</option><option value="5">June</option>
+                    <option value="6">July</option><option value="7">August</option>
+                    <option value="8">September</option><option value="9">October</option>
+                    <option value="10">November</option><option value="11">December</option>
+                </select>
+                /
+                <select name="endDate">
+                </select>
+                /
+                <select name="endYear">
+                    <%
+                    for(int i = startYear;i <= currentYear; i++){
+                    %>
+                    <option value="<%=i%>"><%=i%></option>
+                    <%}%>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td>Ignore Dates:</td>
+            <td>
+            <input type="checkbox" name="ignoreDates" <c:if test="${ignoreDates}"> checked</c:if>/>
+            </td>
+        </tr>    
+        <tr>
+            <td colspan="4" class="DarkBackground"><b>Identity:</b></td>
+        </tr>
+        <tr>
+            <td>Remote Address:</td>
+            <td><input type="text" name="requestHost" value="${requestHost}"/></td>
+            <td>Authenticated User:</td>
+            <td><input type="text" name="authUser" value="${authUser}"/></td>
+        </tr>
+        <tr>
+            <td colspan="4" class="DarkBackground"><b>Request:</b></td>
+        </tr>
+        <tr>
+            <td>Request Method:</td>
+            <td>
+                <select name="requestMethod">
+                    <option value="" <c:if test="${empty requestMethod or requestMethod eq ''}"> selected</c:if>>ANY</option>
+                    <option <c:if test="${requestMethod == 'GET'}"> selected</c:if>>GET</option>
+                    <option <c:if test="${requestMethod == 'POST'}"> selected</c:if>>POST</option>
+                </select>
+            </td>
+            <td>Requested URI:</td>
+            <td><input type="text" name="requestedURI" value="${requestedURI}"/></td>
+            </td>
+        <tr>
+            <td colspan="4" align="center">
+                <input type="submit" value="Go"/>
+            </td>
+        </tr>
+    </table>
+    </form>    
+    </td>
+</tr>    
+<tr>
+    <td>     
+<c:choose>
+<c:when test="${logs != null && fn:length(logs) > 0}">
+    <table>
+        <tr>
+            <td><b>Found ${fn:length(logs)} matches in logfile (${logLength} lines searched).</b></td>
+        </tr>   
+    <c:forEach var="line" items="${logs}">
+        <tr>
+            <td class="Smaller">
+${line.lineNumber}&nbsp;<c:out escapeXml="true" value="${line.lineContent}" />
+            </td>
+        </tr>
+    </c:forEach>
+    </table>
+</c:when>
+<c:otherwise>
+ No log entries found.
+</c:otherwise>
+</c:choose>  
+</td>     
+</tr>
+</table>
+<script language="Javascript">
+var <portlet:namespace/>form = document.<portlet:namespace/>searchForm;
+<c:if test="${!empty fromDate}">
+<portlet:namespace/>form.startMonth.selectedIndex = ${fromDate.month};
+</c:if>
+<c:if test="${!empty toDate}">
+<portlet:namespace/>form.endMonth.selectedIndex = ${toDate.month};
+</c:if>
+<portlet:namespace/>loadDates('startMonth','startDate','startYear');
+<portlet:namespace/>loadDates('endMonth','endDate','endYear');
+<c:if test="${!empty fromDate}">
+<portlet:namespace/>form.startDate.selectedIndex = ${fromDate.date}-1;
+with(<portlet:namespace/>form){
+    for(var i = 0; i < startYear.options.length; i++){
+        if(startYear.options[i].value == ${fromDate.year} + 1900){
+            startYear.selectedIndex = i;
+            break;
+        }
+    }
+}
+</c:if>
+<c:if test="${!empty toDate}">
+<portlet:namespace/>form.endDate.selectedIndex = ${toDate.date}-1;
+with(<portlet:namespace/>form){
+    for(var i = 0; i < endYear.options.length; i++){
+        if(endYear.options[i].value == ${toDate.year} + 1900){
+            endYear.selectedIndex = i;
+            break;
+        }
+    }
+}
+</c:if>
+</script>
\ No newline at end of file

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

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,91 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<portlet:defineObjects/>
+
+<form name="<portlet:namespace/>" action="<portlet:actionURL/>">
+<input type="hidden" name="mode" value="${mode}">
+<input type="hidden" name="protocol" value="${protocol}">
+<input type="hidden" name="containerObjectName" value="${containerObjectName}">
+<input type="hidden" name="managerObjectName" value="${managerObjectName}">
+<c:if test="${mode eq 'save'}">
+  <input type="hidden" name="objectName" value="${objectName}">
+</c:if>
+<table width="100%%"  border="0">
+
+<!-- Current Task -->
+<c:choose>
+  <c:when test="${mode eq 'add'}">
+    <tr><th colspan="2" align="left">Add new ${protocol} listener for ${containerDisplayName}</th></tr>
+  </c:when>
+  <c:otherwise>
+    <tr><th colspan="2" align="left">Edit connector ${name}</th></tr>
+  </c:otherwise>
+</c:choose>
+
+<!-- Name Field -->
+<c:if test="${mode eq 'add'}">
+  <tr>
+    <td><div align="right">Unique Name: </div></td>
+    <td><input name="name" type="text" size="30"></td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td>A name that is different than the name for any other web connectors in the server</td>
+  </tr>
+</c:if>
+<!-- Host Field -->
+  <tr>
+    <td><div align="right">Host: </div></td>
+    <td>
+      <input name="host" type="text" size="30" value="${host}">
+    </td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td>The host name or IP to bind to.  The normal values are <tt>0.0.0.0</tt> (all interfaces) or <tt>localhost</tt> (local connections only)</td>
+  </tr>
+<!-- Port Field -->
+  <tr>
+    <td><div align="right">Port: </div></td>
+    <td>
+      <input name="port" type="text" size="5" value="${port}">
+	</td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td>The network port to bind to.</td>
+  </tr>
+<!-- Min Threads Field (Jetty only) -->
+<c:if test="${server eq 'jetty'}">
+  <tr>
+    <td><div align="right">Min Threads: </div></td>
+    <td>
+      <input name="minThreads" type="text" size="3" value="${minThreads}">
+	</td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td>The minimum number of threads this connector should use to handle incoming requests</td>
+  </tr>
+</c:if>
+<!-- Max Threads Field -->
+  <tr>
+    <td><div align="right">Max Threads: </div></td>
+    <td>
+      <input name="maxThreads" type="text" size="3" value="${maxThreads}">
+	</td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td>The maximum number of threads this connector should use to handle incoming requests</td>
+  </tr>
+<!-- Submit Button -->
+  <tr>
+    <td><div align="right"></div></td>
+    <td><input name="submit" type="submit" value="Save"></td>
+  </tr>
+</table>
+</form>
+<a href='<portlet:actionURL portletMode="view">
+           <portlet:param name="mode" value="list" />
+         </portlet:actionURL>'>List connectors</a>
\ No newline at end of file

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,263 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
+<portlet:defineObjects/>
+
+<form name="<portlet:namespace/>" action="<portlet:actionURL/>">
+<input type="hidden" name="mode" value="${mode}">
+<input type="hidden" name="protocol" value="${protocol}">
+<input type="hidden" name="containerObjectName" value="${containerObjectName}">
+<input type="hidden" name="managerObjectName" value="${managerObjectName}">
+<c:if test="${mode eq 'save'}">
+  <input type="hidden" name="objectName" value="${objectName}">
+</c:if>
+<table width="100%%"  border="0">
+
+<%-- THIS PART SHOULD BE THE SAME AS THE HTTP CONNECTOR --%>
+
+<!-- Current Task -->
+<c:choose>
+  <c:when test="${mode eq 'add'}">
+    <tr><th colspan="2" align="left">Add new ${protocol} listener for ${containerDisplayName}</th></tr>
+  </c:when>
+  <c:otherwise>
+    <tr><th colspan="2" align="left">Edit connector ${name}</th></tr>
+  </c:otherwise>
+</c:choose>
+
+<!-- Name Field -->
+<c:if test="${mode eq 'add'}">
+  <tr>
+    <td><div align="right">Unique Name: </div></td>
+    <td><input name="name" type="text" size="30"></td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td>A name that is different than the name for any other web connectors in the server (no spaces in the name please)</td>
+  </tr>
+</c:if>
+<!-- Host Field -->
+  <tr>
+    <td><div align="right">Host: </div></td>
+    <td>
+      <input name="host" type="text" size="30" value="${host}">
+    </td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td>The host name or IP to bind to.  The normal values are <tt>0.0.0.0</tt> (all interfaces) or <tt>localhost</tt> (local connections only)</td>
+  </tr>
+<!-- Port Field -->
+  <tr>
+    <td><div align="right">Port: </div></td>
+    <td>
+      <input name="port" type="text" size="5" value="${port}">
+	</td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td>The network port to bind to.</td>
+  </tr>
+<!-- Min Threads Field (Jetty only) -->
+<c:if test="${server eq 'jetty'}">
+  <tr>
+    <td><div align="right">Min Threads: </div></td>
+    <td>
+      <input name="minThreads" type="text" size="3" value="${minThreads}">
+	</td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td>The minimum number of threads this connector should use to handle incoming requests</td>
+  </tr>
+</c:if>
+<!-- Max Threads Field -->
+  <tr>
+    <td><div align="right">Max Threads: </div></td>
+    <td>
+      <input name="maxThreads" type="text" size="3" value="${maxThreads}">
+	</td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td>The maximum number of threads this connector should use to handle incoming requests</td>
+  </tr>
+
+<%-- END OF PART THAT SHOULD BE THE SAME AS THE HTTP CONNECTOR --%>
+
+  <tr>
+    <th colspan="2"><div align="left">SSL Settings</div></th>
+  </tr>
+
+<!-- Keystore File Field -->
+  <tr>
+    <td><div align="right">Keystore File: </div></td>
+    <td>
+      <input name="keystoreFile" type="text" size="30" value="${keystoreFile}">
+	</td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td>The file that holds the keystore (relative to the Geronimo install dir)</td>
+  </tr>
+
+<!-- Keystore Password Field -->
+  <tr>
+    <td><div align="right"><c:if test="${mode eq 'save'}">Change </c:if>Keystore Password: </div></td>
+    <td>
+      <input name="keystorePassword" type="password" size="10">
+	</td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td><c:choose><c:when test="${mode eq 'save'}">Change</c:when><c:otherwise>Set</c:otherwise></c:choose>
+      the password used to access the keystore file.<c:if test="${server ne 'jetty'}">  This is also the
+      password used to access the server private key within the keystore (so the two passwords must be
+      set to be the same on the keystore).</c:if><c:if test="${mode eq 'save'}">  Leave
+      this empty if you don't want to change the current password.</c:if></td>
+  </tr>
+
+<!-- Key Password Field (Jetty only) -->
+<c:if test="${server eq 'jetty'}">
+  <tr>
+    <td><div align="right"><c:if test="${mode eq 'save'}">Change </c:if>Server Key Password: </div></td>
+    <td>
+      <input name="privateKeyPassword" type="password" size="10">
+	</td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td><c:choose><c:when test="${mode eq 'save'}">Change</c:when><c:otherwise>Set</c:otherwise></c:choose>
+      the password used to access the private key in the keystore.<c:if test="${mode eq 'save'}">  Leave
+      this empty if you don't want to change the current password.</c:if></td>
+  </tr>
+</c:if>
+
+<!-- Keystore Type Field -->
+  <tr>
+    <td><div align="right">Keystore Type: </div></td>
+    <td>
+      <select name="keystoreType">
+        <option<c:if test="${keystoreType eq 'JKS' || logLevel eq ''}"> selected</c:if>>JKS</option>
+        <option<c:if test="${keystoreType eq 'PKCS12'}"> selected</c:if>>PKCS12</option>
+      </select>
+	</td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td><c:choose><c:when test="${mode eq 'save'}">Change</c:when><c:otherwise>Set</c:otherwise></c:choose>
+      the keystore type.  There is normally no reason not to use the default (<tt>JKS</tt>).</td>
+  </tr>
+
+<!-- Trust material (Tomcat only) -->
+<c:if test="${server eq 'tomcat'}">
+<!-- Truststore File Field -->
+  <tr>
+    <td><div align="right">Truststore File: </div></td>
+    <td>
+      <input name="truststoreFile" type="text" size="30" value="${truststoreFile}">
+    </td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td>The file that holds the truststore (relative to the Geronimo install dir)</td>
+  </tr>
+
+<!-- Truststore Password Field -->
+  <tr>
+    <td><div align="right"><c:if test="${mode eq 'save'}">Change </c:if>Truststore Password: </div></td>
+    <td>
+      <input name="truststorePassword" type="password" size="10">
+    </td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td><c:choose><c:when test="${mode eq 'save'}">Change</c:when><c:otherwise>Set</c:otherwise></c:choose>
+      the password used to verify the truststore file.<c:if test="${mode eq 'save'}">  Leave
+      this empty if you don't want to change the current password.</c:if></td>
+  </tr>
+
+<!-- Truststore Type Field -->
+  <tr>
+    <td><div align="right">Truststore Type: </div></td>
+    <td>
+      <select name="truststoreType">
+        <option<c:if test="${truststoreType eq 'JKS' || logLevel eq ''}"> selected</c:if>>JKS</option>
+        <option<c:if test="${truststoreType eq 'PKCS12'}"> selected</c:if>>PKCS12</option>
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td><c:choose><c:when test="${mode eq 'save'}">Change</c:when><c:otherwise>Set</c:otherwise></c:choose>
+      the truststore type.  There is normally no reason not to use the default (<tt>JKS</tt>).</td>
+  </tr>
+</c:if>
+
+<!-- Algorithm Field -->
+  <tr>
+    <td><div align="right">HTTPS Algorithm: </div></td>
+    <td>
+      <select name="algorithm">
+        <option value="Default"<c:if test="${algorithm eq 'Default' || algorithm eq ''}"> selected</c:if>>JVM Default</option>
+        <option value="SunX509"<c:if test="${algorithm eq 'SunX509' eq ''}"> selected</c:if>>Sun</option>
+        <option value="IbmX509"<c:if test="${algorithm eq 'IbmX509'}"> selected</c:if>>IBM</option>
+      </select>
+	</td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td><c:choose><c:when test="${mode eq 'save'}">Change</c:when><c:otherwise>Set</c:otherwise></c:choose>
+      the HTTPS algorithm.  This should normally be set to match the JVM vendor.</td>
+  </tr>
+
+<!-- Secure Protocol Field -->
+  <tr>
+    <td><div align="right">HTTPS Protocol: </div></td>
+    <td>
+      <select name="secureProtocol">
+        <option<c:if test="${secureProtocol eq 'TLS' || secureProtocol eq ''}"> selected</c:if>>TLS</option>
+        <option<c:if test="${secureProtocol eq 'SSL'}"> selected</c:if>>SSL</option>
+      </select>
+	</td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td><c:choose><c:when test="${mode eq 'save'}">Change</c:when><c:otherwise>Set</c:otherwise></c:choose>
+      the HTTPS protocol.  This should normally be set to <tt>TLS</tt>, though some (IBM) JVMs don't work properly
+      with popular browsers unless it is changed to <tt>SSL</tt>.</td>
+  </tr>
+
+<!-- Client Auth Field -->
+  <tr>
+    <td><div align="right">Client Auth Required: </div></td>
+    <td>
+      <input type="checkbox" name="clientAuth" <c:if test="${!empty clientAuth}">CHECKED </c:if>/>
+	</td>
+  </tr>
+  <tr>
+    <td><div align="right"></div></td>
+    <td>If set, then clients connecting through this connector must supply a valid client certificate.  The
+        validity is checked using the CA certificates stored in the first of these to be found:
+        <ol>
+          <c:if test="${server eq 'tomcat'}">
+            <li>The trust store configured above</li>
+          </c:if>
+            <li>A keystore file specified by the <tt>javax.net.ssl.trustStore</tt> system property</li>
+            <li><i>java-home</i><tt>/lib/security/jssecacerts</tt></li>
+            <li><i>java-home</i><tt>/lib/security/cacerts</tt></li>
+        </ol>
+    </td>
+  </tr>
+
+
+
+<!-- Submit Button -->
+  <tr>
+    <td><div align="right"></div></td>
+    <td><input name="submit" type="submit" value="Save"></td>
+  </tr>
+</table>
+</form>
+<a href='<portlet:actionURL portletMode="view">
+           <portlet:param name="mode" value="list" />
+         </portlet:actionURL>'>List connectors</a>
\ No newline at end of file

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/help.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/help.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/help.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1 @@
+The Connector Manager displays connections of all types and provide the capability to modify connections for this web server. 
\ No newline at end of file

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

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/help.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/help.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/maximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/maximized.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/maximized.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/maximized.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1 @@
+<%@ include file="normal.jsp" %>
\ No newline at end of file

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

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/maximized.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/maximized.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,84 @@
+<%@ 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"%>
+<portlet:defineObjects/>
+
+<!-- Show existing connectors -->
+<c:choose>
+  <c:when test="${empty(containers)}">There are no Web Containers defined</c:when>
+  <c:otherwise>
+    <c:forEach var="container" items="${containers}">
+      <c:if test="${fn:length(containers) > 1}"><p><b>Connectors for ${container.name}:</b></p></c:if>
+        <c:choose>
+          <c:when test="${empty(container.connectors)}"><p>There are no connectors defined for ${container.name}</p></c:when>
+          <c:otherwise>
+<table width="100%">
+          <tr>
+            <td class="DarkBackground">Name</td>
+            <td class="DarkBackground" align="center">Protocol</td>
+            <td class="DarkBackground" align="center">Port</td>
+            <td class="DarkBackground" align="center">State</td>
+            <td class="DarkBackground" align="center">Actions</td>
+            <td class="DarkBackground" align="center">Type</td>
+          </tr>
+<c:forEach var="info" items="${container.connectors}">
+          <tr>
+            <td>${info.displayName}</td>
+            <td>${info.protocol}</td>
+            <td>${info.port}</td>
+            <td>${info.stateName}</td>
+            <td>
+             <c:choose>
+               <c:when test="${info.stateName eq 'running'}">
+               <a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="stop" />
+                 <portlet:param name="name" value="${info.objectName}" />
+                 <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
+                 <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+               </portlet:actionURL>">stop</a>
+               </c:when>
+               <c:otherwise>
+               <a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="start" />
+                 <portlet:param name="name" value="${info.objectName}" />
+                 <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
+                 <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+               </portlet:actionURL>">start</a>
+               </c:otherwise>
+             </c:choose>
+               <a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="edit" />
+                 <portlet:param name="name" value="${info.objectName}" />
+                 <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
+                 <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+               </portlet:actionURL>">edit</a>
+               <a href="<portlet:actionURL portletMode="view">
+                 <portlet:param name="mode" value="delete" />
+                 <portlet:param name="name" value="${info.objectName}" />
+                 <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
+                 <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+               </portlet:actionURL>">delete</a>
+            </td>
+            <td>${info.description}</td>
+          </tr>
+</c:forEach>
+</table>
+          </c:otherwise>
+        </c:choose>
+
+
+<!-- Links to add new connectors -->
+<c:forEach var="protocol" items="${container.protocols}">
+<br />
+<a href="<portlet:actionURL portletMode="view">
+           <portlet:param name="mode" value="new" />
+           <portlet:param name="protocol" value="${protocol}" />
+           <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
+           <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
+           <portlet:param name="containerDisplayName" value="${container.name}" />
+         </portlet:actionURL>">Add new ${protocol} listener for ${container.name}</a>
+</c:forEach>
+
+    </c:forEach>
+  </c:otherwise>
+</c:choose>

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

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/help.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/help.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/help.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,16 @@
+<p> Geronimo Console will collect statistics on the number of requests received by Geronimo Console and on the number of connections made to the Geronimo server. Click on the enable link to monitor the performance of the Geronimo server.</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">refresh</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Update the display with the latest statistics.</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">disable</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Turn off statistics gathering and return the user to the main page.</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">reset</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Reset all counts, totals, averages, etc., to 0 and start gathering statistics again.</td>
+  </tr>
+</table>
+<p>&nbsp;</p>

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

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/help.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/help.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/maximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/maximized.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/maximized.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/maximized.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1 @@
+<%@ include file="normal.jsp" %>
\ No newline at end of file

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

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/maximized.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/maximized.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/normal.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/normal.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/normal.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,24 @@
+<%@ 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="${statsOn}">
+<table width="50%">
+  <tr><th width="30%">&nbsp;</th><th class="DarkBackground"><strong>Total</strong></th></tr>
+  <tr><td align="right" class="LightBackground"><strong>Requests</strong></td><td align="center" class="LightBackground">${requests}</td></tr>
+  <tr><td align="right" class="MediumBackground"><strong>Connections</strong></td><td align="center" class="MediumBackground">${connections}</td></tr>
+  <tr><td align="right" class="LightBackground"><strong>Errors</strong></td><td align="center" class="LightBackground">${errors}</td></tr>
+</table>
+<table width="50%">
+  <tr><th width="30%">&nbsp;</th><th class="DarkBackground">Count</th><th class="DarkBackground">Average</th><th class="DarkBackground">Max</th></tr>
+  <tr><td align="right" class="LightBackground"><strong>Active Requests</strong></td><td align="center" class="LightBackground">${requestsActive}</td><td align="center" class="LightBackground">&nbsp;</td><td align="center" class="LightBackground">${requestsActive}</td></tr>
+  <tr><td align="right" class="MediumBackground"><strong>Request Duration</strong></td><td align="center" class="MediumBackground">&nbsp;</td><td align="center" class="MediumBackground">${requestsDurationAve}</td><td align="center" class="MediumBackground">${requestsDurationMax}</td></tr>
+  <tr><td align="right" class="LightBackground"><strong>Connections Open</strong></td><td align="center" class="LightBackground">${connectionsOpen}</td><td align="center" class="LightBackground">&nbsp;</td><td align="center" class="LightBackground">${connectionsOpenMax}</td></tr>
+  <tr><td align="right" class="MediumBackground"><strong>Connection Requests</strong></td><td align="center" class="MediumBackground">&nbsp;</td><td align="center" class="MediumBackground">${connectionsRequestsAve}</td><td align="center" class="MediumBackground">${connectionsRequestsMax}</td></tr>
+  <tr><td align="right" class="LightBackground"><strong>Connection Duration</strong></td><td align="center" class="LightBackground">&nbsp;</td><td align="center" class="LightBackground">${connectionsDurationAve}</td><td align="center" class="LightBackground">${connectionsDurationMax}</td></tr>
+  <tr><td colspan="4" align="center"> <a href="<portlet:renderURL/>">refresh</a>&nbsp; <a href="<portlet:actionURL><portlet:param name="stats" value="false"/></portlet:actionURL>">disable</a>&nbsp; <a href="<portlet:actionURL><portlet:param name="resetStats" value="true"/></portlet:actionURL>">reset</a> </td></tr>
+</table>
+</c:if>
+<c:if test="${!statsOn}">
+Statistics are not currently being collected. <br/>
+<a href="<portlet:actionURL><portlet:param name="stats" value="true"/></portlet:actionURL>">enable</a>
+</c:if>

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

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/normal.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/normal.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeHelp.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeHelp.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeHelp.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeHelp.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,7 @@
+
+
+<p><font face="Verdana" size="+1"><center><b>This is the help for the Geronimo Administration Console Welcome.</b></center></font></p>
+
+<P>The welcome portlet is the first page that users see when they log in to the Geronimo Administration Console.  It contains introductory information about the Administration Console and links to other information about Apache Geronimo.</P>
+
+<P>To return to the main Welcome panel select the "view" link from the header of this portlet.</P>

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

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeHelp.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeHelp.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeMaximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeMaximized.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeMaximized.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeMaximized.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1 @@
+<%@ include file="welcomeNormal.jsp" %>
\ No newline at end of file

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

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeMaximized.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeMaximized.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,129 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<%@ page import="org.apache.geronimo.console.util.PortletManager" %>
+<portlet:defineObjects/>
+
+
+<table>
+    <tr>
+
+        <!-- Body -->
+        <td width="90%" align="left" valign="top">
+            <p><font face="Verdana" size="+1"><center><b>Welcome to the Apache Geronimo&#8482;<BR>Administration Console!</b></center></font></p>
+
+            <p>The administration console provides a convenient, user friendly way to administer many aspects of the
+                Geronimo Server.  It is currently a work in progress, and will continue to evolve over time.  The
+                navigation panel on the left-hand side of the screen provides easy access to the individual tasks
+                available in the console.</p>
+
+            <p>This space is the main content area where the real work happens.  Each view contains one or more
+                portlets (self contained view fragments) that typically include a link for help in the header.  Look
+                at the top of this portlet for an example and try it out.</p>
+
+            <p>The references on the right are provided so that you can learn more about Apache Geronimo, its
+                capabilities, and what might be coming in future releases.</p>
+
+            <p>Mailing lists are available to get involved in the development of Apache Geronimo or to ask questions
+                of the community:</p>
+
+           <ul>
+               <li><b><a href="mailto:user-subscribe@geronimo.apache.org">user@geronimo.apache.org</a></b>
+                   (<a href="http://marc.theaimsgroup.com/?l=geronimo-user&r=1&w=2">archives</a>)
+                   for general questions related to configuring and using Geronimo</li>
+               <li><b><a href="mailto:dev-subscribe@geronimo.apache.org">dev@geronimo.apache.org</a></b>
+                   (<a href="http://marc.theaimsgroup.com/?l=geronimo-dev&r=1&w=2">archives</a>)
+                   for developers working on Geronimo</li>
+           </ul>
+
+            <p>So share your experiences with us and let us know how we can make Geronimo even better.</p>
+
+            <p style="text-align: center"><b>Thanks for using Geronimo!</b></p>
+
+
+        </td>
+
+        <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
+
+        <!-- Geronimo Links -->
+        <td valign="top">
+
+            <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
+                <tr>
+                    <td class="DarkBackground" align="left" nowrap>
+                        <font face="Verdana" size="+1">Common Console Actions</font>
+                    </td>
+                </tr>
+                <tr>
+                    <td bgcolor="#FFFFFF" nowrap>
+                        &nbsp;<br />
+	                    <% String consoleServletPath = PortletManager.getConsoleFrameworkServletPath(request); %>
+                        <img src="<%=consoleServletPath%>/../images/ico_db_16x16.gif" /><a href="<%=consoleServletPath%>/services/services_jdbc">Database Pools</a><br />
+                        <img src="<%=consoleServletPath%>/../images/ico_lock_16x16.gif" /><a href="<%=consoleServletPath%>/Security/Security_realms">Security Realms</a><br />
+                        <img src="<%=consoleServletPath%>/../images/ico_beanjar_16x16.gif" /><a href="<%=consoleServletPath%>/services/services_jms">JMS Resources</a><br />
+                        <img src="<%=consoleServletPath%>/../images/ico_list_16x16.gif" /><a href="<%=consoleServletPath%>/apps/apps_all">Deploy Applications</a><br />
+                        <img src="<%=consoleServletPath%>/../images/ico_servcomp_16x16.gif" /><a href="<%=consoleServletPath%>/server/server_web">Web Server Ports</a><br />
+                        <img src="<%=consoleServletPath%>/../images/ico_look_16x16.gif" /><a href="<%=consoleServletPath%>/server/server_info">Memory &amp; Uptime</a><br />
+                        &nbsp;<br />
+                    </td>
+                </tr>
+            </table>
+
+            <br />
+            <br />
+
+            <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
+                <tr>
+                    <td class="DarkBackground" align="left" nowrap>
+                        <font face="Verdana" size="+1">Geronimo Online</font>
+                    </td>
+                </tr>
+                <tr>
+                    <td bgcolor="#FFFFFF" nowrap>
+                        &nbsp;<br />
+                        <a href="http://geronimo.apache.org/">The Geronimo Home Page</a><br />
+                        <a href="http://geronimo.apache.org/redirects/issues.html">Problem Tracking Database</a><br />
+                        <a href="http://geronimo.apache.org/redirects/userMailingList.html">Users Mailing List Archive</a><br />
+                        <a href="http://geronimo.apache.org/redirects/developerMailingList.html">Developers Mailing List Archive</a><br />
+                        <a href="irc://irc.freenode.net/#geronimo">Geronimo IRC chat</a><br />
+                        &nbsp;<br />
+                    </td>
+                </tr>
+            </table>
+
+            <br />
+            <br />
+
+            <table width="100%" border="1" cellspacing="0" cellpadding="3" bordercolor="#000000">
+                <tr>
+                    <td class="DarkBackground" align="left" nowrap>
+                        <font face="Verdana" size="+1">Geronimo Documentation&nbsp;&nbsp;&nbsp;</font>
+                    </td>
+                </tr>
+                <tr>
+                    <td bgcolor="#FFFFFF" nowrap>
+                        &nbsp;<br />
+                        <a href="http://geronimo.apache.org/faq.html">FAQ</a><br />
+                        <a href="http://geronimo.apache.org/redirects/wiki.html">Wiki</a><br />
+                        <a href="http://geronimo.apache.org/documentation.html">Geronimo Documentation</a><br />
+                        <a href="http://geronimo.apache.org/redirects/additionalDocumentation.html">Additional Documentation</a><br />
+                        &nbsp;<br />
+                    </td>
+                </tr>
+            </table>
+
+            <br />
+            <br />
+
+            <p align="right"><font size=-1>
+            <img src="/console/images/powered_by_100x30.gif"/>
+            </font><br />
+            &nbsp;
+            <font size=-1>Copyright &copy; 1999-2005 Apache Software Foundation</font><br />
+            <font size=-1>All Rights Reserved</font></p>
+
+        </td>
+
+    </tr>
+</table>
+
+

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

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message