continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r711259 [6/7] - in /continuum/trunk: ./ continuum-core/ continuum-core/src/test/resources/ continuum-data-management/data-management-cli/ continuum-webapp/ continuum-webapp/src/main/java/org/apache/continuum/web/action/ continuum-webapp/src...
Date Tue, 04 Nov 2008 14:16:45 GMT
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp Tue Nov  4 06:16:37 2008
@@ -17,16 +17,16 @@
   ~ 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>
-				<META HTTP-EQUIV="refresh" CONTENT="2;url=<ww:url includeParams="all"/>"/>
+				<META HTTP-EQUIV="refresh" CONTENT="2;url=<s:url includeParams="all"/>"/>
     </head>
     <body>
 			<img src="images/wait.gif">
-			<b><ww:text name="wait.addprocessing.processing"/></b>
+			<b><s:text name="wait.addprocessing.processing"/></b>
 		</body>
-	</ww:i18n>
+	</s:i18n>
 </html>
\ No newline at end of file

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp Tue Nov  4 06:16:37 2008
@@ -17,45 +17,45 @@
   ~ 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="deleteNotifier.page.title"/></title>
+        <title><s:text name="deleteNotifier.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="deleteNotifier.section.title"/></h3>
+        <h3><s:text name="deleteNotifier.section.title"/></h3>
 
         <div class="warningmessage">
           <p>
             <strong>
-                <ww:text name="deleteNotifier.confirmation.message">
-                    <ww:param><ww:property value="notifierType"/></ww:param>
-                    <ww:param><ww:property value="recipient"/></ww:param>
-                </ww:text>
+                <s:text name="deleteNotifier.confirmation.message">
+                    <s:param><s:property value="notifierType"/></s:param>
+                    <s:param><s:property value="recipient"/></s:param>
+                </s:text>
             </strong>
           </p>
         </div>
         <div class="functnbar3">
-          <ww:if test="${projectId == -1}">
-            <ww:form action="deleteProjectGroupNotifier.action" method="post">
-              <ww:hidden name="notifierId"/>
-              <ww:hidden name="projectGroupId" />
+          <s:if test="projectId == -1">
+            <s:form action="deleteProjectGroupNotifier.action" method="post">
+              <s:hidden name="notifierId"/>
+              <s:hidden name="projectGroupId" />
               <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
-            </ww:form>
-          </ww:if>
-          <ww:else>
-            <ww:form action="deleteProjectNotifier.action" method="post">
-              <ww:hidden name="notifierId"/>
-              <ww:hidden name="projectId"/>
-              <ww:hidden name="projectGroupId" />
+            </s:form>
+          </s:if>
+          <s:else>
+            <s:form action="deleteProjectNotifier.action" method="post">
+              <s:hidden name="notifierId"/>
+              <s:hidden name="projectId"/>
+              <s:hidden name="projectGroupId" />
               <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
-            </ww:form>
-          </ww:else>
+            </s:form>
+          </s:else>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp Tue Nov  4 06:16:37 2008
@@ -17,62 +17,63 @@
   ~ 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="notifier.page.title">
-                <ww:param>IRC</ww:param>
-            </ww:text>
+            <s:text name="notifier.page.title">
+                <s:param>IRC</s:param>
+            </s:text>
         </title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <ww:if test="${projectId > 0}">
-            <ww:url id="actionUrl" action="ircProjectNotifierSave" includeContext="false" includeParams="none" />
-        </ww:if>
-        <ww:else>
-            <ww:url id="actionUrl" action="ircProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
-        </ww:else>
+        <s:if test="projectId > 0">
+            <s:url id="actionUrl" action="ircProjectNotifierSave" includeContext="false" includeParams="none" />
+        </s:if>
+        <s:else>
+            <s:url id="actionUrl" action="ircProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
+        </s:else>
         <h3>
-            <ww:text name="notifier.section.title">
-                <ww:param>IRC</ww:param>
-            </ww:text>
+            <s:text name="notifier.section.title">
+                <s:param>IRC</s:param>
+            </s:text>
         </h3>
 
         <div class="axial">
-          <ww:form action="%{actionUrl}" method="post" validate="true">
-            <ww:hidden name="notifierId"/>
-            <ww:hidden name="projectId"/>
-            <ww:hidden name="projectGroupId"/>
-            <ww:hidden name="notifierType"/>            
-            <ww:hidden name="fromGroupPage"/>
+          <s:form action="%{actionUrl}" method="post" validate="true">
+            <s:hidden name="notifierId"/>
+            <s:hidden name="projectId"/>
+            <s:hidden name="projectGroupId"/>
+            <s:hidden name="notifierType"/>
+            <s:hidden name="fromGroupPage"/>
             <table>
               <tbody>
-                <ww:textfield label="%{getText('notifier.irc.host.label')}" name="host" required="true"/>
-                <ww:textfield label="%{getText('notifier.irc.port.label')}" name="port"/>
-                <ww:textfield label="%{getText('notifier.irc.channel.label')}" name="channel" required="true"/>
-                <ww:textfield label="%{getText('notifier.irc.nick.label')}" name="nick"/>
-                <ww:textfield label="%{getText('notifier.irc.alternateNick.label')}" name="alternateNick"/>
-                <ww:textfield label="%{getText('notifier.irc.username.label')}" name="username"/>
-                <ww:textfield label="%{getText('notifier.irc.fullName.label')}" name="fullName"/>
-                <ww:password label="%{getText('notifier.irc.password.label')}" name="password"/>
-                <ww:checkbox label="%{getText('notifier.irc.isSSL.label')}" name="ssl" value="ssl" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
+                <s:textfield label="%{getText('notifier.irc.host.label')}" name="host" required="true"/>
+                <s:textfield label="%{getText('notifier.irc.port.label')}" name="port"/>
+                <s:textfield label="%{getText('notifier.irc.channel.label')}" name="channel" required="true"/>
+                <s:textfield label="%{getText('notifier.irc.nick.label')}" name="nick"/>
+                <s:textfield label="%{getText('notifier.irc.alternateNick.label')}" name="alternateNick"/>
+                <s:textfield label="%{getText('notifier.irc.username.label')}" name="username"/>
+                <s:textfield label="%{getText('notifier.irc.fullName.label')}" name="fullName"/>
+                <s:password label="%{getText('notifier.irc.password.label')}" name="password"/>
+                <s:checkbox label="%{getText('notifier.irc.isSSL.label')}" name="ssl" value="ssl" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
+                <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
                 <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
               </tbody>
             </table>
             <div class="functnbar3">
               <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
             </div>
