continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r707273 [7/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/projectView.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp 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" %>
 
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="projectView.page.title"/></title>
+        <title><s:text name="projectView.page.title"/></title>
     </head>
     <body>
       <div id="h3">
@@ -35,7 +35,7 @@
           <jsp:param name="tab" value="view"/>
         </jsp:include>
 
-        <h3><ww:text name="projectView.section.title"/></h3>
+        <h3><s:text name="projectView.section.title"/></h3>
 
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
@@ -43,9 +43,9 @@
             <c1:data label="%{getText('projectView.project.version')}" name="project.version"/>
             <c1:data label="%{getText('projectView.project.scmUrl')}" name="project.scmUrl"/>
             <c1:data label="%{getText('projectView.project.scmTag')}" name="project.scmTag"/>
-            <ww:url id="projectGroupSummaryUrl" value="/projectGroupSummary.action">
-                <ww:param name="projectGroupId" value="%{project.projectGroup.id}"/>
-            </ww:url>            
+            <s:url id="projectGroupSummaryUrl" value="/projectGroupSummary.action">
+                <s:param name="projectGroupId" value="%{project.projectGroup.id}"/>
+            </s:url>
             <c1:data label="%{getText('projectView.project.group')}" name="project.projectGroup.name" valueLink="%{'${projectGroupSummaryUrl}'}"/>
             <c1:data label="%{getText('projectView.project.lastBuildDateTime')}" name="lastBuildDateTime" />
           </table>
@@ -57,15 +57,15 @@
               <tr>
                 <td>
                   <form action="projectEdit.action" method="post">
-                    <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
-                    <input type="submit" name="edit-project" value="<ww:text name="edit"/>"/>
+                    <input type="hidden" name="projectId" value="<s:property value="project.id"/>"/>
+                    <input type="submit" name="edit-project" value="<s:text name="edit"/>"/>
                   </form>
                 </td>
                 <td>
                   <form method="post" action="buildProject.action">
-                    <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
+                    <input type="hidden" name="projectId" value="<s:property value="project.id"/>"/>
                     <input type="hidden" name="fromProjectPage" value="true"/>
-                    <input type="submit" name="build-project" value="<ww:text name="summary.buildNow"/>"/>
+                    <input type="submit" name="build-project" value="<s:text name="summary.buildNow"/>"/>
                   </form>
                 </td>
               </tr>
@@ -75,26 +75,26 @@
           </redback:ifAuthorized>
         </div>
 
-        <h3><ww:text name="projectView.buildDefinitions"/></h3>
+        <h3><s:text name="projectView.buildDefinitions"/></h3>
 
-        <ww:action name="buildDefinitionSummary" id="summary" namespace="component" executeResult="true">
-          <ww:param name="projectId" value="%{project.id}" />
-          <ww:param name="projectGroupId" value="%{project.projectGroup.id}"/>
-        </ww:action>
+        <s:action name="buildDefinitionSummary" id="summary" namespace="component" executeResult="true">
+          <s:param name="projectId" value="%{project.id}" />
+          <s:param name="projectGroupId" value="%{project.projectGroup.id}"/>
+        </s:action>
 
         <div class="functnbar3">
            <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
-          <ww:form action="buildDefinition" method="post">
-            <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
-            <input type="hidden" name="projectGroupId" value="<ww:property value="project.projectGroup.id"/>"/>
-            <ww:submit value="%{getText('add')}"/>
-          </ww:form>
+          <s:form action="buildDefinition" method="post">
+            <input type="hidden" name="projectId" value="<s:property value="project.id"/>"/>
+            <input type="hidden" name="projectGroupId" value="<s:property value="project.projectGroup.id"/>"/>
+            <s:submit value="%{getText('add')}"/>
+          </s:form>
           </redback:ifAuthorized>
         </div>
 
-        <h3><ww:text name="projectView.notifiers"/></h3>
-        <ww:if test="${not empty project.notifiers}">
-          <ww:set name="notifiers" value="project.notifiers" scope="request"/>
+        <h3><s:text name="projectView.notifiers"/></h3>
+        <s:if test="${not empty project.notifiers}">
+          <s:set name="notifiers" value="project.notifiers" scope="request"/>
           <ec:table items="notifiers"
                     var="notifier"
                     showExports="false"
@@ -111,63 +111,63 @@
                 <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
                   <c:choose>
                     <c:when test="${!pageScope.notifier.fromProject}">
-                      <ww:url id="editUrl" action="editProjectNotifier" namespace="/" includeParams="none">
-                        <ww:param name="notifierId" value="${notifier.id}"/>
-                        <ww:param name="projectId" value="project.id"/>
-                        <ww:param name="projectGroupId" value="${project.projectGroup.id}"/>
-                        <ww:param name="notifierType">${notifier.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="editProjectNotifier" namespace="/" includeParams="none">
+                        <s:param name="notifierId" value="${notifier.id}"/>
+                        <s:param name="projectId" value="project.id"/>
+                        <s:param name="projectGroupId" value="${project.projectGroup.id}"/>
+                        <s:param name="notifierType">${notifier.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>
                     </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="deleteAction" title="&nbsp;" width="1%">
                 <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
                   <c:choose>
                     <c:when test="${!pageScope.notifier.fromProject}">
-                      <ww:url id="removeUrl" action="deleteProjectNotifier" namespace="/">
-                        <ww:param name="projectId" value="project.id"/>
-                        <ww:param name="projectGroupId" value="${project.projectGroup.id}"/>
-                        <ww:param name="notifierType">${notifier.type}</ww:param>
-                        <ww:param name="notifierId" value="${notifier.id}"/>
-                    </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="projectId" value="project.id"/>
+                        <s:param name="projectGroupId" value="${project.projectGroup.id}"/>
+                        <s:param name="notifierType">${notifier.type}</s:param>
+                        <s:param name="notifierId" value="${notifier.id}"/>
+                    </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='edit'/>" title="<ww:text name='edit'/>" border="0" />
+                      <img src="<s:url value='/images/delete_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/delete_disabled.gif' includeParams="none"/>" alt="<ww:text name='edit'/>" title="<ww:text name='edit'/>" border="0" />
+                  <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0" />
                 </redback:elseAuthorized>
               </ec:column>
             </ec:row>
           </ec:table>
-        </ww:if>
+        </s:if>
         <div class="functnbar3">
            <redback:ifAuthorized permission="continuum-modify-group" resource="${project.projectGroup.name}">
-          <ww:form action="addProjectNotifier!default.action" method="post">
-            <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
-            <input type="hidden" name="projectGroupId" value="<ww:property value="project.projectGroup.id"/>"/>
-            <ww:submit value="%{getText('add')}"/>
-          </ww:form>
+          <s:form action="addProjectNotifier!default.action" method="post">
+            <input type="hidden" name="projectId" value="<s:property value="project.id"/>"/>
+            <input type="hidden" name="projectGroupId" value="<s:property value="project.projectGroup.id"/>"/>
+            <s:submit value="%{getText('add')}"/>
+          </s:form>
           </redback:ifAuthorized>
         </div>
 
-        <h3><ww:text name="projectView.dependencies"/></h3>
-        <ww:set name="dependencies" value="project.dependencies" scope="request"/>
+        <h3><s:text name="projectView.dependencies"/></h3>
+        <s:set name="dependencies" value="project.dependencies" scope="request"/>
         <ec:table items="dependencies"
                   var="dep"
                   showExports="false"
@@ -182,8 +182,8 @@
           </ec:row>
         </ec:table>
 
-        <h3><ww:text name="projectView.developers"/></h3>
-        <ww:set name="developers" value="project.developers" scope="request"/>
+        <h3><s:text name="projectView.developers"/></h3>
+        <s:set name="developers" value="project.developers" scope="request"/>
         <ec:table items="developers"
                   showExports="false"
                   showPagination="false"
@@ -198,5 +198,5 @@
 
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp Wed Oct 22 22:05:36 2008
@@ -17,71 +17,71 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="releaseProject.page.title"/></title>
+        <title><s:text name="releaseProject.page.title"/></title>
     </head>
     <body>
-      <h2><ww:text name="releaseInProgress.section.title"/></h2>
-      <h3><ww:property value="name"/></h3>
+      <h2><s:text name="releaseInProgress.section.title"/></h2>
+      <h3><s:property value="name"/></h3>
       <div class="axial">
         <table width="100%">
           <tr>
-            <th><ww:text name="releaseInProgress.status"/></th>
-            <th width="100%"><ww:text name="releaseInProgress.phase"/></th>
+            <th><s:text name="releaseInProgress.status"/></th>
+            <th width="100%"><s:text name="releaseInProgress.phase"/></th>
           </tr>
-          <ww:iterator value="listener.phases">
+          <s:iterator value="listener.phases">
             <tr>
               <td>
-              <ww:if test="listener.completedPhases.contains( top )">
-                <img src="<ww:url value='/images/icon_success_sml.gif' includeParams="none"/>"
+              <s:if test="listener.completedPhases.contains( top )">
+                <img src="<s:url value='/images/icon_success_sml.gif' includeParams="none"/>"
                      alt="Done" title="Done" border="0">
-              </ww:if>
-              <ww:elseif test="listener.inProgress.equals( top )">
-                <ww:if test="listener.error == null">
-                  <img src="<ww:url value='/images/building.gif' includeParams="none"/>"
+              </s:if>
+              <s:elseif test="listener.inProgress.equals( top )">
+                <s:if test="listener.error == null">
+                  <img src="<s:url value='/images/building.gif' includeParams="none"/>"
                        alt="In Progress" title="In Progress" border="0">
-                </ww:if>
-                <ww:else>
-                  <img src="<ww:url value='/images/icon_error_sml.gif' includeParams="none"/>"
+                </s:if>
+                <s:else>
+                  <img src="<s:url value='/images/icon_error_sml.gif' includeParams="none"/>"
                        alt="Error" title="Error" border="0">
-                </ww:else>
-              </ww:elseif>
+                </s:else>
+              </s:elseif>
               </td>
-              <td><ww:property/></td>
+              <td><s:property/></td>
             </tr>
-          </ww:iterator>
+          </s:iterator>
         </table>
       </div>
 
       <p>
-        <ww:url id="releaseViewResultUrl" action="releaseViewResult" namespace="/">
-          <ww:param name="releaseId" value="releaseId"/>
-        </ww:url>
-        <ww:a href="%{releaseViewResultUrl}"><ww:text name="releaseInProgress.viewOutput"/></ww:a>
+        <s:url id="releaseViewResultUrl" action="releaseViewResult" namespace="/">
+          <s:param name="releaseId" value="releaseId"/>
+        </s:url>
+        <s:a href="%{releaseViewResultUrl}"><s:text name="releaseInProgress.viewOutput"/></s:a>
       </p>
 
       <table>
         <tr>
           <td>
-            <ww:form action="releaseRollbackWarning" method="post">
-              <ww:hidden name="projectId"/>
-              <ww:hidden name="releaseId"/>
-              <ww:hidden name="releaseGoal"/>
-              <ww:submit value="Rollback Changes"/>
-            </ww:form>
+            <s:form action="releaseRollbackWarning" method="post">
+              <s:hidden name="projectId"/>
+              <s:hidden name="releaseId"/>
+              <s:hidden name="releaseGoal"/>
+              <s:submit value="Rollback Changes"/>
+            </s:form>
           </td>
           <td>
-            <ww:form action="releaseCleanup" method="post">
-              <ww:hidden name="projectId"/>
-              <ww:hidden name="releaseId"/>
-              <ww:submit value="Done"/>
-            </ww:form>
+            <s:form action="releaseCleanup" method="post">
+              <s:hidden name="projectId"/>
+              <s:hidden name="releaseId"/>
+              <s:submit value="Done"/>
+            </s:form>
           </td>
         </tr>
       </table>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp Wed Oct 22 22:05:36 2008
@@ -17,56 +17,56 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="releaseProject.page.title"/></title>
-        <meta http-equiv="refresh" content="10;url=<ww:url includeParams="all" />"/>
+        <title><s:text name="releaseProject.page.title"/></title>
+        <meta http-equiv="refresh" content="10;url=<s:url includeParams="all" />"/>
     </head>
     <body>
-      <h2><ww:text name="releaseInProgress.section.title"/></h2>
-      <h3><ww:property value="name"/></h3>
+      <h2><s:text name="releaseInProgress.section.title"/></h2>
+      <h3><s:property value="name"/></h3>
       <div class="axial">
         <table width="100%">
           <tr>
-            <th><ww:text name="releaseInProgress.status"/></th>
-            <th width="100%"><ww:text name="releaseInProgress.phase"/></th>
+            <th><s:text name="releaseInProgress.status"/></th>
+            <th width="100%"><s:text name="releaseInProgress.phase"/></th>
           </tr>
-          <ww:iterator value="listener.phases">
+          <s:iterator value="listener.phases">
             <tr>
               <td>
-              <ww:if test="listener.completedPhases.contains( top )">
-                <img src="<ww:url value='/images/icon_success_sml.gif' includeParams="none"/>"
+              <s:if test="listener.completedPhases.contains( top )">
+                <img src="<s:url value='/images/icon_success_sml.gif' includeParams="none"/>"
                      alt="Done" title="Done" border="0">
-              </ww:if>
-              <ww:elseif test="listener.inProgress.equals( top )">
-                <ww:if test="listener.error == null">
-                  <img src="<ww:url value='/images/building.gif' includeParams="none"/>"
+              </s:if>
+              <s:elseif test="listener.inProgress.equals( top )">
+                <s:if test="listener.error == null">
+                  <img src="<s:url value='/images/building.gif' includeParams="none"/>"
                        alt="In Progress" title="In Progress" border="0">
-                </ww:if>
-                <ww:else>
-                  <img src="<ww:url value='/images/icon_error_sml.gif' includeParams="none"/>"
+                </s:if>
+                <s:else>
+                  <img src="<s:url value='/images/icon_error_sml.gif' includeParams="none"/>"
                        alt="Error" title="Error" border="0">
-                </ww:else>
-              </ww:elseif>
-              <ww:else>
-                <img src="<ww:url value='/images/inqueue.gif' includeParams="none"/>"
+                </s:else>
+              </s:elseif>
+              <s:else>
+                <img src="<s:url value='/images/inqueue.gif' includeParams="none"/>"
                      alt="Queued" title="Queued" border="0">
-              </ww:else>
+              </s:else>
               </td>
-              <td><ww:property/></td>
+              <td><s:property/></td>
             </tr>
-          </ww:iterator>
+          </s:iterator>
         </table>
       </div>
 
-      <ww:form action="releaseInProgress" method="get">
-        <ww:hidden name="projectId"/>
-        <ww:hidden name="releaseId"/>
-        <ww:hidden name="releaseGoal"/>
-        <ww:submit value="Refresh"/>
-      </ww:form>
+      <s:form action="releaseInProgress" method="get">
+        <s:hidden name="projectId"/>
+        <s:hidden name="releaseId"/>
+        <s:hidden name="releaseGoal"/>
+        <s:submit value="Refresh"/>
+      </s:form>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInitialized.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInitialized.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInitialized.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInitialized.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" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="releaseProject.page.title"/></title>
-        <meta http-equiv="refresh" content="10;url=<ww:url includeParams="all" />"/>
+        <title><s:text name="releaseProject.page.title"/></title>
+        <meta http-equiv="refresh" content="10;url=<s:url includeParams="all" />"/>
     </head>
     <body>
-      <h2><ww:text name="releaseInProgress.section.title"/></h2>
-      <h3><ww:property value="name"/></h3>
+      <h2><s:text name="releaseInProgress.section.title"/></h2>
+      <h3><s:property value="name"/></h3>
       <p>
         The release goal is currently initializing...
       </p>
       <p>
         Please wait while the server prepares your project for release.
       </p>
-      <ww:form action="releaseInProgress" method="get">
-        <ww:hidden name="projectId"/>
-        <ww:hidden name="releaseId"/>
-        <ww:hidden name="releaseGoal"/>
-        <ww:submit value="Refresh"/>
-      </ww:form>
+      <s:form action="releaseInProgress" method="get">
+        <s:hidden name="projectId"/>
+        <s:hidden name="releaseId"/>
+        <s:hidden name="releaseGoal"/>
+        <s:submit value="Refresh"/>
+      </s:form>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.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" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="releaseProject.page.title"/></title>
+        <title><s:text name="releaseProject.page.title"/></title>
     </head>
     <body>
-      <h2><ww:text name="releasePerform.section.title"/></h2>
-      <ww:form action="releasePerform" method="post" validate="true">
-        <h3><ww:text name="releasePerform.parameters"/></h3>
-        <ww:hidden name="projectId"/>
-        <ww:hidden name="releaseId"/>
+      <h2><s:text name="releasePerform.section.title"/></h2>
+      <s:form action="releasePerform" method="post" validate="true">
+        <h3><s:text name="releasePerform.parameters"/></h3>
+        <s:hidden name="projectId"/>
+        <s:hidden name="releaseId"/>
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
-            <ww:textfield label="Maven Arguments" name="goals" value="clean deploy"/>
-            <ww:checkbox label="Use Release Profile" name="useReleaseProfile" value="true"/>
+            <s:textfield label="Maven Arguments" name="goals" value="clean deploy"/>
+            <s:checkbox label="Use Release Profile" name="useReleaseProfile" value="true"/>
           </table>
         </div>
-        <ww:submit/>
-      </ww:form>
+        <s:submit/>
+      </s:form>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp Wed Oct 22 22:05:36 2008
@@ -17,35 +17,35 @@
   ~ 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" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="releaseProject.page.title"/></title>
+        <title><s:text name="releaseProject.page.title"/></title>
     </head>
     <body>
       <h2>Perform Project Release</h2>
-      <ww:form action="releasePerformFromScm" method="post" validate="true">
+      <s:form action="releasePerformFromScm" method="post" validate="true">
         <h3>Release Perform Parameters</h3>
-        <ww:hidden name="projectId"/>
+        <s:hidden name="projectId"/>
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
-            <ww:textfield label="%{getText('releasePerformFromScm.scmUrl.label')}" name="scmUrl"/>
-            <ww:textfield label="%{getText('releasePerformFromScm.scmUsername.label')}" name="scmUsername"/>
-            <ww:password label="%{getText('releasePerformFromScm.scmPassword.label')}" name="scmPassword"/>
-            <ww:textfield label="%{getText('releasePerformFromScm.scmTag.label')}" name="scmTag"/>
+            <s:textfield label="%{getText('releasePerformFromScm.scmUrl.label')}" name="scmUrl"/>
+            <s:textfield label="%{getText('releasePerformFromScm.scmUsername.label')}" name="scmUsername"/>
+            <s:password label="%{getText('releasePerformFromScm.scmPassword.label')}" name="scmPassword"/>
+            <s:textfield label="%{getText('releasePerformFromScm.scmTag.label')}" name="scmTag"/>
             <c:if test="${!empty (scmTagBase)}">
-              <ww:textfield label="%{getText('releasePerformFromScm.scmTagBase.label')}" name="scmTagBase"/>
+              <s:textfield label="%{getText('releasePerformFromScm.scmTagBase.label')}" name="scmTagBase"/>
             </c:if>
-            <ww:textfield label="%{getText('releasePerformFromScm.goals.label')}" name="goals" value="clean deploy"/>
-            <ww:checkbox label="%{getText('releasePerformFromScm.useReleaseProfile.label')}" name="useReleaseProfile" value="true"/>
-            <ww:select label="%{getText('releasePerformFromScm.buildEnvironment.label')}" name="profileId" list="profiles" listValue="name" 
+            <s:textfield label="%{getText('releasePerformFromScm.goals.label')}" name="goals" value="clean deploy"/>
+            <s:checkbox label="%{getText('releasePerformFromScm.useReleaseProfile.label')}" name="useReleaseProfile" value="true"/>
+            <s:select label="%{getText('releasePerformFromScm.buildEnvironment.label')}" name="profileId" list="profiles" listValue="name"
                        listKey="id" headerKey="-1" headerValue=""/>
           </table>
         </div>
-        <ww:submit/>
-      </ww:form>
+        <s:submit/>
+      </s:form>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp Wed Oct 22 22:05:36 2008
@@ -17,58 +17,58 @@
   ~ 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" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-      <title><ww:text name="releaseProject.page.title"/></title>
-      <ww:head />
+      <title><s:text name="releaseProject.page.title"/></title>
+      <s:head />
     </head>
     <body>
-      <h2><ww:text name="releasePrepare.section.title"/></h2>
-      <ww:form action="releasePrepare" method="post">
-        <h3><ww:text name="releasePrepare.parameters"/></h3>
-        <input type="hidden" name="projectId" value="<ww:property value="projectId"/>"/>
+      <h2><s:text name="releasePrepare.section.title"/></h2>
+      <s:form action="releasePrepare" method="post">
+        <h3><s:text name="releasePrepare.parameters"/></h3>
+        <input type="hidden" name="projectId" value="<s:property value="projectId"/>"/>
         <div class="axial">
           <table border="1" cellspacing="2" cellpadding="3" width="100%">
-            <ww:textfield label="%{getText('releasePrepare.scmUsername.label')}" name="scmUsername" required="true"/>
-            <ww:password label="%{getText('releasePrepare.scmPassword.label')}" name="scmPassword" required="true"/>
-            <ww:textfield label="%{getText('releasePrepare.scmTag.label')}" name="scmTag" required="true"/>
+            <s:textfield label="%{getText('releasePrepare.scmUsername.label')}" name="scmUsername" required="true"/>
+            <s:password label="%{getText('releasePrepare.scmPassword.label')}" name="scmPassword" required="true"/>
+            <s:textfield label="%{getText('releasePrepare.scmTag.label')}" name="scmTag" required="true"/>
             <c:if test="${!empty (scmTagBase)}">
-              <ww:textfield label="%{getText('releasePrepare.scmTagBase.label')}" name="scmTagBase"/>
+              <s:textfield label="%{getText('releasePrepare.scmTagBase.label')}" name="scmTagBase"/>
             </c:if>
-            <ww:textfield label="%{getText('releasePrepare.prepareGoals.label')}" name="prepareGoals" required="true"/>
-            <ww:select label="%{getText('releasePrepare.buildEnvironment.label')}" name="profileId" list="profiles" listValue="name" 
+            <s:textfield label="%{getText('releasePrepare.prepareGoals.label')}" name="prepareGoals" required="true"/>
+            <s:select label="%{getText('releasePrepare.buildEnvironment.label')}" name="profileId" list="profiles" listValue="name"
                        listKey="id" headerKey="-1" headerValue=""/>
           </table>
         </div>
 
-        <ww:iterator value="projects">
-          <h3><ww:property value="name"/></h3>
-          <input type="hidden" name="projectKeys" value="<ww:property value="key"/>">
+        <s:iterator value="projects">
+          <h3><s:property value="name"/></h3>
+          <input type="hidden" name="projectKeys" value="<s:property value="key"/>">
           <div class="axial">
             <table border="1" cellspacing="2" cellpadding="3" width="100%">
               <tr>
-                <th><ww:text name="releasePrepare.releaseVersion"/></th>
+                <th><s:text name="releasePrepare.releaseVersion"/></th>
                 <td>
                   <input type=text name="relVersions"
-                         value="<ww:property value="release"/>" size="100">
+                         value="<s:property value="release"/>" size="100">
                 </td>
               </tr>
               <tr>
-                <th><ww:text name="releasePrepare.nextDevelopmentVersion"/></th>
+                <th><s:text name="releasePrepare.nextDevelopmentVersion"/></th>
                 <td>
                   <input type=text name="devVersions"
-                         value="<ww:property value="dev"/>" size="100">
+                         value="<s:property value="dev"/>" size="100">
                 </td>
               </tr>
              </table>
            </div>
-        </ww:iterator>
+        </s:iterator>
 
-        <ww:submit/>
-      </ww:form>
+        <s:submit/>
+      </s:form>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseProject.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseProject.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseProject.jsp Wed Oct 22 22:05:36 2008
@@ -17,38 +17,38 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="releaseProject.page.title"/></title>
+        <title><s:text name="releaseProject.page.title"/></title>
     </head>
     <body>
       <h3>
-        <ww:text name="releaseProject.section.title">
-          <ww:param><ww:property value="projectName"/></ww:param>
-        </ww:text>
+        <s:text name="releaseProject.section.title">
+          <s:param><s:property value="projectName"/></s:param>
+        </s:text>
       </h3>
-      <ww:form action="releaseProject" method="post">
+      <s:form action="releaseProject" method="post">
         <p>
-          <input name="goal" type="radio" value="prepare" checked/><ww:text name="releaseProject.prepareReleaseOption"/>
+          <input name="goal" type="radio" value="prepare" checked/><s:text name="releaseProject.prepareReleaseOption"/>
           <br/>
-          <input name="goal" type="radio" value="perform"/><ww:text name="releaseProject.performReleaseOption"/>
+          <input name="goal" type="radio" value="perform"/><s:text name="releaseProject.performReleaseOption"/>
           <br/>
           &nbsp;&nbsp;&nbsp;
           <select name="preparedReleaseId">
-            <ww:if test="preparedReleaseName != null">
-              <option selected value="<ww:property value="preparedReleaseId"/>">
-                <ww:property value="preparedReleaseName"/>
+            <s:if test="preparedReleaseName != null">
+              <option selected value="<s:property value="preparedReleaseId"/>">
+                <s:property value="preparedReleaseName"/>
               </option>
-            </ww:if>
-            <option value=""><ww:text name="releaseProject.provideReleaseParameters"/></option>
+            </s:if>
+            <option value=""><s:text name="releaseProject.provideReleaseParameters"/></option>
           </select>
           <br/>
         </p>
-        <input name="projectId" type="hidden" value="<ww:property value="projectId"/>"/>
-        <ww:submit value="Submit"/>
-      </ww:form>
+        <input name="projectId" type="hidden" value="<s:property value="projectId"/>"/>
+        <s:submit value="Submit"/>
+      </s:form>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp Wed Oct 22 22:05:36 2008
@@ -17,38 +17,38 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="releaseProject.page.title"/></title>
+        <title><s:text name="releaseProject.page.title"/></title>
     </head>
     <body>
       <h3>
-        <ww:text name="releaseProject.section.title">
-          <ww:param><ww:property value="projectName"/></ww:param>
-        </ww:text>
+        <s:text name="releaseProject.section.title">
+          <s:param><s:property value="projectName"/></s:param>
+        </s:text>
       </h3>
       <p>This will revert all changes made by the previous release?</p>
       <table>
         <tr>
           <td>
-            <ww:form action="releaseRollback" method="post">
-              <ww:hidden name="projectId"/>
-              <ww:hidden name="releaseId"/>
-              <ww:submit value="Rollback Changes"/>
-            </ww:form>
+            <s:form action="releaseRollback" method="post">
+              <s:hidden name="projectId"/>
+              <s:hidden name="releaseId"/>
+              <s:submit value="Rollback Changes"/>
+            </s:form>
           </td>
           <td>
-            <ww:form action="releaseInProgress" method="post">
-              <ww:hidden name="projectId"/>
-              <ww:hidden name="releaseId"/>
-              <ww:hidden name="releaseGoal"/>
-              <ww:submit value="Cancel"/>
-            </ww:form>
+            <s:form action="releaseInProgress" method="post">
+              <s:hidden name="projectId"/>
+              <s:hidden name="releaseId"/>
+              <s:hidden name="releaseGoal"/>
+              <s:submit value="Cancel"/>
+            </s:form>
           </td>
         </tr>
       </table>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.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="releaseProject.page.title"/></title>
+        <title><s:text name="releaseProject.page.title"/></title>
     </head>
     <body>
-      <h2><ww:text name="releaseViewResult.section.title"/></h2>
+      <h2><s:text name="releaseViewResult.section.title"/></h2>
 
-      <h4><ww:text name="releaseViewResult.summary"/></h4>
+      <h4><s:text name="releaseViewResult.summary"/></h4>
       <div class="axial">
         <table border="1" cellspacing="2" cellpadding="3" width="100%">
           <c1:data label="%{getText('releaseViewResult.projectName')}">
-            <ww:param name="after"><ww:property value="projectName"/></ww:param>
+            <s:param name="after"><s:property value="projectName"/></s:param>
           </c1:data>
           <c1:data label="%{getText('releaseViewResult.releaseGoal')}">
-            <ww:param name="after"><ww:property value="releaseGoal"/></ww:param>
+            <s:param name="after"><s:property value="releaseGoal"/></s:param>
           </c1:data>
           <c1:data label="%{getText('releaseViewResult.startTime')}">
-              <ww:param name="after"><c1:date name="result.startTime"/></ww:param>
+              <s:param name="after"><c1:date name="result.startTime"/></s:param>
           </c1:data>
           <c1:data label="%{getText('releaseViewResult.endTime')}">
-              <ww:param name="after"><c1:date name="result.endTime"/></ww:param>
+              <s:param name="after"><c1:date name="result.endTime"/></s:param>
           </c1:data>
           <c1:data label="%{getText('releaseViewResult.state')}">
-            <ww:param name="after">
-              <ww:if test="result.resultCode == 0">
-                <ww:text name="releaseViewResult.success"/>
-              </ww:if>
-              <ww:else>
-                <ww:text name="releaseViewResult.error"/>
-              </ww:else>
-            </ww:param>
+            <s:param name="after">
+              <s:if test="result.resultCode == 0">
+                <s:text name="releaseViewResult.success"/>
+              </s:if>
+              <s:else>
+                <s:text name="releaseViewResult.error"/>
+              </s:else>
+            </s:param>
           </c1:data>
         </table>
       </div>
 
-      <h4><ww:text name="releaseViewResult.output"/></h4>
+      <h4><s:text name="releaseViewResult.output"/></h4>
       <p>
-        <ww:if test="result.output == ''">
-            <ww:text name="releaseViewResult.noOutput"/>
-        </ww:if>
-        <ww:else>
+        <s:if test="result.output == ''">
+            <s:text name="releaseViewResult.noOutput"/>
+        </s:if>
+        <s:else>
           <div style="width:100%; height:500px; overflow:auto; border-style: solid; border-width: 1px">
-            <pre><ww:property value="result.output"/></pre>
+            <pre><s:property value="result.output"/></pre>
           </div>
-        </ww:else>
+        </s:else>
       </p>
       <input type="button" value="Back" onClick="history.go(-1)">
 
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp Wed Oct 22 22:05:36 2008
@@ -17,18 +17,18 @@
   ~ 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="schedules.page.title"/></title>
+        <title><s:text name="schedules.page.title"/></title>
     </head>
     <body>
       <div id="h3">
-        <h3><ww:text name="schedules.section.title"/></h3>
-        <ww:set name="schedules" value="schedules" scope="request"/>
+        <h3><s:text name="schedules.section.title"/></h3>
+        <s:set name="schedules" value="schedules" scope="request"/>
         <ec:table items="schedules"
                   var="schedule"
                   showExports="false"
@@ -44,26 +44,26 @@
             <ec:column property="maxJobExecutionTime" title="schedules.table.maxJobExecutionTime"/>
             <ec:column property="active" title="schedules.table.active"/>
             <ec:column property="editActions" title="&nbsp;" width="1%">
-                <ww:url id="editScheduleUrl" action="schedule">
-                  <ww:param name="id" value="${pageScope.schedule.id}"/>
-                </ww:url>
-                <ww:a href="%{editScheduleUrl}"><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="editScheduleUrl" action="schedule">
+                  <s:param name="id" value="${pageScope.schedule.id}"/>
+                </s:url>
+                <s:a href="%{editScheduleUrl}"><img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name='edit'/>" title="<s:text name='edit'/>" border="0" /></s:a>
             </ec:column>
             <ec:column property="editActions" title="&nbsp;" width="1%">
-                <ww:url id="removeScheduleUrl" action="removeSchedule">
-                  <ww:param name="id" value="${pageScope.schedule.id}"/>
-                  <ww:param name="name" value="%{'${pageScope.schedule.name}'}"/>                  
-                </ww:url>
-                <ww:a href="%{removeScheduleUrl}"><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="removeScheduleUrl" action="removeSchedule">
+                  <s:param name="id" value="${pageScope.schedule.id}"/>
+                  <s:param name="name" value="%{'${pageScope.schedule.name}'}"/>
+                </s:url>
+                <s:a href="%{removeScheduleUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
             </ec:column>
           </ec:row>
         </ec:table>
       </div>
       <div class="functnbar3">
-        <ww:form action="schedule" method="post">
-          <ww:submit value="%{getText('add')}"/>
-        </ww:form>
+        <s:form action="schedule" 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/surefireReport.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.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 prefix="c1" uri="continuum" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="surefireReport.page.title"/></title>
+        <title><s:text name="surefireReport.page.title"/></title>
     </head>
     <body>
       <div id="h3">
@@ -34,13 +34,13 @@
         </jsp:include>
 
         <h3>
-            <ww:text name="surefireReport.section.title">
-              <ww:param><ww:property value="projectName"/></ww:param>
-              <ww:param><ww:property value="buildId"/></ww:param>
-            </ww:text>
+            <s:text name="surefireReport.section.title">
+              <s:param><s:property value="projectName"/></s:param>
+              <s:param><s:property value="buildId"/></s:param>
+            </s:text>
         </h3>
 
-        <h4><ww:text name="surefireReport.summary"/></h4>
+        <h4><s:text name="surefireReport.summary"/></h4>
         <ec:table items="testSummaryList"
                   var="summary"
                   showExports="false"
@@ -57,7 +57,7 @@
           </ec:row>
         </ec:table>
 
-        <h4><ww:text name="surefireReport.packageList"/></h4>
+        <h4><s:text name="surefireReport.packageList"/></h4>
         <ec:table items="testPackageList"
                   var="report"
                   showExports="false"
@@ -77,8 +77,8 @@
           </ec:row>
         </ec:table>
 
-        <ww:iterator value="testPackageList">
-          <h5><a name="<ww:property value="name"/>"><ww:property value="name"/></a></h5>
+        <s:iterator value="testPackageList">
+          <h5><a name="<s:property value="name"/>"><s:property value="name"/></a></h5>
           <ec:table items="children"
                     var="report"
                     showExports="false"
@@ -88,16 +88,16 @@
                     filterable="false">
             <ec:row>
               <!-- @todo there must be a better option than to use #attr -->
-              <ww:if test="#attr.report.errors > 0 || #attr.report.failures > 0">
+              <s:if test="#attr.report.errors > 0 || #attr.report.failures > 0">
                 <ec:column property="icon" title="&nbsp;" width="1%">
-                  <img src="<ww:url value="/images/icon_error_sml.gif" includeParams="none"/>" alt="<ww:text name="message.error"/>" title="<ww:text name="message.error"/>"/>
+                  <img src="<s:url value="/images/icon_error_sml.gif" includeParams="none"/>" alt="<s:text name="message.error"/>" title="<s:text name="message.error"/>"/>
                 </ec:column>
-              </ww:if>
-              <ww:else>
+              </s:if>
+              <s:else>
                 <ec:column property="icon" title="&nbsp;" width="1%">
-                  <img src="<ww:url value="/images/icon_success_sml.gif" includeParams="none"/>" alt="<ww:text name="message.success"/>" title="<ww:text name="message.success"/>"/>
+                  <img src="<s:url value="/images/icon_success_sml.gif" includeParams="none"/>" alt="<s:text name="message.success"/>" title="<s:text name="message.success"/>"/>
                 </ec:column>
-              </ww:else>
+              </s:else>
               <ec:column property="name" title="surefireReport.class">
                 <a href="#<c:out value="${pageScope.report.id}"/>"><c:out value="${pageScope.report.name}"/></a>
               </ec:column>
@@ -108,12 +108,12 @@
               <ec:column property="elapsedTime" title="surefireReport.time"/>
             </ec:row>
           </ec:table>
-        </ww:iterator>
+        </s:iterator>
 
-        <h4><ww:text name="surefireReport.testCases"/></h4>
-        <ww:iterator value="testPackageList">
-          <ww:iterator value="children">
-            <h5><a name="<ww:property value="id"/>"><ww:property value="name"/></a></h5>
+        <h4><s:text name="surefireReport.testCases"/></h4>
+        <s:iterator value="testPackageList">
+          <s:iterator value="children">
+            <h5><a name="<s:property value="id"/>"><s:property value="name"/></a></h5>
             <ec:table items="children"
                       var="testCase"
                       showExports="false"
@@ -123,9 +123,9 @@
                       filterable="false">
               <ec:row>
                 <!-- @todo there must be a better option than to use #attr -->
-                <ww:if test="#attr.testCase.failureType != null">
+                <s:if test="#attr.testCase.failureType != null">
                   <ec:column property="icon" title="&nbsp;" width="1%">
-                    <img src="<ww:url value="/images/icon_error_sml.gif" includeParams="none"/>" alt="<ww:text name="message.error"/>" title="<ww:text name="message.error"/>"/>
+                    <img src="<s:url value="/images/icon_error_sml.gif" includeParams="none"/>" alt="<s:text name="message.error"/>" title="<s:text name="message.error"/>"/>
                   </ec:column>
                   <ec:column property="name" title="surefireReport.testCase" sortable="false">
                     <c:out value="${pageScope.testCase.name}"/><br/><br/>
@@ -133,19 +133,19 @@
                       <c:out value="${pageScope.testCase.failureDetails}"/>
                     </pre>
                   </ec:column>
-                </ww:if>
-                <ww:else>
+                </s:if>
+                <s:else>
                   <ec:column property="icon" title="&nbsp;" width="1%">
-                    <img src="<ww:url value="/images/icon_success_sml.gif" includeParams="none"/>" alt="<ww:text name="message.success"/>" title="<ww:text name="message.success"/>"/>
+                    <img src="<s:url value="/images/icon_success_sml.gif" includeParams="none"/>" alt="<s:text name="message.success"/>" title="<s:text name="message.success"/>"/>
                   </ec:column>
                   <ec:column property="name" title="surefireReport.testCase"/>
-                </ww:else>
+                </s:else>
                 <ec:column property="time" title="surefireReport.time"/>
               </ec:row>
             </ec:table>
-          </ww:iterator>
-        </ww:iterator>
+          </s:iterator>
+        </s:iterator>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/workingCopy.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/workingCopy.jsp?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/workingCopy.jsp (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/workingCopy.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" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="workingCopy.page.title"/></title>
+        <title><s:text name="workingCopy.page.title"/></title>
     </head>
     <body>
       <div id="h3">
@@ -31,29 +31,29 @@
         </jsp:include>
 
         <h3>
-            <ww:text name="workingCopy.section.title">
-                <ww:param><ww:property value="projectName"/></ww:param>
-            </ww:text>
+            <s:text name="workingCopy.section.title">
+                <s:param><s:property value="projectName"/></s:param>
+            </s:text>
         </h3>
 
-        <ww:property value="output" escape="false"/>
+        <s:property value="output" escape="false"/>
 
         <%
             if ( request.getParameter( "file" ) != null )
             {
         %>
         <p>
-        <ww:url id="workingCopyTextUrl" action="workingCopyFileText">
-          <ww:param name="projectId" value="projectId"/>
-          <ww:param name="projectName" value="projectName"/>
-          <ww:param name="userDirectory" value="userDirectory"/>
-          <ww:param name="file" value="file"/>
-        </ww:url>
-        <ww:a href="%{workingCopyTextUrl}"><ww:text name="workingCopy.currentFile.text"/></ww:a>
+        <s:url id="workingCopyTextUrl" action="workingCopyFileText">
+          <s:param name="projectId" value="projectId"/>
+          <s:param name="projectName" value="projectName"/>
+          <s:param name="userDirectory" value="userDirectory"/>
+          <s:param name="file" value="file"/>
+        </s:url>
+        <s:a href="%{workingCopyTextUrl}"><s:text name="workingCopy.currentFile.text"/></s:a>
         </p>
         
         <form>
-          <textarea rows="50" cols="100" readonly="true"><ww:property value="fileContent"/></textarea>
+          <textarea rows="50" cols="100" readonly="true"><s:property value="fileContent"/></textarea>
         </form>
         <%
             }
@@ -61,5 +61,5 @@
 
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java Wed Oct 22 22:05:36 2008
@@ -61,7 +61,7 @@
     public void testActionLogging()
         throws Exception
     {
-        TestAction testAction = (TestAction) lookup( "com.opensymphony.xwork.Action", "testAction" );
+        TestAction testAction = (TestAction) lookup( "com.opensymphony.xwork2.Action", "testAction" );
         String testString = "action test string";
         testAction.setTestString( testString );
 

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java Wed Oct 22 22:05:36 2008
@@ -19,8 +19,6 @@
  * under the License.
  */
 
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;
-
 /**
  * TestAction:
  *

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/META-INF/plexus/components.xml?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/META-INF/plexus/components.xml (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/META-INF/plexus/components.xml Wed Oct 22 22:05:36 2008
@@ -20,7 +20,7 @@
 <component-set>
   <components>
     <component>
-      <role>com.opensymphony.xwork.Action</role>
+      <role>com.opensymphony.xwork2.Action</role>
       <role-hint>testAction</role-hint>
       <implementation>org.apache.maven.continuum.web.action.TestAction</implementation>
     </component>

Modified: continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/log4j.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/log4j.xml?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/log4j.xml (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/log4j.xml Wed Oct 22 22:05:36 2008
@@ -61,14 +61,10 @@
   </logger>
 
   <!-- CONTINUUM-1228 -->
-  <logger name="com.opensymphony.xwork.util.OgnlUtil">
+  <logger name="com.opensymphony.xwork2.util.OgnlUtil">
     <level value="error"/>
   </logger>
 
-  <logger name="com.opensymphony.webwork">
-    <level value="info"/>
-  </logger>
-
   <logger name="org.codehaus.plexus.PlexusContainer">
     <level value="info"/>
   </logger>

Modified: continuum/branches/continuum-struts2/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml (original)
+++ continuum/branches/continuum-struts2/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml Wed Oct 22 22:05:36 2008
@@ -54,10 +54,6 @@
       <version>1.0-alpha-20</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-xwork-integration</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.xmlrpc</groupId>
       <artifactId>xmlrpc-server</artifactId>
       <version>3.0</version>

Modified: continuum/branches/continuum-struts2/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java (original)
+++ continuum/branches/continuum-struts2/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java Wed Oct 22 22:05:36 2008
@@ -38,7 +38,6 @@
 import org.codehaus.plexus.redback.system.DefaultSecuritySession;
 import org.codehaus.plexus.redback.system.SecuritySystem;
 import org.codehaus.plexus.redback.users.UserNotFoundException;
-import org.codehaus.plexus.xwork.PlexusLifecycleListener;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
@@ -200,16 +199,6 @@
 
         ServletContext context = sc.getServletContext();
 
-        // Attempt to find it already loaded by xwork.
-        PlexusContainer xworkContainer = (PlexusContainer) context.getAttribute( PlexusLifecycleListener.KEY );
-
-        if ( xworkContainer != null )
-        {
-            context.setAttribute( PlexusConstants.PLEXUS_KEY, xworkContainer );
-
-            return;
-        }
-
         // Container not found.
 
         if ( context.getAttribute( PlexusConstants.PLEXUS_KEY ) != null )

Modified: continuum/branches/continuum-struts2/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/pom.xml?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/pom.xml (original)
+++ continuum/branches/continuum-struts2/pom.xml Wed Oct 22 22:05:36 2008
@@ -766,7 +766,7 @@
         <artifactId>plexus-quartz</artifactId>
         <version>1.0-alpha-4</version>
       </dependency>
-      <dependency>
+      <!-- dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-xwork-integration</artifactId>
         <version>1.0-alpha-7</version>
@@ -780,7 +780,7 @@
             <artifactId>plexus-container-default</artifactId>
           </exclusion>
         </exclusions>
-      </dependency>
+      </dependency -->
       <dependency>
         <groupId>commons-configuration</groupId>
         <artifactId>commons-configuration</artifactId>
@@ -801,6 +801,28 @@
         <artifactId>commons-io</artifactId>
         <version>1.4</version>
       </dependency>      
+      <dependency>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-core</artifactId>
+        <version>2.0.11.2</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-spring-plugin</artifactId>
+        <version>2.0.11.2</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <!--
         Plexus Redback Dependencies
         -->
@@ -867,30 +889,48 @@
       </dependency>
       <dependency>
         <groupId>org.codehaus.redback</groupId>
-        <artifactId>redback-taglib</artifactId>
+        <artifactId>redback-struts2-taglib</artifactId>
         <version>${redback.version}</version>
         <exclusions>
           <exclusion>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-container-default</artifactId>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.redback</groupId>
-        <artifactId>redback-xwork-content</artifactId>
+        <artifactId>redback-struts2-content</artifactId>
         <version>${redback.version}</version>
         <type>war</type>
+        <exclusions>
+          <exclusion>
+            <groupId>classworlds</groupId>
+            <artifactId>classworlds</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.redback</groupId>
-        <artifactId>redback-xwork-integration</artifactId>
+        <artifactId>redback-struts2-integration</artifactId>
         <version>${redback.version}</version>
         <exclusions>
           <exclusion>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-container-default</artifactId>
+            <groupId>classworlds</groupId>
+            <artifactId>classworlds</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>velocity</groupId>
+            <artifactId>velocity-dep</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion> 
         </exclusions>
       </dependency>
       <dependency>
@@ -1032,7 +1072,7 @@
     <spring.version>2.5.4</spring.version>
     <wagon.version>1.0-beta-2</wagon.version>
     <maven-scm.version>1.1</maven-scm.version>
-    <redback.version>1.1.2-SNAPSHOT</redback.version>
+    <redback.version>1.2-SNAPSHOT</redback.version>
     <mail-sender.version>1.0-alpha-7</mail-sender.version>
     <archiva.version>1.1</archiva.version>
   </properties>



Mime
View raw message