continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r1091974 - in /continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp: ./ components/
Date Wed, 13 Apr 2011 23:32:25 GMT
Author: ctan
Date: Wed Apr 13 23:32:24 2011
New Revision: 1091974

URL: http://svn.apache.org/viewvc?rev=1091974&view=rev
Log:
[CONTINUUM-2620] removed fn:escapeXml

Modified:
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp?rev=1091974&r1=1091973&r2=1091974&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp Wed Apr 13 23:32:24 2011
@@ -22,7 +22,6 @@
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib prefix="c1" uri="continuum" %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
 <html>
   <s:i18n name="localization.Continuum">
@@ -78,7 +77,7 @@
             <tbody>
             <tr>
               <td>
-                <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroupName)}">
+                <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
                   <form action="removeBuildResult.action">
                     <input type="hidden" name="projectId" value="<s:property value="projectId"/>"/>
                     <input type="hidden" name="buildId" value="<s:property value="buildId"/>"/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp?rev=1091974&r1=1091973&r2=1091974&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp Wed Apr 13 23:32:24 2011
@@ -21,7 +21,6 @@
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
 <html>
   <s:i18n name="localization.Continuum">
@@ -62,7 +61,7 @@
                     filterable="false"
                     sortable="false">
             <ec:row highlightRow="true">
-              <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroupName)}">
+              <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
                 <ec:column alias="selectedBuildResults" title=" " style="width:5px" filterable="false" sortable="false" headerCell="selectAll">
                   <input type="checkbox" name="selectedBuildResults" value="<c:out value="${buildResult.id}"/>" />
                 </ec:column>
@@ -103,7 +102,7 @@
                 <tbody>
                   <tr>
                     <td>
-                      <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroupName)}">
+                      <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
                         <s:hidden name="projectGroupId"/>
                         <s:hidden name="projectId"/>
                         <input type="button" name="delete-project" value="<s:text name="delete"/>" onclick="document.forms.buildResultsForm.submit();" />

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?rev=1091974&r1=1091973&r2=1091974&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp Wed Apr 13 23:32:24 2011
@@ -22,7 +22,6 @@
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
 <s:i18n name="localization.Continuum">
 
@@ -64,7 +63,7 @@
       <ec:column property="type" title="projectView.buildDefinition.type"/>
       <ec:column property="alwaysBuild" title="projectView.buildDefinition.alwaysBuild"/>
       <ec:column property="buildAction" title="&nbsp;" width="1%">
-        <redback:ifAuthorized permission="continuum-build-group" resource="${fn:escapeXml(projectGroupName)}">
+        <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
           <s:url id="buildUrl" action="buildProject" namespace="/">
             <s:param name="projectGroupId"><c:out value="${pageScope.buildDefinitionSummary.projectGroupId}"/></s:param>
             <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
@@ -78,7 +77,7 @@
       </ec:column>
       <ec:column property="editActions" title="&nbsp;" width="1%">
         <center>
-        <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroupName)}">
+        <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
           <s:url id="editUrl" action="buildDefinition" method="input" namespace="/" includeParams="none">
             <s:param name="projectGroupId"><c:out value="${pageScope.buildDefinitionSummary.projectGroupId}"/></s:param>
             <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
@@ -94,7 +93,7 @@
       </ec:column>    
       <ec:column property="deleteActions" title="&nbsp;" width="1%">
         <center>
-        <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroupName)}">
+        <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
           <c:choose>
           <c:when test="${pageScope.buildDefinitionSummary.isDefault == true}">
             <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0">
@@ -122,7 +121,7 @@
     </ec:row>
   </ec:table>
   </c:if>
-  <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroupName)}">
+  <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
     <div class="functnbar3">
       <s:form action="buildDefinition" method="post">
         <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
@@ -176,7 +175,7 @@
       <ec:column property="type" title="projectView.buildDefinition.type"/>
       <ec:column property="alwaysBuild" title="projectView.buildDefinition.alwaysBuild"/>
       <ec:column property="buildNowAction" title="&nbsp;" width="1%">
