continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r707273 [3/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/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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -18,58 +18,58 @@
   --%>
 
 <%@ 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" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ 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="buildQueue.page.title"/></title>
+      <title><s:text name="buildQueue.page.title"/></title>
       <meta http-equiv="refresh" content="60"/>
     </head>
     <body>
-      <ww:form id="removeForm" action="none" method="post">
+      <s:form id="removeForm" action="none" method="post">
         <div id="h3">
           <h3>
-            <ww:text name="buildQueue.currentTask.section.title"/>
+            <s:text name="buildQueue.currentTask.section.title"/>
           </h3>  
           <table width="100%">
-            <ww:if test="currentBuildProjectTask != null">
+            <s:if test="currentBuildProjectTask != null">
             <tbody>
               <tr>
-                <th><ww:text name="buildQueue.currentTask.projectName"/></th>
-                <th><ww:text name="buildQueue.currentTask.buildDefinition"/></th>
+                <th><s:text name="buildQueue.currentTask.projectName"/></th>
+                <th><s:text name="buildQueue.currentTask.buildDefinition"/></th>
                 <th>&nbsp;</th>
               </tr>
               <tr>
-                <td width="50%"><ww:property value="currentBuildProjectTask.projectName"/></td>
-                <td width="49%"><ww:property value="currentBuildProjectTask.buildDefinitionLabel"/></td>
+                <td width="50%"><s:property value="currentBuildProjectTask.projectName"/></td>
+                <td width="49%"><s:property value="currentBuildProjectTask.buildDefinitionLabel"/></td>
                 <td width="1%">
                 <redback:ifAuthorized permission="continuum-manage-queues">
-                  <ww:url id="cancelUrl" action="cancelCurrentBuildTask" method="cancelCurrent" namespace="/">
-                    <ww:param name="projectId"><ww:property value="currentBuildProjectTask.projectId"/></ww:param>
-                  </ww:url>      
-                  <ww:a href="%{cancelUrl}"><img src="<ww:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<ww:text name='cancel'/>" title="<ww:text name='cancel'/>" border="0"></ww:a>              
+                  <s:url id="cancelUrl" action="cancelCurrentBuildTask" method="cancelCurrent" namespace="/">
+                    <s:param name="projectId"><s:property value="currentBuildProjectTask.projectId"/></s:param>
+                  </s:url>
+                  <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
                 </redback:ifAuthorized>
                 <redback:elseAuthorized>
-                  <img src="<ww:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>" alt="<ww:text name='cancel'/>" title="<ww:text name='cancel'/>" border="0">
+                  <img src="<s:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0">
                 </redback:elseAuthorized>
                 </td>
               </tr>
             </tbody>
-            </ww:if>
-            <ww:else>
-              <ww:text name="buildQueue.no.currentTaks" />
-            </ww:else>
+            </s:if>
+            <s:else>
+              <s:text name="buildQueue.no.currentTaks" />
+            </s:else>
           </table>
         </div>    
         <div id="h3">
           <h3>
-            <ww:text name="buildQueue.section.title"/>
+            <s:text name="buildQueue.section.title"/>
           </h3>  
-            <ww:if test="${not empty buildProjectTasks}">
+            <s:if test="${not empty buildProjectTasks}">
               <ec:table items="buildProjectTasks"
                         var="buildProjectTask"
                         showExports="false"
@@ -87,79 +87,79 @@
                   <ec:column property="buildDefinitionLabel" title="buildQueue.currentTask.buildDefinition" style="white-space: nowrap" width="49%"/>
                   <ec:column property="cancelEntry" title="&nbsp;" width="1%">
                     <redback:ifAuthorized permission="continuum-manage-queues">
-                    <ww:url id="cancelUrl" action="removeBuildQueueEntry" method="remove" namespace="/">
-                      <ww:param name="projectId">${pageScope.buildProjectTask.projectId}</ww:param>
-                      <ww:param name="buildDefinitionId">${pageScope.buildProjectTask.buildDefinitionId}</ww:param>
-                      <ww:param name="trigger">${pageScope.buildProjectTask.trigger}</ww:param>
-                      <ww:param name="projectName">${pageScope.buildProjectTask.projectName}</ww:param>
-                    </ww:url>      
-                    <ww:a href="%{cancelUrl}"><img src="<ww:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<ww:text name='cancel'/>" title="<ww:text name='cancel'/>" border="0"></ww:a>
+                    <s:url id="cancelUrl" action="removeBuildQueueEntry" method="remove" namespace="/">
+                      <s:param name="projectId">${pageScope.buildProjectTask.projectId}</s:param>
+                      <s:param name="buildDefinitionId">${pageScope.buildProjectTask.buildDefinitionId}</s:param>
+                      <s:param name="trigger">${pageScope.buildProjectTask.trigger}</s:param>
+                      <s:param name="projectName">${pageScope.buildProjectTask.projectName}</s:param>
+                    </s:url>
+                    <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
                     </redback:ifAuthorized>
                     <redback:elseAuthorized>
-                      <img src="<ww:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>" alt="<ww:text name='cancel'/>" title="<ww:text name='cancel'/>" border="0">
+                      <img src="<s:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0">
                     </redback:elseAuthorized>    
                   </ec:column>             
                 </ec:row>
               </ec:table>
-            </ww:if>
-            <ww:else>
-              <ww:text name="buildQueue.empty"/>
-            </ww:else>
+            </s:if>
+            <s:else>
+              <s:text name="buildQueue.empty"/>
+            </s:else>
         </div>
-        <ww:if test="${not empty buildProjectTasks}">
+        <s:if test="${not empty buildProjectTasks}">
           <div class="functnbar3">
             <table>
               <tbody>
                 <tr>
                   <td>
-                    <input type="submit" value="<ww:text name="buildQueue.removeEntries"/>" 
+                    <input type="submit" value="<s:text name="buildQueue.removeEntries"/>"
                            onclick="$('removeForm').action='removeBuildQueueEntries!removeBuildEntries.action';$('removeForm').submit();" /> 
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
-        </ww:if>      
+        </s:if>
         
         
         <!-- checkout queue -->
         <div id="h3">
           <h3>
-            <ww:text name="checkoutQueue.currentTask.section.title"/>
+            <s:text name="checkoutQueue.currentTask.section.title"/>
           </h3>  
           <table width="100%">
-            <ww:if test="currentCheckOutTask != null">
+            <s:if test="currentCheckOutTask != null">
             <tbody>
               <tr>
-                <th><ww:text name="checkoutQueue.currentTask.projectName"/></th>
+                <th><s:text name="checkoutQueue.currentTask.projectName"/></th>
                 <th>&nbsp;</th>
               </tr>
               <tr>
-                <td width="99%"><ww:property value="currentCheckOutTask.projectName"/></td>
+                <td width="99%"><s:property value="currentCheckOutTask.projectName"/></td>
                 <td width="1%">
                 <redback:ifAuthorized permission="continuum-manage-queues">
-                  <ww:url id="cancelUrl" action="cancelCurrentQueueTask" method="cancelCurrentCheckout" namespace="/">
-                    <ww:param name="projectId"><ww:property value="currentCheckOutTask.projectId"/></ww:param>
-                  </ww:url>      
-                  <ww:a href="%{cancelUrl}"><img src="<ww:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<ww:text name='cancel'/>" title="<ww:text name='cancel'/>" border="0"></ww:a>
+                  <s:url id="cancelUrl" action="cancelCurrentQueueTask" method="cancelCurrentCheckout" namespace="/">
+                    <s:param name="projectId"><s:property value="currentCheckOutTask.projectId"/></s:param>
+                  </s:url>
+                  <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
                 </redback:ifAuthorized>
                 <redback:elseAuthorized>
-                  <img src="<ww:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>" alt="<ww:text name='cancel'/>" title="<ww:text name='cancel'/>" border="0">
+                  <img src="<s:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0">
                 </redback:elseAuthorized>              
                 </td>
               </tr>
             </tbody>
-            </ww:if>
-            <ww:else>
-              <ww:text name="checkoutQueue.no.currentTaks" />
-            </ww:else>
+            </s:if>
+            <s:else>
+              <s:text name="checkoutQueue.no.currentTaks" />
+            </s:else>
           </table>
         </div>    
         <div id="h3">
           <h3>
-            <ww:text name="checkoutQueue.section.title"/>
+            <s:text name="checkoutQueue.section.title"/>
           </h3>  
-            <ww:if test="${not empty currentCheckOutTasks}">
+            <s:if test="${not empty currentCheckOutTasks}">
               <ec:table items="currentCheckOutTasks"
                         var="currentCheckOutTask"
                         showExports="false"
@@ -176,30 +176,30 @@
                   <ec:column property="projectName" title="Project Name" style="white-space: nowrap" width="98%"/>
                   <ec:column property="cancelEntry" title="&nbsp;" width="1%">
                   <redback:ifAuthorized permission="continuum-manage-queues">
-                    <ww:url id="cancelUrl" action="removeCheckoutQueueEntry" method="removeCheckout">
-                      <ww:param name="projectId">${pageScope.currentCheckOutTask.projectId}</ww:param>
-                    </ww:url>      
-                    <ww:a href="%{cancelUrl}"><img src="<ww:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<ww:text name='cancel'/>" title="<ww:text name='cancel'/>" border="0"></ww:a>
+                    <s:url id="cancelUrl" action="removeCheckoutQueueEntry" method="removeCheckout">
+                      <s:param name="projectId">${pageScope.currentCheckOutTask.projectId}</s:param>
+                    </s:url>
+                    <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
                   </redback:ifAuthorized>
                   <redback:elseAuthorized>
-                    <img src="<ww:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>" alt="<ww:text name='cancel'/>" title="<ww:text name='cancel'/>" border="0">
+                    <img src="<s:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0">
                   </redback:elseAuthorized>    
                   </ec:column>             
                 </ec:row>
               </ec:table>
-            </ww:if>
-            <ww:else>
-              <ww:text name="checkoutQueue.empty"/>
-            </ww:else>
+            </s:if>
+            <s:else>
+              <s:text name="checkoutQueue.empty"/>
+            </s:else>
         </div>
-        <ww:if test="${not empty currentCheckOutTasks}">
+        <s:if test="${not empty currentCheckOutTasks}">
           <div class="functnbar3">
             <table>
               <tbody>
                 <tr>
                   <td>
                     <redback:ifAuthorized permission="continuum-manage-queues">
-                    <input type="submit" value="<ww:text name="checkoutQueue.removeEntries"/>" 
+                    <input type="submit" value="<s:text name="checkoutQueue.removeEntries"/>"
                            onclick="$('removeForm').action='removeCheckoutQueueEntries!removeCheckoutEntries.action';$('removeForm').submit();" />
                     </redback:ifAuthorized>
                   </td>
@@ -207,8 +207,8 @@
               </tbody>
             </table>
           </div>
-        </ww:if>            
-      </ww:form>
+        </s:if>
+      </s:form>
     </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/admin/configuration.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.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="continuum" prefix="c1" %>
 <html>
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
   <head>
     <title>
-      <ww:text name="configuration.page.title"/>
+      <s:text name="configuration.page.title"/>
     </title>
   </head>
   <body>
   <div id="axial" class="h3">
     <h3>
-      <ww:text name="configuration.section.title"/>
+      <s:text name="configuration.section.title"/>
     </h3>
 
     <div class="axial">
@@ -42,12 +42,12 @@
         <c1:data label="%{getText('configuration.baseUrl.label')}" name="baseUrl"/>
       </table>
       <div class="functnbar3">
-        <ww:form action="configuration!input.action" method="post">
-          <ww:submit value="%{getText('edit')}"/>
-        </ww:form>
+        <s:form action="configuration!input.action" method="post">
+          <s:submit value="%{getText('edit')}"/>
+        </s:form>
       </div>
     </div>
   </div>
   </body>
-</ww:i18n>
+</s:i18n>
 </html>

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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -17,29 +17,29 @@
   ~ 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="configuration.page.title"/>
+      <s:text name="configuration.page.title"/>
     </title>
   </head>
 
   <body>
   <div id="axial" class="h3">
     <h3>
-      <ww:text name="configuration.section.title"/>
+      <s:text name="configuration.section.title"/>
     </h3>
 
-    <ww:form action="configuration!save" method="post">
+    <s:form action="configuration!save" method="post">
 
       <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>
@@ -49,41 +49,41 @@
         <table>
           <tbody>
 
-            <ww:textfield label="%{getText('configuration.workingDirectory.label')}" name="workingDirectory"
+            <s:textfield label="%{getText('configuration.workingDirectory.label')}" name="workingDirectory"
                           required="true">
-              <ww:param name="desc"><p>
-                <ww:text name="configuration.workingDirectory.message"/>
-              </p></ww:param>
-            </ww:textfield>
+              <s:param name="desc"><p>
+                <s:text name="configuration.workingDirectory.message"/>
+              </p></s:param>
+            </s:textfield>
 
-            <ww:textfield label="%{getText('configuration.buildOutputDirectory.label')}" name="buildOutputDirectory"
+            <s:textfield label="%{getText('configuration.buildOutputDirectory.label')}" name="buildOutputDirectory"
                           required="true">
-              <ww:param name="desc"><p>
-                <ww:text name="configuration.buildOutputDirectory.message"/>
-              </p></ww:param>
-            </ww:textfield>
+              <s:param name="desc"><p>
+                <s:text name="configuration.buildOutputDirectory.message"/>
+              </p></s:param>
+            </s:textfield>
 
-            <ww:textfield label="%{getText('configuration.releaseOutputDirectory.label')}" name="releaseOutputDirectory"
+            <s:textfield label="%{getText('configuration.releaseOutputDirectory.label')}" name="releaseOutputDirectory"
             			  required="${requireReleaseOutput}">
-              <ww:param name="desc"><p>
-                <ww:text name="configuration.releaseOutputDirectory.message"/>
-              </ww:param>
-            </ww:textfield>
+              <s:param name="desc"><p>
+                <s:text name="configuration.releaseOutputDirectory.message"/>
+              </s:param>
+            </s:textfield>
 
-            <ww:textfield label="%{getText('configuration.deploymentRepositoryDirectory.label')}"
+            <s:textfield label="%{getText('configuration.deploymentRepositoryDirectory.label')}"
                           name="deploymentRepositoryDirectory">
-              <ww:param name="desc"><p>
-                <ww:text name="configuration.deploymentRepositoryDirectory.message"/>
-              </p></ww:param>
-            </ww:textfield>
-
-            <ww:textfield label="%{getText('configuration.baseUrl.label')}" name="baseUrl" required="true">
-              <ww:param name="desc"><p>
-                <ww:text name="configuration.baseUrl.message"/>
-              </p></ww:param>
-            </ww:textfield>
+              <s:param name="desc"><p>
+                <s:text name="configuration.deploymentRepositoryDirectory.message"/>
+              </p></s:param>
+            </s:textfield>
+
+            <s:textfield label="%{getText('configuration.baseUrl.label')}" name="baseUrl" required="true">
+              <s:param name="desc"><p>
+                <s:text name="configuration.baseUrl.message"/>
+              </p></s:param>
+            </s:textfield>
 
-            <ww:hidden name="requireReleaseOutput"/>
+            <s:hidden name="requireReleaseOutput"/>
           </tbody>
         </table>
         <div class="functnbar3">
@@ -91,8 +91,8 @@
         </div>
 
       </div>
-    </ww:form>
+    </s:form>
   </div>
   </body>
-</ww:i18n>
+</s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.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="continuum" prefix="c1" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="deleteBuildEnv.page.title"/></title>
+        <title><s:text name="deleteBuildEnv.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="deleteBuildEnv.section.title"/></h3>
+        <h3><s:text name="deleteBuildEnv.section.title"/></h3>
 
         <div class="warningmessage">
           <p>
             <strong>
-                <ww:text name="deleteBuildEnv.confirmation.message">
-                    <ww:param><ww:property value="profile.name"/></ww:param>
-                </ww:text>
+                <s:text name="deleteBuildEnv.confirmation.message">
+                    <s:param><s:property value="profile.name"/></s:param>
+                </s:text>
             </strong>
           </p>
         </div>
         <div class="functnbar3">
-          <ww:form action="deleteBuildEnv!delete.action" method="post">
+          <s:form action="deleteBuildEnv!delete.action" method="post">
             <input type="hidden" name="profile.id" value="${profile.id}" />
             <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/admin/confirmDeleteLocalRepository.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp Wed Oct 22 22:05:36 2008
@@ -17,29 +17,29 @@
   ~ 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="deleteRepository.page.title"/></title>
+        <title><s:text name="deleteRepository.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="deleteRepository.section.title"/></h3>
+        <h3><s:text name="deleteRepository.section.title"/></h3>
         <div class="axial">
-        <ww:form action="removeRepository" method="post">
-          <ww:hidden name="repository.id"/>
-          <ww:hidden name="confirmed" value="true"/>
-          <ww:actionerror/>
+        <s:form action="removeRepository" method="post">
+          <s:hidden name="repository.id"/>
+          <s:hidden name="confirmed" value="true"/>
+          <s:actionerror/>
 
           <div class="warningmessage">
             <p>
               <strong>
-                <ww:text name="deleteRepository.confirmation.message">
-                  <ww:param><ww:property value="%{repository.name}"/></ww:param>
-                </ww:text>
+                <s:text name="deleteRepository.confirmation.message">
+                  <s:param><s:property value="%{repository.name}"/></s:param>
+                </s:text>
               </strong>
             </p>
           </div>
@@ -47,9 +47,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/admin/editAppearance.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp Wed Oct 22 22:05:36 2008
@@ -17,11 +17,11 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
 <head>
   <title>Configure Appearance</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
@@ -34,12 +34,12 @@
     from it.
   </p>
 
-  <ww:actionmessage/>
-  <ww:form method="post" action="saveAppearance" namespace="/admin" validate="true" theme="xhtml">
-    <ww:textfield name="companyPom.groupId" label="Group ID"/>
-    <ww:textfield name="companyPom.artifactId" label="Artifact ID"/>
-    <ww:submit value="Save"/>
-  </ww:form>
+  <s:actionmessage/>
+  <s:form method="post" action="saveAppearance" namespace="/admin" validate="true" theme="xhtml">
+    <s:textfield name="companyPom.groupId" label="Group ID"/>
+    <s:textfield name="companyPom.artifactId" label="Artifact ID"/>
+    <s:submit value="Save"/>
+  </s:form>
 </body>
 
 </html>
\ No newline at end of file

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=707273&r1=707272&r2=707273&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 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="continuum" prefix="c1" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="buildDefinition.template.page.title"/></title>
+        <title><s:text name="buildDefinition.template.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="buildDefinition.template.section.title"/></h3>
+        <h3><s:text name="buildDefinition.template.section.title"/></h3>
 
         <div class="axial">
-          <ww:form action="saveBuildDefinitionAsTemplate" method="post" validate="true">
+          <s:form action="saveBuildDefinitionAsTemplate" method="post" validate="true">
             <c:choose>
             
               <c:when 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>
                 <input type="button" value="Back" onClick="history.go(-1)">
@@ -45,55 +45,55 @@
               <c:when test="${empty actionErrors}">
                 <table>
                   <tbody>
-                    <ww:if test="buildDefinition.type == 'ant'">
-                      <ww:textfield label="%{getText('buildDefinition.buildFile.ant.label')}" name="buildDefinition.buildFile"  required="true"/>
-                    </ww:if>
-                    <ww:elseif test="buildDefinition.type == 'shell'">
-                      <ww:textfield label="%{getText('buildDefinition.buildFile.shell.label')}" name="buildDefinition.buildFile" required="true"/>
-                    </ww:elseif>
-                    <ww:else>
-                      <ww:textfield label="%{getText('buildDefinition.buildFile.maven.label')}" name="buildDefinition.buildFile" required="true"/>
-                    </ww:else>
+                    <s:if test="buildDefinition.type == 'ant'">
+                      <s:textfield label="%{getText('buildDefinition.buildFile.ant.label')}" name="buildDefinition.buildFile"  required="true"/>
+                    </s:if>
+                    <s:elseif test="buildDefinition.type == 'shell'">
+                      <s:textfield label="%{getText('buildDefinition.buildFile.shell.label')}" name="buildDefinition.buildFile" required="true"/>
+                    </s:elseif>
+                    <s:else>
+                      <s:textfield label="%{getText('buildDefinition.buildFile.maven.label')}" name="buildDefinition.buildFile" required="true"/>
+                    </s:else>
     
-                    <ww:if test="buildDefinition.type == 'ant'">
-                      <ww:textfield label="%{getText('buildDefinition.goals.ant.label')}" name="buildDefinition.goals"/>
-                    </ww:if>
-                    <ww:elseif test="buildDefinition.type == 'shell'">
-                    </ww:elseif>
-                    <ww:else>
-                      <ww:textfield label="%{getText('buildDefinition.goals.maven.label')}" name="buildDefinition.goals"/>
-                    </ww:else>
+                    <s:if test="buildDefinition.type == 'ant'">
+                      <s:textfield label="%{getText('buildDefinition.goals.ant.label')}" name="buildDefinition.goals"/>
+                    </s:if>
+                    <s:elseif test="buildDefinition.type == 'shell'">
+                    </s:elseif>
+                    <s:else>
+                      <s:textfield label="%{getText('buildDefinition.goals.maven.label')}" name="buildDefinition.goals"/>
+                    </s:else>
     
-                    <ww:textfield label="%{getText('buildDefinition.arguments.label')}" name="buildDefinition.arguments"/>
-                    <ww:checkbox label="%{getText('buildDefinition.buildFresh.label')}" name="buildDefinition.buildFresh"/>
-                    <ww:checkbox label="%{getText('buildDefinition.alwaysBuild.label')}" name="buildDefinition.alwaysBuild" />
-                    <ww:checkbox label="%{getText('buildDefinition.defaultForProject.label')}" name="buildDefinition.defaultForProject" />
-                    <ww:select label="%{getText('buildDefinition.schedule.label')}" name="buildDefinition.schedule.id" list="schedules" listValue="name"
+                    <s:textfield label="%{getText('buildDefinition.arguments.label')}" name="buildDefinition.arguments"/>
+                    <s:checkbox label="%{getText('buildDefinition.buildFresh.label')}" name="buildDefinition.buildFresh"/>
+                    <s:checkbox label="%{getText('buildDefinition.alwaysBuild.label')}" name="buildDefinition.alwaysBuild" />
+                    <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"/>
-                    <ww:if test="buildDefinition.profile == null">
-                      <ww:select label="%{getText('buildDefinition.profile.label')}" name="buildDefinition.profile.id" list="profiles" listValue="name" 
+                    <s: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=""/>
-                    </ww:if>
-                    <ww:else>
-                      <ww:select label="%{getText('buildDefinition.profile.label')}" name="buildDefinition.profile.id" list="profiles" listValue="name" 
+                    </s:if>
+                    <s:else>
+                      <s:select label="%{getText('buildDefinition.profile.label')}" name="buildDefinition.profile.id" list="profiles" listValue="name"
                                  listKey="id" headerKey="-1" headerValue=""/>
-                    </ww:else>
-                    <ww:select label="%{getText('buildDefinition.type.label')}" name="buildDefinition.type" list="buildDefinitionTypes"/>
-                    <ww:textfield label="%{getText('buildDefinition.description.label')}" name="buildDefinition.description" required="true"/>
+                    </s:else>
+                    <s:select label="%{getText('buildDefinition.type.label')}" name="buildDefinition.type" list="buildDefinitionTypes"/>
+                    <s:textfield label="%{getText('buildDefinition.description.label')}" name="buildDefinition.description" required="true"/>
                   </tbody>
                 </table>
                 <div class="functnbar3">
                   <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
                 </div>
 
-                <ww:hidden name="buildDefinition.id"/>
-                <ww:hidden name="buildDefinition.template" value="true"/>
+                <s:hidden name="buildDefinition.id"/>
+                <s:hidden name="buildDefinition.template" value="true"/>
               </c:when>
             
             </c:choose>
-          </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/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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -17,27 +17,27 @@
   ~ 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="continuum" prefix="c1" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="buildDefinition.template.page.title"/></title>
+        <title><s:text name="buildDefinition.template.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="buildDefinition.template.section.title"/></h3>
+        <h3><s:text name="buildDefinition.template.section.title"/></h3>
 
         <div class="axial">
-          <ww:form action="saveBuildDefinitionTemplate" method="post" validate="true" name="buildDefinitionTemplate"
+          <s:form action="saveBuildDefinitionTemplate" method="post" validate="true" name="buildDefinitionTemplate"
                    onsubmit="customOnsubmit_saveBuildDefinitionTemplate();">
             <c:choose>
             
               <c:when 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>
                 <input type="button" value="Back" onClick="history.go(-1)">
@@ -46,8 +46,8 @@
               <c:when test="${empty actionErrors}">
                 <table>
                   <tbody>
-                    <ww:textfield label="%{getText('buildDefinitionTemplate.name')}" name="buildDefinitionTemplate.name" required="true"/>
-                    <ww:optiontransferselect 
+                    <s:textfield label="%{getText('buildDefinitionTemplate.name')}" name="buildDefinitionTemplate.name" required="true"/>
+                    <s:optiontransferselect
                         label="%{getText('buildDefinitionTemplate.builddefinitions.define')}"    
                         name="buildDefinitionIds"
                         list="buildDefinitions" 
@@ -71,14 +71,14 @@
                 <div class="functnbar3">
                   <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
                 </div>
-                <ww:hidden name="buildDefinitionTemplate.id"/>
-                <ww:hidden name="buildDefinitionTemplate.continuumDefault"/>
+                <s:hidden name="buildDefinitionTemplate.id"/>
+                <s:hidden name="buildDefinitionTemplate.continuumDefault"/>
               </c:when>
             
             </c:choose>
-          </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/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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -17,57 +17,57 @@
   ~ 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="installation.page.title"/>
+      <s:text name="installation.page.title"/>
     </title>
   </head>
 
   <body>
   <div id="axial" class="h3">
     <h3>
-      <ww:text name="installation.section.title"/>
+      <s:text name="installation.section.title"/>
     </h3>
 
-    <ww:form action="saveInstallation!save" method="post">
+    <s:form action="saveInstallation!save" method="post">
 
-      <ww:if test="hasActionErrors()">
+      <s:if test="hasActionErrors()">
         <h3>Action Error</h3>
-      </ww:if>
+      </s:if>
       <p>
-        <ww:actionerror/>
+        <s:actionerror/>
       </p>
 
       <div class="axial">
 
         <table>
           <tbody>
-            <ww:hidden name="installation.installationId" />
-            <ww:hidden name="installationType" />
-            <ww:textfield label="%{getText('installation.name.label')}" name="installation.name"
+            <s:hidden name="installation.installationId" />
+            <s:hidden name="installationType" />
+            <s:textfield label="%{getText('installation.name.label')}" name="installation.name"
                             required="true"/>
-            <ww:if test="displayTypes">
-              <ww:select label="%{getText('installation.type.label')}" name="installation.type" list="typesLabels" />
-            </ww:if>
-            <ww:if test="varNameUpdatable">
-              <ww:if test="varNameDisplayable">
-                <ww:textfield label="%{getText('installation.varName.label')}" name="installation.varName" required="${varNameUpdatable}" />
-              </ww:if>
-            </ww:if>
-            <ww:else>
-              <ww:if test="varNameDisplayable">
-                <ww:textfield label="%{getText('installation.varName.label')}" name="installation.varName" required="true" readonly="true"/>
-              </ww:if>
-            </ww:else>
-            <ww:textfield label="%{getText('installation.value.label')}" name="installation.varValue"
+            <s:if test="displayTypes">
+              <s:select label="%{getText('installation.type.label')}" name="installation.type" list="typesLabels" />
+            </s:if>
+            <s:if test="varNameUpdatable">
+              <s:if test="varNameDisplayable">
+                <s:textfield label="%{getText('installation.varName.label')}" name="installation.varName" required="${varNameUpdatable}" />
+              </s:if>
+            </s:if>
+            <s:else>
+              <s:if test="varNameDisplayable">
+                <s:textfield label="%{getText('installation.varName.label')}" name="installation.varName" required="true" readonly="true"/>
+              </s:if>
+            </s:else>
+            <s:textfield label="%{getText('installation.value.label')}" name="installation.varValue"
                           required="true"/>
-            <ww:if test="(automaticProfileDisplayable && installation == null) ||  (installation.installationId == 0)">
-              <ww:checkbox label="%{getText('installation.automaticProfile.label')}" name="automaticProfile" />
-            </ww:if>
+            <s:if test="(automaticProfileDisplayable && installation == null) ||  (installation.installationId == 0)">
+              <s:checkbox label="%{getText('installation.automaticProfile.label')}" name="automaticProfile" />
+            </s:if>
           </tbody>
         </table>
         <div class="functnbar3">
@@ -75,8 +75,8 @@
         </div>
 
       </div>
-    </ww:form>
+    </s:form>
   </div>
   </body>
-</ww:i18n>
+</s:i18n>
 </html>

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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -18,48 +18,48 @@
   --%>
 
 <%@ 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="repository.page.title"/></title>
+<title><s:text name="repository.page.title"/></title>
 </head>
 <body>
 <div class="app">
   <div id="axial" class="h3">
-    <h3><ww:text name="repository.page.title"/></h3>
+    <h3><s:text name="repository.page.title"/></h3>
 
     <div class="axial">
-      <ww:form action="saveRepository" method="post" validate="true">
+      <s:form action="saveRepository" 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('repository.name.label')}" name="repository.name" required="true" disabled="%{defaultRepo}"/>
-            <ww:textfield label="%{getText('repository.location.label')}" name="repository.location" required="true" disabled="%{defaultRepo}"/>
-            <ww:select label="%{getText('repository.layout.label')}" name="repository.layout" list="layouts" disabled="%{defaultRepo}"/>
+            <s:textfield label="%{getText('repository.name.label')}" name="repository.name" required="true" disabled="%{defaultRepo}"/>
+            <s:textfield label="%{getText('repository.location.label')}" name="repository.location" required="true" disabled="%{defaultRepo}"/>
+            <s:select label="%{getText('repository.layout.label')}" name="repository.layout" list="layouts" disabled="%{defaultRepo}"/>
           </table>