-          </ww:form>
+          </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp Tue Nov  4 06:16:37 2008
@@ -17,61 +17,62 @@
   ~ 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="notifier.page.title">
-                <ww:param>Jabber</ww:param>
-            </ww:text>
+            <s:text name="notifier.page.title">
+                <s:param>Jabber</s:param>
+            </s:text>
         </title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <ww:if test="${projectId > 0}">
-            <ww:url id="actionUrl" action="jabberProjectNotifierSave" includeContext="false" includeParams="none" />
-        </ww:if>
-        <ww:else>
-            <ww:url id="actionUrl" action="jabberProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
-        </ww:else>
+        <s:if test="projectId > 0">
+            <s:url id="actionUrl" action="jabberProjectNotifierSave" includeContext="false" includeParams="none" />
+        </s:if>
+        <s:else>
+            <s:url id="actionUrl" action="jabberProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
+        </s:else>
         <h3>
-            <ww:text name="notifier.section.title">
-                <ww:param>Jabber</ww:param>
-            </ww:text>
+            <s:text name="notifier.section.title">
+                <s:param>Jabber</s:param>
+            </s:text>
         </h3>
 
         <div class="axial">
-          <ww:form action="%{actionUrl}" method="post" validate="true">
-            <ww:hidden name="notifierId"/>
-            <ww:hidden name="projectId"/>
-            <ww:hidden name="projectGroupId"/>
-            <ww:hidden name="notifierType"/>
-            <ww:hidden name="fromGroupPage"/>
+          <s:form action="%{actionUrl}" method="post" validate="true">
+            <s:hidden name="notifierId"/>
+            <s:hidden name="projectId"/>
+            <s:hidden name="projectGroupId"/>
+            <s:hidden name="notifierType"/>
+            <s:hidden name="fromGroupPage"/>
             <table>
               <tbody>
-                <ww:textfield label="%{getText('notifier.jabber.host.label')}" name="host" required="true"/>
-                <ww:textfield label="%{getText('notifier.jabber.port.label')}" name="port"/>
-                <ww:textfield label="%{getText('notifier.jabber.login.label')}" name="login" required="true"/>
-                <ww:password label="%{getText('notifier.jabber.password.label')}" name="password" required="true"/>
-                <ww:textfield label="%{getText('notifier.jabber.domainName.label')}" name="domainName"/>
-                <ww:textfield label="%{getText('notifier.jabber.address.label')}" name="address" required="true"/>
-                <ww:checkbox label="%{getText('notifier.jabber.isSslConnection.label')}" name="sslConnection" value="sslConnection" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.jabber.isGroup.label')}" name="group" value="group" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
+                <s:textfield label="%{getText('notifier.jabber.host.label')}" name="host" required="true"/>
+                <s:textfield label="%{getText('notifier.jabber.port.label')}" name="port"/>
+                <s:textfield label="%{getText('notifier.jabber.login.label')}" name="login" required="true"/>
+                <s:password label="%{getText('notifier.jabber.password.label')}" name="password" required="true"/>
+                <s:textfield label="%{getText('notifier.jabber.domainName.label')}" name="domainName"/>
+                <s:textfield label="%{getText('notifier.jabber.address.label')}" name="address" required="true"/>
+                <s:checkbox label="%{getText('notifier.jabber.isSslConnection.label')}" name="sslConnection" value="sslConnection" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.jabber.isGroup.label')}" name="group" value="group" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
+                <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
                 <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
               </tbody>
             </table>
             <div class="functnbar3">
               <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
             </div>
-          </ww:form>
+          </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp Tue Nov  4 06:16:37 2008
@@ -17,56 +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="notifier.page.title">
-                <ww:param>Mail</ww:param>
-            </ww:text>
+            <s:text name="notifier.page.title">
+                <s:param>Mail</s:param>
+            </s:text>
         </title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <ww:if test="${projectId > 0}">
-            <ww:url id="actionUrl" action="mailProjectNotifierSave" includeContext="false" includeParams="none" />
-        </ww:if>
-        <ww:else>
-            <ww:url id="actionUrl" action="mailProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
-        </ww:else>
+        <s:if test="projectId > 0">
+            <s:url id="actionUrl" action="mailProjectNotifierSave" includeContext="false" includeParams="none" />
+        </s:if>
+        <s:else>
+            <s:url id="actionUrl" action="mailProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
+        </s:else>
         
         <h3>
-            <ww:text name="notifier.section.title">
-                <ww:param>Mail</ww:param>
-            </ww:text>
+            <s:text name="notifier.section.title">
+                <s:param>Mail</s:param>
+            </s:text>
         </h3>
 
         <div class="axial">
-          <ww:form action="%{actionUrl}" method="post" validate="true">
-            <ww:hidden name="notifierId"/>
-            <ww:hidden name="projectId"/>
-            <ww:hidden name="projectGroupId"/>
-            <ww:hidden name="notifierType"/>
-            <ww:hidden name="fromGroupPage"/>
+          <s:form action="%{actionUrl}" method="post" validate="true">
+            <s:hidden name="notifierId"/>
+            <s:hidden name="projectId"/>
+            <s:hidden name="projectGroupId"/>
+            <s:hidden name="notifierType"/>
+            <s:hidden name="fromGroupPage"/>
             <table>
               <tbody>
-                <ww:textfield label="%{getText('notifier.mail.recipient.address.label')}" name="address" />
-                <ww:checkbox label="%{getText('notifier.mail.recipient.committers.label')}" name="committers" value="committers" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
+                <s:textfield label="%{getText('notifier.mail.recipient.address.label')}" name="address" />
+                <s:checkbox label="%{getText('notifier.mail.recipient.committers.label')}" name="committers" value="committers" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
+                <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
                 <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
               </tbody>
             </table>
             <div class="functnbar3">
               <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
             </div>
-          </ww:form>
+          </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp Tue Nov  4 06:16:37 2008
@@ -17,56 +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="notifier.page.title">
-                <ww:param>MSN</ww:param>
-            </ww:text>
+            <s:text name="notifier.page.title">
+                <s:param>MSN</s:param>
+            </s:text>
         </title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <ww:if test="${projectId > 0}">