-        <redback:ifAuthorized permission="continuum-build-group" resource="${fn:escapeXml(projectGroupName)}">
+        <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
           <s:url id="buildProjectUrl" action="buildProject" namespace="/" includeParams="none">
             <s:param name="projectId"><c:out value="${pageScope.buildDefinitionSummary.projectId}"/></s:param>
             <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
@@ -190,7 +189,7 @@
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="editAction" title="&nbsp;" width="1%">
-        <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroupName)}">
+        <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
           <s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
             <s:param name="projectId"><c:out value="${pageScope.buildDefinitionSummary.projectId}"/></s:param>
             <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
@@ -205,7 +204,7 @@
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="removeAction" title="&nbsp;" width="1%">
-        <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroupName)}">
+        <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
           <s:token/>
           <s:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
             <s:param name="projectId"><c:out value="${pageScope.buildDefinitionSummary.projectId}"/></s:param>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?rev=1091974&r1=1091973&r2=1091974&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Wed Apr 13 23:32:24 2011
@@ -22,7 +22,6 @@
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
 <s:i18n name="localization.Continuum">
   <ec:table items="allBuildDefinitionSummaries"
@@ -55,7 +54,7 @@
       <ec:column property="description" title="projectView.buildDefinition.description"/>
       <ec:column property="type" title="projectView.buildDefinition.type"/>      
       <ec:column property="buildAction" title="&nbsp;" width="1%">
-        <redback:ifAuthorized permission="continuum-build-group" resource="${fn:escapeXml(projectGroupName)}">
+        <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
           <s:url id="buildProjectUrl" action="buildProject" namespace="/">
             <s:param name="projectId"><c:out value="${projectId}"/></s:param>
             <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
@@ -71,7 +70,7 @@
         <%-- if the from is PROJECT then render the links differently --%>
         <c:choose>
           <c:when test="${pageScope.buildDefinitionSummary.from=='PROJECT'}">
-            <redback:ifAuthorized permission="continuum-modify-project-build-definition" resource="${fn:escapeXml(projectGroupName)}">
+            <redback:ifAuthorized permission="continuum-modify-project-build-definition" resource="${projectGroupName}">
               <s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
                 <s:param name="projectId"><c:out value="${projectId}"/></s:param>
                 <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
@@ -83,7 +82,7 @@
             </redback:elseAuthorized>
           </c:when>
           <c:otherwise>
-            <redback:ifAuthorized permission="continuum-modify-group-build-definition" resource="${fn:escapeXml(projectGroupName)}">
+            <redback:ifAuthorized permission="continuum-modify-group-build-definition" resource="${projectGroupName}">
               <s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
                 <s:param name="projectGroupId"><c:out value="${pageScope.buildDefinitionSummary.projectGroupId}"/></s:param>
                 <s:param name="buildDefinitionId"><c:out value="${pageScope.buildDefinitionSummary.id}"/></s:param>
@@ -101,7 +100,7 @@
         <%-- if the from is PROJECT then render the links differently --%>
          <c:choose>
           <c:when test="${pageScope.buildDefinitionSummary.from=='PROJECT'}">
-            <redback:ifAuthorized permission="continuum-remove-project-build-definition" resource="${fn:escapeXml(projectGroupName)}">
+            <redback:ifAuthorized permission="continuum-remove-project-build-definition" resource="${projectGroupName}">
               <s:token/>
               <s:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
                 <s:param name="projectId"><c:out value="${projectId}"/></s:param>
@@ -117,7 +116,7 @@
             </redback:elseAuthorized>
           </c:when>
           <c:otherwise>
-            <redback:ifAuthorized permission="continuum-remove-group-build-definition" resource="${fn:escapeXml(projectGroupName)}">
+            <redback:ifAuthorized permission="continuum-remove-group-build-definition" resource="${projectGroupName}">
               <c:choose>              
                 <c:when test="${buildDefinitionSummary.id == defaultGroupDefinitionId || buildDefinitionSummary.isDefault}">                
                   <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?rev=1091974&r1=1091973&r2=1091974&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp Wed Apr 13 23:32:24 2011
