geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r393787 [19/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/jmswizard/provider.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/provider.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/provider.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/provider.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,43 @@
+<%@ 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/>
+
+<p><b>JMS Resource Group</b> -- Select JMS Provider RAR</p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="provider-after" />
+    <table border="0">
+    <!-- ENTRY FIELD: JMS Connection RAR -->
+      <tr>
+        <th><div align="right">JMS Provider RAR:</div></th>
+        <td>
+          <select name="rar">
+            <option></option>
+        <c:forEach var="rar" items="${rars}">
+            <option <c:if test="${rar == pool.rar}">selected</c:if>>${rar}</option>
+        </c:forEach>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The Resource Adapter RAR that can be used to connect to the JMS provider
+            in question.  This RAR should be installed under GERONIMO/repository/ in
+            order for it to appear in this list.
+        </td>
+      </tr>
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td><input type="submit" value="Next" /></td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list-before" />
+            </portlet:actionURL>">Cancel</a></p>

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

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

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

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/raInstance.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/raInstance.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/raInstance.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/raInstance.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,86 @@
+<%@ 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/>
+
+<p><b>JMS Resource Group</b> -- Configure Server Connection</p>
+
+<p>The settings on this screen are different for each JMS provider, but they
+  generally configure connectivity to the JMS server.  Connection factories
+  or destinations you create in the next step typically use these settings to
+  communicate with the server.</p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
+    <input type="hidden" name="mode" value="ra-after" />
+    <input type="hidden" name="rar" value="${data.rarURI}" />
+    <input type="hidden" name="dependency" value="${data.dependency}" />
+    <input type="hidden" name="workManager" value="${data.workManager}" /> <%-- todo: pick list for WorkManager --%>
+    <input type="hidden" name="currentFactoryID" value="${data.currentFactoryID}" />
+    <input type="hidden" name="currentDestinationID" value="${data.currentDestinationID}" />
+    <input type="hidden" name="factoryType" value="${data.factoryType}" />
+    <input type="hidden" name="destinationType" value="${data.destinationType}" />
+    <c:forEach var="factory" items="${data.connectionFactories}" varStatus="status">
+      <input type="hidden" name="factory.${status.index}.factoryType" value="${factory.factoryType}" />
+      <input type="hidden" name="factory.${status.index}.instanceName" value="${factory.instanceName}" />
+      <input type="hidden" name="factory.${status.index}.transaction" value="${factory.transaction}" />
+      <input type="hidden" name="factory.${status.index}.xaTransaction" value="${factory.xaTransactionCaching}" />
+      <input type="hidden" name="factory.${status.index}.xaThread" value="${factory.xaThreadCaching}" />
+      <input type="hidden" name="factory.${status.index}.poolMinSize" value="${factory.poolMinSize}" />
+      <input type="hidden" name="factory.${status.index}.poolMaxSize" value="${factory.poolMaxSize}" />
+      <input type="hidden" name="factory.${status.index}.poolIdleTimeout" value="${factory.poolIdleTimeout}" />
+      <input type="hidden" name="factory.${status.index}.poolBlockingTimeout" value="${factory.poolBlockingTimeout}" />
+      <c:forEach var="prop" items="${factory.instanceProps}">
+        <input type="hidden" name="factory.${status.index}.${prop.key}" value="${prop.value}" />
+      </c:forEach>
+    </c:forEach>
+    <c:forEach var="dest" items="${data.adminObjects}" varStatus="status">
+      <input type="hidden" name="destination.${status.index}.destinationType" value="${dest.destinationType}" />
+      <input type="hidden" name="destination.${status.index}.name" value="${dest.name}" />
+      <c:forEach var="prop" items="${dest.instanceProps}">
+        <input type="hidden" name="destination.${status.index}.${prop.key}" value="${prop.value}" />
+      </c:forEach>
+    </c:forEach>
+    <table border="0">
+    <!-- ENTRY FIELD: RA Instance Name -->
+      <tr>
+        <th><div align="right">Resource Group Name:</div></th>
+        <td><input name="instanceName" type="text" size="20" value="${data.instanceName}" /></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A unique name for the resource adapter; used to generate the configuration name
+          for this resource group as well as to connect Message-Driven Beans to the JMS server
+          using the settings on this page.</td>
+      </tr>
+    <!-- ENTRY FIELD: Config Properties -->
+      <tr>
+        <th colspan="2">Basic Configuration Settings</th>
+      </tr>
+  <c:forEach var="prop" items="${provider.instanceConfigProperties}" varStatus="status">
+      <c:set var="index" value="instance-config-${status.index}" />
+      <tr>
+        <th><div align="right">${prop.name}:</div></th>
+        <td><input name="${index}" type="text" size="20" value="${data.instanceProps[index] == null ? prop.defaultValue : data.instanceProps[index]}" /></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><c:out value="${prop.description}" /></td>
+      </tr>
+  </c:forEach>
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <th><div align="right"></div></th>
+        <td>
+            <input type="hidden" name="nextAction" value="review" />
+            <input type="submit" value="Next" />
+        </td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list-before" />
+            </portlet:actionURL>">Cancel</a></p>

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

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

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

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/status.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/status.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/status.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/jmswizard/status.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,103 @@
+<%@ 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/>
+
+<p><b>JMS Resource Group</b> -- Current Progress</p>
+
+<c:choose>
+    <c:when test="${data.connectionFactoryCount == 0 && data.destinationCount == 0}">
+        <p>So far, you've entered the basic configuration information required for
+          a JMS resource group.  Now you can create connection factories and
+          destinations.  When you're finished adding connection factories and
+          destinations, you can review the Geronimo deployment plan for this JMS
+          resource group, or go ahead and deploy it.</p>
+    </c:when>
+    <c:otherwise>
+        <p>These are the connection factories and destinations you've added to the
+          JMS resource group so far.  When you're finished adding connection factories and
+          destinations, you can review the Geronimo deployment plan for this resource
+          group, or go ahead and deploy it.</p>
+
+        <table border="0" width="100%">
+            <tr><th colspan="3">Resource Group <c:out value="${data.instanceName}"/></th></tr>
+            <tr>
+                <td class="DarkBackground">Type</td>
+                <td class="DarkBackground">Name</td>
+                <td class="DarkBackground">Interface</td>
+            </tr>
+            <c:forEach var="factory" items="${data.connectionFactories}">
+                <tr>
+                    <td>Connection Factory</td>
+                    <td><c:out value="${factory.instanceName}" /></td>
+                    <td><c:out value="${provider.connectionDefinitions[factory.factoryType].connectionFactoryInterface}" /></td>
+                </tr>
+            </c:forEach>
+            <c:forEach var="dest" items="${data.adminObjects}">
+                <tr>
+                    <td>Destination</td>
+                    <td><c:out value="${dest.name}" /></td>
+                    <td><c:out value="${provider.adminObjectDefinitions[dest.destinationType].adminObjectInterface}" /></td>
+                </tr>
+            </c:forEach>
+        </table>
+    </c:otherwise>
+</c:choose>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>JMSForm" action="<portlet:actionURL/>" method="POST">
+    <input type="hidden" name="mode" value="review-after" />
+    <input type="hidden" name="rar" value="${data.rarURI}" />
+    <input type="hidden" name="dependency" value="${data.dependency}" />
+    <input type="hidden" name="instanceName" value="${data.instanceName}" />
+    <input type="hidden" name="workManager" value="${data.workManager}" /> <%-- todo: pick list for WorkManager --%>
+    <c:forEach var="prop" items="${data.instanceProps}">
+      <input type="hidden" name="${prop.key}" value="${prop.value}" />
+    </c:forEach>
+    <input type="hidden" name="currentFactoryID" value="${data.currentFactoryID}" />
+    <input type="hidden" name="currentDestinationID" value="${data.currentDestinationID}" />
+    <input type="hidden" name="factoryType" value="${data.factoryType}" />
+    <input type="hidden" name="destinationType" value="${data.destinationType}" />
+    <c:forEach var="factory" items="${data.connectionFactories}" varStatus="status">
+      <input type="hidden" name="factory.${status.index}.factoryType" value="${factory.factoryType}" />
+      <input type="hidden" name="factory.${status.index}.instanceName" value="${factory.instanceName}" />
+      <input type="hidden" name="factory.${status.index}.transaction" value="${factory.transaction}" />
+      <input type="hidden" name="factory.${status.index}.xaTransaction" value="${factory.xaTransactionCaching}" />
+      <input type="hidden" name="factory.${status.index}.xaThread" value="${factory.xaThreadCaching}" />
+      <input type="hidden" name="factory.${status.index}.poolMinSize" value="${factory.poolMinSize}" />
+      <input type="hidden" name="factory.${status.index}.poolMaxSize" value="${factory.poolMaxSize}" />
+      <input type="hidden" name="factory.${status.index}.poolIdleTimeout" value="${factory.poolIdleTimeout}" />
+      <input type="hidden" name="factory.${status.index}.poolBlockingTimeout" value="${factory.poolBlockingTimeout}" />
+      <c:forEach var="prop" items="${factory.instanceProps}">
+        <input type="hidden" name="factory.${status.index}.${prop.key}" value="${prop.value}" />
+      </c:forEach>
+    </c:forEach>
+    <c:forEach var="dest" items="${data.adminObjects}" varStatus="status">
+      <input type="hidden" name="destination.${status.index}.destinationType" value="${dest.destinationType}" />
+      <input type="hidden" name="destination.${status.index}.name" value="${dest.name}" />
+      <c:forEach var="prop" items="${dest.instanceProps}">
+        <input type="hidden" name="destination.${status.index}.${prop.key}" value="${prop.value}" />
+      </c:forEach>
+    </c:forEach>
+    <table border="0">
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td>
+            <input type="hidden" name="nextAction" value="factoryType" />
+            <input type="submit" value="Add Connection Factory" />
+            <input type="button" value="Add Destination" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='destinationType';document.<portlet:namespace/>JMSForm.submit();return false;" />
+<c:if test="${data.connectionFactoryCount > 0 || data.destinationCount > 0}">
+            <input type="button" value="Show Plan" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='plan';document.<portlet:namespace/>JMSForm.submit();return false;" />
+            <input type="button" value="Deploy Now" onclick="document.<portlet:namespace/>JMSForm.nextAction.value='deploy';document.<portlet:namespace/>JMSForm.submit();return false;" />
+</c:if>
+        </td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list-before" />
+            </portlet:actionURL>">Cancel</a></p>

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

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

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

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/help.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/help.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/help.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/help.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,37 @@
+        <p>This portlet allows the user to select a configuration file for logging 
+  and/or change the log level and Refresh period. The default &quot;Config file&quot; is a standard log4j file and defines the location where the Geronimo Server
+  will log Geronimo output. The configuration file also defines the log 
+  level, the maximum log file size, and other attributes associated with 
+  logging. <br>
+  <br>
+  Gereonimo Console will display output from the Geronimo log file in the Server Log
+  Viewer portlet in the next window pane.</p>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <tr>
+    <td width="150" align="right" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Config File</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px;">Another configuration file can be used by entering a 
+different path and file name in the Config file 
+text box.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Refresh Period</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px;">By default Geronimo checks every 60 seconds to see if the
+configuration file has changed. The user may modify 
+the refresh period.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;">Log Level</td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px;">The user may select a level for logging from the 
+drop-down menu. </td>
+  </tr>
+  <tr>
+    <td width="150" align="right" class="MediumBackground" style="padding: 10px 10px 5px 10px; font-weight: bold;"><img src="/console/images/update.gif" width="65" height="20"></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px;">Make changes take effect.</td>
+  </tr>
+  <tr>
+    <td width="150" align="right" class="MediumBackground" style="padding: 10px 10px 5px 10px; font-weight: bold;"><img src="/console/images/reset.gif" width="56" height="20"></td>
+    <td class="LightBackground" style="padding: 10px 5px 10px 10px;">Resets the &quot;Config File&quot;, &quot;Refresh Period&quot; and 
+&quot;Log Level&quot; to their settings at the last &quot;Update.&quot;
+It does not reset to the Geronimo Server defaults.</td>
+  </tr>
+</table>

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

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

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

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,111 @@
+<%@ 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;
+    var maxRows = document.<portlet:namespace/>searchForm.maxRows.value;
+    if(!<portlet:namespace/>isNumeric(startPos)){
+        alert("Start Position must be a number.");
+        document.<portlet:namespace/>searchForm.startPos.focus();
+        return false;
+    }
+    if(!<portlet:namespace/>isNumeric(endPos)){
+        alert("End Position must be a number.");
+        document.<portlet:namespace/>searchForm.endPos.focus();
+        return false;
+    }
+    if(!<portlet:namespace/>isNumeric(maxRows)){
+        alert("Maximum results must be a number.");
+        document.<portlet:namespace/>searchForm.maxRows.focus();
+        return false;
+    }
+    return true;
+}
+</script>
+
+<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"/>
+    File <select name="logFile">
+        <c:forEach var="file" items="${logFiles}">
+            <option value="${file.fullName}" <c:if test="${logFile eq file.fullName}"> selected</c:if>>${file.name}</option>
+        </c:forEach>
+    </select>
+    Lines <input type="text" name="startPos" value="${startPos}" size="3"/>
+    to <input type="text" name="endPos" value="${endPos}" size="3"/>
+    Max Results <input type="text" name="maxRows" value="${maxRows}" size="3"/>
+    Level
+    <select name="logLevel">
+        <option<c:if test="${logLevel eq 'TRACE' || logLevel eq ''}"> selected</c:if>>TRACE</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>
+    </select>
+    Containing text <input type="text" name="searchString" value="${searchString}"/>
+    With Exceptions <input type="checkbox" name="stackTraces" <c:if test="${!empty stackTraces}">CHECKED </c:if>/>
+    <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<c:if test="${!empty capped}"> (number of results capped)</c:if>.</b>
+            </td>
+        </tr>    
+            
+    <c:forEach var="line" items="${searchResults}">
+        <tr>
+            <td class="Smaller">
+            ${line.lineNumber}:&nbsp;<c:out escapeXml="true" value="${line.lineContent}" />
+            </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/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/view.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/view.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/view.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/view.jsp Thu Apr 13 04:34:08 2006
@@ -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/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/view.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/viewhelp.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/viewhelp.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/viewhelp.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/viewhelp.jsp Thu Apr 13 04:34:08 2006
@@ -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/applications/console/console-standard/src/webapp/WEB-INF/view/logmanager/viewhelp.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

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

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

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/_sql.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,114 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+
+      <tr>
+        <th style="min-width: 140px"><div align="right">User SELECT SQL:</div></th>
+        <td><input name="option-userSelect" type="text"
+                   size="60" value="${realm.options['userSelect']}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A SQL statement to load user/password information.  It should return 2 columns, the first
+          holding a username and the second holding a password.  The statement may use the PreparedStatement
+          syntax of ? for a parameter, in which case the username will be set for every parameter.  A
+          typical setting would be <tt>SELECT username, password FROM app_users WHERE username=?</tt></td>
+      </tr>
+
+      <tr>
+        <th><div align="right">Group SELECT SQL:</div></th>
+        <td><input name="option-groupSelect" type="text"
+                   size="60" value="${realm.options['groupSelect']}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A SQL statement to load group information for a user.  It should return 2 columns, the first
+          holding a username and the second holding a group name.  The statement may use the PreparedStatement
+          syntax of ? for a parameter, in which case the username will be set for every parameter.  A
+          typical setting would be <tt>SELECT username, group_name FROM user_groups WHERE username=?</tt> or for
+          a more normalized schema, <tt>SELECT u.username, g.name FROM app_users u, groups g, user_groups ug
+          WHERE ug.user_id=users.id AND ug.group_id=g.id AND u.username=?</tt></td>
+      </tr>
+
+      <tr>
+        <td></td>
+        <td><i>A SQL security realm must either have a database pool or JDBC connectivity settings to
+          connect to the database.  Please select EITHER the database pool, OR the rest of the JDBC
+          settings.</i></td>
+      </tr>
+
+
+      <tr>
+        <th><div align="right">Database Pool</div></th>
+        <td>
+          <select name="option-databasePoolObjectName">
+            <option />
+        <c:forEach var="pool" items="${pools}">
+            <option value="${pool.objectName}"<c:if test="${realm.options['dataSourceName'] eq pool.name && realm.options['dataSourceApplication'] eq pool.applicationName}"> selected</c:if>>${pool.displayName}</option>
+        </c:forEach>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A database pool that the login module will use to connect to the database.  If this is specified, none of
+          the rest of the settings after this are necessary.</td>
+      </tr>
+
+      <tr>
+        <th><div align="right">JDBC Driver Class</div></th>
+        <td><input name="option-jdbcDriver" type="text"
+                   size="60" value="${realm.options['jdbcDriver']}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The fully-qualified JDBC driver class name.  This driver must be located in the JAR specified in the next
+          field.</td>
+      </tr>
+
+      <tr>
+        <th><div align="right">Driver JAR:</div></th>
+        <td>
+          <select name="jar">
+            <option />
+        <c:forEach var="jar" items="${jars}">
+            <option <c:if test="${jar == realm.jar}">selected</c:if>>${jar}</option>
+        </c:forEach>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The JAR holding the selected JDBC driver.  Should be installed under GERONIMO/repository/ to appear in this list.</td>
+      </tr>
+
+      <tr>
+        <th><div align="right">JDBC URL</div></th>
+        <td><input name="option-jdbcURL" type="text"
+                   size="60" value="${realm.options['jdbcURL']}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The JDBC URL that specifies the details of the database to connect to.  This has a different form for
+          each JDBC driver.</td>
+      </tr>
+
+      <tr>
+        <th><div align="right">JDBC Username</div></th>
+        <td><input name="option-jdbcUser" type="text"
+                   size="20" value="${realm.options['jdbcUser']}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The username used to connect to the database</td>
+      </tr>
+
+      <tr>
+        <th><div align="right">JDBC Password</div></th>
+        <td><input name="option-jdbcPassword" type="password"
+                   size="20" value="${realm.options['jdbcPassword']}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The password used to connect to the database</td>
+      </tr>
+

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

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

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

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/advanced.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,123 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Security Realm</b> -- Step 3: Advanced Configuration</p>
+
+<c:if test="${!(empty AdvancedError)}"><p><font color="red"><b>Error: ${AdvancedError}</b></font></p></c:if>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="process-advanced" />
+    <input type="hidden" name="test" value="true" />
+    <input type="hidden" name="name" value="${realm.name}" />
+    <input type="hidden" name="realmType" value="${realm.realmType}" />
+    <input type="hidden" name="jar" value="${realm.jar}" />
+  <c:forEach var="option" items="${realm.options}">
+    <input type="hidden" name="option-${option.key}" value="${option.value}" />
+  </c:forEach>
+    <input type="hidden" name="objectName" value="${realm.objectName}" />
+    <input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
+    <input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
+    <input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
+    <input type="hidden" name="module-wrap-0" value="${realm.modules[0].wrapPrincipals}" />
+    <input type="hidden" name="module-server-0" value="${realm.modules[0].serverSide}" />
+    <input type="hidden" name="module-options-0" value="${realm.modules[0].optionString}" />
+    <input type="hidden" name="module-domain-1" value="${realm.modules[1].loginDomainName}" />
+    <input type="hidden" name="module-class-1" value="${realm.modules[1].className}" />
+    <input type="hidden" name="module-control-1" value="${realm.modules[1].controlFlag}" />
+    <input type="hidden" name="module-wrap-1" value="${realm.modules[1].wrapPrincipals}" />
+    <input type="hidden" name="module-server-1" value="${realm.modules[1].serverSide}" />
+    <input type="hidden" name="module-options-1" value="${realm.modules[1].optionString}" />
+    <input type="hidden" name="module-domain-2" value="${realm.modules[2].loginDomainName}" />
+    <input type="hidden" name="module-class-2" value="${realm.modules[2].className}" />
+    <input type="hidden" name="module-control-2" value="${realm.modules[2].controlFlag}" />
+    <input type="hidden" name="module-wrap-2" value="${realm.modules[2].wrapPrincipals}" />
+    <input type="hidden" name="module-server-2" value="${realm.modules[2].serverSide}" />
+    <input type="hidden" name="module-options-2" value="${realm.modules[2].optionString}" />
+    <input type="hidden" name="module-domain-3" value="${realm.modules[3].loginDomainName}" />
+    <input type="hidden" name="module-class-3" value="${realm.modules[3].className}" />
+    <input type="hidden" name="module-control-3" value="${realm.modules[3].controlFlag}" />
+    <input type="hidden" name="module-wrap-3" value="${realm.modules[3].wrapPrincipals}" />
+    <input type="hidden" name="module-server-3" value="${realm.modules[3].serverSide}" />
+    <input type="hidden" name="module-options-3" value="${realm.modules[3].optionString}" />
+    <input type="hidden" name="module-domain-4" value="${realm.modules[4].loginDomainName}" />
+    <input type="hidden" name="module-class-4" value="${realm.modules[4].className}" />
+    <input type="hidden" name="module-control-4" value="${realm.modules[4].controlFlag}" />
+    <input type="hidden" name="module-wrap-4" value="${realm.modules[4].wrapPrincipals}" />
+    <input type="hidden" name="module-server-4" value="${realm.modules[4].serverSide}" />
+    <input type="hidden" name="module-options-4" value="${realm.modules[4].optionString}" />
+    <table border="0">
+    <!-- ENTRY FIELD: Audit Log -->
+      <tr>
+        <th valign="top" style="min-width: 140px"><div align="right">Enable Auditing:</div></th>
+        <td valign="top">
+          <input type="checkbox" id="<portlet:namespace/>auditCheckbox" name="enableAuditing"<c:if test="${!(empty realm.auditPath)}"> checked="checked"</c:if>
+          onclick="document.getElementById('<portlet:namespace/>auditDiv').style.display=this.checked ? 'block' : 'none';document.getElementById('<portlet:namespace/>auditPath').value='';"/>
+          <div id="<portlet:namespace/>auditDiv" style="display: <c:choose><c:when test="${empty realm.auditPath}">none</c:when><c:otherwise>block</c:otherwise></c:choose>;">
+          Log File: <input type="text" id="<portlet:namespace/>auditPath" name="auditPath" size="30" value="${realm.auditPath}" />
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>If enabled, every login attempt will be recorded to the specified file.  The path should
+          be relative to the Geronimo home directory (a typical value would be
+          <tt>var/log/login-attempts.log</tt>).</td>
+      </tr>
+    <!-- ENTRY FIELDS: Lockout -->
+      <tr>
+        <th valign="top"><div align="right">Enable Lockout:</div></th>
+        <td valign="top">
+          <input type="checkbox" id="<portlet:namespace/>lockoutCheckbox" name="enableAuditing"<c:if test="${realm.lockoutEnabled}"> checked="checked"</c:if>
+                 onclick="document.getElementById('<portlet:namespace/>lockoutDiv').style.display=this.checked ? 'block' : 'none';document.getElementById('<portlet:namespace/>lockoutCount').value='';document.getElementById('<portlet:namespace/>lockoutWindow').value='';document.getElementById('<portlet:namespace/>lockoutDuration').value='';"/>
+          <div id="<portlet:namespace/>lockoutDiv" style="display: <c:choose><c:when test="${realm.lockoutEnabled}">block</c:when><c:otherwise>none</c:otherwise></c:choose>;">
+          Lock a user after <input type="text" id="<portlet:namespace/>lockoutCount" name="lockoutCount" size="2" maxlength="3" value="${realm.lockoutCount}" />
+          failures within <input type="text" id="<portlet:namespace/>lockoutWindow" name="lockoutWindow" size="4" maxlength="5" value="${realm.lockoutWindow}" /> seconds<br />
+          and keep the account locked for <input type="text" id="<portlet:namespace/>lockoutDuration" name="lockoutDuration" size="5" maxlength="5" value="${realm.lockoutDuration}" /> seconds.
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>If enabled, a certain number of failed logins in a particular time frame will cause a
+          user's account to be locked for a certain period of time.  This is a defense against
+          brute force account cracking attacks.</td>
+      </tr>
+    <!-- ENTRY FIELD: Store Password -->
+      <tr>
+        <th valign="top"><div align="right">Store Password:</div></th>
+        <td valign="top">
+          <input type="checkbox" name="storePassword"<c:if test="${realm.storePassword}"> checked="checked"</c:if>/>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>If enabled, the realm will store each user's password in a private credential in the
+          Subject.  This will allow access to the password later after the login process has
+          completed.  This is not normally required.</td>
+      </tr>
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td>
+      <c:choose>
+        <c:when test="${realm.testable}">
+          <input type="submit" value="Test a Login" />
+          <input type="button" value="Skip Test and Deploy" onclick="document.<portlet:namespace/>RealmForm.test.value='false';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="button" value="Skip Test and Show Plan" onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
+        </c:when>
+        <c:otherwise>
+          <input type="button" value="Deploy Realm" onclick="document.<portlet:namespace/>RealmForm.test.value='false';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="button" value="Show Plan" onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
+        </c:otherwise>
+      </c:choose>
+        </td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

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

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

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

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/configure.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,86 @@
+<%@ 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/>
+
+<p><b>Create Security Realm</b> -- Step 2: Configure Login Module</p>
+
+<c:if test="${!(empty LoginModuleError)}"><p><font color="red"><b>Error: ${LoginModuleError}</b></font></p></c:if>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="process-configure" />
+    <input type="hidden" name="name" value="${realm.name}" />
+    <input type="hidden" name="realmType" value="${realm.realmType}" />
+  <c:if test="${!fn:contains(realm.realmType, 'SQL')}">
+    <input type="hidden" name="jar" value="${realm.jar}" />
+  </c:if>
+    <input type="hidden" name="auditPath" value="${realm.auditPath}" />
+    <input type="hidden" name="lockoutCount" value="${realm.lockoutCount}" />
+    <input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
+    <input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
+    <input type="hidden" name="storePassword" value="${realm.storePassword}" />
+    <input type="hidden" name="objectName" value="${realm.objectName}" />
+    <input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
+    <input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
+    <input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
+    <input type="hidden" name="module-wrap-0" value="${realm.modules[0].wrapPrincipals}" />
+    <input type="hidden" name="module-server-0" value="${realm.modules[0].serverSide}" />
+    <input type="hidden" name="module-options-0" value="${realm.modules[0].optionString}" />
+    <input type="hidden" name="module-domain-1" value="${realm.modules[1].loginDomainName}" />
+    <input type="hidden" name="module-class-1" value="${realm.modules[1].className}" />
+    <input type="hidden" name="module-control-1" value="${realm.modules[1].controlFlag}" />
+    <input type="hidden" name="module-wrap-1" value="${realm.modules[1].wrapPrincipals}" />
+    <input type="hidden" name="module-server-1" value="${realm.modules[1].serverSide}" />
+    <input type="hidden" name="module-options-1" value="${realm.modules[1].optionString}" />
+    <input type="hidden" name="module-domain-2" value="${realm.modules[2].loginDomainName}" />
+    <input type="hidden" name="module-class-2" value="${realm.modules[2].className}" />
+    <input type="hidden" name="module-control-2" value="${realm.modules[2].controlFlag}" />
+    <input type="hidden" name="module-wrap-2" value="${realm.modules[2].wrapPrincipals}" />
+    <input type="hidden" name="module-server-2" value="${realm.modules[2].serverSide}" />
+    <input type="hidden" name="module-options-2" value="${realm.modules[2].optionString}" />
+    <input type="hidden" name="module-domain-3" value="${realm.modules[3].loginDomainName}" />
+    <input type="hidden" name="module-class-3" value="${realm.modules[3].className}" />
+    <input type="hidden" name="module-control-3" value="${realm.modules[3].controlFlag}" />
+    <input type="hidden" name="module-wrap-3" value="${realm.modules[3].wrapPrincipals}" />
+    <input type="hidden" name="module-server-3" value="${realm.modules[3].serverSide}" />
+    <input type="hidden" name="module-options-3" value="${realm.modules[3].optionString}" />
+    <input type="hidden" name="module-domain-4" value="${realm.modules[4].loginDomainName}" />
+    <input type="hidden" name="module-class-4" value="${realm.modules[4].className}" />
+    <input type="hidden" name="module-control-4" value="${realm.modules[4].controlFlag}" />
+    <input type="hidden" name="module-wrap-4" value="${realm.modules[4].wrapPrincipals}" />
+    <input type="hidden" name="module-server-4" value="${realm.modules[4].serverSide}" />
+    <input type="hidden" name="module-options-4" value="${realm.modules[4].optionString}" />
+    <table border="0">
+<c:choose>
+  <c:when test="${fn:contains(realm.realmType, 'SQL')}">
+<jsp:include page="_sql.jsp" />
+  </c:when>
+  <c:otherwise>
+    <c:forEach var="option" items="${realm.optionNames}">
+      <tr>
+        <th style="min-width: 140px"><div align="right">${optionMap[option].displayName}:</div></th>
+        <td><input name="option-${option}"
+                   type="<c:choose><c:when test="${optionMap[option].password}">password</c:when><c:otherwise>text</c:otherwise></c:choose>"
+                   size="${optionMap[option].length}" value="${realm.options[option]}"></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>${optionMap[option].description}</td>
+      </tr>
+    </c:forEach>
+  </c:otherwise>
+</c:choose>
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td><input type="submit" value="Next" /></td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

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

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

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

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/edit.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,167 @@
+<%@ 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/>
+
+<p>This page edits a new or existing security realm.</p>
+
+<p>A security realm may have one or more login modules.  Many simple realms have
+only one login module.  Additional login modules may be used to access more
+underlying security information stores, or to add functionality such as auditing
+to a realm without affecting the authentication process for the realm.</p>
+
+<c:if test="${empty realm.objectName}">
+<p>If you don't need to use as many login modules as there are entries below,
+just leave the extra ones blank.</p>
+</c:if>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="save" />
+    <input type="hidden" name="jar" value="${realm.jar}" />
+    <input type="hidden" name="name" value="${realm.name}" />
+    <input type="hidden" name="realmType" value="${realm.realmType}" />
+  <c:forEach var="option" items="${realm.options}">
+    <input type="hidden" name="option-${option.key}" value="${option.value}" />
+  </c:forEach>
+    <input type="hidden" name="auditPath" value="${realm.auditPath}" />
+    <input type="hidden" name="lockoutCount" value="${realm.lockoutCount}" />
+    <input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
+    <input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
+    <input type="hidden" name="storePassword" value="${realm.storePassword}" />
+    <input type="hidden" name="objectName" value="${realm.objectName}" />
+
+    <table border="0">
+    <!-- ENTRY FIELD: NAME -->
+      <tr>
+        <th style="min-width: 140px"><div align="right">Realm Name:</div></th>
+        <td>
+      <c:choose> <%-- Can't change the realm name after deployment because it's wired into all the ObjectNames --%>
+        <c:when test="${empty realm.objectName}">
+          <input name="name" type="text" size="30" value="${realm.name}">
+        </c:when>
+        <c:otherwise>
+          <input name="name" type="hidden" value="${realm.name}" />
+          <b><c:out value="${realm.name}" /></b>
+        </c:otherwise>
+      </c:choose>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A name that is different than the name for any other security realms in the server (no spaces in the name please).
+          Other components will use this name to refer to the security realm.</td>
+      </tr>
+    <!-- HEADER -->
+    <c:forEach var="module" items="${realm.modules}" varStatus="status" >
+      <tr>
+        <th colspan="2">Login Module ${status.index+1}</th>
+      </tr>
+      <tr>
+        <th><div align="right">Login Domain Name:</div></th>
+        <td>
+      <c:choose> <%-- Can't change the login domain name after deployment because it's how we know which GBean is which --%>
+        <c:when test="${empty realm.objectName}">
+          <input name="module-domain-${status.index}" type="text" size="20" value="${module.loginDomainName}" />
+        </c:when>
+        <c:otherwise>
+          <input name="module-domain-${status.index}" type="hidden" value="${module.loginDomainName}" />
+          <b><c:out value="${module.loginDomainName}" /></b>
+        </c:otherwise>
+      </c:choose>
+        </td>
+
+        <td></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The login domain for this login module, which must be unique among all modules in the security realm.
+          This can be used to distinguish principals from two otherwise identical login modules (for example,
+          from two LDAP login modules pointing to two different LDAP servers)</td>
+      </tr>
+      <tr>
+        <th><div align="right">Login Module Class:</div></th>
+        <td><input name="module-class-${status.index}" type="text" size="60" value="${module.className}" /></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The fully-qualified class name for the login module.</td>
+      </tr>
+      <tr>
+        <th><div align="right">Control Flag:</div></th>
+        <td>
+          <select name="module-control-${status.index}">
+            <option value="OPTIONAL"<c:if test="${module.controlFlag eq 'OPTIONAL'}"> selected</c:if>>Optional</option>
+            <option value="REQUIRED"<c:if test="${module.controlFlag eq 'REQUIRED'}"> selected</c:if>>Required</option>
+            <option value="REQUISITE"<c:if test="${module.controlFlag eq 'REQUISITE'}"> selected</c:if>>Requisite</option>
+            <option value="SUFFICIENT"<c:if test="${module.controlFlag eq 'SUFFICIENT'}"> selected</c:if>>Sufficient</option>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The control flag for the login module, which controls what happens to the overall login processing if this
+          login module succeeds or fails.  For more information see
+          <a href="http://java.sun.com/j2se/1.4.2/docs/api/javax/security/auth/login/Configuration.html">javax.security.auth.login.Configuration</a>.</td>
+      </tr>
+      <tr>
+        <th><div align="right">Server-Side:</div></th>
+        <td>
+          <select name="module-server-${status.index}">
+            <option value="true"<c:if test="${module.serverSide}"> selected</c:if>>Server Side</option>
+            <option value="false"<c:if test="${!module.serverSide}"> selected</c:if>>Client Side</option>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>Server-side login modules are executed within the application server (this is normally correct).  Client-side
+          login modules are executed in the client's environment, for example, in order to use single sign-on features
+          of the client OS.</td>
+      </tr>
+      <tr>
+        <th><div align="right">Support Advanced Mapping:</div></th>
+        <td>
+          <select name="module-wrap-${status.index}">
+            <option value="true"<c:if test="${module.wrapPrincipals}"> selected</c:if>>Yes</option>
+            <option value="false"<c:if test="${!module.wrapPrincipals}"> selected</c:if>>No</option>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>Normally Geronimo can't distinguish between two different principals that have the same name
+          and same principal class but were produced by two different login modules.  If this option is
+          enabled, Geronimo will "wrap" principals to track which login module and realm each
+          principal came from.  This lets you use the "realm-principal" and "login-domain-principal"
+          elements in your security mapping in Geronimo deployment plans.</td>
+      </tr>
+      <tr>
+        <th><div align="right">Configuration Options:</div></th>
+        <td><textarea name="module-options-${status.index}" rows="5" cols="60">${module.optionString}</textarea></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>Any configuration options necessary for the login module, in the standard Java properties format (one
+          per line, <tt>name=value</tt>)</td>
+      </tr>
+    </c:forEach>
+
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td>
+          <input type="button" value="<c:choose><c:when test="${empty realm.objectName}">Deploy</c:when><c:otherwise>Save</c:otherwise></c:choose>"
+                 onclick="document.<portlet:namespace/>RealmForm.mode.value='save';document.<portlet:namespace/>RealmForm.submit();return false;" />
+          <input type="button" value="Show Plan" onclick="document.<portlet:namespace/>RealmForm.mode.value='plan';document.<portlet:namespace/>RealmForm.submit();return false;" />
+        </td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

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

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

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

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/list.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,80 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p>This page lists all the available security realms.  Server-wide security realms can be edited, while security
+realms deployed as part of a single application cannot (change the deployment plan in the application instead).</p>
+
+<c:choose>
+  <c:when test="${empty(realms)}"><p><i>There are no security realms defined</i></p></c:when>
+  <c:otherwise>
+<p>For each realm listed, you can click the <b>usage</b> link to see examples of how
+  to use the realm from your application.</p>
+
+<table width="100%">
+  <tr>
+    <td class="DarkBackground">Name</td>
+    <td class="DarkBackground" align="center">Deployed As</td>
+    <td class="DarkBackground" align="center">State</td>
+    <td class="DarkBackground" align="center">Actions</td>
+  </tr>
+<c:forEach var="realm" items="${realms}">
+  <tr>
+    <td>${realm.name}</td>
+    <td>
+      <c:choose>
+        <c:when test="${empty realm.parentName}">
+          Server-wide
+        </c:when>
+        <c:otherwise>
+          ${realm.parentName}  <%-- todo: make this a link to an application portlet --%>
+        </c:otherwise>
+      </c:choose>
+    </td>
+    <td>${realm.stateName}</td>
+    <td>
+    <c:if test="${empty realm.parentName}">
+         <%--<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="editExisting" />
+        <portlet:param name="objectName" value="${realm.objectName}" />
+      </portlet:actionURL>">edit</a>
+      <a href="<portlet:actionURL portletMode="view">
+        <portlet:param name="mode" value="usage" />
+        <portlet:param name="name" value="${realm.name}" />
+        <portlet:param name="objectName" value="${realm.objectName}" />
+      </portlet:actionURL>">usage</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>--%>
+    </c:if>
+    </td>
+  </tr>
+</c:forEach>
+</table>
+  </c:otherwise>
+</c:choose>
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="type" />
+            </portlet:actionURL>">Add new security realm</a></p>

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

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

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

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/selectType.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,88 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Security Realm</b> -- Step 1: Select Name and Type</p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="process-type" />
+    <input type="hidden" name="jar" value="${realm.jar}" />
+  <c:forEach var="option" items="${realm.options}">
+    <input type="hidden" name="option-${option.key}" value="${option.value}" />
+  </c:forEach>
+    <input type="hidden" name="auditPath" value="${realm.auditPath}" />
+    <input type="hidden" name="lockoutCount" value="${realm.lockoutCount}" />
+    <input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
+    <input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
+    <input type="hidden" name="storePassword" value="${realm.storePassword}" />
+    <input type="hidden" name="objectName" value="${realm.objectName}" />
+    <input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
+    <input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
+    <input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
+    <input type="hidden" name="module-wrap-0" value="${realm.modules[0].wrapPrincipals}" />
+    <input type="hidden" name="module-server-0" value="${realm.modules[0].serverSide}" />
+    <input type="hidden" name="module-options-0" value="${realm.modules[0].optionString}" />
+    <input type="hidden" name="module-domain-1" value="${realm.modules[1].loginDomainName}" />
+    <input type="hidden" name="module-class-1" value="${realm.modules[1].className}" />
+    <input type="hidden" name="module-control-1" value="${realm.modules[1].controlFlag}" />
+    <input type="hidden" name="module-wrap-1" value="${realm.modules[1].wrapPrincipals}" />
+    <input type="hidden" name="module-server-1" value="${realm.modules[1].serverSide}" />
+    <input type="hidden" name="module-options-1" value="${realm.modules[1].optionString}" />
+    <input type="hidden" name="module-domain-2" value="${realm.modules[2].loginDomainName}" />
+    <input type="hidden" name="module-class-2" value="${realm.modules[2].className}" />
+    <input type="hidden" name="module-control-2" value="${realm.modules[2].controlFlag}" />
+    <input type="hidden" name="module-wrap-2" value="${realm.modules[2].wrapPrincipals}" />
+    <input type="hidden" name="module-server-2" value="${realm.modules[2].serverSide}" />
+    <input type="hidden" name="module-options-2" value="${realm.modules[2].optionString}" />
+    <input type="hidden" name="module-domain-3" value="${realm.modules[3].loginDomainName}" />
+    <input type="hidden" name="module-class-3" value="${realm.modules[3].className}" />
+    <input type="hidden" name="module-control-3" value="${realm.modules[3].controlFlag}" />
+    <input type="hidden" name="module-wrap-3" value="${realm.modules[3].wrapPrincipals}" />
+    <input type="hidden" name="module-server-3" value="${realm.modules[3].serverSide}" />
+    <input type="hidden" name="module-options-3" value="${realm.modules[3].optionString}" />
+    <input type="hidden" name="module-domain-4" value="${realm.modules[4].loginDomainName}" />
+    <input type="hidden" name="module-class-4" value="${realm.modules[4].className}" />
+    <input type="hidden" name="module-control-4" value="${realm.modules[4].controlFlag}" />
+    <input type="hidden" name="module-wrap-4" value="${realm.modules[4].wrapPrincipals}" />
+    <input type="hidden" name="module-server-4" value="${realm.modules[4].serverSide}" />
+    <input type="hidden" name="module-options-4" value="${realm.modules[4].optionString}" />
+    <table border="0">
+    <!-- ENTRY FIELD: NAME -->
+      <tr>
+        <th style="min-width: 140px"><div align="right">Name of Security Realm:</div></th>
+        <td><input name="name" type="text" size="30" value="${realm.name}" /></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>A name that is different than the name for any other security realms in the server (no spaces in the name please).
+          Other components will use this name to refer to the security realm.</td>
+      </tr>
+    <!-- ENTRY FIELD: REALM TYPE -->
+      <tr>
+        <th><div align="right">Realm Type:</div></th>
+        <td>
+          <select name="realmType">
+        <c:forEach var="module" items="${moduleTypes}">
+            <option <c:if test="${module.name == realm.realmType}">selected</c:if>>${module.name}</option>
+        </c:forEach>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The type of login module used as the master for this security realm.  Select "Other" for manual
+          configuration options including custom login modules and realms that use multiple login modules
+          to populate user principals.</td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><input type="submit" value="Next" /></td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

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

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

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

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/showPlan.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,105 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Security Realm</b> -- Show Deployment Plan</p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="save" />
+    <input type="hidden" name="jar" value="${realm.jar}" />
+    <input type="hidden" name="name" value="${realm.name}" />
+    <input type="hidden" name="realmType" value="${realm.realmType}" />
+  <c:forEach var="option" items="${realm.options}">
+    <input type="hidden" name="option-${option.key}" value="${option.value}" />
+  </c:forEach>
+    <input type="hidden" name="auditPath" value="${realm.auditPath}" />
+    <input type="hidden" name="lockoutCount" value="${realm.lockoutCount}" />
+    <input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
+    <input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
+    <input type="hidden" name="storePassword" value="${realm.storePassword}" />
+    <input type="hidden" name="objectName" value="${realm.objectName}" />
+    <input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
+    <input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
+    <input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
+    <input type="hidden" name="module-wrap-0" value="${realm.modules[0].wrapPrincipals}" />
+    <input type="hidden" name="module-server-0" value="${realm.modules[0].serverSide}" />
+    <input type="hidden" name="module-options-0" value="${realm.modules[0].optionString}" />
+    <input type="hidden" name="module-domain-1" value="${realm.modules[1].loginDomainName}" />
+    <input type="hidden" name="module-class-1" value="${realm.modules[1].className}" />
+    <input type="hidden" name="module-control-1" value="${realm.modules[1].controlFlag}" />
+    <input type="hidden" name="module-wrap-1" value="${realm.modules[1].wrapPrincipals}" />
+    <input type="hidden" name="module-server-1" value="${realm.modules[1].serverSide}" />
+    <input type="hidden" name="module-options-1" value="${realm.modules[1].optionString}" />
+    <input type="hidden" name="module-domain-2" value="${realm.modules[2].loginDomainName}" />
+    <input type="hidden" name="module-class-2" value="${realm.modules[2].className}" />
+    <input type="hidden" name="module-control-2" value="${realm.modules[2].controlFlag}" />
+    <input type="hidden" name="module-wrap-2" value="${realm.modules[2].wrapPrincipals}" />
+    <input type="hidden" name="module-server-2" value="${realm.modules[2].serverSide}" />
+    <input type="hidden" name="module-options-2" value="${realm.modules[2].optionString}" />
+    <input type="hidden" name="module-domain-3" value="${realm.modules[3].loginDomainName}" />
+    <input type="hidden" name="module-class-3" value="${realm.modules[3].className}" />
+    <input type="hidden" name="module-control-3" value="${realm.modules[3].controlFlag}" />
+    <input type="hidden" name="module-wrap-3" value="${realm.modules[3].wrapPrincipals}" />
+    <input type="hidden" name="module-server-3" value="${realm.modules[3].serverSide}" />
+    <input type="hidden" name="module-options-3" value="${realm.modules[3].optionString}" />
+    <input type="hidden" name="module-domain-4" value="${realm.modules[4].loginDomainName}" />
+    <input type="hidden" name="module-class-4" value="${realm.modules[4].className}" />
+    <input type="hidden" name="module-control-4" value="${realm.modules[4].controlFlag}" />
+    <input type="hidden" name="module-wrap-4" value="${realm.modules[4].wrapPrincipals}" />
+    <input type="hidden" name="module-server-4" value="${realm.modules[4].serverSide}" />
+    <input type="hidden" name="module-options-4" value="${realm.modules[4].optionString}" />
+    <table border="0">
+    <!-- STATUS FIELD: Deployment Plan -->
+      <tr>
+        <th valign="top" style="min-width: 140px"><div align="right">Deployment Plan:</div></th>
+        <td><textarea rows="30" cols="60" readonly>${deploymentPlan}</textarea></td>
+      </tr>
+    <!-- SUBMIT BUTTON -->
+      <tr>
+        <td></td>
+        <td>
+<input type="submit" value="<c:choose><c:when test="${empty realm.objectName}">Deploy Realm</c:when><c:otherwise>Save</c:otherwise></c:choose>" />
+<input type="button" value="Edit Settings" onclick="document.<portlet:namespace/>RealmForm.mode.value='configure';document.<portlet:namespace/>RealmForm.submit();return false;" />
+        </td>
+      </tr>
+    <!-- STATUS FIELD: Command-line guidance -->
+      <tr>
+        <th valign="top"><div align="right">Deploy Command:</div></th>
+        <td>To deploy a security realm from the command line using this plan,
+          copy and paste it to a file (say, <tt>security-realm.xml</tt>) and save
+          it.  Then run a command like:<br />
+<pre>
+cd GERONIMO_HOME
+java -jar bin/deployer.jar deploy security-realm.xml
+</pre></td>
+      </tr>
+    <!-- STATUS FIELD: Embed in EAR guidance -->
+      <tr>
+        <th valign="top"><div align="right">Add to EAR:</div></th>
+        <td>Instead of deploying as a top-level security realm, you
+          can deploy this realm as part of an EAR.  To add a security
+          realm to an EAR using this plan, create a
+          <tt>META-INF/geronimo-application.xml</tt> file in your EAR
+          that has the <tt>dependency</tt> elements (if any) and
+          <tt>gbean</tt> elements from the plan above.  It should look
+          something like this:
+<pre>
+&lt;application
+   xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
+   configId="MyApplication"&gt;
+
+  &lt;gbean name="${realm.name}"
+    class="org.apache.geronimo.security.realm.GenericSecurityRealm"&gt;
+        ...
+  &lt;/gbean&gt;
+&lt;/application&gt;
+</pre></td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

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

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

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

