From fa61616ee37057e1af3d570d8f45cc79b7d61aa1 Mon Sep 17 00:00:00 2001 From: James William Dumay Date: Wed, 1 Oct 2008 09:11:06 +0000 Subject: [PATCH] Behold! Struts2! git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-struts2@700721 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-web/archiva-webapp/pom.xml | 25 ++- .../archiva/web/action/BrowseAction.java | 5 +- .../web/action/PlexusActionSupport.java | 54 ++++++ .../archiva/web/action/SearchAction.java | 10 +- .../web/action/ShowArtifactAction.java | 7 +- .../archiva/web/action/UploadAction.java | 11 +- .../web/action/admin/SchedulerAction.java | 10 +- .../appearance/AbstractAppearanceAction.java | 4 +- .../EditOrganisationInfoAction.java | 8 +- .../appearance/OrganisationInfoAction.java | 2 +- .../proxy/AbstractProxyConnectorAction.java | 8 +- .../AbstractProxyConnectorFormAction.java | 2 +- .../proxy/AddProxyConnectorAction.java | 2 +- .../proxy/DeleteProxyConnectorAction.java | 2 +- .../proxy/DisableProxyConnectorAction.java | 2 +- .../proxy/EditProxyConnectorAction.java | 2 +- .../proxy/EnableProxyConnectorAction.java | 2 +- .../proxy/ProxyConnectorsAction.java | 4 +- .../proxy/SortProxyConnectorsAction.java | 2 +- .../action/admin/database/DatabaseAction.java | 12 +- .../legacy/AddLegacyArtifactPathAction.java | 7 +- .../DeleteLegacyArtifactPathAction.java | 4 +- .../legacy/LegacyArtifactPathAction.java | 14 +- .../ConfigureNetworkProxyAction.java | 12 +- .../networkproxies/NetworkProxiesAction.java | 12 +- .../AbstractRepositoriesAdminAction.java | 8 +- .../AddManagedRepositoryAction.java | 6 +- .../AddRemoteRepositoryAction.java | 6 +- .../DeleteManagedRepositoryAction.java | 4 +- .../DeleteRemoteRepositoryAction.java | 4 +- .../DeleteRepositoryGroupAction.java | 4 +- .../EditManagedRepositoryAction.java | 6 +- .../EditRemoteRepositoryAction.java | 4 +- .../repositories/RepositoriesAction.java | 14 +- .../repositories/RepositoryGroupsAction.java | 6 +- .../repositories/SortRepositoriesAction.java | 2 +- .../scanning/RepositoryScanningAction.java | 15 +- .../action/reports/GenerateReportAction.java | 14 +- .../interceptor/ConfigurationInterceptor.java | 8 +- .../web/mapper/RepositoryActionMapper.java | 10 +- .../maven/archiva/web/rss/RssFeedServlet.java | 2 +- .../archiva/web/tags/DownloadArtifact.java | 14 +- .../archiva/web/tags/DownloadArtifactTag.java | 2 +- .../maven/archiva/web/tags/GroupIdLink.java | 17 +- .../archiva/web/tags/GroupIdLinkTag.java | 4 +- .../validator/CronExpressionValidator.java | 8 +- .../web/validator/IntervalValidator.java | 6 +- .../validator/SyncedRepositoryValidator.java | 6 +- .../resources/META-INF/plexus/application.xml | 2 +- .../src/main/resources/log4j.xml | 4 +- .../{webwork.properties => struts.properties} | 12 +- .../main/resources/{xwork.xml => struts.xml} | 21 ++- .../src/main/resources/validators.xml | 26 +-- .../webapp/WEB-INF/jsp/accessToNoRepos.jsp | 4 +- .../jsp/admin/addLegacyArtifactPath.jsp | 26 +-- .../WEB-INF/jsp/admin/addProxyConnector.jsp | 14 +- .../WEB-INF/jsp/admin/addRemoteRepository.jsp | 14 +- .../WEB-INF/jsp/admin/addRepository.jsp | 16 +- .../webapp/WEB-INF/jsp/admin/appearance.jsp | 8 +- .../jsp/admin/confirmAddRepository.jsp | 38 ++--- .../webapp/WEB-INF/jsp/admin/database.jsp | 34 ++-- .../WEB-INF/jsp/admin/deleteNetworkProxy.jsp | 14 +- .../jsp/admin/deleteProxyConnector.jsp | 16 +- .../jsp/admin/deleteRemoteRepository.jsp | 16 +- .../WEB-INF/jsp/admin/deleteRepository.jsp | 18 +- .../jsp/admin/deleteRepositoryGroup.jsp | 16 +- .../jsp/admin/disableProxyConnector.jsp | 16 +- .../WEB-INF/jsp/admin/editAppearance.jsp | 20 +-- .../WEB-INF/jsp/admin/editNetworkProxy.jsp | 20 +-- .../WEB-INF/jsp/admin/editProxyConnector.jsp | 14 +- .../jsp/admin/editRemoteRepository.jsp | 16 +- .../WEB-INF/jsp/admin/editRepository.jsp | 18 +- .../jsp/admin/enableProxyConnector.jsp | 16 +- .../WEB-INF/jsp/admin/errorMessages.jsp | 10 +- .../WEB-INF/jsp/admin/legacyArtifactPath.jsp | 24 +-- .../WEB-INF/jsp/admin/networkProxies.jsp | 32 ++-- .../WEB-INF/jsp/admin/proxyConnectors.jsp | 96 +++++------ .../webapp/WEB-INF/jsp/admin/repositories.jsp | 68 ++++---- .../WEB-INF/jsp/admin/repositoryGroups.jsp | 72 ++++---- .../WEB-INF/jsp/admin/repositoryScanning.jsp | 40 ++--- .../webapp/WEB-INF/jsp/advancedSearch.jsp | 38 ++--- .../src/main/webapp/WEB-INF/jsp/alert.jsp | 4 +- .../src/main/webapp/WEB-INF/jsp/browse.jsp | 28 ++-- .../webapp/WEB-INF/jsp/browseArtifact.jsp | 16 +- .../main/webapp/WEB-INF/jsp/browseGroup.jsp | 26 +-- .../WEB-INF/jsp/components/companyLogo.jsp | 4 +- .../jsp/decorators/artifactDecorator.jsp | 66 ++++---- .../webapp/WEB-INF/jsp/decorators/default.jsp | 8 +- .../main/webapp/WEB-INF/jsp/findArtifact.jsp | 34 ++-- .../main/webapp/WEB-INF/jsp/generalError.jsp | 6 +- .../main/webapp/WEB-INF/jsp/quickSearch.jsp | 26 +-- .../WEB-INF/jsp/reports/basicReport.jsp | 22 +-- .../WEB-INF/jsp/reports/blankReport.jsp | 6 +- .../webapp/WEB-INF/jsp/reports/pickReport.jsp | 16 +- .../src/main/webapp/WEB-INF/jsp/results.jsp | 158 +++++++++--------- .../main/webapp/WEB-INF/jsp/showArtifact.jsp | 66 ++++---- .../src/main/webapp/WEB-INF/jsp/upload.jsp | 14 +- .../main/webapp/WEB-INF/tags/currentWWUrl.tag | 6 +- .../src/main/webapp/WEB-INF/web.xml | 4 +- .../webapp/template/archiva/checkboxlist.ftl | 4 +- .../main/webapp/template/archiva/radiomap.ftl | 4 +- .../src/main/webapp/template/xhtml/hidden.ftl | 2 +- .../web/action/AbstractWebworkTestCase.java | 2 +- .../EditOrganizationInfoActionTest.java | 6 +- .../OrganizationInfoActionTest.java | 2 +- .../proxy/AddProxyConnectorActionTest.java | 4 +- .../proxy/DeleteProxyConnectorActionTest.java | 4 +- .../DisableProxyConnectorActionTest.java | 4 +- .../proxy/EditProxyConnectorActionTest.java | 4 +- .../proxy/EnableProxyConnectorActionTest.java | 4 +- .../proxy/ProxyConnectorsActionTest.java | 4 +- .../proxy/SortProxyConnectorsActionTest.java | 4 +- .../AddManagedRepositoryActionTest.java | 7 +- .../AddRemoteRepositoryActionTest.java | 6 +- .../DeleteManagedRepositoryActionTest.java | 6 +- .../DeleteRemoteRepositoryActionTest.java | 2 +- .../DeleteRepositoryGroupActionTest.java | 6 +- .../EditManagedRepositoryActionTest.java | 6 +- .../EditRemoteRepositoryActionTest.java | 6 +- .../repositories/RepositoriesActionTest.java | 6 +- .../RepositoryGroupsActionTest.java | 6 +- .../SortRepositoriesActionTest.java | 6 +- .../AbstractManagedRepositoriesActionTest.xml | 6 +- .../DeleteManagedRepositoryActionTest.xml | 2 +- .../repositories/RepositoriesActionTest.xml | 2 +- .../archiva-web/archiva-webdav/pom.xml | 2 +- .../archiva/webdav/ArchivaDavResource.java | 2 +- .../webdav/ArchivaDavResourceFactory.java | 4 +- .../webdav/ArchivaDavSessionProvider.java | 2 +- .../archiva/webdav/RepositoryServlet.java | 2 +- .../webdav/ArchivaDavSessionProviderTest.java | 2 +- .../archiva/webdav/RepositoryServletTest.xml | 2 +- pom.xml | 102 ++++++----- 133 files changed, 1006 insertions(+), 929 deletions(-) create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java rename archiva-modules/archiva-web/archiva-webapp/src/main/resources/{webwork.properties => struts.properties} (74%) rename archiva-modules/archiva-web/archiva-webapp/src/main/resources/{xwork.xml => struts.xml} (98%) diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 97bfcd57a..eaccde728 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -120,8 +120,8 @@ commons-lang - com.opensymphony - webwork + org.apache.struts + struts2-core org.codehaus.plexus.registry @@ -146,23 +146,28 @@ 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 + redback-struts2-taglib org.apache.archiva archiva-webdav + + org.apache.struts + struts2-spring-plugin + runtime + commons-io commons-io @@ -310,12 +315,16 @@ org.mortbay.jetty - maven-jetty-plugin - 6.1.1 + jetty-maven-plugin + 7.0.0pre3 10 / src/jetty-env.xml + + / + src/jetty-env.xml + 9091 @@ -399,7 +408,7 @@ - com.opensymphony.xwork.Action + com.opensymphony.xwork2.Action per-lookup diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java index 92b4c8c91..df1244599 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java @@ -22,14 +22,13 @@ package org.apache.maven.archiva.web.action; import java.util.Collections; import java.util.List; -import com.opensymphony.xwork.ActionContext; +import com.opensymphony.xwork2.ActionContext; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.database.browsing.BrowsingResults; import org.apache.maven.archiva.database.browsing.RepositoryBrowsing; import org.apache.maven.archiva.security.*; import org.apache.maven.archiva.security.ArchivaXworkUser; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; /** * Browse the repository. @@ -37,7 +36,7 @@ import org.codehaus.plexus.xwork.action.PlexusActionSupport; * @todo cache browsing results. * @todo implement repository selectors (all or specific repository) * @todo implement security around browse (based on repository id at first) - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="browseAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="browseAction" */ public class BrowseAction extends PlexusActionSupport diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java new file mode 100644 index 000000000..d68b6be40 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java @@ -0,0 +1,54 @@ +package org.apache.maven.archiva.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 java.util.Map; +import org.apache.struts2.interceptor.SessionAware; +import org.codehaus.plexus.logging.LogEnabled; +import org.codehaus.plexus.logging.Logger; + +/** + * LogEnabled and SessionAware ActionSupport + */ +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; + } +} diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java index 35e770b26..c7b21e596 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/SearchAction.java @@ -42,15 +42,14 @@ import org.apache.maven.archiva.security.ArchivaSecurityException; import org.apache.maven.archiva.security.ArchivaXworkUser; import org.apache.maven.archiva.security.PrincipalNotFoundException; import org.apache.maven.archiva.security.UserRepositories; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; -import com.opensymphony.xwork.ActionContext; -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.Preparable; /** * Search all indexed fields by the given criteria. * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="searchAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="searchAction" */ public class SearchAction extends PlexusActionSupport @@ -307,8 +306,7 @@ public class SearchAction return RESULTS; } - - @Override + public String doInput() { return INPUT; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java index a402515c3..56fd71aa0 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java @@ -32,17 +32,16 @@ import org.apache.maven.archiva.security.ArchivaSecurityException; import org.apache.maven.archiva.security.PrincipalNotFoundException; import org.apache.maven.archiva.security.UserRepositories; import org.apache.maven.archiva.security.ArchivaXworkUser; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; -import com.opensymphony.xwork.ActionContext; -import com.opensymphony.xwork.Validateable; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.Validateable; /** * Browse the repository. * * TODO change name to ShowVersionedAction to conform to terminology. * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="showArtifactAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="showArtifactAction" */ public class ShowArtifactAction extends PlexusActionSupport diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java index cb8bcfe48..c9a15e2dd 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java @@ -61,12 +61,11 @@ import org.apache.maven.archiva.security.ArchivaSecurityException; import org.apache.maven.archiva.security.PrincipalNotFoundException; import org.apache.maven.archiva.security.UserRepositories; import org.apache.maven.archiva.security.ArchivaXworkUser; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; -import com.opensymphony.webwork.ServletActionContext; -import com.opensymphony.xwork.ActionContext; -import com.opensymphony.xwork.Preparable; -import com.opensymphony.xwork.Validateable; +import org.apache.struts2.ServletActionContext; +import com.opensymphony.xwork2.ActionContext; +import com.opensymphony.xwork2.Preparable; +import com.opensymphony.xwork2.Validateable; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; @@ -76,7 +75,7 @@ import org.apache.commons.lang.StringUtils; * * @author Wendy Smoak * @author Maria Odea Ching - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="uploadAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="uploadAction" */ public class UploadAction extends PlexusActionSupport diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java index fb0db8436..4d73cd6a6 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/SchedulerAction.java @@ -27,17 +27,17 @@ import org.apache.maven.archiva.scheduled.tasks.ArchivaTask; import org.apache.maven.archiva.scheduled.tasks.DatabaseTask; import org.apache.maven.archiva.scheduled.tasks.RepositoryTask; import org.apache.maven.archiva.security.ArchivaRoleConstants; +import org.apache.maven.archiva.web.action.PlexusActionSupport; 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.TaskQueueException; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; /** * Configures the application. * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="schedulerAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="schedulerAction" */ public class SchedulerAction extends PlexusActionSupport diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java index f8d6bf73f..d9877ac5f 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/AbstractAppearanceAction.java @@ -22,9 +22,9 @@ package org.apache.maven.archiva.web.action.admin.appearance; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.OrganisationInformation; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; +import org.apache.maven.archiva.web.action.PlexusActionSupport; /** * AbstractAppearanceAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java index 1304b5046..c598fef4c 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganisationInfoAction.java @@ -19,22 +19,22 @@ package org.apache.maven.archiva.web.action.admin.appearance; * under the License. */ -import org.codehaus.plexus.redback.xwork.interceptor.SecureAction; +import org.codehaus.plexus.redback.struts2.interceptor.SecureAction; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.IndeterminateConfigurationException; import org.apache.maven.archiva.configuration.OrganisationInformation; import org.apache.maven.archiva.security.ArchivaRoleConstants; import org.codehaus.plexus.redback.rbac.Resource; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle; -import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle; +import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException; import org.codehaus.plexus.registry.RegistryException; /** * @author Brett Porter * @version $Id: ConfigurationAction.java 480950 2006-11-30 14:58:35Z evenisse $ * - * @plexus.component role="com.opensymphony.xwork.Action" + * @plexus.component role="com.opensymphony.xwork2.Action" * role-hint="editOrganisationInfo" */ public class EditOrganisationInfoAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java index bcacf1ea4..8f6113471 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/appearance/OrganisationInfoAction.java @@ -22,7 +22,7 @@ package org.apache.maven.archiva.web.action.admin.appearance; /** * Stores the organisation information for displaying on the page. * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="organisationInfo" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="organisationInfo" */ public class OrganisationInfoAction extends AbstractAppearanceAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorAction.java index b7f2e60d4..c0a5a79a2 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorAction.java @@ -28,12 +28,12 @@ import org.apache.maven.archiva.configuration.IndeterminateConfigurationExceptio import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration; import org.apache.maven.archiva.configuration.functors.ProxyConnectorSelectionPredicate; import org.apache.maven.archiva.security.ArchivaRoleConstants; +import org.apache.maven.archiva.web.action.PlexusActionSupport; 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.xwork.action.PlexusActionSupport; import java.util.List; import java.util.Map; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java index 1318f5765..b25e2b3c1 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AbstractProxyConnectorFormAction.java @@ -19,7 +19,7 @@ package org.apache.maven.archiva.web.action.admin.connectors.proxy; * under the License. */ -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration; import org.apache.maven.archiva.policies.DownloadErrorPolicy; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java index 84c158cff..5ee458a51 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java @@ -28,7 +28,7 @@ import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addProxyConnectorAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addProxyConnectorAction" */ public class AddProxyConnectorAction extends AbstractProxyConnectorFormAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorAction.java index 2de3ee9a5..3fabeadc7 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DeleteProxyConnectorAction.java @@ -27,7 +27,7 @@ import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="deleteProxyConnectorAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteProxyConnectorAction" */ public class DeleteProxyConnectorAction extends AbstractProxyConnectorAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorAction.java index 5ae3a4ddf..1d109ef63 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/DisableProxyConnectorAction.java @@ -24,7 +24,7 @@ import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration; /** * DisableProxyConnectorAction * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="disableProxyConnectorAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="disableProxyConnectorAction" */ public class DisableProxyConnectorAction extends AbstractProxyConnectorAction { diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java index 8b050e94f..62028ebbe 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EditProxyConnectorAction.java @@ -28,7 +28,7 @@ import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="editProxyConnectorAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="editProxyConnectorAction" */ public class EditProxyConnectorAction extends AbstractProxyConnectorFormAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorAction.java index 9a46d597d..eb575b8fe 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/EnableProxyConnectorAction.java @@ -24,7 +24,7 @@ import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration; /** * EnableProxyConnectorAction * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="enableProxyConnectorAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="enableProxyConnectorAction" */ public class EnableProxyConnectorAction extends AbstractProxyConnectorAction { diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java index 3cfb0ece9..76663156a 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/ProxyConnectorsAction.java @@ -19,7 +19,7 @@ package org.apache.maven.archiva.web.action.admin.connectors.proxy; * under the License. */ -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration; import org.apache.maven.archiva.configuration.Configuration; @@ -35,7 +35,7 @@ import java.util.Map; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="proxyConnectorsAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="proxyConnectorsAction" */ public class ProxyConnectorsAction extends AbstractProxyConnectorAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsAction.java index 75b0f455a..9d322edd5 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/connectors/proxy/SortProxyConnectorsAction.java @@ -30,7 +30,7 @@ import java.util.List; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="sortProxyConnectorsAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="sortProxyConnectorsAction" */ public class SortProxyConnectorsAction extends AbstractProxyConnectorAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java index 277aefee6..34623ffcb 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/database/DatabaseAction.java @@ -19,7 +19,7 @@ package org.apache.maven.archiva.web.action.admin.database; * under the License. */ -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; import org.apache.commons.collections.CollectionUtils; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; @@ -28,12 +28,12 @@ import org.apache.maven.archiva.configuration.IndeterminateConfigurationExceptio import org.apache.maven.archiva.database.updater.DatabaseConsumers; import org.apache.maven.archiva.security.ArchivaRoleConstants; import org.apache.maven.archiva.web.action.admin.scanning.AdminRepositoryConsumerComparator; +import org.apache.maven.archiva.web.action.PlexusActionSupport; 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.xwork.action.PlexusActionSupport; import java.util.Collections; import java.util.List; @@ -43,7 +43,7 @@ import java.util.List; * * @author Joakim Erdfelt * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="databaseAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="databaseAction" */ public class DatabaseAction extends PlexusActionSupport diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java index fa7f22616..b73483881 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java @@ -26,16 +26,15 @@ import org.apache.maven.archiva.configuration.LegacyArtifactPath; import org.apache.maven.archiva.model.ArtifactReference; import org.apache.maven.archiva.repository.ManagedRepositoryContent; import org.codehaus.plexus.registry.RegistryException; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; -import com.opensymphony.webwork.components.ActionError; -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; +import org.apache.maven.archiva.web.action.PlexusActionSupport; /** * Add a LegacyArtifactPath to archiva configuration * * @since 1.1 - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addLegacyArtifactPathAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addLegacyArtifactPathAction" */ public class AddLegacyArtifactPathAction extends PlexusActionSupport diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java index 0a0f6a025..5963cbc18 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/DeleteLegacyArtifactPathAction.java @@ -25,15 +25,15 @@ import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.IndeterminateConfigurationException; import org.apache.maven.archiva.configuration.LegacyArtifactPath; +import org.apache.maven.archiva.web.action.PlexusActionSupport; import org.codehaus.plexus.registry.RegistryException; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; /** * Delete a LegacyArtifactPath to archiva configuration * * * @since 1.1 - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="deleteLegacyArtifactPathAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteLegacyArtifactPathAction" */ public class DeleteLegacyArtifactPathAction extends PlexusActionSupport diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/LegacyArtifactPathAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/LegacyArtifactPathAction.java index 7efa73b6b..f2378d6d3 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/LegacyArtifactPathAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/LegacyArtifactPathAction.java @@ -30,19 +30,19 @@ import org.apache.maven.archiva.configuration.LegacyArtifactPath; import org.apache.maven.archiva.security.ArchivaRoleConstants; import org.apache.maven.archiva.web.util.ContextUtils; 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.xwork.action.PlexusActionSupport; +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.interceptor.ServletRequestAware; -import com.opensymphony.xwork.Preparable; +import org.apache.struts2.interceptor.ServletRequestAware; +import com.opensymphony.xwork2.Preparable; +import org.apache.maven.archiva.web.action.PlexusActionSupport; /** * Shows the LegacyArtifactPath Tab for the administrator. * * @since 1.1 - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="legacyArtifactPathAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="legacyArtifactPathAction" */ public class LegacyArtifactPathAction extends PlexusActionSupport diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java index 4acc3ae14..e2048c357 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyAction.java @@ -19,7 +19,7 @@ package org.apache.maven.archiva.web.action.admin.networkproxies; * under the License. */ -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.functors.NotPredicate; import org.apache.commons.lang.StringUtils; @@ -29,19 +29,19 @@ import org.apache.maven.archiva.configuration.IndeterminateConfigurationExceptio import org.apache.maven.archiva.configuration.NetworkProxyConfiguration; import org.apache.maven.archiva.configuration.functors.NetworkProxySelectionPredicate; import org.apache.maven.archiva.security.ArchivaRoleConstants; +import org.apache.maven.archiva.web.action.PlexusActionSupport; 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.xwork.action.PlexusActionSupport; /** * ConfigureNetworkProxyAction * * @author Joakim Erdfelt * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="configureNetworkProxyAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="configureNetworkProxyAction" */ public class ConfigureNetworkProxyAction extends PlexusActionSupport diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java index 467b3e454..a75a7b83b 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/networkproxies/NetworkProxiesAction.java @@ -19,15 +19,15 @@ package org.apache.maven.archiva.web.action.admin.networkproxies; * under the License. */ -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.security.ArchivaRoleConstants; +import org.apache.maven.archiva.web.action.PlexusActionSupport; 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.xwork.action.PlexusActionSupport; +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.util.List; @@ -37,7 +37,7 @@ import java.util.List; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="networkProxiesAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="networkProxiesAction" */ public class NetworkProxiesAction extends PlexusActionSupport diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractRepositoriesAdminAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractRepositoriesAdminAction.java index a7cd0d7f2..48430c78d 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractRepositoriesAdminAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractRepositoriesAdminAction.java @@ -25,14 +25,14 @@ import org.apache.maven.archiva.configuration.IndeterminateConfigurationExceptio import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration; import org.apache.maven.archiva.security.ArchivaRoleConstants; 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.xwork.action.PlexusActionSupport; import java.util.ArrayList; import java.util.List; +import org.apache.maven.archiva.web.action.PlexusActionSupport; /** * Abstract AdminRepositories Action base. diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java index 919bce071..3190a06f8 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryAction.java @@ -19,8 +19,8 @@ package org.apache.maven.archiva.web.action.admin.repositories; * under the License. */ -import com.opensymphony.xwork.Preparable; -import com.opensymphony.xwork.Validateable; +import com.opensymphony.xwork2.Preparable; +import com.opensymphony.xwork2.Validateable; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; @@ -35,7 +35,7 @@ import java.io.IOException; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addManagedRepositoryAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addManagedRepositoryAction" */ public class AddManagedRepositoryAction extends AbstractManagedRepositoriesAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java index 80d67582c..d4df22917 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AddRemoteRepositoryAction.java @@ -19,8 +19,8 @@ package org.apache.maven.archiva.web.action.admin.repositories; * under the License. */ -import com.opensymphony.xwork.Preparable; -import com.opensymphony.xwork.Validateable; +import com.opensymphony.xwork2.Preparable; +import com.opensymphony.xwork2.Validateable; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration; @@ -34,7 +34,7 @@ import java.io.IOException; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addRemoteRepositoryAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="addRemoteRepositoryAction" */ public class AddRemoteRepositoryAction extends AbstractRemoteRepositoriesAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java index 79b5c8d78..3bb840035 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteManagedRepositoryAction.java @@ -19,7 +19,7 @@ package org.apache.maven.archiva.web.action.admin.repositories; * under the License. */ -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.configuration.Configuration; @@ -48,7 +48,7 @@ import java.util.Map; * * @author Joakim Erdfelt * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="deleteManagedRepositoryAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteManagedRepositoryAction" */ public class DeleteManagedRepositoryAction extends AbstractManagedRepositoriesAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryAction.java index c63996b5f..4b3d95aa4 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRemoteRepositoryAction.java @@ -19,7 +19,7 @@ package org.apache.maven.archiva.web.action.admin.repositories; * under the License. */ -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.configuration.Configuration; @@ -34,7 +34,7 @@ import java.util.List; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="deleteRemoteRepositoryAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteRemoteRepositoryAction" */ public class DeleteRemoteRepositoryAction extends AbstractRemoteRepositoriesAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java index 653a29318..c4683676c 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/DeleteRepositoryGroupAction.java @@ -19,7 +19,7 @@ package org.apache.maven.archiva.web.action.admin.repositories; * under the License. */ -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.configuration.Configuration; @@ -30,7 +30,7 @@ import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration; * * @author * @version - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="deleteRepositoryGroupAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteRepositoryGroupAction" */ public class DeleteRepositoryGroupAction extends AbstractRepositoriesAdminAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java index 86817bab6..52c85f942 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryAction.java @@ -19,8 +19,8 @@ package org.apache.maven.archiva.web.action.admin.repositories; * under the License. */ -import com.opensymphony.xwork.Preparable; -import com.opensymphony.xwork.Validateable; +import com.opensymphony.xwork2.Preparable; +import com.opensymphony.xwork2.Validateable; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.configuration.Configuration; @@ -37,7 +37,7 @@ import java.io.IOException; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="editManagedRepositoryAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="editManagedRepositoryAction" */ public class EditManagedRepositoryAction extends AbstractManagedRepositoriesAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java index abcb8d775..148edc150 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/EditRemoteRepositoryAction.java @@ -19,7 +19,7 @@ package org.apache.maven.archiva.web.action.admin.repositories; * under the License. */ -import com.opensymphony.xwork.Preparable; +import com.opensymphony.xwork2.Preparable; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.configuration.Configuration; @@ -34,7 +34,7 @@ import java.io.IOException; * @author Joakim Erdfelt * @version $Id$ * - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="editRemoteRepositoryAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="editRemoteRepositoryAction" */ public class EditRemoteRepositoryAction extends AbstractRemoteRepositoriesAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesAction.java index 3dda6d7d5..20d7d54b8 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoriesAction.java @@ -19,8 +19,8 @@ package org.apache.maven.archiva.web.action.admin.repositories; * under the License. */ -import com.opensymphony.webwork.interceptor.ServletRequestAware; -import com.opensymphony.xwork.Preparable; +import org.apache.struts2.interceptor.ServletRequestAware; +import com.opensymphony.xwork2.Preparable; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; @@ -31,11 +31,11 @@ import org.apache.maven.archiva.database.constraints.MostRecentRepositoryScanSta import org.apache.maven.archiva.model.RepositoryContentStatistics; import org.apache.maven.archiva.security.ArchivaRoleConstants; import org.apache.maven.archiva.web.util.ContextUtils; +import org.apache.maven.archiva.web.action.PlexusActionSupport; 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.xwork.action.PlexusActionSupport; +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 javax.servlet.http.HttpServletRequest; import java.util.ArrayList; @@ -49,7 +49,7 @@ import java.util.Map; * * @author Joakim Erdfelt * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="repositoriesAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="repositoriesAction" */ public class RepositoriesAction extends PlexusActionSupport diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java index d1109d12a..ba16ef6f6 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/RepositoryGroupsAction.java @@ -26,8 +26,8 @@ import java.util.regex.Pattern; import javax.servlet.http.HttpServletRequest; -import com.opensymphony.webwork.interceptor.ServletRequestAware; -import com.opensymphony.xwork.Preparable; +import org.apache.struts2.interceptor.ServletRequestAware; +import com.opensymphony.xwork2.Preparable; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.configuration.Configuration; @@ -40,7 +40,7 @@ import org.apache.maven.archiva.web.util.ContextUtils; * * @author * @version - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="repositoryGroupsAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="repositoryGroupsAction" */ public class RepositoryGroupsAction extends AbstractRepositoriesAdminAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesAction.java index 4ac5c3ddc..6c58f70f0 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/SortRepositoriesAction.java @@ -30,7 +30,7 @@ import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration; * * @author * @version - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="sortRepositoriesAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="sortRepositoriesAction" */ public class SortRepositoriesAction extends AbstractRepositoriesAdminAction diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java index 0fb82401b..b79ffb7d4 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/scanning/RepositoryScanningAction.java @@ -19,8 +19,8 @@ package org.apache.maven.archiva.web.action.admin.scanning; * under the License. */ -import com.opensymphony.xwork.Preparable; -import com.opensymphony.xwork.Validateable; +import com.opensymphony.xwork2.Preparable; +import com.opensymphony.xwork2.Validateable; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.configuration.ArchivaConfiguration; @@ -32,12 +32,13 @@ import org.apache.maven.archiva.configuration.functors.FiletypeSelectionPredicat import org.apache.maven.archiva.configuration.functors.FiletypeToMapClosure; import org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers; import org.apache.maven.archiva.security.ArchivaRoleConstants; +import org.apache.maven.archiva.web.action.PlexusActionSupport; + 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.xwork.action.PlexusActionSupport; import java.util.ArrayList; import java.util.Collections; @@ -49,7 +50,7 @@ import java.util.Map; * * @author Joakim Erdfelt * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="repositoryScanningAction" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="repositoryScanningAction" */ public class RepositoryScanningAction extends PlexusActionSupport diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java index 747ec9802..e65f3a181 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/reports/GenerateReportAction.java @@ -19,8 +19,8 @@ package org.apache.maven.archiva.web.action.reports; * under the License. */ -import com.opensymphony.webwork.interceptor.ServletRequestAware; -import com.opensymphony.xwork.Preparable; +import org.apache.struts2.interceptor.ServletRequestAware; +import com.opensymphony.xwork2.Preparable; import org.apache.maven.archiva.database.ArchivaDAO; import org.apache.maven.archiva.database.Constraint; import org.apache.maven.archiva.database.constraints.RangeConstraint; @@ -31,11 +31,11 @@ import org.apache.maven.archiva.database.constraints.UniqueFieldConstraint; import org.apache.maven.archiva.model.RepositoryProblem; import org.apache.maven.archiva.model.RepositoryProblemReport; import org.apache.maven.archiva.security.ArchivaRoleConstants; +import org.apache.maven.archiva.web.action.PlexusActionSupport; 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.xwork.action.PlexusActionSupport; +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 javax.servlet.http.HttpServletRequest; import java.util.ArrayList; @@ -45,7 +45,7 @@ import java.util.Map; import java.util.TreeMap; /** - * @plexus.component role="com.opensymphony.xwork.Action" role-hint="generateReport" + * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="generateReport" */ public class GenerateReportAction extends PlexusActionSupport diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java index 0ab429965..fb28d561c 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ConfigurationInterceptor.java @@ -19,9 +19,9 @@ package org.apache.maven.archiva.web.interceptor; * under the License. */ -import com.opensymphony.webwork.ServletActionContext; -import com.opensymphony.xwork.ActionInvocation; -import com.opensymphony.xwork.interceptor.Interceptor; +import org.apache.struts2.ServletActionContext; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.Interceptor; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import javax.servlet.ServletContext; @@ -30,7 +30,7 @@ import javax.servlet.ServletContext; * An interceptor that makes the configuration bits available, both to the application and the webapp * * @author Brett Porter - * @plexus.component role="com.opensymphony.xwork.interceptor.Interceptor" + * @plexus.component role="com.opensymphony.xwork2.interceptor.Interceptor" * role-hint="configurationInterceptor" */ public class ConfigurationInterceptor diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java index 37e657baa..8de843892 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/mapper/RepositoryActionMapper.java @@ -19,8 +19,9 @@ package org.apache.maven.archiva.web.mapper; * under the License. */ -import com.opensymphony.webwork.dispatcher.mapper.ActionMapping; -import com.opensymphony.webwork.dispatcher.mapper.DefaultActionMapper; +import com.opensymphony.xwork2.config.ConfigurationManager; +import org.apache.struts2.dispatcher.mapper.ActionMapping; +import org.apache.struts2.dispatcher.mapper.DefaultActionMapper; import org.apache.commons.lang.StringUtils; @@ -69,7 +70,7 @@ public class RepositoryActionMapper private static final String PARAM_VERSION = "version"; - public ActionMapping getMapping( HttpServletRequest httpServletRequest ) + public ActionMapping getMapping( HttpServletRequest httpServletRequest, ConfigurationManager manager ) { String path = httpServletRequest.getServletPath(); @@ -141,9 +142,10 @@ public class RepositoryActionMapper } } - return super.getMapping( httpServletRequest ); + return super.getMapping( httpServletRequest, manager ); } + @Override public String getUriFromActionMapping( ActionMapping actionMapping ) { Map params = actionMapping.getParams(); diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java index 89570523a..d047eaf65 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/rss/RssFeedServlet.java @@ -52,7 +52,7 @@ import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator; +import org.codehaus.plexus.redback.struts2.filter.authentication.HttpAuthenticator; import org.codehaus.plexus.spring.PlexusToSpringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java index 7f6fe606f..8db360632 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifact.java @@ -19,10 +19,11 @@ package org.apache.maven.archiva.web.tags; * under the License. */ -import com.opensymphony.webwork.WebWorkException; -import com.opensymphony.webwork.components.Component; -import com.opensymphony.xwork.util.OgnlValueStack; +import org.apache.struts2.StrutsException; +import org.apache.struts2.components.Component; +import com.opensymphony.xwork2.util.OgnlValueStack; +import com.opensymphony.xwork2.util.ValueStack; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.database.ArchivaDAO; @@ -51,7 +52,7 @@ import javax.servlet.jsp.PageContext; * * @author Joakim Erdfelt * @version $Id$ - * @plexus.component role="com.opensymphony.webwork.components.Component" role-hint="download-artifact" + * @plexus.component role="org.apache.struts2.components.Component" role-hint="download-artifact" * instantiation-strategy="per-lookup" */ public class DownloadArtifact @@ -82,7 +83,7 @@ public class DownloadArtifact private DecimalFormat decimalFormat; - public DownloadArtifact( OgnlValueStack stack, PageContext pageContext ) + public DownloadArtifact( ValueStack stack, PageContext pageContext ) { super( stack ); decimalFormat = new DecimalFormat( "#,#00" ); @@ -100,6 +101,7 @@ public class DownloadArtifact } } + @Override public boolean end( Writer writer, String body ) { StringBuffer sb = new StringBuffer(); @@ -151,7 +153,7 @@ public class DownloadArtifact } catch ( IOException e ) { - throw new WebWorkException( "IOError: " + e.getMessage(), e ); + throw new StrutsException( "IOError: " + e.getMessage(), e ); } return super.end( writer, body ); diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java index 21aaa982f..9b372cf5e 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/DownloadArtifactTag.java @@ -19,7 +19,7 @@ package org.apache.maven.archiva.web.tags; * under the License. */ -import com.opensymphony.webwork.views.jsp.TagUtils; +import org.apache.struts2.views.jsp.TagUtils; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.TagSupport; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java index 37871480c..6593e1639 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLink.java @@ -19,10 +19,10 @@ package org.apache.maven.archiva.web.tags; * under the License. */ -import com.opensymphony.webwork.WebWorkException; -import com.opensymphony.webwork.components.Component; -import com.opensymphony.xwork.util.OgnlValueStack; +import org.apache.struts2.StrutsException; +import org.apache.struts2.components.Component; +import com.opensymphony.xwork2.util.ValueStack; import java.io.IOException; import java.io.Writer; import java.util.StringTokenizer; @@ -57,13 +57,14 @@ public class GroupIdLink private boolean includeTop = false; - public GroupIdLink( OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res ) + public GroupIdLink( ValueStack stack, HttpServletRequest req, HttpServletResponse res ) { super( stack ); this.req = req; this.res = res; } + @Override public boolean end( Writer writer, String body ) { StringBuffer sb = new StringBuffer(); @@ -105,7 +106,7 @@ public class GroupIdLink } catch ( IOException e ) { - throw new WebWorkException( "IOError: " + e.getMessage(), e ); + throw new StrutsException( "IOError: " + e.getMessage(), e ); } return super.end( writer, body ); @@ -113,16 +114,14 @@ public class GroupIdLink private String determineBrowseActionUrl() { - return determineActionURL( "browse", NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext, - encode, true ); + return determineActionURL( "browse", NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext, encode ); } private String determineBrowseGroupActionUrl( String gid ) { parameters.put( "groupId", gid ); - return determineActionURL( ACTION, NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext, - encode, true ); + return determineActionURL( ACTION, NAMESPACE, method, req, res, parameters, req.getScheme(), includeContext, encode ); } public String getGroupId() diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java index ec42b8bbe..39a8d0f40 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/tags/GroupIdLinkTag.java @@ -19,7 +19,7 @@ package org.apache.maven.archiva.web.tags; * under the License. */ -import com.opensymphony.webwork.views.jsp.TagUtils; +import org.apache.struts2.views.jsp.TagUtils; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -41,6 +41,7 @@ public class GroupIdLinkTag private boolean includeTop = false; + @Override public void release() { var_ = null; @@ -50,6 +51,7 @@ public class GroupIdLinkTag super.release(); } + @Override public int doEndTag() throws JspException { diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/CronExpressionValidator.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/CronExpressionValidator.java index 86464e59d..f8cce8d4a 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/CronExpressionValidator.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/CronExpressionValidator.java @@ -19,9 +19,9 @@ package org.apache.maven.archiva.web.validator; * under the License. */ -import com.opensymphony.xwork.validator.ValidationException; -import com.opensymphony.xwork.validator.ValidatorContext; -import com.opensymphony.xwork.validator.validators.FieldValidatorSupport; +import com.opensymphony.xwork2.validator.ValidationException; +import com.opensymphony.xwork2.validator.ValidatorContext; +import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; /** * Reused from Continuum crontab validator @@ -44,4 +44,4 @@ public class CronExpressionValidator return; } } -} \ No newline at end of file +} diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java index 628caa8a0..0c08e56b9 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java @@ -19,9 +19,9 @@ package org.apache.maven.archiva.web.validator; * under the License. */ -import com.opensymphony.xwork.validator.ValidationException; -import com.opensymphony.xwork.validator.ValidatorContext; -import com.opensymphony.xwork.validator.validators.ValidatorSupport; +import com.opensymphony.xwork2.validator.ValidationException; +import com.opensymphony.xwork2.validator.ValidatorContext; +import com.opensymphony.xwork2.validator.validators.ValidatorSupport; /** * @author Maria Odea Ching diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java index d97a9e2c4..49ebc6eef 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java @@ -19,9 +19,9 @@ package org.apache.maven.archiva.web.validator; * under the License. */ -import com.opensymphony.xwork.validator.ValidationException; -import com.opensymphony.xwork.validator.ValidatorContext; -import com.opensymphony.xwork.validator.validators.ValidatorSupport; +import com.opensymphony.xwork2.validator.ValidationException; +import com.opensymphony.xwork2.validator.ValidatorContext; +import com.opensymphony.xwork2.validator.validators.ValidatorSupport; /** * Validator for synced repository form. The values to be validated depends on the diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml index 22ad7d1ac..bfa05c10a 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml @@ -202,7 +202,7 @@ org.codehaus.plexus.redback.system.check.EnvironmentCheck locked-admin-check - org.codehaus.plexus.redback.xwork.checks.security.LockedAdminEnvironmentCheck + org.codehaus.plexus.redback.struts2.checks.security.LockedAdminEnvironmentCheck LockedAdminEnvironmentCheck: checks if accounts marked as system administrator are locked and unlocks them on startup. diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml index 19bb54331..1f6339e27 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/log4j.xml @@ -73,12 +73,12 @@ - + - + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/webwork.properties b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties similarity index 74% rename from archiva-modules/archiva-web/archiva-webapp/src/main/resources/webwork.properties rename to archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties index 1ad77fc06..524cdb3fe 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/webwork.properties +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.properties @@ -18,14 +18,14 @@ # # define our own action mapper here -webwork.mapper.class = org.apache.maven.archiva.web.mapper.RepositoryActionMapper -webwork.objectFactory = org.codehaus.plexus.spring.WebWorkPlexusInSpringObjectFactory -webwork.url.includeParams = none +struts.mapper.class = org.apache.maven.archiva.web.mapper.RepositoryActionMapper +struts.objectFactory = org.codehaus.plexus.spring.Struts2PlexusInSpringObjectFactory +struts.url.includeParams = none -#webwork.devMode = true -webwork.multipart.parser=jakarta +struts.devMode = true +struts.multipart.parser=jakarta # TODO: package up a theme and share with Continuum. Should contain everything from xhtml, and set templateDir to WEB-INF/themes # Localization -webwork.custom.i18n.resources=org.codehaus.plexus.redback.xwork.default,org.apache.maven.archiva.redback.custom +struts.custom.i18n.resources=org.codehaus.plexus.redback.xwork.default,org.apache.maven.archiva.redback.custom diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml similarity index 98% rename from archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml rename to archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml index 36509e11e..18d941f81 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/xwork.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml @@ -18,24 +18,21 @@ ~ under the License. --> - - - - - + + - + - + - + @@ -220,7 +217,7 @@ - + /WEB-INF/jsp/components/companyLogo.jsp @@ -496,6 +493,7 @@ + + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml index c05423ec7..65b4ca2c3 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml @@ -19,19 +19,19 @@ --> - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/accessToNoRepos.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/accessToNoRepos.jsp index 5ed04736f..2b2e6a66e 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/accessToNoRepos.jsp +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/accessToNoRepos.jsp @@ -17,13 +17,13 @@ ~ under the License. --%> -<%@ taglib prefix="ww" uri="/webwork" %> +<%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> You have access to no repositories - + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp index 6c647d426..a0e30b1d1 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp @@ -17,12 +17,12 @@ ~ under the License. --%> -<%@ taglib prefix="ww" uri="/webwork" %> +<%@ taglib prefix="s" uri="/struts-tags" %> Admin: Add Legacy Artifact Path - + @@ -65,17 +65,17 @@ } - - - - - - - - - - - + + + + + + + + + + +