@@ -22,7 +22,6 @@
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <s:i18n name="localization.Continuum">
 
   <h3><s:text name="projectGroupNotifierSummaryComponent.groupNotifiers"><s:param><c:out value="${projectGroup.name}"/></s:param></s:text></h3>
@@ -41,7 +40,7 @@
       <ec:column property="events" title="projectView.notifier.events"/>
       <!-- ec:column property="sender" title="projectView.notifier.sender"/ -->
       <ec:column property="editActions" title="&nbsp;" width="1%">
-        <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroup.name)}">
+        <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
           <s:url id="editUrl" action="editProjectGroupNotifier" namespace="/">
             <s:param name="projectGroupId"><c:out value="${pageScope.projectGroupNotifierSummary.projectGroupId}"/></s:param>
             <s:param name="notifierId"><c:out value="${pageScope.projectGroupNotifierSummary.id}"/></s:param>
@@ -56,7 +55,7 @@
         </redback:elseAuthorized>
       </ec:column>    
       <ec:column property="deleteActions" title="&nbsp;" width="1%">
-        <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroup.name)}">
+        <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
           <s:url id="removeUrl" action="deleteProjectGroupNotifier!default.action" namespace="/">
             <s:param name="projectGroupId"><c:out value="${pageScope.projectGroupNotifierSummary.projectGroupId}"/></s:param>
             <s:param name="notifierId"><c:out value="${pageScope.projectGroupNotifierSummary.id}"/></s:param>
@@ -74,7 +73,7 @@
   </ec:table>
   </c:if>
 
-  <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroup.name)}">
+  <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
     <div class="functnbar3">
       <s:url id="addUrl" action="addProjectGroupNotifier" namespace="/"  includeContext="false" includeParams="none" />
       <s:form action="%{addUrl}" method="post">
@@ -106,7 +105,7 @@
         <ec:column property="events" title="projectView.notifier.events"/>
         <!-- ec:column property="sender" title="projectView.notifier.sender"/ -->
         <ec:column property="editActions" title="&nbsp;" width="1%">
-          <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroup.name)}">
+          <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
             <c:choose>
               <c:when test="${!pageScope.projectNotifierSummary.fromProject}">
                 <s:url id="editUrl" action="editProjectNotifier" namespace="/" includeParams="none">
@@ -130,7 +129,7 @@
           </redback:elseAuthorized>
         </ec:column>
         <ec:column property="deleteActions" title="&nbsp;" width="1%">
-          <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroup.name)}">
+          <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
             <c:choose>
               <c:when test="${!pageScope.projectNotifierSummary.fromProject}">
                 <s:url id="removeUrl" action="deleteProjectNotifier!default.action" namespace="/">

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp?rev=1091974&r1=1091973&r2=1091974&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp Wed Apr 13 23:32:24 2011
@@ -21,7 +21,6 @@
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="continuum" prefix="c1" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
 <s:i18n name="localization.Continuum">
 
@@ -47,7 +46,7 @@
         <s:set name="tabName" value="tabName"/>
         <c:choose>
             <c:when test="${tabName != 'Summary'}">
-                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${fn:escapeXml(projectGroupSummaryUrl)}"><s:text name="projectGroup.tab.summary"/></a>
+                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupSummaryUrl}"><s:text name="projectGroup.tab.summary"/></a>
             </c:when>
             <c:otherwise>
                 <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><s:text name="projectGroup.tab.summary"/></b>
@@ -56,7 +55,7 @@
 
         <c:choose>
             <c:when test="${tabName != 'Members'}">
-                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${fn:escapeXml(projectGroupMembersUrl)}"><s:text name="projectGroup.tab.members"/></a>
+                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupMembersUrl}"><s:text name="projectGroup.tab.members"/></a>
             </c:when>
             <c:otherwise>
                 <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><s:text name="projectGroup.tab.members"/></b>
@@ -65,7 +64,7 @@
 
         <c:choose>
             <c:when test="${tabName != 'BuildDefinitions'}">
