continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r707824 - in /continuum/branches/continuum-struts2: ./ continuum-webapp/src/main/webapp/WEB-INF/jsp/ continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/ continuum-webapp/src/main/webapp/WEB-INF/jsp/components/ continuum-webapp/src/main/weba...
Date Sat, 25 Oct 2008 08:38:39 GMT
Author: evenisse
Date: Sat Oct 25 01:38:37 2008
New Revision: 707824

URL: http://svn.apache.org/viewvc?rev=707824&view=rev
Log:
more struts2 changes

Modified:
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
    continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp
    continuum/branches/continuum-struts2/pom.xml

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp Sat Oct 25 01:38:37 2008
@@ -51,9 +51,9 @@
           </ec:column>  
           <!-- TODO list attached buildDefs -->
           <ec:column property="deleteAction" title="&nbsp;" width="1%">
-            <s:if test="${template.continuumDefault == true}">
+            <c:if test="${template.continuumDefault == true}">
               <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='disabled'/>" title="<s:text name='disabled'/>" border="0" />
-            </s:if>
+            </c:if>
             <s:else>
               <s:url id="deleteUrl" action="deleteDefinitionTemplate" method="delete" namespace="/">
                 <s:param name="buildDefinitionTemplate.id">${pageScope.template.id}</s:param>
@@ -96,9 +96,9 @@
             <s:a href="%{editUrl}"><img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0"></s:a>
           </ec:column>          
           <ec:column property="deleteAction" title="&nbsp;" width="1%">
-            <s:if test="${buildDefinitionSummary.isDefault == true}">
+            <c:if test="${buildDefinitionSummary.isDefault == true}">
               <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='disabled'/>" title="<s:text name='disabled'/>" border="0" />
-            </s:if>
+            </c:if>
             <s:else>
               <s:url id="deleteUrl" action="deleteBuildDefinitionAsTemplate" method="deleteBuildDefinition" namespace="/">
                 <s:param name="buildDefinition.id">${pageScope.buildDefinitionSummary.id}</s:param>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp Sat Oct 25 01:38:37 2008
@@ -36,7 +36,7 @@
             <s:text name="buildQueue.currentTask.section.title"/>
           </h3>  
           <table width="100%">
-            <s:if test="currentBuildProjectTask != null">
+            <c:if test="currentBuildProjectTask != null">
             <tbody>
               <tr>
                 <th><s:text name="buildQueue.currentTask.projectName"/></th>
@@ -59,7 +59,7 @@
                 </td>
               </tr>
             </tbody>
-            </s:if>
+            </c:if>
             <s:else>
               <s:text name="buildQueue.no.currentTaks" />
             </s:else>
@@ -69,7 +69,7 @@
           <h3>
             <s:text name="buildQueue.section.title"/>
           </h3>  
-            <s:if test="${not empty buildProjectTasks}">
+            <c:if test="${not empty buildProjectTasks}">
               <ec:table items="buildProjectTasks"
                         var="buildProjectTask"
                         showExports="false"
@@ -101,12 +101,12 @@
                   </ec:column>             
                 </ec:row>
               </ec:table>
-            </s:if>
+            </c:if>
             <s:else>
               <s:text name="buildQueue.empty"/>
             </s:else>
         </div>
-        <s:if test="${not empty buildProjectTasks}">
+        <c:if test="${not empty buildProjectTasks}">
           <div class="functnbar3">
             <table>
               <tbody>
@@ -119,7 +119,7 @@
               </tbody>
             </table>
           </div>
-        </s:if>
+        </c:if>
         
         
         <!-- checkout queue -->
@@ -128,7 +128,7 @@
             <s:text name="checkoutQueue.currentTask.section.title"/>
           </h3>  
           <table width="100%">
-            <s:if test="currentCheckOutTask != null">
+            <c:if test="currentCheckOutTask != null">
             <tbody>
               <tr>
                 <th><s:text name="checkoutQueue.currentTask.projectName"/></th>
@@ -149,7 +149,7 @@
                 </td>
               </tr>
             </tbody>
-            </s:if>
+            </c:if>
             <s:else>
               <s:text name="checkoutQueue.no.currentTaks" />
             </s:else>
@@ -159,7 +159,7 @@
           <h3>
             <s:text name="checkoutQueue.section.title"/>
           </h3>  
-            <s:if test="${not empty currentCheckOutTasks}">
+            <c:if test="${not empty currentCheckOutTasks}">
               <ec:table items="currentCheckOutTasks"
                         var="currentCheckOutTask"
                         showExports="false"
@@ -187,12 +187,12 @@
                   </ec:column>             
                 </ec:row>
               </ec:table>
-            </s:if>
+            </c:if>
             <s:else>
               <s:text name="checkoutQueue.empty"/>
             </s:else>
         </div>
-        <s:if test="${not empty currentCheckOutTasks}">
+        <c:if test="${not empty currentCheckOutTasks}">
           <div class="functnbar3">
             <table>
               <tbody>
@@ -207,7 +207,7 @@
               </tbody>
             </table>
           </div>
-        </s:if>
+        </c:if>
       </s:form>
     </body>
   </s:i18n>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp Sat Oct 25 01:38:37 2008
@@ -38,9 +38,9 @@
 
       <c:if test="${!empty actionErrors}">
         <div class="errormessage">
-          <c:forEach items="${actionErrors}" var="actionError">
-            <p><s:text name="${actionError}"/></p>
-          </c:forEach>
+          <s:iterator value="actionErrors">
+            <p><s:text name="<s:property/>" /></p>
+          </s:iterator>
         </div>
       </c:if>
 
@@ -64,7 +64,7 @@
             </s:textfield>
 
             <s:textfield label="%{getText('configuration.releaseOutputDirectory.label')}" name="releaseOutputDirectory"
-            			  required="${requireReleaseOutput}">
+            			  required="%{#requireReleaseOutput}">
               <s:param name="desc"><p>
                 <s:text name="configuration.releaseOutputDirectory.message"/>
               </s:param>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp Sat Oct 25 01:38:37 2008
@@ -35,9 +35,9 @@
             
               <c:when test="${!empty actionErrors}">
                 <div class="errormessage">
-                  <c:forEach items="${actionErrors}" var="actionError">
-                    <p><s:text name="${actionError}"/></p>
-                  </c:forEach>
+                  <s:iterator value="actionErrors">
+                    <p><s:text name="<s:property/>" /></p>
+                  </s:iterator>
                 </div>
                 <input type="button" value="Back" onClick="history.go(-1)">
               </c:when>
@@ -45,9 +45,9 @@
               <c:when test="${empty actionErrors}">
                 <table>
                   <tbody>
-                    <s:if test="buildDefinition.type == 'ant'">
+                    <c:if test="buildDefinition.type == 'ant'">
                       <s:textfield label="%{getText('buildDefinition.buildFile.ant.label')}" name="buildDefinition.buildFile"  required="true"/>
-                    </s:if>
+                    </c:if>
                     <s:elseif test="buildDefinition.type == 'shell'">
                       <s:textfield label="%{getText('buildDefinition.buildFile.shell.label')}" name="buildDefinition.buildFile" required="true"/>
                     </s:elseif>