-            <ww:url id="actionUrl" action="msnProjectNotifierSave" includeContext="false" includeParams="none" />
-        </ww:if>
-        <ww:else>
-            <ww:url id="actionUrl" action="msnProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
-        </ww:else>
+        <s:if test="projectId > 0">
+            <s:url id="actionUrl" action="msnProjectNotifierSave" includeContext="false" includeParams="none" />
+        </s:if>
+        <s:else>
+            <s:url id="actionUrl" action="msnProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
+        </s:else>
         <h3>
-            <ww:text name="notifier.section.title">
-                <ww:param>MSN</ww:param>
-            </ww:text>
+            <s:text name="notifier.section.title">
+                <s:param>MSN</s:param>
+            </s:text>
         </h3>
 
         <div class="axial">
-          <ww:form action="%{actionUrl}" method="post" validate="true">
-            <ww:hidden name="notifierId"/>
-            <ww:hidden name="projectId"/>
-            <ww:hidden name="projectGroupId"/>
-            <ww:hidden name="notifierType"/>
-            <ww:hidden name="fromGroupPage"/>
+          <s:form action="%{actionUrl}" method="post" validate="true">
+            <s:hidden name="notifierId"/>
+            <s:hidden name="projectId"/>
+            <s:hidden name="projectGroupId"/>
+            <s:hidden name="notifierType"/>
+            <s:hidden name="fromGroupPage"/>
             <table>
               <tbody>
-                <ww:textfield label="%{getText('notifier.msn.login.label')}" name="login" required="true"/>
-                <ww:password label="%{getText('notifier.msn.password.label')}" name="password" required="true"/>
-                <ww:textfield label="%{getText('notifier.msn.address.label')}" name="address" required="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
+                <s:textfield label="%{getText('notifier.msn.login.label')}" name="login" required="true"/>
+                <s:password label="%{getText('notifier.msn.password.label')}" name="password" required="true"/>
+                <s:textfield label="%{getText('notifier.msn.address.label')}" name="address" required="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
+                <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
                 <ww:checkbox label="%{getText('notifier.event.sendOnScmFailure')}" name="sendOnScmFailure" value="sendOnScmFailure" fieldValue="true"/>
               </tbody>
             </table>
             <div class="functnbar3">
               <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
             </div>
-          </ww:form>
+          </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp Tue Nov  4 06:16:37 2008
@@ -17,42 +17,42 @@
   ~ 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="notifier.page.add.title"/></title>
+        <title><s:text name="notifier.page.add.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
       
-        <ww:if test="${projectId > 0}">            
-            <ww:url id="actionUrl" value="addProjectNotifier!execute" includeParams="none" />
-        </ww:if>
-        <ww:else>            
-            <ww:url id="actionUrl" value="addProjectGroupNotifier!execute" includeParams="none" />
-        </ww:else>
+        <s:if test="projectId > 0">
+            <s:url id="actionUrl" value="addProjectNotifier!execute" includeParams="none" />
+        </s:if>
+        <s:else>
+            <s:url id="actionUrl" value="addProjectGroupNotifier!execute" includeParams="none" />
+        </s:else>
        
-        <h3><ww:text name="notifier.section.add.title"/></h3>
+        <h3><s:text name="notifier.section.add.title"/></h3>
 
         <div class="axial">
                 
-          <ww:form action="%{actionUrl}" method="post">        
-            <ww:hidden name="projectId"/>
-            <ww:hidden name="projectGroupId"/>
+          <s:form action="%{actionUrl}" method="post">
+            <s:hidden name="projectId"/>
+            <s:hidden name="projectGroupId"/>
             <table>
               <tbody>
-                <ww:select label="%{getText('notifier.type.label')}" name="notifierType"
+                <s:select label="%{getText('notifier.type.label')}" name="notifierType"
                            list="#@java.util.LinkedHashMap@{'mail':'Mail', 'irc':'IRC', 'jabber':'Jabber', 'msn':'MSN', 'wagon':'Wagon'}"/>
               </tbody>
             </table>
             <div class="functnbar3">
               <c1:submitcancel value="%{getText('submit')}" cancel="%{getText('cancel')}"/>
             </div>
-          </ww:form>
+          </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp Tue Nov  4 06:16:37 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="notifier.page.title">
-                <ww:param>Wagon</ww:param>
-            </ww:text>
+            <s:text name="notifier.page.title">
+                <s:param>Wagon</s:param>
+            </s:text>
         </title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <ww:if test="${projectId > 0}">
-            <ww:url id="actionUrl" action="wagonProjectNotifierSave" includeContext="false" includeParams="none" />
-        </ww:if>
-        <ww:else>
-            <ww:url id="actionUrl" action="wagonProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
-        </ww:else>
+        <s:if test="projectId > 0">
+            <s:url id="actionUrl" action="wagonProjectNotifierSave" includeContext="false" includeParams="none" />
+        </s:if>
+        <s:else>
+            <s:url id="actionUrl" action="wagonProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
+        </s:else>
         
         <h3>
-            <ww:text name="notifier.section.title">
-                <ww:param>Wagon</ww:param>
-            </ww:text>
+            <s:text name="notifier.section.title">
+                <s:param>Wagon</s:param>
+            </s:text>
         </h3>
 
         <div class="axial">
-          <ww:form action="%{actionUrl}" method="post" validate="true">
-            <ww:hidden name="notifierId"/>
-            <ww:hidden name="projectId"/>
-            <ww:hidden name="projectGroupId"/>
-            <ww:hidden name="notifierType"/>
-            <ww:hidden name="fromGroupPage"/>
+          <s:form action="%{actionUrl}" method="post" validate="true">
+            <s:hidden name="notifierId"/>
+            <s:hidden name="projectId"/>
+            <s:hidden name="projectGroupId"/>
+            <s:hidden name="notifierType"/>
+            <s:hidden name="fromGroupPage"/>
 
             <table>
               <tbody>
-                <ww:textfield label="%{getText('notifier.wagon.url.label')}" name="url" required="true" />
-                <ww:textfield label="%{getText('notifier.wagon.id.label')}" name="id" required="true" />
-                <ww:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
-                <ww:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
+                <s:textfield label="%{getText('notifier.wagon.url.label')}" name="url" required="true" />
+                <s:textfield label="%{getText('notifier.wagon.id.label')}" name="id" required="true" />
+                <s:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
+                <s:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
               </tbody>
             </table>
 
             <div class="functnbar3">
               <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
             </div>
