continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1091297 [1/2] - in /continuum/trunk: ./ continuum-api/src/main/java/org/apache/continuum/taskqueue/ continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/ continuum-buildagent/...
Date Tue, 12 Apr 2011 05:14:10 GMT
Author: brett
Date: Tue Apr 12 05:14:08 2011
New Revision: 1091297

URL: http://svn.apache.org/viewvc?rev=1091297&view=rev
Log:
[CONTINUUM-2621] upgraded to Redback 1.2.8-SNAPSHOT to get CSRF fixes in user mgnt
[CONTINUUM-2622]
o added CSRF checks for delete actions and some save actions
o added selenium tests for CSRF checks
Merged from: r1091025:1091284

Added:
    continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/CSRFSecurityTest.java
      - copied unchanged from r1091290, continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/CSRFSecurityTest.java
Modified:
    continuum/trunk/   (props changed)
    continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java   (props changed)
    continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java   (props changed)
    continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/PrepareBuildProjectsTask.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/BuildAgentBuildExecutorManager.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/BuildAgentMavenBuilderHelper.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfiguration.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationException.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/GeneralBuildAgentConfiguration.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/BuildAgentInstallationService.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultBuildAgentInstallationService.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/BuildAgentTaskQueueManager.java   (props changed)
    continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java   (props changed)
    continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java   (props changed)
    continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/ThreadedDistributedBuildTaskQueueExecutor.java   (props changed)
    continuum/trunk/continuum-data-management/data-management-cli/   (props changed)
    continuum/trunk/continuum-docs/   (props changed)
    continuum/trunk/continuum-docs/src/site/xdoc/   (props changed)
    continuum/trunk/continuum-model/src/main/resources/package-default.orm   (props changed)
    continuum/trunk/continuum-webapp-test/src/test/selenium-ide/   (props changed)
    continuum/trunk/continuum-webapp-test/src/test/testng/config/testng.xml
    continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java   (props changed)
    continuum/trunk/continuum-webapp/src/main/resources/struts.xml
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
    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/confirmDeleteBuildAgent.jsp   (contents, props changed)
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionTemplate.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildQueue.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteInstallation.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeletePurgeConfiguration.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.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/buildDefinitionSummaryComponent.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp
    continuum/trunk/src/site/   (props changed)

Propchange: continuum/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,4 +1,4 @@
 /continuum/branches/continuum-1.2.x:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024,725845,726103,726239,726462
-/continuum/branches/continuum-1.3.x:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/branches/continuum-distributed-builds:713270-734307
 /continuum/tags/continuum-1.2.3:733253

Propchange: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-api/src/main/java/org/apache/maven/continuum/buildqueue/BuildProjectTask.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/BuildProjectTask.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/buildqueue/BuildProjectTask.java:713270-724659

Propchange: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTask.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/CheckOutTask.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTask.java:713270-724659

Propchange: continuum/trunk/continuum-api/src/main/java/org/apache/continuum/taskqueue/PrepareBuildProjectsTask.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,2 +1,2 @@
 /continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTask.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339
-/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/PrepareBuildProjectsTask.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/taskqueue/PrepareBuildProjectsTask.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/BuildAgentBuildExecutorManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/BuildExecutorManager.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/BuildAgentBuildExecutorManager.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/BuildAgentBuildExecutorManager.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/BuildExecutorManager.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildExecutorManager.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildAgentBuildExecutorManager.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/manager/DefaultBuildExecutorManager.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/branches/continuum-distributed-builds/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1:713270-726726
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m1:724671-733412

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/BuildAgentMavenBuilderHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/MavenBuilderHelper.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/BuildAgentMavenBuilderHelper.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/BuildAgentMavenBuilderHelper.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/MavenBuilderHelper.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultMavenBuilderHelper.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultBuildAgentMavenBuilderHelper.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/build/execution/maven/m2/DefaultMavenBuilderHelper.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumConfiguration.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfiguration.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfiguration.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumConfiguration.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumConfigurationException.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationException.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationException.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumConfigurationException.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ConfigurationService.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ConfigurationService.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultContinuumConfiguration.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultContinuumConfiguration.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultConfigurationService.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultConfigurationService.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/GeneralBuildAgentConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumBuildAgentConfiguration.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/GeneralBuildAgentConfiguration.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/GeneralBuildAgentConfiguration.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/ContinuumBuildAgentConfiguration.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/BuildAgentInstallationService.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/InstallationService.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/BuildAgentInstallationService.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/BuildAgentInstallationService.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/InstallationService.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultBuildAgentInstallationService.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultInstallationService.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultBuildAgentInstallationService.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultBuildAgentInstallationService.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/installation/DefaultInstallationService.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/Continuum.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/Continuum.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/DefaultContinuum.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/DefaultContinuum.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/BuildAgentTaskQueueManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/TaskQueueManager.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/BuildAgentTaskQueueManager.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/BuildAgentTaskQueueManager.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/TaskQueueManager.java:713270-724659