-                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${fn:escapeXml(projectGroupBuildDefinitionUrl)}"><s:text name="projectGroup.tab.buildDefinitions"/></a>
+                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupBuildDefinitionUrl}"><s:text name="projectGroup.tab.buildDefinitions"/></a>
             </c:when>
             <c:otherwise>
                 <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><s:text name="projectGroup.tab.buildDefinitions"/></b>
@@ -74,7 +73,7 @@
 
         <c:choose>
             <c:when test="${tabName != 'Notifier'}">
-                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${fn:escapeXml(projectGroupNotifierUrl)}"><s:text name="projectGroup.tab.notifiers"/></a>
+                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupNotifierUrl}"><s:text name="projectGroup.tab.notifiers"/></a>
             </c:when>
             <c:otherwise>
                 <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><s:text name="projectGroup.tab.notifiers"/></b>
@@ -83,7 +82,7 @@
         
         <c:choose>
             <c:when test="${tabName != 'ReleaseResults'}">
-                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${fn:escapeXml(projectGroupReleaseResultsUrl)}"><s:text name="projectGroup.tab.releaseResults"/></a>
+                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupReleaseResultsUrl}"><s:text name="projectGroup.tab.releaseResults"/></a>
             </c:when>
             <c:otherwise>
                 <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><s:text name="projectGroup.tab.releaseResults"/></b>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp?rev=1091974&r1=1091973&r2=1091974&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp Wed Apr 13 23:32:24 2011
@@ -22,7 +22,6 @@
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
 <s:i18n name="localization.Continuum">
 <c:if test="${not empty projects}">
@@ -62,7 +61,7 @@
       <%-- placed here for reusability --%>
       <c:set var="projectIdle" value="${!project.inBuildingQueue and ( ( ( project.state gt 0 ) and ( project.state lt 5 ) ) or project.state == 7 or project.state gt 8 ) }" scope="request"/>
 
-      <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroupName)}">
+      <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
         <ec:column alias="selectedProjects" title=" " style="width:5px" filterable="false" sortable="false" width="1%" headerCell="selectAll">
           <input type="checkbox" name="selectedProjects" value="<c:out value="${project.id}"/>" />
         </ec:column>
@@ -78,7 +77,7 @@
       <ec:column property="buildNumber" title="summary.projectTable.build" width="2%" style="text-align: center">
         <c:choose>
           <c:when test="${project.buildNumber gt 0 && project.buildInSuccessId gt 0}">
-            <redback:ifAuthorized permission="continuum-view-group" resource="${fn:escapeXml(projectGroupName)}">
+            <redback:ifAuthorized permission="continuum-view-group" resource="${projectGroupName}">
               <s:url id="buildResult" action="buildResult">
                 <s:param name="projecGroupId"><c:out value="${project.projectGroupId}"/></s:param>
                 <s:param name="projectId"><c:out value="${project.id}"/></s:param>
@@ -106,7 +105,7 @@
             <img src="<s:url value='/images/inqueue.gif' includeParams="none"/>" alt="<s:text name="legend.queuedBuild"/>" title="<s:text name="legend.queuedBuild"/>" border="0">
           </c:when>
           <c:otherwise>
-            <redback:ifAuthorized permission="continuum-build-group" resource="${fn:escapeXml(projectGroupName)}">
+            <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
               <c:choose>
                 <c:when test="${projectIdle}">
                   <s:url id="buildProjectUrl" action="buildProject" namespace="/" includeParams="none">
@@ -150,7 +149,7 @@
         </c:choose>
       </ec:column>
       <ec:column property="buildHistoryAction" title="&nbsp;" width="1%">
-        <redback:ifAuthorized permission="continuum-view-group" resource="${fn:escapeXml(projectGroupName)}">
+        <redback:ifAuthorized permission="continuum-view-group" resource="${projectGroupName}">
         <c:choose>
           <c:when test="${pageScope.project.latestBuildId > 0}">
             <s:url id="buildResultsUrl" action="buildResults" namespace="/">