-          <ww:hidden name="repository.id"/>
+          <s:hidden name="repository.id"/>
           <c:if test="${defaultRepo}">
-            <ww:hidden name="repository.name"/>
-            <ww:hidden name="repository.location"/>
-            <ww:hidden name="repository.layout"/>
+            <s:hidden name="repository.name"/>
+            <s:hidden name="repository.location"/>
+            <s:hidden name="repository.layout"/>
           </c:if>
           <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/admin/editPom.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp Wed Oct 22 22:05:36 2008
@@ -17,24 +17,24 @@
   ~ under the License.
   --%>
 
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <html>
 <head>
   <title>Edit Company POM</title>
-  <ww:head/>
+  <s:head/>
 </head>
 
 <body>
 <h1>Company POM</h1>
 
-<ww:actionmessage/>
-<ww:form method="post" action="saveCompanyPom" namespace="/admin" validate="true" theme="xhtml">
-  <ww:label name="companyModel.groupId" label="Group ID"/>
-  <ww:label name="companyModel.artifactId" label="Artifact ID"/>
+<s:actionmessage/>
+<s:form method="post" action="saveCompanyPom" namespace="/admin" validate="true" theme="xhtml">
+  <s:label name="companyModel.groupId" label="Group ID"/>
+  <s:label name="companyModel.artifactId" label="Artifact ID"/>
   <tr>
     <td>Version</td>
     <td>