@@ -55,9 +55,9 @@
                       <s:textfield label="%{getText('buildDefinition.buildFile.maven.label')}" name="buildDefinition.buildFile" required="true"/>
                     </s:else>
     
-                    <s:if test="buildDefinition.type == 'ant'">
+                    <c:if test="buildDefinition.type == 'ant'">
                       <s:textfield label="%{getText('buildDefinition.goals.ant.label')}" name="buildDefinition.goals"/>
-                    </s:if>
+                    </c:if>
                     <s:elseif test="buildDefinition.type == 'shell'">
                     </s:elseif>
                     <s:else>
@@ -70,10 +70,10 @@
                     <s:checkbox label="%{getText('buildDefinition.defaultForProject.label')}" name="buildDefinition.defaultForProject" />
                     <s:select label="%{getText('buildDefinition.schedule.label')}" name="buildDefinition.schedule.id" list="schedules" listValue="name"
                                listKey="id"/>
-                    <s:if test="buildDefinition.profile == null">
+                    <c:if test="buildDefinition.profile == null">
                       <s:select label="%{getText('buildDefinition.profile.label')}" name="buildDefinition.profile.id" list="profiles" listValue="name"
                                  value="-1" listKey="id" headerKey="-1" headerValue=""/>
-                    </s:if>
+                    </c:if>
                     <s:else>
                       <s:select label="%{getText('buildDefinition.profile.label')}" name="buildDefinition.profile.id" list="profiles" listValue="name"
                                  listKey="id" headerKey="-1" headerValue=""/>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp Sat Oct 25 01:38:37 2008
@@ -36,9 +36,9 @@
             
               <c:when test="${!empty actionErrors}">
                 <div class="errormessage">
-                  <c:forEach items="${actionErrors}" var="actionError">
-                    <p><s:text name="${actionError}"/></p>
-                  </c:forEach>
+                  <s:iterator value="actionErrors">
+                    <p><s:text name="<s:property/>" /></p>
+                  </s:iterator>
                 </div>
                 <input type="button" value="Back" onClick="history.go(-1)">
               </c:when>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp Sat Oct 25 01:38:37 2008
@@ -55,7 +55,7 @@
             </s:if>
             <s:if test="varNameUpdatable">
               <s:if test="varNameDisplayable">
-                <s:textfield label="%{getText('installation.varName.label')}" name="installation.varName" required="${varNameUpdatable}" />
+                <s:textfield label="%{getText('installation.varName.label')}" name="installation.varName" required="%{#varNameUpdatable}" />
               </s:if>
             </s:if>
             <s:else>
@@ -65,9 +65,9 @@
             </s:else>
             <s:textfield label="%{getText('installation.value.label')}" name="installation.varValue"
                           required="true"/>
-            <s:if test="(automaticProfileDisplayable && installation == null) ||  (installation.installationId == 0)">
+            <c:if test="(automaticProfileDisplayable && installation == null) ||  (installation.installationId == 0)">
               <s:checkbox label="%{getText('installation.automaticProfile.label')}" name="automaticProfile" />
-            </s:if>
+            </c:if>
           </tbody>
         </table>
         <div class="functnbar3">

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp Sat Oct 25 01:38:37 2008
@@ -34,9 +34,9 @@
       <s:form action="saveRepository" method="post" validate="true">
         <c:if test="${!empty actionErrors}">
           <div class="errormessage">
-            <c:forEach items="${actionErrors}" var="actionError">
-              <p><s:text name="${actionError}"/></p>
-            </c:forEach>
+            <s:iterator value="actionErrors">
+              <p><s:text name="<s:property/>" /></p>
+            </s:iterator>
           </div>
         </c:if>
 

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp Sat Oct 25 01:38:37 2008
@@ -65,7 +65,7 @@
           </s:form>
           </td>
         </tr>
-        <s:if test="profile.id != 0">
+        <c:if test="profile.id != 0">
           <tr>
             <td>
               <div class="axial">
@@ -101,7 +101,7 @@
                     </tr>
                   </tbody>
                 </table>
-                <s:if test="${!empty allInstallations}">
+                <c:if test="${!empty allInstallations}">
                   <s:form action="addInstallationBuildEnv!addInstallation.action" method="get">
                     <s:hidden name="profile.id" />
                     <div class="functnbar3">
@@ -110,20 +110,20 @@
                       <s:submit value="%{getText('add')}"/>
                     </div>
                   </s:form>
-                </s:if>
+                </c:if>
                 <s:else>
                   <div class="warningmessage" style="color: red"><s:text name="profile.no.installations" /></div>
                 </s:else>
               </div>              
             </td>
           </tr>
-        </s:if>
+        </c:if>
         <s:else>
           <tr>
             <td>
-              <s:if test="${empty allInstallations}">
+              <c:if test="${empty allInstallations}">
                 <div class="warningmessage" style="color: red"><s:text name="profile.no.installations" /></div>
-              </s:if>
+              </c:if>
             </td>
           </tr> 
         </s:else>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp Sat Oct 25 01:38:37 2008
@@ -34,9 +34,9 @@
       <s:form action="savePurgeConfig" method="post" validate="true">
         <c:if test="${!empty actionErrors}">
           <div class="errormessage">
-            <c:forEach items="${actionErrors}" var="actionError">
-              <p><s:text name="${actionError}"/></p>
-            </c:forEach>
+            <s:iterator value="actionErrors">
+              <p><s:text name="<s:property/>" /></p>
+            </s:iterator>
           </div>
         </c:if>
         <c:choose>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp Sat Oct 25 01:38:37 2008
@@ -33,7 +33,7 @@
       <s:text name="installationsList.section.title"/>
     </h3>  
 
-    <s:if test="${not empty installations}">
+    <c:if test="${not empty installations}">
     <ec:table items="installations"
               var="installation"
               showExports="false"
@@ -59,7 +59,7 @@
         </ec:column>             
       </ec:row>
     </ec:table>
-    </s:if>
+    </c:if>
     <div class="functnbar3">
       <s:form action="installationsTypeChoice!listTypes.action" method="post">
         <s:submit value="%{getText('add')}"/>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp Sat Oct 25 01:38:37 2008
@@ -30,9 +30,9 @@
         <h3><s:text name="repositories.section.title"/></h3>
         <c:if test="${!empty actionErrors}">
           <div class="errormessage">
-            <c:forEach items="${actionErrors}" var="actionError">
-              <p><s:text name="${actionError}"/></p>
-            </c:forEach>
+            <s:iterator value="actionErrors">
+              <p><s:text name="<s:property/>" /></p>
+            </s:iterator>
           </div>
         </c:if>
         <s:set name="repositories" value="repositories" scope="request"/>
@@ -49,7 +49,7 @@
             <ec:column property="layout" title="repositories.table.layout"/>
             <ec:column property="editActions" title="&nbsp;" width="1%">
                 <s:url id="editRepositoryUrl" action="editRepository">
-                  <s:param name="repository.id" value="${pageScope.repository.id}"/>
+                  <s:param name="repository.id">${pageScope.repository.id}</s:param>
                 </s:url>
                 <c:choose>
                   <c:when test="${repository.name == 'DEFAULT'}">