@@ -169,7 +168,7 @@
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="workingCopyAction" title="&nbsp;" width="1%">
-        <redback:ifAuthorized permission="continuum-view-group" resource="${fn:escapeXml(projectGroupName)}">
+        <redback:ifAuthorized permission="continuum-view-group" resource="${projectGroupName}">
         <c:choose>
           <c:when test="${pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4 || pageScope.project.state == 6}">
             <s:url id="workingCopyUrl" action="workingCopy" namespace="/">
@@ -187,7 +186,7 @@
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="releaseAction" title="&nbsp;" width="1%" sortable="false">
-        <redback:ifAuthorized permission="continuum-build-group" resource="${fn:escapeXml(projectGroupName)}">
+        <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
         <c:choose>
           <c:when test="${pageScope.project.state == 2 && pageScope.project.projectType == 'maven2'}">
             <s:url id="releaseProjectUrl" action="releasePromptGoal" namespace="/">
@@ -207,7 +206,7 @@
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="deleteAction" title="&nbsp;" width="1%" sortable="false">
-        <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroupName)}">
+        <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
         <c:choose>
           <c:when
               test="${projectIdle}">
@@ -238,7 +237,7 @@
         <tbody>
           <tr>
             <td>
-              <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroupName)}">
+              <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
                 <input type="hidden" name="projectGroupId" value="<c:out value="${projectGroupId}"/>" />
                 <s:select theme="simple" name="buildDef" list="buildDefinitions"
                            listKey="value" listValue="key" headerKey="-1" headerValue="%{getText('projectGroup.buildDefinition.label')}"

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp?rev=1091974&r1=1091973&r2=1091974&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp Wed Apr 13 23:32:24 2011
@@ -21,7 +21,6 @@
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
 <html>
 <s:i18n name="localization.Continuum">
@@ -69,11 +68,11 @@
               <c:out value="${group.id}" />
             </s:param>
           </s:url>
-          <a href="${fn:escapeXml(projectGroupSummaryUrl)}"><c:out value="${group.name}"/></a>
+          <a href="${projectGroupSummaryUrl}"><c:out value="${group.name}"/></a>
         </ec:column>
         <ec:column property="groupId" title="groups.table.groupId" width="40%"/>
         <ec:column property="buildGroupNowAction" title="&nbsp;" width="1%">
-          <redback:ifAuthorized permission="continuum-build-group" resource="${fn:escapeXml(group.name)}">
+          <redback:ifAuthorized permission="continuum-build-group" resource="${group.name}">
             <s:url id="buildProjectGroupUrl" action="buildProjectGroup" namespace="/" includeParams="none">
               <s:param name="projectGroupId"><c:out value="${group.id}"/></s:param>
               <s:param name="buildDefinitionId" value="-1"/>
@@ -88,7 +87,7 @@
           </redback:elseAuthorized>
         </ec:column>
         <ec:column property="releaseProjectGroupAction" title="&nbsp;" width="1%">
-          <redback:ifAuthorized permission="continuum-build-group" resource="${fn:escapeXml(group.name)}">
+          <redback:ifAuthorized permission="continuum-build-group" resource="${group.name}">
             <s:url id="releaseProjectGroupUrl" action="releaseProjectGroup" namespace="/" includeParams="none">
               <s:param name="projectGroupId"><c:out value="${group.id}"/></s:param>
             </s:url>
@@ -101,7 +100,7 @@
           </redback:elseAuthorized>
         </ec:column>
         <ec:column property="removeProjectGroupAction" title="&nbsp;" width="1%">
-          <redback:ifAuthorized permission="continuum-remove-group" resource="${fn:escapeXml(group.name)}">
+          <redback:ifAuthorized permission="continuum-remove-group" resource="${group.name}">
             <s:token/>
             <s:url id="removeProjectGroupUrl" action="removeProjectGroup" namespace="/" includeParams="none">
               <s:param name="projectGroupId"><c:out value="${group.id}"/></s:param>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp?rev=1091974&r1=1091973&r2=1091974&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp Wed Apr 13 23:32:24 2011
