continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r707273 [5/7] - in /continuum/branches/continuum-struts2: ./ continuum-core/ continuum-core/src/test/resources/ continuum-webapp/ continuum-webapp/src/main/java/org/apache/continuum/web/action/ continuum-webapp/src/main/java/org/apache/cont...
Date Thu, 23 Oct 2008 05:05:43 GMT
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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -17,30 +17,30 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ 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' %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
-<ww:i18n name="localization.Continuum">
-<ww:if test="${not empty projects}">
+<s:i18n name="localization.Continuum">
+<s:if test="${not empty projects}">
 
-  <h3><ww:text name="projectGroup.buildsStatut.title"/></h3>
+  <h3><s:text name="projectGroup.buildsStatut.title"/></h3>
   <table>
     <tr>
       <td>
-          <ww:text name="projectGroup.buildsStatut.success"/> : ${groupSummary.numSuccesses}
-          &nbsp;<img src="<ww:url value='/images/icon_success_sml.gif' includeParams="none"/>" alt="<ww:text name="projectGroup.buildsStatut.success"/>">    
-          &nbsp; <ww:text name="projectGroup.buildsStatut.errors"/> : ${groupSummary.numErrors}
-          &nbsp;<img src="<ww:url value='/images/icon_error_sml.gif' includeParams="none"/>" alt="<ww:text name="projectGroup.buildsStatut.errors"/>">
-          &nbsp; <ww:text name="projectGroup.buildsStatut.failures"/> : ${groupSummary.numFailures}
-          &nbsp;<img src="<ww:url value='/images/icon_warning_sml.gif' includeParams="none"/>" alt="<ww:text name="projectGroup.buildsStatut.failures"/>">
+          <s:text name="projectGroup.buildsStatut.success"/> : ${groupSummary.numSuccesses}
+          &nbsp;<img src="<s:url value='/images/icon_success_sml.gif' includeParams="none"/>" alt="<s:text name="projectGroup.buildsStatut.success"/>">
+          &nbsp; <s:text name="projectGroup.buildsStatut.errors"/> : ${groupSummary.numErrors}
+          &nbsp;<img src="<s:url value='/images/icon_error_sml.gif' includeParams="none"/>" alt="<s:text name="projectGroup.buildsStatut.errors"/>">
+          &nbsp; <s:text name="projectGroup.buildsStatut.failures"/> : ${groupSummary.numFailures}
+          &nbsp;<img src="<s:url value='/images/icon_warning_sml.gif' includeParams="none"/>" alt="<s:text name="projectGroup.buildsStatut.failures"/>">
       <td>      
     </tr>
   </table>
 
-  <h3><ww:text name="projectGroup.projects.title"/></h3>
+  <h3><s:text name="projectGroup.projects.title"/></h3>
 
   <form id="projectsForm" action="ProjectsList.action" method="post">
     <input type="hidden" name="methodToCall" value="" />
@@ -68,23 +68,23 @@
       </redback:ifAuthorized>
       <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%">
-        <ww:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
-          <ww:param name="projectId" value="${project.id}"/>
-        </ww:url>
-        <ww:a href="%{projectUrl}">${pageScope.project.name}</ww:a>
+        <s:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
+          <s:param name="projectId" value="${project.id}"/>
+        </s:url>
+        <s:a href="%{projectUrl}">${pageScope.project.name}</s:a>
       </ec:column>
       <ec:column property="version" title="summary.projectTable.version" width="12%"/>
       <ec:column property="buildNumber" title="summary.projectTable.build" width="2%" style="text-align: center">
         <c:choose>
           <c:when test="${project.buildNumber gt 0 && project.buildInSuccessId gt 0}">
             <redback:ifAuthorized permission="continuum-view-group" resource="${projectGroupName}">
-              <ww:url id="buildResult" action="buildResult">
-                <ww:param name="projecGroupId" value="${project.projectGroupId}"/>
-                <ww:param name="projectId" value="${project.id}"/>
-                <ww:param name="projectName" value="${project.name}"/>
-                <ww:param name="buildId" value="${project.buildInSuccessId}"/>
-              </ww:url>
-              <ww:a href="%{buildResult}">${project.buildNumber}</ww:a>
+              <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:url>
+              <s:a href="%{buildResult}">${project.buildNumber}</s:a>
             </redback:ifAuthorized>
             <redback:elseAuthorized>
               ${project.buildNumber}
@@ -102,33 +102,33 @@
       <ec:column property="buildNowAction" title="&nbsp;" width="1%">
         <c:choose>
           <c:when test="${project.inBuildingQueue}">
-            <img src="<ww:url value='/images/inqueue.gif' includeParams="none"/>" alt="<ww:text name="legend.queuedBuild"/>" title="<ww:text name="legend.queuedBuild"/>" border="0">
+            <img src="<s:url value='/images/inqueue.gif' includeParams="none"/>" alt="<s:text name="legend.queuedBuild"/>" title="<s:text name="legend.queuedBuild"/>" border="0">
           </c:when>
           <c:otherwise>
             <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
               <c:choose>
                 <c:when test="${projectIdle}">
-                  <ww:url id="buildProjectUrl" action="buildProject" namespace="/" includeParams="none">
-                    <ww:param name="projectId" value="${project.id}"/>
-                    <ww:param name="projectGroupId" value="${project.projectGroupId}"/>
-                    <ww:param name="fromGroupPage" value="true"/>
-                  </ww:url>
-                  <ww:a href="%{buildProjectUrl}">
-                    <img src="<ww:url value='/images/buildnow.gif' includeParams="none"/>" alt="<ww:text name="legend.buildNow"/>" title="<ww:text name="legend.buildNow"/>" border="0">
-                  </ww:a>
+                  <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="fromGroupPage" value="true"/>
+                  </s:url>
+                  <s:a href="%{buildProjectUrl}">
+                    <img src="<s:url value='/images/buildnow.gif' includeParams="none"/>" alt="<s:text name="legend.buildNow"/>" title="<s:text name="legend.buildNow"/>" border="0">
+                  </s:a>
                 </c:when>
                 <c:otherwise>
-                  <ww:url id="cancelBuildProjectUrl" action="cancelBuild" namespace="/" includeParams="none">
-                    <ww:param name="projectId" value="${project.id}"/>
-                  </ww:url>
+                  <s:url id="cancelBuildProjectUrl" action="cancelBuild" namespace="/" includeParams="none">
+                    <s:param name="projectId" value="${project.id}"/>
+                  </s:url>
                   <c:choose>
                     <c:when test="${project.state != 8}">
-                      <ww:a href="%{cancelBuildProjectUrl}">
-                        <img src="<ww:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<ww:text name="legend.cancelBuild"/>" title="<ww:text name="legend.cancelBuild"/>" border="0">
-                      </ww:a>
+                      <s:a href="%{cancelBuildProjectUrl}">
+                        <img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name="legend.cancelBuild"/>" title="<s:text name="legend.cancelBuild"/>" border="0">
+                      </s:a>
                     </c:when>
                     <c:otherwise>
-                      <img src="<ww:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>" alt="<ww:text name="legend.cancelBuild"/>" title="<ww:text name="legend.cancelBuild"/>" border="0">
+                      <img src="<s:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>" alt="<s:text name="legend.cancelBuild"/>" title="<s:text name="legend.cancelBuild"/>" border="0">
                     </c:otherwise>
                   </c:choose>
                 </c:otherwise>
@@ -137,10 +137,10 @@
             <redback:elseAuthorized>
               <c:choose>
                 <c:when test="${projectIdle}">
-                  <img src="<ww:url value='/images/buildnow_disabled.gif' includeParams="none"/>" alt="<ww:text name="legend.buildNow"/>" title="<ww:text name="legend.buildNow"/>" border="0">
+                  <img src="<s:url value='/images/buildnow_disabled.gif' includeParams="none"/>" alt="<s:text name="legend.buildNow"/>" title="<s:text name="legend.buildNow"/>" border="0">
                 </c:when>
                 <c:otherwise>