@@ -65,7 +65,7 @@
               <c:choose>
                 <c:when test="${defaultPurgeMap[repositoryName]}">
                   <s:url id="purgeRepositoryUrl" action="purgeRepository">
-                    <s:param name="repository.id" value="${pageScope.repository.id}"/>
+                    <s:param name="repository.id">${pageScope.repository.id}</s:param>
                   </s:url>
                   <s:a href="%{purgeRepositoryUrl}"><img src="<s:url value='/images/purgenow.gif' includeParams="none"/>" alt="<s:text name='purge'/>" title="<s:text name='purge'/>" border="0" /></s:a>
                 </c:when>
@@ -76,7 +76,7 @@
             </ec:column>
             <ec:column property="deleteActions" title="&nbsp;" width="1%">
                 <s:url id="removeRepositoryUrl" action="removeRepository">
-                  <s:param name="repository.id" value="${pageScope.repository.id}"/>
+                  <s:param name="repository.id">${pageScope.repository.id}</s:param>
                 </s:url>
                 <c:choose>
                   <c:when test="${repository.name == 'DEFAULT'}">

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp Sat Oct 25 01:38:37 2008
@@ -35,13 +35,13 @@
 
     <c:if test="${!empty actionErrors}">
       <div class="errormessage">
-        <c:forEach items="${actionErrors}" var="actionError">
-          <p><s:text name="${actionError}"/></p>
-        </c:forEach>
+        <s:iterator value="actionErrors">
+          <p><s:text name="<s:property/>" /></p>
+        </s:iterator>
       </div>
     </c:if>
         
-    <s:if test="${not empty profiles}">
+    <c:if test="${not empty profiles}">
     <ec:table items="profiles"
               var="profile"
               showExports="false"
@@ -78,7 +78,7 @@
         </ec:column>        
       </ec:row>
     </ec:table>
-    </s:if>
+    </c:if>
     <div class="functnbar3">
       <s:form action="addBuildEnv!input.action" method="post">
         <s:submit value="%{getText('add')}"/>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp Sat Oct 25 01:38:37 2008
@@ -33,9 +33,9 @@
         <h3><s:text name="purgeConfigs.repo.section.title"/></h3>
         <c:if test="${!empty actionErrors}">
           <div class="errormessage">
-            <c:forEach items="${actionErrors}" var="actionError">
-              <p><s:text name="${actionError}"/></p>
-            </c:forEach>
+            <s:iterator value="actionErrors">
+              <p><s:text name="<s:property/>" /></p>
+            </s:iterator>
           </div>
         </c:if>
         <s:set name="repoPurgeConfigs" value="repoPurgeConfigs" scope="request"/>
@@ -68,19 +68,19 @@
             <ec:column property="description" title="purgeConfigs.table.description"/>
             <ec:column property="editActions" title="&nbsp;" width="1%">
                 <s:url id="editPurgeConfigUrl" action="editPurgeConfig">
-                  <s:param name="purgeConfigId" value="${pageScope.repoPurge.id}"/>
+                  <s:param name="purgeConfigId">${pageScope.repoPurge.id}</s:param>
                 </s:url>
                 <s:a href="%{editPurgeConfigUrl}"><img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0" /></s:a>
             </ec:column>
             <ec:column property="purgeActions" title="&nbsp;" width="1%">
                 <s:url id="purgeUrl" action="doPurge">
-                  <s:param name="purgeConfigId" value="${pageScope.repoPurge.id}"/>
+                  <s:param name="purgeConfigId">${pageScope.repoPurge.id}</s:param>
                 </s:url>
                 <s:a href="%{purgeUrl}"><img src="<s:url value='/images/purgenow.gif' includeParams="none"/>" alt="<s:text name='purge'/>" title="<s:text name='purge'/>" border="0" /></s:a>
             </ec:column>
             <ec:column property="deleteActions" title="&nbsp;" width="1%">
                 <s:url id="removePurgeConfigUrl" action="removePurgeConfig">
-                  <s:param name="purgeConfigId" value="${pageScope.repoPurge.id}"/>
+                  <s:param name="purgeConfigId">${pageScope.repoPurge.id}</s:param>
                 </s:url>
                 <s:a href="%{removePurgeConfigUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
             </ec:column>
@@ -115,19 +115,19 @@
             <ec:column property="description" title="purgeConfigs.table.description"/>
             <ec:column property="editActions" title="&nbsp;" width="1%">
                 <s:url id="editPurgeConfigUrl" action="editPurgeConfig">
-                  <s:param name="purgeConfigId" value="${pageScope.dirPurge.id}"/>
+                  <s:param name="purgeConfigId">${pageScope.dirPurge.id}</s:param>
                 </s:url>
                 <s:a href="%{editPurgeConfigUrl}"><img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0" /></s:a>
             </ec:column>
             <ec:column property="purgeActions" title="&nbsp;" width="1%">
                 <s:url id="purgeUrl" action="doPurge">
-                  <s:param name="purgeConfigId" value="${pageScope.dirPurge.id}"/>
+                  <s:param name="purgeConfigId">${pageScope.dirPurge.id}</s:param>
                 </s:url>
                 <s:a href="%{purgeUrl}"><img src="<s:url value='/images/purgenow.gif' includeParams="none"/>" alt="<s:text name='purge'/>" title="<s:text name='purge'/>" border="0" /></s:a>
             </ec:column>
             <ec:column property="deleteActions" title="&nbsp;" width="1%">
                 <s:url id="removePurgeConfigUrl" action="removePurgeConfig">
-                  <s:param name="purgeConfigId" value="${pageScope.dirPurge.id}"/>
+                  <s:param name="purgeConfigId">${pageScope.dirPurge.id}</s:param>
                 </s:url>
                 <s:a href="%{removePurgeConfigUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
             </ec:column>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp Sat Oct 25 01:38:37 2008
@@ -35,9 +35,9 @@
             
               <c:when test="${!empty actionErrors}">
                 <div class="errormessage">
-                  <c:forEach items="${actionErrors}" var="actionError">
-                    <p><s:text name="${actionError}"/></p>
-                  </c:forEach>
+                  <s:iterator value="actionErrors">
+                    <p><s:text name="<s:property/>" /></p>
+                  </s:iterator>
                 </div>
                 <input type="button" value="Back" onClick="history.go(-1)">
               </c:when>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp Sat Oct 25 01:38:37 2008
@@ -48,7 +48,7 @@
             </c1:data>
             <c1:data label="%{getText('buildResult.duration')}">
                 <s:param name="after">
-                    <s:if test="${buildResult.endTime == 0}"><s:text name="buildResult.startedSince"/></s:if> <s:property value="buildResult.durationTime"/></s:param>
+                    <c:if test="${buildResult.endTime == 0}"><s:text name="buildResult.startedSince"/></c:if> <s:property value="buildResult.durationTime"/></s:param>
             </c1:data>
             <c1:data label="%{getText('buildResult.trigger')}">
                 <s:param name="after"><s:text name="buildResult.trigger.%{buildResult.trigger}"/></s:param>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp Sat Oct 25 01:38:37 2008