-      <ww:property value="companyModel.version"/>
+      <s:property value="companyModel.version"/>
       <i>(The version will automatically be incremented when you save this form)</i>
     </td>
   </tr>
@@ -42,12 +42,12 @@
     <td></td>
     <td><h2>Organization</h2></td>
   </tr>
-  <ww:textfield name="companyModel.organization.name" size="40" label="Name"/>
-  <ww:textfield name="companyModel.organization.url" size="70" label="URL"/>
+  <s:textfield name="companyModel.organization.name" size="40" label="Name"/>
+  <s:textfield name="companyModel.organization.url" size="70" label="URL"/>
   <%-- TODO: how to get it to be a string, not a String[]? --%>
-  <ww:textfield name="companyModel.properties['organization.logo']" size="70" label="Logo URL"/>
-  <ww:submit value="Save"/>
-</ww:form>
+  <s:textfield name="companyModel.properties['organization.logo']" size="70" label="Logo URL"/>
+  <s:submit value="Save"/>
+</s:form>
 
 </body>
 

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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -17,43 +17,43 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ 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="profile.page.title"/>
+      <s:text name="profile.page.title"/>
     </title>
   </head>
 
   <body>
     <div id="axial" class="h3">
       <h3>
-        <ww:text name="profile.section.title"/>
+        <s:text name="profile.section.title"/>
       </h3>
 
       <div class="axial">