-          </ww:form>
+          </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectEdit.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectEdit.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectEdit.jsp Tue Nov  4 06:16:37 2008
@@ -17,12 +17,12 @@
   ~ 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="projectEdit.page.title"/></title>
+      <title><s:text name="projectEdit.page.title"/></title>
       <script type="text/javascript">
         function focus()
         {
@@ -50,30 +50,30 @@
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="projectEdit.section.title"/></h3>
+        <h3><s:text name="projectEdit.section.title"/></h3>
 
         <div class="axial">
-          <ww:form name="editProject" action="projectSave" method="post" validate="true">
+          <s:form name="editProject" action="projectSave" method="post" validate="true">
             <table>
               <tbody>
-                <ww:textfield label="%{getText('projectEdit.project.name.label')}" name="name" required="true"/>
-                <ww:textfield label="%{getText('projectEdit.project.version.label')}" name="version" required="true"/>
-                <ww:textfield label="%{getText('projectEdit.project.scmUrl.label')}" name="scmUrl" required="true"
+                <s:textfield label="%{getText('projectEdit.project.name.label')}" name="name" required="true"/>
+                <s:textfield label="%{getText('projectEdit.project.version.label')}" name="version" required="true"/>
+                <s:textfield label="%{getText('projectEdit.project.scmUrl.label')}" name="scmUrl" required="true"
                              onchange="checkUseCache()"/>
-                <ww:checkbox label="%{getText('projectEdit.project.scmUseCache.label')}" name="scmUseCache"
+                <s:checkbox label="%{getText('projectEdit.project.scmUseCache.label')}" name="scmUseCache"
                              onclick="checkUseCache()"/>
-                <ww:textfield label="%{getText('projectEdit.project.scmUsername.label')}" name="scmUsername"/>
-                <ww:password label="%{getText('projectEdit.project.scmPassword.label')}" name="scmPassword"/>
-                <ww:textfield label="%{getText('projectEdit.project.scmTag.label')}" name="scmTag"/>
+                <s:textfield label="%{getText('projectEdit.project.scmUsername.label')}" name="scmUsername"/>
+                <s:password label="%{getText('projectEdit.project.scmPassword.label')}" name="scmPassword"/>
+                <s:textfield label="%{getText('projectEdit.project.scmTag.label')}" name="scmTag"/>
               </tbody>
             </table>
             <div class="functnbar3">
               <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
             </div>
-            <ww:hidden name="projectId"/>
-          </ww:form>
+            <s:hidden name="projectId"/>
+          </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>
\ No newline at end of file

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp Tue Nov  4 06:16:37 2008
@@ -17,43 +17,43 @@
   ~ 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="projectGroup.add.page.title"/></title>
+        <title><s:text name="projectGroup.add.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="projectGroup.add.section.title"/></h3>
+        <h3><s:text name="projectGroup.add.section.title"/></h3>
 
         <div class="axial">
-          <ww:url id="actionUrl" action="addProjectGroup" includeContext="false" />
-          <ww:form action="%{actionUrl}" method="post" >
+          <s:url id="actionUrl" action="addProjectGroup" includeContext="false" />
+          <s:form action="%{actionUrl}" method="post" >
             <c:if test="${!empty actionErrors}">
               <div class="errormessage">
-                <c:forEach items="${actionErrors}" var="actionError">
-                  <p><ww:text name="${actionError}"/></p>
-                </c:forEach>
+                <s:iterator value="actionErrors">
+                  <p><s:text name="<s:property/>" /></p>
+                </s:iterator>
               </div>
             </c:if>
             <table>
               <tbody>
-                <ww:textfield label="%{getText('projectGroup.name.label')}" name="name"  required="true"/>
-                <ww:textfield label="%{getText('projectGroup.groupId.label')}" name="groupId" required="true"/>
-                <ww:textfield label="%{getText('projectGroup.description.label')}" name="description"/>
-                <ww:select label="%{getText('projectGroup.repository.label')}" name="repositoryId" list="repositories"
+                <s:textfield label="%{getText('projectGroup.name.label')}" name="name"  required="true"/>
+                <s:textfield label="%{getText('projectGroup.groupId.label')}" name="groupId" required="true"/>
+                <s:textfield label="%{getText('projectGroup.description.label')}" name="description"/>
+                <s:select label="%{getText('projectGroup.repository.label')}" name="repositoryId" list="repositories"
                 		   listKey="id" listValue="name"/>
               </tbody>
             </table>
             <div class="functnbar3">
               <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
             </div>
-          </ww:form>
+          </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp Tue Nov  4 06:16:37 2008
@@ -17,28 +17,28 @@
   ~ under the License.
   --%>
 
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 <%@ taglib uri="continuum" prefix="c1" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-      <title><ww:text name="projectGroup.page.title"/></title>
+      <title><s:text name="projectGroup.page.title"/></title>
     </head>
 
     <body>
       <div id="h3">
 
-        <ww:action name="projectGroupTab" executeResult="true">
-          <ww:param name="tabName" value="'BuildDefinitions'"/>
-        </ww:action>
+        <s:action name="projectGroupTab" executeResult="true">
+          <s:param name="tabName" value="'BuildDefinitions'"/>
+        </s:action>
 
-        <ww:action name="groupBuildDefinitionSummary" executeResult="true" namespace="component">
-          <ww:param name="projectGroupId" value="%{projectGroupId}"/>
-          <ww:param name="projectGroupName" value="%{projectGroup.name}"/>
-        </ww:action>
+        <s:action name="groupBuildDefinitionSummary" executeResult="true" namespace="component">
+          <s:param name="projectGroupId">${projectGroupId}</s:param>
+          <s:param name="projectGroupName">${projectGroup.name}</s:param>
+        </s:action>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp Tue Nov  4 06:16:37 2008
@@ -18,77 +18,77 @@
   --%>
 
 <%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
 <%@ taglib uri="continuum" prefix="c1" %>
 <%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="projectGroup.edit.page.title"/></title>
+        <title><s:text name="projectGroup.edit.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
-        <h3><ww:text name="projectGroup.edit.section.title"/></h3>
+        <h3><s:text name="projectGroup.edit.section.title"/></h3>
 
         <div class="axial">
-          <ww:form action="saveProjectGroup" method="post" validate="true">
-              <c:if test="${projectInCOQueue}">
+          <s:form action="saveProjectGroup" method="post" validate="true">
+              <s:if test="projectInCOQueue">
                 <div class="label">
-                    <p><ww:text name="%{getText('project.in.checkout.queue.error')}"/></p>
+                    <p><s:text name="%{getText('project.in.checkout.queue.error')}"/></p>
                             </div >
-              </c:if>
+              </s:if>
               <c:if test="${!empty actionErrors}">
               <div class="errormessage">
-                <c:forEach items="${actionErrors}" var="actionError">
-                  <p><ww:text name="${actionError}"/></p>
-                </c:forEach>
+                <s:iterator value="actionErrors">
+                  <p><s:text name="<s:property/>" /></p>
+                </s:iterator>
               </div>
               </c:if>
             <table>
               <tbody>
-                <ww:hidden name="projectGroupId"/>
-                <ww:textfield label="%{getText('projectGroup.name.label')}" name="name" required="true" disabled="%{projectInCOQueue}"/>
+                <s:hidden name="projectGroupId"/>
+                <s:textfield label="%{getText('projectGroup.name.label')}" name="name" required="true" disabled="%{projectInCOQueue}"/>
                 <c1:data label="%{getText('projectGroup.groupId.label')}" name="projectGroup.groupId"/>
-                <ww:textfield label="%{getText('projectGroup.description.label')}" name="description" disabled="%{projectInCOQueue}"/>
-                <ww:select label="%{getText('projectGroup.repository.label')}" name="repositoryId" list="repositories" 
+                <s:textfield label="%{getText('projectGroup.description.label')}" name="description" disabled="%{projectInCOQueue}"/>
+                <s:select label="%{getText('projectGroup.repository.label')}" name="repositoryId" list="repositories"
                            listKey="id" listValue="name" disabled="%{disabledRepositories}"/> 
-                <ww:textfield label="%{getText('projectGroup.url.label')}" name="url" disabled="%{projectInCOQueue}"/>
+                <s:textfield label="%{getText('projectGroup.url.label')}" name="url" disabled="%{projectInCOQueue}"/>
               </tbody>
             </table>
             
-            <ww:if test="${!empty projectList}">
-            <h3><ww:text name="projectGroup.edit.section.projects.title"/></h3>
+            <c:if test="${!empty projectList}">
+            <h3><s:text name="projectGroup.edit.section.projects.title"/></h3>
             <div class="eXtremeTable">
               <table id="projects_table" border="1" cellspacing="2" cellpadding="3" class="tableRegion" width="100%">
                 <thead>
                   <tr>
-                    <td class="tableHeader"><ww:text name="projectGroup.edit.project.name"/></td>
-                    <td class="tableHeader"><ww:text name="projectGroup.edit.move.to.group"/></td>
+                    <td class="tableHeader"><s:text name="projectGroup.edit.project.name"/></td>
+                    <td class="tableHeader"><s:text name="projectGroup.edit.move.to.group"/></td>
                   </tr>
                 </thead>
                 <tbody class="tableBody">
-                  <ww:iterator value="projectList" status="rowCounter">
-                    <tr class="<ww:if test="#rowCounter.odd == true">odd</ww:if><ww:else>even</ww:else>">
-                      <td><ww:select cssStyle="width:200px" label="%{name}" name="projects[%{id}]" list="projectGroups" value="%{projectGroup.id}" disabled="%{projectInCOQueue}"/></td>
+                  <s:iterator value="projectList" status="rowCounter">
+                    <tr class="<s:if test="#rowCounter.odd == true">odd</s:if><s:else>even</s:else>">
+                      <td><s:select cssStyle="width:200px" label="%{name}" name="projects[%{id}]" list="projectGroups" value="%{projectGroup.id}" disabled="%{projectInCOQueue}"/></td>
                     </tr>
-                  </ww:iterator>
+                  </s:iterator>
                 </tbody>
               </table>
             </div>
-            </ww:if>
+            </c:if>
             <div class="functnbar3">
               <c:choose>
                 <c:when test="${!projectInCOQueue}">
                   <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
                 </c:when>
                 <c:otherwise>
-                  <input type="button" value="<ww:text name="back"/>" onClick="history.go(-1)">
+                  <input type="button" value="<s:text name="back"/>" onClick="history.go(-1)">
                 </c:otherwise>
               </c:choose>
             </div>
-          </ww:form>
+          </s:form>
         </div>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp Tue Nov  4 06:16:37 2008
@@ -17,31 +17,31 @@
   ~ 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="projectGroup.page.title"/></title>
+      <title><s:text name="projectGroup.page.title"/></title>
     </head>
 
     <body>
       <div id="h3">
 
-    <ww:action name="projectGroupTab" executeResult="true">
-      <ww:param name="tabName" value="'Members'"/>
-    </ww:action>
+    <s:action name="projectGroupTab" executeResult="true">
+      <s:param name="tabName" value="'Members'"/>
+    </s:action>
     <div class="axial">
       <!--
       Scan for new Projects?
       -->
     </div>
 
-    <h3><ww:text name="projectGroup.members.section.title"><ww:param>${projectGroup.name}</ww:param></ww:text></h3>
+    <h3><s:text name="projectGroup.members.section.title"><s:param>${projectGroup.name}</s:param></s:text></h3>
 
     <ec:table items="groupProjects"
               var="project"
@@ -52,10 +52,10 @@
               sortable="false">
       <ec:row highlightRow="true">
         <ec:column property="name" title="summary.projectTable.name" width="48%">
-          <ww:url id="projectViewUrl" action="projectView">
-            <ww:param name="projectId" value="${pageScope.project.id}"/>
-          </ww:url>
-          <ww:a href="%{projectViewUrl}">${pageScope.project.name}</ww:a>
+          <s:url id="projectViewUrl" action="projectView">
+            <s:param name="projectId">${pageScope.project.id}</s:param>
+          </s:url>
+          <s:a href="%{projectViewUrl}">${pageScope.project.name}</s:a>
         </ec:column>
         <ec:column property="editAction" title="&nbsp;" width="1%" sortable="false">
           <center>
@@ -63,21 +63,21 @@
             <c:choose>
               <c:when
                   test="${pageScope.project.state == 1 || pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4}">
-                <ww:url id="editProjectUrl" action="projectEdit">
-                  <ww:param name="projectId" value="${pageScope.project.id}"/>
-                  <ww:param name="projectName" value="${project.name}"/>
-                </ww:url>
-                <ww:a href="%{editProjectUrl}">
-                  <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="editProjectUrl" action="projectEdit">
+                  <s:param name="projectId">${pageScope.project.id}</s:param>
+                  <s:param name="projectName">${project.name}</s:param>
+                </s:url>
+                <s:a href="%{editProjectUrl}">
+                  <img src="<s:url value='/images/edit.gif' includeParams="none"/>" alt="<s:text name="edit"/>" title="<s:text name="edit"/>" border="0">
+                </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>
           </center>
         </ec:column>
@@ -87,21 +87,21 @@
             <c:choose>
               <c:when
                   test="${pageScope.project.state == 1 || pageScope.project.state == 10 || pageScope.project.state == 2 || pageScope.project.state == 3 || pageScope.project.state == 4}">
-                <ww:url id="removeProjectUrl" action="deleteProject!default.action">
-                  <ww:param name="projectId" value="${pageScope.project.id}"/>
-                  <ww:param name="projectName" value="${pageScope.project.name}"/>
-                </ww:url>
-                <ww:a href="%{removeProjectUrl}">
-                  <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="removeProjectUrl" action="deleteProject!default.action">
+                  <s:param name="projectId">${pageScope.project.id}</s:param>
+                  <s:param name="projectName">${pageScope.project.name}</s:param>
+                </s:url>
+                <s:a href="%{removeProjectUrl}">
+                  <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">
+                </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>
           </center>
         </ec:column>
@@ -109,15 +109,15 @@
     </ec:table>
     
   <redback:ifAuthorized permission="continuum-manage-users">
-  <h3><ww:text name="projectGroup.members.users.title"/></h3>
+  <h3><s:text name="projectGroup.members.users.title"/></h3>
     
-  <ww:form action="projectGroupMembers" theme="xhtml" method="post">
-    <ww:hidden name="ascending" />
-    <ww:hidden name="projectGroupId" />
+  <s:form action="projectGroupMembers" theme="xhtml" method="post">
+    <s:hidden name="ascending" />
+    <s:hidden name="projectGroupId" />
     <tr>
       <td nowrap="true">
         <table cellpadding="0" cellspacing="0">               
-          <ww:select label="%{getText('projectGroup.members.users.search.label')}"
+          <s:select label="%{getText('projectGroup.members.users.search.label')}"
                list="criteria"
                name="filterProperty"
                value="filterProperty" />
@@ -125,16 +125,16 @@
       </td>               
       <td>
         <table cellpadding="0" cellspacing="0">
-          <ww:textfield name="filterKey" />
+          <s:textfield name="filterKey" />
         </table>
       </td>  
       <td colspan="2" align="right">
         <table cellpadding="0" cellspacing="0">
-          <ww:submit value="%{getText('projectGroup.members.users.search.button')}"/>
+          <s:submit value="%{getText('projectGroup.members.users.search.button')}"/>
         </table>
       </td>
     </tr>             
-  </ww:form>
+  </s:form>
 
   <hr/>
   
@@ -142,60 +142,60 @@
     <thead>
       <tr>
         <th nowrap="true">
-          <ww:form id="sortlist" name="sortlist" action="projectGroupMembers" theme="xhtml" method="post">
-            <ww:if test="${ascending}">
-              <ww:a href="javascript:document.forms['sortlist'].submit()"><img src="<ww:url value='/images/icon_sortdown.gif' includeParams="none"/>" title="<ww:text name='sort.descending'/>" border="0"></ww:a> <ww:text name="user.username.label"/>
-            </ww:if>
-            <ww:else>
-              <ww:a href="javascript:document.forms['sortlist'].submit()"><img src="<ww:url value='/images/icon_sortup.gif' includeParams="none"/>" title="<ww:text name='sort.ascending'/>" border="0"></ww:a> <ww:text name="user.username.label"/>
-            </ww:else>
-            <ww:hidden name="ascending" value="${!ascending}"/>
-            <ww:hidden name="projectGroupId" />
-            <ww:hidden name="filterProperty" />
-            <ww:hidden name="filterKey" />
-          </ww:form>
+          <s:form id="sortlist" name="sortlist" action="projectGroupMembers" theme="xhtml" method="post">
+            <s:if test="ascending">
+              <s:a href="javascript:document.forms['sortlist'].submit()"><img src="<s:url value='/images/icon_sortdown.gif' includeParams="none"/>" title="<s:text name='sort.descending'/>" border="0"></s:a> <s:text name="user.username.label"/>
+            </s:if>
+            <s:else>
+              <s:a href="javascript:document.forms['sortlist'].submit()"><img src="<s:url value='/images/icon_sortup.gif' includeParams="none"/>" title="<s:text name='sort.ascending'/>" border="0"></s:a> <s:text name="user.username.label"/>
+            </s:else>
+            <s:hidden name="ascending">${!ascending}</s:hidden>
+            <s:hidden name="projectGroupId" />
+            <s:hidden name="filterProperty" />
+            <s:hidden name="filterKey" />
+          </s:form>
         </th>   
-        <th><ww:text name="user.fullName.label"/></th>
-        <th><ww:text name="user.email.label"/></th>
-        <th><ww:text name="projectGroup.members.user.role.administrator"/></th>
-        <th><ww:text name="projectGroup.members.user.role.developer"/></th>
-        <th><ww:text name="projectGroup.members.user.role.user"/></th>
+        <th><s:text name="user.fullName.label"/></th>
+        <th><s:text name="user.email.label"/></th>
+        <th><s:text name="projectGroup.members.user.role.administrator"/></th>
+        <th><s:text name="projectGroup.members.user.role.developer"/></th>
+        <th><s:text name="projectGroup.members.user.role.user"/></th>
       </tr>
     </thead>
     <tbody>
-      <ww:iterator value="projectGroupUsers">
+      <s:iterator value="projectGroupUsers">
         <tr>
           <td>
-            <ww:property value="username"/>
+            <s:property value="username"/>
           </td>
           <td>
-            <ww:property value="userFullName"/>
+            <s:property value="userFullName"/>
           </td>
           <td>
-            <ww:property value="userEmail"/>
+            <s:property value="userEmail"/>
           </td>
           <td>
-            <ww:if test="${administrator}">
-              <img src="<ww:url value='/images/icon_success_sml.gif' includeParams="none"/>" border="0">
-            </ww:if>
+            <s:if test="administrator">
+              <img src="<s:url value='/images/icon_success_sml.gif' includeParams="none"/>" border="0">
+            </s:if>
           </td>
           <td>
-            <ww:if test="${developer}">
-              <img src="<ww:url value='/images/icon_success_sml.gif' includeParams="none"/>" border="0">
-            </ww:if>
+            <s:if test="developer">
+              <img src="<s:url value='/images/icon_success_sml.gif' includeParams="none"/>" border="0">
+            </s:if>
           </td>
           <td>
-            <ww:if test="${user}">
-              <img src="<ww:url value='/images/icon_success_sml.gif' includeParams="none"/>" border="0">
-            </ww:if>
+            <s:if test="user">
+              <img src="<s:url value='/images/icon_success_sml.gif' includeParams="none"/>" border="0">
+            </s:if>
           </td>
         </tr>
-      </ww:iterator>
+      </s:iterator>
     </tbody>
   </table>
   </redback:ifAuthorized>
   
   </div>
   </body>
-</ww:i18n>
+</s:i18n>
 </html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.jsp Tue Nov  4 06:16:37 2008
@@ -17,27 +17,27 @@
   ~ 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" %>
 <html>
-  <ww:i18n name="localization.Continuum">
+  <s:i18n name="localization.Continuum">
     <head>
-      <title><ww:text name="projectGroup.page.title"/></title>
+      <title><s:text name="projectGroup.page.title"/></title>
     </head>
 
     <body>
       <div id="h3">
 
-        <ww:action name="projectGroupTab" executeResult="true">
-          <ww:param name="tabName" value="'Notifier'"/>
-        </ww:action>
+        <s:action name="projectGroupTab" executeResult="true">
+          <s:param name="tabName" value="'Notifier'"/>
+        </s:action>
     
-        <ww:action name="projectGroupNotifierSummary" executeResult="true" namespace="component">
-          <ww:param name="projectGroupId" value="%{projectGroupId}"/>
-        </ww:action>
+        <s:action name="projectGroupNotifierSummary" executeResult="true" namespace="component">
+          <s:param name="projectGroupId">${projectGroupId}</s:param>
+        </s:action>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp Tue Nov  4 06:16:37 2008
@@ -17,7 +17,7 @@
   ~ 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" %>
@@ -25,22 +25,22 @@
 <%@ 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="projectGroup.page.title"/></title>
+      <title><s:text name="projectGroup.page.title"/></title>
     </head>
 
     <body>
       <div id="h3">
 
-      <ww:action name="projectGroupTab" executeResult="true">
-        <ww:param name="tabName" value="'ReleaseResults'"/>
-      </ww:action>
+      <s:action name="projectGroupTab" executeResult="true">
+        <s:param name="tabName" value="'ReleaseResults'"/>
+      </s:action>
     
-      <h3><ww:text name="projectGroup.releaseResults.section.title"><ww:param>${projectGroup.name}</ww:param></ww:text></h3>
+      <h3><s:text name="projectGroup.releaseResults.section.title"><s:param>${projectGroup.name}</s:param></s:text></h3>
       
       <form id="releaseResultsForm" action="removeReleaseResults.action" method="post">
-        <ww:hidden name="projectGroupId"/>
+        <s:hidden name="projectGroupId"/>
         <ec:table items="releaseResults"
                 var="result"
                 showExports="false"
@@ -59,39 +59,39 @@
             <ec:column property="startTime" title="releaseResults.startTime" cell="date"/>
             <ec:column property="endTime" title="releaseResults.endTime" cell="date"/>
             <ec:column property="resultCode" title="releaseResults.state">
-              <ww:if test="${pageScope.result.resultCode == 0}">
-                <ww:text name="releaseViewResult.success"/>
-              </ww:if>
-              <ww:else>
-                <ww:text name="releaseViewResult.error"/>
-              </ww:else>
+              <s:if test="pageScope.result.resultCode == 0">
+                <s:text name="releaseViewResult.success"/>
+              </s:if>
+              <s:else>
+                <s:text name="releaseViewResult.error"/>
+              </s:else>
             </ec:column>
             <ec:column property="actions" title="&nbsp;">
-               <ww:url id="viewReleaseResultUrl" action="viewReleaseResult">
-                 <ww:param name="releaseResultId" value="${pageScope.result.id}"/>
-                 <ww:param name="projectGroupId" value="${projectGroupId}"/>
-               </ww:url>
-               <ww:a href="%{viewReleaseResultUrl}"><ww:text name="releaseResults.viewResult"/></ww:a>
+               <s:url id="viewReleaseResultUrl" action="viewReleaseResult">
+                 <s:param name="releaseResultId">${pageScope.result.id}</s:param>
+                 <s:param name="projectGroupId">${projectGroupId}</s:param>
+               </s:url>
+               <s:a href="%{viewReleaseResultUrl}"><s:text name="releaseResults.viewResult"/></s:a>
              </ec:column>
           </ec:row>
         </ec:table>
-        <ww:if test="${not empty releaseResults}">
+        <c:if test="${not empty releaseResults}">
           <div class="functnbar3">
             <table>
               <tbody>
                 <tr>
                   <td>
                     <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
-                      <input type="button" name="delete-release-results" value="<ww:text name="delete"/>" onclick="document.forms.releaseResultsForm.submit();" />
+                      <input type="button" name="delete-release-results" value="<s:text name="delete"/>" onclick="document.forms.releaseResultsForm.submit();" />
                     </redback:ifAuthorized>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
-        </ww:if>
+        </c:if>
       </form>
       </div>
     </body>
-  </ww:i18n>
+  </s:i18n>
 </html>
\ No newline at end of file

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?rev=711259&r1=711258&r2=711259&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp Tue Nov  4 06:16:37 2008
@@ -17,7 +17,7 @@
   ~ 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" %>
@@ -25,10 +25,10 @@
 
 <html>
 
-<ww:i18n name="localization.Continuum">
+<s:i18n name="localization.Continuum">
   <head>
     <title>
-      <ww:text name="projectGroup.page.title"/>
+      <s:text name="projectGroup.page.title"/>
     </title>
     <meta http-equiv="refresh" content="30"/>
     <script type="text/javascript">
@@ -78,21 +78,21 @@
   </head>
   <body>
   <div id="h3">
-    <ww:action name="projectGroupTab" executeResult="true">
-      <ww:param name="tabName" value="'Summary'"/>
-    </ww:action>
+    <s:action name="projectGroupTab" executeResult="true">
+      <s:param name="tabName" value="'Summary'"/>
+    </s:action>
 
-    <h3><ww:text name="projectGroup.information.title"/></h3>
+    <h3><s:text name="projectGroup.information.title"/></h3>
     <div class="axial">
       <table border="1" cellspacing="2" cellpadding="3" width="100%">
         <c1:data label="%{getText('projectGroup.name.label')}" name="projectGroup.name"/>
         <c1:data label="%{getText('projectGroup.groupId.label')}" name="projectGroup.groupId"/>
         <c1:data label="%{getText('projectGroup.description.label')}" name="projectGroup.description"/>
         <c1:data label="%{getText('projectGroup.repository.label')}" name="projectGroup.localRepository.name"/>
-        <c:if test="${url != null}">
-            <ww:url id="projectHomepageUrl" value="${url}" includeContext="false" includeParams="none"/>
+        <s:if test="url != null">
+            <s:url id="projectHomepageUrl" value="%{url}" includeContext="false" includeParams="none"/>
         	<c1:data label="%{getText('projectGroup.url.label')}" name="url" valueLink="%{'${projectHomepageUrl}'}"/>  
-        </c:if>
+        </s:if>
       </table>
     </div>
 
@@ -111,13 +111,13 @@
     </ec:table>
 
     <redback:ifAnyAuthorized permissions="continuum-build-group,continuum-remove-group" resource="${projectGroup.name}">
-      <h3><ww:text name="projectGroup.actions.title"/></h3>
+      <h3><s:text name="projectGroup.actions.title"/></h3>
 
       <c:if test="${!empty actionErrors}">
         <div class="errormessage">
-          <c:forEach items="${actionErrors}" var="actionError">
-            <p><ww:text name="${actionError}"/></p>
-          </c:forEach>
+          <s:iterator value="actionErrors">
+            <p><s:text name="<s:property/>" /></p>
+          </s:iterator>
         </div>
       </c:if>
 
@@ -128,10 +128,10 @@
               <table>
                 <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroup.name}">
                   <form action="buildProjectGroup.action" method="post">