@@ -77,16 +77,16 @@
               <ec:column property="buildDefinition.description" title="buildResults.buildDefinition.description" />
               <ec:column property="actions" title="&nbsp;">
                 <s:url id="buildResultUrl" action="buildResult">
-                  <s:param name="projectId" value="${projectId}"/>
-                  <s:param name="projectName" value="%{projectName}"/>
-                  <s:param name="buildId" value="${buildResult.id}"/>
-                  <s:param name="projectGroupId" value="${projectGroupId}"/>
+                  <s:param name="projectId">${projectId}</s:param>
+                  <s:param name="projectName">${projectName}</s:param>
+                  <s:param name="buildId">${buildResult.id}"</s:param>
+                  <s:param name="projectGroupId">${projectGroupId}</s:param>
                 </s:url>
                 <s:a href="%{buildResultUrl}"><s:text name="buildResults.result"/></s:a>
               </ec:column>
             </ec:row>
           </ec:table>
-          <s:if test="${not empty buildResults}">
+          <c:if test="${not empty buildResults}">
             <div class="functnbar3">
               <table>
                 <tbody>
@@ -100,7 +100,7 @@
                 </tbody>
               </table>
             </div>
-          </s:if>
+          </c:if>
         </form>
       </div>
     </body>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp Sat Oct 25 01:38:37 2008
@@ -26,7 +26,7 @@
 <s:i18n name="localization.Continuum">
 
   <h3><s:text name="buildDefinitionSummary.projectGroup.section.title"><s:param>${projectGroup.name}</s:param></s:text></h3>
-  <s:if test="${not empty groupBuildDefinitionSummaries}">
+  <c:if test="${not empty groupBuildDefinitionSummaries}">
   <ec:table items="groupBuildDefinitionSummaries"
             var="buildDefinitionSummary"
             showExports="false"
@@ -92,9 +92,9 @@
       <ec:column property="deleteActions" title="&nbsp;" width="1%">
         <center>
         <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-          <s:if test="${pageScope.buildDefinitionSummary.isDefault == true}">
+          <c:if 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">
-          </s:if>
+          </c:if>
           <s:else>
             <s:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
               <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
@@ -113,7 +113,7 @@
       </ec:column>
     </ec:row>
   </ec:table>
-  </s:if>
+  </c:if>
   <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
     <div class="functnbar3">
       <s:form action="buildDefinition" method="post">
@@ -123,7 +123,7 @@
     </div>
   </redback:ifAuthorized>
 
-  <s:if test="${not empty projectBuildDefinitionSummaries}">
+  <c:if test="${not empty projectBuildDefinitionSummaries}">
   <h3>Project Build Definitions</h3>
 
   <ec:table items="projectBuildDefinitionSummaries"
@@ -136,7 +136,7 @@
     <ec:row>
       <ec:column property="projectName" title="Project">
         <s:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
-          <s:param name="projectId" value="${pageScope.buildDefinitionSummary.projectId}"/>
+          <s:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</s:param>
         </s:url>
         <s:a href="%{projectUrl}">${pageScope.buildDefinitionSummary.projectName}</s:a>
       </ec:column>
@@ -212,6 +212,6 @@
     </ec:row>
   </ec:table>
 
-  </s:if>
+  </c:if>
 
 </s:i18n>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Sat Oct 25 01:38:37 2008
@@ -67,7 +67,7 @@
       </ec:column>
       <ec:column property="editAction" title="&nbsp;" width="1%">
         <%-- if the from is PROJECT then render the links differently --%>
-        <s:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
+        <c:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
           <redback:ifAuthorized permission="continuum-modify-project-build-definition" resource="${projectGroupName}">
             <s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
               <s:param name="projectId">${projectId}</s:param>
@@ -78,7 +78,7 @@
           <redback:elseAuthorized>
             <img src="<s:url value='/images/edit_disabled.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0" />
           </redback:elseAuthorized>
-        </s:if>
+        </c:if>
         <s:else>
           <redback:ifAuthorized permission="continuum-modify-group-build-definition" resource="${projectGroupName}">
             <s:url id="editUrl" action="buildDefinition" method="input" namespace="/">
@@ -95,7 +95,7 @@
       </ec:column>
       <ec:column property="deleteAction" title="&nbsp;" width="1%">
         <%-- if the from is PROJECT then render the links differently --%>
-        <s:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
+        <c:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
           <redback:ifAuthorized permission="continuum-remove-project-build-definition" resource="${projectGroupName}">
             <s:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
               <s:param name="projectId">${projectId}</s:param>
@@ -107,7 +107,7 @@
           <redback:elseAuthorized>
             <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
           </redback:elseAuthorized>
-        </s:if>
+        </c:if>
         <s:else>
           <redback:ifAuthorized permission="continuum-remove-group-build-definition" resource="${projectGroupName}">
             <s:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp Sat Oct 25 01:38:37 2008
@@ -25,7 +25,7 @@
 <s:i18n name="localization.Continuum">
 
   <h3>Project Group Notifiers of ${projectGroup.name} group</h3>
-  <s:if test="${not empty projectGroupNotifierSummaries}">
+  <c:if test="${not empty projectGroupNotifierSummaries}">
   <ec:table items="projectGroupNotifierSummaries"
             var="projectGroupNotifierSummary"
             showExports="false"
@@ -71,7 +71,7 @@
       </ec:column>      
     </ec:row>
   </ec:table>
-  </s:if>
+  </c:if>
 
   <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
     <div class="functnbar3">
@@ -83,7 +83,7 @@
     </div>
   </redback:ifAuthorized>
 
-  <s:if test="${not empty projectNotifierSummaries}">
+  <c:if test="${not empty projectNotifierSummaries}">
     <h3>Project Notifiers</h3>
     <ec:table items="projectNotifierSummaries"
               var="projectNotifierSummary"
@@ -95,7 +95,7 @@
       <ec:row>
         <ec:column property="projectName" title="PROJECT NAME">
           <s:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
-            <s:param name="projectId" value="${pageScope.projectNotifierSummary.projectId}"/>
+            <s:param name="projectId">${pageScope.projectNotifierSummary.projectId}</s:param>
           </s:url>
         <s:a href="%{projectUrl}">${pageScope.projectNotifierSummary.projectName}</s:a>
         </ec:column>
@@ -153,5 +153,5 @@
         </ec:column>
       </ec:row>
     </ec:table>
-  </s:if>
+  </c:if>
 </s:i18n>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp Sat Oct 25 01:38:37 2008
@@ -24,7 +24,7 @@
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
 <s:i18n name="localization.Continuum">
-<s:if test="${not empty projects}">
+<c:if test="${not empty projects}">
 
   <h3><s:text name="projectGroup.buildsStatut.title"/></h3>
   <table>
@@ -69,7 +69,7 @@
       <ec:column property="state" title="&nbsp;" width="1%" cell="org.apache.maven.continuum.web.view.StateCell"/>
       <ec:column property="name" title="summary.projectTable.name" width="50%">
         <s:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