-        <ww:if test="hasActionErrors()">
+        <s:if test="hasActionErrors()">
           <h3>Action Error</h3>
-        </ww:if>
+        </s:if>
         <p>
-          <ww:actionerror/>
+          <s:actionerror/>
         </p>      
       </div>
       <table>
         <tr>
           <td>
-          <ww:form action="saveBuildEnv!save" method="post">
+          <s:form action="saveBuildEnv!save" method="post">
 
             <div class="axial">
               <!--  if other fields are added ProfileAction#save must be changed  -->
               <table>
                 <tbody>
-                  <ww:hidden name="profile.id" />
-                  <ww:textfield label="%{getText('profile.name.label')}" name="profile.name"
+                  <s:hidden name="profile.id" />
+                  <s:textfield label="%{getText('profile.name.label')}" name="profile.name"
                                 required="true" />
                 </tbody>
               </table>
@@ -62,10 +62,10 @@
               </div>
 
             </div>
-          </ww:form>
+          </s:form>
           </td>
         </tr>
-        <ww:if test="profile.id != 0">
+        <s:if test="profile.id != 0">
           <tr>
             <td>
               <div class="axial">
@@ -92,7 +92,7 @@
                             <ec:column property="type" title="Type" style="white-space: nowrap" width="49%"/>
                             <ec:column property="id" title="&nbsp;" width="1%">
                               <a href="removeBuildEnvInstallation!removeInstallation.action?profile.id=<c:out value="${profile.id}"/>&installationId=<c:out value="${profileInstallation.installationId}"/>">
