continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r707273 [4/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/buildDefinitionEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp 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.page.title"/></title>
+        <title><s:text name="buildDefinition.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="buildDefinition.section.title"/></h3>
+        <h3><s:text name="buildDefinition.section.title"/></h3>
 
         <div class="axial">
-          <ww:form action="saveBuildDefinition" method="get" validate="true">
+          <s:form action="saveBuildDefinition" method="get" 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,58 +45,58 @@
               <c:when test="${empty actionErrors}">
                 <table>
                   <tbody>
-                    <ww:if test="executor == 'ant'">
-                      <ww:textfield label="%{getText('buildDefinition.buildFile.ant.label')}" name="buildFile"  required="true"/>
-                    </ww:if>
-                    <ww:elseif test="executor == 'shell'">
-                      <ww:textfield label="%{getText('buildDefinition.buildFile.shell.label')}" name="buildFile" required="true"/>
-                    </ww:elseif>
-                    <ww:else>
-                      <ww:textfield label="%{getText('buildDefinition.buildFile.maven.label')}" name="buildFile" required="true"/>
-                    </ww:else>
+                    <s:if test="executor == 'ant'">
+                      <s:textfield label="%{getText('buildDefinition.buildFile.ant.label')}" name="buildFile"  required="true"/>
+                    </s:if>
+                    <s:elseif test="executor == 'shell'">
+                      <s:textfield label="%{getText('buildDefinition.buildFile.shell.label')}" name="buildFile" required="true"/>
+                    </s:elseif>
+                    <s:else>
+                      <s:textfield label="%{getText('buildDefinition.buildFile.maven.label')}" name="buildFile" required="true"/>
+                    </s:else>
     
-                    <ww:if test="executor == 'ant'">
-                      <ww:textfield label="%{getText('buildDefinition.goals.ant.label')}" name="goals"/>
-                    </ww:if>
-                    <ww:elseif test="executor == 'shell'">
-                    </ww:elseif>
-                    <ww:else>
-                      <ww:textfield label="%{getText('buildDefinition.goals.maven.label')}" name="goals"/>
-                    </ww:else>
+                    <s:if test="executor == 'ant'">
+                      <s:textfield label="%{getText('buildDefinition.goals.ant.label')}" name="goals"/>
+                    </s:if>
+                    <s:elseif test="executor == 'shell'">
+                    </s:elseif>
+                    <s:else>
+                      <s:textfield label="%{getText('buildDefinition.goals.maven.label')}" name="goals"/>
+                    </s:else>
     
-                    <ww:textfield label="%{getText('buildDefinition.arguments.label')}" name="arguments"/>
-                    <ww:checkbox label="%{getText('buildDefinition.buildFresh.label')}" name="buildFresh" value="buildFresh" fieldValue="true"/>
-                    <ww:checkbox label="%{getText('buildDefinition.alwaysBuild.label')}" name="alwaysBuild" />
-                    <ww:if test="defaultBuildDefinition == true">
-                      <ww:label label="%{getText('buildDefinition.defaultForProject.label')}" value="true"/>
-                    </ww:if>
-                    <ww:else>
-                      <ww:checkbox label="%{getText('buildDefinition.defaultForProject.label')}"  name="defaultBuildDefinition" value="defaultBuildDefinition" fieldValue="true"/>
-                    </ww:else>
-                    <ww:select label="%{getText('buildDefinition.schedule.label')}" name="scheduleId" list="schedules"/>
-                    <ww:select label="%{getText('buildDefinition.profile.label')}" name="profileId" list="profiles" listValue="name" 
+                    <s:textfield label="%{getText('buildDefinition.arguments.label')}" name="arguments"/>
+                    <s:checkbox label="%{getText('buildDefinition.buildFresh.label')}" name="buildFresh" value="buildFresh" fieldValue="true"/>
+                    <s:checkbox label="%{getText('buildDefinition.alwaysBuild.label')}" name="alwaysBuild" />
+                    <s:if test="defaultBuildDefinition == true">
+                      <s:label label="%{getText('buildDefinition.defaultForProject.label')}" value="true"/>
+                    </s:if>
+                    <s:else>
+                      <s:checkbox label="%{getText('buildDefinition.defaultForProject.label')}"  name="defaultBuildDefinition" value="defaultBuildDefinition" fieldValue="true"/>
+                    </s:else>
+                    <s:select label="%{getText('buildDefinition.schedule.label')}" name="scheduleId" list="schedules"/>
+                    <s:select label="%{getText('buildDefinition.profile.label')}" name="profileId" list="profiles" listValue="name"
                                listKey="id" headerKey="-1" headerValue=""/>
-                    <ww:select label="%{getText('buildDefinition.type.label')}" name="buildDefinitionType" list="buildDefinitionTypes"/>
-                    <ww:textfield label="%{getText('buildDefinition.description.label')}" name="description" />
+                    <s:select label="%{getText('buildDefinition.type.label')}" name="buildDefinitionType" list="buildDefinitionTypes"/>
+                    <s:textfield label="%{getText('buildDefinition.description.label')}" name="description" />
                   </tbody>
                 </table>
                 <div class="functnbar3">
                   <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
                 </div>
 
-                <ww:hidden name="buildDefinitionId"/>
-                <ww:hidden name="projectId"/>
-                <ww:hidden name="projectGroupId"/>
-                <ww:hidden name="groupBuildDefinition"/>
-                <ww:if test="defaultBuildDefinition == true">
-                  <ww:hidden name="defaultBuildDefinition" value="true"/>
-                </ww:if>
+                <s:hidden name="buildDefinitionId"/>
+                <s:hidden name="projectId"/>
+                <s:hidden name="projectGroupId"/>
+                <s:hidden name="groupBuildDefinition"/>
+                <s:if test="defaultBuildDefinition == true">
+                  <s:hidden name="defaultBuildDefinition" value="true"/>
+                </s:if>
               </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/buildResult.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp Wed Oct 22 22:05:36 2008
@@ -17,15 +17,15 @@
   ~ 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 prefix="c1" uri="continuum" %>
 <%@ 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="buildResult.page.title"/></title>
+        <title><s:text name="buildResult.page.title"/></title>
     </head>
     <body>
       <div id="h3">
@@ -33,38 +33,38 @@
         <jsp:include page="/WEB-INF/jsp/navigations/ProjectMenu.jsp"/>
 
         <h3>
-            <ww:text name="buildResult.section.title">
-                <ww:param><ww:property value="project.name"/></ww:param>
-            </ww:text>
+            <s:text name="buildResult.section.title">
+                <s:param><s:property value="project.name"/></s:param>
+            </s:text>
         </h3>
 
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
             <c1:data label="%{getText('buildResult.startTime')}">
-                <ww:param name="after"><c1:date name="buildResult.startTime"/></ww:param>
+                <s:param name="after"><c1:date name="buildResult.startTime"/></s:param>
             </c1:data>
             <c1:data label="%{getText('buildResult.endTime')}">
-                <ww:param name="after"><c1:date name="buildResult.endTime"/></ww:param>
+                <s:param name="after"><c1:date name="buildResult.endTime"/></s:param>
             </c1:data>
             <c1:data label="%{getText('buildResult.duration')}">
-                <ww:param name="after">
-                    <ww:if test="${buildResult.endTime == 0}"><ww:text name="buildResult.startedSince"/></ww:if> <ww:property value="buildResult.durationTime"/></ww:param>
+                <s:param name="after">
+                    <s:if test="${buildResult.endTime == 0}"><s:text name="buildResult.startedSince"/></s:if> <s:property value="buildResult.durationTime"/></s:param>
             </c1:data>
             <c1:data label="%{getText('buildResult.trigger')}">
-                <ww:param name="after"><ww:text name="buildResult.trigger.%{buildResult.trigger}"/></ww:param>
+                <s:param name="after"><s:text name="buildResult.trigger.%{buildResult.trigger}"/></s:param>
             </c1:data>
             <c1:data label="%{getText('buildResult.state')}">
-                <ww:param name="after" value="state"/>
+                <s:param name="after" value="state"/>
             </c1:data>
             <c1:data label="%{getText('buildResult.buildNumber')}">
-                <ww:param name="after">
-                    <ww:if test="buildResult.buildNumber != 0">
-                        <ww:property value="buildResult.buildNumber"/>
-                    </ww:if>
-                    <ww:else>
+                <s:param name="after">
+                    <s:if test="buildResult.buildNumber != 0">
+                        <s:property value="buildResult.buildNumber"/>
+                    </s:if>
+                    <s:else>
                         &nbsp;
-                    </ww:else>
-                </ww:param>
+                    </s:else>
+                </s:param>
             </c1:data>
           </table>
         </div>
@@ -75,14 +75,14 @@
               <td>
                 <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
                   <form action="removeBuildResult.action">
-                    <input type="hidden" name="projectId" value="<ww:property value="projectId"/>"/>
-                    <input type="hidden" name="buildId" value="<ww:property value="buildId"/>"/>
-                    <ww:if test="canDelete">
-                      <input type="submit" name="delete-project" value="<ww:text name="delete"/>"/>
-                    </ww:if>
-                    <ww:else>
-                      <input type="submit" disabled="true" name="delete-project" value="<ww:text name="delete"/>"/>
-                    </ww:else>                    
+                    <input type="hidden" name="projectId" value="<s:property value="projectId"/>"/>
+                    <input type="hidden" name="buildId" value="<s:property value="buildId"/>"/>
+                    <s:if test="canDelete">
+                      <input type="submit" name="delete-project" value="<s:text name="delete"/>"/>
+                    </s:if>
+                    <s:else>
+                      <input type="submit" disabled="true" name="delete-project" value="<s:text name="delete"/>"/>
+                    </s:else>
                   </form>
                 </redback:ifAuthorized>
               </td>
@@ -91,9 +91,9 @@
           </table>
         </div>
 
-        <h4><ww:text name="buildResult.scmResult.changes"/></h4>
-        <ww:if test="buildResult.scmResult.changes != null && buildResult.scmResult.changes.size() > 0">
-            <ww:set name="changes" value="buildResult.scmResult.changes" scope="request"/>
+        <h4><s:text name="buildResult.scmResult.changes"/></h4>
+        <s:if test="buildResult.scmResult.changes != null && buildResult.scmResult.changes.size() > 0">
+            <s:set name="changes" value="buildResult.scmResult.changes" scope="request"/>
             <ec:table items="changes"
                       var="change"
                       showExports="false"
@@ -112,14 +112,14 @@
                 </ec:column>
               </ec:row>
             </ec:table>
-        </ww:if>
-        <ww:else>
-          <b><ww:text name="buildResult.scmResult.noChanges"/></b>
-        </ww:else>
-
-        <ww:if test="changesSinceLastSuccess != null && changesSinceLastSuccess.size() > 0">
-            <h4><ww:text name="buildResult.changesSinceLastSuccess"/></h4>
-            <ww:set name="changes" value="changesSinceLastSuccess" scope="request"/>
+        </s:if>
+        <s:else>
+          <b><s:text name="buildResult.scmResult.noChanges"/></b>
+        </s:else>
+
+        <s:if test="changesSinceLastSuccess != null && changesSinceLastSuccess.size() > 0">
+            <h4><s:text name="buildResult.changesSinceLastSuccess"/></h4>
+            <s:set name="changes" value="changesSinceLastSuccess" scope="request"/>
             <ec:table items="changes"
                       var="change"
                       showExports="false"
@@ -138,11 +138,11 @@
                 </ec:column>
               </ec:row>
             </ec:table>
-        </ww:if>
+        </s:if>
 
-        <h4><ww:text name="buildResult.dependencies.changes"/></h4>
-        <ww:if test="buildResult.modifiedDependencies != null && buildResult.modifiedDependencies.size() > 0">
-            <ww:set name="dependencies" value="buildResult.modifiedDependencies" scope="request"/>
+        <h4><s:text name="buildResult.dependencies.changes"/></h4>
+        <s:if test="buildResult.modifiedDependencies != null && buildResult.modifiedDependencies.size() > 0">
+            <s:set name="dependencies" value="buildResult.modifiedDependencies" scope="request"/>
             <ec:table items="dependencies"
                       var="dep"
                       showExports="false"
@@ -156,105 +156,105 @@
                 <ec:column property="version" title="buildResult.dependencies.version"/>
               </ec:row>
             </ec:table>
-        </ww:if>
-        <ww:else>
-          <b><ww:text name="buildResult.dependencies.noChanges"/></b>
-        </ww:else>
+        </s:if>
+        <s:else>
+          <b><s:text name="buildResult.dependencies.noChanges"/></b>
+        </s:else>
         
-        <h4><ww:text name="buildResult.buildDefinition"/></h4>
+        <h4><s:text name="buildResult.buildDefinition"/></h4>
           <table border="1" cellspacing="2" cellpadding="3" width="80%">
             <tbody>
-              <ww:if test="buildResult.buildDefinition.type='ant'">
+              <s:if test="buildResult.buildDefinition.type='ant'">
                 <tr class="b">
-                  <th><ww:text name="buildResult.buildDefinition.ant.label"/></th>
-                  <td><ww:property value="buildResult.buildDefinition.buildFile"/></td>
+                  <th><s:text name="buildResult.buildDefinition.ant.label"/></th>
+                  <td><s:property value="buildResult.buildDefinition.buildFile"/></td>
                 </tr>               
-              </ww:if>
-              <ww:elseif test="buildResult.buildDefinition.type='shell'">
+              </s:if>
+              <s:elseif test="buildResult.buildDefinition.type='shell'">
                 <tr class="b">
-                  <th><ww:text name="buildResult.buildDefinition.shell.label"/></th>
-                  <td><ww:property value="buildResult.buildDefinition.buildFile"/></td>
+                  <th><s:text name="buildResult.buildDefinition.shell.label"/></th>
+                  <td><s:property value="buildResult.buildDefinition.buildFile"/></td>
                 </tr>               
-              </ww:elseif> 
-              <ww:else>
+              </s:elseif>
+              <s:else>
                 <tr class="b">
-                  <th><ww:text name="buildResult.buildDefinition.maven.label"/></th>
-                  <td><ww:property value="buildResult.buildDefinition.buildFile"/></td>
+                  <th><s:text name="buildResult.buildDefinition.maven.label"/></th>
+                  <td><s:property value="buildResult.buildDefinition.buildFile"/></td>
                 </tr>               
-              </ww:else>                        
+              </s:else>
               <tr class="b">
-                <th><ww:text name="buildResult.buildDefinition.goals"/></th>
-                <td><ww:property value="buildResult.buildDefinition.goals"/></td>
+                <th><s:text name="buildResult.buildDefinition.goals"/></th>
+                <td><s:property value="buildResult.buildDefinition.goals"/></td>
               </tr>
               <tr class="b">
-                <th><ww:text name="buildResult.buildDefinition.arguments"/></th>
-                <td><ww:property value="buildResult.buildDefinition.arguments"/></td>
+                <th><s:text name="buildResult.buildDefinition.arguments"/></th>
+                <td><s:property value="buildResult.buildDefinition.arguments"/></td>
               </tr>
               <tr class="b">
-                <th><ww:text name="buildResult.buildDefinition.buildFresh"/></th>
-                <td><ww:property value="buildResult.buildDefinition.buildFresh"/></td>
+                <th><s:text name="buildResult.buildDefinition.buildFresh"/></th>
+                <td><s:property value="buildResult.buildDefinition.buildFresh"/></td>
               </tr>
               <tr class="b">
-                <th><ww:text name="buildResult.buildDefinition.alwaysBuild"/></th>
-                <td><ww:property value="buildResult.buildDefinition.alwaysBuild"/></td>
+                <th><s:text name="buildResult.buildDefinition.alwaysBuild"/></th>
+                <td><s:property value="buildResult.buildDefinition.alwaysBuild"/></td>
               </tr>
               <tr class="b">
-                <th><ww:text name="buildResult.buildDefinition.defaultForProject"/></th>
-                <td><ww:property value="buildResult.buildDefinition.defaultForProject"/></td>
+                <th><s:text name="buildResult.buildDefinition.defaultForProject"/></th>
+                <td><s:property value="buildResult.buildDefinition.defaultForProject"/></td>
               </tr>
               <tr class="b">
-                <th><ww:text name="buildResult.buildDefinition.schedule"/></th>
-                <td><ww:property value="buildResult.buildDefinition.schedule.name"/></td>
+                <th><s:text name="buildResult.buildDefinition.schedule"/></th>
+                <td><s:property value="buildResult.buildDefinition.schedule.name"/></td>
               </tr>
-              <ww:if test="buildResult.buildDefinition.profile != null">
+              <s:if test="buildResult.buildDefinition.profile != null">
                 <tr class="b">
-                  <th><ww:text name="buildResult.buildDefinition.profileName"/></th>
-                  <td><ww:property value="buildResult.buildDefinition.profile.name"/></td>
+                  <th><s:text name="buildResult.buildDefinition.profileName"/></th>
+                  <td><s:property value="buildResult.buildDefinition.profile.name"/></td>
                 </tr>          
-              </ww:if>
+              </s:if>
               <tr class="b">
-                <th><ww:text name="buildResult.buildDefinition.description"/></th>
-                <td><ww:property value="buildResult.buildDefinition.description"/></td>
+                <th><s:text name="buildResult.buildDefinition.description"/></th>
+                <td><s:property value="buildResult.buildDefinition.description"/></td>
               </tr>              
             </tbody>
           </table> 
 
-        <ww:if test="hasSurefireResults">
-          <h4><ww:text name="buildResult.generatedReports.title"/></h4>
+        <s:if test="hasSurefireResults">
+          <h4><s:text name="buildResult.generatedReports.title"/></h4>
 
-          <ww:url id="surefireReportUrl" action="surefireReport">
-            <ww:param name="projectId" value="projectId"/>
-            <ww:param name="buildId" value="buildId"/>
-            <ww:param name="projectName" value="projectName"/>
-          </ww:url>
-          <ww:a href="%{surefireReportUrl}"><ww:text name="buildResult.generatedReports.surefire"/></ww:a>
-        </ww:if>
+          <s:url id="surefireReportUrl" action="surefireReport">
+            <s:param name="projectId" value="projectId"/>
+            <s:param name="buildId" value="buildId"/>
+            <s:param name="projectName" value="projectName"/>
+          </s:url>
+          <s:a href="%{surefireReportUrl}"><s:text name="buildResult.generatedReports.surefire"/></s:a>
+        </s:if>
 
-        <ww:if test="buildResult.state == 4">
-          <h4><ww:text name="buildResult.buildError"/></h4>
+        <s:if test="buildResult.state == 4">
+          <h4><s:text name="buildResult.buildError"/></h4>
           <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width: 1px">
-            <pre><ww:property value="buildResult.error"/></pre>
+            <pre><s:property value="buildResult.error"/></pre>
           </div>
-        </ww:if>
-        <ww:else>
-          <h4><ww:text name="buildResult.buildOutput"/></h4>
+        </s:if>
+        <s:else>
+          <h4><s:text name="buildResult.buildOutput"/></h4>
           <p>
-            <ww:if test="buildOutput == ''">
-                <ww:text name="buildResult.noOutput"/>
-            </ww:if>
-            <ww:else>
-              <ww:url id="buildOutputTextUrl" action="buildOutputText">
-                <ww:param name="projectId" value="projectId"/>
-                <ww:param name="buildId" value="buildId"/>
-              </ww:url>
-              <ww:a href="%{buildOutputTextUrl}"><ww:text name="buildResult.buildOutput.text"/></ww:a>
+            <s:if test="buildOutput == ''">
+                <s:text name="buildResult.noOutput"/>
+            </s:if>
+            <s:else>
+              <s:url id="buildOutputTextUrl" action="buildOutputText">
+                <s:param name="projectId" value="projectId"/>
+                <s:param name="buildId" value="buildId"/>
+              </s:url>
+              <s:a href="%{buildOutputTextUrl}"><s:text name="buildResult.buildOutput.text"/></s:a>
               <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width: 1px">
-                <pre><ww:property value="buildOutput"/></pre>
+                <pre><s:property value="buildOutput"/></pre>
               </div>
-            </ww:else>
+            </s:else>
           </p>
-        </ww:else>
+        </s:else>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp Wed Oct 22 22:05:36 2008
@@ -17,14 +17,14 @@
   ~ 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="buildResults.page.title"/></title>
+        <title><s:text name="buildResults.page.title"/></title>
         <meta http-equiv="refresh" content="300"/>
     </head>
     <body>
@@ -35,14 +35,14 @@
         </jsp:include>
 
         <h3>
-            <ww:text name="buildResults.section.title">
-                <ww:param><ww:property value="project.name"/></ww:param>
-            </ww:text>
+            <s:text name="buildResults.section.title">
+                <s:param><s:property value="project.name"/></s:param>
+            </s:text>
         </h3>
         <form id="buildResultsForm" action="removeBuildResults.action" method="post">
-          <ww:hidden name="projectGroupId"/>
-          <ww:hidden name="projectId"/> 
-          <ww:set name="buildResults" value="buildResults" scope="request"/>
+          <s:hidden name="projectGroupId"/>
+          <s:hidden name="projectId"/>
+          <s:set name="buildResults" value="buildResults" scope="request"/>
           <ec:table items="buildResults"
                     var="buildResult"
                     showExports="false"
@@ -66,43 +66,43 @@
               <ec:column property="duration" title="&nbsp;">
                 <c:choose>
                   <c:when test="${buildResult.endTime gt 0}">
-                    <ww:text name="buildResults.duration"/> : ${buildResult.durationTime}
+                    <s:text name="buildResults.duration"/> : ${buildResult.durationTime}
                   </c:when>
                   <c:otherwise>
-                    <ww:text name="buildResults.startedSince"/> : ${buildResult.elapsedTime}
+                    <s:text name="buildResults.startedSince"/> : ${buildResult.elapsedTime}
                   </c:otherwise>
                 </c:choose>
               </ec:column>
               <ec:column property="state" title="buildResults.state" cell="org.apache.maven.continuum.web.view.buildresults.StateCell"/>
               <ec:column property="buildDefinition.description" title="buildResults.buildDefinition.description" />
               <ec:column property="actions" title="&nbsp;">
-                <ww:url id="buildResultUrl" action="buildResult">
-                  <ww:param name="projectId" value="${projectId}"/>
-                  <ww:param name="projectName" value="%{projectName}"/>
-                  <ww:param name="buildId" value="${buildResult.id}"/>
-                  <ww:param name="projectGroupId" value="${projectGroupId}"/>
-                </ww:url>
-                <ww:a href="%{buildResultUrl}"><ww:text name="buildResults.result"/></ww:a>
+                <s:url id="buildResultUrl" action="buildResult">
+                  <s:param name="projectId" value="${projectId}"/>
+                  <s:param name="projectName" value="%{projectName}"/>
+                  <s:param name="buildId" value="${buildResult.id}"/>
+                  <s:param name="projectGroupId" value="${projectGroupId}"/>
+                </s:url>
+                <s:a href="%{buildResultUrl}"><s:text name="buildResults.result"/></s:a>
               </ec:column>
             </ec:row>
           </ec:table>
-          <ww:if test="${not empty buildResults}">
+          <s:if test="${not empty buildResults}">
             <div class="functnbar3">
               <table>
                 <tbody>
                   <tr>
                     <td>
                       <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-                        <input type="button" name="delete-project" value="<ww:text name="delete"/>" onclick="document.forms.buildResultsForm.submit();" />
+                        <input type="button" name="delete-project" value="<s:text name="delete"/>" onclick="document.forms.buildResultsForm.submit();" />
                       </redback:ifAuthorized>
                     </td>
                   </tr>
                 </tbody>
               </table>
             </div>
-          </ww:if>
+          </s:if>
         </form>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp Wed Oct 22 22:05:36 2008
@@ -17,16 +17,16 @@
   ~ 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">
+<s:i18n name="localization.Continuum">
 
-  <h3><ww:text name="buildDefinitionSummary.projectGroup.section.title"><ww:param>${projectGroup.name}</ww:param></ww:text></h3>
-  <ww:if test="${not empty groupBuildDefinitionSummaries}">
+  <h3><s:text name="buildDefinitionSummary.projectGroup.section.title"><s:param>${projectGroup.name}</s:param></s:text></h3>
+  <s:if test="${not empty groupBuildDefinitionSummaries}">
   <ec:table items="groupBuildDefinitionSummaries"
             var="buildDefinitionSummary"
             showExports="false"
@@ -40,20 +40,20 @@
       <ec:column property="buildFile" title="projectView.buildDefinition.buildFile"/>
       <ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
         <redback:ifAuthorized permission="continuum-manage-schedules">
-          <ww:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
-            <ww:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</ww:param>
-          </ww:url>
-          <ww:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</ww:a> 
+          <s:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
+            <s:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</s:param>
+          </s:url>
+          <s:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</s:a>
         </redback:ifAuthorized>
         <redback:elseAuthorized>
           ${pageScope.buildDefinitionSummary.scheduleName}
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="profileName" title="projectView.buildDefinition.profile">
-        <ww:url id="profileUrl" action="editBuildEnv!edit.action" namespace="/" includeParams="none">
-          <ww:param name="profile.id">${pageScope.buildDefinitionSummary.profileId}</ww:param>
-        </ww:url>    
-        <ww:a href="%{profileUrl}">${pageScope.buildDefinitionSummary.profileName}</ww:a>     
+        <s:url id="profileUrl" action="editBuildEnv!edit.action" namespace="/" includeParams="none">
+          <s:param name="profile.id">${pageScope.buildDefinitionSummary.profileId}</s:param>
+        </s:url>
+        <s:a href="%{profileUrl}">${pageScope.buildDefinitionSummary.profileName}</s:a>
       </ec:column>      
       <ec:column property="from" title="projectView.buildDefinition.from"/>
       <ec:column property="isBuildFresh" title="projectView.buildDefinition.buildFresh"/>
@@ -63,67 +63,67 @@
       <ec:column property="alwaysBuild" title="projectView.buildDefinition.alwaysBuild"/>
       <ec:column property="buildAction" title="&nbsp;" width="1%">
         <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
-          <ww:url id="buildUrl" action="buildProject" namespace="/">
-            <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
-            <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-          </ww:url>
-          <ww:a href="%{buildUrl}"><img src="<ww:url value='/images/buildnow.gif' includeParams="none"/>" alt="<ww:text name='build'/>" title="<ww:text name='build'/>" border="0"></ww:a>
+          <s:url id="buildUrl" action="buildProject" namespace="/">
+            <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
+            <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+          </s:url>
+          <s:a href="%{buildUrl}"><img src="<s:url value='/images/buildnow.gif' includeParams="none"/>" alt="<s:text name='build'/>" title="<s:text name='build'/>" border="0"></s:a>
         </redback:ifAuthorized>
         <redback:elseAuthorized>
-          <img src="<ww:url value='/images/buildnow_disabled.gif' includeParams="none"/>" alt="<ww:text name='build'/>" title="<ww:text name='build'/>" border="0" />
+          <img src="<s:url value='/images/buildnow_disabled.gif' includeParams="none"/>" alt="<s:text name='build'/>" title="<s:text name='build'/>" border="0" />
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="editActions" title="&nbsp;" width="1%">
         <center>
         <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-          <ww:url id="editUrl" action="buildDefinition" method="input" namespace="/" includeParams="none">
-            <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
-            <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-          </ww:url>
-          <ww:a href="%{editUrl}">
-              <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="editUrl" action="buildDefinition" method="input" namespace="/" includeParams="none">
+            <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
+            <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+          </s:url>
+          <s:a href="%{editUrl}">
+              <img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0">
+          </s:a>
         </redback:ifAuthorized>
         <redback:elseAuthorized>
-          <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">
         </redback:elseAuthorized>
         </center>
       </ec:column>    
       <ec:column property="deleteActions" title="&nbsp;" width="1%">
         <center>
         <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-          <ww:if test="${pageScope.buildDefinitionSummary.isDefault == true}">
-            <img src="<ww:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0">
-          </ww:if>
-          <ww:else> 
-            <ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
-              <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
-              <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-              <ww:param name="confirmed" value="false"/>
-            </ww:url>
-            <ww:a href="%{removeUrl}">
-              <img src="<ww:url value='/images/delete.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0">
-            </ww:a>
-          </ww:else>
+          <s:if test="${pageScope.buildDefinitionSummary.isDefault == true}">
+            <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0">
+          </s:if>
+          <s:else>
+            <s:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
+              <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
+              <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+              <s:param name="confirmed" value="false"/>
+            </s:url>
+            <s:a href="%{removeUrl}">
+              <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0">
+            </s:a>
+          </s:else>
         </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>
         </center>
       </ec:column>
     </ec:row>
   </ec:table>
-  </ww:if>
+  </s:if>
   <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
     <div class="functnbar3">
-      <ww:form action="buildDefinition" method="post">
-        <input type="hidden" name="projectGroupId" value="<ww:property value="projectGroupId"/>"/>
-        <ww:submit value="%{getText('add')}"/>
-      </ww:form>
+      <s:form action="buildDefinition" method="post">
+        <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
+        <s:submit value="%{getText('add')}"/>
+      </s:form>
     </div>
   </redback:ifAuthorized>
 
-  <ww:if test="${not empty projectBuildDefinitionSummaries}">
+  <s:if test="${not empty projectBuildDefinitionSummaries}">
   <h3>Project Build Definitions</h3>
 
   <ec:table items="projectBuildDefinitionSummaries"
@@ -135,30 +135,30 @@
             sortable="false">
     <ec:row>
       <ec:column property="projectName" title="Project">
-        <ww:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
-          <ww:param name="projectId" value="${pageScope.buildDefinitionSummary.projectId}"/>
-        </ww:url>
-        <ww:a href="%{projectUrl}">${pageScope.buildDefinitionSummary.projectName}</ww:a>
+        <s:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
+          <s:param name="projectId" value="${pageScope.buildDefinitionSummary.projectId}"/>
+        </s:url>
+        <s:a href="%{projectUrl}">${pageScope.buildDefinitionSummary.projectName}</s:a>
       </ec:column>
       <ec:column property="goals" title="projectView.buildDefinition.goals"/>
       <ec:column property="arguments" title="projectView.buildDefinition.arguments"/>
       <ec:column property="buildFile" title="projectView.buildDefinition.buildFile"/>
       <ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
         <redback:ifAuthorized permission="continuum-manage-schedules">
-          <ww:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
-            <ww:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</ww:param>
-          </ww:url>
-          <ww:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</ww:a> 
+          <s:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
+            <s:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</s:param>
+          </s:url>
+          <s:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</s:a>
         </redback:ifAuthorized>
         <redback:elseAuthorized>
           ${pageScope.buildDefinitionSummary.scheduleName}
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="profileName" title="projectView.buildDefinition.profile">
-        <ww:url id="profileUrl" action="editBuildEnv!edit.action" namespace="/" includeParams="none">
-          <ww:param name="profile.id">${pageScope.buildDefinitionSummary.profileId}</ww:param>
-        </ww:url>
-        <ww:a href="%{profileUrl}">${pageScope.buildDefinitionSummary.profileName}</ww:a>        
+        <s:url id="profileUrl" action="editBuildEnv!edit.action" namespace="/" includeParams="none">
+          <s:param name="profile.id">${pageScope.buildDefinitionSummary.profileId}</s:param>
+        </s:url>
+        <s:a href="%{profileUrl}">${pageScope.buildDefinitionSummary.profileName}</s:a>
       </ec:column>      
       <ec:column property="from" title="projectView.buildDefinition.from"/>
       <ec:column property="isBuildFresh" title="projectView.buildDefinition.buildFresh"/>
@@ -168,50 +168,50 @@
       <ec:column property="alwaysBuild" title="projectView.buildDefinition.alwaysBuild"/>
       <ec:column property="buildNowAction" title="&nbsp;" width="1%">
         <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
-          <ww:url id="buildProjectUrl" action="buildProject" namespace="/" includeParams="none">
-            <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
-            <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-          </ww:url>
-          <ww:a href="%{buildProjectUrl}">
-            <img src="<ww:url value='/images/buildnow.gif' includeParams="none"/>" alt="<ww:text name='build'/>" title="<ww:text name='build'/>" border="0">
-          </ww:a>
+          <s:url id="buildProjectUrl" action="buildProject" namespace="/" includeParams="none">
+            <s:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</s:param>
+            <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+          </s:url>
+          <s:a href="%{buildProjectUrl}">
+            <img src="<s:url value='/images/buildnow.gif' includeParams="none"/>" alt="<s:text name='build'/>" title="<s:text name='build'/>" border="0">
+          </s:a>
         </redback:ifAuthorized>
         <redback:elseAuthorized>
-          <img src="<ww:url value='/images/buildnow_disabled.gif' includeParams="none"/>" alt="<ww:text name='build'/>" title="<ww:text name='build'/>" border="0" />
+          <img src="<s:url value='/images/buildnow_disabled.gif' includeParams="none"/>" alt="<s:text name='build'/>" title="<s:text name='build'/>" border="0" />
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="editAction" title="&nbsp;" width="1%">
         <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-          <ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
-            <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
-            <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-          </ww:url>
-          <ww:a href="%{editUrl}">
-              <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="editUrl" action="buildDefinition" method="input" namespace="/">
+            <s:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</s:param>
+            <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+          </s:url>
+          <s:a href="%{editUrl}">
+              <img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0">
+          </s:a>
         </redback:ifAuthorized>
         <redback:elseAuthorized>
-          <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">
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="removeAction" title="&nbsp;" width="1%">
         <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-          <ww:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
-            <ww:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</ww:param>
-            <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-            <ww:param name="confirmed" value="false"/>
-          </ww:url>
-          <ww:a href="%{removeUrl}">
-              <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="removeUrl" action="removeProjectBuildDefinition" namespace="/">
+            <s:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</s:param>
+            <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+            <s:param name="confirmed" value="false"/>
+          </s:url>
+          <s:a href="%{removeUrl}">
+              <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0">
+          </s:a>
         </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>
+  </s:if>
 
-</ww:i18n>
+</s:i18n>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Wed Oct 22 22:05:36 2008
@@ -17,13 +17,13 @@
   ~ 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">
+<s:i18n name="localization.Continuum">
   <ec:table items="allBuildDefinitionSummaries"
             var="buildDefinitionSummary"
             showExports="false"
@@ -37,10 +37,10 @@
       <ec:column property="buildFile" title="projectView.buildDefinition.buildFile"/>
       <ec:column property="scheduleName" title="projectView.buildDefinition.schedule">
         <redback:ifAuthorized permission="continuum-manage-schedules">
-          <ww:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
-            <ww:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</ww:param>
-          </ww:url>
-          <ww:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</ww:a> 
+          <s:url id="scheduleUrl" action="schedule" namespace="/" includeParams="none">
+            <s:param name="id">${pageScope.buildDefinitionSummary.scheduleId}</s:param>
+          </s:url>
+          <s:a href="%{scheduleUrl}">${pageScope.buildDefinitionSummary.scheduleName}</s:a>
         </redback:ifAuthorized>
         <redback:elseAuthorized>
           ${pageScope.buildDefinitionSummary.scheduleName}
@@ -54,75 +54,75 @@
       <ec:column property="type" title="projectView.buildDefinition.type"/>      
       <ec:column property="buildAction" title="&nbsp;" width="1%">
         <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
-          <ww:url id="buildProjectUrl" action="buildProject" namespace="/">
-            <ww:param name="projectId">${projectId}</ww:param>
-            <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-            <ww:param name="fromProjectPage" value="true"/>
-          </ww:url>
-          <ww:a href="%{buildProjectUrl}"><img src="<ww:url value='/images/buildnow.gif' includeParams="none"/>" alt="<ww:text name='build'/>" title="<ww:text name='build'/>" border="0"></ww:a>
+          <s:url id="buildProjectUrl" action="buildProject" namespace="/">
+            <s:param name="projectId">${projectId}</s:param>
+            <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+            <s:param name="fromProjectPage" value="true"/>
+          </s:url>
+          <s:a href="%{buildProjectUrl}"><img src="<s:url value='/images/buildnow.gif' includeParams="none"/>" alt="<s:text name='build'/>" title="<s:text name='build'/>" border="0"></s:a>
         </redback:ifAuthorized>
         <redback:elseAuthorized>
-          <img src="<ww:url value='/images/buildnow_disabled.gif' includeParams="none"/>" alt="<ww:text name='build'/>" title="<ww:text name='build'/>" border="0" />
+          <img src="<s:url value='/images/buildnow_disabled.gif' includeParams="none"/>" alt="<s:text name='build'/>" title="<s:text name='build'/>" border="0" />
         </redback:elseAuthorized>
       </ec:column>
       <ec:column property="editAction" title="&nbsp;" width="1%">
         <%-- if the from is PROJECT then render the links differently --%>
-        <ww:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
+        <s:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
           <redback:ifAuthorized permission="continuum-modify-project-build-definition" resource="${projectGroupName}">
-            <ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
-              <ww:param name="projectId">${projectId}</ww:param>
-              <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-            </ww:url>
-            <ww:a href="%{editUrl}"><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="editUrl" action="buildDefinition" method="input" namespace="/">
+              <s:param name="projectId">${projectId}</s:param>
+              <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+            </s:url>
+            <s:a href="%{editUrl}"><img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0"></s:a>
           </redback:ifAuthorized>
           <redback:elseAuthorized>
-            <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" />
           </redback:elseAuthorized>
-        </ww:if>
-        <ww:else>
+        </s:if>
+        <s:else>
           <redback:ifAuthorized permission="continuum-modify-group-build-definition" resource="${projectGroupName}">
-            <ww:url id="editUrl" action="buildDefinition" method="input" namespace="/">
-              <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
-              <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-              <ww:param name="groupBuildDefinition">true</ww:param>
-            </ww:url>
-            <ww:a href="%{editUrl}"><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="editUrl" action="buildDefinition" method="input" namespace="/">
+              <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
+              <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+              <s:param name="groupBuildDefinition">true</s:param>
+            </s:url>
+            <s:a href="%{editUrl}"><img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0"></s:a>
           </redback:ifAuthorized>
           <redback:elseAuthorized>
-            <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" />
           </redback:elseAuthorized>
-        </ww:else>
+        </s:else>
       </ec:column>
       <ec:column property="deleteAction" title="&nbsp;" width="1%">
         <%-- if the from is PROJECT then render the links differently --%>
-        <ww:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
+        <s:if test="${pageScope.buildDefinitionSummary.from == 'PROJECT'}">
           <redback:ifAuthorized permission="continuum-remove-project-build-definition" resource="${projectGroupName}">
-            <ww:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
-              <ww:param name="projectId">${projectId}</ww:param>
-              <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-              <ww:param name="confirmed" value="false"/>
-            </ww:url>
-            <ww:a href="%{removeUrl}"><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="removeUrl" action="removeProjectBuildDefinition" namespace="/">
+              <s:param name="projectId">${projectId}</s:param>
+              <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+              <s:param name="confirmed" value="false"/>
+            </s:url>
+            <s:a href="%{removeUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
           </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>
-        </ww:if>
-        <ww:else>
+        </s:if>
+        <s:else>
           <redback:ifAuthorized permission="continuum-remove-group-build-definition" resource="${projectGroupName}">
-            <ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
-              <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
-              <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
-              <ww:param name="groupBuildDefinition">true</ww:param>
-              <ww:param name="confirmed" value="false"/>
-            </ww:url>
-            <ww:a href="%{removeUrl}"><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="removeUrl" action="removeGroupBuildDefinition" namespace="/">
+              <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
+              <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+              <s:param name="groupBuildDefinition">true</s:param>
+              <s:param name="confirmed" value="false"/>
+            </s:url>
+            <s:a href="%{removeUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
           </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>
-        </ww:else>
+        </s:else>
       </ec:column>
     </ec:row>
   </ec:table>
-</ww:i18n>
+</s:i18n>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp Wed Oct 22 22:05:36 2008
@@ -17,11 +17,11 @@
   ~ 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" %>
-<ww:set name="companyLogo" value="companyLogo"/>
+<s:set name="companyLogo" value="companyLogo"/>
 <c:if test="${!empty (companyLogo)}">
-  <ww:set name="companyUrl" value="companyUrl"/>
+  <s:set name="companyUrl" value="companyUrl"/>
   <c:choose>
     <c:when test="${!empty (companyUrl)}">
       <a href="${companyUrl}">

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp Wed Oct 22 22:05:36 2008
@@ -17,11 +17,11 @@
   ~ 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" %>
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
 
   <div class="axial">
     <table>
@@ -30,4 +30,4 @@
       </tr>
     </table>
   </div>
-</ww:i18n>
+</s:i18n>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp Wed Oct 22 22:05:36 2008
@@ -17,15 +17,15 @@
   ~ 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">
+<s:i18n name="localization.Continuum">
 
   <h3>Project Group Notifiers of ${projectGroup.name} group</h3>
-  <ww:if test="${not empty projectGroupNotifierSummaries}">
+  <s:if test="${not empty projectGroupNotifierSummaries}">
   <ec:table items="projectGroupNotifierSummaries"
             var="projectGroupNotifierSummary"
             showExports="false"
@@ -40,50 +40,50 @@
       <!-- ec:column property="sender" title="projectView.notifier.sender"/ -->
       <ec:column property="editActions" title="&nbsp;" width="1%">
         <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
-          <ww:url id="editUrl" action="editProjectGroupNotifier" namespace="/">
-            <ww:param name="projectGroupId">${pageScope.projectGroupNotifierSummary.projectGroupId}</ww:param>
-            <ww:param name="notifierId">${pageScope.projectGroupNotifierSummary.id}</ww:param>
-            <ww:param name="notifierType">${pageScope.projectGroupNotifierSummary.type}</ww:param>
-          </ww:url>
-          <ww:a href="%{editUrl}">
-            <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="editUrl" action="editProjectGroupNotifier" namespace="/">
+            <s:param name="projectGroupId">${pageScope.projectGroupNotifierSummary.projectGroupId}</s:param>
+            <s:param name="notifierId">${pageScope.projectGroupNotifierSummary.id}</s:param>
+            <s:param name="notifierType">${pageScope.projectGroupNotifierSummary.type}</s:param>
+          </s:url>
+          <s:a href="%{editUrl}">
+            <img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name="edit"/>" title="<s:text name="edit"/>" border="0">
+          </s:a>
         </redback:ifAuthorized>
         <redback:elseAuthorized>
-          <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">
         </redback:elseAuthorized>
       </ec:column>    
       <ec:column property="deleteActions" title="&nbsp;" width="1%">
         <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
-          <ww:url id="removeUrl" action="deleteProjectGroupNotifier!default.action" namespace="/">
-            <ww:param name="projectGroupId">${pageScope.projectGroupNotifierSummary.projectGroupId}</ww:param>
-            <ww:param name="notifierId">${pageScope.projectGroupNotifierSummary.id}</ww:param>
-            <ww:param name="notifierType">${pageScope.projectGroupNotifierSummary.type}</ww:param>
-            <ww:param name="confirmed" value="false"/>
-          </ww:url>
-        <ww:a href="%{removeUrl}">
-          <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="removeUrl" action="deleteProjectGroupNotifier!default.action" namespace="/">
+            <s:param name="projectGroupId">${pageScope.projectGroupNotifierSummary.projectGroupId}</s:param>
+            <s:param name="notifierId">${pageScope.projectGroupNotifierSummary.id}</s:param>
+            <s:param name="notifierType">${pageScope.projectGroupNotifierSummary.type}</s:param>
+            <s:param name="confirmed" value="false"/>
+          </s:url>
+        <s:a href="%{removeUrl}">
+          <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">
+        </s:a>
         </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>
+  </s:if>
 
   <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
     <div class="functnbar3">
-      <ww:url id="addUrl" action="addProjectGroupNotifier" namespace="/"  includeContext="false" includeParams="none" />
-      <ww:form action="%{addUrl}" method="post">
-        <input type="hidden" name="projectGroupId" value="<ww:property value="projectGroupId"/>"/>
-        <ww:submit value="%{getText('add')}"/>
-        </ww:form>
+      <s:url id="addUrl" action="addProjectGroupNotifier" namespace="/"  includeContext="false" includeParams="none" />
+      <s:form action="%{addUrl}" method="post">
+        <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
+        <s:submit value="%{getText('add')}"/>
+        </s:form>
     </div>
   </redback:ifAuthorized>
 
-  <ww:if test="${not empty projectNotifierSummaries}">
+  <s:if test="${not empty projectNotifierSummaries}">
     <h3>Project Notifiers</h3>
     <ec:table items="projectNotifierSummaries"
               var="projectNotifierSummary"
@@ -94,10 +94,10 @@
               sortable="false">
       <ec:row>
         <ec:column property="projectName" title="PROJECT NAME">
-          <ww:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
-            <ww:param name="projectId" value="${pageScope.projectNotifierSummary.projectId}"/>
-          </ww:url>
-        <ww:a href="%{projectUrl}">${pageScope.projectNotifierSummary.projectName}</ww:a>
+          <s:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
+            <s:param name="projectId" value="${pageScope.projectNotifierSummary.projectId}"/>
+          </s:url>
+        <s:a href="%{projectUrl}">${pageScope.projectNotifierSummary.projectName}</s:a>
         </ec:column>
         <ec:column property="type" title="projectView.notifier.type"/>
         <ec:column property="recipient" title="projectView.notifier.recipient"/>
@@ -107,51 +107,51 @@
           <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
             <c:choose>
               <c:when test="${!pageScope.projectNotifierSummary.fromProject}">
-                <ww:url id="editUrl" action="editProjectNotifier" namespace="/" includeParams="none">
-                  <ww:param name="projectGroupId">${pageScope.projectNotifierSummary.projectGroupId}</ww:param>
-                  <ww:param name="projectId">${pageScope.projectNotifierSummary.projectId}</ww:param>
-                  <ww:param name="notifierId">${pageScope.projectNotifierSummary.id}</ww:param>
-                  <ww:param name="notifierType">${pageScope.projectNotifierSummary.type}</ww:param>
-                  <ww:param name="fromGroupPage" value="true"/>
-                </ww:url>
-                <ww:a href="%{editUrl}">
-                  <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="editUrl" action="editProjectNotifier" namespace="/" includeParams="none">
+                  <s:param name="projectGroupId">${pageScope.projectNotifierSummary.projectGroupId}</s:param>
+                  <s:param name="projectId">${pageScope.projectNotifierSummary.projectId}</s:param>
+                  <s:param name="notifierId">${pageScope.projectNotifierSummary.id}</s:param>
+                  <s:param name="notifierType">${pageScope.projectNotifierSummary.type}</s:param>
+                  <s:param name="fromGroupPage" value="true"/>
+                </s:url>
+                <s:a href="%{editUrl}">
+                  <img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name="edit"/>" title="<s:text name="edit"/>" border="0">
+                </s:a>
               </c:when>
               <c:otherwise>
-                <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:otherwise>
             </c:choose>
           </redback:ifAuthorized>
           <redback:elseAuthorized>
-            <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">
           </redback:elseAuthorized>
         </ec:column>
         <ec:column property="deleteActions" title="&nbsp;" width="1%">
           <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
             <c:choose>
               <c:when test="${!pageScope.projectNotifierSummary.fromProject}">
-                <ww:url id="removeUrl" action="deleteProjectNotifier" namespace="/">
-                  <ww:param name="projectGroupId">${pageScope.projectNotifierSummary.projectGroupId}</ww:param>
-                  <ww:param name="projectId">${pageScope.projectNotifierSummary.projectId}</ww:param>
-                  <ww:param name="notifierId">${pageScope.projectNotifierSummary.id}</ww:param>
-                  <ww:param name="confirmed" value="false"/>
-                  <ww:param name="fromGroupPage" value="true"/>
-                </ww:url>
-                <ww:a href="%{removeUrl}">
-                  <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="removeUrl" action="deleteProjectNotifier" namespace="/">
+                  <s:param name="projectGroupId">${pageScope.projectNotifierSummary.projectGroupId}</s:param>
+                  <s:param name="projectId">${pageScope.projectNotifierSummary.projectId}</s:param>
+                  <s:param name="notifierId">${pageScope.projectNotifierSummary.id}</s:param>
+                  <s:param name="confirmed" value="false"/>
+                  <s:param name="fromGroupPage" value="true"/>
+                </s:url>
+                <s:a href="%{removeUrl}">
+                  <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">
+                </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>
-</ww:i18n>
+  </s:if>
+</s:i18n>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp Wed Oct 22 22:05:36 2008
@@ -17,78 +17,78 @@
   ~ 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" %>
 
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
 
   <div id="h3">
     <div>
       <p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
-        <ww:url id="projectGroupSummaryUrl" action="projectGroupSummary" includeParams="none">
-          <ww:param name="projectGroupId" value="projectGroupId"/>
-        </ww:url>
-        <ww:url id="projectGroupMembersUrl" action="projectGroupMembers" includeParams="none">
-          <ww:param name="projectGroupId" value="projectGroupId"/>
-        </ww:url>
-        <ww:url id="projectGroupBuildDefinitionUrl" action="projectGroupBuildDefinition" includeParams="none">
-          <ww:param name="projectGroupId" value="projectGroupId"/>
-        </ww:url>
-        <ww:url id="projectGroupNotifierUrl" action="projectGroupNotifier" includeParams="none">
-          <ww:param name="projectGroupId" value="projectGroupId"/>
-        </ww:url>
-        <ww:url id="projectGroupReleaseResultsUrl" action="projectGroupReleaseResults" includeParams="none">
-          <ww:param name="projectGroupId" value="projectGroupId"/>
-        </ww:url>
+        <s:url id="projectGroupSummaryUrl" action="projectGroupSummary" includeParams="none">
+          <s:param name="projectGroupId" value="projectGroupId"/>
+        </s:url>
+        <s:url id="projectGroupMembersUrl" action="projectGroupMembers" includeParams="none">
+          <s:param name="projectGroupId" value="projectGroupId"/>
+        </s:url>
+        <s:url id="projectGroupBuildDefinitionUrl" action="projectGroupBuildDefinition" includeParams="none">
+          <s:param name="projectGroupId" value="projectGroupId"/>
+        </s:url>
+        <s:url id="projectGroupNotifierUrl" action="projectGroupNotifier" includeParams="none">
+          <s:param name="projectGroupId" value="projectGroupId"/>
+        </s:url>
+        <s:url id="projectGroupReleaseResultsUrl" action="projectGroupReleaseResults" includeParams="none">
+          <s:param name="projectGroupId" value="projectGroupId"/>
+        </s:url>
 
-        <ww:set name="tabName" value="tabName"/>
+        <s:set name="tabName" value="tabName"/>
         <c:choose>
             <c:when test="${tabName != 'Summary'}">
-                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupSummaryUrl}"><ww:text name="projectGroup.tab.summary"/></a>
+                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupSummaryUrl}"><s:text name="projectGroup.tab.summary"/></a>
             </c:when>
             <c:otherwise>