Propchange: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultTaskQueueManager.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-distributed-build/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultTaskQueueManager.java:713270-724659

Propchange: continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildTaskExecutor.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildTaskExecutor.java:713270-724659

Propchange: continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/ThreadedDistributedBuildTaskQueueExecutor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildTaskQueueExecutor.java:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024
-/continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/ThreadedDistributedBuildTaskQueueExecutor.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/ThreadedDistributedBuildTaskQueueExecutor.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildTaskQueueExecutor.java:713270-724659

Propchange: continuum/trunk/continuum-data-management/data-management-cli/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,3 +1,3 @@
 /continuum/branches/continuum-1.2.x/continuum-data-management/data-management-cli:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024,725845,726103,726239,726462,734910
-/continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-data-management/data-management-cli:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli:713270-734307

Propchange: continuum/trunk/continuum-docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,4 +1,4 @@
 /continuum/branches/continuum-1.2.x/continuum-docs:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024,725845,726103,726239,726462
-/continuum/branches/continuum-1.3.x/continuum-docs:760767-900271,904130,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-docs:760767-900271,904130,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/branches/continuum-distributed-builds/continuum-docs:713270-734307
 /continuum/tags/continuum-1.2.3/continuum-docs:733253

Propchange: continuum/trunk/continuum-docs/src/site/xdoc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,5 +1,5 @@
 /continuum/branches/continuum-1.2.x/continuum-docs/src/site/xdoc:698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024,725845,726103,726239,726462
-/continuum/branches/continuum-1.3.x/continuum-docs/src/site/xdoc:760767-900271,904130,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-docs/src/site/xdoc:760767-900271,904130,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/branches/continuum-distributed-builds/continuum-docs/src/site/xdoc:713270-734307
 /continuum/tags/continuum-1.2.3/continuum-docs/src/site/xdoc:733253
 /continuum/trunk/continuum-docs/src/site/xdoc:690494-690520

Propchange: continuum/trunk/continuum-model/src/main/resources/package-default.orm
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1 +1 @@
-/continuum/branches/continuum-1.3.x/continuum-model/src/main/resources/package-default.orm:760767-766105,766107-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-model/src/main/resources/package-default.orm:760767-766105,766107-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290

