continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r952508 - in /continuum/trunk: ./ continuum-webapp/ continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/ continuum-webapp/src/main/resources/ contin...
Date Tue, 08 Jun 2010 02:04:29 GMT
Author: ctan
Date: Tue Jun  8 02:04:28 2010
New Revision: 952508

URL: http://svn.apache.org/viewvc?rev=952508&view=rev
Log:
[CONTINUUM-2169] upgrade struts to 2.1.6 and redback to 1.3-SNAPSHOT

Submitted By: Julien Henry and Jose Morales

With additional changes:
- upgrade plexus-spring to 1.3-SNAPSHOT
- fixed webapp test failures
- set theme to simple for s:button
- removed ActionContextCleanUp (deprecated) and FilterDispatcher (deprecated) and replaced them with StrutsPrepareFilter and StrutsExecuteFilter
- replaced PageFilter with SiteMeshFilter


Added:
    continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractActionTest.java
Modified:
    continuum/trunk/continuum-webapp/pom.xml
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java
    continuum/trunk/continuum-webapp/src/main/resources/log4j.xml
    continuum/trunk/continuum-webapp/src/main/resources/struts.xml
    continuum/trunk/continuum-webapp/src/main/resources/template/default/head.ftl
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
    continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractReleaseActionTest.java
    continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/ViewBuildsReportActionTest.java
    continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java
    continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildAgentActionTest.java
    continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildResultActionTest.java
    continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java
    continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/SummaryActionTest.java
    continuum/trunk/pom.xml

Modified: continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/pom.xml?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/pom.xml (original)
+++ continuum/trunk/continuum-webapp/pom.xml Tue Jun  8 02:04:28 2010
@@ -385,7 +385,7 @@ under the License.
     <dependency>
       <groupId>opensymphony</groupId>
       <artifactId>sitemesh</artifactId>
-      <version>2.2.1</version>
+      <version>2.4.2</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
@@ -554,16 +554,6 @@ under the License.
       <artifactId>struts2-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.opensymphony</groupId>