-          <s:param name="projectId" value="${project.id}"/>
+          <s:param name="projectId">${project.id}</s:param>
         </s:url>
         <s:a href="%{projectUrl}">${pageScope.project.name}</s:a>
       </ec:column>
@@ -79,10 +79,10 @@
           <c:when test="${project.buildNumber gt 0 && project.buildInSuccessId gt 0}">
             <redback:ifAuthorized permission="continuum-view-group" resource="${projectGroupName}">
               <s:url id="buildResult" action="buildResult">
-                <s:param name="projecGroupId" value="${project.projectGroupId}"/>
-                <s:param name="projectId" value="${project.id}"/>
-                <s:param name="projectName" value="${project.name}"/>
-                <s:param name="buildId" value="${project.buildInSuccessId}"/>
+                <s:param name="projecGroupId">${project.projectGroupId}</s:param>
+                <s:param name="projectId">${project.id}</s:param>
+                <s:param name="projectName">${project.name}</s:param>
+                <s:param name="buildId">${project.buildInSuccessId}</s:param>
               </s:url>
               <s:a href="%{buildResult}">${project.buildNumber}</s:a>
             </redback:ifAuthorized>
@@ -109,8 +109,8 @@
               <c:choose>
                 <c:when test="${projectIdle}">
                   <s:url id="buildProjectUrl" action="buildProject" namespace="/" includeParams="none">
-                    <s:param name="projectId" value="${project.id}"/>
-                    <s:param name="projectGroupId" value="${project.projectGroupId}"/>
+                    <s:param name="projectId">${project.id}</s:param>
+                    <s:param name="projectGroupId">${project.projectGroupId}</s:param>
                     <s:param name="fromGroupPage" value="true"/>
                   </s:url>
                   <s:a href="%{buildProjectUrl}">
@@ -119,7 +119,7 @@
                 </c:when>
                 <c:otherwise>
                   <s:url id="cancelBuildProjectUrl" action="cancelBuild" namespace="/" includeParams="none">
-                    <s:param name="projectId" value="${project.id}"/>
+                    <s:param name="projectId">${project.id}</s:param>
                   </s:url>
                   <c:choose>
                     <c:when test="${project.state != 8}">
@@ -152,7 +152,7 @@
         <c:choose>
           <c:when test="${pageScope.project.latestBuildId > 0}">
             <s:url id="buildResultsUrl" action="buildResults" namespace="/">
-              <s:param name="projectId" value="${project.id}"/>
+              <s:param name="projectId">${project.id}</s:param>
               <s:param name="projectName">${project.name}</s:param>
             </s:url>
             <s:a href="%{buildResultsUrl}"><img src="<s:url value='/images/buildhistory.gif' includeParams="none"/>" alt="<s:text name="legend.buildHistory"/>" title="<s:text name="legend.buildHistory"/>" border="0"></s:a>
@@ -171,7 +171,7 @@
         <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="/">
-              <s:param name="projectId" value="${project.id}"/>
+              <s:param name="projectId">${project.id}</s:param>
             </s:url>
             <s:a href="%{workingCopyUrl}"><img src="<s:url value='/images/workingcopy.gif' includeParams="none"/>" alt="<s:text name="legend.workingCopy"/>" title="<s:text name="legend.workingCopy"/>" border="0"></s:a>
           </c:when>
@@ -189,7 +189,7 @@
         <c:choose>
           <c:when test="${pageScope.project.state == 2 && pageScope.project.projectType == 'maven2'}">
             <s:url id="releaseProjectUrl" action="releasePromptGoal" namespace="/">
-              <s:param name="projectId" value="${project.id}"/>
+              <s:param name="projectId">${project.id}</s:param>
             </s:url>
             <s:a href="%{releaseProjectUrl}">
               <img src="<s:url value='/images/releaseproject.gif' includeParams="none"/>" alt="<s:text name="legend.release"/>" title="<s:text name="legend.release"/>" border="0"/>
@@ -210,7 +210,7 @@
           <c:when
               test="${projectIdle}">
             <s:url id="deleteProjectUrl" value="deleteProject!default.action" namespace="/">
-              <s:param name="projectId" value="${project.id}"/>
+              <s:param name="projectId">${project.id}</s:param>
             </s:url>
             <s:a href="%{deleteProjectUrl}">
               <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">
@@ -227,7 +227,7 @@
       </ec:column>
     </ec:row>
   </ec:table>
-  <s:if test="${not empty projects}">
+  <c:if test="${not empty projects}">
     <div class="functnbar3">
       <table>
         <tbody>
@@ -246,7 +246,7 @@
         </tbody>
       </table>
     </div>
-  </s:if>
+  </c:if>
   </form>
-</s:if>
+</c:if>
 </s:i18n>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp Sat Oct 25 01:38:37 2008
@@ -34,9 +34,9 @@
       <s:form action="saveSchedule" method="post" validate="true">
         <c:if test="${!empty actionErrors}">
           <div class="errormessage">
-            <c:forEach items="${actionErrors}" var="actionError">
-              <p><s:text name="${actionError}"/></p>
-            </c:forEach>
+            <s:iterator value="actionErrors">
+              <p><s:text name="<s:property/>" /></p>
+            </s:iterator>
           </div>
         </c:if>
 

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp Sat Oct 25 01:38:37 2008
@@ -28,7 +28,7 @@
   <title>
     <c:choose>
       <c:when test="${param.errorCode == 403 || param.errorCode == 404 || param.errorCode == 500}">
-        <s:text name="error.${param.errorCode}.title"/>
+        <s:text name="error.%{param.errorCode}.title"/>
       </c:when>
       <c:otherwise>
         <s:text name="error.page.title"/>
@@ -62,7 +62,7 @@
               <h3>
                 <c:choose>
                   <c:when test="${param.errorCode == 403 || param.errorCode == 404 || param.errorCode == 500}">
-                    <s:text name="error.${param.errorCode}.section.title"/>
+                    <s:text name="error.%{param.errorCode}.section.title"/>
                   </c:when>
                   <c:otherwise>
                     The URL requested results to an unknown error.
@@ -73,7 +73,7 @@
               <div class="errormessage">
                 <c:choose>
                   <c:when test="${param.errorCode == 403 || param.errorCode == 404 || param.errorCode == 500}">
-                    <s:text name="error.${param.errorCode}.message"/>
+                    <s:text name="error.%{param.errorCode}.message"/>
                   </c:when>
                   <c:otherwise>
                     The URL requested results to an unknown error.

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp Sat Oct 25 01:38:37 2008
@@ -32,18 +32,18 @@
   <body>
   <div id="h3">
 
-    <s:if test="${infoMessage != null}">
+    <c:if test="${infoMessage != null}">
        <p>${infoMessage}</p>
-    </s:if>
+    </c:if>
     <s:else>
        <h3><s:text name="groups.page.section.title"/></h3>
     </s:else>
   
-    <s:if test="${empty groups}">
+    <c:if test="${empty groups}">
       <s:text name="groups.page.list.empty"/>
-    </s:if>
+    </c:if>
 
-    <s:if test="${not empty groups}">
+    <c:if test="${not empty groups}">
 
     <ec:table items="groups"
               var="group"