-                  <img src="<ww:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>" alt="<ww:text name="legend.cancelBuild"/>" title="<ww:text name="legend.cancelBuild"/>" border="0">
+                  <img src="<s:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>" alt="<s:text name="legend.cancelBuild"/>" title="<s:text name="legend.cancelBuild"/>" border="0">
                 </c:otherwise>
               </c:choose>
             </redback:elseAuthorized>
@@ -151,57 +151,57 @@
         <redback:ifAuthorized permission="continuum-view-group" resource="${projectGroupName}">
         <c:choose>
           <c:when test="${pageScope.project.latestBuildId > 0}">
-            <ww:url id="buildResultsUrl" action="buildResults" namespace="/">
-              <ww:param name="projectId" value="${project.id}"/>
-              <ww:param name="projectName">${project.name}</ww:param>
-            </ww:url>
-            <ww:a href="%{buildResultsUrl}"><img src="<ww:url value='/images/buildhistory.gif' includeParams="none"/>" alt="<ww:text name="legend.buildHistory"/>" title="<ww:text name="legend.buildHistory"/>" border="0"></ww:a>
+            <s:url id="buildResultsUrl" action="buildResults" namespace="/">
+              <s:param name="projectId" value="${project.id}"/>
+              <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>
           </c:when>
           <c:otherwise>
-            <img src="<ww:url value='/images/buildhistory_disabled.gif' includeParams="none"/>" alt="<ww:text name="legend.buildHistory"/>" title="<ww:text name="legend.buildHistory"/>" border="0">
+            <img src="<s:url value='/images/buildhistory_disabled.gif' includeParams="none"/>" alt="<s:text name="legend.buildHistory"/>" title="<s:text name="legend.buildHistory"/>" border="0">
           </c:otherwise>
         </c:choose>
         </redback:ifAuthorized>
         <redback:elseAuthorized>
-          <img src="<ww:url value='/images/buildhistory_disabled.gif' includeParams="none"/>" alt="<ww:text name="legend.buildHistory"/>" title="<ww:text name="legend.buildHistory"/>" border="0">
+          <img src="<s:url value='/images/buildhistory_disabled.gif' includeParams="none"/>" alt="<s:text name="legend.buildHistory"/>" title="<s:text name="legend.buildHistory"/>" border="0">
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="workingCopyAction" title="&nbsp;" width="1%">
         <redback:ifAuthorized permission="continuum-view-group" resource="${projectGroupName}">
         <c:choose>
           <c:when test="${pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4 || pageScope.project.state == 6}">
-            <ww:url id="workingCopyUrl" action="workingCopy" namespace="/">
-              <ww:param name="projectId" value="${project.id}"/>
-            </ww:url>
-            <ww:a href="%{workingCopyUrl}"><img src="<ww:url value='/images/workingcopy.gif' includeParams="none"/>" alt="<ww:text name="legend.workingCopy"/>" title="<ww:text name="legend.workingCopy"/>" border="0"></ww:a>
+            <s:url id="workingCopyUrl" action="workingCopy" namespace="/">
+              <s:param name="projectId" value="${project.id}"/>
+            </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>
           <c:otherwise>
-            <img src="<ww:url value='/images/workingcopy_disabled.gif' includeParams="none"/>" alt="<ww:text name="legend.workingCopy"/>" title="<ww:text name="legend.workingCopy"/>" border="0">
+            <img src="<s:url value='/images/workingcopy_disabled.gif' includeParams="none"/>" alt="<s:text name="legend.workingCopy"/>" title="<s:text name="legend.workingCopy"/>" border="0">
           </c:otherwise>
         </c:choose>
         </redback:ifAuthorized>
         <redback:elseAuthorized>
-          <img src="<ww:url value='/images/workingcopy_disabled.gif' includeParams="none"/>" alt="<ww:text name="legend.workingCopy"/>" title="<ww:text name="legend.workingCopy"/>" border="0">
+          <img src="<s:url value='/images/workingcopy_disabled.gif' includeParams="none"/>" alt="<s:text name="legend.workingCopy"/>" title="<s:text name="legend.workingCopy"/>" border="0">
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="releaseAction" title="&nbsp;" width="1%" sortable="false">
         <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
         <c:choose>
           <c:when test="${pageScope.project.state == 2 && pageScope.project.projectType == 'maven2'}">
-            <ww:url id="releaseProjectUrl" action="releasePromptGoal" namespace="/">
-              <ww:param name="projectId" value="${project.id}"/>
-            </ww:url>
-            <ww:a href="%{releaseProjectUrl}">
-              <img src="<ww:url value='/images/releaseproject.gif' includeParams="none"/>" alt="<ww:text name="legend.release"/>" title="<ww:text name="legend.release"/>" border="0"/>
-            </ww:a>
+            <s:url id="releaseProjectUrl" action="releasePromptGoal" namespace="/">
+              <s:param name="projectId" value="${project.id}"/>
+            </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"/>
+            </s:a>
           </c:when>
           <c:otherwise>
-            <img src="<ww:url value='/images/releaseproject_disabled.gif' includeParams="none"/>" alt="<ww:text name="legend.release"/>" title="<ww:text name="legend.release"/>" border="0"/>
+            <img src="<s:url value='/images/releaseproject_disabled.gif' includeParams="none"/>" alt="<s:text name="legend.release"/>" title="<s:text name="legend.release"/>" border="0"/>
           </c:otherwise>
         </c:choose>
         </redback:ifAuthorized>
         <redback:elseAuthorized>
-          <img src="<ww:url value='/images/releaseproject_disabled.gif' includeParams="none"/>" alt="<ww:text name="legend.release"/>" title="<ww:text name="legend.release"/>" border="0">
+          <img src="<s:url value='/images/releaseproject_disabled.gif' includeParams="none"/>" alt="<s:text name="legend.release"/>" title="<s:text name="legend.release"/>" border="0">
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="deleteAction" title="&nbsp;" width="1%" sortable="false">
@@ -209,44 +209,44 @@
         <c:choose>
           <c:when
               test="${projectIdle}">
-            <ww:url id="deleteProjectUrl" value="deleteProject!default.action" namespace="/">
-              <ww:param name="projectId" value="${project.id}"/>
-            </ww:url>
-            <ww:a href="%{deleteProjectUrl}">
-              <img src="<ww:url value='/images/delete.gif' includeParams="none"/>" alt="<ww:text name="delete"/>" title="<ww:text name="delete"/>" border="0">
-            </ww:a>
+            <s:url id="deleteProjectUrl" value="deleteProject!default.action" namespace="/">
+              <s:param name="projectId" value="${project.id}"/>
+            </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">
+            </s:a>
           </c:when>
           <c:otherwise>
-            <img src="<ww:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<ww:text name="delete"/>" title="<ww:text name="delete"/>" border="0">
+            <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">
           </c:otherwise>
         </c:choose>
         </redback:ifAuthorized>
         <redback:elseAuthorized>
-          <img src="<ww:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<ww:text name="delete"/>" title="<ww:text name="delete"/>" border="0">
+          <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>
       </ec:column>
     </ec:row>
   </ec:table>
-  <ww:if test="${not empty projects}">
+  <s:if test="${not empty projects}">
     <div class="functnbar3">
       <table>
         <tbody>
           <tr>
             <td>
               <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-                <ww:select theme="simple" name="buildDef" list="buildDefinitions" 
+                <s:select theme="simple" name="buildDef" list="buildDefinitions"
                            listKey="value" listValue="key" headerKey="-1" headerValue="%{getText('projectGroup.buildDefinition.label')}"
                            onchange="$('projectsForm').buildDefinitionId.value=$('buildDef').value" />