-                    <input type="hidden" name="projectGroupId" value="<ww:property value="projectGroupId"/>"/>
-                    <ww:select theme="simple" name="buildDefinitionId" list="buildDefinitions" 
+                    <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
+                    <s:select theme="simple" name="buildDefinitionId" list="buildDefinitions"
                                listKey="value" listValue="key" headerKey="-1" headerValue="%{getText('projectGroup.buildDefinition.label')}" />                    
-                    <input type="submit" name="build" value="<ww:text name="projectGroup.buildGroup"/>"/>
+                    <input type="submit" name="build" value="<s:text name="projectGroup.buildGroup"/>"/>
                   </form>
                 </redback:ifAuthorized>
               </table>
@@ -139,29 +139,29 @@
             <td>
               <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroup.name}">
                 <form action="editProjectGroup.action" method="post">
-                  <input type="hidden" name="projectGroupId" value="<ww:property value="projectGroupId"/>"/>
-                  <input type="submit" name="edit" value="<ww:text name="edit"/>"/>
+                  <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
+                  <input type="submit" name="edit" value="<s:text name="edit"/>"/>
                 </form>
               </redback:ifAuthorized>
             </td>
             <td>
               <redback:ifAuthorized permission="continuum-build-group" resource="${projectGroup.name}">
                 <form action="releaseProjectGroup.action" method="post">