@@ -54,7 +54,7 @@
               filterable="false">
       <ec:row highlightRow="true">
         <ec:column property="name" title="groups.table.name" width="20%" style="white-space: nowrap">
-          <a href="<s:url  action="projectGroupSummary" namespace="/"><s:param name="projectGroupId" value="%{'${group.id}'}"/></s:url>">${group.name}</a>
+          <a href="<s:url  action="projectGroupSummary" namespace="/"><s:param name="projectGroupId">${group.id}</s:param></s:url>">${group.name}</a>
         </ec:column>
         <ec:column property="groupId" title="groups.table.groupId" width="20%"/>
         <ec:column property="repositoryName" title="groups.table.repositoryName" width="20%">
@@ -71,7 +71,7 @@
         <ec:column property="buildGroupNowAction" title="&nbsp;" width="1%">
           <redback:ifAuthorized permission="continuum-build-group" resource="${group.name}">
             <s:url id="buildProjectGroupUrl" action="buildProjectGroup" namespace="/" includeParams="none">
-              <s:param name="projectGroupId" value="${group.id}"/>
+              <s:param name="projectGroupId">${group.id}</s:param>
               <s:param name="buildDefinitionId" value="-1"/>
               <s:param name="fromSummaryPage" value="true"/>
             </s:url>
@@ -86,7 +86,7 @@
         <ec:column property="releaseProjectGroupAction" title="&nbsp;" width="1%">
           <redback:ifAuthorized permission="continuum-build-group" resource="${group.name}">
             <s:url id="releaseProjectGroupUrl" action="releaseProjectGroup" namespace="/" includeParams="none">
-              <s:param name="projectGroupId" value="${group.id}"/>
+              <s:param name="projectGroupId">${group.id}</s:param>
             </s:url>
             <s:a href="%{releaseProjectGroupUrl}">
               <img src="<s:url value='/images/releaseproject.gif'/>" alt="<s:text name="projectGroup.releaseNow"/>" title="<s:text name="projectGroup.releaseNow"/>" border="0">
@@ -99,7 +99,7 @@
         <ec:column property="removeProjectGroupAction" title="&nbsp;" width="1%">
           <redback:ifAuthorized permission="continuum-remove-group" resource="${group.name}">
             <s:url id="removeProjectGroupUrl" action="removeProjectGroup" namespace="/" includeParams="none">
-              <s:param name="projectGroupId" value="${group.id}"/>
+              <s:param name="projectGroupId">${group.id}</s:param>
             </s:url>
             <s:a href="%{removeProjectGroupUrl}">
               <img src="<s:url value='/images/delete.gif'/>" alt="<s:text name="projectGroup.deleteGroup"/>" title="<s:text name="projectGroup.deleteGroup"/>" border="0">
@@ -115,7 +115,7 @@
         <ec:column property="numProjects" title="groups.table.totalProjects" format="0" width="1%" style="text-align: right" headerStyle="text-align: center" calc="total"/>
       </ec:row>
     </ec:table>
-    </s:if>
+    </c:if>
     <redback:ifAuthorized permission="continuum-add-group">
       <div class="functnbar3">
         <table>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp Sat Oct 25 01:38:37 2008
@@ -39,13 +39,13 @@
           </p>
         </div>
         <div class="functnbar3">
-          <s:if test="${projectId == -1}">
+          <c:if test="${projectId == -1}">
             <s:form action="deleteProjectGroupNotifier.action" method="post">
               <s:hidden name="notifierId"/>
               <s:hidden name="projectGroupId" />
               <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
             </s:form>
-          </s:if>
+          </c:if>
           <s:else>
             <s:form action="deleteProjectNotifier.action" method="post">
               <s:hidden name="notifierId"/>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp Sat Oct 25 01:38:37 2008
@@ -30,9 +30,9 @@
     </head>
     <body>
       <div id="axial" class="h3">
-        <s:if test="${projectId > 0}">
+        <c:if test="${projectId > 0}">
             <s:url id="actionUrl" action="ircProjectNotifierSave" includeContext="false" includeParams="none" />
-        </s:if>
+        </c:if>
         <s:else>
             <s:url id="actionUrl" action="ircProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
         </s:else>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp Sat Oct 25 01:38:37 2008
@@ -30,9 +30,9 @@
     </head>
     <body>
       <div id="axial" class="h3">
-        <s:if test="${projectId > 0}">
+        <c:if test="${projectId > 0}">
             <s:url id="actionUrl" action="jabberProjectNotifierSave" includeContext="false" includeParams="none" />
-        </s:if>
+        </c:if>
         <s:else>
             <s:url id="actionUrl" action="jabberProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
         </s:else>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp Sat Oct 25 01:38:37 2008
@@ -30,9 +30,9 @@
     </head>
     <body>
       <div id="axial" class="h3">
-        <s:if test="${projectId > 0}">
+        <c:if test="${projectId > 0}">
             <s:url id="actionUrl" action="mailProjectNotifierSave" includeContext="false" includeParams="none" />
-        </s:if>
+        </c:if>
         <s:else>
             <s:url id="actionUrl" action="mailProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
         </s:else>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp Sat Oct 25 01:38:37 2008
@@ -30,9 +30,9 @@
     </head>
     <body>
       <div id="axial" class="h3">
-        <s:if test="${projectId > 0}">
+        <c:if test="${projectId > 0}">
             <s:url id="actionUrl" action="msnProjectNotifierSave" includeContext="false" includeParams="none" />
-        </s:if>
+        </c:if>
         <s:else>
             <s:url id="actionUrl" action="msnProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
         </s:else>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp Sat Oct 25 01:38:37 2008
@@ -27,9 +27,9 @@
     <body>
       <div id="axial" class="h3">
       
-        <s:if test="${projectId > 0}">
+        <c:if test="${projectId > 0}">
             <s:url id="actionUrl" value="addProjectNotifier!execute" includeParams="none" />
-        </s:if>
+        </c:if>
         <s:else>
             <s:url id="actionUrl" value="addProjectGroupNotifier!execute" includeParams="none" />
         </s:else>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp Sat Oct 25 01:38:37 2008
@@ -30,9 +30,9 @@
     </head>
     <body>
       <div id="axial" class="h3">
-        <s:if test="${projectId > 0}">
+        <c:if test="${projectId > 0}">
             <s:url id="actionUrl" action="wagonProjectNotifierSave" includeContext="false" includeParams="none" />
-        </s:if>
+        </c:if>
         <s:else>
             <s:url id="actionUrl" action="wagonProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
         </s:else>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp Sat Oct 25 01:38:37 2008
@@ -34,9 +34,9 @@
           <s:form action="%{actionUrl}" method="post" >
             <c:if test="${!empty actionErrors}">
               <div class="errormessage">
-                <c:forEach items="${actionErrors}" var="actionError">
-                  <p><s:text name="${actionError}"/></p>
-                </c:forEach>
+                <s:iterator value="actionErrors">
+                  <p><s:text name="<s:property/>" /></p>
+                </s:iterator>
               </div>
             </c:if>
             <table>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp Sat Oct 25 01:38:37 2008