-                <input type="button" name="build-projects" value="<ww:text name="projectGroup.buildProjects"/>" onclick="$('projectsForm').methodToCall.value='build';document.forms.projectsForm.submit();" />
-                <input type="button" name="cancel-builds" value="<ww:text name="projectGroup.cancelBuilds"/>" onclick="document.forms.projectsForm.action='cancelBuilds.action';document.forms.projectsForm.submit();" />
-                <input type="button" name="delete-projects" value="<ww:text name="projectGroup.deleteProjects"/>" onclick="document.forms.projectsForm.methodToCall.value='confirmRemove';document.forms.projectsForm.submit();" />
+                <input type="button" name="build-projects" value="<s:text name="projectGroup.buildProjects"/>" onclick="$('projectsForm').methodToCall.value='build';document.forms.projectsForm.submit();" />
+                <input type="button" name="cancel-builds" value="<s:text name="projectGroup.cancelBuilds"/>" onclick="document.forms.projectsForm.action='cancelBuilds.action';document.forms.projectsForm.submit();" />
+                <input type="button" name="delete-projects" value="<s:text name="projectGroup.deleteProjects"/>" onclick="document.forms.projectsForm.methodToCall.value='confirmRemove';document.forms.projectsForm.submit();" />
               </redback:ifAuthorized>
             </td>
           </tr>
         </tbody>
       </table>
     </div>
-  </ww:if>
+  </s:if>
   </form>
-</ww:if>
-</ww:i18n>
+</s:if>
+</s:i18n>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp Wed Oct 22 22:05:36 2008
@@ -17,38 +17,38 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="deleteBuildDefinition.page.title"/></title>
+        <title><s:text name="deleteBuildDefinition.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="deleteBuildDefinition.section.title"/></h3>
+        <h3><s:text name="deleteBuildDefinition.section.title"/></h3>
 
         <div class="warningmessage">
           <p>
             <strong>
-                <ww:text name="deleteBuildDefinition.confirmation.message">
-                  <ww:param><ww:property value="buildDefinitionId"/></ww:param>
-                  <ww:param><ww:property value="description"/></ww:param>
-                  <ww:param><ww:property value="goals"/></ww:param>
-                </ww:text>
+                <s:text name="deleteBuildDefinition.confirmation.message">
+                  <s:param><s:property value="buildDefinitionId"/></s:param>
+                  <s:param><s:property value="description"/></s:param>
+                  <s:param><s:property value="goals"/></s:param>
+                </s:text>
             </strong>
           </p>
         </div>
         <div class="functnbar3">
-          <ww:form action="removeGroupBuildDefinition">
-            <ww:hidden name="buildDefinitionId"/>
-            <ww:hidden name="projectGroupId"/>
-            <ww:hidden name="projectId"/>
-            <ww:hidden name="confirmed" value="true"/>
+          <s:form action="removeGroupBuildDefinition">
+            <s:hidden name="buildDefinitionId"/>
+            <s:hidden name="projectGroupId"/>
+            <s:hidden name="projectId"/>
+            <s:hidden name="confirmed" value="true"/>
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
-          </ww:form>
+          </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp Wed Oct 22 22:05:36 2008
@@ -17,72 +17,72 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="buildResult.delete.confirmation.page.title"/></title>
+        <title><s:text name="buildResult.delete.confirmation.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="buildResult.delete.confirmation.section.title"/></h3>
+        <h3><s:text name="buildResult.delete.confirmation.section.title"/></h3>
         <div class="axial">
-        <ww:if test="hasActionMessages()">
+        <s:if test="hasActionMessages()">
           <div class="warningmessage">
             <p>
-              <ww:actionmessage/>
+              <s:actionmessage/>
             </p>        
           </div>
-        </ww:if>
+        </s:if>
         <!-- in this case we come from the build result edit -->
-        <ww:if test="buildId">
+        <s:if test="buildId">
           <c:set var="action" value="removeBuildResult.action" />
-        </ww:if>
-        <ww:else>
+        </s:if>
+        <s:else>
           <c:set var="action" value="removeBuildResults.action" />
-        </ww:else>
+        </s:else>
         <form action="${action}" method="post">
-          <ww:hidden name="projectGroupId"/>
-          <ww:hidden name="projectId"/>
-          <ww:hidden name="buildId"/>
-          <ww:hidden name="confirmed" value="true"/>
-          <ww:if test="selectedBuildResults">
-          <ww:iterator value="selectedBuildResults">
-            <input type="hidden" value="<ww:property/>" name="selectedBuildResults" />
-          </ww:iterator>
-          </ww:if>
-          <ww:else>
-            <input type="hidden" value="<ww:property value="buildId"/>" name="selectedBuildResults" />
-          </ww:else>
+          <s:hidden name="projectGroupId"/>
+          <s:hidden name="projectId"/>
+          <s:hidden name="buildId"/>
+          <s:hidden name="confirmed" value="true"/>
+          <s:if test="selectedBuildResults">
+          <s:iterator value="selectedBuildResults">
+            <input type="hidden" value="<s:property/>" name="selectedBuildResults" />
+          </s:iterator>
+          </s:if>
+          <s:else>
+            <input type="hidden" value="<s:property value="buildId"/>" name="selectedBuildResults" />
+          </s:else>
           
-          <ww:actionerror/>
+          <s:actionerror/>
 
           <div class="warningmessage">
             <p>
               <strong>
-                <ww:text name="buildResult.delete.confirmation.message">
-                  <ww:param><ww:property value="%{selectedBuildResults.size}"/></ww:param>
-                </ww:text>
+                <s:text name="buildResult.delete.confirmation.message">
+                  <s:param><s:property value="%{selectedBuildResults.size}"/></s:param>
+                </s:text>
               </strong>
             </p>
           </div>
 
           <div class="functnbar3">
-            <ww:if test="buildId > 0">
+            <s:if test="buildId > 0">
               <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
-            </ww:if>
-            <ww:elseif test="selectedBuildResults.size > 0">
+            </s:if>
+            <s:elseif test="selectedBuildResults.size > 0">
               <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
-            </ww:elseif>
-            <ww:else>
-              <input type="submit" value="<ww:text name="cancel"/>" onClick="history.back()"/> 
-            </ww:else>
+            </s:elseif>
+            <s:else>
+              <input type="submit" value="<s:text name="cancel"/>" onClick="history.back()"/>
+            </s:else>
           </div>
         </form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmDeleteProjects.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmDeleteProjects.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmDeleteProjects.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmDeleteProjects.jsp Wed Oct 22 22:05:36 2008
@@ -17,37 +17,37 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="deleteProjects.page.title"/></title>
+        <title><s:text name="deleteProjects.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="deleteProjects.section.title"/></h3>
+        <h3><s:text name="deleteProjects.section.title"/></h3>
 
         <div class="warningmessage">
           <p>
             <strong>
-                <ww:text name="deleteProjects.confirmation.message">
-                    <ww:param><ww:property value="selectedProjectsNames"/></ww:param>
-                </ww:text>
+                <s:text name="deleteProjects.confirmation.message">
+                    <s:param><s:property value="selectedProjectsNames"/></s:param>
+                </s:text>
             </strong>
           </p>
         </div>
         <div class="functnbar3">
-          <ww:form action="ProjectsList.action" method="post">
-            <ww:iterator value="selectedProjects">
-              <input type="hidden" value="<ww:property/>" name="selectedProjects"/>
-            </ww:iterator>
+          <s:form action="ProjectsList.action" method="post">
+            <s:iterator value="selectedProjects">
+              <input type="hidden" value="<s:property/>" name="selectedProjects"/>
+            </s:iterator>
             <input type="hidden" name="projectGroupId" value="${projectGroupId}" />
             <input type="hidden" name="methodToCall" value="remove" />
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
-          </ww:form>
+          </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp Wed Oct 22 22:05:36 2008
@@ -17,10 +17,10 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
         <title>Project Group Removal</title>
     </head>
@@ -28,17 +28,17 @@
       <div id="axial" class="h3">
         <h3>Project Group Removal</h3>
         <div class="axial">
