geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r219976 [11/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/apac...
Date Thu, 21 Jul 2005 01:38:23 GMT
Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,127 @@
+<%@ 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"%>
+<script language="JavaScript">
+var numbers = new Array(0,1,2,3,4,5,6,7,8,9);
+var max = ${lineCount};
+function <portlet:namespace/>binarySearch(criteria, arr, left, right){
+    var pos = parseInt((left+right)/2);
+    if(criteria == arr[pos]) return pos;
+    else if(left >= right) return -1;
+    else if(criteria > arr[pos]) return <portlet:namespace/>binarySearch(criteria, arr, pos+1, right);
+    else return <portlet:namespace/>binarySearch(criteria, arr, left, pos-1);
+}
+
+function <portlet:namespace/>search(criteria, arr){
+    return <portlet:namespace/>binarySearch(criteria, arr, 0, arr.length)
+}
+
+function <portlet:namespace/>isNumeric(candidate){
+    for(i = 0; i < candidate.length; i++){
+        if(<portlet:namespace/>search(candidate.charAt(i),numbers) < 0){
+            return false;
+        }
+    }
+    return true;
+}
+
+function <portlet:namespace/>validateForm(){
+    var startPos = document.<portlet:namespace/>searchForm.startPos.value;
+    var endPos = document.<portlet:namespace/>searchForm.endPos.value;
+    if(startPos.length < 1){
+        alert("Please input a start position.");
+        document.<portlet:namespace/>searchForm.startPos.focus();
+        return false;
+    }
+    if(endPos.length < 1){
+        alert("Please input an end position.");
+        document.<portlet:namespace/>searchForm.endPos.focus();
+        return false;
+    }
+    if(!<portlet:namespace/>isNumeric(startPos)){
+        alert("Start Position must be a positive integer.");
+        document.<portlet:namespace/>searchForm.startPos.focus();
+        return false;
+    }
+    if(parseInt(startPos) < 1){
+        alert("Start Position must be a non-zero positive integer.");
+        document.<portlet:namespace/>searchForm.startPos.focus();
+        return false;
+     }
+    if(!<portlet:namespace/>isNumeric(endPos) ||
+            parseInt(endPos) > ${lineCount}){
+        alert("End Position must be a positive integer less than or equal to ${lineCount}.");
+        document.<portlet:namespace/>searchForm.endPos.focus();
+        return false;
+    }
+    if(parseInt(endPos) < 1){
+        alert("End Position must be a non-zero positive integer.");
+        document.<portlet:namespace/>searchForm.endPos.focus();
+        return false;
+     }
+    if(parseInt(startPos) > parseInt(endPos)){
+        alert("Start position must be less than or equal to end position.");
+        document.<portlet:namespace/>searchForm.startPos.focus();
+        return false;
+    }
+    return true;
+}
+</script>
+
+<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 class="Smaller" valign="middle">
+    <form action="<portlet:renderURL/>" name="<portlet:namespace/>searchForm" onsubmit="return <portlet:namespace/>validateForm();">
+    <b>Filter results:</b>
+    <input type="hidden" value="search" name="action"/>
+    Lines <input type="text" name="startPos" value="${startPos}" size="3"/>
+    to <input type="text" name="endPos" value="${endPos}" size="3"/>
+    Level 
+    <select name="logLevel">
+        <option value=""<c:if test="${logLevel eq ''}"> selected</c:if>>ALL</option>
+        <option<c:if test="${logLevel eq 'DEBUG'}"> selected</c:if>>DEBUG</option>
+        <option<c:if test="${logLevel eq 'INFO'}"> selected</c:if>>INFO</option>
+        <option<c:if test="${logLevel eq 'WARN'}"> selected</c:if>>WARN</option>
+        <option<c:if test="${logLevel eq 'ERROR'}"> selected</c:if>>ERROR</option>
+        <option<c:if test="${logLevel eq 'FATAL'}"> selected</c:if>>FATAL</option>
+        <option<c:if test="${logLevel eq 'TRACE'}"> selected</c:if>>TRACE</option>
+    </select>
+    Containing text <input type="text" name="searchString" value="${searchString}"/>
+    <input type="submit" value="Go"/>
+    </form>
+    </td>
+</tr>    
+<tr>
+    <td>     
+
+<c:choose>
+<c:when test="${searchResults != null && fn:length(searchResults) > 0}">
+    <table>
+        <tr>
+            <td class="Smaller">
+            <b>${lineCount} total message(s) in log file. ${fn:length(searchResults)} matched your criteria.</b>
+            </td>
+        </tr>    
+            
+    <c:forEach var="line" items="${searchResults}">
+        <tr>
+            <td class="Smaller">
+            ${line}
+            </td>
+        </tr>
+    </c:forEach>
+    </table>
+</c:when>
+<c:otherwise>
+ No logs found with the specified criteria.
+</c:otherwise>
+</c:choose>  
+</td>     
+</tr>
+</table>

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/view.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/view.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/view.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/view.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,70 @@
+
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+
+<script>
+function trim(str){
+    if(!str) return "";
+    else if(str.charAt(0) == " "){       
+        return trim(str.substring(1));
+    }else if(str.charAt(str.length-1) == " "){
+        return trim(str.substring(0,str.length-1));
+    }else return str;    
+}
+function <portlet:namespace/>validateForm(){
+    with(document.<portlet:namespace/>update){
+        if(trim(logFile.value).length == ""){
+            alert("Please input the log file name.");
+            logFile.value="";
+            logFile.focus();
+            return false;
+        }
+        if(trim(layoutPattern.value) == ""){
+            alert("Please input layout pattern.");
+            layoutPattern.value="";
+            layoutPattern.focus();
+            return false;
+        }
+        
+    }
+    return true;
+}
+</script>
+
+<form name="<portlet:namespace/>update" action="<portlet:actionURL/>" onsubmit="return <portlet:namespace/>validateForm()">
+<input type="hidden" name="action" value="update"/>
+<table width="680">
+<tr>
+<!--
+		renderRequest.setAttribute("configuration", LogHelper.getConfiguration());
+		renderRequest.setAttribute("logLevel", LogHelper.getLogLevel());
+		renderRequest.setAttribute("refreshPeriod", LogHelper.getRefreshPeriod());
+
+-->
+    <td nowrap>Config File</td>
+    <td><input type="text" name="configFile" value="${configFile}" size="45"/></td>
+</tr>
+<tr>
+    <td nowrap>Refresh Period</td>
+    <td><input type="text" name="refreshPeriod" value="${refreshPeriod}" size="45"/></td>
+</tr>
+<tr>
+    <td nowrap>Log Level</td>
+    <td>
+    <select name="logLevel">
+        <option<c:if test="${logLevel eq 'ALL'}"> selected</c:if>>ALL</option>
+        <option<c:if test="${logLevel eq 'DEBUG'}"> selected</c:if>>DEBUG</option>
+        <option<c:if test="${logLevel eq 'INFO'}"> selected</c:if>>INFO</option>
+        <option<c:if test="${logLevel eq 'WARN'}"> selected</c:if>>WARN</option>
+        <option<c:if test="${logLevel eq 'ERROR'}"> selected</c:if>>ERROR</option>
+        <option<c:if test="${logLevel eq 'FATAL'}"> selected</c:if>>FATAL</option>
+        <option<c:if test="${logLevel eq 'TRACE'}"> selected</c:if>>TRACE</option>
+        <option<c:if test="${logLevel eq 'OFF'}"> selected</c:if>>OFF</option>
+    </select>
+    </td>
+</tr>
+<tr>   
+    <td colspan="2" align="center" class="formElement"><input type="submit" value="Update"/> <input type="reset" value="Reset"/></td>
+</tr>
+</table>
+</form>
\ No newline at end of file

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/viewhelp.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/viewhelp.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/viewhelp.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/logmanager/viewhelp.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,18 @@
+ <p>This portlet displays the Geronimo server log and is helpful for 
+  debugging problems with the Geronimo Console and with deployed
+  applications.</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" >Resets the filtering criteria to Geronimo Console's defaults and displays the latest 11 lines in the Geronimo log file.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground"style="padding: 10px 10px 10px 5px; color: #1E1E52; font-weight: bold;">Filter results</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Allows the user to customize the filtering criteria. The user can display any line of the log file starting at the first line of the log file through the end. Note: A browser may limit how many lines can be 
+displayed at once. <br>
+<br>
+The user may filter on the log level to display only log lines at that level. <br>
+<br>
+The user may also enter a string of text to search for.</td>
+  </tr>
+</table>

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/repository/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/repository/help.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/repository/help.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/repository/help.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,20 @@
+<p>This page displays the artifacts installed in the server's repository. The layout of the repository is the same as that used by Apache Maven making it possible to easily copy files over. The Geronimo Console provides a method for adding artifacts:</p><br>
+
+<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"><img src="/console/images/browse.gif" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px">Browse to select the artifact to be added.</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 this button to install the artifact.</td>
+  </tr>
+</table>
+
+<p>To use an artifact in an application, add a dependency element into it's deployment plan. For example, to use Castor XML add the following XML to the plan:
+<pre>
+    &lt;dependency&gt;
+        &lt;uri&gt;castor/jars/castor-0.9.5.3.jar&lt;/uri&gt;
+    &lt;/dependency&gt;
+</pre>
+</p>
\ No newline at end of file

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/repository/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/repository/normal.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/repository/normal.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/repository/normal.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,57 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<c:set var="rooturl" value="${requestScope['org.apache.geronimo.console.repo.root']}"/>
+<c:set var="reslist" value="${requestScope['org.apache.geronimo.console.repo.list']}"/>
+
+<style type="text/css">  
+	div.Hidden {
+	display: none;
+	}
+	
+	div.Shown {
+	display: block;
+	font-size: 10px;
+	}
+</style>  
+
+<script language="JavaScript">
+
+state1 = false;
+
+function toggle1() {
+	state1 = !state1;
+	document.getElementById("first").className = state1 ? "Shown" : "Hidden";
+} 
+</script>
+
+<table width="100%">
+<th>root URL: <c:out value="${rooturl}"/></th>
+<tr>
+ <center><td>
+ <form enctype="multipart/form-data" method="POST" action="<portlet:actionURL><portlet:param name="action" value="deploy"/></portlet:actionURL>">
+ <table> 
+  <th align="center"><center>Add File to Repository</center></th>
+  <tr>
+
+    <tr>
+   <td>File</td><td><input type="file" name="local">&nbsp;&nbsp;&nbsp;   All uploaded files are placed in the 'uploaded' directory.</td>
+  </tr>  
+ </table> 
+ 
+  </td>
+  <tr>
+    <center><td><input type="submit" value="Install" /></td></center>
+  </tr>
+  <tr><td>&nbsp;</td></tr>
+  <tr><td>&nbsp;</td></tr>
+  </center>
+</tr>
+ </form>
+<c:forEach items="${reslist}" var="res">
+<tr><td><c:out value="${res}"/></td></tr>
+</c:forEach>
+<tr><td>&nbsp;</td></tr>
+<tr><td>&nbsp;</td></tr>
+</table>

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/addmaximized.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,130 @@
+<%@ 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"%>
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>addgroup";
+var <portlet:namespace/>requiredFields = new Array("GroupName","Description");
+function <portlet:namespace/>validateForm(){
+    return (textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields));
+}
+function <portlet:namespace/>move(formName, from, to){
+    var objFrom = eval("document." + formName + "." + from);
+    var objTo = eval("document." + formName + "." + to);
+    for(var pos = objFrom.length-1; pos >=0; pos--){ 
+        if(objFrom.options[pos].selected){
+            objTo.options.length += 1;
+            objTo.options[objTo.options.length-1].value = objFrom.options[pos].value;
+            objTo.options[objTo.options.length-1].text = objFrom.options[pos].text;
+            <portlet:namespace/>removeAt(objFrom,pos);
+        }
+    }    
+}
+function <portlet:namespace/>removeAt(obj,pos){
+    for(var i = pos; i < obj.options.length-1; i++){
+        obj.options[i].value = obj.options[i+1].value;
+        obj.options[i].text = obj.options[i+1].text;
+    }
+    obj.options.length -= 1;    
+}
+function <portlet:namespace/>selectAll(formName, objName){
+    var obj = eval("document." + formName + "." + objName);
+    for(var i = 0; i < obj.options.length; i++){
+        obj.options[i].selected = true;
+    }
+    return true;
+}
+</script>
+<c:set var="add" value="${group == null}"/>
+<form name="<portlet:namespace/>addgroup" action="<portlet:actionURL portletMode="view"/>">
+
+    <table cellspacing="5">
+    <tr>
+      <td colspan="2" align="left" class="formHeader">
+       <c:choose>
+	   <c:when test="${add}"> 
+       		<b>ADD GROUP</b>
+      		<c:set var="GroupName" value=""/>
+      		<c:set var="Description" value=""/>
+      		<c:set var="Submit" value="Add"/>
+       </c:when>
+       <c:otherwise>
+			<b>UPDATE GROUP</b>
+      		<c:set var="GroupName" value="${group['GroupName']}"/>
+      		<c:set var="Description" value="${group['Description']}"/>
+      		<c:set var="Submit" value="Update"/>
+       </c:otherwise>
+       </c:choose>
+        </td>
+    </tr>
+    <tr>
+        <td width="200" class="formLabel">Group Name</td>
+        <td class="formElement">
+       <c:choose>
+	   <c:when test="${add}"> 
+	    <input type="hidden" name="action" value="add">
+	    <input type="text" name="GroupName" value="">
+       </c:when>
+       <c:otherwise>
+	    <input type="hidden" name="action" value="update">
+        <input type="hidden" name="GroupName" value="${GroupName}">
+        ${GroupName}
+       </c:otherwise>
+       </c:choose>       
+        </td>
+    </tr>   
+
+    <tr>
+        <td width="200" class="formLabel">Description</td>
+        <td class="formElement"><input type="text" name="Description" value="${Description}"></td>
+    </tr>   
+    <tr>
+        <td class="formLabel">Users</td>
+        <td colspan="2" class="formElement">
+        <c:choose>
+        <c:when test="${(otherUsers != null && fn:length(otherUsers) > 0) || (users != null && fn:length(users) > 0)}">
+        <table>
+            <tr>
+                <td>
+                    <select name="usersToRemove" size="4" multiple>
+            	    <c:forEach var="user" items="${otherUsers}">
+                	    <option value="${user}">${user}</option>
+                	</c:forEach>    
+                    </select> 
+                </td>
+                <td align="center" valign="middle">
+                <input type = "button" 
+                    value="&nbsp;&nbsp;&nbsp;&nbsp;Add &gt;&gt;&nbsp;&nbsp;&nbsp;&nbsp;"
+                    onclick="<portlet:namespace/>move('<portlet:namespace/>addgroup','usersToRemove','Members');"
+                    />
+                    
+                    <br/>
+                <input type = "button" value="&lt;&lt; Remove"
+                    onclick="<portlet:namespace/>move('<portlet:namespace/>addgroup','Members','usersToRemove');"
+                    />                
+                </td> 
+                <td>
+                <select name="Members" size="4" multiple>
+                <c:forEach var="user" items="${users}">
+                    <option value="${user}">${user}</option>
+                </c:forEach>    
+                </select> 
+                </td>
+            </tr>   
+            </table>
+        </c:when>
+        <c:otherwise>
+        No available users.
+        </c:otherwise>
+        </c:choose>       
+        </td>
+    </tr>
+    <tr>   
+          <td>&nbsp;</td>
+          <td align="left" class="formElement">
+          <input type="submit" value="${Submit}" 
+                onclick="return <portlet:namespace/>validateForm() && <portlet:namespace/>selectAll('<portlet:namespace/>addgroup', 'Members');">
+          <input type="submit" name="cancel"  value="Cancel">
+          </td>
+    </tr>
+    </table>
+</form>
\ No newline at end of file

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

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

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/error.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/error.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/error.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/error.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1 @@
+ERROR: ${errorMessage}
\ No newline at end of file

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/help.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/help.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/help.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,31 @@
+ <p>This portlet lists all the Application Realm groups and allows the 
+  user to add, modify and delete them. To add a new group click on
+  the &quot;Create New Group&quot; link and fill in the fields on that page. To 
+  modify an existing group, click on the group link and change the 
+  field(s) on the page. To delete a group, click on the &quot;Delete&quot; link 
+  to the right of the group to be deleted. <br>
+  <br>
+  Clicking on the &quot;Create New Group&quot; link allows creation of a new
+  group by filling in the fields and clicking on the &quot;Add&quot; button.</p>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Group Name</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The name of the group.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Description</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The description of the group.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Users</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The box on the left lists all the current user accounts. Selecting a user and then clicking the &quot;Add&gt;&gt;&quot; button will put the user in the group. Selecting a user in the list to the right and clicking on the &quot;&lt;&lt;Remove&quot; button will delete the user from the group.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/add.gif" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Clicking this button will create the new group. If users had been put in the new group, clicking &quot;Add&quot; will create the new group with the selected users in it.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/cancel.gif" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Will cancel the creation of the new group and return the previous page to the browser.</td>
+  </tr>
+</table>

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/maximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/maximized.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/maximized.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/groups/maximized.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%">
+    ${message}
+ 	<tr>
+		<td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>">Create New Group</a> </td><td colspan="2">&nbsp;</td>
+	</tr>
+        <tr>
+            <td width="100">Group Name</td>
+            <td width="150">Description</td>
+            <td></td>
+        </tr>
+    <c:forEach var="group" items="${groups}">
+        <tr>
+            <td width="100"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="edit"/><portlet:param name="group" value="${group.key}"/></portlet:actionURL>">${group.key}</a></td>
+            <td width="150">${group.value}</td>
+            <td><a href="<portlet:actionURL><portlet:param name="group" value="${group.key}"/><portlet:param name="action" value="delete"/></portlet:actionURL>" onclick="return confirm('Confirm Delete?');">Delete</a></td>
+        </tr>
+    </c:forEach>
+</table>

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

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

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/addmaximized.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,100 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<script language="JavaScript">
+var formName = "adduser";
+var requiredFields = new Array("UserName","Password");
+function <portlet:namespace/>validateForm(){
+    return textElementsNotEmpty(formName,requiredFields) && <portlet:namespace/>passwordMatch(); 
+}
+function <portlet:namespace/>passwordMatch(){
+     with(document.adduser){
+        if(Password.value != ConfirmPassword.value){
+            alert("Password and confirm password do not match!");
+            Password.focus();
+            return false;
+        }
+    }
+}
+
+</script>
+<c:set var="add" value="${user == null}"/>
+<form name="adduser" action="<portlet:actionURL portletMode="view"/>" >
+    <table cellspacing="5">
+    <tr>
+      <td colspan="2" align="left" class="formHeader">
+       <c:choose>
+	   <c:when test="${add}"> 
+       		<b>ADD USER</b>
+      		<c:set var="UserName" value=""/>
+      		<c:set var="Password" value=""/>
+      		<c:set var="Password2" value=""/>
+      		<c:set var="FirstName" value=""/>
+      		<c:set var="MiddleInit" value=""/>
+      		<c:set var="LastName" value=""/>
+      		<c:set var="Department" value=""/>
+      		<c:set var="Email" value=""/>
+      		<c:set var="Submit" value="Add"/>
+       </c:when>
+       <c:otherwise>
+			<b>UPDATE USER</b>
+      		<c:set var="UserName" value="${user['UserName']}"/>
+      		<c:set var="Password" value="xxxxxxxx"/>
+      		<c:set var="Password2" value="yyyyyyyy"/>      		
+      		<c:set var="FirstName" value="${user['FirstName']}"/>
+      		<c:set var="MiddleInit" value="${user['MiddleInit']}"/>
+      		<c:set var="LastName" value="${user['LastName']}"/>
+      		<c:set var="Department" value="${user['Department']}"/>
+      		<c:set var="Email" value="${user['Email']}"/>
+      		<c:set var="Submit" value="Update"/>
+       </c:otherwise>
+       </c:choose>
+        </td>
+    </tr>
+    <tr>
+        <td width="200" class="formLabel">User Name</td>
+        <td class="formElement">
+       <c:choose>
+	   <c:when test="${add}"> 
+	    <input type="hidden" name="action" value="add">
+	    <input type="text" name="UserName" value="" maxlength="30">
+       </c:when>
+       <c:otherwise>
+	    <input type="hidden" name="action" value="update">
+        <input type="hidden" name="UserName" value="${UserName}">
+        ${UserName}
+       </c:otherwise>
+       </c:choose>       
+        </td>
+    </tr>   
+    <tr>
+        <td width="200" class="formLabel">Password</td>
+        <td class="formElement"><input type="password" name="Password" value="${Password}" maxlength="30"></td>
+    </tr>   
+    <tr>
+        <td width="200">Confirm Password</td>
+        <td><input type="password" name="ConfirmPassword" value="${Password2}" maxlength="30"></td>
+    </tr>
+    <tr>
+        <td width="200" class="formLabel">Given Name</td>
+        <td class="formElement"><input type="text" name="FirstName" value="${FirstName}" maxlength="30"></td>
+    </tr>
+
+    <input type="hidden" name="MiddleInit" value="" >
+    <tr>
+        <td width="200" class="formLabel">Family Name</td>
+        <td class="formElement"><input type="text" name="LastName" value="${LastName}" maxlength="30"></td>
+    </tr>
+    <tr>
+        <td width="200" class="formLabel">Department</td>
+        <td class="formElement"><input type="text" name="Department" value="${Department}" maxlength="30"></td>
+    </tr>
+    <tr>
+        <td width="200" class="formLabel">Email</td>
+        <td class="formElement"><input type="text" name="Email" value="${Email}" maxlength="30"></td>
+    </tr>
+
+    <tr>   
+         <td>&nbsp;</td><td  align="left"><input type="submit" value="${Submit}" class="formElement" onclick="return <portlet:namespace/>validateForm()"> <input type="submit" name="cancel" value="Cancel" ></td>
+    </tr>
+    </table>
+</form>
\ No newline at end of file

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

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

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/error.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/error.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/error.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/error.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1 @@
+ERROR: ${errorMessage}
\ No newline at end of file

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/help.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/help.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/help.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,37 @@
+ <p>This page lists all the application realm users and allows you to add, modify and delete them. To add a new user click on the &quot;Create New User&quot; link and fill in the fields on that page. To modify a user's account, click on the username link for the user and change the field(s) on the page. To delete a user, click on the &quot;Delete&quot;  link to the right of the user to be deleted. <br>
+  <br>
+  Clicking on the &quot;Create New User&quot; link allows adding users by filling in the fields and clicking on the &quot;Add&quot; button. The fields are defined as follows:</p>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">User Name</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The username for the user.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Password</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Password for the new user.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Given Name</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The user's first name.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Family Name</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The user's last name.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Department</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The user's department.</td>
+  </tr>
+  <tr>
+    <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">Email</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The user's email address.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/add.gif" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">To add the new user click the &quot;Add&quot; button.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/cancel.gif" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">To cancel an add this button must be clicked before the &quot;Add&quot; button. It will return the previous page to the browser.</td>
+  </tr>
+</table>

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/maximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/maximized.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/maximized.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/derby/users/maximized.jsp Wed Jul 20 18:38:12 2005
@@ -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/>
+
+<table width="100%" cellspacing="5">
+    ${message}
+	<tr>
+		<td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>">Create New User</a> </td>
+		<td >&nbsp;</td>
+	</tr>
+        <tr>
+            <td>Username</td>
+            <td>&nbsp;</td>
+            
+        </tr>
+    <c:forEach var="user" items="${users}">
+        <tr>
+            <td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="edit"/><portlet:param name="userId" value="${user.key}"/></portlet:actionURL>">${user.key}</a></td>
+            
+            <td><a href="<portlet:actionURL><portlet:param name="userId" value="${user.key}"/><portlet:param name="action" value="delete"/></portlet:actionURL>" onclick="return confirm('Confirm Delete?');">Delete</a></td>
+        </tr>
+    </c:forEach>
+
+</table>

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

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

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/addmaximized.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,146 @@
+<%@ page import="org.apache.geronimo.console.util.SERealmGroupHelper" %>
+<%@ page import="java.util.Collection" %>
+<%@ page import="java.util.Iterator" %>
+
+<%@ 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"%>
+<script language="JavaScript">
+var <portlet:namespace/>formName = "<portlet:namespace/>addgroup";
+var <portlet:namespace/>requiredFields = new Array("group");
+function <portlet:namespace/>validateForm(){
+    return (textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields));
+}
+function <portlet:namespace/>move(formName, from, to){
+    var objFrom = eval("document." + formName + "." + from);
+    var objTo = eval("document." + formName + "." + to);
+    for(var pos = objFrom.length-1; pos >=0; pos--){ 
+        if(objFrom.options[pos].selected){
+            objTo.options.length += 1;
+            objTo.options[objTo.options.length-1].value = objFrom.options[pos].value;
+            objTo.options[objTo.options.length-1].text = objFrom.options[pos].text;
+            <portlet:namespace/>removeAt(objFrom,pos);
+        }
+    }    
+}
+function <portlet:namespace/>removeAt(obj,pos){
+    for(var i = pos; i < obj.options.length-1; i++){
+        obj.options[i].value = obj.options[i+1].value;
+        obj.options[i].text = obj.options[i+1].text;
+    }
+    obj.options.length -= 1;    
+}
+
+function <portlet:namespace/>selectAll(formName, objName){
+    var obj = eval("document." + formName + "." + objName);
+    for(var i = 0; i < obj.options.length; i++){
+        obj.options[i].selected = true;
+    }
+    return true;
+}
+
+</script>
+<c:set var="add" value="${group == null}"/>
+<form name="<portlet:namespace/>addgroup" action="<portlet:actionURL portletMode="view"/>" >
+    <table cellspacing="5">
+    <tr>
+      <td colspan="2" align="left" class="formHeader">
+       <c:choose>
+	   <c:when test="${add}"> 
+       		<b>ADD GROUP</b>
+      		<c:set var="GroupName" value=""/>
+      		<c:set var="Submit" value="Add"/>
+       </c:when>
+       <c:otherwise>
+			<b>UPDATE GROUP</b>
+      		<c:set var="GroupName" value="${group}"/>
+      		<c:set var="Submit" value="Update"/>
+       </c:otherwise>
+       </c:choose>
+        </td>
+    </tr>
+    <tr>
+        <td width="200" class="formLabel">Group Name</td>
+        <td class="formElement">
+       <c:choose>
+	   <c:when test="${add}"> 
+	    <input type="hidden" name="action" value="add">
+	    <input type="text" name="group" value="">
+       </c:when>
+       <c:otherwise>
+	    <input type="hidden" name="action" value="update">
+        <input type="hidden" name="group" value="${GroupName}">
+        ${GroupName}
+       </c:otherwise>
+       </c:choose>       
+        </td>
+    </tr>   
+    <tr>
+        <td class="formLabel">Users</td>
+        <td class="formElement">
+        <c:choose>
+        <c:when test="${users != null && fn:length(users) > 0}">
+            <% 
+            String[] users = ((String[])request.getAttribute("users"));
+            %>
+            <table>
+            <tr>
+                <td>
+                <select name="availusers" size="4" multiple>
+                <%
+                for(int i = 0;i<users.length;i++){
+                    String user = users[i];
+                    Object grp = request.getAttribute("group");
+                    String group = ((grp!=null)?grp.toString():"");
+                %>    
+                <%if(!SERealmGroupHelper.isGroupMember(group, user)){%>
+                <option><%=user%></option>
+                <%}%>
+               <%}%> 
+                </select>
+                </td>
+                <td align="center" valign="middle">
+                <input type = "button" 
+                    value="&nbsp;&nbsp;&nbsp;&nbsp;Add &gt;&gt;&nbsp;&nbsp;&nbsp;&nbsp;"
+                    onclick="<portlet:namespace/>move('<portlet:namespace/>addgroup','availusers','users');"
+                    />
+                    
+                    <br/>
+                <input type = "button" value="&lt;&lt; Remove"
+                    onclick="<portlet:namespace/>move('<portlet:namespace/>addgroup','users','availusers');"
+                    />                
+                </td> 
+                <td>
+                <select name="users" size="4" multiple>
+                <%
+                for(int i = 0;i<users.length;i++){
+                    String user = users[i];
+                    Object grp = request.getAttribute("group");
+                    String group = ((grp!=null)?grp.toString():"");
+                %>    
+                <%if(SERealmGroupHelper.isGroupMember(group, user)){%>
+                <option><%=user%></option>
+                <%}%>
+               <%}%> 
+                </select>
+                </td>
+            </tr>   
+            </table>
+            </td>
+             
+        </c:when>
+        <c:otherwise>
+        No available users.
+        </c:otherwise>
+        </c:choose>       
+        </td>
+    </tr>
+    <tr>   
+       <td>&nbsp;</td><td align="left" class="formElement">
+       <input type="submit" value="${Submit}" 
+            onclick="return <portlet:namespace/>validateForm() && <portlet:namespace/>selectAll('<portlet:namespace/>addgroup', 'users');">
+       <input type="submit" name="cancel"  value="Cancel">
+       </td>
+      </tr>
+    </table>
+</form>
\ No newline at end of file

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

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

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/error.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/error.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/error.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/error.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1 @@
+ERROR: ${errorMessage}
\ No newline at end of file

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/help.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/help.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/help.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,22 @@
+ <p>This portlet lists all the Console Realm groups and allows the user to add, modify and delete them. To add a new group click on the &quot;Create New Group&quot; link and fill in the fields on that page. To modify 
+  an existing group, click on the group link and change the field(s) on the page. To delete a group, click on the &quot;Delete&quot; link to the right of the group to be deleted. <br>
+  <br>
+  Clicking on the &quot;Create New Group&quot; link allows the user to add a new   group. The fields are defined as follows:</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; color: #1E1E52;">Group Name</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The name of the group.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Users</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The box on the left lists all the current user accounts. Selecting a user and then clicking the &quot;Add&gt;&gt;&quot; button will put the user in the group. Selecting a user in the list to the right and clicking on the &quot;&lt;&lt;Remove&quot; button will delete the user from the group.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/add.gif" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Clicking this button will create the new group. If users had been put in the new group, clicking &quot;Add&quot; will create the new group with the selected users in it.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/cancel.gif" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Will cancel the creation of the new group and return the previous page to the browser.</td>
+  </tr>
+</table>

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/groups/maximized.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/>
+<table width="100%">
+    ${message}
+	<tr>
+		<td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>">Create New Group</a> </td>
+		<td >&nbsp;</td>
+	</tr>
+        <tr>
+            <td width="100">Group Name</td>
+            <td>&nbsp;</td>
+        </tr>
+    <c:forEach var="group" items="${groupsInfo}">
+        <form action="<portlet:actionURL></portlet:actionURL>">
+        <input type="hidden" name="action" value="update">
+        <input type="hidden" name="group" value="${group.key}">
+        <tr>
+            <td width="100"><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="edit"/><portlet:param name="group" value="${group.key}"/></portlet:actionURL>">${group.key}</a></td>
+            <td><a href="<portlet:actionURL><portlet:param name="group" value="${group.key}"/><portlet:param name="action" value="delete"/></portlet:actionURL>" onclick="return confirm('Confirm Delete?');">Delete</a></td>
+        </tr>
+        </form>
+    </c:forEach>
+
+</table>

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

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

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/addmaximized.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,72 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<script language="JavaScript">
+var <portlet:namespace/>formName = "adduser";
+var <portlet:namespace/>requiredFields = new Array("userId","password");
+function <portlet:namespace/>validateForm(){
+    return (textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields) && <portlet:namespace/>passwordMatch());
+}
+function <portlet:namespace/>passwordMatch(){
+     with(document.adduser){
+        if(password.value != confirmpassword.value){
+            alert("Password and confirm password do not match!");
+            password.focus();
+            return false;
+        }
+    }
+}
+</script>
+<c:set var="add" value="${userID == null}"/>
+<form name="adduser" action="<portlet:actionURL portletMode="view"/>" >
+    <table cellspacing="5">
+    <tr>
+        <td colspan="2" align="left">
+        <c:choose>
+        <c:when test="${add}"> 
+       		<b>ADD USER</b>
+      		<c:set var="UserName" value=""/>
+      		<c:set var="Password" value=""/>      		
+      		<c:set var="Password2" value=""/>      		
+      		<c:set var="Action" value="add"/>      		
+      		<c:set var="Submit" value="Add"/>
+       </c:when>
+       <c:otherwise>
+			<b>UPDATE USER</b>
+      		<c:set var="UserName" value="${userID}"/>
+      		<c:set var="Password" value="xxxxxxxx"/>
+      		<c:set var="Password2" value="yyyyyyyy"/>      		
+      		<c:set var="Action" value="update"/>      		
+      		<c:set var="Submit" value="Update"/>
+       </c:otherwise>
+       </c:choose>
+        </td>
+    </tr>
+    <tr>
+        <td width="200">UserID</td>
+        <td>
+        <input type="hidden" name="action" value="${Action}">
+        <c:choose>
+        <c:when test="${add}"> 
+            <input type="text" name="userId" value="${UserName}">
+        </c:when>
+        <c:otherwise>
+            <input type="hidden" name="userId" value="${UserName}">
+            ${UserName}
+        </c:otherwise>
+        </c:choose>
+            
+        </td>
+    </tr>   
+    <tr>
+        <td width="200">Password</td>
+        <td><input type="password" name="password" value="${Password}"></td>
+    </tr>   
+    <tr>
+        <td width="200">Confirm Password</td>
+        <td><input type="password" name="confirmpassword" value="${Password2}"></td>
+    </tr>
+    <tr>   
+       <td>&nbsp;</td> <td  align="left" class="formElement"><input type="submit" value="${Submit}" onclick="return <portlet:namespace/>validateForm()"> <input type="submit" name="cancel"  value="Cancel"></td>
+     </tr>
+    </table>
+</form>
\ No newline at end of file

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

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

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/error.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/error.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/error.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/error.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1 @@
+ERROR: ${errorMessage}
\ No newline at end of file

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/help.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/help.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/help.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,27 @@
+ <p>This portlet lists all the console realm users and allows the user to add, modify and delete them. To add a new user click on the &quot;Create New User&quot; link and fill in the fields on that page. To 
+  modify a user's account, click on the username link for the user and change the field(s) on the page. To delete a user, click on the &quot;Delete&quot; link to the right of the user to be deleted.<br>
+  <br>
+  Clicking on the Create New User link brings up a page that allows adding users by filling in the fields and clicking on the&quot;Add&quot; button. The fields are defined as follows:</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; color: #1E1E52;">UserID</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">The username for the user.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Password</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Password for the new user.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Confirm Password</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Re-enter the new user's password.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/add.gif" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">Click on this button to create the new user and return to the main &quot;Console Realm Users&quot; 
+page. The new user will be listed there.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" valign="top" class="MediumBackground" style="padding: 10px 10px 10px 5px;"><img src="/console/images/cancel.gif" /></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top">To cancel an add this button must be clicked before the &quot;Add&quot; button.</td>
+  </tr>
+</table>

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/securityrealmmanager/se/users/maximized.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,52 @@
+<%@ 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 <portlet:namespace/>validateForm(formname){
+    with(eval("document."+formname)){
+        if(isEmptyString(password.value)){
+            alert("Please enter a password");
+            password.focus();
+            return false;
+        }
+        if(isEmptyString(confirmpassword.value)){
+            alert("Please re-enter password");
+            confirmpassword.focus();
+            return false;
+        }
+        if(password.value != confirmpassword.value){
+            alert("Password and confirm password do not match!");
+            password.focus();
+            return false;
+        }
+    }
+    return true;
+}
+function isEmptyString(value){
+    return value.length < 1;
+}
+</script>
+<table width="100%" cellspacing="5">
+    ${message}
+	<tr>
+		<td><a href="<portlet:actionURL portletMode="view"><portlet:param name="action" value="new"/></portlet:actionURL>">Create New User</a> </td>
+		<td></td>
+	</tr>
+        <tr>
+            <td>Username</td>
+            <td>&nbsp;</td>
+        </tr>
+     <c:set var="count" value="1"/>
+    <c:forEach var="user" items="${userInfo}">
+        <tr>
+            <td width="100">
+            <a href = "<portlet:actionURL portletMode="view"><portlet:param name="action" value="edit"/><portlet:param name="userId" value="${user.key}"/></portlet:actionURL>">
+            ${user.key}
+            </a>
+            </td>
+            <td><a href="<portlet:actionURL><portlet:param name="userId" value="${user.key}"/><portlet:param name="action" value="delete"/></portlet:actionURL>" onclick="return confirm('Confirm Delete?');">Delete</a></td>
+        </tr>
+    </c:forEach>
+    
+</table>

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

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

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/help.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,6 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+<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>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>
\ No newline at end of file

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/normal.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/normal.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/>
+<br />
+<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"/></td></tr>
+</form>
+</table>

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/servermanager/shutdown.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1 @@
+Server shutdown completed.

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/help.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/help.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/help.jsp Wed Jul 20 18:38:12 2005
@@ -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/sandbox/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1,197 @@
+<%@ 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">
+        <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="${ignoreDate}"> 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.</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>
+<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/sandbox/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/ajp13/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/ajp13/help.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/ajp13/help.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/ajp13/help.jsp Wed Jul 20 18:38:12 2005
@@ -0,0 +1 @@
+The AJP13 (Apache Jserv Protocol version 1.3) listener connections is not presently implemented, but is planned for a future release. It will allow the user to integrate the Apache web server with the Geronimo Platform.
\ No newline at end of file

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

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

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

Added: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/ajp13/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/ajp13/normal.jsp?rev=219976&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/ajp13/normal.jsp (added)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/view/webmanager/ajp13/normal.jsp Wed Jul 20 18:38:12 2005
@@ -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/>
+<c:if test="${empty(connectors)}">There are no AJP13 Connectors defined</c:if>
+<c:if test="${!empty(connectors)}"><table>
+    <tr><th>Connector</th><th>State</th><th>Port</th></tr>
+<c:forEach var="info" items="${connectors}">
+    <tr><td>${info.objectName}</td><td>${info.stateName}</td><td>${info.port}</td></tr>
+</c:forEach>
+</table>
+</c:if>

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



Mime
View raw message