You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2008/10/23 07:05:43 UTC
svn commit: r707273 [1/7] - in /continuum/branches/continuum-struts2: ./
continuum-core/ continuum-core/src/test/resources/ continuum-webapp/
continuum-webapp/src/main/java/org/apache/continuum/web/action/
continuum-webapp/src/main/java/org/apache/cont...
Author: evenisse
Date: Wed Oct 22 22:05:36 2008
New Revision: 707273
URL: http://svn.apache.org/viewvc?rev=707273&view=rev
Log:
migration to struts2 - not complete yet
Added:
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java (with props)
continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.properties
- copied, changed from r706303, continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/webwork.properties
continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/struts.xml
- copied, changed from r706303, continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/xwork.xml
Removed:
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/filter/
continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/webwork.properties
continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/xwork.xml
Modified:
continuum/branches/continuum-struts2/continuum-core/pom.xml
continuum/branches/continuum-struts2/continuum-core/src/test/resources/plexus.xml
continuum/branches/continuum-struts2/continuum-webapp/pom.xml
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/CompanyInfoAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/ContinuumTabAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/NotifierSummaryAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddGroupNotifierAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/AddProjectNotifierAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteGroupNotifierAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/DeleteProjectNotifierAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonGroupNotifierEditAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/notifier/WagonProjectNotifierEditAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/Data.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/components/SubmitCancel.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/interceptor/ForceContinuumConfigurationInterceptor.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/CronExpressionValidator.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/InstallationValidator.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/validator/WagonUrlValidator.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/BuildCell.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DataTag.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/DateTag.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/jsp/ui/SubmitCancelTag.java
continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/log4j.xml
continuum/branches/continuum-struts2/continuum-webapp/src/main/resources/validators.xml
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/about.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenOneProject.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildDefinitionTemplateSummary.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configuration.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationEdit.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildEnv.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionTemplate.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editLocalRepository.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsTypeChoice.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/localRepositoriesList.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/purgeConfigurationsList.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildDefinitionRemoval.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmBuildResultsRemoval.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmDeleteProjects.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmGroupRemoval.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmReleaseResultsRemoval.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/confirmScheduleRemoval.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteBuildDefinition.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteProject.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/authorizationError.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultTop.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierWagon.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectEdit.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupAdd.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupBuildDefinition.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupEdit.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupMembers.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupNotifier.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupReleaseResults.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseFinished.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInProgress.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseInitialized.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerform.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePerformFromScm.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releasePrepare.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseProject.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseRollbackWarning.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/releaseViewResult.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/schedules.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/surefireReport.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/main/webapp/WEB-INF/jsp/workingCopy.jsp
continuum/branches/continuum-struts2/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java
continuum/branches/continuum-struts2/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/TestAction.java
continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/META-INF/plexus/components.xml
continuum/branches/continuum-struts2/continuum-webapp/src/test/resources/log4j.xml
continuum/branches/continuum-struts2/continuum-xmlrpc/continuum-xmlrpc-server/pom.xml
continuum/branches/continuum-struts2/continuum-xmlrpc/continuum-xmlrpc-server/src/main/java/org/apache/maven/continuum/xmlrpc/server/ContinuumXmlRpcServlet.java
continuum/branches/continuum-struts2/pom.xml
Modified: continuum/branches/continuum-struts2/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-core/pom.xml?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-core/pom.xml (original)
+++ continuum/branches/continuum-struts2/continuum-core/pom.xml Wed Oct 22 22:05:36 2008
@@ -231,7 +231,7 @@
</dependency>
<dependency>
<groupId>org.codehaus.redback</groupId>
- <artifactId>redback-xwork-integration</artifactId>
+ <artifactId>redback-struts2-integration</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: continuum/branches/continuum-struts2/continuum-core/src/test/resources/plexus.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-core/src/test/resources/plexus.xml?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-core/src/test/resources/plexus.xml (original)
+++ continuum/branches/continuum-struts2/continuum-core/src/test/resources/plexus.xml Wed Oct 22 22:05:36 2008
@@ -77,14 +77,10 @@
</level>
<level>
<!-- CONTINUUM-1228 -->
- <hierarchy>com.opensymphony.xwork.util.OgnlUtil</hierarchy>
+ <hierarchy>com.opensymphony.xwork2.util.OgnlUtil</hierarchy>
<level>ERROR</level>
</level>
<level>
- <hierarchy>com.opensymphony.webwork</hierarchy>
- <level>INFO</level>
- </level>
- <level>
<hierarchy>org.codehaus.plexus.PlexusContainer</hierarchy>
<level>INFO</level>
</level>
Modified: continuum/branches/continuum-struts2/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/pom.xml?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/pom.xml (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/pom.xml Wed Oct 22 22:05:36 2008
@@ -134,11 +134,11 @@
<configuration>
<roleDefaults>
<roleDefault>
- <role>com.opensymphony.xwork.Action</role>
+ <role>com.opensymphony.xwork2.Action</role>
<instantiation-strategy>per-lookup</instantiation-strategy>
</roleDefault>
<roleDefault>
- <role>com.opensymphony.xwork.validator.Validator</role>
+ <role>com.opensymphony.xwork2.validator.Validator</role>
<instantiation-strategy>per-lookup</instantiation-strategy>
</roleDefault>
</roleDefaults>
@@ -316,10 +316,6 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
- <!--dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-xwork-integration</artifactId>
- </dependency-->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -457,22 +453,31 @@
<artifactId>wagon-webdav</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-spring-plugin</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!--
- Plexus Security Dependencies
+ Redback Dependencies
-->
<dependency>
<groupId>org.codehaus.redback</groupId>
- <artifactId>redback-xwork-content</artifactId>
+ <artifactId>redback-struts2-content</artifactId>
<type>war</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.redback</groupId>
- <artifactId>redback-xwork-integration</artifactId>
+ <artifactId>redback-struts2-integration</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.redback</groupId>
- <artifactId>redback-taglib</artifactId>
+ <artifactId>redback-struts2-taglib</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/ReleaseResultAction.java Wed Oct 22 22:05:36 2008
@@ -37,7 +37,7 @@
/**
* @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
- * @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/LocalRepositoryAction.java Wed Oct 22 22:05:36 2008
@@ -32,19 +32,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.plexus.redback.struts2.interceptor.SecureAction;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java Wed Oct 22 22:05:36 2008
@@ -36,19 +36,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.plexus.redback.struts2.interceptor.SecureAction;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AboutAction.java Wed Oct 22 22:05:36 2008
@@ -24,7 +24,7 @@
*
* @author: Jesse McConnell <jm...@apache.org>
* @version: $ID:$
- * @plexus.component role="com.opensymphony.xwork.Action"
+ * @plexus.component role="com.opensymphony.xwork2.Action"
* role-hint="about"
*/
public class AboutAction
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java Wed Oct 22 22:05:36 2008
@@ -30,7 +30,7 @@
* @author Nick Gonzalez
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java Wed Oct 22 22:05:36 2008
@@ -39,7 +39,7 @@
* @author Nick Gonzalez
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Wed Oct 22 22:05:36 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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectGroupAction.java Wed Oct 22 22:05:36 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 <hi...@exist.com>
- * @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionAction.java Wed Oct 22 22:05:36 2008
@@ -45,7 +45,7 @@
*
* @author Jesse McConnell <jm...@apache.org>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java Wed Oct 22 22:05:36 2008
@@ -26,7 +26,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java Wed Oct 22 22:05:36 2008
@@ -19,30 +19,28 @@
* 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;
-import org.apache.maven.continuum.buildqueue.BuildProjectTask;
import org.apache.maven.continuum.configuration.ConfigurationException;
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.model.project.Project;
-import org.apache.maven.continuum.project.ContinuumProjectState;
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 <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @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
@@ -62,7 +60,7 @@
private String state;
private String projectGroupName = "";
-
+
public String execute()
throws ContinuumException, ConfigurationException, IOException
{
@@ -82,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 )
{
@@ -95,14 +94,15 @@
changeSet = getContinuum().getChangesSinceLastSuccess( getProjectId(), getBuildId() );
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
{
@@ -128,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 );
@@ -147,8 +147,8 @@
}
return null;
}
-
-
+
+
public int getBuildId()
{
return buildId;
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java Wed Oct 22 22:05:36 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 <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/CancelBuildAction.java Wed Oct 22 22:05:36 2008
@@ -30,7 +30,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java Wed Oct 22 22:05:36 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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java Wed Oct 22 22:05:36 2008
@@ -26,7 +26,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java Wed Oct 22 22:05:36 2008
@@ -32,7 +32,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @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
Added: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java?rev=707273&view=auto
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java (added)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java Wed Oct 22 22:05:36 2008
@@ -0,0 +1,58 @@
+package org.apache.maven.continuum.web.action;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import com.opensymphony.xwork2.ActionSupport;
+import org.apache.struts2.interceptor.SessionAware;
+import org.codehaus.plexus.logging.LogEnabled;
+import org.codehaus.plexus.logging.Logger;
+
+import java.util.Map;
+
+/**
+ * LogEnabled and SessionAware ActionSupport
+ *
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+public abstract class PlexusActionSupport
+ extends ActionSupport
+ implements LogEnabled, SessionAware
+{
+ protected Map session;
+
+ private Logger logger;
+
+ public void setSession( Map map )
+ {
+ //noinspection AssignmentToCollectionOrArrayFieldFromParameter
+ this.session = map;
+ }
+
+ public void enableLogging( Logger logger )
+ {
+ this.logger = logger;
+ }
+
+ protected Logger getLogger()
+ {
+ return logger;
+ }
+}
Propchange: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/PlexusActionSupport.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java Wed Oct 22 22:05:36 2008
@@ -26,7 +26,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Wed Oct 22 22:05:36 2008
@@ -54,7 +54,7 @@
*
* @author Jesse McConnell <jm...@apache.org>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java Wed Oct 22 22:05:36 2008
@@ -30,7 +30,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectsListAction.java Wed Oct 22 22:05:36 2008
@@ -34,7 +34,7 @@
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseCleanupAction.java Wed Oct 22 22:05:36 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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseInProgressAction.java Wed Oct 22 22:05:36 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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePerformAction.java Wed Oct 22 22:05:36 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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleasePrepareAction.java Wed Oct 22 22:05:36 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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectAction.java Wed Oct 22 22:05:36 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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseProjectGoalAction.java Wed Oct 22 22:05:36 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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java Wed Oct 22 22:05:36 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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java Wed Oct 22 22:05:36 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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java Wed Oct 22 22:05:36 2008
@@ -40,7 +40,7 @@
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java Wed Oct 22 22:05:36 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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java Wed Oct 22 22:05:36 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 <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.java Wed Oct 22 22:05:36 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.plexus.redback.struts2.interceptor.SecureAction;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
-import com.opensymphony.xwork.Preparable;
+import com.opensymphony.xwork2.Preparable;
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
* @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<BuildDefinitionTemplate> templates;
private BuildDefinitionTemplate buildDefinitionTemplate;
Modified: continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigurationAction.java Wed Oct 22 22:05:36 2008
@@ -29,19 +29,19 @@
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.redback.struts2.interceptor.SecureAction;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
import org.codehaus.plexus.util.StringUtils;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.xwork.Preparable;
+import com.opensymphony.xwork2.Preparable;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureAppearanceAction.java Wed Oct 22 22:05:36 2008
@@ -19,11 +19,7 @@
* under the License.
*/
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
+import com.opensymphony.xwork2.ModelDriven;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
@@ -43,18 +39,21 @@
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.redback.struts2.interceptor.SecureAction;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import com.opensymphony.xwork.ModelDriven;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @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 +137,16 @@
for ( String profileId : profileIds )
{
Profile profile = profilesAsMap.get( profileId );
- if (profile != null)
+ if ( profile != null )
{
List<Repository> 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 +154,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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ConfigureFooterAction.java Wed Oct 22 22:05:36 2008
@@ -27,7 +27,7 @@
* @author <a href="mailto:olamy@apache.org">olamy</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/EditPomAction.java Wed Oct 22 22:05:36 2008
@@ -19,7 +19,7 @@
* under the License.
*/
-import com.opensymphony.xwork.ModelDriven;
+import com.opensymphony.xwork2.ModelDriven;
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 +33,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.plexus.redback.struts2.interceptor.SecureAction;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
import java.io.IOException;
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java Wed Oct 22 22:05:36 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.plexus.redback.struts2.interceptor.SecureAction;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.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 <a href="mailto:olamy@codehaus.org">olamy</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/ProfileAction.java Wed Oct 22 22:05:36 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.plexus.redback.struts2.interceptor.SecureAction;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.xwork.Preparable;
+import com.opensymphony.xwork2.Preparable;
/**
* @author <a href="mailto:olamy@codehaus.org">olamy</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/QueuesAction.java Wed Oct 22 22:05:36 2008
@@ -30,16 +30,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.redback.struts2.interceptor.SecureAction;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
import org.codehaus.plexus.taskqueue.Task;
import org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor;
/**
* @author <a href="mailto:olamy@apache.org">olamy</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BottomAction.java Wed Oct 22 22:05:36 2008
@@ -23,7 +23,7 @@
* @author <a href="mailto:olamy@apache.org">olamy</a>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java Wed Oct 22 22:05:36 2008
@@ -36,7 +36,7 @@
*
* @author Jesse McConnell <jm...@apache.org>
* @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/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/CompanyInfoAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/CompanyInfoAction.java?rev=707273&r1=707272&r2=707273&view=diff
==============================================================================
--- continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/CompanyInfoAction.java (original)
+++ continuum/branches/continuum-struts2/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/CompanyInfoAction.java Wed Oct 22 22:05:36 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