@@ -22,7 +22,6 @@
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
 <html>
   <s:i18n name="localization.Continuum">
@@ -61,7 +60,7 @@
         </ec:column>
         <ec:column property="editAction" title="&nbsp;" width="1%" sortable="false">
           <center>
-            <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroup.name)}">
+            <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
             <c:choose>
               <c:when
                   test="${pageScope.project.state == 1 || pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4}">
@@ -85,7 +84,7 @@
         </ec:column>
         <ec:column property="deleteAction" title="&nbsp;" width="1%" sortable="false">
           <center>
-            <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroup.name)}">
+            <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
             <c:choose>
               <c:when
                   test="${pageScope.project.state == 1 || pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4}">

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp?rev=1091974&r1=1091973&r2=1091974&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp Wed Apr 13 23:32:24 2011
@@ -23,7 +23,6 @@
 <%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
 <html>
   <s:i18n name="localization.Continuum">
@@ -51,7 +50,7 @@
                 filterable="false"
                 sortable="false">
           <ec:row highlightRow="true">
-            <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroup.name)}">
+            <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
               <ec:column alias="selectedReleaseResults" title=" " style="width:5px" filterable="false" sortable="false" headerCell="selectAll">
                 <input type="checkbox" name="selectedReleaseResults" value="<c:out value="${result.id}"/>" />
               </ec:column>
@@ -85,7 +84,7 @@
               <tbody>
                 <tr>
                   <td>
-                    <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroup.name)}">
+                    <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
                       <s:hidden name="projectGroupId"/>
                       <input type="button" name="delete-release-results" value="<s:text name="delete"/>" onclick="document.forms.releaseResultsForm.submit();" />
                     </redback:ifAuthorized>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?rev=1091974&r1=1091973&r2=1091974&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp Wed Apr 13 23:32:24 2011
@@ -22,7 +22,6 @@
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
 <html>
 
@@ -92,7 +91,7 @@
         <c1:data label="%{getText('projectGroup.repository.label')}" name="projectGroup.localRepository.name"/>
         <s:if test="url != null">
             <s:url id="projectHomepageUrl" value="%{url}" includeContext="false" includeParams="none"/>
-        	<c1:data label="%{getText('projectGroup.url.label')}" name="url" valueLink="%{'${fn:escapeXml(projectHomepageUrl)}'}"/>  
+        	<c1:data label="%{getText('projectGroup.url.label')}" name="url" valueLink="%{'${projectHomepageUrl}'}"/>  
         </s:if>
       </table>
     </div>
@@ -112,7 +111,7 @@
       </ec:row>
     </ec:table>
 
-    <redback:ifAnyAuthorized permissions="continuum-build-group,continuum-remove-group" resource="${fn:escapeXml(projectGroup.name)}">
+    <redback:ifAnyAuthorized permissions="continuum-build-group,continuum-remove-group" resource="${projectGroup.name}">
       <h3><s:text name="projectGroup.actions.title"/></h3>
 
       <c:if test="${!empty actionErrors}">
@@ -128,7 +127,7 @@
           <tr>
             <td>
               <table>
-                <redback:ifAuthorized permission="continuum-build-group" resource="${fn:escapeXml(projectGroup.name)}">
+                <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroup.name}">
                   <form action="buildProjectGroup.action" method="post">
                     <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
                     <s:select theme="simple" name="buildDefinitionId" list="buildDefinitions"
@@ -139,7 +138,7 @@
               </table>
             </td>
             <td>
-              <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(projectGroup.name)}">
+              <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
                 <form action="editProjectGroup.action" method="post">
                   <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
                   <input type="submit" name="edit" value="<s:text name="edit"/>"/>
@@ -147,7 +146,7 @@
               </redback:ifAuthorized>
             </td>
             <td>
-              <redback:ifAuthorized permission="continuum-build-group" resource="${fn:escapeXml(projectGroup.name)}">
+              <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroup.name}">
                 <form action="releaseProjectGroup.action" method="post">
                   <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
                   <input type="submit" name="release" value="<s:text name="release"/>"/>