-                  <input type="hidden" name="projectGroupId" value="<ww:property value="projectGroupId"/>"/>
-                  <input type="submit" name="release" value="<ww:text name="release"/>"/>
+                  <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
+                  <input type="submit" name="release" value="<s:text name="release"/>"/>
                 </form>
               </redback:ifAuthorized>
             </td>
             <td>
               <redback:ifAnyAuthorized permissions="continuum-add-project-to-group" resource="${projectGroup.name}">
-                <ww:form name="addNewProject">
-                  <ww:hidden name="disableGroupSelection" value="true"/>
-                  <ww:hidden name="selectedProjectGroup" value="${projectGroup.id}"/>
-                  <ww:hidden name="projectGroupName" value="${projectGroup.name}"/>
-                  <ww:hidden name="projectType" value=""/>
-                </ww:form>
+                <s:form name="addNewProject">
+                  <s:hidden name="disableGroupSelection" value="true"/>
+                  <s:hidden name="selectedProjectGroup" value="%{projectGroup.id}"/>
+                  <s:hidden name="projectGroupName" value="%{projectGroup.name}"/>
+                  <s:hidden name="projectType" value=""/>
+                </s:form>
 
-                <ww:select theme="simple" name="preferredExecutor" list="#@java.util.HashMap@{'maven2' : 'Add M2 Project', 'maven-1' : 'Add M1 Project', 'ant' : 'Add Ant Project', 'shell' : 'Add Shell Project'}"
+                <s:select theme="simple" name="preferredExecutor" list="#@java.util.HashMap@{'maven2' : 'Add M2 Project', 'maven-1' : 'Add M1 Project', 'ant' : 'Add Ant Project', 'shell' : 'Add Shell Project'}"
                     headerValue="Choose the project type" headerKey="" emptyOption="true" />
 
                 <input type="button" value="Add" onclick="goToAddProject()"/>