-                <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><ww:text name="projectGroup.tab.summary"/></b>
+                <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><s:text name="projectGroup.tab.summary"/></b>
             </c:otherwise>
         </c:choose>
 
         <c:choose>
             <c:when test="${tabName != 'Members'}">
-                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupMembersUrl}"><ww:text name="projectGroup.tab.members"/></a>
+                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupMembersUrl}"><s:text name="projectGroup.tab.members"/></a>
             </c:when>
             <c:otherwise>
-                <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><ww:text name="projectGroup.tab.members"/></b>
+                <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><s:text name="projectGroup.tab.members"/></b>
             </c:otherwise>
         </c:choose>
 
         <c:choose>
             <c:when test="${tabName != 'BuildDefinitions'}">
-                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupBuildDefinitionUrl}"><ww:text name="projectGroup.tab.buildDefinitions"/></a>
+                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupBuildDefinitionUrl}"><s:text name="projectGroup.tab.buildDefinitions"/></a>
             </c:when>
             <c:otherwise>
-                <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><ww:text name="projectGroup.tab.buildDefinitions"/></b>
+                <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><s:text name="projectGroup.tab.buildDefinitions"/></b>
             </c:otherwise>
         </c:choose>
 
         <c:choose>
             <c:when test="${tabName != 'Notifier'}">