@@ -155,7 +154,7 @@
               </redback:ifAuthorized>
             </td>
             <td>
-              <redback:ifAnyAuthorized permissions="continuum-add-project-to-group" resource="${fn:escapeXml(projectGroup.name)}">
+              <redback:ifAnyAuthorized permissions="continuum-add-project-to-group" resource="${projectGroup.name}">
                 <s:form name="addNewProject">
                   <s:hidden name="disableGroupSelection" value="true"/>
                   <s:hidden name="selectedProjectGroup" value="%{projectGroup.id}"/>
@@ -170,7 +169,7 @@
               </redback:ifAnyAuthorized>
             </td>
             <td>
-              <redback:ifAuthorized permission="continuum-remove-group" resource="${fn:escapeXml(projectGroup.name)}">
+              <redback:ifAuthorized permission="continuum-remove-group" resource="${projectGroup.name}">
                 <form action="removeProjectGroup.action" method="post">
                   <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
                   <input type="submit" name="remove" value="<s:text name="projectGroup.deleteGroup"/>"/>
@@ -178,7 +177,7 @@
               </redback:ifAuthorized>
             </td>
             <td>
-              <redback:ifAuthorized permission="continuum-build-project-in-group" resource="${fn:escapeXml(projectGroup.name)}">
+              <redback:ifAuthorized permission="continuum-build-project-in-group" resource="${projectGroup.name}">
                 <form action="cancelGroupBuild.action" method="post">
                   <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
                   <input type="submit" name="cancel" value="<s:text name="projectGroup.cancelGroupBuild"/>"/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?rev=1091974&r1=1091973&r2=1091974&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp Wed Apr 13 23:32:24 2011
@@ -22,7 +22,6 @@
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
 <html>
   <s:i18n name="localization.Continuum">
@@ -52,7 +51,7 @@
             <c1:data label="%{getText('projectView.project.lastBuildDateTime')}" name="lastBuildDateTime" />
           </table>
 
-          <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(project.projectGroup.name)}">
+          <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
           <div class="functnbar3">
             <table>
               <tbody>
@@ -85,7 +84,7 @@
         </s:action>
 
         <div class="functnbar3">
-           <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(project.projectGroup.name)}">
+           <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
           <s:form action="buildDefinition" method="post">
             <input type="hidden" name="projectId" value="<s:property value="project.id"/>"/>
             <input type="hidden" name="projectGroupId" value="<s:property value="project.projectGroup.id"/>"/>
@@ -111,7 +110,7 @@
               <ec:column property="events" title="projectView.notifier.events" cell="org.apache.maven.continuum.web.view.projectview.NotifierEventCell"/>
               <ec:column property="from" title="projectView.notifier.from" cell="org.apache.maven.continuum.web.view.projectview.NotifierFromCell"/>
               <ec:column property="editAction" title="&nbsp;" width="1%">
-                <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(project.projectGroup.name)}">
+                <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
                   <c:choose>
                     <c:when test="${!pageScope.notifier.fromProject}">
                       <s:url id="editUrl" action="editProjectNotifier" namespace="/" includeParams="none">
@@ -134,7 +133,7 @@
                 </redback:elseAuthorized>
               </ec:column>
               <ec:column property="deleteAction" title="&nbsp;" width="1%">
-                <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(project.projectGroup.name)}">
+                <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
                   <c:choose>
                     <c:when test="${!pageScope.notifier.fromProject}">
                       <s:url id="removeUrl" action="deleteProjectNotifier!default.action" namespace="/">
@@ -160,7 +159,7 @@
           </ec:table>
         </c:if>
         <div class="functnbar3">
-           <redback:ifAuthorized permission="continuum-modify-group" resource="${fn:escapeXml(project.projectGroup.name)}">
+           <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
           <s:form action="addProjectNotifier!default.action" method="post">
             <input type="hidden" name="projectId" value="<s:property value="project.id"/>"/>
             <input type="hidden" name="projectGroupId" value="<s:property value="project.projectGroup.id"/>"/>



Mime
View raw message