geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r599015 - in /geronimo/server/trunk/plugins: console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/ console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/ system-database/system-database-portlets/src...
Date Wed, 28 Nov 2007 14:47:58 GMT
Author: jbohn
Date: Wed Nov 28 06:47:51 2007
New Revision: 599015

URL: http://svn.apache.org/viewvc?rev=599015&view=rev
Log:
GERONIMO-3636 fix broken server log viewer filter in console, replace refresh links with buttons,
beautify the jsps

Modified:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
    geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp?rev=599015&r1=599014&r2=599015&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/logmanager/search.jsp
Wed Nov 28 06:47:51 2007
@@ -22,9 +22,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);
+    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);
 }
 
@@ -33,8 +33,8 @@
 }
 
 function <portlet:namespace/>isNumeric(candidate){
-    for(i = 0; i < candidate.length; i++){
-        if(<portlet:namespace/>search(candidate.charAt(i),numbers) < 0){
+    for (i = 0; i < candidate.length; i++) {
+        if (<portlet:namespace/>search(candidate.charAt(i),numbers) < 0) {
             return false;
         }
     }
@@ -45,17 +45,17 @@
     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)){
+    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)){
+    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)){
+    if (!<portlet:namespace/>isNumeric(maxRows)) {
         alert("Maximum results must be a number.");
         document.<portlet:namespace/>searchForm.maxRows.focus();
         return false;
@@ -65,63 +65,69 @@
 </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:actionURL/>" name="<portlet:namespace/>searchForm"
onsubmit="return <portlet:namespace/>validateForm();">
-    <b>Filter results:</b>
-    <input type="hidden" value="search" name="action"/>
-    File <select name="logFile">
-        <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>/>
-    <br/><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>
+    <tr>
+        <td><button onclick="location='<portlet:renderURL><portlet:param
name="action" value="refresh"/></portlet:renderURL>'">Refresh</button>
+            <br/>
+            <br/>
+        </td>
+    </tr>
+    <tr>
+        <td class="Smaller" valign="middle">
+            <form action="<portlet:actionURL/>" name="<portlet:namespace/>searchForm"
onsubmit="return <portlet:namespace/>validateForm();">
+                <b>Filter Criteria:</b>
+                <input type="hidden" value="search" name="action"/>
+                <br/>
+                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 == 'TRACE' || logLevel == ''}">selected</c:if>>TRACE</option>
+                    <option <c:if test="${logLevel == 'DEBUG'}">selected</c:if>>DEBUG</option>
+                    <option <c:if test="${logLevel == 'INFO'}">selected</c:if>>INFO</option>
+                    <option <c:if test="${logLevel == 'WARN'}">selected</c:if>>WARN</option>
+                    <option <c:if test="${logLevel == 'ERROR'}">selected</c:if>>ERROR</option>
+                    <option <c:if test="${logLevel == '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>/>
+                <br/>
+                <input type="submit" value="Filter Log"/>
+            </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>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp?rev=599015&r1=599014&r2=599015&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
(original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
Wed Nov 28 06:47:51 2007
@@ -25,163 +25,183 @@
 var <portlet:namespace/>dateFields = new Array("fromDate", "toDate");
 
 function <portlet:namespace/>validateForm(){
-    if(document.forms[<portlet:namespace/>formName].ignoreDates.checked)
+    if (document.forms[<portlet:namespace/>formName].ignoreDates.checked)
         return true;
-    for(i in <portlet:namespace/>dateFields) {
-        if(!checkDateMMDDYYYY(<portlet:namespace/>formName, <portlet:namespace/>dateFields[i]))
+    for (i in <portlet:namespace/>dateFields) {
+        if (!checkDateMMDDYYYY(<portlet:namespace/>formName, <portlet:namespace/>dateFields[i]))
             return false;
     }
     // Check if to date is after from date
     var fromDate = new Date(document.forms[<portlet:namespace/>formName].fromDate.value);
     var toDate = new Date(document.forms[<portlet:namespace/>formName].toDate.value);
-    if(fromDate > toDate) {
+    if (fromDate > toDate) {
         alert('to date must be after from date.');
         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>
-    <form action="<portlet:actionURL/>" name="<portlet:namespace/>searchForm"
method="post" onSubmit="return <portlet:namespace/>validateForm();">
-    <b>Filter results:</b>
-    <input type="hidden" value="search" name="action"/>    
-    <table width="680">
-    <c:choose>
-      <c:when test="${fn:length(webContainers) > 1}">
-        <tr>
-            <td colspan="4" class="DarkBackground"><b>Container:</b></td>
-        </tr>
-        <tr>
-            <td>Search Web Container:</td>
-            <td>
-              <select name="selectedContainer">
-            <c:forEach var="webContainer" items="${webContainers}">
-                <option value="${webContainer.value}"<c:if test="${webContainer.value
eq selectedContainer}"> selected</c:if>>${webContainer.key}</option>
-            </c:forEach>
-              </select>
-            </td>
-        </tr>
-      </c:when>
-      <c:otherwise>
-      <c:forEach var="webContainer" items="${webContainers}">
-        <tr><td><input type="hidden" name="selectedContainer" value="${webContainer.value}"
/></td></tr>
-      </c:forEach>
-      </c:otherwise>
-    </c:choose>
-    <%-- todo: When the user changes the selected container, we need to change the log
selection options!!!
-         need some AJAX here.  :)  --%>
-    <c:choose>
-      <c:when test="${fn:length(webLogs) > 1}">
-        <tr>
-            <td colspan="4" class="DarkBackground"><b>Log:</b></td>
-        </tr>
-        <tr>
-            <td>Search Web Log:</td>
-            <td>
-              <select name="selectedLog">
-            <c:forEach var="webLog" items="${webLogs}">
-                <option<c:if test="${webLog eq selectedLog}"> selected</c:if>>${webLog}</option>
-            </c:forEach>
-              </select>
-            </td>
-        </tr>
-      </c:when>
-      <c:otherwise>
-      <c:forEach var="webLog" items="${webLogs}">
-        <tr><td><input type="hidden" name="selectedLog" value="${webLog}"
/></td></tr>
-      </c:forEach>
-      </c:otherwise>
-    </c:choose>
-        <tr>
-            <td colspan="4" class="DarkBackground"><b>Date:</b></td>
-        </tr>
-        <tr>
-            <td>From (MM/DD/YYYY):</td>
-            <td><input type="text" name="fromDate" value="${fromDate}"></td>
-            <td>To (MM/DD/YYYY):</td>
-            <td><input type="text" name="toDate" value="${toDate}"></td>
-        </tr>
-        <tr>
-            <td>Ignore Dates:</td>
-            <td>
-            <input type="checkbox" name="ignoreDates" <c:if test="${ignoreDates}">
checked</c:if>/>
-            </td>
-        </tr>    
-        <tr>
-            <td colspan="4" class="DarkBackground"><b>Identity:</b></td>
-        </tr>
-        <tr>
-            <td>Remote Address:</td>
-            <td><input type="text" name="requestHost" value="${requestHost}"/></td>
-            <td>Authenticated User:</td>
-            <td><input type="text" name="authUser" value="${authUser}"/></td>
-        </tr>
-        <tr>
-            <td colspan="4" class="DarkBackground"><b>Request:</b></td>
-        </tr>
-        <tr>
-            <td>Request Method:</td>
-            <td>
-                <select name="requestMethod">
-                    <option value="" <c:if test="${empty requestMethod or requestMethod
eq ''}"> selected</c:if>>ANY</option>
-                    <option <c:if test="${requestMethod == 'GET'}"> selected</c:if>>GET</option>
-                    <option <c:if test="${requestMethod == 'POST'}"> selected</c:if>>POST</option>
-                    <option <c:if test="${requestMethod == 'PUT'}"> selected</c:if>>PUT</option>
-                    <option <c:if test="${requestMethod == 'DELETE'}"> selected</c:if>>DELETE</option>
-                </select>
-            </td>
-            <td>Requested URI:</td>
-            <td><input type="text" name="requestedURI" value="${requestedURI}"/></td>
-        </tr>
-        <tr>
-            <td colspan="4" class="DarkBackground"><b>Result Size:</b></td>
-        </tr>
-        <tr>
-            <td>Start Result:</td>
-            <td><input type="text" name="startResult" value="${startResult}"/>
-            </td>
-            <td>Max Results:</td>
-            <td><input type="text" name="maxResult" value="${maxResult}"/>
-            </td>
-        </tr>        
-        <tr>
-            <td colspan="4" align="left">
-                <input type="submit" value="Go"/>
-            </td>
-        </tr>
-    </table>
-    </form>    
-    </td>
-</tr>    
-<tr>
-    <td>     
-<c:choose>
-<c:when test="${logs != null && fn:length(logs) > 0}">
-    <table>
-        <tr>
-            <td><b>Found ${fn:length(logs)} matches in logfile (${logLength}
lines searched).</b></td>
-        </tr>   
-    <c:forEach var="line" items="${logs}">
-        <tr>
-            <td class="Smaller">
-${line.lineNumber}&nbsp;<c:out escapeXml="true" value="${line.lineContent}" />
-            </td>
-        </tr>
-    </c:forEach>
-    </table>
-</c:when>
-<c:otherwise>
- No log entries found.
-</c:otherwise>
-</c:choose>  
-</td>     
-</tr>
+    <tr>
+        <td><button onclick="location='<portlet:renderURL><portlet:param
name="action" value="refresh"/></portlet:renderURL>'">Refresh</button>
+            <br/>
+            <br/>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <form action="<portlet:actionURL/>" name="<portlet:namespace/>searchForm"
method="post" onSubmit="return <portlet:namespace/>validateForm();">
+                <b>Filter Criteria:</b>
+                <input type="hidden" value="search" name="action"/>
+                <table width="680">
+                    <c:choose>
+                        <c:when test="${fn:length(webContainers) > 1}">
+                            <tr>
+                                <td colspan="4" class="DarkBackground"><b>Container:</b></td>
+                            </tr>
+                            <tr>
+                                <td>Search Web Container:</td>
+                                <td>
+                                    <select name="selectedContainer">
+                                        <c:forEach var="webContainer" items="${webContainers}">
+                                            <option value="${webContainer.value}"<c:if
test="${webContainer.value eq selectedContainer}">selected</c:if>>${webContainer.key}</option>
+                                        </c:forEach>
+                                    </select>
+                                </td>
+                            </tr>
+                        </c:when>
+                        <c:otherwise>
+                            <c:forEach var="webContainer" items="${webContainers}">
+                                <tr>
+                                    <td>
+                                        <input type="hidden" name="selectedContainer"
value="${webContainer.value}" />
+                                    </td>
+                                </tr>
+                            </c:forEach>
+                        </c:otherwise>
+                    </c:choose>
+                    <%-- todo: When the user changes the selected container, we need to
change the log selection options!!!
+                         need some AJAX here.  :)  --%>
+                    <c:choose>
+                        <c:when test="${fn:length(webLogs) > 1}">
+                            <tr>
+                                <td colspan="4" class="DarkBackground"><b>Log:</b></td>
+                            </tr>
+                            <tr>
+                                <td>Search Web Log:</td>
+                                <td>
+                                    <select name="selectedLog">
+                                        <c:forEach var="webLog" items="${webLogs}">
+                                            <option<c:if test="${webLog eq selectedLog}">selected</c:if>>${webLog}</option>
+                                        </c:forEach>
+                                    </select>
+                                </td>
+                            </tr>
+                        </c:when>
+                        <c:otherwise>
+                            <c:forEach var="webLog" items="${webLogs}">
+                                <tr>
+                                    <td>
+                                        <input type="hidden" name="selectedLog" value="${webLog}"
/>
+                                    </td>
+                                </tr>
+                            </c:forEach>
+                        </c:otherwise>
+                    </c:choose>
+                    <tr>
+                        <td colspan="4" class="DarkBackground"><b>Date:</b></td>
+                    </tr>
+                    <tr>
+                        <td>From (MM/DD/YYYY):</td>
+                        <td>
+                            <input type="text" name="fromDate" value="${fromDate}">
+                        </td>
+                        <td>To (MM/DD/YYYY):</td>
+                        <td>
+                            <input type="text" name="toDate" value="${toDate}">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>Ignore Dates:</td>
+                        <td>
+                            <input type="checkbox" name="ignoreDates" < c:if test="${ignoreDates}">checked</c:if>/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="4" class="DarkBackground"><b>Identity:</b></td>
+                    </tr>
+                    <tr>
+                        <td>Remote Address:</td>
+                        <td>
+                            <input type="text" name="requestHost" value="${requestHost}"/>
+                        </td>
+                        <td>Authenticated User:</td>
+                        <td>
+                            <input type="text" name="authUser" value="${authUser}"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="4" class="DarkBackground"><b>Request:</b></td>
+                    </tr>
+                    <tr>
+                        <td>Request Method:</td>
+                        <td>
+                            <select name="requestMethod">
+                                <option value="" < c:if test="${empty requestMethod
or requestMethod eq ''}">selected</c:if>>ANY</option>
+                                <option <c:if test="${requestMethod == 'GET'}">selected</c:if>>GET</option>
+                                <option <c:if test="${requestMethod == 'POST'}">selected</c:if>>POST</option>
+                                <option <c:if test="${requestMethod == 'PUT'}">selected</c:if>>PUT</option>
+                                <option <c:if test="${requestMethod == 'DELETE'}">selected</c:if>>DELETE</option>
+                            </select>
+                        </td>
+                        <td>Requested URI:</td>
+                        <td>
+                            <input type="text" name="requestedURI" value="${requestedURI}"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="4" class="DarkBackground"><b>Result Size:</b></td>
+                    </tr>
+                    <tr>
+                        <td>Start Result:</td>
+                        <td>
+                            <input type="text" name="startResult" value="${startResult}"/>
+                        </td>
+                        <td>Max Results:</td>
+                        <td>
+                            <input type="text" name="maxResult" value="${maxResult}"/>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="4" align="left">
+                            <input type="submit" value="Filter Log"/>
+                        </td>
+                    </tr>
+                </table>
+            </form>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <c:choose>
+                <c:when test="${logs != null && fn:length(logs) > 0}">
+                    <table>
+                        <tr>
+                            <td><b>Found ${fn:length(logs)} matches in logfile
(${logLength} lines searched).</b></td>
+                        </tr>
+                        <c:forEach var="line" items="${logs}">
+                        <tr>
+                            <td class="Smaller">${line.lineNumber}&nbsp;
+                                <c:out escapeXml="true" value="${line.lineContent}" />
+                            </td>
+                        </tr>
+                        </c:forEach>
+                    </table>
+                </c:when>
+                <c:otherwise>
+                    No log entries found.
+                </c:otherwise>
+            </c:choose>
+        </td>
+    </tr>
 </table>

Modified: geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp?rev=599015&r1=599014&r2=599015&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp
(original)
+++ geronimo/server/trunk/plugins/system-database/system-database-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp
Wed Nov 28 06:47:51 2007
@@ -19,48 +19,55 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 
 <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"
>
-    <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"/>
-    Max Results <input type="text" name="maxRows" value="${maxRows}" size="3"/>
-    Containing text <input type="text" name="searchString" value="${searchString}"/>
-    <br/><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>
+    <tr>
+        <td><button onclick="location='<portlet:renderURL><portlet:param
name="action" value="refresh"/></portlet:renderURL>'">Refresh</button>
+            <br/>
+            <br/>
+        </td>
+    </tr>
+    <tr>
+        <td class="Smaller" valign="middle">
+            <form action="<portlet:renderURL/>" name="<portlet:namespace/>searchForm"
>
+                <b>Filter Criteria:</b>
+                <input type="hidden" value="search" name="action"/>
+                <br/>
+                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"/>
+                Containing text <input type="text" name="searchString" value="${searchString}"/>
+                <br/>
+                <input type="submit" value="Filter Log"/>
+            </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 entries found with the specified criteria.
-</c:otherwise>
-</c:choose>
-</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 entries found with the specified criteria.
+                </c:otherwise>
+            </c:choose>
+        </td>
+    </tr>
 </table>



Mime
View raw message