-                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupNotifierUrl}"><ww:text name="projectGroup.tab.notifiers"/></a>
+                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupNotifierUrl}"><s:text name="projectGroup.tab.notifiers"/></a>
             </c:when>
             <c:otherwise>
-                <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><ww:text name="projectGroup.tab.notifiers"/></b>
+                <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><s:text name="projectGroup.tab.notifiers"/></b>
             </c:otherwise>
         </c:choose>
         
         <c:choose>
             <c:when test="${tabName != 'ReleaseResults'}">
-                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupReleaseResultsUrl}"><ww:text name="projectGroup.tab.releaseResults"/></a>
+                <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupReleaseResultsUrl}"><s:text name="projectGroup.tab.releaseResults"/></a>
             </c:when>
             <c:otherwise>
-                <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><ww:text name="projectGroup.tab.releaseResults"/></b>
+                <b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><s:text name="projectGroup.tab.releaseResults"/></b>
             </c:otherwise>
         </c:choose>
       </p>
     </div>
   </div>
-</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/components/projectNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp Wed Oct 22 22:05:36 2008
@@ -17,15 +17,15 @@
   ~ 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">
+<s:i18n name="localization.Continuum">
 
 
 TODO: Implement Project Group Notifier Summary
 
 
-</ww:i18n>
\ No newline at end of file
+</s:i18n>
\ No newline at end of file



Mime
View raw message