-        <ww:form action="removeProjectGroup" method="post">
-          <ww:hidden name="projectGroupId"/>
-          <ww:hidden name="confirmed" value="true"/>
-          <ww:actionerror/>
+        <s:form action="removeProjectGroup" method="post">
+          <s:hidden name="projectGroupId"/>
+          <s:hidden name="confirmed" value="true"/>
+          <s:actionerror/>
 
           <div class="warningmessage">
             <p>
               <strong>
-                <ww:text name="groups.confirmation.message">
-                  <ww:param><ww:property value="%{name}"/></ww:param>
-                </ww:text>
+                <s:text name="groups.confirmation.message">
+                  <s:param><s:property value="%{name}"/></s:param>
+                </s:text>
               </strong>
             </p>
           </div>
@@ -46,9 +46,9 @@
           <div class="functnbar3">
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
           </div>
-        </ww:form>
+        </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp Wed Oct 22 22:05:36 2008
@@ -17,39 +17,39 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="deleteReleaseResults.page.title"/></title>
+        <title><s:text name="deleteReleaseResults.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="deleteReleseResults.section.title"/></h3>
+        <h3><s:text name="deleteReleseResults.section.title"/></h3>
 
         <div class="warningmessage">
           <p>
             <strong>
-                <ww:text name="deleteReleaseResults.confirmation.message">
-                    <ww:param><ww:property value="%{selectedReleaseResults.size}"/></ww:param>
-                </ww:text>
+                <s:text name="deleteReleaseResults.confirmation.message">
+                    <s:param><s:property value="%{selectedReleaseResults.size}"/></s:param>
+                </s:text>
             </strong>
           </p>
         </div>
         
         <div class="functnbar3">
-          <ww:form action="removeReleaseResults" method="post">
-            <ww:iterator value="selectedReleaseResults">
-              <input type="hidden" value="<ww:property/>" name="selectedReleaseResults"/>
-            </ww:iterator>
+          <s:form action="removeReleaseResults" method="post">
+            <s:iterator value="selectedReleaseResults">
+              <input type="hidden" value="<s:property/>" name="selectedReleaseResults"/>
+            </s:iterator>
             <input type="hidden" name="projectGroupId" value="${projectGroupId}" />
-            <ww:hidden name="confirmed" value="true"/>
+            <s:hidden name="confirmed" value="true"/>
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
-          </ww:form>
+          </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>
\ No newline at end of file

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp Wed Oct 22 22:05:36 2008
@@ -17,10 +17,10 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
         <title>Schedule Removal</title>
     </head>
@@ -28,17 +28,17 @@
       <div id="axial" class="h3">
         <h3>Schedule Removal</h3>
         <div class="axial">
-        <ww:form action="removeSchedule" method="post">
-          <ww:hidden name="id"/>
-          <ww:hidden name="confirmed" value="true"/>
-          <ww:actionerror/>
+        <s:form action="removeSchedule" method="post">
+          <s:hidden name="id"/>
+          <s:hidden name="confirmed" value="true"/>
+          <s:actionerror/>
 
           <div class="warningmessage">
             <p>
               <strong>
-                <ww:text name="schedules.confirmation.message">
-                  <ww:param><ww:property value="%{name}"/></ww:param>
-                </ww:text>
+                <s:text name="schedules.confirmation.message">
+                  <s:param><s:property value="%{name}"/></s:param>
+                </s:text>
               </strong>
             </p>
           </div>
@@ -46,9 +46,9 @@
           <div class="functnbar3">
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
           </div>
-        </ww:form>
+        </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp Wed Oct 22 22:05:36 2008
@@ -20,18 +20,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 
 <html>
 <head>
   <title>
     <decorator:title/>
   </title>
-  <link rel="stylesheet" type="text/css" href="<ww:url value="/css/tigris.css" includeParams="none"/>" media="screen"/>
-  <link rel="stylesheet" type="text/css" href="<ww:url value="/css/print.css" includeParams="none"/>" media="print"/>
-  <link rel="stylesheet" type="text/css" href="<ww:url value="/css/extremecomponents.css" includeParams="none"/>" media="screen"/>
-  <link rel="shortcut icon" href="<ww:url value="/favicon.ico" includeParams="none"/>" type="image/x-icon"/>
-  <script type="text/javascript" src="<ww:url value="/js/prototype.js" includeParams="none"/>"></script>
+  <link rel="stylesheet" type="text/css" href="<s:url value="/css/tigris.css" includeParams="none"/>" media="screen"/>
+  <link rel="stylesheet" type="text/css" href="<s:url value="/css/print.css" includeParams="none"/>" media="print"/>
+  <link rel="stylesheet" type="text/css" href="<s:url value="/css/extremecomponents.css" includeParams="none"/>" media="screen"/>
+  <link rel="shortcut icon" href="<s:url value="/favicon.ico" includeParams="none"/>" type="image/x-icon"/>
+  <script type="text/javascript" src="<s:url value="/js/prototype.js" includeParams="none"/>"></script>
 
   <decorator:head/>
 </head>
@@ -59,7 +59,7 @@
   </tbody>
 </table>
 
-<ww:action name="bottom" executeResult="true"/>
+<s:action name="bottom" executeResult="true"/>
 
 <script language="javascript">
     <!--

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp Wed Oct 22 22:05:36 2008
@@ -17,36 +17,36 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-      <title><ww:text name="deleteBuildDefinition.page.title"/></title>
+      <title><s:text name="deleteBuildDefinition.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="deleteBuildDefinition.section.title"/></h3>
+        <h3><s:text name="deleteBuildDefinition.section.title"/></h3>
         <div class="warningmessage">
           <p>
             <strong>
-              <ww:text name="deleteBuildDefinition.confirmation.message">
-          	  	<ww:param><ww:property value="buildDefinitionId"/></ww:param>
-          	  	<ww:param><ww:property value="description"/></ww:param>
-          	  	<ww:param><ww:property value="goals"/></ww:param>
-          	  </ww:text>
+              <s:text name="deleteBuildDefinition.confirmation.message">
+          	  	<s:param><s:property value="buildDefinitionId"/></s:param>
+          	  	<s:param><s:property value="description"/></s:param>
+          	  	<s:param><s:property value="goals"/></s:param>
+          	  </s:text>
             </strong>
           </p>
         </div>
         <div class="functnbar3">
-          <ww:form action="removeProjectBuildDefinition.action" method="post">
-            <ww:hidden name="projectId"/>
-            <ww:hidden name="buildDefinitionId"/>
-            <ww:hidden name="confirmed" value="true"/>
+          <s:form action="removeProjectBuildDefinition.action" method="post">
+            <s:hidden name="projectId"/>
+            <s:hidden name="buildDefinitionId"/>
+            <s:hidden name="confirmed" value="true"/>
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
-          </ww:form>
+          </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp Wed Oct 22 22:05:36 2008
@@ -17,34 +17,34 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="deleteProject.page.title"/></title>
+        <title><s:text name="deleteProject.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="deleteProject.section.title"/></h3>
+        <h3><s:text name="deleteProject.section.title"/></h3>
 
         <div class="warningmessage">
           <p>
             <strong>
-                <ww:text name="deleteProject.confirmation.message">
-                    <ww:param><ww:property value="projectName"/></ww:param>
-                </ww:text>
+                <s:text name="deleteProject.confirmation.message">
+                    <s:param><s:property value="projectName"/></s:param>
+                </s:text>
             </strong>
           </p>
         </div>
         <div class="functnbar3">
-          <ww:form action="deleteProject.action" method="post">
-            <ww:hidden name="projectId"/>
-            <ww:hidden name="projectGroupId"/>
+          <s:form action="deleteProject.action" method="post">
+            <s:hidden name="projectId"/>
+            <s:hidden name="projectGroupId"/>
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
-          </ww:form>
+          </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -18,72 +18,72 @@
   --%>
 
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
 <head>
-<title><ww:text name="editSchedule.page.title"/></title>
+<title><s:text name="editSchedule.page.title"/></title>
 </head>
 <body>
 <div class="app">
   <div id="axial" class="h3">