-                                <img src="<ww:url value='/images/delete.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0" />
+                                <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
                               </a>                    
                             </ec:column>        
                           </ec:row>
@@ -101,34 +101,34 @@
                     </tr>
                   </tbody>
                 </table>
-                <ww:if test="${!empty allInstallations}">
-                  <ww:form action="addInstallationBuildEnv!addInstallation.action" method="get">
-                    <ww:hidden name="profile.id" />
+                <s:if test="${!empty allInstallations}">
+                  <s:form action="addInstallationBuildEnv!addInstallation.action" method="get">
+                    <s:hidden name="profile.id" />
                     <div class="functnbar3">
                       <!-- can't use default profile to display this select -->
-                      <ww:select theme="profile" name="installationId" list="allInstallations" listKey="installationId" listValue="name" />
-                      <ww:submit value="%{getText('add')}"/>
+                      <s:select theme="profile" name="installationId" list="allInstallations" listKey="installationId" listValue="name" />
+                      <s:submit value="%{getText('add')}"/>
                     </div>
-                  </ww:form>
-                </ww:if>
-                <ww:else>
-                  <div class="warningmessage" style="color: red"><ww:text name="profile.no.installations" /></div>
-                </ww:else>
+                  </s:form>
+                </s:if>
+                <s:else>
+                  <div class="warningmessage" style="color: red"><s:text name="profile.no.installations" /></div>
+                </s:else>
               </div>              
             </td>
           </tr>