@@ -35,8 +35,8 @@
         </s:action>
 
         <s:action name="groupBuildDefinitionSummary" executeResult="true" namespace="component">
-          <s:param name="projectGroupId" value="%{projectGroupId}"/>
-          <s:param name="projectGroupName" value="%{projectGroup.name}"/>
+          <s:param name="projectGroupId">${projectGroupId}</s:param>
+          <s:param name="projectGroupName">${projectGroup.name}</s:param>
         </s:action>
       </div>
     </body>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp Sat Oct 25 01:38:37 2008
@@ -39,9 +39,9 @@
               </c:if>
               <c:if test="${!empty actionErrors}">
               <div class="errormessage">
-                <c:forEach items="${actionErrors}" var="actionError">
-                  <p><s:text name="${actionError}"/></p>
-                </c:forEach>
+                <s:iterator value="actionErrors">
+                  <p><s:text name="<s:property/>" /></p>
+                </s:iterator>
               </div>
               </c:if>
             <table>
@@ -56,7 +56,7 @@
               </tbody>
             </table>
             
-            <s:if test="${!empty projectList}">
+            <c:if test="${!empty projectList}">
             <h3><s:text name="projectGroup.edit.section.projects.title"/></h3>
             <div class="eXtremeTable">
               <table id="projects_table" border="1" cellspacing="2" cellpadding="3" class="tableRegion" width="100%">
@@ -75,7 +75,7 @@
                 </tbody>
               </table>
             </div>
-            </s:if>
+            </c:if>
             <div class="functnbar3">
               <c:choose>
                 <c:when test="${!projectInCOQueue}">

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp Sat Oct 25 01:38:37 2008
@@ -53,7 +53,7 @@
       <ec:row highlightRow="true">
         <ec:column property="name" title="summary.projectTable.name" width="48%">
           <s:url id="projectViewUrl" action="projectView">
-            <s:param name="projectId" value="${pageScope.project.id}"/>
+            <s:param name="projectId">${pageScope.project.id}</s:param>
           </s:url>
           <s:a href="%{projectViewUrl}">${pageScope.project.name}</s:a>
         </ec:column>
@@ -64,8 +64,8 @@
               <c:when
                   test="${pageScope.project.state == 1 || pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4}">
                 <s:url id="editProjectUrl" action="projectEdit">
-                  <s:param name="projectId" value="${pageScope.project.id}"/>
-                  <s:param name="projectName" value="${project.name}"/>
+                  <s:param name="projectId">${pageScope.project.id}</s:param>
+                  <s:param name="projectName">${project.name}</s:param>
                 </s:url>
                 <s:a href="%{editProjectUrl}">
                   <img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name="edit"/>" title="<s:text name="edit"/>" border="0">
@@ -88,8 +88,8 @@
               <c:when
                   test="${pageScope.project.state == 1 || pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4}">
                 <s:url id="removeProjectUrl" action="deleteProject!default.action">
-                  <s:param name="projectId" value="${pageScope.project.id}"/>
-                  <s:param name="projectName" value="${pageScope.project.name}"/>
+                  <s:param name="projectId">${pageScope.project.id}</s:param>
+                  <s:param name="projectName">${pageScope.project.name}</s:param>
                 </s:url>
                 <s:a href="%{removeProjectUrl}">
                   <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">
@@ -143,13 +143,13 @@
       <tr>
         <th nowrap="true">
           <s:form id="sortlist" name="sortlist" action="projectGroupMembers" theme="xhtml" method="post">
-            <s:if test="${ascending}">
+            <c:if test="${ascending}">
               <s:a href="javascript:document.forms['sortlist'].submit()"><img src="<s:url value='/images/icon_sortdown.gif' includeParams="none"/>" title="<s:text name='sort.descending'/>" border="0"></s:a> <s:text name="user.username.label"/>
-            </s:if>
+            </c:if>
             <s:else>
               <s:a href="javascript:document.forms['sortlist'].submit()"><img src="<s:url value='/images/icon_sortup.gif' includeParams="none"/>" title="<s:text name='sort.ascending'/>" border="0"></s:a> <s:text name="user.username.label"/>
             </s:else>
-            <s:hidden name="ascending" value="${!ascending}"/>
+            <s:hidden name="ascending">${!ascending}</s:hidden>
             <s:hidden name="projectGroupId" />
             <s:hidden name="filterProperty" />
             <s:hidden name="filterKey" />
@@ -175,19 +175,19 @@
             <s:property value="userEmail"/>
           </td>
           <td>
-            <s:if test="${administrator}">
+            <c:if test="${administrator}">
               <img src="<s:url value='/images/icon_success_sml.gif' includeParams="none"/>" border="0">
-            </s:if>
+            </c:if>
           </td>
           <td>
-            <s:if test="${developer}">
+            <c:if test="${developer}">
               <img src="<s:url value='/images/icon_success_sml.gif' includeParams="none"/>" border="0">
-            </s:if>
+            </c:if>
           </td>
           <td>
-            <s:if test="${user}">
+            <c:if test="${user}">
               <img src="<s:url value='/images/icon_success_sml.gif' includeParams="none"/>" border="0">
-            </s:if>
+            </c:if>
           </td>
         </tr>
       </s:iterator>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.jsp Sat Oct 25 01:38:37 2008
@@ -35,7 +35,7 @@
         </s:action>
     
         <s:action name="projectGroupNotifierSummary" executeResult="true" namespace="component">
-          <s:param name="projectGroupId" value="%{projectGroupId}"/>
+          <s:param name="projectGroupId">${projectGroupId}</s:param>
         </s:action>
       </div>
     </body>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp Sat Oct 25 01:38:37 2008
@@ -59,23 +59,23 @@
             <ec:column property="startTime" title="releaseResults.startTime" cell="date"/>
             <ec:column property="endTime" title="releaseResults.endTime" cell="date"/>
             <ec:column property="resultCode" title="releaseResults.state">
-              <s:if test="${pageScope.result.resultCode == 0}">
+              <c:if test="${pageScope.result.resultCode == 0}">
                 <s:text name="releaseViewResult.success"/>
-              </s:if>
+              </c:if>
               <s:else>
                 <s:text name="releaseViewResult.error"/>
               </s:else>
             </ec:column>
             <ec:column property="actions" title="&nbsp;">
                <s:url id="viewReleaseResultUrl" action="viewReleaseResult">
-                 <s:param name="releaseResultId" value="${pageScope.result.id}"/>
-                 <s:param name="projectGroupId" value="${projectGroupId}"/>
+                 <s:param name="releaseResultId">${pageScope.result.id}</s:param>
+                 <s:param name="projectGroupId">${projectGroupId}</s:param>
                </s:url>
                <s:a href="%{viewReleaseResultUrl}"><s:text name="releaseResults.viewResult"/></s:a>
              </ec:column>
           </ec:row>
         </ec:table>
-        <s:if test="${not empty releaseResults}">
+        <c:if test="${not empty releaseResults}">
           <div class="functnbar3">
             <table>
               <tbody>
@@ -89,7 +89,7 @@
               </tbody>
             </table>
           </div>