-    <h3><ww:text name="editSchedule.page.title"/></h3>
+    <h3><s:text name="editSchedule.page.title"/></h3>
 
     <div class="axial">
-      <ww:form action="saveSchedule" method="post" validate="true">
+      <s:form action="saveSchedule" method="post" validate="true">
         <c:if test="${!empty actionErrors}">
           <div class="errormessage">
             <c:forEach items="${actionErrors}" var="actionError">
-              <p><ww:text name="${actionError}"/></p>
+              <p><s:text name="${actionError}"/></p>
             </c:forEach>
           </div>
         </c:if>
 
           <table>
-            <ww:textfield label="%{getText('schedule.name.label')}" name="name" required="true">
-                <ww:param name="desc"><p><ww:text name="schedule.name.message"/></p></ww:param>
-            </ww:textfield>
-            <ww:textfield label="%{getText('schedule.description.label')}" name="description" required="true">
-                <ww:param name="desc"><p><ww:text name="schedule.description.message"/></p></ww:param>
-            </ww:textfield>
+            <s:textfield label="%{getText('schedule.name.label')}" name="name" required="true">
+                <s:param name="desc"><p><s:text name="schedule.name.message"/></p></s:param>
+            </s:textfield>
+            <s:textfield label="%{getText('schedule.description.label')}" name="description" required="true">
+                <s:param name="desc"><p><s:text name="schedule.description.message"/></p></s:param>
+            </s:textfield>
 
             <tr>
-              <th><ww:label theme="simple" value="%{getText('schedule.cronExpression.label')}:"/></th>
+              <th><s:label theme="simple" value="%{getText('schedule.cronExpression.label')}:"/></th>
               <td>
                 <table>
-                  <ww:textfield label="%{getText('schedule.second.label')}" name="second" size="10"/>
-                  <ww:textfield label="%{getText('schedule.minute.label')}" name="minute" size="10"/>
-                  <ww:textfield label="%{getText('schedule.hour.label')}" name="hour" size="10"/>
-                  <ww:textfield label="%{getText('schedule.dayOfMonth.label')}" name="dayOfMonth" size="10"/>
-                  <ww:textfield label="%{getText('schedule.month.label')}" name="month" size="10"/>
-                  <ww:textfield label="%{getText('schedule.dayOfWeek.label')}" name="dayOfWeek" size="10"/>
-                  <ww:textfield label="%{getText('schedule.year.label')}" name="year"  size="4">
-                    <ww:param name="desc"><p><ww:text name="schedule.cronExpression.message"/></p></ww:param>
-                  </ww:textfield>
+                  <s:textfield label="%{getText('schedule.second.label')}" name="second" size="10"/>
+                  <s:textfield label="%{getText('schedule.minute.label')}" name="minute" size="10"/>
+                  <s:textfield label="%{getText('schedule.hour.label')}" name="hour" size="10"/>
+                  <s:textfield label="%{getText('schedule.dayOfMonth.label')}" name="dayOfMonth" size="10"/>
+                  <s:textfield label="%{getText('schedule.month.label')}" name="month" size="10"/>
+                  <s:textfield label="%{getText('schedule.dayOfWeek.label')}" name="dayOfWeek" size="10"/>
+                  <s:textfield label="%{getText('schedule.year.label')}" name="year"  size="4">
+                    <s:param name="desc"><p><s:text name="schedule.cronExpression.message"/></p></s:param>
+                  </s:textfield>
                 </table>
               </td>
             </tr>
 
-            <ww:textfield label="%{getText('schedule.maxJobExecutionTime.label')}" name="maxJobExecutionTime" required="true">
-                <ww:param name="desc"><p><ww:text name="schedule.maxJobExecutionTime.message"/></p></ww:param>
-            </ww:textfield>
-            <ww:textfield label="%{getText('schedule.quietPeriod.label')}" name="delay">
-                <ww:param name="desc"><p><ww:text name="schedule.quietPeriod.message"/></p></ww:param>
-            </ww:textfield>
-            <ww:checkbox label="%{getText('schedule.enabled.label')}" name="active" value="active" fieldValue="true">
-                <ww:param name="desc"><p><ww:text name="schedule.enabled.message"/></p></ww:param>
-            </ww:checkbox>
+            <s:textfield label="%{getText('schedule.maxJobExecutionTime.label')}" name="maxJobExecutionTime" required="true">
+                <s:param name="desc"><p><s:text name="schedule.maxJobExecutionTime.message"/></p></s:param>
+            </s:textfield>
+            <s:textfield label="%{getText('schedule.quietPeriod.label')}" name="delay">
+                <s:param name="desc"><p><s:text name="schedule.quietPeriod.message"/></p></s:param>
+            </s:textfield>
+            <s:checkbox label="%{getText('schedule.enabled.label')}" name="active" value="active" fieldValue="true">
+                <s:param name="desc"><p><s:text name="schedule.enabled.message"/></p></s:param>
+            </s:checkbox>
           </table>
-          <ww:hidden name="id"/>
+          <s:hidden name="id"/>
         <div class="functnbar3">
           <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
         </div>
-      </ww:form>
+      </s:form>
     </div>
   </div>
 </div>
 
 </body>
-</ww:i18n>
+</s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp Wed Oct 22 22:05:36 2008
@@ -17,7 +17,7 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
 <html>
@@ -29,14 +29,14 @@
   <div id="h3">
     <h3>Authorization Error</h3>
     <div class="errors">
-      <ww:if test="hasActionErrors()">
-        <ww:actionerror/>
-      </ww:if>
+      <s:if test="hasActionErrors()">
+        <s:actionerror/>
+      </s:if>
 
-      <ww:else>
+      <s:else>
         You are not authorized to access this page.
         Please contact your administrator to be granted the appropriate permissions.
-      </ww:else>
+      </s:else>
     </div>
   </div>
 </body>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp Wed Oct 22 22:05:36 2008
@@ -17,13 +17,13 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
 <html>
 <head>
   <title>Error Occurred</title>
-  <ww:head />
+  <s:head />
   <script language=javascript type='text/javascript'>
     <!--
     var state = 'none';
@@ -61,12 +61,12 @@
     <h3>Error Occurred</h3>
 
     <div class="errormessage">
-      <ww:property value="exception"/>
+      <s:property value="exception"/>
     </div>
     <p><a href="#" onclick="showhide('stacktrace');">Show/hide Stack Trace</a></p>
     <div id="stacktrace" style="display: none;">
       <pre>
-        <ww:property value="exceptionStack"/>
+        <s:property value="exceptionStack"/>
       </pre>
     </div>
   </div>

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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -20,27 +20,27 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
 <html>
 <head>
   <title>
     <c:choose>
       <c:when test="${param.errorCode == 403 || param.errorCode == 404 || param.errorCode == 500}">
-        <ww:text name="error.${param.errorCode}.title"/>
+        <s:text name="error.${param.errorCode}.title"/>
       </c:when>
       <c:otherwise>
-        <ww:text name="error.page.title"/>
+        <s:text name="error.page.title"/>
       </c:otherwise>
     </c:choose>
   </title>
-  <link rel="stylesheet" type="text/css" href="<ww:url value="/css/tigris.css" includeParams="none"/>" media="screen"/>
-  <link rel="stylesheet" type="text/css" href="<ww:url value="/css/print.css" includeParams="none"/>" media="print"/>
-  <link rel="stylesheet" type="text/css" href="<ww:url value="/css/extremecomponents.css" includeParams="none"/>" media="screen"/>
-  <link rel="shortcut icon" href="<ww:url value="/favicon.ico" includeParams="none"/>" type="image/x-icon"/>
+  <link rel="stylesheet" type="text/css" href="<s:url value="/css/tigris.css" includeParams="none"/>" media="screen"/>
+  <link rel="stylesheet" type="text/css" href="<s:url value="/css/print.css" includeParams="none"/>" media="print"/>
+  <link rel="stylesheet" type="text/css" href="<s:url value="/css/extremecomponents.css" includeParams="none"/>" media="screen"/>
+  <link rel="shortcut icon" href="<s:url value="/favicon.ico" includeParams="none"/>" type="image/x-icon"/>
 