-        </ww:if>
-        <ww:else>
+        </s:if>
+        <s:else>
           <tr>
             <td>
-              <ww:if test="${empty allInstallations}">
-                <div class="warningmessage" style="color: red"><ww:text name="profile.no.installations" /></div>
-              </ww:if>
+              <s:if test="${empty allInstallations}">
+                <div class="warningmessage" style="color: red"><s:text name="profile.no.installations" /></div>
+              </s:if>
             </td>
           </tr> 
-        </ww:else>
+        </s:else>
       </table>
     </div>
   </body>
-</ww:i18n>
+</s:i18n>
 </html>

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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -18,24 +18,24 @@
   --%>
 
 <%@ 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="purgeConfig.page.title"/></title>
+    <title><s:text name="purgeConfig.page.title"/></title>
   </head>
   <body>
   <div class="app">
     <div id="axial" class="h3">
-      <h3><ww:text name="purgeConfig.section.title"/></h3>
+      <h3><s:text name="purgeConfig.section.title"/></h3>
 
     <div class="axial">
-      <ww:form action="savePurgeConfig" method="post" validate="true">
+      <s:form action="savePurgeConfig" 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>
@@ -44,46 +44,46 @@
           <table>
             <c:choose>
               <c:when test="${purgeType == 'repository'}">
-                <ww:select label="%{getText('purgeConfig.repository.label')}" name="repositoryId" list="repositories" required="true"/>
+                <s:select label="%{getText('purgeConfig.repository.label')}" name="repositoryId" list="repositories" required="true"/>
               </c:when>
               <c:otherwise>
-                <ww:select label="%{getText('purgeConfig.directoryType.label')}" name="directoryType" list="directoryTypes"/>
+                <s:select label="%{getText('purgeConfig.directoryType.label')}" name="directoryType" list="directoryTypes"/>
               </c:otherwise>
             </c:choose>
-            <ww:textfield label="%{getText('purgeConfig.daysOlder.label')}" name="daysOlder"/>
-            <ww:textfield label="%{getText('purgeConfig.retentionCount.label')}" name="retentionCount"/>
-            <ww:checkbox label="%{getText('purgeConfig.deleteAll.label')}" name="deleteAll"/>
+            <s:textfield label="%{getText('purgeConfig.daysOlder.label')}" name="daysOlder"/>
+            <s:textfield label="%{getText('purgeConfig.retentionCount.label')}" name="retentionCount"/>
+            <s:checkbox label="%{getText('purgeConfig.deleteAll.label')}" name="deleteAll"/>
             <c:if test="${purgeType == 'repository'}">
-              <ww:checkbox label="%{getText('purgeConfig.deleteReleasedSnapshots.label')}" name="deleteReleasedSnapshots"/>
+              <s:checkbox label="%{getText('purgeConfig.deleteReleasedSnapshots.label')}" name="deleteReleasedSnapshots"/>
             </c:if>
             <c:choose>
               <c:when test="${defaultPurgeConfiguration == true}">
-                <ww:hidden name="defaultPurgeConfiguration"/>
-                <ww:label label="%{getText('purgeConfig.defaultPurge.label')}" value="true"/>
+                <s:hidden name="defaultPurgeConfiguration"/>
+                <s:label label="%{getText('purgeConfig.defaultPurge.label')}" value="true"/>
               </c:when>
               <c:otherwise>
-                <ww:checkbox label="%{getText('purgeConfig.defaultPurge.label')}" name="defaultPurgeConfiguration" value="defaultPurgeConfiguration" fieldValue="true"/>
+                <s:checkbox label="%{getText('purgeConfig.defaultPurge.label')}" name="defaultPurgeConfiguration" value="defaultPurgeConfiguration" fieldValue="true"/>
               </c:otherwise>
             </c:choose>
-            <ww:select label="%{getText('purgeConfig.schedule.label')}" name="scheduleId" list="schedules"
+            <s:select label="%{getText('purgeConfig.schedule.label')}" name="scheduleId" list="schedules"
                        headerKey="-1" headerValue=""/>
-            <ww:textfield label="%{getText('purgeConfig.description.label')}" name="description"/>
+            <s:textfield label="%{getText('purgeConfig.description.label')}" name="description"/>
           </table>
-          <ww:hidden name="purgeConfigId"/>
-          <ww:hidden name="purgeType"/>
+          <s:hidden name="purgeConfigId"/>
+          <s:hidden name="purgeType"/>
           <div class="functnbar3">
             <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
           </div>
         </c:when>
         <c:otherwise>
-          <div class="warningmessage" style="color: red"><ww:text name="purgeConfig.no.repositories" /></div>
+          <div class="warningmessage" style="color: red"><s:text name="purgeConfig.no.repositories" /></div>
         </c:otherwise>
       </c:choose>
-      </ww:form>
+      </s:form>
     </div>
   </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/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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -18,22 +18,22 @@
   --%>
 
 <%@ 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" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 
 <html>
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
   <head>
-    <title><ww:text name="installationsList.page.title"/></title>
+    <title><s:text name="installationsList.page.title"/></title>
   </head>
   
   <div id="h3">
     <h3>
-      <ww:text name="installationsList.section.title"/>
+      <s:text name="installationsList.section.title"/>
     </h3>  
 
-    <ww:if test="${not empty installations}">
+    <s:if test="${not empty installations}">
     <ec:table items="installations"
               var="installation"
               showExports="false"
@@ -49,23 +49,23 @@
         
         <ec:column property="id" title="&nbsp;" width="1%">
           <a href="editInstallation!edit.action?installation.installationId=<c:out value="${installation.installationId}"/>">
-            <img src="<ww:url value='/images/edit.gif' includeParams="none"/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0" />
+            <img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0" />
           </a>  
         </ec:column>   
         <ec:column property="id" title="&nbsp;" width="1%">
           <a href="deleteInstallation!delete.action?installation.installationId=<c:out value="${installation.installationId}"/>">
-            <img src="<ww:url value='/images/delete.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0" />
+            <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
           </a>  
         </ec:column>             
       </ec:row>
     </ec:table>
