You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2006/01/25 22:35:37 UTC
svn commit: r372324 - in /geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view: derbylogmanager/view.jsp logmanager/search.jsp webaccesslogmanager/view.jsp

Author: ammulder
Date: Wed Jan 25 13:35:35 2006
New Revision: 372324

URL: http://svn.apache.org/viewcvs?rev=372324&view=rev
Log:
Merge fix for GERONIMO-1474 from branch

Modified:
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp?rev=372324&r1=372323&r2=372324&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/derbylogmanager/view.jsp Wed Jan 25 13:35:35 2006
@@ -35,7 +35,7 @@
     <c:forEach var="line" items="${searchResults}">
         <tr>
             <td class="Smaller">
-            ${line.lineNumber}:&nbsp;${line.lineContent}
+            ${line.lineNumber}:&nbsp;<c:out escapeXml="true" value="${line.lineContent}" />
             </td>
         </tr>
     </c:forEach>

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp?rev=372324&r1=372323&r2=372324&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/logmanager/search.jsp Wed Jan 25 13:35:35 2006
@@ -96,7 +96,7 @@
     <c:forEach var="line" items="${searchResults}">
         <tr>
             <td class="Smaller">
-            ${line.lineNumber}:&nbsp;${line.lineContent}
+            ${line.lineNumber}:&nbsp;<c:out escapeXml="true" value="${line.lineContent}" />
             </td>
         </tr>
     </c:forEach>

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp?rev=372324&r1=372323&r2=372324&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp (original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/webaccesslogmanager/view.jsp Wed Jan 25 13:35:35 2006
@@ -195,7 +195,7 @@
     <c:forEach var="line" items="${logs}">
         <tr>
             <td class="Smaller">
-${line.lineNumber}&nbsp;${line.lineContent}
+${line.lineNumber}&nbsp;<c:out escapeXml="true" value="${line.lineContent}" />
             </td>
         </tr>
     </c:forEach>