-  <script src="<ww:url value="/scripts/tigris.js" includeParams="none"/>" type="text/javascript"></script>
+  <script src="<s:url value="/scripts/tigris.js" includeParams="none"/>" type="text/javascript"></script>
 </head>
 
 <body onload="focus()" marginwidth="0" marginheight="0" class="composite">
@@ -62,7 +62,7 @@
               <h3>
                 <c:choose>
                   <c:when test="${param.errorCode == 403 || param.errorCode == 404 || param.errorCode == 500}">
-                    <ww: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}">
-                    <ww: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.
@@ -91,4 +91,4 @@
 <%@ include file="/WEB-INF/jsp/navigations/DefaultBottom.jsp" %>
 </body>
 </html>
-</ww:i18n>
\ No newline at end of file
+</s:i18n>
\ No newline at end of file

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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -17,33 +17,33 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ 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' %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
 <html>
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
   <head>
-    <title><ww:text name="groups.page.title"/></title>
+    <title><s:text name="groups.page.title"/></title>
     <meta http-equiv="refresh" content="300"/>
   </head>
 
   <body>
   <div id="h3">
 
-    <ww:if test="${infoMessage != null}">
+    <s:if test="${infoMessage != null}">
        <p>${infoMessage}</p>
-    </ww:if>
-    <ww:else>
-       <h3><ww:text name="groups.page.section.title"/></h3>
-    </ww:else>
+    </s:if>
+    <s:else>
+       <h3><s:text name="groups.page.section.title"/></h3>
+    </s:else>
   
-    <ww:if test="${empty groups}">
-      <ww:text name="groups.page.list.empty"/>
-    </ww:if>
+    <s:if test="${empty groups}">
+      <s:text name="groups.page.list.empty"/>
+    </s:if>
 
-    <ww:if test="${not empty groups}">
+    <s:if test="${not empty groups}">
 
     <ec:table items="groups"
               var="group"
@@ -54,15 +54,15 @@
               filterable="false">
       <ec:row highlightRow="true">
         <ec:column property="name" title="groups.table.name" width="20%" style="white-space: nowrap">
-          <a href="<ww:url  action="projectGroupSummary" namespace="/"><ww:param name="projectGroupId" value="%{'${group.id}'}"/></ww:url>">${group.name}</a>
+          <a href="<s:url  action="projectGroupSummary" namespace="/"><s:param name="projectGroupId" value="%{'${group.id}'}"/></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%">
           <redback:ifAuthorized permission="continuum-manage-repositories">
-            <ww:url id="editRepositoryUrl" action="editRepository" namespace="/admin" includeParams="none">
-              <ww:param name="repository.id">${pageScope.group.repositoryId}</ww:param>
-            </ww:url>
-            <ww:a href="%{editRepositoryUrl}">${pageScope.group.repositoryName}</ww:a> 
+            <s:url id="editRepositoryUrl" action="editRepository" namespace="/admin" includeParams="none">
+              <s:param name="repository.id">${pageScope.group.repositoryId}</s:param>
+            </s:url>
+            <s:a href="%{editRepositoryUrl}">${pageScope.group.repositoryName}</s:a>
           </redback:ifAuthorized>
           <redback:elseAuthorized>
             ${pageScope.group.repositoryName}
@@ -70,43 +70,43 @@
         </ec:column>
         <ec:column property="buildGroupNowAction" title="&nbsp;" width="1%">
           <redback:ifAuthorized permission="continuum-build-group" resource="${group.name}">
-            <ww:url id="buildProjectGroupUrl" action="buildProjectGroup" namespace="/" includeParams="none">
-              <ww:param name="projectGroupId" value="${group.id}"/>
-              <ww:param name="buildDefinitionId" value="-1"/>
-              <ww:param name="fromSummaryPage" value="true"/>
-            </ww:url>
-            <ww:a href="%{buildProjectGroupUrl}">
-              <img src="<ww:url value='/images/buildnow.gif'/>" alt="<ww:text name="projectGroup.buildGroup"/>" title="<ww:text name="projectGroup.buildGroup"/>" border="0">
-            </ww:a>
+            <s:url id="buildProjectGroupUrl" action="buildProjectGroup" namespace="/" includeParams="none">
+              <s:param name="projectGroupId" value="${group.id}"/>
+              <s:param name="buildDefinitionId" value="-1"/>
+              <s:param name="fromSummaryPage" value="true"/>
+            </s:url>
+            <s:a href="%{buildProjectGroupUrl}">
+              <img src="<s:url value='/images/buildnow.gif'/>" alt="<s:text name="projectGroup.buildGroup"/>" title="<s:text name="projectGroup.buildGroup"/>" border="0">
+            </s:a>
           </redback:ifAuthorized>
           <redback:elseAuthorized>
-            <img src="<ww:url value='/images/buildnow_disabled.gif'/>" alt="<ww:text name="projectGroup.buildGroup"/>" title="<ww:text name="projectGroup.buildGroup"/>" border="0">
+            <img src="<s:url value='/images/buildnow_disabled.gif'/>" alt="<s:text name="projectGroup.buildGroup"/>" title="<s:text name="projectGroup.buildGroup"/>" border="0">
           </redback:elseAuthorized>
         </ec:column>
         <ec:column property="releaseProjectGroupAction" title="&nbsp;" width="1%">
           <redback:ifAuthorized permission="continuum-build-group" resource="${group.name}">
-            <ww:url id="releaseProjectGroupUrl" action="releaseProjectGroup" namespace="/" includeParams="none">
-              <ww:param name="projectGroupId" value="${group.id}"/>
-            </ww:url>
-            <ww:a href="%{releaseProjectGroupUrl}">
-              <img src="<ww:url value='/images/releaseproject.gif'/>" alt="<ww:text name="projectGroup.releaseNow"/>" title="<ww:text name="projectGroup.releaseNow"/>" border="0">
-            </ww:a>
+            <s:url id="releaseProjectGroupUrl" action="releaseProjectGroup" namespace="/" includeParams="none">
+              <s:param name="projectGroupId" value="${group.id}"/>
+            </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">
+            </s:a>
           </redback:ifAuthorized>
           <redback:elseAuthorized>
-            <img src="<ww:url value='/images/releaseproject_disabled.gif'/>" alt="<ww:text name="projectGroup.releaseNow"/>" title="<ww:text name="projectGroup.releaseNow"/>" border="0">
+            <img src="<s:url value='/images/releaseproject_disabled.gif'/>" alt="<s:text name="projectGroup.releaseNow"/>" title="<s:text name="projectGroup.releaseNow"/>" border="0">
           </redback:elseAuthorized>
         </ec:column>
         <ec:column property="removeProjectGroupAction" title="&nbsp;" width="1%">
           <redback:ifAuthorized permission="continuum-remove-group" resource="${group.name}">
-            <ww:url id="removeProjectGroupUrl" action="removeProjectGroup" namespace="/" includeParams="none">
-              <ww:param name="projectGroupId" value="${group.id}"/>
-            </ww:url>
-            <ww:a href="%{removeProjectGroupUrl}">
-              <img src="<ww:url value='/images/delete.gif'/>" alt="<ww:text name="projectGroup.deleteGroup"/>" title="<ww:text name="projectGroup.deleteGroup"/>" border="0">
-            </ww:a>
+            <s:url id="removeProjectGroupUrl" action="removeProjectGroup" namespace="/" includeParams="none">
+              <s:param name="projectGroupId" value="${group.id}"/>
+            </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">
+            </s:a>
           </redback:ifAuthorized>
           <redback:elseAuthorized>