Propchange: continuum/trunk/continuum-webapp-test/src/test/selenium-ide/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1 +1 @@
-/continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/selenium-ide:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-webapp-test/src/test/selenium-ide:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/config/testng.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/config/testng.xml?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/config/testng.xml (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/config/testng.xml Tue Apr 12 05:14:08 2011
@@ -64,6 +64,7 @@ under the License.
         <include name="buildEnvironment" />
         <include name="buildDefinitionTemplate" />
         <include name="userroles"/>
+        <include name="csrf"/>
       </run>
     </groups>
     <packages>

Propchange: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,2 +1,2 @@
-/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290
 /continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java:713270-724659,724671-733412

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=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/struts.xml Tue Apr 12 05:14:08 2011
@@ -49,6 +49,9 @@
         </interceptor-ref>
         <interceptor-ref name="redbackPolicyEnforcement"/>
         <interceptor-ref name="continuumConfigurationCheck"/>
+        <interceptor-ref name="tokenSession">
+          <param name="excludeMethods">*</param>
+        </interceptor-ref>
         <interceptor-ref name="validation">
           <param name="excludeMethods">input,back,cancel,browse,edit</param>
         </interceptor-ref>
@@ -155,6 +158,8 @@
         <param name="actionName">password</param>
         <param name="namespace">/security</param>
       </result>
+
+      <result name="invalid.token">/WEB-INF/jsp/redback/invalidToken.jsp</result>
     </global-results>
 
     <global-exception-mappings>
@@ -248,7 +253,9 @@
     </action>
 
     <action name="deleteProject" class="deleteProject">
-      <interceptor-ref name="storeStack"/>
+      <interceptor-ref name="storeStack">
+        <param name="tokenSession.includeMethods">*</param>
+      </interceptor-ref>
       <result name="delete">/WEB-INF/jsp/deleteProject.jsp</result>
       <result name="success" type="redirectAction">
         <param name="actionName">projectGroupSummary</param>
@@ -312,6 +319,9 @@
     <action name="removeProjectBuildDefinition" class="buildDefinition" method="removeFromProject">
       <result name="confirm">/WEB-INF/jsp/deleteBuildDefinition.jsp</result>
       <result name="success" type="chain">projectView</result>
+      <interceptor-ref name="configuredContinuumStack">
+        <param name="tokenSession.includeMethods">removeFromProject</param>
+      </interceptor-ref>
     </action>
 
     <action name="saveGroupBuildDefinition" class="buildDefinition" method="saveToGroup">
@@ -321,6 +331,9 @@
     <action name="removeGroupBuildDefinition" class="buildDefinition" method="removeFromProjectGroup">
       <result name="confirm">/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp</result>
       <result name="success" type="chain">projectGroupBuildDefinition</result>
+      <interceptor-ref name="configuredContinuumStack">
+        <param name="tokenSession.includeMethods">removeFromProjectGroup</param>
+      </interceptor-ref>
     </action>
 
 
@@ -357,7 +370,9 @@
     </action>
 
     <action name="removeProjectGroup" class="projectGroup" method="remove">
-      <interceptor-ref name="storeStack"/>
+      <interceptor-ref name="storeStack">
+        <param name="tokenSession.includeMethods">remove</param>
+      </interceptor-ref>
       <result name="confirm">/WEB-INF/jsp/confirmGroupRemoval.jsp</result>
       <result name="success" type="redirectAction">
         <param name="actionName">groupSummary</param>
@@ -427,7 +442,9 @@
     </action>    
     
     <action name="removeBuildResult" class="buildResult" method="remove">
-      <interceptor-ref name="storeStack"/>
+      <interceptor-ref name="storeStack">
+        <param name="tokenSession.includeMethods">remove</param>
+      </interceptor-ref>
       <result name="success" type="redirectAction">
         <param name="actionName">buildResults</param>
         <param name="projectId">${projectId}</param>
@@ -476,10 +493,14 @@
       <result name="success" type="chain">schedules</result>
       <result name="error" type="chain">schedule</result>
     </action>
+    
     <action name="removeSchedule" class="schedule" method="remove">
       <result name="confirm">/WEB-INF/jsp/confirmScheduleRemoval.jsp</result>
       <result name="success" type="chain">schedules</result>
       <result name="error" type="chain">schedule</result>
+      <interceptor-ref name="configuredContinuumStack">
+        <param name="tokenSession.includeMethods">remove</param>
+      </interceptor-ref>
     </action>
 
     <action name="cancelBuild" class="cancelBuild">
@@ -625,6 +646,9 @@
         <param name="actionName">projectGroupReleaseResults</param>
         <param name="projectGroupId">${projectGroupId}</param>
       </result>
+      <interceptor-ref name="configuredContinuumStack">
+        <param name="tokenSession.includeMethods">remove</param>
+      </interceptor-ref>
     </action>
 
     <action name="viewReleases" class="distributedRelease" method="list">
@@ -674,6 +698,9 @@
     <action name="saveFooter" class="configureFooter" method="saveFooter">
       <result name="input">/WEB-INF/jsp/admin/appearance.jsp</result>
       <result name="success">/WEB-INF/jsp/admin/appearance.jsp</result>
+      <interceptor-ref name="configuredContinuumStack">
+        <param name="tokenSession.includeMethods">saveFooter</param>
+      </interceptor-ref>
     </action>    
       
     <action name="editAppearance" class="configureAppearance" method="input">
@@ -698,6 +725,9 @@
         <param name="actionName">configureAppearance</param>
         <param name="namespace">/admin</param>
       </result>
+      <interceptor-ref name="configuredContinuumStack">
+        <param name="tokenSession.includeMethods">execute</param>
+      </interceptor-ref>
     </action>
       
     <!--
@@ -719,7 +749,9 @@
     </action>
       
     <action name="deleteBuildEnv" class="profileAdministration" method="delete">
-      <interceptor-ref name="storeStack"/>
+      <interceptor-ref name="storeStack">
+        <param name="tokenSession.includeMethods">delete</param>
+      </interceptor-ref>
       <result name="success" type="redirectAction">
         <param name="actionName">buildEnvList</param>
         <param name="namespace">/admin</param>
@@ -744,7 +776,7 @@
     
     <action name="removeBuildEnvInstallation" class="profileAdministration" method="removeInstallation">
       <result name="success">/WEB-INF/jsp/admin/editProfile.jsp</result>
-      <result name="input">/WEB-INF/jsp/admin/editProfile.jsp</result>        
+      <result name="input">/WEB-INF/jsp/admin/editProfile.jsp</result>
     </action>
       
     <!--
@@ -796,6 +828,9 @@
         <param name="actionName">buildDefinitionTemplates.action</param>        
       </result>
       <result name="confirm">/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionTemplate.jsp</result>
+      <interceptor-ref name="configuredContinuumStack">
+        <param name="tokenSession.includeMethods">delete</param>
+      </interceptor-ref>
     </action>
     
     <action name="saveBuildDefinitionTemplate" class="buildDefinitionTemplates" method="save">
@@ -936,8 +971,11 @@
       <result name="confirm">/WEB-INF/jsp/admin/confirmDeleteBuildQueue.jsp</result>
       <result name="success" type="redirectAction">
         <param name="actionName">buildQueueList</param>
-      </result>    
-    </action>  
+      </result>
+      <interceptor-ref name="configuredContinuumStack">
+        <param name="tokenSession.includeMethods">delete</param>
+      </interceptor-ref>
+    </action>
             
     <!--
     * Local Repository actions
@@ -962,7 +1000,9 @@
     </action>
     
     <action name="removeRepository" class="localRepository" method="remove">
-      <interceptor-ref name="storeStack"/>
+      <interceptor-ref name="storeStack">
+        <param name="tokenSession.includeMethods">remove</param>
+      </interceptor-ref>
       <result name="confirm">/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp</result>
       <result name="success" type="redirectAction">
         <param name="actionName">repositoryList</param>
@@ -1005,6 +1045,9 @@
       <result name="success" type="redirectAction">
         <param name="actionName">purgeConfigList</param>
       </result>
+      <interceptor-ref name="configuredContinuumStack">
+        <param name="tokenSession.includeMethods">remove</param>
+      </interceptor-ref>
     </action>
     
     <action name="doPurge" class="purgeConfiguration" method="purge">
@@ -1043,6 +1086,9 @@
       <result name="success" type="redirectAction">
         <param name="actionName">buildAgentList</param>
       </result>
+      <interceptor-ref name="configuredContinuumStack">
+        <param name="tokenSession.includeMethods">delete</param>
+      </interceptor-ref>
     </action>
     
     <action name="viewBuildAgent" class="buildAgent" method="view">
@@ -1058,6 +1104,9 @@
       <result name="success" type="redirectAction">
         <param name="actionName">buildAgentList</param>
       </result>
+      <interceptor-ref name="configuredContinuumStack">
+        <param name="tokenSession.includeMethods">deleteGroup</param>
+      </interceptor-ref>
     </action>
 
     <action name="editBuildAgentGroup" class="buildAgent" method="inputGroup">
@@ -1121,6 +1170,9 @@
       <result name="delete">/WEB-INF/jsp/notifier/deleteNotifier.jsp</result>
       <result name="success" type="chain">projectView</result>
       <result name="to_group_page" type="chain">projectGroupNotifier</result>
+      <interceptor-ref name="configuredContinuumStack">
+        <param name="tokenSession.includeMethods">execute</param>
+      </interceptor-ref>
     </action>
 
     <action name="addProjectNotifier" class="addProjectNotifier" method="doDefault">
@@ -1197,6 +1249,9 @@
     <action name="deleteProjectGroupNotifier" class="deleteGroupNotifier">
       <result name="delete">/WEB-INF/jsp/notifier/deleteNotifier.jsp</result>
       <result name="success" type="chain">projectGroupNotifier</result>
+      <interceptor-ref name="configuredContinuumStack">
+        <param name="tokenSession.includeMethods">execute</param>
+      </interceptor-ref>
     </action>
 
     <action name="addProjectGroupNotifier" class="addGroupNotifier" method="doDefault">

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Tue Apr 12 05:14:08 2011
@@ -94,6 +94,7 @@
   </c:choose>
 </c:if>
 <s:form action="saveFooter!saveFooter.action" method="get" namespace="/admin">
+  <s:token/>
   <div id="axial" class="h3">
     <h3><s:text name="appearance.footerContent"/></h3>
     <div class="axial">

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=1091297&r1=1091296&r2=1091297&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 Apr 12 05:14:08 2011
@@ -62,8 +62,11 @@
               </s:a>
             </ec:column>
             <ec:column property="deleteActions" title="&nbsp;" width="1%">
+              <s:token/>
               <s:url id="removeBuildAgentUrl" action="deleteBuildAgent">
                 <s:param name="buildAgent.url">${pageScope.buildAgent.url}</s:param>
+                <s:param name="struts.token.name">struts.token</s:param>
+                <s:param name="struts.token"><s:property value="struts.token"/></s:param>
               </s:url>
               <s:a href="%{removeBuildAgentUrl}">
                 <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"/>
@@ -108,8 +111,11 @@
               </s:a>
             </ec:column>
             <ec:column property="deleteActions" title="&nbsp;" width="1%">
+              <s:token/>
               <s:url id="removeBuildAgentGroupUrl" action="deleteBuildAgentGroup">
                 <s:param name="buildAgentGroup.name">${pageScope.buildAgentGroup.name}</s:param>
+                <s:param name="struts.token.name">struts.token</s:param>
+                <s:param name="struts.token"><s:property value="struts.token"/></s:param>
               </s:url>
               <s:a href="%{removeBuildAgentGroupUrl}">
                 <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"/>

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=1091297&r1=1091296&r2=1091297&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 Apr 12 05:14:08 2011
@@ -57,9 +57,12 @@
               <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='disabled'/>" title="<s:text name='disabled'/>" border="0" />
             </c:when>
             <c:otherwise>
+              <s:token/>
               <s:url id="deleteUrl" action="deleteDefinitionTemplate" method="delete" namespace="/">
                 <s:param name="buildDefinitionTemplate.id">${pageScope.template.id}</s:param>
                 <s:param name="buildDefinitionTemplate.name">${pageScope.template.name}</s:param>
+                <s:param name="struts.token.name">struts.token</s:param>
+                <s:param name="struts.token"><s:property value="struts.token"/></s:param>
               </s:url>
               <s:a href="%{deleteUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
             </c:otherwise>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp Tue Apr 12 05:14:08 2011
@@ -40,6 +40,7 @@
         </div>
         <div class="functnbar3">
           <s:form action="deleteBuildAgent!delete.action" method="post">
+            <s:token/>
             <input type="hidden" name="buildAgent.url" value="${buildAgent.url}" />
             <s:hidden name="confirmed" value="true"/>
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>

Propchange: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 12 05:14:08 2011
@@ -1,2 +1,2 @@
 /continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationDeleteBuildAgent.jsp:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339
-/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053
+/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp:760767-900271,915354,915760,915848-915864,916073-916074,1065985,1066010,1066053,1091025-1091290

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgentGroup.jsp Tue Apr 12 05:14:08 2011
@@ -40,6 +40,7 @@
         </div>
         <div class="functnbar3">
           <s:form action="deleteBuildAgentGroup!deleteGroup.action" method="post">
+            <s:token/>
             <input type="hidden" name="buildAgentGroup.name" value="${buildAgentGroup.name}" />
             <s:hidden name="confirmed" value="true"/>
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionTemplate.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionTemplate.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionTemplate.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildDefinitionTemplate.jsp Tue Apr 12 05:14:08 2011
@@ -39,6 +39,7 @@
         </div>
         <div class="functnbar3">
           <s:form action="deleteDefinitionTemplate" method="post">
+            <s:token/>
             <s:hidden name="buildDefinitionTemplate.id"/>
             <s:hidden name="confirmed" value="true"/>
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp Tue Apr 12 05:14:08 2011
@@ -39,6 +39,7 @@
         </div>
         <div class="functnbar3">
           <s:form action="deleteBuildEnv!delete.action" method="post">
+            <s:token/>
             <input type="hidden" name="profile.id" value="${profile.id}" />
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
           </s:form>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildQueue.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildQueue.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildQueue.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildQueue.jsp Tue Apr 12 05:14:08 2011
@@ -39,6 +39,7 @@
         </div>
         <div class="functnbar3">
           <s:form action="deleteBuildQueue" method="post">
+            <s:token/>
             <s:hidden name="buildQueue.id"/>
             <s:hidden name="confirmed" value="true"/>
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteInstallation.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteInstallation.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteInstallation.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteInstallation.jsp Tue Apr 12 05:14:08 2011
@@ -38,7 +38,7 @@
           </p>
         </div>
         <div class="functnbar3">
-          <s:form action="deleteInstallation" method="post">            
+          <s:form action="deleteInstallation" method="post">
             <input type="hidden" name="installation.installationId" value="${installation.installationId}" />
             <s:hidden name="confirmed" value="true"/>
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp Tue Apr 12 05:14:08 2011
@@ -30,6 +30,7 @@
         <h3><s:text name="deleteRepository.section.title"/></h3>
         <div class="axial">
         <s:form action="removeRepository" method="post">
+          <s:token/>
           <s:hidden name="repository.id"/>
           <s:hidden name="confirmed" value="true"/>
           <s:actionerror/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeletePurgeConfiguration.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeletePurgeConfiguration.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeletePurgeConfiguration.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeletePurgeConfiguration.jsp Tue Apr 12 05:14:08 2011
@@ -30,6 +30,7 @@
         <h3><s:text name="deletePurgeConfiguration.section.title"/></h3>
         <div class="axial">
         <s:form action="removePurgeConfig" method="post">
+          <s:token/>
           <s:hidden name="purgeConfigId"/>
           <s:hidden name="confirmed" value="true"/>
           <s:actionerror/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp Tue Apr 12 05:14:08 2011
@@ -29,6 +29,7 @@
 
 <s:actionmessage/>
 <s:form method="post" action="saveCompanyPom" namespace="/admin" validate="true" theme="xhtml">
+  <s:token/>
   <s:label name="companyModel.groupId" label="%{getText('appearance.companyPom.groupId')}"/>
   <s:label name="companyModel.artifactId" label="%{getText('appearance.companyPom.artifactId')}"/>
   <tr>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp Tue Apr 12 05:14:08 2011
@@ -76,8 +76,11 @@
               </c:choose>
             </ec:column>
             <ec:column property="deleteActions" title="&nbsp;" width="1%">
+                <s:token/>
                 <s:url id="removeRepositoryUrl" action="removeRepository">
                   <s:param name="repository.id">${pageScope.repository.id}</s:param>
+                  <s:param name="struts.token.name">struts.token</s:param>
+                  <s:param name="struts.token"><s:property value="struts.token"/></s:param>
                 </s:url>
                 <c:choose>
                   <c:when test="${repository.name == 'DEFAULT'}">

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/parallelbuilds.jsp Tue Apr 12 05:14:08 2011
@@ -47,10 +47,13 @@
         <ec:column property="name" title="Name" style="white-space: nowrap" />
            
         <ec:column property="id" title="&nbsp;" width="1%">
-          <c:if test="${buildQueue.id != 1}"> 
+          <c:if test="${buildQueue.id != 1}">
+            <s:token/>
             <s:url id="deleteBuildQueueUrl" action="deleteBuildQueue">
               <s:param name="buildQueue.id">${pageScope.buildQueue.id}</s:param>
               <s:param name="buildQueue.name">${pageScope.buildQueue.name}</s:param>
+              <s:param name="struts.token.name">struts.token</s:param>
+              <s:param name="struts.token"><s:property value="struts.token"/></s:param>
             </s:url>          
             <s:a href="%{deleteBuildQueueUrl}">
               <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />

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=1091297&r1=1091296&r2=1091297&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 Apr 12 05:14:08 2011
@@ -80,9 +80,12 @@
                 <s:a href="%{purgeUrl}"><img src="<s:url value='/images/purgenow.gif' includeParams="none"/>" alt="<s:text name='purge'/>" title="<s:text name='purge'/>" border="0" /></s:a>
             </ec:column>
             <ec:column property="deleteActions" title="&nbsp;" width="1%">
+                <s:token/>
                 <s:url id="removePurgeConfigUrl" action="removePurgeConfig">
                   <s:param name="purgeConfigId">${pageScope.repoPurge.id}</s:param>
                   <s:param name="description">${pageScope.repoPurge.description}</s:param>
+                  <s:param name="struts.token.name">struts.token</s:param>
+                  <s:param name="struts.token"><s:property value="struts.token"/></s:param>
                 </s:url>
                 <s:a href="%{removePurgeConfigUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
             </ec:column>
@@ -129,9 +132,12 @@
                 <s:a href="%{purgeUrl}"><img src="<s:url value='/images/purgenow.gif' includeParams="none"/>" alt="<s:text name='purge'/>" title="<s:text name='purge'/>" border="0" /></s:a>
             </ec:column>
             <ec:column property="deleteActions" title="&nbsp;" width="1%">
+                <s:token/>
                 <s:url id="removePurgeConfigUrl" action="removePurgeConfig">
                   <s:param name="purgeConfigId">${pageScope.dirPurge.id}</s:param>
                   <s:param name="description">${pageScope.dirPurge.description}</s:param>
+                  <s:param name="struts.token.name">struts.token</s:param>
+                  <s:param name="struts.token"><s:property value="struts.token"/></s:param>
                 </s:url>
                 <s:a href="%{removePurgeConfigUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
             </ec:column>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp Tue Apr 12 05:14:08 2011
@@ -80,6 +80,7 @@
                   <form action="removeBuildResult.action">
                     <input type="hidden" name="projectId" value="<s:property value="projectId"/>"/>
                     <input type="hidden" name="buildId" value="<s:property value="buildId"/>"/>
+                    <s:token/>
                     <s:if test="canDelete">
                       <input type="submit" name="delete-project" value="<s:text name="delete"/>"/>
                     </s:if>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp Tue Apr 12 05:14:08 2011
@@ -49,6 +49,7 @@
         </c:if>
     
         <form id="buildResultsForm" action="removeBuildResults.action" method="post">
+          <s:token/>
           <s:set name="buildResults" value="buildResults" scope="request"/>
           <ec:table items="buildResults"
                     var="buildResult"

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=1091297&r1=1091296&r2=1091297&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 Apr 12 05:14:08 2011
@@ -99,10 +99,13 @@
             <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0">
           </c:when>
           <c:otherwise>
+            <s:token/>
             <s:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
               <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
               <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
               <s:param name="confirmed" value="false"/>
+              <s:param name="struts.token.name">struts.token</s:param>
+              <s:param name="struts.token"><s:property value="struts.token"/></s:param> 
             </s:url>
             <s:a href="%{removeUrl}">
               <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0">
@@ -202,10 +205,13 @@
       </ec:column>
       <ec:column property="removeAction" title="&nbsp;" width="1%">
         <redback:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
+          <s:token/>
           <s:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
             <s:param name="projectId">${pageScope.buildDefinitionSummary.projectId}</s:param>
             <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
             <s:param name="confirmed" value="false"/>
+            <s:param name="struts.token.name">struts.token</s:param>
+            <s:param name="struts.token"><s:property value="struts.token"/></s:param>
           </s:url>
           <s:a href="%{removeUrl}">
               <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0">

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Tue Apr 12 05:14:08 2011
@@ -101,10 +101,13 @@
          <c:choose>
           <c:when test="${pageScope.buildDefinitionSummary.from=='PROJECT'}">
             <redback:ifAuthorized permission="continuum-remove-project-build-definition" resource="${projectGroupName}">
+              <s:token/>
               <s:url id="removeUrl" action="removeProjectBuildDefinition" namespace="/">
                 <s:param name="projectId">${projectId}</s:param>
                 <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
                 <s:param name="confirmed" value="false"/>
+                <s:param name="struts.token.name">struts.token</s:param>
+                <s:param name="struts.token"><s:property value="struts.token"/></s:param>
               </s:url>
               <s:a href="%{removeUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
             </redback:ifAuthorized>
@@ -119,11 +122,14 @@
                   <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
                 </c:when>
                 <c:otherwise>
+                  <s:token/>
                   <s:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
                     <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
                     <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
                     <s:param name="groupBuildDefinition">true</s:param>
                     <s:param name="confirmed" value="false"/>
+                    <s:param name="struts.token.name">struts.token</s:param>
+                    <s:param name="struts.token"><s:property value="struts.token"/></s:param>
                   </s:url>
                   <s:a href="%{removeUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
                 </c:otherwise>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp Tue Apr 12 05:14:08 2011
@@ -210,9 +210,11 @@
         <c:choose>
           <c:when
               test="${projectIdle}">
+            <s:token/>
             <s:url id="deleteProjectUrl" value="deleteProject!default.action" namespace="/">
               <s:param name="projectId">${project.id}</s:param>
-              <s:param name="projectGroupId">${project.projectGroupId}</s:param>
+              <s:param name="struts.token.name">struts.token</s:param>
+              <s:param name="struts.token"><s:property value="struts.token"/></s:param>
             </s:url>
             <s:a href="%{deleteProjectUrl}">
               <img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name="delete"/>" title="<s:text name="delete"/>" border="0">

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp Tue Apr 12 05:14:08 2011
@@ -41,6 +41,7 @@
         </div>
         <div class="functnbar3">
           <s:form action="removeGroupBuildDefinition">
+            <s:token/>
             <s:hidden name="buildDefinitionId"/>
             <s:hidden name="projectGroupId"/>
             <s:hidden name="projectId"/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp Tue Apr 12 05:14:08 2011
@@ -44,6 +44,7 @@
           <c:set var="action" value="removeBuildResults.action" />
         </s:else>
         <form action="${action}" method="post">
+          <s:token/>
           <s:hidden name="projectGroupId"/>
           <s:hidden name="projectId"/>
           <s:hidden name="buildId"/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp Tue Apr 12 05:14:08 2011
@@ -31,6 +31,7 @@
         <s:form action="removeProjectGroup" method="post">
           <s:hidden name="projectGroupId"/>
           <s:hidden name="confirmed" value="true"/>
+          <s:token/>
           <s:actionerror/>
 
           <div class="warningmessage">

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp Tue Apr 12 05:14:08 2011
@@ -41,6 +41,7 @@
         
         <div class="functnbar3">
           <s:form action="removeReleaseResults" method="post">
+            <s:token/>
             <s:iterator value="selectedReleaseResults">
               <input type="hidden" value="<s:property/>" name="selectedReleaseResults"/>
             </s:iterator>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp Tue Apr 12 05:14:08 2011
@@ -29,6 +29,7 @@
         <h3><s:text name="deleteSchedule.section.title"/></h3>
         <div class="axial">
         <s:form action="removeSchedule" method="post">
+          <s:token/>
           <s:hidden name="id"/>
           <s:hidden name="confirmed" value="true"/>
           <s:actionerror/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp Tue Apr 12 05:14:08 2011
@@ -40,6 +40,7 @@
         </div>
         <div class="functnbar3">
           <s:form action="removeProjectBuildDefinition.action" method="post">
+            <s:token/>
             <s:hidden name="projectId"/>
             <s:hidden name="buildDefinitionId"/>
             <s:hidden name="confirmed" value="true"/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp Tue Apr 12 05:14:08 2011
@@ -39,6 +39,7 @@
         </div>
         <div class="functnbar3">
           <s:form action="deleteProject.action" method="post">
+            <s:token/>
             <s:hidden name="projectId"/>
             <s:hidden name="projectGroupId"/>
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp?rev=1091297&r1=1091296&r2=1091297&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp Tue Apr 12 05:14:08 2011
@@ -96,8 +96,11 @@
         </ec:column>
         <ec:column property="removeProjectGroupAction" title="&nbsp;" width="1%">
           <redback:ifAuthorized permission="continuum-remove-group" resource="${group.name}">
+            <s:token/>
             <s:url id="removeProjectGroupUrl" action="removeProjectGroup" namespace="/" includeParams="none">
               <s:param name="projectGroupId">${group.id}</s:param>
+              <s:param name="struts.token.name">struts.token</s:param>
+              <s:param name="struts.token"><s:property value="struts.token"/></s:param>
             </s:url>
             <s:a href="%{removeProjectGroupUrl}">
               <img src="<s:url value='/images/delete.gif'/>" alt="<s:text name="projectGroup.deleteGroup"/>" title="<s:text name="projectGroup.deleteGroup"/>" border="0">



Mime
View raw message