-      <artifactId>xwork</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>    
-    <dependency>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-spring-plugin</artifactId>
       <scope>runtime</scope>

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java Tue Jun  8 02:04:28 2010
@@ -76,7 +76,7 @@ public class ReleaseCleanupAction
             }
             catch ( BuildAgentConfigurationException e )
             {
-                List<String> args = new ArrayList<String>();
+                List<Object> args = new ArrayList<Object>();
                 args.add( e.getMessage() );
 
                 addActionError( getText( "releaseCleanup.error", args ) );

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java Tue Jun  8 02:04:28 2010
@@ -93,7 +93,7 @@ public class ReleaseInProgressAction
             }
             catch ( BuildAgentConfigurationException e )
             {
-                List<String> args = new ArrayList<String>();
+                List<Object> args = new ArrayList<Object>();
                 args.add( e.getMessage() );
 
                 addActionError( getText( "distributedBuild.releaseInProgress.error", args ) );
@@ -239,7 +239,7 @@ public class ReleaseInProgressAction
             }
             catch ( BuildAgentConfigurationException e )
             {
-                List<String> args = new ArrayList<String>();
+                List<Object> args = new ArrayList<Object>();
                 args.add( e.getMessage() );
                 
                 addActionError( getText( "releaseViewResult.error", args ) );

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java Tue Jun  8 02:04:28 2010
@@ -123,7 +123,7 @@ public class ReleasePerformAction
         }
         catch ( BuildAgentConfigurationException e )
         {
-            List<String> args = new ArrayList<String>();
+            List<Object> args = new ArrayList<Object>();
             args.add( e.getMessage() );
 
             addActionError( getText( "distributedBuild.releasePerform.input.error", args ) ) ;
@@ -157,7 +157,7 @@ public class ReleasePerformAction
         }
         catch ( BuildAgentConfigurationException e )
         {
-            List<String> args = new ArrayList<String>();
+            List<Object> args = new ArrayList<Object>();
             args.add( e.getMessage() );
 
             addActionError( getText( "distributedBuild.releasePerform.input.error", args ) ) ;
@@ -247,7 +247,7 @@ public class ReleasePerformAction
             }
             catch ( BuildAgentConfigurationException e )
             {
-                List<String> args = new ArrayList<String>();
+                List<Object> args = new ArrayList<Object>();
                 args.add( e.getMessage() );
 
                 addActionError( getText( "distributedBuild.releasePerform.release.error", args ) );
@@ -304,7 +304,7 @@ public class ReleasePerformAction
             }
             catch ( BuildAgentConfigurationException e )
             {
-                List<String> args = new ArrayList<String>();
+                List<Object> args = new ArrayList<Object>();
                 args.add( e.getMessage() );
 
                 addActionError( getText( "distributedBuild.releasePerform.release.error", args ) );

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java Tue Jun  8 02:04:28 2010
@@ -175,7 +175,7 @@ public class ReleasePrepareAction
             }
             catch ( BuildAgentConfigurationException e )
             {
-                List<String> args = new ArrayList<String>();
+                List<Object> args = new ArrayList<Object>();
                 args.add( e.getMessage() );
 
                 addActionError( getText( "distributedBuild.releasePrepare.input.error", args ) );
@@ -194,7 +194,7 @@ public class ReleasePrepareAction
             }
             catch ( Exception e )
             {   
-                List<String> args = new ArrayList<String>();
+                List<Object> args = new ArrayList<Object>();
                 args.add( e.getMessage() );
 
                 addActionError( getText( "releasePrepare.input.error", args ) );
@@ -328,7 +328,7 @@ public class ReleasePrepareAction
             }
             catch ( BuildAgentConfigurationException e )
             {
-                List<String> args = new ArrayList<String>();
+                List<Object> args = new ArrayList<Object>();
                 args.add( e.getMessage() );
 
                 addActionError( getText( "distributedBuild.releasePrepare.release.error", args ) );
@@ -432,7 +432,7 @@ public class ReleasePrepareAction
             }
             catch ( BuildAgentConfigurationException e )
             {
-                addActionError( "" );
+                addActionError( "Failed to retrieve listener for release: " + releaseId );
                 return "";
             }
                 

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java Tue Jun  8 02:04:28 2010
@@ -78,7 +78,7 @@ public class ReleaseRollbackAction
             }
             catch ( BuildAgentConfigurationException e )
             {
-                List<String> args = new ArrayList<String>();
+                List<Object> args = new ArrayList<Object>();
                 args.add( e.getMessage() );
 
                 addActionError( getText( "releaseRollback.error", args ) );

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java (original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java Tue Jun  8 02:04:28 2010
@@ -26,7 +26,7 @@ import org.apache.maven.continuum.web.co
 import org.apache.struts2.components.Component;
 import org.apache.struts2.views.jsp.ui.AbstractUITag;
 
-import com.opensymphony.xwork2.util.OgnlValueStack;
+import com.opensymphony.xwork2.ognl.OgnlValueStack;
 import com.opensymphony.xwork2.util.ValueStack;
 
 /**

Modified: continuum/trunk/continuum-webapp/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/log4j.xml?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/log4j.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/log4j.xml Tue Jun  8 02:04:28 2010
@@ -105,10 +105,19 @@
     <level value="error"/>
   </logger>
 
-  <logger name="com.opensymphony.xwork2.util.OgnlUtil">
+  <logger name="com.opensymphony.xwork2.ognl.OgnlUtil">
     <level value="error"/>
   </logger>
 
+  <logger name="org.apache.struts2.util.TextProviderHelper">
+    <level value="error"/>
+  </logger>
+
+  <!-- Related https://issues.apache.org/struts/browse/WW-1714 -->
+  <logger name="com.opensymphony.xwork2.ObjectFactory">
+    <level value="fatal"/>
+  </logger>
+
   <logger name="JPOX">
     <level value="warn"/>
   </logger>

Modified: continuum/trunk/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/struts.xml?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/struts.xml Tue Jun  8 02:04:28 2010
@@ -93,59 +93,59 @@
       <result name="requires-authorization">/WEB-INF/jsp/error/authorizationError.jsp</result>
 
 
-      <result name="continuum-configuration-required" type="redirect-action">
+      <result name="continuum-configuration-required" type="redirectAction">
         <param name="actionName">configuration</param>
         <param name="namespace">/admin</param>
         <param name="method">input</param>
       </result>
 
       <!-- The following security-* result names arrive from the plexus-security package -->
-      <result name="security-login-success" type="redirect-action">
+      <result name="security-login-success" type="redirectAction">
         <param name="actionName">groupSummary</param>
         <param name="namespace">/</param>
       </result>
-      <result name="security-login-cancel" type="redirect-action">
+      <result name="security-login-cancel" type="redirectAction">
         <param name="actionName">groupSummary</param>
         <param name="namespace">/</param>
       </result>
-      <result name="security-login-locked" type="redirect-action">
+      <result name="security-login-locked" type="redirectAction">
         <param name="actionName">groupSummary</param>
         <param name="namespace">/</param>
         <param name="infoMessage">Account Locked</param>
       </result>
-      <result name="security-logout" type="redirect-action">
+      <result name="security-logout" type="redirectAction">
         <param name="actionName">groupSummary</param>
         <param name="namespace">/</param>
       </result>
-      <result name="requires-authentication" type="redirect-action">
+      <result name="requires-authentication" type="redirectAction">
         <param name="actionName">login</param>
         <param name="namespace">/security</param>
       </result>
-      <result name="security-register-success" type="redirect-action">
+      <result name="security-register-success" type="redirectAction">
         <param name="actionName">groupSummary</param>
         <param name="namespace">/security</param>
       </result>
-      <result name="security-register-cancel" type="redirect-action">
+      <result name="security-register-cancel" type="redirectAction">
         <param name="actionName">groupSummary</param>
         <param name="namespace">/</param>
       </result>
-      <result name="security-account-success" type="redirect-action">
+      <result name="security-account-success" type="redirectAction">
         <param name="actionName">groupSummary</param>
         <param name="namespace">/</param>
       </result>
-      <result name="security-account-cancel" type="redirect-action">
+      <result name="security-account-cancel" type="redirectAction">
         <param name="actionName">login</param>
         <param name="namespace">/security</param>
       </result>
-      <result name="security-admin-user-created" type="redirect-action">
+      <result name="security-admin-user-created" type="redirectAction">
         <param name="actionName">login</param>
         <param name="namespace">/security</param>
       </result>
-      <result name="security-admin-user-needed" type="redirect-action">
+      <result name="security-admin-user-needed" type="redirectAction">
         <param name="actionName">addadmin</param>
         <param name="namespace">/security</param>
       </result>
-      <result name="security-must-change-password" type="redirect-action">
+      <result name="security-must-change-password" type="redirectAction">
         <param name="actionName">password</param>
         <param name="namespace">/security</param>
       </result>
@@ -162,7 +162,7 @@
              into the application webapp, using global result names. -->
     <action name="redbackRedirect" class="redback-redirect" method="redirect">
       <interceptor-ref name="retrieveStack"/>
-      <result type="redirect-action">groupSummary</result>
+      <result type="redirectAction">groupSummary</result>
     </action>
 
     <action name="httpError" class="httpError">
@@ -203,7 +203,7 @@
       <result name="wait">/WEB-INF/jsp/navigations/wait.jsp</result>     
       <result name="input">/WEB-INF/jsp/addMavenTwoProject.jsp</result>
       <result name="success" type="chain">groupSummary</result>
-      <result name="projectGroupSummary" type="redirect-action">
+      <result name="projectGroupSummary" type="redirectAction">
         <param name="actionName">projectGroupSummary</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
@@ -219,7 +219,7 @@
       <result name="wait">/WEB-INF/jsp/navigations/wait.jsp</result>      
       <result name="input">/WEB-INF/jsp/addMavenOneProject.jsp</result>
       <result name="success" type="chain">groupSummary</result>
-      <result name="projectGroupSummary" type="redirect-action">
+      <result name="projectGroupSummary" type="redirectAction">
         <param name="actionName">projectGroupSummary</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
@@ -235,7 +235,7 @@
       <result name="wait">/WEB-INF/jsp/navigations/wait.jsp</result>      
       <result name="input" type="chain">addProjectInput</result>
       <result name="success" type="chain">groupSummary</result>
-      <result name="projectGroupSummary" type="redirect-action">
+      <result name="projectGroupSummary" type="redirectAction">
         <param name="actionName">projectGroupSummary</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
@@ -244,7 +244,7 @@
     <action name="deleteProject" class="deleteProject">
       <interceptor-ref name="storeStack"/>
       <result name="delete">/WEB-INF/jsp/deleteProject.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">projectGroupSummary</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
@@ -253,7 +253,7 @@
     <action name="ProjectsList" class="projects">
       <interceptor-ref name="storeStack"/>
       <result name="confirmRemove">/WEB-INF/jsp/confirmDeleteProjects.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">projectGroupSummary</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
@@ -262,7 +262,7 @@
     <action name="buildProject" class="buildProject">
       <interceptor-ref name="storeStack"/>
       <result name="success" type="chain">groupSummary</result>
-      <result name="to_group_page" type="redirect-action">
+      <result name="to_group_page" type="redirectAction">
         <param name="actionName">projectGroupSummary</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
@@ -291,7 +291,7 @@
 
     <action name="saveBuildDefinition" class="buildDefinition" method="saveBuildDefinition">
       <result name="input">/WEB-INF/jsp/buildDefinitionEdit.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">projectView</param>
         <param name="projectId">${projectId}</param>
       </result>
@@ -324,7 +324,7 @@
     <action name="projectGroupSummary" class="projectGroup" method="summary">
       <interceptor-ref name="retrieveStack"/>
       <result name="success">/WEB-INF/jsp/projectGroupSummary.jsp</result>
-      <result name="to_summary_page" type="redirect-action">
+      <result name="to_summary_page" type="redirectAction">
         <param name="actionName">groupSummary</param>
       </result>
     </action>
@@ -343,7 +343,7 @@
 
     <action name="buildProjectGroup" class="projectGroup" method="build">
       <interceptor-ref name="storeStack"/>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">projectGroupSummary</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
@@ -353,18 +353,18 @@
     <action name="removeProjectGroup" class="projectGroup" method="remove">
       <interceptor-ref name="storeStack"/>
       <result name="confirm">/WEB-INF/jsp/confirmGroupRemoval.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">groupSummary</param>
       </result>
     </action>
     
     <action name="releaseProjectGroup" class="projectGroup" method="release">
       <interceptor-ref name="storeStack"/>
-      <result name="input" type="redirect-action">
+      <result name="input" type="redirectAction">
         <param name="actionName">projectGroupSummary</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">releasePromptGoal</param>
         <param name="projectId">${releaseProjectId}</param>
       </result>
@@ -372,7 +372,7 @@
 
     <action name="addProjectGroup" class="addProjectGroup">
       <result name="input">/WEB-INF/jsp/projectGroupAdd.jsp</result>
-      <result name="success" type="redirect-action">groupSummary</result>
+      <result name="success" type="redirectAction">groupSummary</result>
     </action>
 
     <action name="editProjectGroup" class="projectGroup" method="edit">
@@ -381,7 +381,7 @@
 
     <action name="saveProjectGroup" class="projectGroup" method="save">
       <result name="input">/WEB-INF/jsp/projectGroupEdit.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">projectGroupSummary</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
@@ -397,7 +397,7 @@
     
     <action name="removeBuildResults" class="buildResults" method="remove">
       <interceptor-ref name="storeStack"/>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">buildResults</param>
         <param name="projectId">${projectId}</param>
       </result>
@@ -407,7 +407,7 @@
     <action name="buildResult" class="buildResult">
       <interceptor-ref name="storeStack"/>
       <result name="success">/WEB-INF/jsp/buildResult.jsp</result>
-      <result name="error" type="redirect-action">
+      <result name="error" type="redirectAction">
         <param name="actionName">projectGroupSummary</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
@@ -422,7 +422,7 @@
     
     <action name="removeBuildResult" class="buildResult" method="remove">
       <interceptor-ref name="storeStack"/>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">buildResults</param>
         <param name="projectId">${projectId}</param>
       </result>
@@ -481,14 +481,14 @@
     </action>
     
     <action name="cancelBuilds" class="cancelBuild" method="cancelBuilds">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">projectGroupSummary</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
     </action>    
 
     <action name="cancelGroupBuild" class="cancelBuild" method="cancelGroupBuild">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">projectGroupSummary</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
@@ -499,7 +499,7 @@
     -->
     <action name="releasePromptGoal" class="releaseProject" method="promptReleaseGoal">
       <result name="success">/WEB-INF/jsp/releaseProject.jsp</result>
-      <result name="releaseOutputDir-required" type="redirect-action">
+      <result name="releaseOutputDir-required" type="redirectAction">
         <param name="actionName">configuration</param>
         <param name="namespace">/admin</param>
         <param name="method">input</param>
@@ -508,16 +508,16 @@
     </action>
 
     <action name="releaseProject" class="releaseProject">
-      <result name="prepareRelease" type="redirect-action">
+      <result name="prepareRelease" type="redirectAction">
         <param name="actionName">releasePrepareInput</param>
         <param name="projectId">${projectId}</param>
       </result>
-      <result name="performRelease" type="redirect-action">
+      <result name="performRelease" type="redirectAction">
         <param name="actionName">releasePerformInput</param>
         <param name="projectId">${projectId}</param>
         <param name="releaseId">${preparedReleaseId}</param>
       </result>
-      <result name="performReleaseFromScm" type="redirect-action">
+      <result name="performReleaseFromScm" type="redirectAction">
         <param name="actionName">releasePerformFromScmInput</param>
         <param name="projectId">${projectId}</param>
       </result>
@@ -530,7 +530,7 @@
 
     <action name="releasePrepare" class="releasePrepare">
       <result name="input" type="chain">releasePrepareInput</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">releaseInProgress</param>
         <param name="releaseId">${releaseId}</param>
         <param name="projectId">${projectId}</param>
@@ -546,7 +546,7 @@
 
     <action name="releasePerform" class="releasePerform">
       <result name="input" type="chain">releasePerformInput</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">releaseInProgress</param>
         <param name="releaseId">${releaseId}</param>
         <param name="projectId">${projectId}</param>
@@ -562,7 +562,7 @@
 
     <action name="releasePerformFromScm" class="releasePerform" method="executeFromScm">
       <result name="input">/WEB-INF/jsp/releasePerformFromScm.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">releaseInProgress</param>
         <param name="projectId">${projectId}</param>
         <param name="releaseId">${releaseId}</param>
@@ -583,7 +583,7 @@
     </action>
 
     <action name="releaseRollback" class="releaseRollback">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">releaseCleanup</param>
         <param name="projectId">${projectId}</param>
         <param name="releaseId">${releaseId}</param>
@@ -593,7 +593,7 @@
 
     <action name="releaseCleanup" class="releaseCleanup">
       <result name="prepareFinished" type="chain">releasePromptGoal</result>
-      <result name="performFinished" type="redirect-action">
+      <result name="performFinished" type="redirectAction">
         <param name="actionName">projectGroupSummary</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
@@ -615,7 +615,7 @@
 
     <action name="removeReleaseResults" class="releaseResult" method="remove">
       <result name="confirm">/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">projectGroupReleaseResults</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
@@ -676,7 +676,7 @@
 
     <action name="saveAppearance" class="configureAppearance">
       <result name="input">/WEB-INF/jsp/admin/editAppearance.jsp</result>
-      <result type="redirect-action">
+      <result type="redirectAction">
         <param name="actionName">configureAppearance</param>
         <param name="namespace">/admin</param>
       </result>
@@ -688,7 +688,7 @@
 
     <action name="saveCompanyPom" class="editPom">
       <result name="input">/WEB-INF/jsp/admin/editPom.jsp</result>
-      <result type="redirect-action">
+      <result type="redirectAction">
         <param name="actionName">configureAppearance</param>
         <param name="namespace">/admin</param>
       </result>
@@ -714,7 +714,7 @@
       
     <action name="deleteBuildEnv" class="profileAdministration" method="delete">
       <interceptor-ref name="storeStack"/>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">buildEnvList</param>
         <param name="namespace">/admin</param>
         <param name="method">list</param>
@@ -759,7 +759,7 @@
       
     <action name="saveInstallation" class="installation" method="save">
       <result name="input">/WEB-INF/jsp/admin/editInstallation.jsp</result>
-      <result name="success" type="redirect-action">installationsList</result>
+      <result name="success" type="redirectAction">installationsList</result>
     </action> 
     
     <action name="deleteInstallation" class="installation" method="delete">
@@ -786,14 +786,14 @@
     </action>
 
     <action name="deleteDefinitionTemplate" class="buildDefinitionTemplates" method="delete">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">buildDefinitionTemplates.action</param>        
       </result>
       <result name="confirm">/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionTemplate.jsp</result>
     </action>
     
     <action name="saveBuildDefinitionTemplate" class="buildDefinitionTemplates" method="save">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">buildDefinitionTemplates.action</param>
       </result>
       <result name="input">/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp</result>
@@ -805,21 +805,21 @@
     </action>
     
     <action name="saveBuildDefinitionAsTemplate" class="buildDefinitionTemplates" method="saveBuildDefinition">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">buildDefinitionTemplates.action</param>
       </result>
       <result name="input">/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp</result>
     </action>
 
     <action name="buildDefinitionAsTemplate" class="buildDefinitionTemplates" method="saveBuildDefinition">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">buildDefinitionTemplates.action</param>
       </result>
       <result name="input">/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp</result>
     </action>
               
     <action name="deleteBuildDefinitionAsTemplate" class="buildDefinitionTemplates" method="deleteBuildDefinition">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">buildDefinitionTemplates.action</param>
       </result>
       <result name="confirm">/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionAsTemplate.jsp</result>
@@ -831,79 +831,79 @@
     </action>
     
     <action name="removeBuildQueueEntry" class="queues" method="remove">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">displayQueues</param>
       </result>      
     </action>   
     
     <action name="removeBuildQueueEntries" class="queues" method="removeBuildEntries">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">displayQueues</param>
       </result>      
     </action>    
     
     <action name="cancelCurrentBuildTask" class="queues" method="cancelCurrent">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">displayQueues</param>
       </result>      
     </action> 
     
     <action name="removeCheckoutQueueEntry" class="queues" method="removeCheckout">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">displayQueues</param>
       </result>      
     </action>
     
     <action name="cancelCurrentQueueTask" class="queues" method="cancelCurrentCheckout">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">displayQueues</param>
       </result>      
     </action>    
     
     <action name="removeCheckoutQueueEntries" class="queues" method="removeCheckoutEntries">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">displayQueues</param>
       </result>      
     </action>    
 
     <action name="removePrepareBuildEntry" class="queues" method="removePrepareBuildEntry">
-	  <result name="success" type="redirect-action">
+	  <result name="success" type="redirectAction">
         <param name="actionName">displayQueues</param>
       </result>
     </action>
 
     <action name="removePrepareBuildEntries" class="queues" method="removePrepareBuildEntries">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">displayQueues</param>
       </result>
     </action>
     
     <action name="cancelDistributedBuild" class="queues" method="cancelDistributedBuild">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">displayQueues</param>
       </result>
     </action>
 
     <action name="removeDistributedPrepareBuildEntry" class="queues" method="removeDistributedPrepareBuildEntry">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">displayQueues</param>
       </result>
     </action>
 
     <action name="removeDistributedPrepareBuildEntries" class="queues" method="removeDistributedPrepareBuildEntries">
-	  <result name="success" type="redirect-action">
+	  <result name="success" type="redirectAction">
 	    <param name="actionName">displayQueues</param>
 	  </result>
     </action>
 
     <action name="removeDistributedBuildEntries" class="queues" method="removeDistributedBuildEntries">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">displayQueues</param>
       </result>
     </action>
 
     <action name="removeDistributedBuildEntry" class="queues" method="removeDistributedBuildEntry">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">displayQueues</param>
       </result>
     </action>
@@ -923,12 +923,12 @@
     <action name="saveBuildQueue" class="org.apache.maven.continuum.web.action.admin.BuildQueueAction" method="save">
       <result name="input">/WEB-INF/jsp/admin/editParallelBuilds.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/editParallelBuilds.jsp</result>
-      <result name="success" type="redirect-action">buildQueueList</result>
+      <result name="success" type="redirectAction">buildQueueList</result>
     </action> 
     
     <action name="deleteBuildQueue" class="org.apache.maven.continuum.web.action.admin.BuildQueueAction" method="delete">
       <result name="confirm">/WEB-INF/jsp/admin/confirmDeleteBuildQueue.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">buildQueueList</param>
       </result>    
     </action>  
@@ -950,7 +950,7 @@
     <action name="saveRepository" class="localRepository" method="save">
       <result name="error">/WEB-INF/jsp/admin/editLocalRepository.jsp</result>
       <result name="input">/WEB-INF/jsp/admin/editLocalRepository.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">repositoryList</param>
       </result>
     </action>
@@ -958,14 +958,14 @@
     <action name="removeRepository" class="localRepository" method="remove">
       <interceptor-ref name="storeStack"/>
       <result name="confirm">/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">repositoryList</param>
       </result>
     </action>
     
     <action name="purgeRepository" class="localRepository" method="doPurge">
       <interceptor-ref name="storeStack"/>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">repositoryList</param>
       </result>
     </action>
@@ -985,27 +985,27 @@
     
     <action name="savePurgeConfig" class="purgeConfiguration" method="save">
       <result name="input">/WEB-INF/jsp/admin/editPurgeConfiguration.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">purgeConfigList</param>
       </result>
     </action>
     
     <action name="removePurgeConfig" class="purgeConfiguration" method="remove">
-      <result name="error" type="redirect-action">
+      <result name="error" type="redirectAction">
         <param name="actionName">purgeConfigList</param>
         <param name="errorMessage">${message}</param>
       </result>
       <result name="confirm">/WEB-INF/jsp/admin/confirmDeletePurgeConfiguration.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">purgeConfigList</param>
       </result>
     </action>
     
     <action name="doPurge" class="purgeConfiguration" method="purge">
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">purgeConfigList</param>
       </result>
-      <result name="error" type="redirect-action">
+      <result name="error" type="redirectAction">
         <param name="actionName">purgeConfigList</param>
         <param name="errorMessage">${message}</param>
       </result>
@@ -1023,18 +1023,18 @@
     <action name="saveBuildAgent" class="buildAgent" method="save">
       <result name="input">/WEB-INF/jsp/admin/editBuildAgent.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/editBuildAgent.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">buildAgentList</param>
       </result>
     </action>
     
     <action name="deleteBuildAgent" class="buildAgent" method="delete">
-      <result name="error" type="redirect-action">
+      <result name="error" type="redirectAction">
         <param name="actionName">buildAgentList</param>
         <param name="errorMessage">${message}</param>
       </result>
       <result name="confirm">/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">buildAgentList</param>
       </result>
     </action>
@@ -1044,12 +1044,12 @@
     </action>
 
     <action name="deleteBuildAgentGroup" class="buildAgent" method="deleteGroup">
-      <result name="error" type="redirect-action">
+      <result name="error" type="redirectAction">
         <param name="actionName">buildAgentList</param>
         <param name="errorMessage">${message}</param>
       </result>
       <result name="confirm">/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">buildAgentList</param>
       </result>
     </action>
@@ -1062,7 +1062,7 @@
     <action name="saveBuildAgentGroup" class="buildAgent" method="saveGroup">
       <result name="input">/WEB-INF/jsp/admin/editBuildAgentGroup.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/editBuildAgentGroup.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">buildAgentList</param>
       </result>
     </action>

Modified: continuum/trunk/continuum-webapp/src/main/resources/template/default/head.ftl
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/template/default/head.ftl?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/template/default/head.ftl (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/template/default/head.ftl Tue Jun  8 02:04:28 2010
@@ -23,7 +23,7 @@
     // Dojo configuration
     djConfig = {
         baseRelativePath: "<@s.url includeParams='none' value='/struts/dojo' includeParams="none" encode='false'/>",
-        isDebug: ${parameters.debug?default(false)},
+        isDebug: ${parameters.debug?default(false)?string},
         bindEncoding: "${parameters.encoding}",
         debugAtAllCosts: false // not needed, but allows the Venkman debugger to work with the includes
     };

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildAgentsList.jsp Tue Jun  8 02:04:28 2010
@@ -73,7 +73,7 @@
       </div>
       <div class="functnbar3">
         <s:form name="addBuildAgent" action="editBuildAgent" method="post">
-          <s:submit value="%{getText('add')}"/>
+          <s:submit value="%{getText('add')}" theme="simple"/>
         </s:form>
       </div>
       <div id="h3">
@@ -118,7 +118,7 @@
       </div>
       <div class="functnbar3">
         <s:form name="addBuildAgentGroup" action="editBuildAgentGroup" method="post">
-          <s:submit value="%{getText('add')}"/>
+          <s:submit value="%{getText('add')}" theme="simple"/>
         </s:form>
       </div>
     </body>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp Tue Jun  8 02:04:28 2010
@@ -68,7 +68,7 @@
       </ec:table> 
       <div class="functnbar3">
         <s:form action="buildDefinitionTemplate!input.action" method="post">
-          <s:submit value="%{getText('add')}"/>
+          <s:submit value="%{getText('add')}" theme="simple"/>
         </s:form>
       </div>      
       <h3>
@@ -117,7 +117,7 @@
       
       <div class="functnbar3">
         <s:form action="buildDefinitionAsTemplate!inputBuildDefinition.action" method="post">
-          <s:submit value="%{getText('add')}"/>
+          <s:submit value="%{getText('add')}" theme="simple"/>
         </s:form>
       </div>           
       

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp Tue Jun  8 02:04:28 2010
@@ -91,7 +91,7 @@
       <div class="functnbar3">
         <s:form name="addRepoPurgeConfig" action="editPurgeConfig" method="post">
           <s:hidden name="purgeType" value="repository"/>
-          <s:submit value="%{getText('add')}"/>
+          <s:submit value="%{getText('add')}" theme="simple"/>
         </s:form>
       </div>
         
@@ -139,7 +139,7 @@
       <div class="functnbar3">
         <s:form name="addDirPurgeConfig" action="editPurgeConfig" method="post">
           <s:hidden name="purgeType" value="directory"/>
-          <s:submit value="%{getText('add')}"/>
+          <s:submit value="%{getText('add')}" theme="simple"/>
         </s:form>
       </div>
     </body>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp Tue Jun  8 02:04:28 2010
@@ -121,7 +121,7 @@
     <div class="functnbar3">
       <s:form action="buildDefinition" method="post">
         <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
-        <s:submit value="%{getText('add')}"/>
+        <s:submit value="%{getText('add')}" theme="simple"/>
       </s:form>
     </div>
   </redback:ifAuthorized>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp Tue Jun  8 02:04:28 2010
@@ -77,7 +77,7 @@
       <s:url id="addUrl" action="addProjectGroupNotifier" namespace="/"  includeContext="false" includeParams="none" />
       <s:form action="%{addUrl}" method="post">
         <input type="hidden" name="projectGroupId" value="<s:property value="projectGroupId"/>"/>
-        <s:submit value="%{getText('add')}"/>
+        <s:submit value="%{getText('add')}" theme="simple"/>
         </s:form>
     </div>
   </redback:ifAuthorized>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp Tue Jun  8 02:04:28 2010
@@ -88,7 +88,7 @@
           <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:submit value="%{getText('add')}" theme="simple"/>
           </s:form>
           </redback:ifAuthorized>
         </div>
@@ -162,7 +162,7 @@
           <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:submit value="%{getText('add')}" theme="simple"/>
           </s:form>
           </redback:ifAuthorized>
         </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp Tue Jun  8 02:04:28 2010
@@ -70,14 +70,14 @@
               <s:hidden name="projectId"/>
               <s:hidden name="releaseId"/>
               <s:hidden name="releaseGoal"/>
-              <s:submit value="%{getText('rollback')}"/>
+              <s:submit value="%{getText('rollback')}" theme="simple"/>
             </s:form>
           </td>
           <td>
             <s:form action="releaseCleanup" method="post">
               <s:hidden name="projectId"/>
               <s:hidden name="releaseId"/>
-              <s:submit value="%{getText('done')}"/>
+              <s:submit value="%{getText('done')}" theme="simple"/>
             </s:form>
           </td>
         </tr>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp Tue Jun  8 02:04:28 2010
@@ -34,7 +34,7 @@
             <s:form action="releaseRollback" method="post">
               <s:hidden name="projectId"/>
               <s:hidden name="releaseId"/>
-              <s:submit value="%{getText('rollback')}"/>
+              <s:submit value="%{getText('rollback')}" theme="simple"/>
             </s:form>
           </td>
           <td>
@@ -42,7 +42,7 @@
               <s:hidden name="projectId"/>
               <s:hidden name="releaseId"/>
               <s:hidden name="releaseGoal"/>
-              <s:submit value="%{getText('cancel')}"/>
+              <s:submit value="%{getText('cancel')}" theme="simple"/>
             </s:form>
           </td>
         </tr>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp Tue Jun  8 02:04:28 2010
@@ -73,7 +73,7 @@
             <s:textfield label="%{getText('projectBuilds.report.rowCount')}" name="rowCount" id="rowCount" size="10"/>
         </table>
         <div class="functnbar3">
-          <s:submit value="%{getText('projectBuilds.report.view')}" />
+          <s:submit value="%{getText('projectBuilds.report.view')}" theme="simple" />
           <input type="button" id="resetFilter" value="<s:text name='projectBuilds.report.button.reset' />" />
         </div>
       </div>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml Tue Jun  8 02:04:28 2010
@@ -37,18 +37,20 @@
 
 
   <filter>
-    <filter-name>struts-cleanup</filter-name>
-    <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class>
+    <filter-name>struts-prepare</filter-name>
+    <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class>
   </filter>
+
   <filter>
     <filter-name>sitemesh</filter-name>
-    <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
+    <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
   </filter>
+
   <filter>
-    <filter-name>struts</filter-name>
-    <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
+    <filter-name>struts-execute</filter-name>
+    <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class>
   </filter>
-  
+
   <filter>
     <filter-name>encodingFilter</filter-name>
     <filter-class> org.springframework.web.filter.CharacterEncodingFilter</filter-class>
@@ -68,7 +70,7 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>  
   <filter-mapping>
-    <filter-name>struts-cleanup</filter-name>
+    <filter-name>struts-prepare</filter-name>
     <url-pattern>/*</url-pattern>
   </filter-mapping>
   <filter-mapping>
@@ -76,7 +78,7 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
   <filter-mapping>
-    <filter-name>struts</filter-name>
+    <filter-name>struts-execute</filter-name>
     <url-pattern>/*</url-pattern>
   </filter-mapping>
   

Added: continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractActionTest.java?rev=952508&view=auto
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractActionTest.java (added)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractActionTest.java Tue Jun  8 02:04:28 2010
@@ -0,0 +1,53 @@
+package org.apache.continuum.web.action;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.jmock.MockObjectTestCase;
+
+import com.opensymphony.xwork2.ActionContext;
+import com.opensymphony.xwork2.config.ConfigurationManager;
+import com.opensymphony.xwork2.config.providers.XWorkConfigurationProvider;
+import com.opensymphony.xwork2.inject.Container;
+import com.opensymphony.xwork2.util.ValueStack;
+import com.opensymphony.xwork2.util.ValueStackFactory;
+
+public abstract class AbstractActionTest
+    extends MockObjectTestCase
+{
+    protected void setUp()
+        throws Exception
+    {
+        if ( ActionContext.getContext() == null )
+        {
+            // This fix allow initialization of ActionContext.getContext() to avoid NPE
+
+            ConfigurationManager configurationManager = new ConfigurationManager();
+            configurationManager.addContainerProvider( new XWorkConfigurationProvider() );
+            com.opensymphony.xwork2.config.Configuration config = configurationManager.getConfiguration();
+            Container container = config.getContainer();
+    
+            ValueStack stack = container.getInstance( ValueStackFactory.class ).createValueStack();
+            stack.getContext().put( ActionContext.CONTAINER, container );
+            ActionContext.setContext( new ActionContext( stack.getContext() ) );
+    
+            assertNotNull(ActionContext.getContext());
+        }
+    }
+}

Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractReleaseActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractReleaseActionTest.java?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractReleaseActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractReleaseActionTest.java Tue Jun  8 02:04:28 2010
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.web.action;
+package org.apache.continuum.web.action;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -31,10 +31,9 @@ import org.apache.maven.continuum.Contin
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.model.system.Profile;
 import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
 
 public class AbstractReleaseActionTest
-    extends MockObjectTestCase
+    extends AbstractActionTest
 {
     private ReleaseActionStub action;
 
@@ -47,6 +46,8 @@ public class AbstractReleaseActionTest
     protected void setUp()
         throws Exception
     {
+        super.setUp();
+
         continuumMock = mock( Continuum.class );
         configurationServiceMock = mock( ConfigurationService.class );
 

Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/ViewBuildsReportActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/ViewBuildsReportActionTest.java?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/ViewBuildsReportActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/ViewBuildsReportActionTest.java Tue Jun  8 02:04:28 2010
@@ -30,12 +30,11 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.apache.maven.continuum.Continuum;
 import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
 
 import com.opensymphony.xwork2.Action;
 
 public class ViewBuildsReportActionTest
-    extends MockObjectTestCase
+    extends AbstractActionTest
 {
     private ViewBuildsReportActionStub action;
 

Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java Tue Jun  8 02:04:28 2010
@@ -23,12 +23,12 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.continuum.web.action.AbstractActionTest;
 import org.apache.maven.continuum.web.action.stub.AddProjectActionStub;
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.ProjectGroup;
 import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
 
 /**
  * Test for {@link AddProjectAction}
@@ -36,14 +36,17 @@ import org.jmock.MockObjectTestCase;
  * @author <a href="mailto:jzurbano@apache.org">jzurbano</a>
  */
 public class AddProjectActionTest
-    extends MockObjectTestCase
+    extends AbstractActionTest
 {
-    private final AddProjectActionStub action;
+    private AddProjectActionStub action;
 
-    private final Mock continuumMock;
+    private Mock continuumMock;
 
-    public AddProjectActionTest()
+    protected void setUp()
+        throws Exception
     {
+        super.setUp();
+
         action = new AddProjectActionStub();
         continuumMock = new Mock( Continuum.class );
         action.setContinuum( (Continuum) continuumMock.proxy() );

Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildAgentActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildAgentActionTest.java?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildAgentActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildAgentActionTest.java Tue Jun  8 02:04:28 2010
@@ -25,14 +25,14 @@ import java.util.List;
 import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
 import org.apache.continuum.configuration.BuildAgentConfiguration;
 import org.apache.continuum.configuration.BuildAgentGroupConfiguration;
+import org.apache.continuum.web.action.AbstractActionTest;
 import org.apache.continuum.web.action.admin.BuildAgentAction;
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
 
 public class BuildAgentActionTest
-    extends MockObjectTestCase
+    extends AbstractActionTest
 {
     private BuildAgentAction action;
 
@@ -47,6 +47,8 @@ public class BuildAgentActionTest
     protected void setUp()
         throws Exception
     {
+        super.setUp();
+
         action = new BuildAgentAction();
         continuumMock = mock( Continuum.class );
         configurationServiceMock = mock( ConfigurationService.class );

Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildResultActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildResultActionTest.java?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildResultActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildResultActionTest.java Tue Jun  8 02:04:28 2010
@@ -25,6 +25,7 @@ import java.util.HashMap;
 import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
 import org.apache.continuum.buildmanager.BuildsManager;
 import org.apache.continuum.taskqueue.BuildProjectTask;
+import org.apache.continuum.web.action.AbstractActionTest;
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.model.project.BuildResult;
@@ -32,10 +33,9 @@ import org.apache.maven.continuum.model.
 import org.apache.maven.continuum.web.action.stub.BuildResultActionStub;
 import org.apache.maven.continuum.xmlrpc.project.ContinuumProjectState;
 import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
 
 public class BuildResultActionTest
-    extends MockObjectTestCase
+    extends AbstractActionTest
 {
     private BuildResultActionStub action;
 
@@ -48,7 +48,10 @@ public class BuildResultActionTest
     private Mock buildsManager;
 
     protected void setUp()
+        throws Exception
     {
+        super.setUp();
+
         action = new BuildResultActionStub();
         continuum = mock( Continuum.class );
         configurationService = mock( ConfigurationService.class );

Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ReleasePrepareActionTest.java Tue Jun  8 02:04:28 2010
@@ -19,10 +19,10 @@ package org.apache.maven.continuum.web.a
  * under the License.
  */
 
+import org.apache.continuum.web.action.AbstractActionTest;
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.model.project.Project;
 import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
 
 /**
  * Test for {@link ReleasePrepareAction}
@@ -31,14 +31,17 @@ import org.jmock.MockObjectTestCase;
  * @version $Id$
  */
 public class ReleasePrepareActionTest
-    extends MockObjectTestCase
+    extends AbstractActionTest
 {
-    private final ReleasePrepareAction action;
+    private ReleasePrepareAction action;
 
-    private final Mock continuumMock;
+    private Mock continuumMock;
 
-    public ReleasePrepareActionTest()
+    protected void setUp()
+        throws Exception
     {
+        super.setUp();
+
         action = new ReleasePrepareAction();
         continuumMock = new Mock( Continuum.class );
         //securitySessionMock = new Mock( SecuritySession.class );

Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/SummaryActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/SummaryActionTest.java?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/SummaryActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/SummaryActionTest.java Tue Jun  8 02:04:28 2010
@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.continuum.buildmanager.BuildsManager;
+import org.apache.continuum.web.action.AbstractActionTest;
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.configuration.ConfigurationService;
 import org.apache.maven.continuum.model.project.BuildResult;
@@ -35,10 +36,9 @@ import org.apache.maven.continuum.web.ac
 import org.apache.maven.continuum.web.model.ProjectSummary;
 import org.apache.maven.continuum.xmlrpc.project.ContinuumProjectState;
 import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
 
 public class SummaryActionTest
-    extends MockObjectTestCase
+    extends AbstractActionTest
 {
     private SummaryActionStub action;
 
@@ -49,7 +49,10 @@ public class SummaryActionTest
     private Mock buildsManager;
 
     protected void setUp()
+        throws Exception
     {
+        super.setUp();
+
         action = new SummaryActionStub();
 
         continuum = mock( Continuum.class );

Modified: continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=952508&r1=952507&r2=952508&view=diff
==============================================================================
--- continuum/trunk/pom.xml (original)
+++ continuum/trunk/pom.xml Tue Jun  8 02:04:28 2010
@@ -1103,7 +1103,7 @@ under the License.
       <dependency>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-core</artifactId>
-        <version>2.0.14</version>
+        <version>${struts.version}</version>
         <exclusions>
           <exclusion>
             <groupId>commons-logging</groupId>
@@ -1114,7 +1114,7 @@ under the License.
       <dependency>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-spring-plugin</artifactId>
-        <version>2.0.14</version>
+        <version>${struts.version}</version>
         <exclusions>
           <exclusion>
             <groupId>commons-logging</groupId>
@@ -1122,11 +1122,6 @@ under the License.
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>com.opensymphony</groupId>
-        <artifactId>xwork</artifactId>
-        <version>2.0.7</version>
-      </dependency>
       <!--
         Plexus Redback Dependencies
         -->
@@ -1279,7 +1274,7 @@ under the License.
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-spring</artifactId>
-        <version>1.2</version>
+        <version>1.3-SNAPSHOT</version>
         <exclusions>
           <exclusion>
             <groupId>xml-apis</groupId>
@@ -1671,9 +1666,10 @@ under the License.
     <continuumWebappVersion>${project.version}</continuumWebappVersion>
     <maven.version>2.0.9</maven.version>
     <spring.version>2.5.6</spring.version>
+    <struts.version>2.1.6</struts.version>
     <wagon.version>1.0-beta-2</wagon.version>
     <maven-scm.version>1.2</maven-scm.version>
-    <redback.version>1.2.3</redback.version>
+    <redback.version>1.3-SNAPSHOT</redback.version>
     <archiva.version>1.2.1</archiva.version>
     <slf4jVersion>1.5.8</slf4jVersion>
     <xmlrpc.version>3.1</xmlrpc.version>



Mime
View raw message