-            <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="<ww:text name="projectGroup.deleteGroup"/>" title="<ww:text name="projectGroup.deleteGroup"/>" border="0">
+            <img src="<s:url value='/images/delete_disabled.gif'/>" alt="<s:text name="projectGroup.deleteGroup"/>" title="<s:text name="projectGroup.deleteGroup"/>" border="0">
           </redback:elseAuthorized>
         </ec:column>
         <ec:column property="numSuccesses" title="&nbsp;" format="0" width="2%" style="text-align: right" headerClass="calcHeaderSucces" calc="total" calcTitle="groups.table.summary"/>
@@ -115,14 +115,14 @@
         <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>
-    </ww:if>
+    </s:if>
     <redback:ifAuthorized permission="continuum-add-group">
       <div class="functnbar3">
         <table>
           <tr>
             <td>
-              <form action="<ww:url  action='addProjectGroup' method='input' namespace='/' />" method="post">
-                <input type="submit" name="addProjectGroup" value="<ww:text name="projectGroup.add.section.title"/>"/>
+              <form action="<s:url  action='addProjectGroup' method='input' namespace='/' />" method="post">
+                <input type="submit" name="addProjectGroup" value="<s:text name="projectGroup.add.section.title"/>"/>
               </form>
             </td>
           </tr>
@@ -131,5 +131,5 @@
     </redback:ifAuthorized>
   </div>
   </body>
-</ww:i18n>
+</s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp Wed Oct 22 22:05:36 2008
@@ -17,10 +17,10 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ page import="java.util.Calendar" %>
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
 <div id="footer">
-  <ww:property value="continuumFooter" escape="false"/>
+  <s:property value="continuumFooter" escape="false"/>
 </div>
-</ww:i18n>
+</s:i18n>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultTop.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultTop.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultTop.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultTop.jsp Wed Oct 22 22:05:36 2008
@@ -17,19 +17,19 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
   <div id="banner">
     <span id="bannerLeft">
       <a href="http://continuum.apache.org">
-        <img src="<ww:url value="/images/continuum_logo_75.gif" includeParams="none"/>" alt="Continuum" title="Continuum" border="0">
+        <img src="<s:url value="/images/continuum_logo_75.gif" includeParams="none"/>" alt="Continuum" title="Continuum" border="0">
       </a>
     </span>
     <span id="bannerRight">
-      <ww:action name="companyInfo" executeResult="true"/>
+      <s:action name="companyInfo" executeResult="true"/>
     </span>
 
     <div class="clear">
@@ -46,4 +46,4 @@
     </div>
     <%@ include file="/WEB-INF/jsp/redback/include/securityLinks.jsp" %>
   </div>
-</ww:i18n>
+</s:i18n>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp Wed Oct 22 22:05:36 2008
@@ -17,26 +17,26 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
 <%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
 
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
 <div id="navcolumn">
   <div id="projectmenu" class="toolgroup">
     <div class="label">Continuum</div>
     <div>
       <div class="body">
-        <ww:url id="aboutUrl" action="about" namespace="/" includeParams="none"/>
-        <ww:a href="%{aboutUrl}">
-          <ww:text name="menu.continuum.about"/>
-        </ww:a>
+        <s:url id="aboutUrl" action="about" namespace="/" includeParams="none"/>
+        <s:a href="%{aboutUrl}">
+          <s:text name="menu.continuum.about"/>
+        </s:a>
       </div>
       <div class="body">
-        <ww:url id="groupSummaryUrl" action="groupSummary" namespace="/" includeParams="none"/>
-        <ww:a href="%{groupSummaryUrl}">
-          <ww:text name="menu.continuum.showProjectGroups"/>
-        </ww:a>
+        <s:url id="groupSummaryUrl" action="groupSummary" namespace="/" includeParams="none"/>
+        <s:a href="%{groupSummaryUrl}">
+          <s:text name="menu.continuum.showProjectGroups"/>
+        </s:a>
       </div>
     </div>
   </div>
@@ -44,38 +44,38 @@
   <redback:ifAuthorized permission="continuum-add-group">
     <div id="projectmenu" class="toolgroup">
       <div class="label">
-        <ww:text name="menu.addProject"/>
+        <s:text name="menu.addProject"/>
       </div>
       <div>
         <div class="body">
-          <ww:url id="addMavenTwoProjectUrl" action="addMavenTwoProjectInput" method="input" namespace="/"
+          <s:url id="addMavenTwoProjectUrl" action="addMavenTwoProjectInput" method="input" namespace="/"
                   includeParams="none"/>
-          <ww:a href="%{addMavenTwoProjectUrl}">
-            <ww:text name="menu.add.m2Project"/>
-          </ww:a>
+          <s:a href="%{addMavenTwoProjectUrl}">
+            <s:text name="menu.add.m2Project"/>
+          </s:a>
         </div>
         <div class="body">
-          <ww:url id="addMavenOneProjectUrl" action="addMavenOneProjectInput" method="input" namespace="/"
+          <s:url id="addMavenOneProjectUrl" action="addMavenOneProjectInput" method="input" namespace="/"
                   includeParams="none"/>
-          <ww:a href="%{addMavenOneProjectUrl}">
-            <ww:text name="menu.add.m1Project"/>
-          </ww:a>
+          <s:a href="%{addMavenOneProjectUrl}">
+            <s:text name="menu.add.m1Project"/>
+          </s:a>
         </div>
         <div class="body">
-          <ww:url id="addAntProjectUrl" action="addProjectInput" namespace="/" includeParams="none">
-            <ww:param name="projectType">ant</ww:param>
-          </ww:url>
-          <ww:a href="%{addAntProjectUrl}">
-            <ww:text name="menu.add.antProject"/>
-          </ww:a>
+          <s:url id="addAntProjectUrl" action="addProjectInput" namespace="/" includeParams="none">
+            <s:param name="projectType">ant</s:param>
+          </s:url>
+          <s:a href="%{addAntProjectUrl}">
+            <s:text name="menu.add.antProject"/>
+          </s:a>
         </div>
         <div class="body">
-          <ww:url id="addShellProjectUrl" action="addProjectInput" namespace="/" includeParams="none">
-            <ww:param name="projectType">shell</ww:param>
-          </ww:url>
-          <ww:a href="%{addShellProjectUrl}">
-            <ww:text name="menu.add.shellProject"/>
-          </ww:a>
+          <s:url id="addShellProjectUrl" action="addProjectInput" namespace="/" includeParams="none">
+            <s:param name="projectType">shell</s:param>
+          </s:url>
+          <s:a href="%{addShellProjectUrl}">
+            <s:text name="menu.add.shellProject"/>
+          </s:a>
         </div>
       </div>
     </div>
@@ -85,91 +85,91 @@
   <redback:ifAnyAuthorized permissions="continuum-manage-build-templates,continuum-manage-schedules,continuum-manage-configuration,continuum-manage-users,continuum-manage-installations,continuum-manage-profiles,continuum-view-queues,continuum-manage-repositories,continuum-manage-purging">
     <div id="projectmenu" class="toolgroup">
       <div class="label">
-        <ww:text name="menu.administration"/>
+        <s:text name="menu.administration"/>
       </div>
       <div>
         <redback:ifAuthorized permission="continuum-manage-repositories">
-          <ww:url id="repositoryListUrl" action="repositoryList" namespace="/admin" includeParams="none"/>
+          <s:url id="repositoryListUrl" action="repositoryList" namespace="/admin" includeParams="none"/>
           <div class="body">
-            <ww:a href="%{repositoryListUrl}">
-              <ww:text name="menu.administration.repositories"/>
-            </ww:a>
+            <s:a href="%{repositoryListUrl}">
+              <s:text name="menu.administration.repositories"/>
+            </s:a>
           </div>
         </redback:ifAuthorized>
         <redback:ifAuthorized permission="continuum-manage-purging">
-          <ww:url id="purgeConfigListUrl" action="purgeConfigList" namespace="/admin" includeParams="none"/>
+          <s:url id="purgeConfigListUrl" action="purgeConfigList" namespace="/admin" includeParams="none"/>
           <div class="body">