-        </s:if>
+        </c:if>
       </form>
       </div>
     </body>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp Sat Oct 25 01:38:37 2008
@@ -90,7 +90,7 @@
         <c1:data label="%{getText('projectGroup.description.label')}" name="projectGroup.description"/>
         <c1:data label="%{getText('projectGroup.repository.label')}" name="projectGroup.localRepository.name"/>
         <c:if test="${url != null}">
-            <s:url id="projectHomepageUrl" value="${url}" includeContext="false" includeParams="none"/>
+            <s:url id="projectHomepageUrl" value="%{#url}" includeContext="false" includeParams="none"/>
         	<c1:data label="%{getText('projectGroup.url.label')}" name="url" valueLink="%{'${projectHomepageUrl}'}"/>  
         </c:if>
       </table>
@@ -101,9 +101,9 @@
 
       <c:if test="${!empty actionErrors}">
         <div class="errormessage">
-          <c:forEach items="${actionErrors}" var="actionError">
-            <p><s:text name="${actionError}"/></p>
-          </c:forEach>
+          <s:iterator value="actionErrors">
+            <p><s:text name="<s:property/>" /></p>
+          </s:iterator>
         </div>
       </c:if>
 
@@ -142,8 +142,8 @@
               <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}"/>
-                  <s:hidden name="projectGroupName" value="${projectGroup.name}"/>
+                  <s:hidden name="selectedProjectGroup">${projectGroup.id}</s:hidden>
+                  <s:hidden name="projectGroupName">${projectGroup.name}</s:hidden>
                   <s:hidden name="projectType" value=""/>
                 </s:form>
 
@@ -167,8 +167,8 @@
     </redback:ifAnyAuthorized>
 
     <s:action name="projectSummary" executeResult="true" namespace="component">
-      <s:param name="projectGroupId" value="%{projectGroupId}"/>
-      <s:param name="projectGroupName" value="%{projectGroup.name}"/>
+      <s:param name="projectGroupId">${projectGroupId}</s:param>
+      <s:param name="projectGroupName">${projectGroup.name}</s:param>
     </s:action>
 
   </div>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp Sat Oct 25 01:38:37 2008
@@ -44,7 +44,7 @@
             <c1:data label="%{getText('projectView.project.scmUrl')}" name="project.scmUrl"/>
             <c1:data label="%{getText('projectView.project.scmTag')}" name="project.scmTag"/>
             <s:url id="projectGroupSummaryUrl" value="/projectGroupSummary.action">
-                <s:param name="projectGroupId" value="%{project.projectGroup.id}"/>
+                <s:param name="projectGroupId">${project.projectGroup.id}</s:param>
             </s:url>
             <c1:data label="%{getText('projectView.project.group')}" name="project.projectGroup.name" valueLink="%{'${projectGroupSummaryUrl}'}"/>
             <c1:data label="%{getText('projectView.project.lastBuildDateTime')}" name="lastBuildDateTime" />
@@ -78,8 +78,8 @@
         <h3><s:text name="projectView.buildDefinitions"/></h3>
 
         <s:action name="buildDefinitionSummary" id="summary" namespace="component" executeResult="true">
-          <s:param name="projectId" value="%{project.id}" />
-          <s:param name="projectGroupId" value="%{project.projectGroup.id}"/>
+          <s:param name="projectId">${project.id}</s:param>
+          <s:param name="projectGroupId">${project.projectGroup.id}</s:param>
         </s:action>
 
         <div class="functnbar3">
@@ -93,7 +93,7 @@
         </div>
 
         <h3><s:text name="projectView.notifiers"/></h3>
-        <s:if test="${not empty project.notifiers}">
+        <c:if test="${not empty project.notifiers}">
           <s:set name="notifiers" value="project.notifiers" scope="request"/>
           <ec:table items="notifiers"
                     var="notifier"
@@ -112,9 +112,9 @@
                   <c:choose>
                     <c:when test="${!pageScope.notifier.fromProject}">
                       <s:url id="editUrl" action="editProjectNotifier" namespace="/" includeParams="none">
-                        <s:param name="notifierId" value="${notifier.id}"/>
+                        <s:param name="notifierId">${notifier.id}</s:param>
                         <s:param name="projectId" value="project.id"/>
-                        <s:param name="projectGroupId" value="${project.projectGroup.id}"/>
+                        <s:param name="projectGroupId">${project.projectGroup.id}</s:param>
                         <s:param name="notifierType">${notifier.type}</s:param>
                       </s:url>
                       <s:a href="%{editUrl}">
@@ -136,9 +136,9 @@
                     <c:when test="${!pageScope.notifier.fromProject}">
                       <s:url id="removeUrl" action="deleteProjectNotifier" namespace="/">
                         <s:param name="projectId" value="project.id"/>
-                        <s:param name="projectGroupId" value="${project.projectGroup.id}"/>
+                        <s:param name="projectGroupId">${project.projectGroup.id}</s:param>
                         <s:param name="notifierType">${notifier.type}</s:param>
-                        <s:param name="notifierId" value="${notifier.id}"/>
+                        <s:param name="notifierId">${notifier.id}</s:param>
                     </s:url>
                     <s:a href="%{removeUrl}">
                       <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">
@@ -155,7 +155,7 @@
               </ec:column>
             </ec:row>
           </ec:table>
-        </s:if>
+        </c:if>
         <div class="functnbar3">
            <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
           <s:form action="addProjectNotifier!default.action" method="post">

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp Sat Oct 25 01:38:37 2008
@@ -45,14 +45,14 @@
             <ec:column property="active" title="schedules.table.active"/>
             <ec:column property="editActions" title="&nbsp;" width="1%">
                 <s:url id="editScheduleUrl" action="schedule">
-                  <s:param name="id" value="${pageScope.schedule.id}"/>
+                  <s:param name="id">${pageScope.schedule.id}</s:param>
                 </s:url>
                 <s:a href="%{editScheduleUrl}"><img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0" /></s:a>
             </ec:column>
             <ec:column property="editActions" title="&nbsp;" width="1%">
                 <s:url id="removeScheduleUrl" action="removeSchedule">
-                  <s:param name="id" value="${pageScope.schedule.id}"/>
-                  <s:param name="name" value="%{'${pageScope.schedule.name}'}"/>
+                  <s:param name="id">${pageScope.schedule.id}</s:param>
+                  <s:param name="name">${pageScope.schedule.name}</s:param>
                 </s:url>
                 <s:a href="%{removeScheduleUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
             </ec:column>

Modified: continuum/branches/continuum-struts2/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/pom.xml?rev=707824&r1=707823&r2=707824&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/pom.xml (original)
+++ continuum/branches/continuum-struts2/pom.xml Sat Oct 25 01:38:37 2008
@@ -214,7 +214,7 @@
     <module>continuum-webapp</module>
     <module>continuum-xmlrpc</module>
     <module>continuum-release</module>
-    <module>continuum-data-management</module>
+    <!-- module>continuum-data-management</module -->
     <module>maven-continuum-plugin</module>
     <module>continuum-docs</module>
     <module>continuum-jetty</module>



Mime
View raw message