-    </ww:if>
+    </s:if>
     <div class="functnbar3">
-      <ww:form action="installationsTypeChoice!listTypes.action" method="post">
-        <ww:submit value="%{getText('add')}"/>
-      </ww:form>
+      <s:form action="installationsTypeChoice!listTypes.action" method="post">
+        <s:submit value="%{getText('add')}"/>
+      </s:form>
     </div>  
   
   </div>
   
-</ww:i18n>
+</s:i18n>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.jsp Wed Oct 22 22:05:36 2008
@@ -18,26 +18,26 @@
   --%>
 
 <%@ 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" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 
 <html>
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
   <head>
-    <title><ww:text name="installationTypeChoice.page.title"/></title>
+    <title><s:text name="installationTypeChoice.page.title"/></title>
   </head>
   
   <div id="h3">
     <h3>
-      <ww:text name="installationTypeChoice.section.title"/>
+      <s:text name="installationTypeChoice.section.title"/>
     </h3>  
     <form action="editInstallation!input.action">
       <div class="axial">
 
         <table>
           <tbody>    
-            <ww:select name="installationType" list="installationTypes" 
+            <s:select name="installationType" list="installationTypes"
                        label="%{getText('installationTypeChoice.action.label')}" />
           </tbody>
         </table>
@@ -48,4 +48,4 @@
   
   </div>
   
-</ww:i18n>
+</s:i18n>

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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -17,25 +17,25 @@
   ~ 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'%>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="repositories.page.title"/></title>
+        <title><s:text name="repositories.page.title"/></title>
     </head>
     <body>
       <div id="h3">
-        <h3><ww:text name="repositories.section.title"/></h3>
+        <h3><s:text name="repositories.section.title"/></h3>
         <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>
-        <ww:set name="repositories" value="repositories" scope="request"/>
+        <s:set name="repositories" value="repositories" scope="request"/>
         <ec:table items="repositories"
                   var="repository"
                   showExports="false"
@@ -48,15 +48,15 @@
             <ec:column property="location" title="repositories.table.location"/>
             <ec:column property="layout" title="repositories.table.layout"/>
             <ec:column property="editActions" title="&nbsp;" width="1%">
-                <ww:url id="editRepositoryUrl" action="editRepository">
-                  <ww:param name="repository.id" value="${pageScope.repository.id}"/>
-                </ww:url>
+                <s:url id="editRepositoryUrl" action="editRepository">
+                  <s:param name="repository.id" value="${pageScope.repository.id}"/>
+                </s:url>
                 <c:choose>
                   <c:when test="${repository.name == 'DEFAULT'}">
-                    <img src="<ww:url value='/images/edit_disabled.gif' includeParams="none"/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0" />
+                    <img src="<s:url value='/images/edit_disabled.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0" />
                   </c:when>
                   <c:otherwise>
-                    <ww:a href="%{editRepositoryUrl}"><img src="<ww:url value='/images/edit.gif' includeParams="none"/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0" /></ww:a>
+                    <s:a href="%{editRepositoryUrl}"><img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0" /></s:a>
                   </c:otherwise>
                 </c:choose>
             </ec:column>
@@ -64,26 +64,26 @@
               <c:set var="repositoryName" value="${pageScope.repository.name}" scope="request"/>
               <c:choose>
                 <c:when test="${defaultPurgeMap[repositoryName]}">
-                  <ww:url id="purgeRepositoryUrl" action="purgeRepository">
-                    <ww:param name="repository.id" value="${pageScope.repository.id}"/>
-                  </ww:url>
-                  <ww:a href="%{purgeRepositoryUrl}"><img src="<ww:url value='/images/purgenow.gif' includeParams="none"/>" alt="<ww:text name='purge'/>" title="<ww:text name='purge'/>" border="0" /></ww:a>
+                  <s:url id="purgeRepositoryUrl" action="purgeRepository">
+                    <s:param name="repository.id" value="${pageScope.repository.id}"/>
+                  </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>
                 <c:otherwise>
-                  <ww:a href="%{purgeRepositoryUrl}"><img src="<ww:url value='/images/disabled_purgenow.gif' includeParams="none"/>" alt="<ww:text name='purge'/>" title="<ww:text name='purge'/>" border="0" /></ww:a>
+                  <s:a href="%{purgeRepositoryUrl}"><img src="<s:url value='/images/disabled_purgenow.gif' includeParams="none"/>" alt="<s:text name='purge'/>" title="<s:text name='purge'/>" border="0" /></s:a>
                 </c:otherwise>
               </c:choose>
             </ec:column>
             <ec:column property="deleteActions" title="&nbsp;" width="1%">
-                <ww:url id="removeRepositoryUrl" action="removeRepository">
-                  <ww:param name="repository.id" value="${pageScope.repository.id}"/>                 
-                </ww:url>
+                <s:url id="removeRepositoryUrl" action="removeRepository">
+                  <s:param name="repository.id" value="${pageScope.repository.id}"/>
+                </s:url>
                 <c:choose>
                   <c:when test="${repository.name == 'DEFAULT'}">
-                    <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:when>
                   <c:otherwise>
-                    <ww:a href="%{removeRepositoryUrl}"><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:a href="%{removeRepositoryUrl}"><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:otherwise>
                 </c:choose>
             </ec:column>
@@ -91,10 +91,10 @@
         </ec:table>
       </div>
       <div class="functnbar3">
-        <ww:form action="editRepository" method="post">
-          <ww:submit value="%{getText('add')}"/>
-        </ww:form>
+        <s:form action="editRepository" method="post">
+          <s:submit value="%{getText('add')}"/>
+        </s:form>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -18,30 +18,30 @@
   --%>
 
 <%@ 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" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 
 <html>
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
   <head>
-    <title><ww:text name="profilesList.page.title"/></title>
+    <title><s:text name="profilesList.page.title"/></title>
   </head>
   
   <div id="h3">
     <h3>
-      <ww:text name="profilesList.section.title"/>
+      <s:text name="profilesList.section.title"/>
     </h3>
 
     <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>
         
-    <ww:if test="${not empty profiles}">
+    <s:if test="${not empty profiles}">
     <ec:table items="profiles"
               var="profile"
               showExports="false"
@@ -68,23 +68,23 @@
         </ec:column>
         <ec:column property="id" title="&nbsp;" width="1%">
           <a href="editBuildEnv!edit.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
-            <img src="<ww:url value='/images/edit.gif' includeParams="none"/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0" />
+            <img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0" />
           </a>                    
         </ec:column>
         <ec:column property="id" title="&nbsp;" width="1%">
           <a href="confirmDeleteBuildEnv!confirmDelete.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
-            <img src="<ww:url value='/images/delete.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0" />
+            <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
           </a>                    
         </ec:column>        
       </ec:row>
     </ec:table>
-    </ww:if>
+    </s:if>
     <div class="functnbar3">
-      <ww:form action="addBuildEnv!input.action" method="post">
-        <ww:submit value="%{getText('add')}"/>
-      </ww:form>
+      <s:form action="addBuildEnv!input.action" method="post">
+        <s:submit value="%{getText('add')}"/>
+      </s:form>
     </div>    
   
   </div>
   