-            <ww:a href="%{purgeConfigListUrl}">
-              <ww:text name="menu.administration.purge"/>
-            </ww:a>
+            <s:a href="%{purgeConfigListUrl}">
+              <s:text name="menu.administration.purge"/>
+            </s:a>
           </div>
         </redback:ifAuthorized>
         <redback:ifAuthorized permission="continuum-manage-schedules">
-          <ww:url id="scheduleUrl" namespace="/" action="schedules" includeParams="none"/>
+          <s:url id="scheduleUrl" namespace="/" action="schedules" includeParams="none"/>
           <div class="body">
-            <ww:a href="%{scheduleUrl}">
-              <ww:text name="menu.administration.schedules"/>
-            </ww:a>
+            <s:a href="%{scheduleUrl}">
+              <s:text name="menu.administration.schedules"/>
+            </s:a>
           </div>
         </redback:ifAuthorized>
         <redback:ifAuthorized permission="continuum-manage-installations">
-          <ww:url id="configurationUrl" action="installationsList" namespace="/admin" method="list" includeParams="none"/>
+          <s:url id="configurationUrl" action="installationsList" namespace="/admin" method="list" includeParams="none"/>
           <div class="body">
-            <ww:a href="%{configurationUrl}">
-              <ww:text name="menu.administration.installations"/>
-            </ww:a>
+            <s:a href="%{configurationUrl}">
+              <s:text name="menu.administration.installations"/>
+            </s:a>
           </div>
         </redback:ifAuthorized>
         <redback:ifAuthorized permission="continuum-manage-profiles">
-          <ww:url id="configurationUrl" action="buildEnvList" namespace="/admin" method="list" includeParams="none"/>
+          <s:url id="configurationUrl" action="buildEnvList" namespace="/admin" method="list" includeParams="none"/>
           <div class="body">
-            <ww:a href="%{configurationUrl}">
-              <ww:text name="menu.administration.profile"/>
-            </ww:a>
+            <s:a href="%{configurationUrl}">
+              <s:text name="menu.administration.profile"/>
+            </s:a>
           </div> 
         </redback:ifAuthorized> 
         <redback:ifAuthorized permission="continuum-view-queues">
-          <ww:url id="queueUrls" action="displayQueues" namespace="/admin" method="display" includeParams="none"/>
+          <s:url id="queueUrls" action="displayQueues" namespace="/admin" method="display" includeParams="none"/>
           <div class="body">
-            <ww:a href="%{queueUrls}">
-              <ww:text name="menu.administration.queues"/>
-            </ww:a>
+            <s:a href="%{queueUrls}">
+              <s:text name="menu.administration.queues"/>
+            </s:a>
           </div> 
         </redback:ifAuthorized> 
         <redback:ifAuthorized permission="continuum-manage-build-templates">
-          <ww:url id="buildDefinitionTemplatesUrl" action="buildDefinitionTemplates" namespace="/admin" includeParams="none"/>
+          <s:url id="buildDefinitionTemplatesUrl" action="buildDefinitionTemplates" namespace="/admin" includeParams="none"/>
           <div class="body">
-            <ww:a href="%{buildDefinitionTemplatesUrl}">
-              <ww:text name="menu.administration.buildDefinitionTemplates"/>
-            </ww:a>
+            <s:a href="%{buildDefinitionTemplatesUrl}">
+              <s:text name="menu.administration.buildDefinitionTemplates"/>
+            </s:a>
           </div> 
         </redback:ifAuthorized>        
         <redback:ifAuthorized permission="continuum-manage-configuration">               
-          <ww:url id="configurationUrl" action="configuration" namespace="/admin" method="input" includeParams="none"/>
+          <s:url id="configurationUrl" action="configuration" namespace="/admin" method="input" includeParams="none"/>
           <div class="body">
-            <ww:a href="%{configurationUrl}">
-              <ww:text name="menu.administration.configuration"/>
-            </ww:a>
+            <s:a href="%{configurationUrl}">
+              <s:text name="menu.administration.configuration"/>
+            </s:a>
           </div>
-          <ww:url id="configurationUrl" action="configureAppearance" namespace="/admin" includeParams="none"/>
+          <s:url id="configurationUrl" action="configureAppearance" namespace="/admin" includeParams="none"/>
           <div class="body">
-            <ww:a href="%{configurationUrl}">
-              <ww:text name="menu.administration.appearance"/>
-            </ww:a>
+            <s:a href="%{configurationUrl}">
+              <s:text name="menu.administration.appearance"/>
+            </s:a>
           </div>
         </redback:ifAuthorized>
         <redback:ifAuthorized permission="continuum-manage-users">
-          <ww:url id="userListUrl" action="userlist" namespace="/security" includeParams="none"/>
+          <s:url id="userListUrl" action="userlist" namespace="/security" includeParams="none"/>
           <div class="body">
-            <ww:a href="%{userListUrl}">
-              <ww:text name="menu.administration.users"/>
-            </ww:a>
+            <s:a href="%{userListUrl}">
+              <s:text name="menu.administration.users"/>
+            </s:a>
           </div>
-          <ww:url id="roleListUrl" action="roles" namespace="/security" includeParams="none"/>
+          <s:url id="roleListUrl" action="roles" namespace="/security" includeParams="none"/>
           <div class="body">
-            <ww:a href="%{roleListUrl}">
-              <ww:text name="menu.administration.roles"/>
-            </ww:a>
+            <s:a href="%{roleListUrl}">
+              <s:text name="menu.administration.roles"/>
+            </s:a>
           </div>
         </redback:ifAuthorized>
       </div>
@@ -179,20 +179,20 @@
   <div id="projectmenu" class="toolgroup">
     <div class="label">Legend</div>
     <div id="legend">
-      <div id="litem1" class="body"><ww:text name="legend.buildNow"/></div>
-      <div id="litem2" class="body"><ww:text name="legend.buildHistory"/></div>
-      <div id="litem3" class="body"><ww:text name="legend.buildInProgress"/></div>
-      <div id="litem4" class="body"><ww:text name="legend.workingCopy"/></div>
-      <div id="litem5" class="body"><ww:text name="legend.checkingOutBuild"/></div>
-      <div id="litem6" class="body"><ww:text name="legend.queuedBuild"/></div>
-      <div id="litem7" class="body"><ww:text name="legend.cancelBuild"/></div>
-      <div id="litem8" class="body"><ww:text name="legend.delete"/></div>
-      <div id="litem9" class="body"><ww:text name="legend.edit"/></div>
-      <div id="litem10" class="body"><ww:text name="legend.release"/></div>
-      <div id="litem11" class="body"><ww:text name="legend.buildInSuccess"/></div>
-      <div id="litem12" class="body"><ww:text name="legend.buildInFailure"/></div>
-      <div id="litem13" class="body"><ww:text name="legend.buildInError"/></div>
+      <div id="litem1" class="body"><s:text name="legend.buildNow"/></div>
+      <div id="litem2" class="body"><s:text name="legend.buildHistory"/></div>
+      <div id="litem3" class="body"><s:text name="legend.buildInProgress"/></div>
+      <div id="litem4" class="body"><s:text name="legend.workingCopy"/></div>
+      <div id="litem5" class="body"><s:text name="legend.checkingOutBuild"/></div>
+      <div id="litem6" class="body"><s:text name="legend.queuedBuild"/></div>
+      <div id="litem7" class="body"><s:text name="legend.cancelBuild"/></div>
+      <div id="litem8" class="body"><s:text name="legend.delete"/></div>
+      <div id="litem9" class="body"><s:text name="legend.edit"/></div>
+      <div id="litem10" class="body"><s:text name="legend.release"/></div>
+      <div id="litem11" class="body"><s:text name="legend.buildInSuccess"/></div>
+      <div id="litem12" class="body"><s:text name="legend.buildInFailure"/></div>
+      <div id="litem13" class="body"><s:text name="legend.buildInError"/></div>
     </div>
   </div>
 </div>
-</ww:i18n>
+</s:i18n>



Mime
View raw message