Added: geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp?rev=393787&view=auto
==============================================================================
--- geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp (added)
+++ geronimo/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/realmwizard/testLogin.jsp Thu Apr 13 04:34:08 2006
@@ -0,0 +1,86 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
+<portlet:defineObjects/>
+
+<p><b>Create Security Realm</b> -- Step 4: Test Login</p>
+
+<p>From here you can enter a username and password for the main login module in the realm, and
+see if the login is successful and which Principals are generated for the user.  This is
+menat to be an indication of whether the settings for the main login module are correct.  It
+does not invoke advanced features such as auditing or lockout.</p>
+
+<!--   FORM TO COLLECT DATA FOR THIS PAGE   -->
+<form name="<portlet:namespace/>RealmForm" action="<portlet:actionURL/>">
+    <input type="hidden" name="mode" value="process-test" />
+    <input type="hidden" name="name" value="${realm.name}" />
+    <input type="hidden" name="realmType" value="${realm.realmType}" />
+    <input type="hidden" name="jar" value="${realm.jar}" />
+  <c:forEach var="option" items="${realm.options}">
+    <input type="hidden" name="option-${option.key}" value="${option.value}" />
+  </c:forEach>
+    <input type="hidden" name="auditPath" value="${realm.auditPath}" />
+    <input type="hidden" name="lockoutCount" value="${realm.lockoutCount}" />
+    <input type="hidden" name="lockoutWindow" value="${realm.lockoutWindow}" />
+    <input type="hidden" name="lockoutDuration" value="${realm.lockoutDuration}" />
+    <input type="hidden" name="storePassword" value="${realm.storePassword}" />
+    <input type="hidden" name="objectName" value="${realm.objectName}" />
+    <input type="hidden" name="module-domain-0" value="${realm.modules[0].loginDomainName}" />
+    <input type="hidden" name="module-class-0" value="${realm.modules[0].className}" />
+    <input type="hidden" name="module-control-0" value="${realm.modules[0].controlFlag}" />
+    <input type="hidden" name="module-wrap-0" value="${realm.modules[0].wrapPrincipals}" />
+    <input type="hidden" name="module-server-0" value="${realm.modules[0].serverSide}" />
+    <input type="hidden" name="module-options-0" value="${realm.modules[0].optionString}" />
+    <input type="hidden" name="module-domain-1" value="${realm.modules[1].loginDomainName}" />
+    <input type="hidden" name="module-class-1" value="${realm.modules[1].className}" />
+    <input type="hidden" name="module-control-1" value="${realm.modules[1].controlFlag}" />
+    <input type="hidden" name="module-wrap-1" value="${realm.modules[1].wrapPrincipals}" />
+    <input type="hidden" name="module-server-1" value="${realm.modules[1].serverSide}" />
+    <input type="hidden" name="module-options-1" value="${realm.modules[1].optionString}" />
+    <input type="hidden" name="module-domain-2" value="${realm.modules[2].loginDomainName}" />
+    <input type="hidden" name="module-class-2" value="${realm.modules[2].className}" />
+    <input type="hidden" name="module-control-2" value="${realm.modules[2].controlFlag}" />
+    <input type="hidden" name="module-wrap-2" value="${realm.modules[2].wrapPrincipals}" />
+    <input type="hidden" name="module-server-2" value="${realm.modules[2].serverSide}" />
+    <input type="hidden" name="module-options-2" value="${realm.modules[2].optionString}" />
+    <input type="hidden" name="module-domain-3" value="${realm.modules[3].loginDomainName}" />
+    <input type="hidden" name="module-class-3" value="${realm.modules[3].className}" />
+    <input type="hidden" name="module-control-3" value="${realm.modules[3].controlFlag}" />
+    <input type="hidden" name="module-wrap-3" value="${realm.modules[3].wrapPrincipals}" />
+    <input type="hidden" name="module-server-3" value="${realm.modules[3].serverSide}" />
+    <input type="hidden" name="module-options-3" value="${realm.modules[3].optionString}" />
+    <input type="hidden" name="module-domain-4" value="${realm.modules[4].loginDomainName}" />
+    <input type="hidden" name="module-class-4" value="${realm.modules[4].className}" />
+    <input type="hidden" name="module-control-4" value="${realm.modules[4].controlFlag}" />
+    <input type="hidden" name="module-wrap-4" value="${realm.modules[4].wrapPrincipals}" />
+    <input type="hidden" name="module-server-4" value="${realm.modules[4].serverSide}" />
+    <input type="hidden" name="module-options-4" value="${realm.modules[4].optionString}" />
+    <table border="0">
+    <!-- ENTRY FIELD: Username -->
+      <tr>
+        <th style="min-width: 140px"><div align="right">Username:</div></th>
+        <td><input name="username" type="text" size="20" /></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The username to use to log in to the realm.</td>
+      </tr>
+    <!-- ENTRY FIELD: Password -->
+      <tr>
+        <th><div align="right">Password:</div></th>
+        <td><input name="password" type="password" size="20" /></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td>The password to use to log in to the realm.</td>
+      </tr>
+      <tr>
+        <td></td>
+        <td><input type="submit" value="Next" /></td>
+      </tr>
+    </table>
+</form>
+<!--   END OF FORM TO COLLECT DATA FOR THIS PAGE   -->
+
+<p><a href="<portlet:actionURL portletMode="view">
+              <portlet:param name="mode" value="list" />
+            </portlet:actionURL>">Cancel</a></p>

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

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

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



Mime
View raw message