-</ww:i18n>
+</s:i18n>

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=707273&r1=707272&r2=707273&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 Wed Oct 22 22:05:36 2008
@@ -17,28 +17,28 @@
   ~ 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" %>
 
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-      <title><ww:text name="purgeConfigs.page.title"/></title>
+      <title><s:text name="purgeConfigs.page.title"/></title>
     </head>
     <body>
       <div id="h3">
-        <h3><ww:text name="purgeConfigs.repo.section.title"/></h3>
+        <h3><s:text name="purgeConfigs.repo.section.title"/></h3>
         <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>
-        <ww:set name="repoPurgeConfigs" value="repoPurgeConfigs" scope="request"/>
+        <s:set name="repoPurgeConfigs" value="repoPurgeConfigs" scope="request"/>
         <ec:table items="repoPurgeConfigs"
                   var="repoPurge"
                   showExports="false"
@@ -49,10 +49,10 @@
          <ec:row>
             <ec:column property="repository.name" title="purgeConfigs.table.repository">
               <redback:ifAuthorized permission="continuum-manage-repositories">
-                <ww:url id="editRepositoryUrl" action="editRepository" namespace="/admin" includeParams="none">
-                  <ww:param name="repository.id">${pageScope.repoPurge.repository.id}</ww:param>
-                </ww:url>
-                <ww:a href="%{editRepositoryUrl}">${pageScope.repoPurge.repository.name}</ww:a> 
+                <s:url id="editRepositoryUrl" action="editRepository" namespace="/admin" includeParams="none">
+                  <s:param name="repository.id">${pageScope.repoPurge.repository.id}</s:param>
+                </s:url>
+                <s:a href="%{editRepositoryUrl}">${pageScope.repoPurge.repository.name}</s:a>
               </redback:ifAuthorized>
               <redback:elseAuthorized>
                 ${pageScope.repoPurge.repository.name}
@@ -67,36 +67,36 @@
             <ec:column property="enabled" title="purgeConfigs.table.enabled"/>
             <ec:column property="description" title="purgeConfigs.table.description"/>
             <ec:column property="editActions" title="&nbsp;" width="1%">
-                <ww:url id="editPurgeConfigUrl" action="editPurgeConfig">
-                  <ww:param name="purgeConfigId" value="${pageScope.repoPurge.id}"/>
-                </ww:url>
-                <ww:a href="%{editPurgeConfigUrl}"><img src="<ww:url value='/images/edit.gif' includeParams="none"/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0" /></ww:a>
+                <s:url id="editPurgeConfigUrl" action="editPurgeConfig">
+                  <s:param name="purgeConfigId" value="${pageScope.repoPurge.id}"/>
+                </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%">
-                <ww:url id="purgeUrl" action="doPurge">
-                  <ww:param name="purgeConfigId" value="${pageScope.repoPurge.id}"/>
-                </ww:url>
-                <ww:a href="%{purgeUrl}"><img src="<ww:url value='/images/purgenow.gif' includeParams="none"/>" alt="<ww:text name='purge'/>" title="<ww:text name='purge'/>" border="0" /></ww:a>
+                <s:url id="purgeUrl" action="doPurge">
+                  <s:param name="purgeConfigId" value="${pageScope.repoPurge.id}"/>
+                </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%">
-                <ww:url id="removePurgeConfigUrl" action="removePurgeConfig">
-                  <ww:param name="purgeConfigId" value="${pageScope.repoPurge.id}"/>                 
-                </ww:url>
-                <ww:a href="%{removePurgeConfigUrl}"><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="removePurgeConfigUrl" action="removePurgeConfig">
+                  <s:param name="purgeConfigId" value="${pageScope.repoPurge.id}"/>
+                </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>
           </ec:row>
         </ec:table>
       </div>
       <div class="functnbar3">
-        <ww:form name="addRepoPurgeConfig" action="editPurgeConfig" method="post">
-          <ww:hidden name="purgeType" value="repository"/>
-          <ww:submit value="%{getText('add')}"/>
-        </ww:form>
+        <s:form name="addRepoPurgeConfig" action="editPurgeConfig" method="post">
+          <s:hidden name="purgeType" value="repository"/>
+          <s:submit value="%{getText('add')}"/>
+        </s:form>
       </div>
         
       <div id="h3">
-        <h3><ww:text name="purgeConfigs.dir.section.title"/></h3>
-        <ww:set name="dirPurgeConfigs" value="dirPurgeConfigs" scope="request"/>
+        <h3><s:text name="purgeConfigs.dir.section.title"/></h3>
+        <s:set name="dirPurgeConfigs" value="dirPurgeConfigs" scope="request"/>
         <ec:table items="dirPurgeConfigs"
                   var="dirPurge"
                   showExports="false"
@@ -114,32 +114,32 @@
             <ec:column property="enabled" title="purgeConfigs.table.enabled"/>
             <ec:column property="description" title="purgeConfigs.table.description"/>
             <ec:column property="editActions" title="&nbsp;" width="1%">
-                <ww:url id="editPurgeConfigUrl" action="editPurgeConfig">
-                  <ww:param name="purgeConfigId" value="${pageScope.dirPurge.id}"/>
-                </ww:url>
-                <ww:a href="%{editPurgeConfigUrl}"><img src="<ww:url value='/images/edit.gif' includeParams="none"/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0" /></ww:a>
+                <s:url id="editPurgeConfigUrl" action="editPurgeConfig">
+                  <s:param name="purgeConfigId" value="${pageScope.dirPurge.id}"/>
+                </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%">
-                <ww:url id="purgeUrl" action="doPurge">
-                  <ww:param name="purgeConfigId" value="${pageScope.dirPurge.id}"/>
-                </ww:url>
-                <ww:a href="%{purgeUrl}"><img src="<ww:url value='/images/purgenow.gif' includeParams="none"/>" alt="<ww:text name='purge'/>" title="<ww:text name='purge'/>" border="0" /></ww:a>
+                <s:url id="purgeUrl" action="doPurge">
+                  <s:param name="purgeConfigId" value="${pageScope.dirPurge.id}"/>
+                </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%">
-                <ww:url id="removePurgeConfigUrl" action="removePurgeConfig">
-                  <ww:param name="purgeConfigId" value="${pageScope.dirPurge.id}"/>                 
-                </ww:url>
-                <ww:a href="%{removePurgeConfigUrl}"><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="removePurgeConfigUrl" action="removePurgeConfig">
+                  <s:param name="purgeConfigId" value="${pageScope.dirPurge.id}"/>
+                </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>
           </ec:row>
         </ec:table>
       </div>
       <div class="functnbar3">
-        <ww:form name="addDirPurgeConfig" action="editPurgeConfig" method="post">
-          <ww:hidden name="purgeType" value="directory"/>
-          <ww:submit value="%{getText('add')}"/>
-        </ww:form>
+        <s:form name="addDirPurgeConfig" action="editPurgeConfig" method="post">
+          <s:hidden name="purgeType" value="directory"/>
+          <s:submit value="%{getText('add')}"/>
+        </s:form>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>
\ No newline at end of file



Mime
View raw message