Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 97389 invoked from network); 4 Nov 2008 14:17:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Nov 2008 14:17:53 -0000 Received: (qmail 66096 invoked by uid 500); 4 Nov 2008 14:17:59 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 66068 invoked by uid 500); 4 Nov 2008 14:17:59 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 66059 invoked by uid 99); 4 Nov 2008 14:17:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2008 06:17:59 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2008 14:16:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7135C23888EB; Tue, 4 Nov 2008 06:16:57 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r711259 [1/7] - in /continuum/trunk: ./ continuum-core/ continuum-core/src/test/resources/ continuum-data-management/data-management-cli/ continuum-webapp/ continuum-webapp/src/main/java/org/apache/continuum/web/action/ continuum-webapp/src... Date: Tue, 04 Nov 2008 14:16:45 -0000 To: commits@continuum.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081104141657.7135C23888EB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Tue Nov 4 06:16:37 2008 New Revision: 711259 URL: http://svn.apache.org/viewvc?rev=711259&view=rev Log: Merge with struts2 branch Added: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java - copied unchanged from r711195, continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java continuum/trunk/continuum-webapp/src/main/resources/struts.properties - copied unchanged from r711195, continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.properties continuum/trunk/continuum-webapp/src/main/resources/struts.xml - copied unchanged from r711195, continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml Removed: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/filter/ continuum/trunk/continuum-webapp/src/main/resources/webwork.properties continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Modified: continuum/trunk/continuum-core/pom.xml continuum/trunk/continuum-core/src/test/resources/plexus.xml continuum/trunk/continuum-data-management/data-management-cli/pom.xml continuum/trunk/continuum-webapp/ (props changed) continuum/trunk/continuum-webapp/pom.xml continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java 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/ReleaseProjectAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.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/action/ScheduleAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/CompanyInfoAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/Data.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/SubmitCancel.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/CronExpressionValidator.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/WagonUrlValidator.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.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/META-INF/plexus/application.xml continuum/trunk/continuum-webapp/src/main/resources/log4j.xml continuum/trunk/continuum-webapp/src/main/resources/template/default/checkbox.ftl continuum/trunk/continuum-webapp/src/main/resources/template/default/file.ftl continuum/trunk/continuum-webapp/src/main/resources/template/default/head.ftl continuum/trunk/continuum-webapp/src/main/resources/template/default/password.ftl continuum/trunk/continuum-webapp/src/main/resources/template/default/text.ftl continuum/trunk/continuum-webapp/src/main/resources/template/default/tooltip.ftl continuum/trunk/continuum-webapp/src/main/resources/validators.xml continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.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/buildQueueView.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.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/confirmDeleteLocalRepository.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.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/editProfile.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.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/profilesList.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.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/companyLogo.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.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/confirmDeleteProjects.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/decorators/default.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/editSchedule.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultTop.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectEdit.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.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/projectView.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInitialized.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseProject.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/scmResult.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/workingCopy.jsp continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java continuum/trunk/continuum-webapp/src/test/resources/META-INF/plexus/components.xml continuum/trunk/continuum-webapp/src/test/resources/log4j.xml continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java continuum/trunk/pom.xml Modified: continuum/trunk/continuum-core/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/pom.xml?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-core/pom.xml (original) +++ continuum/trunk/continuum-core/pom.xml Tue Nov 4 06:16:37 2008 @@ -33,10 +33,6 @@ org.codehaus.plexus - plexus-mail-sender-api - - - org.codehaus.plexus plexus-utils @@ -208,11 +204,6 @@ test - org.codehaus.plexus - plexus-mail-sender-test - test - - xml-apis xml-apis 1.0.b2 @@ -225,13 +216,8 @@ test - org.codehaus.plexus - plexus-mail-sender-simple - test - - org.codehaus.redback - redback-xwork-integration + redback-struts2-integration test Modified: continuum/trunk/continuum-core/src/test/resources/plexus.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/resources/plexus.xml?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-core/src/test/resources/plexus.xml (original) +++ continuum/trunk/continuum-core/src/test/resources/plexus.xml Tue Nov 4 06:16:37 2008 @@ -77,14 +77,10 @@ - com.opensymphony.xwork.util.OgnlUtil + com.opensymphony.xwork2.util.OgnlUtil ERROR - com.opensymphony.webwork - INFO - - org.codehaus.plexus.PlexusContainer INFO Modified: continuum/trunk/continuum-data-management/data-management-cli/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-data-management/data-management-cli/pom.xml?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-data-management/data-management-cli/pom.xml (original) +++ continuum/trunk/continuum-data-management/data-management-cli/pom.xml Tue Nov 4 06:16:37 2008 @@ -29,6 +29,11 @@ Continuum :: Data Management :: CLI + org.codehaus.plexus + plexus-container-default + 1.0-alpha-20 + + org.apache.maven maven-project Propchange: continuum/trunk/continuum-webapp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Nov 4 06:16:37 2008 @@ -10,3 +10,4 @@ derby.log .settings build +data Modified: continuum/trunk/continuum-webapp/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/pom.xml?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/pom.xml (original) +++ continuum/trunk/continuum-webapp/pom.xml Tue Nov 4 06:16:37 2008 @@ -128,17 +128,46 @@ + + + + maven-antrun-plugin + + + cleanup-struts-jar-in-webapp + compile + + run + + + + + + + + + + + + + + + org.codehaus.plexus plexus-maven-plugin - com.opensymphony.xwork.Action + com.opensymphony.xwork2.Action per-lookup - com.opensymphony.xwork.validator.Validator + com.opensymphony.xwork2.validator.Validator per-lookup @@ -316,10 +345,6 @@ org.codehaus.plexus plexus-utils - javax.servlet servlet-api @@ -457,23 +482,34 @@ wagon-webdav runtime + + org.apache.struts + struts2-core + + + com.opensymphony + xwork + + + org.apache.struts + struts2-spring-plugin + org.codehaus.redback - redback-xwork-content + redback-struts2-content war runtime org.codehaus.redback - redback-xwork-integration + redback-struts2-integration org.codehaus.redback - redback-taglib - runtime + redback-common-integrations net.sf.ehcache @@ -507,11 +543,6 @@ plexus-spring - org.codehaus.plexus - plexus-mail-sender-javamail - runtime - - org.springframework spring-web @@ -597,6 +628,7 @@ + Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java Tue Nov 4 06:16:37 2008 @@ -37,7 +37,7 @@ /** * @author Maria Catherine Tan - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="releaseResult" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="releaseResult" */ public class ReleaseResultAction extends ContinuumConfirmAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/ScmResultAction.java Tue Nov 4 06:16:37 2008 @@ -7,7 +7,7 @@ import org.apache.maven.continuum.web.util.StateGenerator; import org.codehaus.plexus.util.StringUtils; -import com.opensymphony.webwork.ServletActionContext; +import org.apache.struts2.ServletActionContext; /** * @author Maria Catherine Tan Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java Tue Nov 4 06:16:37 2008 @@ -33,19 +33,19 @@ import org.apache.maven.continuum.model.project.ProjectGroup; import org.apache.maven.continuum.security.ContinuumRoleConstants; import org.apache.maven.continuum.web.action.ContinuumConfirmAction; +import org.apache.struts2.ServletActionContext; import org.codehaus.plexus.redback.rbac.Resource; -import org.codehaus.plexus.redback.xwork.interceptor.SecureAction; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.redback.integration.interceptor.SecureAction; +import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.codehaus.redback.integration.interceptor.SecureActionException; -import com.opensymphony.webwork.ServletActionContext; -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; /** * @author Maria Catherine Tan * @version $Id$ * @since 25 jul 07 - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="localRepository" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="localRepository" */ public class LocalRepositoryAction extends ContinuumConfirmAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java Tue Nov 4 06:16:37 2008 @@ -37,19 +37,19 @@ import org.apache.maven.continuum.model.project.Schedule; import org.apache.maven.continuum.security.ContinuumRoleConstants; import org.apache.maven.continuum.web.action.ContinuumConfirmAction; +import org.apache.struts2.ServletActionContext; import org.codehaus.plexus.redback.rbac.Resource; -import org.codehaus.plexus.redback.xwork.interceptor.SecureAction; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.redback.integration.interceptor.SecureAction; +import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.codehaus.redback.integration.interceptor.SecureActionException; -import com.opensymphony.webwork.ServletActionContext; -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; /** * @author Maria Catherine Tan * @version $Id$ * @since 25 jul 07 - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="purgeConfiguration" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="purgeConfiguration" * */ public class PurgeConfigurationAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java Tue Nov 4 06:16:37 2008 @@ -24,7 +24,7 @@ * * @author: Jesse McConnell * @version: $ID:$ - * @plexus.component role="com.opensymphony.xwork.Action" + * @plexus.component role="com.opensymphony.xwork2.Action" * role-hint="about" */ public class AboutAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java Tue Nov 4 06:16:37 2008 @@ -30,7 +30,7 @@ * @author Nick Gonzalez * @author Carlos Sanchez * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addMavenOneProject" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addMavenOneProject" */ public class AddMavenOneProjectAction extends AddMavenProjectAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Tue Nov 4 06:16:37 2008 @@ -39,7 +39,7 @@ * @author Nick Gonzalez * @author Carlos Sanchez * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addMavenTwoProject" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addMavenTwoProject" */ public class AddMavenTwoProjectAction extends AddMavenProjectAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Tue Nov 4 06:16:37 2008 @@ -19,7 +19,7 @@ * under the License. */ -import com.opensymphony.xwork.Validateable; +import com.opensymphony.xwork2.Validateable; import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.builddefinition.BuildDefinitionServiceException; @@ -40,7 +40,7 @@ /** * @author Nick Gonzalez * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addProject" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addProject" */ public class AddProjectAction extends ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java Tue Nov 4 06:16:37 2008 @@ -28,11 +28,11 @@ import org.apache.maven.continuum.model.project.ProjectGroup; import org.apache.maven.continuum.web.exception.AuthorizationRequiredException; -import com.opensymphony.xwork.Validateable; +import com.opensymphony.xwork2.Validateable; /** * @author Henry Isidro - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addProjectGroup" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addProjectGroup" */ public class AddProjectGroupAction extends ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java Tue Nov 4 06:16:37 2008 @@ -45,7 +45,7 @@ * * @author Jesse McConnell * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="buildDefinition" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="buildDefinition" */ public class BuildDefinitionAction extends ContinuumConfirmAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java Tue Nov 4 06:16:37 2008 @@ -26,7 +26,7 @@ /** * @author Emmanuel Venisse * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="buildProject" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="buildProject" */ public class BuildProjectAction extends ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java Tue Nov 4 06:16:37 2008 @@ -19,11 +19,6 @@ * under the License. */ -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.List; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringEscapeUtils; import org.apache.maven.continuum.ContinuumException; @@ -32,15 +27,20 @@ import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.web.exception.AuthorizationRequiredException; import org.apache.maven.continuum.web.util.StateGenerator; +import org.apache.struts2.ServletActionContext; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; -import com.opensymphony.webwork.ServletActionContext; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; + /** * @author Emmanuel Venisse * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="buildResult" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="buildResult" */ public class BuildResultAction extends AbstractBuildAction @@ -60,7 +60,7 @@ private String state; private String projectGroupName = ""; - + public String execute() throws ContinuumException, ConfigurationException, IOException { @@ -80,7 +80,8 @@ buildResult = getContinuum().getBuildResult( getBuildId() ); // directory contains files ? - File surefireReportsDirectory = getContinuum().getConfiguration().getTestReportsDirectory( buildId, getProjectId() ); + File surefireReportsDirectory = + getContinuum().getConfiguration().getTestReportsDirectory( buildId, getProjectId() ); File[] files = surefireReportsDirectory.listFiles(); if ( files == null ) { @@ -93,14 +94,15 @@ changeSet = getContinuum().getChangesSinceLastUpdate( getProjectId() ); buildOutput = getBuildOutputText(); - + state = StateGenerator.generate( buildResult.getState(), ServletActionContext.getRequest().getContextPath() ); this.setCanDelete( this.canRemoveBuildResult( buildResult ) ); return SUCCESS; } - - public String remove() throws ContinuumException + + public String remove() + throws ContinuumException { try { @@ -126,9 +128,9 @@ buildOutput = getBuildOutputText(); return SUCCESS; } - + public InputStream getBuildOutputInputStream() - throws ConfigurationException, IOException + throws ConfigurationException, IOException { String outputText = getBuildOutputText(); return outputText == null ? null : IOUtils.toInputStream( outputText ); @@ -145,8 +147,8 @@ } return null; } - - + + public int getBuildId() { return buildId; Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java Tue Nov 4 06:16:37 2008 @@ -22,19 +22,16 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.ResourceBundle; import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.web.exception.AuthorizationRequiredException; import org.codehaus.plexus.util.StringUtils; -import com.opensymphony.xwork.util.LocalizedTextUtil; - /** * @author Emmanuel Venisse * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="buildResults" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="buildResults" */ public class BuildResultsListAction extends AbstractBuildAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java Tue Nov 4 06:16:37 2008 @@ -32,7 +32,7 @@ /** * @author Emmanuel Venisse * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="cancelBuild" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="cancelBuild" */ public class CancelBuildAction extends AbstractBuildQueueAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java Tue Nov 4 06:16:37 2008 @@ -22,8 +22,8 @@ import java.text.SimpleDateFormat; import java.util.ResourceBundle; -import com.opensymphony.xwork.ActionContext; -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.Preparable; import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.security.ContinuumRoleConstants; import org.apache.maven.continuum.web.exception.AuthenticationRequiredException; @@ -33,7 +33,6 @@ import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystemConstants; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; /** * ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java Tue Nov 4 06:16:37 2008 @@ -26,7 +26,7 @@ /** * @author Emmanuel Venisse * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="deleteProject" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteProject" */ public class DeleteProjectAction extends ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java Tue Nov 4 06:16:37 2008 @@ -32,7 +32,7 @@ /** * @author Emmanuel Venisse * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="groupSummary" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="groupSummary" */ public class GroupSummaryAction extends ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java Tue Nov 4 06:16:37 2008 @@ -26,7 +26,7 @@ /** * @author Emmanuel Venisse * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="projectEdit" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="projectEdit" */ public class ProjectEditAction extends ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Tue Nov 4 06:16:37 2008 @@ -57,7 +57,7 @@ * * @author Jesse McConnell * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="projectGroup" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="projectGroup" */ public class ProjectGroupAction extends ContinuumConfirmAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java Tue Nov 4 06:16:37 2008 @@ -30,7 +30,7 @@ /** * @author Emmanuel Venisse * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="projectView" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="projectView" */ public class ProjectViewAction extends ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java Tue Nov 4 06:16:37 2008 @@ -36,7 +36,7 @@ /** * @author Emmanuel Venisse * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="projects" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="projects" */ public class ProjectsListAction extends ContinuumActionSupport 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=711259&r1=711258&r2=711259&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 Nov 4 06:16:37 2008 @@ -26,7 +26,7 @@ /** * @author Edwin Punzalan - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="releaseCleanup" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="releaseCleanup" */ public class ReleaseCleanupAction extends ContinuumActionSupport 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=711259&r1=711258&r2=711259&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 Nov 4 06:16:37 2008 @@ -36,7 +36,7 @@ /** * @author Edwin Punzalan - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="releaseInProgress" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="releaseInProgress" */ public class ReleaseInProgressAction extends ContinuumActionSupport 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=711259&r1=711258&r2=711259&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 Nov 4 06:16:37 2008 @@ -36,7 +36,7 @@ /** * @author Edwin Punzalan - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="releasePerform" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="releasePerform" */ public class ReleasePerformAction extends ContinuumActionSupport 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=711259&r1=711258&r2=711259&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 Nov 4 06:16:37 2008 @@ -47,7 +47,7 @@ /** * @author Edwin Punzalan - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="releasePrepare" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="releasePrepare" */ public class ReleasePrepareAction extends ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java Tue Nov 4 06:16:37 2008 @@ -32,7 +32,7 @@ /** * @author Edwin Punzalan - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="releaseProject" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="releaseProject" */ public class ReleaseProjectAction extends ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java Tue Nov 4 06:16:37 2008 @@ -31,7 +31,7 @@ /** * @author Edwin Punzalan - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="releaseProjectGoal" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="releaseProjectGoal" */ public class ReleaseProjectGoalAction extends ContinuumActionSupport 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=711259&r1=711258&r2=711259&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 Nov 4 06:16:37 2008 @@ -30,7 +30,7 @@ /** * @author Edwin Punzalan - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="releaseRollback" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="releaseRollback" */ public class ReleaseRollbackAction extends ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Tue Nov 4 06:16:37 2008 @@ -28,7 +28,7 @@ /** * @author Nik Gonzalez - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="schedule" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="schedule" */ public class ScheduleAction extends ContinuumConfirmAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java Tue Nov 4 06:16:37 2008 @@ -42,7 +42,7 @@ * * @author Emmanuel Venisse * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="summary" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="summary" */ public class SummaryAction extends ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java Tue Nov 4 06:16:37 2008 @@ -40,7 +40,7 @@ /** * @author Edwin Punzalan - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="surefireReport" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="surefireReport" * @todo too many inner classes, maybe a continuum-reports project group ? */ public class SurefireReportAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java Tue Nov 4 06:16:37 2008 @@ -19,12 +19,12 @@ * under the License. */ -import com.opensymphony.webwork.ServletActionContext; -import com.opensymphony.webwork.views.util.UrlHelper; import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.web.exception.AuthorizationRequiredException; import org.apache.maven.continuum.web.util.WorkingCopyContentGenerator; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.views.util.UrlHelper; import org.codehaus.plexus.util.StringUtils; import javax.activation.MimetypesFileTypeMap; @@ -38,7 +38,7 @@ /** * @author Emmanuel Venisse * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="workingCopy" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="workingCopy" */ public class WorkingCopyAction extends ContinuumActionSupport @@ -81,7 +81,7 @@ { return REQUIRES_AUTHORIZATION; } - + if ( "release.properties".equals( currentFile ) ) { throw new ContinuumException( "release.properties is not accessible." ); @@ -176,7 +176,7 @@ { this.currentFile = currentFile; } - + public String getFile() { return currentFile; Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java Tue Nov 4 06:16:37 2008 @@ -37,23 +37,22 @@ import org.apache.maven.continuum.web.action.AbstractBuildDefinitionAction; import org.apache.maven.continuum.web.model.BuildDefinitionSummary; import org.codehaus.plexus.redback.rbac.Resource; -import org.codehaus.plexus.redback.xwork.interceptor.SecureAction; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.redback.integration.interceptor.SecureAction; +import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.codehaus.redback.integration.interceptor.SecureActionException; -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; /** * @author olamy * @since 16 sept. 07 * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="buildDefinitionTemplates" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="buildDefinitionTemplates" */ public class BuildDefinitionTemplateAction extends AbstractBuildDefinitionAction implements SecureAction, Preparable { - private List templates; private BuildDefinitionTemplate buildDefinitionTemplate; Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java Tue Nov 4 06:16:37 2008 @@ -23,25 +23,25 @@ import javax.servlet.http.HttpServletRequest; +import org.apache.continuum.configuration.ContinuumConfigurationException; import org.apache.maven.continuum.configuration.ConfigurationService; import org.apache.maven.continuum.configuration.ConfigurationStoringException; import org.apache.maven.continuum.security.ContinuumRoleConstants; import org.apache.maven.continuum.store.ContinuumStoreException; import org.apache.maven.continuum.web.action.ContinuumActionSupport; -import org.apache.continuum.configuration.ContinuumConfigurationException; +import org.apache.struts2.ServletActionContext; import org.codehaus.plexus.redback.rbac.Resource; -import org.codehaus.plexus.redback.xwork.interceptor.SecureAction; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; import org.codehaus.plexus.util.StringUtils; +import org.codehaus.redback.integration.interceptor.SecureAction; +import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.codehaus.redback.integration.interceptor.SecureActionException; -import com.opensymphony.webwork.ServletActionContext; -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; /** * @author Emmanuel Venisse * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="configuration" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="configuration" */ public class ConfigurationAction extends ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java Tue Nov 4 06:16:37 2008 @@ -43,18 +43,18 @@ import org.apache.maven.shared.app.configuration.Configuration; import org.apache.maven.shared.app.configuration.MavenAppConfiguration; import org.codehaus.plexus.redback.rbac.Resource; -import org.codehaus.plexus.redback.xwork.interceptor.SecureAction; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; import org.codehaus.plexus.registry.RegistryException; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import org.codehaus.redback.integration.interceptor.SecureAction; +import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.codehaus.redback.integration.interceptor.SecureActionException; -import com.opensymphony.xwork.ModelDriven; +import com.opensymphony.xwork2.ModelDriven; /** * @author Brett Porter * @version $Id: ConfigurationAction.java 480950 2006-11-30 14:58:35Z evenisse $ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="configureAppearance" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="configureAppearance" */ public class ConfigureAppearanceAction extends AbstractFooterAction @@ -138,15 +138,16 @@ for ( String profileId : profileIds ) { Profile profile = profilesAsMap.get( profileId ); - if (profile != null) + if ( profile != null ) { List repos = profile.getRepositories(); if ( repos != null && !repos.isEmpty() ) { for ( Repository repo : repos ) { - remoteRepositories.add( artifactRepositoryFactory.createArtifactRepository( repo.getId(), repo - .getUrl(), layout, null, null ) ); + remoteRepositories.add( + artifactRepositoryFactory.createArtifactRepository( repo.getId(), repo + .getUrl(), layout, null, null ) ); } } } @@ -154,8 +155,8 @@ } configuration = appConfiguration.getConfiguration(); - companyModel = companyPomHandler.getCompanyPomModel( configuration.getCompanyPom(), - helper.getLocalRepository(), remoteRepositories ); + companyModel = companyPomHandler.getCompanyPomModel( configuration.getCompanyPom(), helper.getLocalRepository(), + remoteRepositories ); this.setFooter( appareanceConfiguration.getFooter() ); } Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java Tue Nov 4 06:16:37 2008 @@ -27,7 +27,7 @@ * @author olamy * @since 9 nov. 07 * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="configureFooter" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="configureFooter" */ public class ConfigureFooterAction extends AbstractFooterAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java Tue Nov 4 06:16:37 2008 @@ -19,7 +19,8 @@ * under the License. */ -import com.opensymphony.xwork.ModelDriven; +import java.io.IOException; + import org.apache.maven.artifact.installer.ArtifactInstallationException; import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException; import org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper; @@ -33,16 +34,16 @@ import org.apache.maven.shared.app.configuration.Configuration; import org.apache.maven.shared.app.configuration.MavenAppConfiguration; import org.codehaus.plexus.redback.rbac.Resource; -import org.codehaus.plexus.redback.xwork.interceptor.SecureAction; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.redback.integration.interceptor.SecureAction; +import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.codehaus.redback.integration.interceptor.SecureActionException; -import java.io.IOException; +import com.opensymphony.xwork2.ModelDriven; /** * @author Brett Porter * @version $Id: ConfigurationAction.java 480950 2006-11-30 14:58:35Z evenisse $ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="editPom" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="editPom" */ public class EditPomAction extends ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java Tue Nov 4 06:16:37 2008 @@ -12,11 +12,11 @@ import org.apache.maven.continuum.security.ContinuumRoleConstants; import org.apache.maven.continuum.web.action.ContinuumActionSupport; import org.codehaus.plexus.redback.rbac.Resource; -import org.codehaus.plexus.redback.xwork.interceptor.SecureAction; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.redback.integration.interceptor.SecureAction; +import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.codehaus.redback.integration.interceptor.SecureActionException; -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -39,7 +39,7 @@ /** * @author olamy * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="installation" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="installation" * @since 14 juin 07 */ public class InstallationAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java Tue Nov 4 06:16:37 2008 @@ -32,18 +32,18 @@ import org.apache.maven.continuum.profile.ProfileService; import org.apache.maven.continuum.security.ContinuumRoleConstants; import org.apache.maven.continuum.web.action.ContinuumActionSupport; +import org.apache.struts2.ServletActionContext; import org.codehaus.plexus.redback.rbac.Resource; -import org.codehaus.plexus.redback.xwork.interceptor.SecureAction; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.redback.integration.interceptor.SecureAction; +import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.codehaus.redback.integration.interceptor.SecureActionException; -import com.opensymphony.webwork.ServletActionContext; -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; /** * @author olamy * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="profileAdministration" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="profileAdministration" * @since 7 juin 07 */ public class ProfileAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java Tue Nov 4 06:16:37 2008 @@ -31,16 +31,16 @@ import org.apache.maven.continuum.web.exception.AuthorizationRequiredException; import org.codehaus.plexus.logging.LogEnabled; import org.codehaus.plexus.redback.rbac.Resource; -import org.codehaus.plexus.redback.xwork.interceptor.SecureAction; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; import org.codehaus.plexus.taskqueue.Task; import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor; +import org.codehaus.redback.integration.interceptor.SecureAction; +import org.codehaus.redback.integration.interceptor.SecureActionBundle; +import org.codehaus.redback.integration.interceptor.SecureActionException; /** * @author olamy * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="queues" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="queues" * @since 24 sept. 07 */ public class QueuesAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java Tue Nov 4 06:16:37 2008 @@ -23,7 +23,7 @@ * @author olamy * @since 8 nov. 07 * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="bottom" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="bottom" */ public class BottomAction extends AbstractFooterAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java Tue Nov 4 06:16:37 2008 @@ -36,7 +36,7 @@ * * @author Jesse McConnell * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="buildDefinitionSummary" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="buildDefinitionSummary" */ public class BuildDefinitionSummaryAction extends AbstractBuildDefinitionAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/CompanyInfoAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/CompanyInfoAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/CompanyInfoAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/CompanyInfoAction.java Tue Nov 4 06:16:37 2008 @@ -19,7 +19,7 @@ * under the License. */ -import com.opensymphony.xwork.ActionSupport; +import com.opensymphony.xwork2.ActionSupport; import org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper; import org.apache.maven.model.Model; import org.apache.maven.shared.app.company.CompanyPomHandler; @@ -28,7 +28,7 @@ /** * Stores the company information for displaying on the page. * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="companyInfo" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="companyInfo" */ public class CompanyInfoAction extends ActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java Tue Nov 4 06:16:37 2008 @@ -1,5 +1,7 @@ package org.apache.maven.continuum.web.action.component; +import org.apache.maven.continuum.web.action.PlexusActionSupport; + /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -19,10 +21,8 @@ * under the License. */ -import org.codehaus.plexus.xwork.action.PlexusActionSupport; - /** - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="continuumTab" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="continuumTab" */ public class ContinuumTabAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java Tue Nov 4 06:16:37 2008 @@ -43,7 +43,7 @@ * * @author Rahul Thakur * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="notifierSummary" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="notifierSummary" */ public class NotifierSummaryAction extends ContinuumActionSupport Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java Tue Nov 4 06:16:37 2008 @@ -35,7 +35,7 @@ * * @author Rahul Thakur * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addGroupNotifier" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addGroupNotifier" * @since 1.1 */ public class AddGroupNotifierAction Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java?rev=711259&r1=711258&r2=711259&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java Tue Nov 4 06:16:37 2008 @@ -32,7 +32,7 @@ * * @author Emmanuel Venisse * @version $Id: AddNotifierAction.java 466640 2006-10-22 13:11:30Z jmcconnell $ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addProjectNotifier" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addProjectNotifier" * @since 1.1 */ public class AddProjectNotifierAction