Migrated distributed releases page from jstl to struts tags.

git-svn-id: https://svn.apache.org/repos/asf/continuum/trunk@1679062 13f79535-47bb-0310-9956-ffa450edef68
apache · May 12, 2015 · c33c39c · c33c39c
1 parent f578221
commit c33c39c
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/continuum-webapp/src/main/webapp/WEB-INF/jsp/releases.jsp b/continuum-webapp/src/main/webapp/WEB-INF/jsp/releases.jsp
@@ -19,8 +19,6 @@
 
 <%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-
 <html>
   <s:i18n name="localization.Continuum">
     <head>
@@ -29,13 +27,16 @@
     <body>
       <div id="h3">
         <h3><s:text name="releases.section.title"/></h3>
-        <c:if test="${!empty actionErrors}">
+        <s:if test="hasActionErrors()">
           <div class="errormessage">
-            <s:iterator value="actionErrors">
-              <p><s:text name="<s:property/>" /></p>
-            </s:iterator>
+            <s:actionerror/>
+          </div>
+        </s:if>
+        <s:if test="hasActionMessages()">
+          <div class="warningmessage">
+            <s:actionmessage/>
           </div>
-        </c:if>
+        </s:if>
         <s:set name="releasesSummary" value="releasesSummary" scope="request"/>
         <ec:table items="releasesSummary"
                   var="releaseSummary"
@@ -48,11 +49,11 @@
           <ec:row>
             <ec:column property="releaseId" title="releaseSummary.table.releaseId">
               <s:url id="viewReleaseUrl" action="releaseInProgress">
-                <s:param name="releaseId"><c:out value="${pageScope.releaseSummary.releaseId}"/></s:param>
-                <s:param name="projectId"><c:out value="${pageScope.releaseSummary.projectId}"/></s:param>
-                <s:param name="releaseGoal"><c:out value="${pageScope.releaseSummary.releaseGoal}"/></s:param>
+                <s:param name="releaseId" value="#attr.releaseSummary.releaseId"/>
+                <s:param name="projectId" value="#attr.releaseSummary.projectId"/>
+                <s:param name="releaseGoal" value="#attr.releaseSummary.releaseGoal"/>
               </s:url>
-              <s:a href="%{viewReleaseUrl}"><c:out value="${pageScope.releaseSummary.releaseId}"/></s:a>
+              <s:a href="%{viewReleaseUrl}"><s:property value="#attr.releaseSummary.releaseId"/></s:a>
             </ec:column>
             <ec:column property="releaseGoal" title="releaseSummary.table.releaseGoal"/>
             <ec:column property="buildAgentUrl" title="releaseSummary.table.buildAgentUrl"/>