@@ -170,8 +170,8 @@
             <td>
               <redback:ifAuthorized permission="continuum-remove-group" resource="${projectGroup.name}">
                 <form action="removeProjectGroup.action" method="post">
-                  <input type="hidden" name="projectGroupId" value="<ww:property value="projectGroupId"/>"/>
-                  <input type="submit" name="remove" value="<ww:text name="projectGroup.deleteGroup"/>"/>
+                  <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
+                  <input type="submit" name="remove" value="<s:text name="projectGroup.deleteGroup"/>"/>
                 </form>
               </redback:ifAuthorized>
             </td>
@@ -180,12 +180,12 @@
       </div>
     </redback:ifAnyAuthorized>
 
-    <ww:action name="projectSummary" executeResult="true" namespace="component">
-      <ww:param name="projectGroupId" value="%{projectGroupId}"/>
-      <ww:param name="projectGroupName" value="%{projectGroup.name}"/>
-    </ww:action>
+    <s:action name="projectSummary" executeResult="true" namespace="component">
+      <s:param name="projectGroupId">${projectGroupId}</s:param>
+      <s:param name="projectGroupName">${projectGroup.name}</s:param>
+    </s:action>
 
   </div>
   </body>
-</ww:i18n>
+</s:i18n>
 </html>



Mime
View raw message