<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus.registry</groupId>
<!-- Plexus Security 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>
</dependency>
<!-- Other dependencies -->
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-webdav</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-spring-plugin</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.1</version>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>7.0.0pre3</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<contextPath>/</contextPath>
<jettyEnvXml>src/jetty-env.xml</jettyEnvXml>
+ <webAppConfig>
+ <contextPath>/</contextPath>
+ <jettyEnvXmlFile>src/jetty-env.xml</jettyEnvXmlFile>
+ </webAppConfig>
<connectors>
<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
<port>9091</port>
<configuration>
<roleDefaults>
<roleDefault>
- <role>com.opensymphony.xwork.Action</role>
+ <role>com.opensymphony.xwork2.Action</role>
<instantiation-strategy>per-lookup</instantiation-strategy>
</roleDefault>
</roleDefaults>
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.
* @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
--- /dev/null
+package org.apache.maven.archiva.web.action;\r
+\r
+/*\r
+ * Licensed to the Apache Software Foundation (ASF) under one\r
+ * or more contributor license agreements. See the NOTICE file\r
+ * distributed with this work for additional information\r
+ * regarding copyright ownership. The ASF licenses this file\r
+ * to you under the Apache License, Version 2.0 (the\r
+ * "License"); you may not use this file except in compliance\r
+ * with the License. You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing,\r
+ * software distributed under the License is distributed on an\r
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\r
+ * KIND, either express or implied. See the License for the\r
+ * specific language governing permissions and limitations\r
+ * under the License.\r
+ */\r
+\r
+import com.opensymphony.xwork2.ActionSupport;\r
+import java.util.Map;\r
+import org.apache.struts2.interceptor.SessionAware;\r
+import org.codehaus.plexus.logging.LogEnabled;\r
+import org.codehaus.plexus.logging.Logger;\r
+\r
+/**\r
+ * LogEnabled and SessionAware ActionSupport\r
+ */\r
+public abstract class PlexusActionSupport\r
+ extends ActionSupport\r
+ implements LogEnabled, SessionAware\r
+{\r
+ protected Map session;\r
+\r
+ private Logger logger;\r
+\r
+ public void setSession( Map map )\r
+ {\r
+ //noinspection AssignmentToCollectionOrArrayFieldFromParameter\r
+ this.session = map;\r
+ }\r
+\r
+ public void enableLogging( Logger logger )\r
+ {\r
+ this.logger = logger;\r
+ }\r
+\r
+ protected Logger getLogger()\r
+ {\r
+ return logger;\r
+ }\r
+}\r
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
return RESULTS;
}
-
- @Override
+
public String doInput()
{
return INPUT;
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
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;
*
* @author <a href="mailto:wsmoak@apache.org">Wendy Smoak</a>
* @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
- * @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
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
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
* 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 <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"
+ * @plexus.component role="com.opensymphony.xwork2.Action"
* role-hint="editOrganisationInfo"
*/
public class EditOrganisationInfoAction
/**
* 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
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;
* 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;
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
/**
* 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
{
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
/**
* 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
{
* 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;
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
* 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;
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;
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
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
import org.apache.maven.archiva.configuration.Configuration;\r
import org.apache.maven.archiva.configuration.IndeterminateConfigurationException;\r
import org.apache.maven.archiva.configuration.LegacyArtifactPath;\r
+import org.apache.maven.archiva.web.action.PlexusActionSupport;\r
import org.codehaus.plexus.registry.RegistryException;\r
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;\r
\r
/**\r
* Delete a LegacyArtifactPath to archiva configuration\r
*\r
*\r
* @since 1.1\r
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="deleteLegacyArtifactPathAction"\r
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteLegacyArtifactPathAction"\r
*/\r
public class DeleteLegacyArtifactPathAction\r
extends PlexusActionSupport\r
import org.apache.maven.archiva.security.ArchivaRoleConstants;\r
import org.apache.maven.archiva.web.util.ContextUtils;\r
import org.codehaus.plexus.redback.rbac.Resource;\r
-import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;\r
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;\r
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;\r
-import org.codehaus.plexus.xwork.action.PlexusActionSupport;\r
+import org.codehaus.plexus.redback.struts2.interceptor.SecureAction;\r
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;\r
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;\r
\r
-import com.opensymphony.webwork.interceptor.ServletRequestAware;\r
-import com.opensymphony.xwork.Preparable;\r
+import org.apache.struts2.interceptor.ServletRequestAware;\r
+import com.opensymphony.xwork2.Preparable;\r
+import org.apache.maven.archiva.web.action.PlexusActionSupport;\r
\r
/**\r
* Shows the LegacyArtifactPath Tab for the administrator.\r
*\r
* @since 1.1\r
- * @plexus.component role="com.opensymphony.xwork.Action" role-hint="legacyArtifactPathAction"\r
+ * @plexus.component role="com.opensymphony.xwork2.Action" role-hint="legacyArtifactPathAction"\r
*/\r
public class LegacyArtifactPathAction\r
extends PlexusActionSupport\r
* 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;
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 <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
* 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;
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
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.
* 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;
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
* 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;
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
* 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;
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
* 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;
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
* 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;
*
* @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
* 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;
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
* 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;
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
* 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;
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;
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
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;
*
* @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
*
* @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
* 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;
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;
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
* 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;
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;
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
* 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;
* An interceptor that makes the configuration bits available, both to the application and the webapp
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @plexus.component role="com.opensymphony.xwork.interceptor.Interceptor"
+ * @plexus.component role="com.opensymphony.xwork2.interceptor.Interceptor"
* role-hint="configurationInterceptor"
*/
public class ConfigurationInterceptor
* 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;
private static final String PARAM_VERSION = "version";
- public ActionMapping getMapping( HttpServletRequest httpServletRequest )
+ public ActionMapping getMapping( HttpServletRequest httpServletRequest, ConfigurationManager manager )
{
String path = httpServletRequest.getServletPath();
}
}
- return super.getMapping( httpServletRequest );
+ return super.getMapping( httpServletRequest, manager );
}
+ @Override
public String getUriFromActionMapping( ActionMapping actionMapping )
{
Map params = actionMapping.getParams();
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;
* 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;
*
* @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a>
* @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
private DecimalFormat decimalFormat;
- public DownloadArtifact( OgnlValueStack stack, PageContext pageContext )
+ public DownloadArtifact( ValueStack stack, PageContext pageContext )
{
super( stack );
decimalFormat = new DecimalFormat( "#,#00" );
}
}
+ @Override
public boolean end( Writer writer, String body )
{
StringBuffer sb = new StringBuffer();
}
catch ( IOException e )
{
- throw new WebWorkException( "IOError: " + e.getMessage(), e );
+ throw new StrutsException( "IOError: " + e.getMessage(), e );
}
return super.end( writer, body );
* 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;
* 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;
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();
}
catch ( IOException e )
{
- throw new WebWorkException( "IOError: " + e.getMessage(), e );
+ throw new StrutsException( "IOError: " + e.getMessage(), e );
}
return super.end( writer, body );
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()
* 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;
private boolean includeTop = false;
+ @Override
public void release()
{
var_ = null;
super.release();
}
+ @Override
public int doEndTag()
throws JspException
{
* 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
return;
}
}
-}
\ No newline at end of file
+}
* 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 <a href="mailto:oching@apache.org">Maria Odea Ching</a>
* 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
<component>
<role>org.codehaus.plexus.redback.system.check.EnvironmentCheck</role>
<role-hint>locked-admin-check</role-hint>
- <implementation>org.codehaus.plexus.redback.xwork.checks.security.LockedAdminEnvironmentCheck</implementation>
+ <implementation>org.codehaus.plexus.redback.struts2.checks.security.LockedAdminEnvironmentCheck</implementation>
<description>LockedAdminEnvironmentCheck: checks if accounts marked as system administrator are locked
and unlocks them on startup.
</description>
<appender-ref ref="rolling" />
</logger>
- <logger name="com.opensymphony.xwork">
+ <logger name="com.opensymphony.xwork2">
<level value="info"/>
<appender-ref ref="rolling" />
</logger>
- <logger name="com.opensymphony.webwork">
+ <logger name="org.apache.struts2">
<level value="info"/>
<appender-ref ref="rolling" />
</logger>
--- /dev/null
+#
+# 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.
+#
+
+# define our own action mapper here
+struts.mapper.class = org.apache.maven.archiva.web.mapper.RepositoryActionMapper
+struts.objectFactory = org.codehaus.plexus.spring.Struts2PlexusInSpringObjectFactory
+struts.url.includeParams = none
+
+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
+struts.custom.i18n.resources=org.codehaus.plexus.redback.xwork.default,org.apache.maven.archiva.redback.custom
--- /dev/null
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ ~ 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.
+ -->
+
+<!DOCTYPE struts PUBLIC "-//Apache Software Foundation//DTD Struts Configuration//EN"
+ "http://struts.apache.org/dtds/struts-2.0.dtd">
+
+<struts>
+ <!-- Include plexus-security xwork configurations. -->
+ <include file="struts-security.xml"/>
+
+ <package name="base" extends="struts-default">
+ <interceptors>
+ <interceptor name="configuration" class="configurationInterceptor"/>
+ <interceptor name="redbackForceAdminUser" class="redbackForceAdminUserInterceptor"/>
+ <interceptor name="redbackSecureActions" class="redbackSecureActionInterceptor"/>
+ <interceptor name="redbackAutoLogin" class="redbackAutoLoginInterceptor"/>
+ <interceptor name="redbackPolicyEnforcement" class="redbackPolicyEnforcementInterceptor"/>
+ <interceptor name="paramFilter" class="com.opensymphony.xwork2.interceptor.ParameterFilterInterceptor"/>
+
+ <interceptor-stack name="configuredArchivaStack">
+ <interceptor-ref name="redbackForceAdminUser"/>
+ <interceptor-ref name="redbackAutoLogin"/>
+ <interceptor-ref name="defaultStack"/>
+ <interceptor-ref name="paramFilter">
+ <param name="blocked">externalResult</param>
+ </interceptor-ref>
+ <interceptor-ref name="redbackSecureActions"/>
+ <interceptor-ref name="redbackPolicyEnforcement"/>
+ <interceptor-ref name="configuration"/>
+ <interceptor-ref name="validation">
+ <param name="excludeMethods">input,back,cancel,browse</param>
+ </interceptor-ref>
+ <interceptor-ref name="workflow">
+ <param name="excludeMethods">input,back,cancel,browse</param>
+ </interceptor-ref>
+ </interceptor-stack>
+
+ <interceptor-stack name="unconfiguredArchivaStack">
+ <interceptor-ref name="redbackForceAdminUser"/>
+ <interceptor-ref name="redbackAutoLogin"/>
+ <interceptor-ref name="defaultStack"/>
+ <interceptor-ref name="redbackPolicyEnforcement"/>
+ <interceptor-ref name="redbackSecureActions"/>
+ <interceptor-ref name="validation">
+ <param name="excludeMethods">input,back,cancel,browse</param>
+ </interceptor-ref>
+ <interceptor-ref name="workflow">
+ <param name="excludeMethods">input,back,cancel,browse</param>
+ </interceptor-ref>
+ </interceptor-stack>
+
+ <interceptor-stack name="configuredPrepareParamsStack">
+ <!-- <interceptor-ref name="prepare" /> -->
+ <interceptor-ref name="params"/>
+ <interceptor-ref name="configuredArchivaStack"/>
+ </interceptor-stack>
+ </interceptors>
+
+ <!-- Default interceptor stack. -->
+ <default-interceptor-ref name="configuredArchivaStack"/>
+
+ <global-results>
+ <!-- The following security-* result names arrive from the plexus-security package -->
+
+ <result name="security-login-success" type="redirect-action">index</result>
+ <result name="security-login-cancel" type="redirect-action">index</result>
+ <result name="security-login-locked" type="redirect-action">
+ <param name="infoMessage">Account Locked</param>
+ <param name="actionName">index</param>
+ </result>
+ <result name="security-logout" type="redirect-action">index</result>
+ <result name="requires-authentication" type="redirect-action">
+ <param name="actionName">login</param>
+ <param name="namespace">/security</param>
+ </result>
+ <result name="requires-authorization" type="redirect-action">
+ <param name="actionName">login</param>
+ <param name="namespace">/security</param>
+ </result>
+ <result name="security-register-success" type="redirect-action">
+ <param name="actionName">login</param>
+ <param name="namespace">/security</param>
+ </result>
+ <result name="security-register-cancel" type="redirect-action">
+ <param name="actionName">login</param>
+ <param name="namespace">/security</param>
+ </result>
+ <result name="security-account-success" type="redirect-action">index</result>
+ <result name="security-account-cancel" type="redirect-action">
+ <param name="actionName">login</param>
+ <param name="namespace">/security</param>
+ </result>
+ <result name="security-admin-user-created" type="redirect-action">
+ <param name="actionName">login</param>
+ <param name="namespace">/security</param>
+ </result>
+ <result name="security-admin-user-needed" type="redirect-action">
+ <param name="actionName">addadmin</param>
+ <param name="namespace">/security</param>
+ </result>
+ <result name="security-must-change-password" type="redirect-action">
+ <param name="actionName">password</param>
+ <param name="namespace">/security</param>
+ </result>
+
+ <!-- Generic Catchall for those action configurations that forget to
+ include a result for 'error' -->
+ <result name="error">/WEB-INF/jsp/generalError.jsp</result>
+ <result name="access_to_no_repos">/WEB-INF/jsp/accessToNoRepos.jsp</result>
+ </global-results>
+ </package>
+
+ <!-- Configuration for the default package. -->
+ <package name="default" extends="base" namespace="/">
+
+ <!-- This is the redirection facility for plexus-security,
+ allowing plexus-security to call out from its own set of actions
+ into the application webapp, using global result names. -->
+ <action name="redbackRedirect" class="redback-redirect" method="redirect">
+ <result type="redirect-action">browse</result>
+ </action>
+
+ <action name="index" class="searchAction" method="input">
+ <result name="input">/WEB-INF/jsp/quickSearch.jsp</result>
+ </action>
+
+ <action name="advancedSearch" class="searchAction" method="input">
+ <result name="input">/WEB-INF/jsp/advancedSearch.jsp</result>
+ </action>
+
+ <action name="filteredSearch" class="searchAction" method="filteredSearch">
+ <result name="input">/WEB-INF/jsp/advancedSearch.jsp</result>
+ <result>/WEB-INF/jsp/results.jsp</result>
+ <result name="error">/WEB-INF/jsp/quickSearch.jsp</result>
+ </action>
+
+ <action name="quickSearch" class="searchAction" method="quickSearch">
+ <result name="input">/WEB-INF/jsp/quickSearch.jsp</result>
+ <result>/WEB-INF/jsp/results.jsp</result>
+ <result name="error">/WEB-INF/jsp/quickSearch.jsp</result>
+ </action>
+
+ <action name="findArtifact" class="searchAction" method="input">
+ <result name="input">/WEB-INF/jsp/findArtifact.jsp</result>
+ </action>
+
+ <action name="upload" class="uploadAction" method="input">
+ <result name="input">/WEB-INF/jsp/upload.jsp</result>
+ <result name="error">/WEB-INF/jsp/upload.jsp</result>
+ <result name="success">/WEB-INF/jsp/upload.jsp</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ <interceptor-ref name="fileUpload"/>
+ </action>
+
+ <action name="checksumSearch" class="searchAction" method="findArtifact">
+ <result name="input">/WEB-INF/jsp/findArtifact.jsp</result>
+ <result name="results">/WEB-INF/jsp/results.jsp</result>
+ <result name="error">/WEB-INF/jsp/findArtifact.jsp</result>
+ <result name="artifact" type="redirect">
+ /browse/${databaseResults.get(0).getGroupId()}/${databaseResults.get(0).getArtifactId()}/${databaseResults.get(0).getVersion()}
+ </result>
+ </action>
+
+ <action name="browse" class="browseAction" method="browse">
+ <result>/WEB-INF/jsp/browse.jsp</result>
+ </action>
+
+ <action name="browseGroup" class="browseAction" method="browseGroup">
+ <result>/WEB-INF/jsp/browse.jsp</result>
+ </action>
+
+ <action name="browseArtifact" class="browseAction" method="browseArtifact">
+ <result>/WEB-INF/jsp/browse.jsp</result>
+ </action>
+
+ <action name="showArtifact" class="showArtifactAction" method="artifact">
+ <result name="error">/WEB-INF/jsp/generalError.jsp</result>
+ <result name="success">/WEB-INF/jsp/showArtifact.jsp</result>
+ </action>
+
+ <action name="showArtifactMailingLists" class="showArtifactAction" method="mailingLists">
+ <result>/WEB-INF/jsp/showArtifact.jsp</result>
+ </action>
+
+ <action name="showArtifactReports" class="showArtifactAction" method="reports">
+ <result>/WEB-INF/jsp/showArtifact.jsp</result>
+ </action>
+
+ <action name="showArtifactDependencies" class="showArtifactAction" method="dependencies">
+ <result>/WEB-INF/jsp/showArtifact.jsp</result>
+ </action>
+
+ <action name="showArtifactDependees" class="showArtifactAction" method="dependees">
+ <result>/WEB-INF/jsp/showArtifact.jsp</result>
+ </action>
+
+ <action name="showArtifactDependencyTree" class="showArtifactAction" method="dependencyTree">
+ <result>/WEB-INF/jsp/artifact/dependencyTree.jsp</result>
+ </action>
+
+ </package>
+
+ <package name="components" namespace="/components" extends="struts-default">
+ <default-interceptor-ref name="basicStack"/>
+ <action name="companyInfo" class="organisationInfo">
+ <result>/WEB-INF/jsp/components/companyLogo.jsp</result>
+ </action>
+ </package>
+
+ <!-- Configuration for the admin package. -->
+ <package name="admin" namespace="/admin" extends="base">
+
+ <action name="index" class="repositoriesAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/repositories.jsp</result>
+ </action>
+
+ <!-- .\ REPOSITORY GROUPS \._______________________________________ -->
+
+ <action name="repositoryGroups" class="repositoryGroupsAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
+ </action>
+
+ <action name="addRepositoryGroup" class="repositoryGroupsAction" method="addRepositoryGroup">
+ <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
+ <result name="success" type="redirect-action">repositoryGroups</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="confirmDeleteRepositoryGroup" class="deleteRepositoryGroupAction" method="confirmDelete">
+ <result name="input">/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="deleteRepositoryGroup" class="deleteRepositoryGroupAction" method="delete">
+ <result name="input">/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp</result>
+ <result name="success" type="redirect-action">repositoryGroups</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="addRepositoryToGroup" class="repositoryGroupsAction" method="addRepositoryToGroup">
+ <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
+ <result name="success" type="redirect-action">repositoryGroups</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="removeRepositoryFromGroup" class="repositoryGroupsAction" method="removeRepositoryFromGroup">
+ <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
+ <result name="success" type="redirect-action">repositoryGroups</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="sortDownRepositoryFromGroup" class="sortRepositoriesAction" method="sortDown">
+ <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
+ <result name="success" type="redirect-action">repositoryGroups</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="sortUpRepositoryFromGroup" class="sortRepositoriesAction" method="sortUp">
+ <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
+ <result name="success" type="redirect-action">repositoryGroups</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <!-- .\ REPOSITORIES \.____________________________________________ -->
+
+ <action name="repositories" class="repositoriesAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/repositories.jsp</result>
+ <result name="confirm" type="redirect-action">deleteRepository</result>
+ </action>
+
+ <action name="indexRepository" class="schedulerAction" method="scanRepository">
+ <result type="redirect-action">repositories</result>
+ </action>
+
+ <action name="addRepository" class="addManagedRepositoryAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/addRepository.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/addRepository.jsp</result>
+ <result name="confirm">/WEB-INF/jsp/admin/confirmAddRepository.jsp</result>
+ <result name="success" type="redirect-action">repositories</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="editRepository" class="editManagedRepositoryAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/editRepository.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/editRepository.jsp</result>
+ <result name="success" type="redirect-action">repositories</result>
+ <result name="confirm">/WEB-INF/jsp/admin/confirmAddRepository.jsp</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="confirmDeleteRepository" class="deleteManagedRepositoryAction" method="confirmDelete">
+ <result name="input">/WEB-INF/jsp/admin/deleteRepository.jsp</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="deleteRepository" class="deleteManagedRepositoryAction" method="delete">
+ <result name="input">/WEB-INF/jsp/admin/deleteRepository.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/deleteRepository.jsp</result>
+ <result name="success" type="redirect-action">repositories</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="addRemoteRepository" class="addRemoteRepositoryAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/addRemoteRepository.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/addRemoteRepository.jsp</result>
+ <result name="success" type="redirect-action">repositories</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="editRemoteRepository" class="editRemoteRepositoryAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/editRemoteRepository.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/editRemoteRepository.jsp</result>
+ <result name="success" type="redirect-action">repositories</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="confirmDeleteRemoteRepository" class="deleteRemoteRepositoryAction" method="confirmDelete">
+ <result name="input">/WEB-INF/jsp/admin/deleteRemoteRepository.jsp</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="deleteRemoteRepository" class="deleteRemoteRepositoryAction" method="delete">
+ <result name="input">/WEB-INF/jsp/admin/deleteRemoteRepository.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/deleteRemoteRepository.jsp</result>
+ <result name="success" type="redirect-action">repositories</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <!-- .\ PROXY CONNECTORS \.________________________________________ -->
+
+ <action name="proxyConnectors" class="proxyConnectorsAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/proxyConnectors.jsp</result>
+ </action>
+
+ <action name="addProxyConnector" class="addProxyConnectorAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/addProxyConnector.jsp</result>
+ <result name="success" type="redirect-action">proxyConnectors</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="editProxyConnector" class="editProxyConnectorAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/editProxyConnector.jsp</result>
+ <result name="success" type="redirect-action">proxyConnectors</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="sortUpProxyConnector" class="sortProxyConnectorsAction" method="sortUp">
+ <result name="input">/WEB-INF/jsp/admin/editProxyConnector.jsp</result>
+ <result name="success" type="redirect-action">proxyConnectors</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="sortDownProxyConnector" class="sortProxyConnectorsAction" method="sortDown">
+ <result name="input">/WEB-INF/jsp/admin/editProxyConnector.jsp</result>
+ <result name="success" type="redirect-action">proxyConnectors</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="deleteProxyConnector" class="deleteProxyConnectorAction" method="confirm">
+ <result name="input">/WEB-INF/jsp/admin/deleteProxyConnector.jsp</result>
+ <result name="success" type="redirect-action">proxyConnectors</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="enableProxyConnector" class="enableProxyConnectorAction" method="confirm">
+ <result name="input">/WEB-INF/jsp/admin/enableProxyConnector.jsp</result>
+ <result name="success" type="redirect-action">proxyConnectors</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="disableProxyConnector" class="disableProxyConnectorAction" method="confirm">
+ <result name="input">/WEB-INF/jsp/admin/disableProxyConnector.jsp</result>
+ <result name="success" type="redirect-action">proxyConnectors</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+
+ <!-- .\ NETWORK PROXIES \._________________________________________ -->
+
+ <action name="networkProxies" class="networkProxiesAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/networkProxies.jsp</result>
+ </action>
+
+ <action name="addNetworkProxy" class="configureNetworkProxyAction" method="add">
+ <result name="input">/WEB-INF/jsp/admin/editNetworkProxy.jsp</result>
+ <result name="success" type="redirect-action">networkProxies</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="editNetworkProxy" class="configureNetworkProxyAction" method="edit">
+ <result name="input">/WEB-INF/jsp/admin/editNetworkProxy.jsp</result>
+ <result name="success" type="redirect-action">networkProxies</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="saveNetworkProxy" class="configureNetworkProxyAction" method="save">
+ <result name="input">/WEB-INF/jsp/admin/editNetworkProxy.jsp</result>
+ <result name="success" type="redirect-action">networkProxies</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="deleteNetworkProxy" class="configureNetworkProxyAction" method="confirm">
+ <result name="input">/WEB-INF/jsp/admin/deleteNetworkProxy.jsp</result>
+ <result name="success" type="redirect-action">networkProxies</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <!-- .\ REPOSITORY SCANNING \._____________________________________ -->
+
+ <action name="repositoryScanning" class="repositoryScanningAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result>
+ <result name="success" type="redirect-action">
+ <param name="actionName">repositoryScanning</param>
+ </result>
+ </action>
+
+ <!-- .\ DATABASE \.________________________________________________ -->
+
+ <action name="database" class="databaseAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/database.jsp</result>
+ <result name="success" type="redirect-action">
+ <param name="actionName">database</param>
+ </result>
+ </action>
+
+ <action name="updateDatabase" class="schedulerAction" method="updateDatabase">
+ <result type="redirect-action">database</result>
+ </action>
+
+ <!-- .\ CONFIGURATION \.___________________________________________ -->
+
+ <action name="configureAppearance" class="organisationInfo">
+ <result name="success">/WEB-INF/jsp/admin/appearance.jsp</result>
+ </action>
+
+ <action name="editAppearance" class="editOrganisationInfo" method="input">
+ <result name="input">/WEB-INF/jsp/admin/editAppearance.jsp</result>
+ </action>
+
+ <action name="saveAppearance" class="editOrganisationInfo">
+ <result name="input">/WEB-INF/jsp/admin/editAppearance.jsp</result>
+ <result type="redirect-action">
+ <param name="actionName">configureAppearance</param>
+ <param name="namespace">/admin</param>
+ </result>
+ </action>
+
+ <!-- .\ LEGACY SUPPORT \.__________________________________________ -->
+
+ <action name="legacyArtifactPath" class="legacyArtifactPathAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/legacyArtifactPath.jsp</result>
+ <result name="success" type="redirect-action">
+ <param name="actionName">legacyArtifactPath</param>
+ </result>
+ </action>
+
+ <action name="addLegacyArtifactPath" class="addLegacyArtifactPathAction" method="input">
+ <result name="input">/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp</result>
+ <result name="success" type="redirect-action">legacyArtifactPath</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ <action name="deleteLegacyArtifactPath" class="deleteLegacyArtifactPathAction" method="delete">
+ <result name="input">/WEB-INF/jsp/admin/legacyArtifactPath.jsp</result>
+ <result name="error">/WEB-INF/jsp/admin/legacyArtifactPath.jsp</result>
+ <result name="success" type="redirect-action">legacyArtifactPath</result>
+ <interceptor-ref name="configuredPrepareParamsStack"/>
+ </action>
+
+ </package>
+
+<!--
+ <package name="report" namespace="/report" extends="base">
+ <action name="pickReport" class="generateReport" method="input">
+ <result name="input">/WEB-INF/jsp/reports/pickReport.jsp</result>
+ </action>
+
+ <action name="generateReport" class="generateReport">
+ <result name="jasper" type="jasper">
+ <param name="location">/WEB-INF/jasperreports/report.jasper</param>
+ <param name="dataSource">reports</param>
+ <param name="format">HTML</param>
+ </result>
+ <result name="input">/WEB-INF/jsp/reports/pickReport.jsp</result>
+ <result name="blank">/WEB-INF/jsp/reports/blankReport.jsp</result>
+ <result>/WEB-INF/jsp/reports/basicReport.jsp</result>
+ </action>
+ </package>
+ -->
+</struts>
+
-->
<validators>
- <validator name="required" class="com.opensymphony.xwork.validator.validators.RequiredFieldValidator"/>
- <validator name="requiredstring" class="com.opensymphony.xwork.validator.validators.RequiredStringValidator"/>
- <validator name="int" class="com.opensymphony.xwork.validator.validators.IntRangeFieldValidator"/>
- <validator name="double" class="com.opensymphony.xwork.validator.validators.DoubleRangeFieldValidator"/>
- <validator name="date" class="com.opensymphony.xwork.validator.validators.DateRangeFieldValidator"/>
- <validator name="expression" class="com.opensymphony.xwork.validator.validators.ExpressionValidator"/>
- <validator name="fieldexpression" class="com.opensymphony.xwork.validator.validators.FieldExpressionValidator"/>
- <validator name="email" class="com.opensymphony.xwork.validator.validators.EmailValidator"/>
- <validator name="url" class="com.opensymphony.xwork.validator.validators.URLValidator"/>
- <validator name="visitor" class="com.opensymphony.xwork.validator.validators.VisitorFieldValidator"/>
- <validator name="conversion" class="com.opensymphony.xwork.validator.validators.ConversionErrorFieldValidator"/>
- <validator name="stringlength" class="com.opensymphony.xwork.validator.validators.StringLengthFieldValidator"/>
- <validator name="regex" class="com.opensymphony.xwork.validator.validators.RegexFieldValidator"/>
+ <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/>
+ <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/>
+ <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/>
+ <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/>
+ <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/>
+ <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/>
+ <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/>
+ <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/>
+ <validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/>
+ <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/>
+ <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
+ <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/>
+ <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/>
<validator name="interval" class="org.apache.maven.archiva.web.validator.IntervalValidator"/>
<validator name="syncedrepo" class="org.apache.maven.archiva.web.validator.SyncedRepositoryValidator"/>
<validator name="crontab" class="org.apache.maven.archiva.web.validator.CronExpressionValidator"/>
+++ /dev/null
-#
-# 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.
-#
-
-# 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
-
-#webwork.devMode = true
-webwork.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
+++ /dev/null
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- ~ 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.
- -->
-
-<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1//EN"
- "http://www.opensymphony.com/xwork/xwork-1.1.dtd">
-
-<xwork>
- <!-- TODO: better error handling for exceptions needed [MRM-490] -->
- <include file="webwork-default.xml"/>
-
- <!-- Include plexus-security xwork configurations. -->
- <include file="xwork-security.xml"/>
-
- <package name="base" extends="webwork-default">
- <interceptors>
- <interceptor name="configuration" class="configurationInterceptor"/>
- <interceptor name="redbackForceAdminUser" class="redbackForceAdminUserInterceptor"/>
- <interceptor name="redbackSecureActions" class="redbackSecureActionInterceptor"/>
- <interceptor name="redbackAutoLogin" class="redbackAutoLoginInterceptor"/>
- <interceptor name="redbackPolicyEnforcement" class="redbackPolicyEnforcementInterceptor"/>
- <interceptor name="paramFilter" class="com.opensymphony.xwork.interceptor.ParameterFilterInterceptor"/>
-
- <interceptor-stack name="configuredArchivaStack">
- <interceptor-ref name="redbackForceAdminUser"/>
- <interceptor-ref name="redbackAutoLogin"/>
- <interceptor-ref name="defaultStack"/>
- <interceptor-ref name="paramFilter">
- <param name="blocked">externalResult</param>
- </interceptor-ref>
- <interceptor-ref name="redbackSecureActions"/>
- <interceptor-ref name="redbackPolicyEnforcement"/>
- <interceptor-ref name="configuration"/>
- <interceptor-ref name="validation">
- <param name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- <interceptor-ref name="workflow">
- <param name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- </interceptor-stack>
-
- <interceptor-stack name="unconfiguredArchivaStack">
- <interceptor-ref name="redbackForceAdminUser"/>
- <interceptor-ref name="redbackAutoLogin"/>
- <interceptor-ref name="defaultStack"/>
- <interceptor-ref name="redbackPolicyEnforcement"/>
- <interceptor-ref name="redbackSecureActions"/>
- <interceptor-ref name="validation">
- <param name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- <interceptor-ref name="workflow">
- <param name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- </interceptor-stack>
-
- <interceptor-stack name="configuredPrepareParamsStack">
- <!-- <interceptor-ref name="prepare" /> -->
- <interceptor-ref name="params"/>
- <interceptor-ref name="configuredArchivaStack"/>
- </interceptor-stack>
- </interceptors>
-
- <!-- Default interceptor stack. -->
- <default-interceptor-ref name="configuredArchivaStack"/>
-
- <global-results>
- <!-- The following security-* result names arrive from the plexus-security package -->
-
- <result name="security-login-success" type="redirect-action">index</result>
- <result name="security-login-cancel" type="redirect-action">index</result>
- <result name="security-login-locked" type="redirect-action">
- <param name="infoMessage">Account Locked</param>
- <param name="actionName">index</param>
- </result>
- <result name="security-logout" type="redirect-action">index</result>
- <result name="requires-authentication" type="redirect-action">
- <param name="actionName">login</param>
- <param name="namespace">/security</param>
- </result>
- <result name="requires-authorization" type="redirect-action">
- <param name="actionName">login</param>
- <param name="namespace">/security</param>
- </result>
- <result name="security-register-success" type="redirect-action">
- <param name="actionName">login</param>
- <param name="namespace">/security</param>
- </result>
- <result name="security-register-cancel" type="redirect-action">
- <param name="actionName">login</param>
- <param name="namespace">/security</param>
- </result>
- <result name="security-account-success" type="redirect-action">index</result>
- <result name="security-account-cancel" type="redirect-action">
- <param name="actionName">login</param>
- <param name="namespace">/security</param>
- </result>
- <result name="security-admin-user-created" type="redirect-action">
- <param name="actionName">login</param>
- <param name="namespace">/security</param>
- </result>
- <result name="security-admin-user-needed" type="redirect-action">
- <param name="actionName">addadmin</param>
- <param name="namespace">/security</param>
- </result>
- <result name="security-must-change-password" type="redirect-action">
- <param name="actionName">password</param>
- <param name="namespace">/security</param>
- </result>
-
- <!-- Generic Catchall for those action configurations that forget to
- include a result for 'error' -->
- <result name="error">/WEB-INF/jsp/generalError.jsp</result>
- <result name="access_to_no_repos">/WEB-INF/jsp/accessToNoRepos.jsp</result>
- </global-results>
- </package>
-
- <!-- Configuration for the default package. -->
- <package name="default" extends="base" namespace="/">
-
- <!-- This is the redirection facility for plexus-security,
- allowing plexus-security to call out from its own set of actions
- into the application webapp, using global result names. -->
- <action name="redbackRedirect" class="redback-redirect" method="redirect">
- <result type="redirect-action">browse</result>
- </action>
-
- <action name="index" class="searchAction" method="input">
- <result name="input">/WEB-INF/jsp/quickSearch.jsp</result>
- </action>
-
- <action name="advancedSearch" class="searchAction" method="input">
- <result name="input">/WEB-INF/jsp/advancedSearch.jsp</result>
- </action>
-
- <action name="filteredSearch" class="searchAction" method="filteredSearch">
- <result name="input">/WEB-INF/jsp/advancedSearch.jsp</result>
- <result>/WEB-INF/jsp/results.jsp</result>
- <result name="error">/WEB-INF/jsp/quickSearch.jsp</result>
- </action>
-
- <action name="quickSearch" class="searchAction" method="quickSearch">
- <result name="input">/WEB-INF/jsp/quickSearch.jsp</result>
- <result>/WEB-INF/jsp/results.jsp</result>
- <result name="error">/WEB-INF/jsp/quickSearch.jsp</result>
- </action>
-
- <action name="findArtifact" class="searchAction" method="input">
- <result name="input">/WEB-INF/jsp/findArtifact.jsp</result>
- </action>
-
- <action name="upload" class="uploadAction" method="input">
- <result name="input">/WEB-INF/jsp/upload.jsp</result>
- <result name="error">/WEB-INF/jsp/upload.jsp</result>
- <result name="success">/WEB-INF/jsp/upload.jsp</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- <interceptor-ref name="fileUpload"/>
- </action>
-
- <action name="checksumSearch" class="searchAction" method="findArtifact">
- <result name="input">/WEB-INF/jsp/findArtifact.jsp</result>
- <result name="results">/WEB-INF/jsp/results.jsp</result>
- <result name="error">/WEB-INF/jsp/findArtifact.jsp</result>
- <result name="artifact" type="redirect">
- /browse/${databaseResults.get(0).getGroupId()}/${databaseResults.get(0).getArtifactId()}/${databaseResults.get(0).getVersion()}
- </result>
- </action>
-
- <action name="browse" class="browseAction" method="browse">
- <result>/WEB-INF/jsp/browse.jsp</result>
- </action>
-
- <action name="browseGroup" class="browseAction" method="browseGroup">
- <result>/WEB-INF/jsp/browse.jsp</result>
- </action>
-
- <action name="browseArtifact" class="browseAction" method="browseArtifact">
- <result>/WEB-INF/jsp/browse.jsp</result>
- </action>
-
- <action name="showArtifact" class="showArtifactAction" method="artifact">
- <result name="error">/WEB-INF/jsp/generalError.jsp</result>
- <result name="success">/WEB-INF/jsp/showArtifact.jsp</result>
- </action>
-
- <action name="showArtifactMailingLists" class="showArtifactAction" method="mailingLists">
- <result>/WEB-INF/jsp/showArtifact.jsp</result>
- </action>
-
- <action name="showArtifactReports" class="showArtifactAction" method="reports">
- <result>/WEB-INF/jsp/showArtifact.jsp</result>
- </action>
-
- <action name="showArtifactDependencies" class="showArtifactAction" method="dependencies">
- <result>/WEB-INF/jsp/showArtifact.jsp</result>
- </action>
-
- <action name="showArtifactDependees" class="showArtifactAction" method="dependees">
- <result>/WEB-INF/jsp/showArtifact.jsp</result>
- </action>
-
- <action name="showArtifactDependencyTree" class="showArtifactAction" method="dependencyTree">
- <result>/WEB-INF/jsp/artifact/dependencyTree.jsp</result>
- </action>
-
- </package>
-
- <package name="components" namespace="/components" extends="webwork-default">
- <default-interceptor-ref name="basicStack"/>
- <action name="companyInfo" class="organisationInfo">
- <result>/WEB-INF/jsp/components/companyLogo.jsp</result>
- </action>
- </package>
-
- <!-- Configuration for the admin package. -->
- <package name="admin" namespace="/admin" extends="base">
-
- <action name="index" class="repositoriesAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/repositories.jsp</result>
- </action>
-
- <!-- .\ REPOSITORY GROUPS \._______________________________________ -->
-
- <action name="repositoryGroups" class="repositoryGroupsAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- </action>
-
- <action name="addRepositoryGroup" class="repositoryGroupsAction" method="addRepositoryGroup">
- <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="success" type="redirect-action">repositoryGroups</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="confirmDeleteRepositoryGroup" class="deleteRepositoryGroupAction" method="confirmDelete">
- <result name="input">/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="deleteRepositoryGroup" class="deleteRepositoryGroupAction" method="delete">
- <result name="input">/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp</result>
- <result name="success" type="redirect-action">repositoryGroups</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="addRepositoryToGroup" class="repositoryGroupsAction" method="addRepositoryToGroup">
- <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="success" type="redirect-action">repositoryGroups</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="removeRepositoryFromGroup" class="repositoryGroupsAction" method="removeRepositoryFromGroup">
- <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="success" type="redirect-action">repositoryGroups</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="sortDownRepositoryFromGroup" class="sortRepositoriesAction" method="sortDown">
- <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="success" type="redirect-action">repositoryGroups</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="sortUpRepositoryFromGroup" class="sortRepositoriesAction" method="sortUp">
- <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
- <result name="success" type="redirect-action">repositoryGroups</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <!-- .\ REPOSITORIES \.____________________________________________ -->
-
- <action name="repositories" class="repositoriesAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/repositories.jsp</result>
- <result name="confirm" type="redirect-action">deleteRepository</result>
- </action>
-
- <action name="indexRepository" class="schedulerAction" method="scanRepository">
- <result type="redirect-action">repositories</result>
- </action>
-
- <action name="addRepository" class="addManagedRepositoryAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/addRepository.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/addRepository.jsp</result>
- <result name="confirm">/WEB-INF/jsp/admin/confirmAddRepository.jsp</result>
- <result name="success" type="redirect-action">repositories</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="editRepository" class="editManagedRepositoryAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/editRepository.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/editRepository.jsp</result>
- <result name="success" type="redirect-action">repositories</result>
- <result name="confirm">/WEB-INF/jsp/admin/confirmAddRepository.jsp</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="confirmDeleteRepository" class="deleteManagedRepositoryAction" method="confirmDelete">
- <result name="input">/WEB-INF/jsp/admin/deleteRepository.jsp</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="deleteRepository" class="deleteManagedRepositoryAction" method="delete">
- <result name="input">/WEB-INF/jsp/admin/deleteRepository.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/deleteRepository.jsp</result>
- <result name="success" type="redirect-action">repositories</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="addRemoteRepository" class="addRemoteRepositoryAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/addRemoteRepository.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/addRemoteRepository.jsp</result>
- <result name="success" type="redirect-action">repositories</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="editRemoteRepository" class="editRemoteRepositoryAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/editRemoteRepository.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/editRemoteRepository.jsp</result>
- <result name="success" type="redirect-action">repositories</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="confirmDeleteRemoteRepository" class="deleteRemoteRepositoryAction" method="confirmDelete">
- <result name="input">/WEB-INF/jsp/admin/deleteRemoteRepository.jsp</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="deleteRemoteRepository" class="deleteRemoteRepositoryAction" method="delete">
- <result name="input">/WEB-INF/jsp/admin/deleteRemoteRepository.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/deleteRemoteRepository.jsp</result>
- <result name="success" type="redirect-action">repositories</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <!-- .\ PROXY CONNECTORS \.________________________________________ -->
-
- <action name="proxyConnectors" class="proxyConnectorsAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/proxyConnectors.jsp</result>
- </action>
-
- <action name="addProxyConnector" class="addProxyConnectorAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/addProxyConnector.jsp</result>
- <result name="success" type="redirect-action">proxyConnectors</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="editProxyConnector" class="editProxyConnectorAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/editProxyConnector.jsp</result>
- <result name="success" type="redirect-action">proxyConnectors</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="sortUpProxyConnector" class="sortProxyConnectorsAction" method="sortUp">
- <result name="input">/WEB-INF/jsp/admin/editProxyConnector.jsp</result>
- <result name="success" type="redirect-action">proxyConnectors</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="sortDownProxyConnector" class="sortProxyConnectorsAction" method="sortDown">
- <result name="input">/WEB-INF/jsp/admin/editProxyConnector.jsp</result>
- <result name="success" type="redirect-action">proxyConnectors</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="deleteProxyConnector" class="deleteProxyConnectorAction" method="confirm">
- <result name="input">/WEB-INF/jsp/admin/deleteProxyConnector.jsp</result>
- <result name="success" type="redirect-action">proxyConnectors</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="enableProxyConnector" class="enableProxyConnectorAction" method="confirm">
- <result name="input">/WEB-INF/jsp/admin/enableProxyConnector.jsp</result>
- <result name="success" type="redirect-action">proxyConnectors</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="disableProxyConnector" class="disableProxyConnectorAction" method="confirm">
- <result name="input">/WEB-INF/jsp/admin/disableProxyConnector.jsp</result>
- <result name="success" type="redirect-action">proxyConnectors</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
-
- <!-- .\ NETWORK PROXIES \._________________________________________ -->
-
- <action name="networkProxies" class="networkProxiesAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/networkProxies.jsp</result>
- </action>
-
- <action name="addNetworkProxy" class="configureNetworkProxyAction" method="add">
- <result name="input">/WEB-INF/jsp/admin/editNetworkProxy.jsp</result>
- <result name="success" type="redirect-action">networkProxies</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="editNetworkProxy" class="configureNetworkProxyAction" method="edit">
- <result name="input">/WEB-INF/jsp/admin/editNetworkProxy.jsp</result>
- <result name="success" type="redirect-action">networkProxies</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="saveNetworkProxy" class="configureNetworkProxyAction" method="save">
- <result name="input">/WEB-INF/jsp/admin/editNetworkProxy.jsp</result>
- <result name="success" type="redirect-action">networkProxies</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="deleteNetworkProxy" class="configureNetworkProxyAction" method="confirm">
- <result name="input">/WEB-INF/jsp/admin/deleteNetworkProxy.jsp</result>
- <result name="success" type="redirect-action">networkProxies</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <!-- .\ REPOSITORY SCANNING \._____________________________________ -->
-
- <action name="repositoryScanning" class="repositoryScanningAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result>
- <result name="success" type="redirect-action">
- <param name="actionName">repositoryScanning</param>
- </result>
- </action>
-
- <!-- .\ DATABASE \.________________________________________________ -->
-
- <action name="database" class="databaseAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/database.jsp</result>
- <result name="success" type="redirect-action">
- <param name="actionName">database</param>
- </result>
- </action>
-
- <action name="updateDatabase" class="schedulerAction" method="updateDatabase">
- <result type="redirect-action">database</result>
- </action>
-
- <!-- .\ CONFIGURATION \.___________________________________________ -->
-
- <action name="configureAppearance" class="organisationInfo">
- <result name="success">/WEB-INF/jsp/admin/appearance.jsp</result>
- </action>
-
- <action name="editAppearance" class="editOrganisationInfo" method="input">
- <result name="input">/WEB-INF/jsp/admin/editAppearance.jsp</result>
- </action>
-
- <action name="saveAppearance" class="editOrganisationInfo">
- <result name="input">/WEB-INF/jsp/admin/editAppearance.jsp</result>
- <result type="redirect-action">
- <param name="actionName">configureAppearance</param>
- <param name="namespace">/admin</param>
- </result>
- </action>
-
- <!-- .\ LEGACY SUPPORT \.__________________________________________ -->
-
- <action name="legacyArtifactPath" class="legacyArtifactPathAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/legacyArtifactPath.jsp</result>
- <result name="success" type="redirect-action">
- <param name="actionName">legacyArtifactPath</param>
- </result>
- </action>
-
- <action name="addLegacyArtifactPath" class="addLegacyArtifactPathAction" method="input">
- <result name="input">/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp</result>
- <result name="success" type="redirect-action">legacyArtifactPath</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- <action name="deleteLegacyArtifactPath" class="deleteLegacyArtifactPathAction" method="delete">
- <result name="input">/WEB-INF/jsp/admin/legacyArtifactPath.jsp</result>
- <result name="error">/WEB-INF/jsp/admin/legacyArtifactPath.jsp</result>
- <result name="success" type="redirect-action">legacyArtifactPath</result>
- <interceptor-ref name="configuredPrepareParamsStack"/>
- </action>
-
- </package>
-
- <package name="report" namespace="/report" extends="base">
- <action name="pickReport" class="generateReport" method="input">
- <result name="input">/WEB-INF/jsp/reports/pickReport.jsp</result>
- </action>
-
- <action name="generateReport" class="generateReport">
- <result name="jasper" type="jasper">
- <param name="location">/WEB-INF/jasperreports/report.jasper</param>
- <param name="dataSource">reports</param>
- <param name="format">HTML</param>
- </result>
- <result name="input">/WEB-INF/jsp/reports/pickReport.jsp</result>
- <result name="blank">/WEB-INF/jsp/reports/blankReport.jsp</result>
- <result>/WEB-INF/jsp/reports/basicReport.jsp</result>
- </action>
- </package>
-</xwork>
-
~ 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" %>
<html>
<head>
<title>You have access to no repositories</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
~ under the License.\r
--%>\r
\r
-<%@ taglib prefix="ww" uri="/webwork" %>\r
+<%@ taglib prefix="s" uri="/struts-tags" %>\r
\r
<html>\r
<head>\r
<title>Admin: Add Legacy Artifact Path</title>\r
- <ww:head/>\r
+ <s:head/>\r
</head>\r
\r
<body>\r
}\r
</script>\r
\r
- <ww:actionmessage/>\r
- <ww:actionerror/>\r
- <ww:form method="post" action="addLegacyArtifactPath!commit" namespace="/admin" validate="true">\r
- <ww:textfield name="legacyArtifactPath.path" label="Path" size="50" required="true" onchange="parse( this.value )"/>\r
- <ww:textfield name="groupId" label="GroupId" size="20" required="true"/>\r
- <ww:textfield name="artifactId" label="ArtifactId" size="20" required="true"/>\r
- <ww:textfield name="version" label="Version" size="20" required="true"/>\r
- <ww:textfield name="classifier" label="Classifier" size="20" required="false"/>\r
- <ww:textfield name="type" label="Type" size="20" required="true"/>\r
- <ww:submit value="Add Legacy Artifact Path"/>\r
- </ww:form>\r
+ <s:actionmessage/>\r
+ <s:actionerror/>\r
+ <s:form method="post" action="addLegacyArtifactPath!commit" namespace="/admin" validate="true">\r
+ <s:textfield name="legacyArtifactPath.path" label="Path" size="50" required="true" onchange="parse( this.value )"/>\r
+ <s:textfield name="groupId" label="GroupId" size="20" required="true"/>\r
+ <s:textfield name="artifactId" label="ArtifactId" size="20" required="true"/>\r
+ <s:textfield name="version" label="Version" size="20" required="true"/>\r
+ <s:textfield name="classifier" label="Classifier" size="20" required="false"/>\r
+ <s:textfield name="type" label="Type" size="20" required="true"/>\r
+ <s:submit value="Add Legacy Artifact Path"/>\r
+ </s:form>\r
\r
<script type="text/javascript">\r
var ref = document.getElementById("addLegacyArtifactPath_legacyArtifactPath_artifact").value;\r
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Admin: Add Proxy Connector</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<div id="contentArea">
- <ww:actionerror/>
- <ww:actionmessage/>
+ <s:actionerror/>
+ <s:actionmessage/>
- <ww:form name="saveProxyConnector" method="post" action="addProxyConnector!commit" namespace="/admin" validate="true">
+ <s:form name="saveProxyConnector" method="post" action="addProxyConnector!commit" namespace="/admin" validate="true">
<%@ include file="/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf" %>
- <ww:submit value="Add Proxy Connector"/>
- </ww:form>
+ <s:submit value="Add Proxy Connector"/>
+ </s:form>
</div>
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Admin: Add Remote Repository</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<div id="contentArea">
- <ww:actionmessage/>
- <ww:form method="post" action="addRemoteRepository!commit" namespace="/admin" validate="true">
- <ww:textfield name="repository.id" label="Identifier" size="10" required="true"/>
+ <s:actionmessage/>
+ <s:form method="post" action="addRemoteRepository!commit" namespace="/admin" validate="true">
+ <s:textfield name="repository.id" label="Identifier" size="10" required="true"/>
<%@ include file="/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf" %>
- <ww:submit value="Add Repository"/>
- </ww:form>
+ <s:submit value="Add Repository"/>
+ </s:form>
<script type="text/javascript">
document.getElementById("addRemoteRepository_id").focus();
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Admin: Add Managed Repository</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h1>Admin: Add Managed Repository</h1>
<div id="contentArea">
- <ww:actionerror/>
- <ww:actionmessage/>
- <ww:form method="post" action="addRepository!commit" namespace="/admin" validate="true">
- <ww:textfield name="repository.id" label="Identifier" size="10" required="true"/>
+ <s:actionerror/>
+ <s:actionmessage/>
+ <s:form method="post" action="addRepository!commit" namespace="/admin" validate="true">
+ <s:textfield name="repository.id" label="Identifier" size="10" required="true"/>
<%@ include file="/WEB-INF/jsp/admin/include/repositoryForm.jspf" %>
- <ww:submit value="Add Repository"/>
- </ww:form>
+ <s:submit value="Add Repository"/>
+ </s:form>
<script type="text/javascript">
document.getElementById("addRepository_repository_id").focus();
~ 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" %>
<html>
<head>
<title>Configure Appearance</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h1>Appearance</h1>
<div style="float: right">
- <a href="<ww:url action='editAppearance' />">Edit</a>
+ <a href="<s:url action='editAppearance' />">Edit</a>
</div>
<h2>Organization Details</h2>
<p>
The logo in the top right of the screen is controlled by the following settings.
- <a href="<ww:url action='editAppearance' />">Change your appearence</a>
+ <a href="<s:url action='editAppearance' />">Change your appearence</a>
</p>
<h3>Organization Information</h3>
~ 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" %>
<html>
<head>
<title>Admin: Add Managed Repository</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
</table>
</div>
- <ww:form method="post" action="${action}" namespace="/admin" validate="true" theme="simple">
+ <s:form method="post" action="${action}" namespace="/admin" validate="true" theme="simple">
<div class="buttons">
- <ww:hidden name="repository.id" value="${repository.id}"/>
- <ww:hidden name="repository.name" value="${repository.name}"/>
- <ww:hidden name="repository.location" value="${repository.location}"/>
- <ww:hidden name="repository.indexDir" value="${repository.indexDir}"/>
- <ww:hidden name="repository.layout" value="${repository.layout}"/>
- <ww:hidden name="repository.refreshCronExpression" value="${repository.refreshCronExpression}"/>
- <ww:hidden name="repository.daysOlder" value="${repository.daysOlder}"/>
- <ww:hidden name="repository.retentionCount" value="${repository.retentionCount}"/>
- <ww:hidden name="repository.releases" value="${repository.releases}"/>
- <ww:hidden name="repository.snapshots" value="${repository.snapshots}"/>
- <ww:hidden name="repository.scanned" value="${repository.scanned}"/>
- <ww:hidden name="repository.deleteReleasedSnapshots" value="${repository.deleteReleasedSnapshots}"/>
+ <s:hidden name="repository.id" value="${repository.id}"/>
+ <s:hidden name="repository.name" value="${repository.name}"/>
+ <s:hidden name="repository.location" value="${repository.location}"/>
+ <s:hidden name="repository.indexDir" value="${repository.indexDir}"/>
+ <s:hidden name="repository.layout" value="${repository.layout}"/>
+ <s:hidden name="repository.refreshCronExpression" value="${repository.refreshCronExpression}"/>
+ <s:hidden name="repository.daysOlder" value="${repository.daysOlder}"/>
+ <s:hidden name="repository.retentionCount" value="${repository.retentionCount}"/>
+ <s:hidden name="repository.releases" value="${repository.releases}"/>
+ <s:hidden name="repository.snapshots" value="${repository.snapshots}"/>
+ <s:hidden name="repository.scanned" value="${repository.scanned}"/>
+ <s:hidden name="repository.deleteReleasedSnapshots" value="${repository.deleteReleasedSnapshots}"/>
<c:choose>
<c:when test="${action == 'addRepository'}">
- <ww:submit value="Save" method="confirmAdd"/>
+ <s:submit value="Save" method="confirmAdd"/>
</c:when>
<c:otherwise>
- <ww:submit value="Save" method="confirmUpdate"/>
+ <s:submit value="Save" method="confirmUpdate"/>
</c:otherwise>
</c:choose>
- <ww:submit value="Cancel" method="execute"/>
+ <s:submit value="Cancel" method="execute"/>
</div>
- </ww:form>
+ </s:form>
</body>
</html>
~ 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"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
<html>
<head>
<title>Administration - Database</title>
-<ww:head />
+<s:head />
</head>
<body>
<div id="contentArea">
-<ww:actionerror />
-<ww:actionmessage />
+<s:actionerror />
+<s:actionmessage />
<c:url var="iconDeleteUrl" value="/images/icons/delete.gif" />
<c:url var="iconCreateUrl" value="/images/icons/create.png" />
<h2>Database - Unprocessed Artifacts Scanning</h2>
- <ww:form method="post" action="database!updateSchedule"
+ <s:form method="post" action="database!updateSchedule"
namespace="/admin" validate="false" theme="simple">
<table>
- <ww:textfield name="cron" label="Cron" size="40" theme="xhtml" />
+ <s:textfield name="cron" label="Cron" size="40" theme="xhtml" />
<tr>
<td colspan="2">
- <ww:submit value="Update Cron" />
+ <s:submit value="Update Cron" />
</td>
</tr>
</table>
- </ww:form>
+ </s:form>
- <ww:form action="updateDatabase" theme="simple">
- <ww:submit value="Update Database Now"/>
- </ww:form>
+ <s:form action="updateDatabase" theme="simple">
+ <s:submit value="Update Database Now"/>
+ </s:form>
<h2>Database - Unprocessed Artifacts Scanning</h2>
<c:otherwise>
<%-- Display the consumers. --%>
- <ww:form method="post" action="database!updateUnprocessedConsumers"
+ <s:form method="post" action="database!updateUnprocessedConsumers"
namespace="/admin" validate="false" theme="simple">
<table class="consumers">
<tr>
</c:forEach>
<tr>
<td colspan="4">
- <ww:submit value="Update Consumers" />
+ <s:submit value="Update Consumers" />
</td>
</tr>
</table>
- </ww:form>
+ </s:form>
</c:otherwise>
</c:choose>
<c:otherwise>
<%-- Display the consumers. --%>
- <ww:form method="post" action="database!updateCleanupConsumers"
+ <s:form method="post" action="database!updateCleanupConsumers"
namespace="/admin" validate="false" theme="simple">
<table class="consumers">
<tr>
</c:forEach>
<tr>
<td colspan="4">
- <ww:submit value="Update Consumers" />
+ <s:submit value="Update Consumers" />
</td>
</tr>
</table>
- </ww:form>
+ </s:form>
</c:otherwise>
</c:choose>
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Admin: Delete Network Proxy</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h1>Admin: Delete Network Proxy</h1>
-<ww:actionerror/>
+<s:actionerror/>
<div id="contentArea">
Are you sure you want to delete network proxy <code>${proxyid}</code> ?
</p>
- <ww:form method="post" action="deleteNetworkProxy!delete" namespace="/admin" validate="true">
- <ww:hidden name="proxyid"/>
- <ww:submit value="Delete"/>
- </ww:form>
+ <s:form method="post" action="deleteNetworkProxy!delete" namespace="/admin" validate="true">
+ <s:hidden name="proxyid"/>
+ <s:submit value="Delete"/>
+ </s:form>
</div>
</body>
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Admin: Delete Proxy Connector</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h1>Admin: Delete Proxy Connector</h1>
-<ww:actionerror/>
+<s:actionerror/>
<div id="contentArea">
Are you sure you want to delete proxy connector <code>[ ${source} , ${target} ]</code> ?
</p>
- <ww:form method="post" action="deleteProxyConnector!delete" namespace="/admin" validate="true">
- <ww:hidden name="target"/>
- <ww:hidden name="source"/>
- <ww:submit value="Delete"/>
- </ww:form>
+ <s:form method="post" action="deleteProxyConnector!delete" namespace="/admin" validate="true">
+ <s:hidden name="target"/>
+ <s:hidden name="source"/>
+ <s:submit value="Delete"/>
+ </s:form>
</div>
</body>
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Admin: Delete Remote Repository</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h1>Admin: Delete Remote Repository</h1>
-<ww:actionerror/>
+<s:actionerror/>
<div id="contentArea">
</table>
</div>
- <ww:form method="post" action="deleteRemoteRepository" namespace="/admin" validate="true" theme="simple">
- <ww:hidden name="repoid"/>
+ <s:form method="post" action="deleteRemoteRepository" namespace="/admin" validate="true" theme="simple">
+ <s:hidden name="repoid"/>
<div class="buttons">
- <ww:submit value="Confirm" method="delete"/>
- <ww:submit value="Cancel" method="execute"/>
+ <s:submit value="Confirm" method="delete"/>
+ <s:submit value="Cancel" method="execute"/>
</div>
- </ww:form>
+ </s:form>
</div>
</body>
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Admin: Delete Managed Repository</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h1>Admin: Delete Managed Repository</h1>
-<ww:actionerror/>
+<s:actionerror/>
<div id="contentArea">
</table>
</div>
- <ww:form method="post" action="deleteRepository" namespace="/admin" validate="true" theme="simple">
- <ww:hidden name="repoid"/>
+ <s:form method="post" action="deleteRepository" namespace="/admin" validate="true" theme="simple">
+ <s:hidden name="repoid"/>
<div class="buttons">
- <ww:submit value="Delete Configuration Only" method="deleteEntry" />
- <ww:submit value="Delete Configuration and Contents" method="deleteContents" />
- <ww:submit value="Cancel" method="execute"/>
+ <s:submit value="Delete Configuration Only" method="deleteEntry" />
+ <s:submit value="Delete Configuration and Contents" method="deleteContents" />
+ <s:submit value="Cancel" method="execute"/>
</div>
- </ww:form>
+ </s:form>
</div>
</body>
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Admin: Delete Repository Group</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h1>Admin: Delete Repository Group</h1>
-<ww:actionerror/>
+<s:actionerror/>
<div id="contentArea">
</table>
</div>
- <ww:form method="post" action="deleteRepositoryGroup" namespace="/admin" validate="true" theme="simple">
- <ww:hidden name="repoGroupId"/>
+ <s:form method="post" action="deleteRepositoryGroup" namespace="/admin" validate="true" theme="simple">
+ <s:hidden name="repoGroupId"/>
<div class="buttons">
- <ww:submit value="Confirm" method="delete"/>
- <ww:submit value="Cancel" method="execute"/>
+ <s:submit value="Confirm" method="delete"/>
+ <s:submit value="Cancel" method="execute"/>
</div>
- </ww:form>
+ </s:form>
</div>
</body>
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Admin: Disable Proxy Connector</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h1>Admin: Disable Proxy Connector</h1>
-<ww:actionerror/>
+<s:actionerror/>
<div id="contentArea">
Are you sure you want to disable proxy connector <code>[ ${source} , ${target} ]</code> ?
</p>
- <ww:form method="post" action="disableProxyConnector!disable" namespace="/admin" validate="true">
- <ww:hidden name="target"/>
- <ww:hidden name="source"/>
- <ww:submit value="Disable"/>
- </ww:form>
+ <s:form method="post" action="disableProxyConnector!disable" namespace="/admin" validate="true">
+ <s:hidden name="target"/>
+ <s:hidden name="source"/>
+ <s:submit value="Disable"/>
+ </s:form>
</div>
</body>
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Configure Appearance</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
Enter the details of your organization below.
</p>
-<ww:set name="editOrganisationInfo" value="editOrganisationInfo"/>
-<ww:actionmessage/>
-<ww:form method="post" action="saveAppearance" namespace="/admin" validate="true" theme="xhtml">
- <ww:textfield name="organisationName" value="${organisationName}" label="Name" size="50" />
- <ww:textfield name="organisationUrl" value="${organisationUrl}" label="URL" size="50"/>
- <ww:textfield name="organisationLogo" value="${organisationLogo}" label="Logo URL" size="50" />
- <ww:submit value="Save"/>
-</ww:form>
+<s:set name="editOrganisationInfo" value="editOrganisationInfo"/>
+<s:actionmessage/>
+<s:form method="post" action="saveAppearance" namespace="/admin" validate="true" theme="xhtml">
+ <s:textfield name="organisationName" value="${organisationName}" label="Name" size="50" />
+ <s:textfield name="organisationUrl" value="${organisationUrl}" label="URL" size="50"/>
+ <s:textfield name="organisationLogo" value="${organisationLogo}" label="Logo URL" size="50" />
+ <s:submit value="Save"/>
+</s:form>
</body>
</html>
~ 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" %>
<c:choose>
<html>
<head>
<title>Admin: ${addedit} Network Proxy</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h2>${addedit} network proxy: ${networkProxyName}</h2>
- <ww:actionerror/>
- <ww:actionmessage/>
+ <s:actionerror/>
+ <s:actionmessage/>
- <ww:form method="post" action="saveNetworkProxy" namespace="/admin">
- <ww:hidden name="mode"/>
+ <s:form method="post" action="saveNetworkProxy" namespace="/admin">
+ <s:hidden name="mode"/>
<c:choose>
<c:when test="${mode == 'edit'}">
- <ww:hidden name="proxy.id"/>
+ <s:hidden name="proxy.id"/>
</c:when>
<c:otherwise>
- <ww:textfield name="proxy.id" label="Identifier" size="10" required="true"/>
+ <s:textfield name="proxy.id" label="Identifier" size="10" required="true"/>
</c:otherwise>
</c:choose>
<%@ include file="/WEB-INF/jsp/admin/include/networkProxyForm.jspf" %>
- <ww:submit value="Save Network Proxy"/>
- </ww:form>
+ <s:submit value="Save Network Proxy"/>
+ </s:form>
<script type="text/javascript">
document.getElementById("saveNetworkProxy_host").focus();
~ 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" %>
<html>
<head>
<title>Admin : Edit Proxy Connector</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<div id="contentArea">
- <ww:actionerror/>
- <ww:actionmessage/>
+ <s:actionerror/>
+ <s:actionmessage/>
- <ww:form name="saveProxyConnector" method="post" action="editProxyConnector!commit" namespace="/admin" validate="true">
+ <s:form name="saveProxyConnector" method="post" action="editProxyConnector!commit" namespace="/admin" validate="true">
<%@ include file="/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf" %>
- <ww:submit value="Save Proxy Connector"/>
- </ww:form>
+ <s:submit value="Save Proxy Connector"/>
+ </s:form>
</div>
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Admin: Edit Remote Repository</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h1>Admin: Edit Remote Repository</h1>
-<ww:actionerror/>
+<s:actionerror/>
<div id="contentArea">
- <ww:actionmessage/>
- <ww:form method="post" action="editRemoteRepository!commit" namespace="/admin" validate="false">
- <ww:hidden name="repository.id"/>
+ <s:actionmessage/>
+ <s:form method="post" action="editRemoteRepository!commit" namespace="/admin" validate="false">
+ <s:hidden name="repository.id"/>
<%@ include file="/WEB-INF/jsp/admin/include/remoteRepositoryForm.jspf" %>
- <ww:submit value="Update Repository"/>
- </ww:form>
+ <s:submit value="Update Repository"/>
+ </s:form>
<script type="text/javascript">
document.getElementById("editRemoteRepository_repository_name").focus();
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Admin: Edit Managed Repository</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h1>Admin: Edit Managed Repository</h1>
-<ww:actionerror/>
+<s:actionerror/>
<div id="contentArea">
- <ww:actionmessage/>
- <ww:form method="post" action="editRepository!commit" namespace="/admin" validate="false">
- <ww:hidden name="repository.id"/>
- <ww:label label="ID" name="repository.id" />
+ <s:actionmessage/>
+ <s:form method="post" action="editRepository!commit" namespace="/admin" validate="false">
+ <s:hidden name="repository.id"/>
+ <s:label label="ID" name="repository.id" />
<%@ include file="/WEB-INF/jsp/admin/include/repositoryForm.jspf" %>
- <ww:submit value="Update Repository"/>
- </ww:form>
+ <s:submit value="Update Repository"/>
+ </s:form>
<script type="text/javascript">
document.getElementById("editRepository_repository_name").focus();
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Admin: Enable Proxy Connector</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h1>Admin: Enable Proxy Connector</h1>
-<ww:actionerror/>
+<s:actionerror/>
<div id="contentArea">
Are you sure you want to enable proxy connector <code>[ ${source} , ${target} ]</code> ?
</p>
- <ww:form method="post" action="enableProxyConnector!enable" namespace="/admin" validate="true">
- <ww:hidden name="target"/>
- <ww:hidden name="source"/>
- <ww:submit value="Enable"/>
- </ww:form>
+ <s:form method="post" action="enableProxyConnector!enable" namespace="/admin" validate="true">
+ <s:hidden name="target"/>
+ <s:hidden name="source"/>
+ <s:submit value="Enable"/>
+ </s:form>
</div>
</body>
--%>
<p>
- <ww:if test="hasActionErrors()">
+ <s:if test="hasActionErrors()">
<b style="color: red;">Errors:</b>
- <ww:iterator value="actionErrors">
+ <s:iterator value="actionErrors">
<li style="color: red;">
- <ww:property/>
+ <s:property/>
</li>
- </ww:iterator>
- </ww:if>
+ </s:iterator>
+ </s:if>
</p>
\ No newline at end of file
~ under the License.\r
--%>\r
\r
-<%@ taglib prefix="ww" uri="/webwork" %>\r
+<%@ taglib prefix="s" uri="/struts-tags" %>\r
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>\r
<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>\r
<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>\r
<html>\r
<head>\r
<title>Administration - Legacy support</title>\r
- <ww:head/>\r
+ <s:head/>\r
</head>\r
\r
<body>\r
\r
<div id="contentArea">\r
\r
-<ww:actionerror/>\r
-<ww:actionmessage/>\r
+<s:actionerror/>\r
+<s:actionmessage/>\r
\r
<div class="admin">\r
<div class="controls">\r
<redback:ifAuthorized permission="archiva-manage-configuration">\r
- <ww:url id="addLegacyArtifactPathUrl" action="addLegacyArtifactPath"/>\r
- <ww:a href="%{addLegacyArtifactPathUrl}">\r
+ <s:url id="addLegacyArtifactPathUrl" action="addLegacyArtifactPath"/>\r
+ <s:a href="%{addLegacyArtifactPathUrl}">\r
<img src="<c:url value="/images/icons/create.png" />" alt="" width="16" height="16"/>\r
Add\r
- </ww:a>\r
+ </s:a>\r
</redback:ifAuthorized>\r
</div>\r
<h2>Path Mappings</h2>\r
<div class="controls">\r
<%-- TODO: make some icons --%>\r
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">\r
- <ww:url id="deleteLegacyArtifactPath" action="deleteLegacyArtifactPath">\r
- <ww:param name="path" value="%{'${legacyArtifactPath.path}'}"/>\r
- </ww:url>\r
- <ww:a href="%{deleteLegacyArtifactPath}">\r
+ <s:url id="deleteLegacyArtifactPath" action="deleteLegacyArtifactPath">\r
+ <s:param name="path" value="%{'${legacyArtifactPath.path}'}"/>\r
+ </s:url>\r
+ <s:a href="%{deleteLegacyArtifactPath}">\r
<img src="<c:url value="/images/icons/delete.gif" />" alt="" width="16" height="16"/>\r
Delete\r
- </ww:a>\r
+ </s:a>\r
</redback:ifAnyAuthorized>\r
</div>\r
\r
~ 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"%>
<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
<%@ taglib prefix="archiva" uri="http://archiva.apache.org"%>
<html>
<head>
<title>Administration - Network Proxies</title>
-<ww:head />
+<s:head />
</head>
<body>
<div id="contentArea">
-<ww:actionerror /> <ww:actionmessage />
+<s:actionerror /> <s:actionmessage />
<div class="admin">
<div class="controls">
<redback:ifAuthorized
permission="archiva-manage-configuration">
- <ww:url id="addNetworkProxyUrl" action="addNetworkProxy" />
- <ww:a href="%{addNetworkProxyUrl}">
+ <s:url id="addNetworkProxyUrl" action="addNetworkProxy" />
+ <s:a href="%{addNetworkProxyUrl}">
<img src="<c:url value="/images/icons/create.png" />" />
- Add Network Proxy</ww:a>
+ Add Network Proxy</s:a>
</redback:ifAuthorized></div>
<h2>Network Proxies</h2>
<div class="controls">
<redback:ifAnyAuthorized
permissions="archiva-manage-configuration">
- <ww:url id="editNetworkProxyUrl" action="editNetworkProxy">
- <ww:param name="proxyid" value="%{'${proxy.id}'}" />
- </ww:url>
- <ww:url id="deleteNetworkProxyUrl" action="deleteNetworkProxy" method="confirm">
- <ww:param name="proxyid" value="%{'${proxy.id}'}" />
- </ww:url>
- <ww:a href="%{editNetworkProxyUrl}">
+ <s:url id="editNetworkProxyUrl" action="editNetworkProxy">
+ <s:param name="proxyid" value="%{'${proxy.id}'}" />
+ </s:url>
+ <s:url id="deleteNetworkProxyUrl" action="deleteNetworkProxy" method="confirm">
+ <s:param name="proxyid" value="%{'${proxy.id}'}" />
+ </s:url>
+ <s:a href="%{editNetworkProxyUrl}">
<img src="<c:url value="/images/icons/edit.png" />" />
- Edit Network Proxy</ww:a>
- <ww:a href="%{deleteNetworkProxyUrl}">
+ Edit Network Proxy</s:a>
+ <s:a href="%{deleteNetworkProxyUrl}">
<img src="<c:url value="/images/icons/delete.gif" />" />
- Delete Network Proxy</ww:a>
+ Delete Network Proxy</s:a>
</redback:ifAnyAuthorized></div>
<table class="infoTable">
~ 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" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
<html>
<head>
<title>Administration - Proxy Connectors</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<div id="contentArea">
-<ww:actionerror/>
-<ww:actionmessage/>
+<s:actionerror/>
+<s:actionmessage/>
<div style="float:right">
<c:choose>
<c:when test="${remoteRepoExists}">
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">
- <ww:url id="addProxyConnectorUrl" action="addProxyConnector"/>
- <ww:a href="%{addProxyConnectorUrl}" cssClass="create">
+ <s:url id="addProxyConnectorUrl" action="addProxyConnector"/>
+ <s:a href="%{addProxyConnectorUrl}" cssClass="create">
<img src="<c:url value="/images/icons/create.png" />"/>
Add
- </ww:a>
+ </s:a>
</redback:ifAnyAuthorized>
</c:when>
<c:otherwise>
<div class="connector ${rowColor}">
<div class="controls">
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">
- <ww:url id="sortDownProxyConnectorUrl" action="sortDownProxyConnector">
- <ww:param name="target" value="%{'${connector.targetRepoId}'}"/>
- <ww:param name="source" value="%{'${connector.sourceRepoId}'}"/>
- </ww:url>
- <ww:url id="sortUpProxyConnectorUrl" action="sortUpProxyConnector">
- <ww:param name="target" value="%{'${connector.targetRepoId}'}"/>
- <ww:param name="source" value="%{'${connector.sourceRepoId}'}"/>
- </ww:url>
- <ww:url id="editProxyConnectorUrl" action="editProxyConnector">
- <ww:param name="target" value="%{'${connector.targetRepoId}'}"/>
- <ww:param name="source" value="%{'${connector.sourceRepoId}'}"/>
- </ww:url>
- <ww:url id="deleteProxyConnectorUrl" action="deleteProxyConnector" method="confirmDelete">
- <ww:param name="source" value="%{'${connector.sourceRepoId}'}"/>
- <ww:param name="target" value="%{'${connector.targetRepoId}'}"/>
- </ww:url>
- <ww:url id="enableProxyConnectorUrl" action="enableProxyConnector" method="confirmEnable">
- <ww:param name="source" value="%{'${connector.sourceRepoId}'}"/>
- <ww:param name="target" value="%{'${connector.targetRepoId}'}"/>
- </ww:url>
- <ww:url id="disableProxyConnectorUrl" action="disableProxyConnector" method="confirmDisable">
- <ww:param name="source" value="%{'${connector.sourceRepoId}'}"/>
- <ww:param name="target" value="%{'${connector.targetRepoId}'}"/>
- </ww:url>
+ <s:url id="sortDownProxyConnectorUrl" action="sortDownProxyConnector">
+ <s:param name="target" value="%{'${connector.targetRepoId}'}"/>
+ <s:param name="source" value="%{'${connector.sourceRepoId}'}"/>
+ </s:url>
+ <s:url id="sortUpProxyConnectorUrl" action="sortUpProxyConnector">
+ <s:param name="target" value="%{'${connector.targetRepoId}'}"/>
+ <s:param name="source" value="%{'${connector.sourceRepoId}'}"/>
+ </s:url>
+ <s:url id="editProxyConnectorUrl" action="editProxyConnector">
+ <s:param name="target" value="%{'${connector.targetRepoId}'}"/>
+ <s:param name="source" value="%{'${connector.sourceRepoId}'}"/>
+ </s:url>
+ <s:url id="deleteProxyConnectorUrl" action="deleteProxyConnector" method="confirmDelete">
+ <s:param name="source" value="%{'${connector.sourceRepoId}'}"/>
+ <s:param name="target" value="%{'${connector.targetRepoId}'}"/>
+ </s:url>
+ <s:url id="enableProxyConnectorUrl" action="enableProxyConnector" method="confirmEnable">
+ <s:param name="source" value="%{'${connector.sourceRepoId}'}"/>
+ <s:param name="target" value="%{'${connector.targetRepoId}'}"/>
+ </s:url>
+ <s:url id="disableProxyConnectorUrl" action="disableProxyConnector" method="confirmDisable">
+ <s:param name="source" value="%{'${connector.sourceRepoId}'}"/>
+ <s:param name="target" value="%{'${connector.targetRepoId}'}"/>
+ </s:url>
<c:if test="${connector.disabled}">
- <ww:a href="%{enableProxyConnectorUrl}" title="Enable Proxy Connector">
+ <s:a href="%{enableProxyConnectorUrl}" title="Enable Proxy Connector">
<img src="${iconDisable}"/>
- </ww:a>
+ </s:a>
</c:if>
<c:if test="${connector.disabled == false}">
- <ww:a href="%{disableProxyConnectorUrl}" title="Disable Proxy Connector">
+ <s:a href="%{disableProxyConnectorUrl}" title="Disable Proxy Connector">
<img src="${iconEnable}"/>
- </ww:a>
+ </s:a>
</c:if>
<c:if test="${pc.count > 1}">
- <ww:a href="%{sortUpProxyConnectorUrl}" title="Move Proxy Connector Up">
+ <s:a href="%{sortUpProxyConnectorUrl}" title="Move Proxy Connector Up">
<img src="${iconUpUrl}"/>
- </ww:a>
+ </s:a>
</c:if>
<c:if test="${pc.count < numberOfRepos}">
- <ww:a href="%{sortDownProxyConnectorUrl}" cssClass="down" title="Move Proxy Connector Down">
+ <s:a href="%{sortDownProxyConnectorUrl}" cssClass="down" title="Move Proxy Connector Down">
<img src="${iconDownUrl}"/>
- </ww:a>
+ </s:a>
</c:if>
- <ww:a href="%{editProxyConnectorUrl}" cssClass="edit" title="Edit Proxy Connector">
+ <s:a href="%{editProxyConnectorUrl}" cssClass="edit" title="Edit Proxy Connector">
<img src="${iconEditUrl}"/>
- </ww:a>
- <ww:a href="%{deleteProxyConnectorUrl}" cssClass="delete" title="Delete Proxy Connector">
+ </s:a>
+ <s:a href="%{deleteProxyConnectorUrl}" cssClass="delete" title="Delete Proxy Connector">
<img src="${iconDeleteUrl}"/>
- </ww:a>
+ </s:a>
</redback:ifAnyAuthorized>
</div>
<span class="directConnection">(Direct Connection)</span>
</c:when>
<c:otherwise>
- <ww:url id="editProxyIdUrl" action="editNetworkProxy">
- <ww:param name="proxyid" value="%{'${connector.proxyId}'}"/>
- </ww:url>
- <ww:a href="%{editProxyIdUrl}" cssClass="edit" title="Edit Network Proxy">
+ <s:url id="editProxyIdUrl" action="editNetworkProxy">
+ <s:param name="proxyid" value="%{'${connector.proxyId}'}"/>
+ </s:url>
+ <s:a href="%{editProxyIdUrl}" cssClass="edit" title="Edit Network Proxy">
${connector.proxyId}
<img src="${iconEditUrl}"/>
- </ww:a>
+ </s:a>
</c:otherwise>
</c:choose>
</td>
~ 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" %>
<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
<html>
<head>
<title>Administration - Repositories</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<div id="contentArea">
-<ww:actionerror/>
-<ww:actionmessage/>
+<s:actionerror/>
+<s:actionmessage/>
<div class="admin">
<div class="controls">
<redback:ifAuthorized permission="archiva-manage-configuration">
- <ww:url id="addRepositoryUrl" action="addRepository"/>
- <ww:a href="%{addRepositoryUrl}">
+ <s:url id="addRepositoryUrl" action="addRepository"/>
+ <s:a href="%{addRepositoryUrl}">
<img src="<c:url value="/images/icons/create.png" />" alt="" width="16" height="16"/>
Add
- </ww:a>
+ </s:a>
</redback:ifAuthorized>
</div>
<h2>Managed Repositories</h2>
<div class="controls">
<%-- TODO: make some icons --%>
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">
- <ww:url id="editRepositoryUrl" action="editRepository">
- <ww:param name="repoid" value="%{'${repository.id}'}"/>
- </ww:url>
- <ww:url id="deleteRepositoryUrl" action="confirmDeleteRepository">
- <ww:param name="repoid" value="%{'${repository.id}'}"/>
- </ww:url>
- <ww:a href="%{editRepositoryUrl}">
+ <s:url id="editRepositoryUrl" action="editRepository">
+ <s:param name="repoid" value="%{'${repository.id}'}"/>
+ </s:url>
+ <s:url id="deleteRepositoryUrl" action="confirmDeleteRepository">
+ <s:param name="repoid" value="%{'${repository.id}'}"/>
+ </s:url>
+ <s:a href="%{editRepositoryUrl}">
<img src="<c:url value="/images/icons/edit.png" />" alt="" width="16" height="16"/>
Edit
- </ww:a>
- <ww:a href="%{deleteRepositoryUrl}">
+ </s:a>
+ <s:a href="%{deleteRepositoryUrl}">
<img src="<c:url value="/images/icons/delete.gif" />" alt="" width="16" height="16"/>
Delete
- </ww:a>
+ </s:a>
</redback:ifAnyAuthorized>
<c:url var="rssFeedIconUrl" value="/images/icons/rss-feed.png"/>
<a href="/archiva/feeds/${repository.id}">
<tr>
<td>
<redback:ifAuthorized permission="archiva-run-indexer">
- <ww:form action="indexRepository" theme="simple">
- <ww:hidden name="repoid" value="%{'${repository.id}'}"/>
- <ww:submit value="Scan Repository Now"/>
- </ww:form>
+ <s:form action="indexRepository" theme="simple">
+ <s:hidden name="repoid" value="%{'${repository.id}'}"/>
+ <s:submit value="Scan Repository Now"/>
+ </s:form>
</redback:ifAuthorized>
</td>
</tr>
<div class="controls">
<redback:ifAuthorized permission="archiva-manage-configuration">
- <ww:url id="addRepositoryUrl" action="addRemoteRepository"/>
- <ww:a href="%{addRepositoryUrl}">
+ <s:url id="addRepositoryUrl" action="addRemoteRepository"/>
+ <s:a href="%{addRepositoryUrl}">
<img src="<c:url value="/images/icons/create.png" />" alt="" width="16" height="16"/>
Add
- </ww:a>
+ </s:a>
</redback:ifAuthorized>
</div>
<h2>Remote Repositories</h2>
<div class="controls">
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">
- <ww:url id="editRepositoryUrl" action="editRemoteRepository">
- <ww:param name="repoid" value="%{'${repository.id}'}"/>
- </ww:url>
- <ww:a href="%{editRepositoryUrl}">
+ <s:url id="editRepositoryUrl" action="editRemoteRepository">
+ <s:param name="repoid" value="%{'${repository.id}'}"/>
+ </s:url>
+ <s:a href="%{editRepositoryUrl}">
<img src="<c:url value="/images/icons/edit.png" />" alt="" width="16" height="16"/>
Edit
- </ww:a>
- <ww:url id="deleteRepositoryUrl" action="confirmDeleteRemoteRepository">
- <ww:param name="repoid" value="%{'${repository.id}'}"/>
- </ww:url>
- <ww:a href="%{deleteRepositoryUrl}">
+ </s:a>
+ <s:url id="deleteRepositoryUrl" action="confirmDeleteRemoteRepository">
+ <s:param name="repoid" value="%{'${repository.id}'}"/>
+ </s:url>
+ <s:a href="%{deleteRepositoryUrl}">
<img src="<c:url value="/images/icons/delete.gif" />" alt="" width="16" height="16"/>
Delete
- </ww:a>
+ </s:a>
</redback:ifAnyAuthorized>
</div>
~ 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" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
<html>
<head>
<title>Administration - Repository Groups</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<div id="contentArea">
-<ww:actionerror/>
-<ww:actionmessage/>
+<s:actionerror/>
+<s:actionmessage/>
<div align="right">
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">
- <ww:form action="addRepositoryGroup" namespace="/admin">
+ <s:form action="addRepositoryGroup" namespace="/admin">
<span class="label">Identifier<span style="color:red">*</span>:</span>
- <ww:textfield size="10" label="Identifier" theme="simple" name="repositoryGroup.id"/>
- <ww:submit value="Add Group" theme="simple" cssClass="button"/>
- </ww:form>
+ <s:textfield size="10" label="Identifier" theme="simple" name="repositoryGroup.id"/>
+ <s:submit value="Add Group" theme="simple" cssClass="button"/>
+ </s:form>
</redback:ifAnyAuthorized>
</div>
<div class="managedRepo">
<div style="float:right">
- <ww:url id="deleteRepositoryGroupUrl" action="confirmDeleteRepositoryGroup">
- <ww:param name="repoGroupId" value="%{'${repositoryGroup.key}'}" />
- </ww:url>
- <ww:a href="%{deleteRepositoryGroupUrl}" cssClass="delete">
+ <s:url id="deleteRepositoryGroupUrl" action="confirmDeleteRepositoryGroup">
+ <s:param name="repoGroupId" value="%{'${repositoryGroup.key}'}" />
+ </s:url>
+ <s:a href="%{deleteRepositoryGroupUrl}" cssClass="delete">
<img src="${iconDeleteUrl}"/>
- </ww:a>
+ </s:a>
</div>
<img src="<c:url value="/images/archiva-splat-32.gif"/>"/>
<c:if test="${!empty (groupToRepositoryMap[repositoryGroup.key])}">
<div class="repos">
- <ww:form name="form${i}" action="addRepositoryToGroup" namespace="/admin" validate="true">
- <ww:hidden name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
- <ww:select list="groupToRepositoryMap['${repositoryGroup.key}']" name="repoId" theme="simple"/>
- <ww:submit value="Add Repository" theme="simple" cssClass="button"/>
- </ww:form>
+ <s:form name="form${i}" action="addRepositoryToGroup" namespace="/admin" validate="true">
+ <s:hidden name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
+ <s:select list="groupToRepositoryMap['${repositoryGroup.key}']" name="repoId" theme="simple"/>
+ <s:submit value="Add Repository" theme="simple" cssClass="button"/>
+ </s:form>
</div>
</c:if>
<div class="connector ${rowColor}">
<div class="controls">
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">
- <ww:url id="sortDownRepositoryUrl" action="sortDownRepositoryFromGroup">
- <ww:param name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
- <ww:param name="targetRepo" value="managedRepositories['${repository}'].id"/>
- </ww:url>
- <ww:url id="sortUpRepositoryUrl" action="sortUpRepositoryFromGroup">
- <ww:param name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
- <ww:param name="targetRepo" value="managedRepositories['${repository}'].id"/>
- </ww:url>
- <ww:url id="removeRepositoryUrl" action="removeRepositoryFromGroup">
- <ww:param name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
- <ww:param name="repoId" value="managedRepositories['${repository}'].id"/>
- </ww:url>
+ <s:url id="sortDownRepositoryUrl" action="sortDownRepositoryFromGroup">
+ <s:param name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
+ <s:param name="targetRepo" value="managedRepositories['${repository}'].id"/>
+ </s:url>
+ <s:url id="sortUpRepositoryUrl" action="sortUpRepositoryFromGroup">
+ <s:param name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
+ <s:param name="targetRepo" value="managedRepositories['${repository}'].id"/>
+ </s:url>
+ <s:url id="removeRepositoryUrl" action="removeRepositoryFromGroup">
+ <s:param name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
+ <s:param name="repoId" value="managedRepositories['${repository}'].id"/>
+ </s:url>
<c:if test="${r.count > 1}">
- <ww:a href="%{sortUpRepositoryUrl}" cssClass="up" title="Move Repository Up">
+ <s:a href="%{sortUpRepositoryUrl}" cssClass="up" title="Move Repository Up">
<img src="${iconUpUrl}"/>
- </ww:a>
+ </s:a>
</c:if>
<c:if test="${r.count < numberOfRepos}">
- <ww:a href="%{sortDownRepositoryUrl}" cssClass="down" title="Move Repository Down">
+ <s:a href="%{sortDownRepositoryUrl}" cssClass="down" title="Move Repository Down">
<img src="${iconDownUrl}"/>
- </ww:a>
+ </s:a>
</c:if>
- <ww:a href="%{removeRepositoryUrl}" cssClass="delete" title="Delete Repository">
+ <s:a href="%{removeRepositoryUrl}" cssClass="delete" title="Delete Repository">
<img src="${iconDeleteUrl}"/>
- </ww:a>
+ </s:a>
</redback:ifAnyAuthorized>
</div>
~ 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"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
<html>
<head>
<title>Administration - Repository Scanning</title>
-<ww:head />
+<s:head />
</head>
<body>
<div id="contentArea">
-<ww:actionerror />
-<ww:actionmessage />
+<s:actionerror />
+<s:actionmessage />
<c:url var="iconDeleteUrl" value="/images/icons/delete.gif" />
<c:url var="iconCreateUrl" value="/images/icons/create.png" />
-<ww:url id="removeFiletypePatternUrl" action="repositoryScanning" method="removeFiletypePattern" />
-<ww:url id="addFiletypePatternUrl" action="repositoryScanning" method="addFiletypePattern" />
+<s:url id="removeFiletypePatternUrl" action="repositoryScanning" method="removeFiletypePattern" />
+<s:url id="addFiletypePatternUrl" action="repositoryScanning" method="addFiletypePattern" />
<script type="text/javascript">
<!--
<c:otherwise>
<%-- Display the filetypes. --%>
- <ww:form method="post" action="repositoryScanning"
+ <s:form method="post" action="repositoryScanning"
namespace="/admin" validate="false"
id="filetypeForm" theme="simple">
<input type="hidden" name="pattern" />
<input type="hidden" name="fileTypeId" />
- </ww:form>
+ </s:form>
- <ww:url id="addFiletypePatternUrl" action="repositoryScanning" method="addFiletypePattern" />
+ <s:url id="addFiletypePatternUrl" action="repositoryScanning" method="addFiletypePattern" />
<c:forEach items="${fileTypeIds}" var="filetypeId" varStatus="j">
<code>${escapedPattern}</code>
</td>
<td class="controls ${bgcolor}">
- <ww:a href="#" title="Remove [${escapedPattern}] Pattern from [${filetypeId}]"
+ <s:a href="#" title="Remove [${escapedPattern}] Pattern from [${filetypeId}]"
onclick="removeFiletypePattern( '${filetypeId}', '${escapedPattern}' )"
theme="simple">
<img src="${iconDeleteUrl}" />
- </ww:a>
+ </s:a>
</td>
</tr>
</c:forEach>
<tr>
<td>
- <ww:textfield size="40"
+ <s:textfield size="40"
id="newpattern_${j.index}"
theme="simple" />
</td>
<td>
- <ww:a href="#"
+ <s:a href="#"
title="Add Pattern to [${filetypeId}]"
onclick="addFiletypePattern( '${filetypeId}', 'newpattern_${j.index}' )"
theme="simple">
<img src="${iconCreateUrl}" />
- </ww:a>
+ </s:a>
</td>
</tr>
</table>
<c:otherwise>
<%-- Display the consumers. --%>
- <ww:form method="post" action="repositoryScanning!updateKnownConsumers"
+ <s:form method="post" action="repositoryScanning!updateKnownConsumers"
namespace="/admin" validate="false" theme="simple">
<table class="consumers">
<tr>
</c:forEach>
<tr>
<td colspan="4">
- <ww:submit value="Update Consumers" />
+ <s:submit value="Update Consumers" />
</td>
</tr>
</table>
- </ww:form>
+ </s:form>
</c:otherwise>
</c:choose>
<c:otherwise>
<%-- Display the consumers. --%>
- <ww:form method="post" action="repositoryScanning!updateInvalidConsumers"
+ <s:form method="post" action="repositoryScanning!updateInvalidConsumers"
namespace="/admin" validate="false" theme="simple">
<table class="consumers">
<tr>
</c:forEach>
<tr>
<td colspan="4">
- <ww:submit value="Update Consumers" />
+ <s:submit value="Update Consumers" />
</td>
</tr>
</table>
- </ww:form>
+ </s:form>
</c:otherwise>
</c:choose></div>
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Advanced Search</title>
- <ww:head/>
+ <s:head/>
</head>
-<ww:if test="%{infoMessage != null}">
+<s:if test="%{infoMessage != null}">
<p>${infoMessage}</p>
-</ww:if>
+</s:if>
<body>
<div id="searchBox">
- <ww:form method="get" action="filteredSearch" validate="true">
- <ww:textfield label="Row Count" size="50" name="rowCount"/>
- <ww:textfield label="Group Id" size="50" name="groupId"/>
- <ww:textfield label="Artifact Id" size="50" name="artifactId"/>
- <ww:textfield label="Version" size="50" name="version"/>
- <ww:textfield label="Class / Package" size="50" name="className"/>
- <ww:select name="repositoryId" label="Repository ID" list="managedRepositoryList"/>
- <ww:hidden name="completeQueryString" value="${completeQueryString}"/>
- <ww:hidden name="fromFilterSearch" value="${fromFilterSearch}"/>
- <ww:submit label="Go!"/>
- </ww:form>
+ <s:form method="get" action="filteredSearch" validate="true">
+ <s:textfield label="Row Count" size="50" name="rowCount"/>
+ <s:textfield label="Group Id" size="50" name="groupId"/>
+ <s:textfield label="Artifact Id" size="50" name="artifactId"/>
+ <s:textfield label="Version" size="50" name="version"/>
+ <s:textfield label="Class / Package" size="50" name="className"/>
+ <s:select name="repositoryId" label="Repository ID" list="managedRepositoryList"/>
+ <s:hidden name="completeQueryString" value="${completeQueryString}"/>
+ <s:hidden name="fromFilterSearch" value="${fromFilterSearch}"/>
+ <s:submit label="Go!"/>
+ </s:form>
- <ww:url id="indexUrl" action="index"/>
- <ww:a href="%{indexUrl}">
+ <s:url id="indexUrl" action="index"/>
+ <s:a href="%{indexUrl}">
Quick Search Page
- </ww:a>
+ </s:a>
</div>
<script type="text/javascript">
document.getElementById("filteredSearch_groupId").focus();
</script>
- <ww:actionerror/>
+ <s:actionerror/>
</div>
~ 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" %>
<html>
<head>
<title>Security Alert Page</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
~ 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" %>
<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
<html>
<head>
<title>Browse Repository</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<ul>
<c:forEach items="${results.groupIds}" var="groupId">
<c:set var="url">
- <ww:url action="browseGroup" namespace="/">
- <ww:param name="groupId" value="%{'${groupId}'}"/>
- </ww:url>
+ <s:url action="browseGroup" namespace="/">
+ <s:param name="groupId" value="%{'${groupId}'}"/>
+ </s:url>
</c:set>
<li><a href="${url}">${groupId}/</a></li>
</c:forEach>
<c:url var="rssFeedIconUrl" value="/images/icons/rss-feed.png"/>
<c:forEach items="${results.artifacts}" var="artifactId">
<c:set var="url">
- <ww:url action="browseArtifact" namespace="/">
- <ww:param name="groupId" value="%{'${results.selectedGroupId}'}"/>
- <ww:param name="artifactId" value="%{'${artifactId}'}"/>
- </ww:url>
+ <s:url action="browseArtifact" namespace="/">
+ <s:param name="groupId" value="%{'${results.selectedGroupId}'}"/>
+ <s:param name="artifactId" value="%{'${artifactId}'}"/>
+ </s:url>
</c:set>
<c:url var="rssUrl" value="/feeds/${groupId}/${artifactId}"/>
<li>
<ul>
<c:forEach items="${results.versions}" var="version">
<c:set var="url">
- <ww:url action="showArtifact" namespace="/">
- <ww:param name="groupId" value="%{'${results.selectedGroupId}'}"/>
- <ww:param name="artifactId" value="%{'${results.selectedArtifactId}'}"/>
- <ww:param name="version" value="%{'${version}'}"/>
- </ww:url>
+ <s:url action="showArtifact" namespace="/">
+ <s:param name="groupId" value="%{'${results.selectedGroupId}'}"/>
+ <s:param name="artifactId" value="%{'${results.selectedArtifactId}'}"/>
+ <s:param name="version" value="%{'${version}'}"/>
+ </s:url>
</c:set>
<li><a href="${url}">${version}/</a></li>
</c:forEach>
~ 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" %>
<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
<html>
<head>
<title>Browse Repository</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h2>Versions</h2>
<ul>
- <ww:set name="versions" value="versions"/>
+ <s:set name="versions" value="versions"/>
<c:forEach items="${versions}" var="version">
<c:set var="url">
- <ww:url action="showArtifact" namespace="/">
- <ww:param name="groupId" value="%{'${groupId}'}"/>
- <ww:param name="artifactId" value="%{'${artifactId}'}"/>
- <ww:param name="version" value="%{'${version}'}"/>
- </ww:url>
+ <s:url action="showArtifact" namespace="/">
+ <s:param name="groupId" value="%{'${groupId}'}"/>
+ <s:param name="artifactId" value="%{'${artifactId}'}"/>
+ <s:param name="version" value="%{'${version}'}"/>
+ </s:url>
</c:set>
<li><a href="${url}">${version}/</a></li>
</c:forEach>
~ 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" %>
<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
<html>
<head>
<title>Browse Repository</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<ul>
<c:forEach items="${results.groupIds}" var="groupId">
<c:set var="url">
- <ww:url action="browseGroup" namespace="/">
- <ww:param name="groupId" value="%{'${groupId}'}"/>
- </ww:url>
+ <s:url action="browseGroup" namespace="/">
+ <s:param name="groupId" value="%{'${groupId}'}"/>
+ </s:url>
</c:set>
<li><a href="${url}">${groupId}/</a></li>
</c:forEach>
<ul>
<c:forEach items="${results.versions}" var="version">
<c:set var="url">
- <ww:url action="browseVersion" namespace="/">
- <ww:param name="groupId" value="%{'${results.selectedGroupId}'}"/>
- <ww:param name="version" value="%{'${version}'}"/>
- </ww:url>
+ <s:url action="browseVersion" namespace="/">
+ <s:param name="groupId" value="%{'${results.selectedGroupId}'}"/>
+ <s:param name="version" value="%{'${version}'}"/>
+ </s:url>
</c:set>
<li><a href="${url}">${version}/</a></li>
</c:forEach>
<ul>
<c:forEach items="${results.artifacts}" var="artifactId">
<c:set var="url">
- <ww:url action="browseArtifact" namespace="/">
- <ww:param name="groupId" value="%{'${groupId}'}"/>
- <ww:param name="artifactId" value="%{'${artifactId}'}"/>
- </ww:url>
+ <s:url action="browseArtifact" namespace="/">
+ <s:param name="groupId" value="%{'${groupId}'}"/>
+ <s:param name="artifactId" value="%{'${artifactId}'}"/>
+ </s:url>
</c:set>
<li><a href="${url}">${artifactId}/</a></li>
</c:forEach>
~ under the License.
--%>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<c:if test="${!empty (organisationLogo)}">
- <ww:set name="organisationUrl" value="organisationUrl"/>
+ <s:set name="organisationUrl" value="organisationUrl"/>
<c:choose>
<c:when test="${!empty (organisationUrl)}">
<a href="${companyUrl}">
<%@ taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %>
<%@ taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
<html>
<head>
<title>Browse Repository</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
-<ww:set name="model" value="model"/>
+<s:set name="model" value="model"/>
<c:choose>
<c:when test="${model.packaging == 'maven-plugin'}">
<c:url var="imageUrl" value="/images/mavenplugin.gif"/>
<div id="tabs">
<span>
<c:set var="url">
- <ww:url action="showArtifact">
- <ww:param name="groupId" value="%{groupId}"/>
- <ww:param name="artifactId" value="%{artifactId}"/>
- <ww:param name="version" value="%{version}"/>
- </ww:url>
+ <s:url action="showArtifact">
+ <s:param name="groupId" value="%{groupId}"/>
+ <s:param name="artifactId" value="%{artifactId}"/>
+ <s:param name="version" value="%{version}"/>
+ </s:url>
</c:set>
<my:currentWWUrl url="${url}">Info</my:currentWWUrl>
<c:set var="url">
- <ww:url action="showArtifactDependencies">
- <ww:param name="groupId" value="%{groupId}"/>
- <ww:param name="artifactId" value="%{artifactId}"/>
- <ww:param name="version" value="%{version}"/>
- </ww:url>
+ <s:url action="showArtifactDependencies">
+ <s:param name="groupId" value="%{groupId}"/>
+ <s:param name="artifactId" value="%{artifactId}"/>
+ <s:param name="version" value="%{version}"/>
+ </s:url>
</c:set>
<my:currentWWUrl url="${url}">Dependencies</my:currentWWUrl>
<c:set var="url">
- <ww:url action="showArtifactDependencyTree">
- <ww:param name="groupId" value="%{groupId}"/>
- <ww:param name="artifactId" value="%{artifactId}"/>
- <ww:param name="version" value="%{version}"/>
- </ww:url>
+ <s:url action="showArtifactDependencyTree">
+ <s:param name="groupId" value="%{groupId}"/>
+ <s:param name="artifactId" value="%{artifactId}"/>
+ <s:param name="version" value="%{version}"/>
+ </s:url>
</c:set>
<my:currentWWUrl url="${url}">Dependency Tree</my:currentWWUrl>
<c:set var="url">
- <ww:url action="showArtifactDependees">
- <ww:param name="groupId" value="%{groupId}"/>
- <ww:param name="artifactId" value="%{artifactId}"/>
- <ww:param name="version" value="%{version}"/>
- </ww:url>
+ <s:url action="showArtifactDependees">
+ <s:param name="groupId" value="%{groupId}"/>
+ <s:param name="artifactId" value="%{artifactId}"/>
+ <s:param name="version" value="%{version}"/>
+ </s:url>
</c:set>
<my:currentWWUrl url="${url}">Used By</my:currentWWUrl>
<c:set var="url">
- <ww:url action="showArtifactMailingLists">
- <ww:param name="groupId" value="%{groupId}"/>
- <ww:param name="artifactId" value="%{artifactId}"/>
- <ww:param name="version" value="%{version}"/>
- </ww:url>
+ <s:url action="showArtifactMailingLists">
+ <s:param name="groupId" value="%{groupId}"/>
+ <s:param name="artifactId" value="%{artifactId}"/>
+ <s:param name="version" value="%{version}"/>
+ </s:url>
</c:set>
<my:currentWWUrl url="${url}">Mailing Lists</my:currentWWUrl>
<%-- POSTPONED to 1.0-alpha-2
<redback:ifAnyAuthorized permissions="archiva-access-reports">
<c:set var="url">
- <ww:url action="showArtifactReports">
- <ww:param name="groupId" value="%{groupId}"/>
- <ww:param name="artifactId" value="%{artifactId}"/>
- <ww:param name="version" value="%{version}"/>
- </ww:url>
+ <s:url action="showArtifactReports">
+ <s:param name="groupId" value="%{groupId}"/>
+ <s:param name="artifactId" value="%{artifactId}"/>
+ <s:param name="version" value="%{version}"/>
+ </s:url>
</c:set>
<my:currentWWUrl url="${url}">Reports</my:currentWWUrl>
</redback:ifAnyAuthorized>
--%>
<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
<%@ taglib prefix="redback" uri="http://plexus.codehaus.org/redback/taglib-1.0" %>
</my:currentWWUrl>
</span>
<span id="bannerRight">
- <ww:action namespace="/components" name="companyInfo" executeResult="true"/>
+ <s:action namespace="/components" name="companyInfo" executeResult="true"/>
</span>
<div class="clear">
<my:currentWWUrl action="index" namespace="/">Search</my:currentWWUrl>
</li>
- <ww:if test="${applicationScope.uiOptions.showFindArtifacts}">
+ <s:if test="%{applicationScope.uiOptions.showFindArtifacts}">
<li class="none">
<my:currentWWUrl action="findArtifact" namespace="/">Find Artifact</my:currentWWUrl>
</li>
- </ww:if>
+ </s:if>
<li class="none">
<my:currentWWUrl action="browse" namespace="/">Browse</my:currentWWUrl>
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Find Artifact</title>
- <ww:head/>
+ <s:head/>
</head>
<body onload="document.checksumSearch.file.disabled = false">
<div id="contentArea">
<div id="searchBox">
- <ww:if test="${applicationScope.uiOptions.appletFindEnabled}">
+ <s:if test="${applicationScope.uiOptions.appletFindEnabled}">
<script type="text/javascript">
function generateMd5( file, defVal )
{
<span class="errorMessage">JavaScript is disabled: using the file browser will not work.</span>
</noscript>
- <ww:form method="POST" action="checksumSearch" namespace="/"
+ <s:form method="POST" action="checksumSearch" namespace="/"
onsubmit="this.q.value = generateMd5(this.file.value,this.md5.value); this.file.disabled = true;">
- <ww:hidden name="q"/>
+ <s:hidden name="q"/>
<tr>
<td class="tdLabel"><label for="checksumSearch_file" class="label">Search for:</label></td>
<td>
<input type="file" name="file" size="50" value="" id="checksumSearch_file"/>
</td>
</tr>
- <ww:textfield label="Checksum" size="50" name="md5"/>
- <ww:submit value="Search"/>
- </ww:form>
+ <s:textfield label="Checksum" size="50" name="md5"/>
+ <s:submit value="Search"/>
+ </s:form>
<p>
This allows you to search the repository using the checksum of an artifact that you are trying to identify.
<b>not</b>
be uploaded to the server. See the progress bar below for progress of
locally creating a checksum that is uploaded to the server after you hit "Search".
- <ww:actionerror/>
+ <s:actionerror/>
</p>
<p>
width="400" height="20" name="ChecksumApplet">
</applet>
</p>
- </ww:if>
- <ww:else>
- <ww:form method="POST" action="checksumSearch" namespace="/">
- <ww:textfield label="Checksum" size="50" name="q"/>
- <ww:submit value="Search"/>
- </ww:form>
+ </s:if>
+ <s:else>
+ <s:form method="POST" action="checksumSearch" namespace="/">
+ <s:textfield label="Checksum" size="50" name="q"/>
+ <s:submit value="Search"/>
+ </s:form>
<p>
- <ww:actionerror/>
+ <s:actionerror/>
</p>
- </ww:else>
+ </s:else>
</div>
</div>
~ 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" %>
<html>
<head>
<title>Error Occurred</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<h1>Error Occurred</h1>
-<ww:actionerror/>
+<s:actionerror/>
</body>
</html>
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Quick Search</title>
- <ww:head/>
+ <s:head/>
</head>
-<ww:if test="%{infoMessage != null}">
+<s:if test="%{infoMessage != null}">
<p>${infoMessage}</p>
-</ww:if>
+</s:if>
<body>
<div id="contentArea">
<div id="searchBox">
- <ww:form method="get" action="quickSearch" validate="true">
- <ww:textfield label="Search for" size="50" name="q"/>
- <ww:hidden name="completeQueryString" value="${completeQueryString}"/>
- <ww:submit label="Go!"/>
- </ww:form>
+ <s:form method="get" action="quickSearch" validate="true">
+ <s:textfield label="Search for" size="50" name="q"/>
+ <s:hidden name="completeQueryString" value="%{completeQueryString}"/>
+ <s:submit label="Go!"/>
+ </s:form>
<script type="text/javascript">
document.getElementById("quickSearch_q").focus();
</script>
- <ww:url id="filteredSearchUrl" action="advancedSearch"/>
- <ww:a href="%{filteredSearchUrl}">
+ <s:url id="filteredSearchUrl" action="advancedSearch"/>
+ <s:a href="%{filteredSearchUrl}">
Advanced Search
- </ww:a>
+ </s:a>
<p>
- <ww:actionerror/>
+ <s:actionerror/>
</p>
</div>
~ 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" %>
<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
<html>
<head>
<title>Reports</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<div id="contentArea">
- <ww:set name="reports" value="reports"/>
+ <s:set name="reports" value="reports"/>
<c:forEach var="repository" items="${repositoriesMap}">
<strong>Repository: ${repository.key}</strong>
<p>
<archiva:groupIdLink var="${report.groupId}" includeTop="true"/>
<c:set var="url">
- <ww:url action="browseArtifact" namespace="/">
- <ww:param name="groupId" value="%{'${report.groupId}'}"/>
- <ww:param name="artifactId" value="%{'${report.artifactId}'}"/>
- </ww:url>
+ <s:url action="browseArtifact" namespace="/">
+ <s:param name="groupId" value="%{'${report.groupId}'}"/>
+ <s:param name="artifactId" value="%{'${report.artifactId}'}"/>
+ </s:url>
</c:set>
<a href="${url}">${report.artifactId}</a> /
<strong>${report.version}</strong>
</c:forEach>
</c:forEach>
- <ww:set name="page" value="page"/>
- <c:if test="${page > 1}"><a href="<ww:property value='prev' />"><<</a></c:if>
+ <s:set name="page" value="page"/>
+ <c:if test="${page > 1}"><a href="<s:property value='prev' />"><<</a></c:if>
Page: ${page}
- <ww:set name="isLastPage" value="isLastPage"/>
- <c:if test="${!isLastPage}"><a href="<ww:property value='next' />">>></a></c:if>
+ <s:set name="isLastPage" value="isLastPage"/>
+ <c:if test="${!isLastPage}"><a href="<s:property value='next' />">>></a></c:if>
</div>
</body>
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Reports</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<div id="contentArea">
- <ww:text name="The operation generated an empty report."/>
+ <s:text name="The operation generated an empty report."/>
</div>
</body>
~ under the License.
--%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Reports</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<div id="contentArea">
- <ww:form action="generateReport" namespace="/report" validate="true">
- <ww:textfield label="Row Count" name="rowCount" />
- <ww:textfield label="Group ID" name="groupId"/>
- <ww:select label="Repository ID" name="repositoryId" list="repositoryIds"/>
- <ww:submit value="Show Report"/>
- </ww:form>
+ <s:form action="generateReport" namespace="/report" validate="true">
+ <s:textfield label="Row Count" name="rowCount" />
+ <s:textfield label="Group ID" name="groupId"/>
+ <s:select label="Repository ID" name="repositoryId" list="repositoryIds"/>
+ <s:submit value="Show Report"/>
+ </s:form>
</div>
~ under the License.
--%>
-<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
<html>
<head>
<title>Search Results</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<div id="searchBox">
<c:if test="${fromFilterSearch == true}">
- <ww:form method="get" action="filteredSearch" validate="true">
- <ww:textfield label="Row Count" size="50" name="rowCount"/>
- <ww:textfield label="Group Id" size="50" name="groupId"/>
- <ww:textfield label="Artifact Id" size="50" name="artifactId"/>
- <ww:textfield label="Version" size="50" name="version"/>
- <ww:textfield label="Class / Package" size="50" name="className"/>
- <ww:select name="repositoryId" label="Repository ID" list="managedRepositoryList"/>
- <ww:hidden name="completeQueryString" value="${completeQueryString}"/>
- <ww:hidden name="fromFilterSearch" value="${fromFilterSearch}"/>
- <ww:submit label="Go!"/>
- </ww:form>
+ <s:form method="get" action="filteredSearch" validate="true">
+ <s:textfield label="Row Count" size="50" name="rowCount"/>
+ <s:textfield label="Group Id" size="50" name="groupId"/>
+ <s:textfield label="Artifact Id" size="50" name="artifactId"/>
+ <s:textfield label="Version" size="50" name="version"/>
+ <s:textfield label="Class / Package" size="50" name="className"/>
+ <s:select name="repositoryId" label="Repository ID" list="managedRepositoryList"/>
+ <s:hidden name="completeQueryString" value="${completeQueryString}"/>
+ <s:hidden name="fromFilterSearch" value="${fromFilterSearch}"/>
+ <s:submit label="Go!"/>
+ </s:form>
- <ww:url id="indexUrl" action="index"/>
- <ww:a href="%{indexUrl}">
+ <s:url id="indexUrl" action="index"/>
+ <s:a href="%{indexUrl}">
Quick Search Page
- </ww:a>
+ </s:a>
<script type="text/javascript">
document.getElementById("filteredSearch_groupId").focus();
</script>
</c:if>
<c:if test="${fromFilterSearch == false}">
- <ww:form method="get" action="quickSearch" validate="true">
- <ww:textfield label="Search for" size="50" name="q"/>
- <ww:checkbox label="Search within results" name="searchResultsOnly"/>
- <ww:hidden name="completeQueryString" value="${completeQueryString}"/>
- <ww:submit label="Go!"/>
- </ww:form>
+ <s:form method="get" action="quickSearch" validate="true">
+ <s:textfield label="Search for" size="50" name="q"/>
+ <s:checkbox label="Search within results" name="searchResultsOnly"/>
+ <s:hidden name="completeQueryString" value="${completeQueryString}"/>
+ <s:submit label="Go!"/>
+ </s:form>
<script type="text/javascript">
document.getElementById("quickSearch_q").focus();
</script>
</c:if>
<p>
- <ww:actionerror/>
+ <s:actionerror/>
</p>
</div>
<%-- Prev & Next icons --%>
<c:if test="${fromFilterSearch == false}">
<c:set var="prevPageUrl">
- <ww:url action="quickSearch" namespace="/">
- <ww:param name="q" value="%{'${q}'}"/>
- <ww:param name="currentPage" value="%{'${currentPage - 1}'}"/>
- </ww:url>
+ <s:url action="quickSearch" namespace="/">
+ <s:param name="q" value="%{'${q}'}"/>
+ <s:param name="currentPage" value="%{'${currentPage - 1}'}"/>
+ </s:url>
</c:set>
<c:set var="nextPageUrl">
- <ww:url action="quickSearch" namespace="/">
- <ww:param name="q" value="%{'${q}'}"/>
- <ww:param name="currentPage" value="%{'${currentPage + 1}'}"/>
- </ww:url>
+ <s:url action="quickSearch" namespace="/">
+ <s:param name="q" value="%{'${q}'}"/>
+ <s:param name="currentPage" value="%{'${currentPage + 1}'}"/>
+ </s:url>
</c:set>
</c:if>
<c:if test="${fromFilterSearch == true}">
<c:set var="prevPageUrl">
- <ww:url action="filteredSearch" namespace="/">
- <%-- <ww:param name="q" value="%{'${q}'}"/> --%>
- <ww:param name="rowCount" value="%{'${rowCount}'}"/>
- <ww:param name="groupId" value="%{'${groupId}'}"/>
- <ww:param name="artifactId" value="%{'${artifactId}'}"/>
- <ww:param name="version" value="%{'${version}'}"/>
- <ww:param name="className" value="%{'${className}'}"/>
- <ww:param name="repositoryId" value="%{'${repositoryId}'}"/>
- <ww:param name="filterSearch" value="%{'${filterSearch}'}"/>
- <ww:param name="fromResultsPage" value="true"/>
- <ww:param name="currentPage" value="%{'${currentPage - 1}'}"/>
- <ww:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
- <ww:param name="completeQueryString" value="%{'${completeQueryString}'}"/>
- </ww:url>
+ <s:url action="filteredSearch" namespace="/">
+ <%-- <s:param name="q" value="%{'${q}'}"/> --%>
+ <s:param name="rowCount" value="%{'${rowCount}'}"/>
+ <s:param name="groupId" value="%{'${groupId}'}"/>
+ <s:param name="artifactId" value="%{'${artifactId}'}"/>
+ <s:param name="version" value="%{'${version}'}"/>
+ <s:param name="className" value="%{'${className}'}"/>
+ <s:param name="repositoryId" value="%{'${repositoryId}'}"/>
+ <s:param name="filterSearch" value="%{'${filterSearch}'}"/>
+ <s:param name="fromResultsPage" value="true"/>
+ <s:param name="currentPage" value="%{'${currentPage - 1}'}"/>
+ <s:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
+ <s:param name="completeQueryString" value="%{'${completeQueryString}'}"/>
+ </s:url>
</c:set>
<c:set var="nextPageUrl">
- <ww:url action="filteredSearch" namespace="/">
-<%-- <ww:param name="q" value="%{'${q}'}"/> --%>
- <ww:param name="rowCount" value="%{'${rowCount}'}"/>
- <ww:param name="groupId" value="%{'${groupId}'}"/>
- <ww:param name="artifactId" value="%{'${artifactId}'}"/>
- <ww:param name="version" value="%{'${version}'}"/>
- <ww:param name="className" value="%{'${className}'}"/>
- <ww:param name="repositoryId" value="%{'${repositoryId}'}"/>
- <ww:param name="filterSearch" value="%{'${filterSearch}'}"/>
- <ww:param name="fromResultsPage" value="true"/>
- <ww:param name="currentPage" value="%{'${currentPage + 1}'}"/>
- <ww:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
- <ww:param name="completeQueryString" value="%{'${completeQueryString}'}"/>
- </ww:url>
+ <s:url action="filteredSearch" namespace="/">
+<%-- <s:param name="q" value="%{'${q}'}"/> --%>
+ <s:param name="rowCount" value="%{'${rowCount}'}"/>
+ <s:param name="groupId" value="%{'${groupId}'}"/>
+ <s:param name="artifactId" value="%{'${artifactId}'}"/>
+ <s:param name="version" value="%{'${version}'}"/>
+ <s:param name="className" value="%{'${className}'}"/>
+ <s:param name="repositoryId" value="%{'${repositoryId}'}"/>
+ <s:param name="filterSearch" value="%{'${filterSearch}'}"/>
+ <s:param name="fromResultsPage" value="true"/>
+ <s:param name="currentPage" value="%{'${currentPage + 1}'}"/>
+ <s:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
+ <s:param name="completeQueryString" value="%{'${completeQueryString}'}"/>
+ </s:url>
</c:set>
</c:if>
<c:choose>
<c:when test="${i != currentPage}">
<c:set var="specificPageUrl">
- <ww:url action="quickSearch" namespace="/">
- <ww:param name="q" value="%{'${q}'}"/>
- <ww:param name="currentPage" value="%{'${i}'}"/>
- <ww:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
- <ww:param name="completeQueryString" value="%{'${completeQueryString}'}"/>
- </ww:url>
+ <s:url action="quickSearch" namespace="/">
+ <s:param name="q" value="%{'${q}'}"/>
+ <s:param name="currentPage" value="%{'${i}'}"/>
+ <s:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
+ <s:param name="completeQueryString" value="%{'${completeQueryString}'}"/>
+ </s:url>
</c:set>
<a href="${specificPageUrl}">${i + 1}</a>
</c:when>
<c:choose>
<c:when test="${i != currentPage}">
<c:set var="specificPageUrl">
- <ww:url action="filteredSearch" namespace="/">
-<%-- <ww:param name="q" value="%{'${q}'}"/> --%>
- <ww:param name="rowCount" value="%{'${rowCount}'}"/>
- <ww:param name="groupId" value="%{'${groupId}'}"/>
- <ww:param name="artifactId" value="%{'${artifactId}'}"/>
- <ww:param name="version" value="%{'${version}'}"/>
- <ww:param name="className" value="%{'${className}'}"/>
- <ww:param name="repositoryId" value="%{'${repositoryId}'}"/>
- <ww:param name="filterSearch" value="%{'${filterSearch}'}"/>
- <ww:param name="fromResultsPage" value="true"/>
- <ww:param name="currentPage" value="%{'${i}'}"/>
- <ww:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
- <ww:param name="completeQueryString" value="%{'${completeQueryString}'}"/>
- </ww:url>
+ <s:url action="filteredSearch" namespace="/">
+<%-- <s:param name="q" value="%{'${q}'}"/> --%>
+ <s:param name="rowCount" value="%{'${rowCount}'}"/>
+ <s:param name="groupId" value="%{'${groupId}'}"/>
+ <s:param name="artifactId" value="%{'${artifactId}'}"/>
+ <s:param name="version" value="%{'${version}'}"/>
+ <s:param name="className" value="%{'${className}'}"/>
+ <s:param name="repositoryId" value="%{'${repositoryId}'}"/>
+ <s:param name="filterSearch" value="%{'${filterSearch}'}"/>
+ <s:param name="fromResultsPage" value="true"/>
+ <s:param name="currentPage" value="%{'${i}'}"/>
+ <s:param name="searchResultsOnly" value="%{'${searchResultsOnly}'}"/>
+ <s:param name="completeQueryString" value="%{'${completeQueryString}'}"/>
+ </s:url>
</c:set>
<a href="${specificPageUrl}">${i + 1}</a>
</c:when>
~ 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" %>
<%@ taglib prefix="my" tagdir="/WEB-INF/tags" %>
<%@ taglib prefix="archiva" uri="http://archiva.apache.org" %>
<html>
<head>
<title>Browse Repository</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
-<ww:set name="model" value="model"/>
+<s:set name="model" value="model"/>
<c:choose>
<c:when test="${model.packaging == 'maven-plugin'}">
<c:url var="imageUrl" value="/images/mavenplugin.gif"/>
<div id="tabs">
<span>
<c:set var="url">
- <ww:url action="showArtifact">
- <ww:param name="groupId" value="%{groupId}"/>
- <ww:param name="artifactId" value="%{artifactId}"/>
- <ww:param name="version" value="%{version}"/>
- </ww:url>
+ <s:url action="showArtifact">
+ <s:param name="groupId" value="%{groupId}"/>
+ <s:param name="artifactId" value="%{artifactId}"/>
+ <s:param name="version" value="%{version}"/>
+ </s:url>
</c:set>
<my:currentWWUrl url="${url}">Info</my:currentWWUrl>
<c:set var="url">
- <ww:url action="showArtifactDependencies">
- <ww:param name="groupId" value="%{groupId}"/>
- <ww:param name="artifactId" value="%{artifactId}"/>
- <ww:param name="version" value="%{version}"/>
- </ww:url>
+ <s:url action="showArtifactDependencies">
+ <s:param name="groupId" value="%{groupId}"/>
+ <s:param name="artifactId" value="%{artifactId}"/>
+ <s:param name="version" value="%{version}"/>
+ </s:url>
</c:set>
<my:currentWWUrl url="${url}">Dependencies</my:currentWWUrl>
<c:set var="url">
- <ww:url action="showArtifactDependencyTree">
- <ww:param name="groupId" value="%{groupId}"/>
- <ww:param name="artifactId" value="%{artifactId}"/>
- <ww:param name="version" value="%{version}"/>
- </ww:url>
+ <s:url action="showArtifactDependencyTree">
+ <s:param name="groupId" value="%{groupId}"/>
+ <s:param name="artifactId" value="%{artifactId}"/>
+ <s:param name="version" value="%{version}"/>
+ </s:url>
</c:set>
<my:currentWWUrl url="${url}">Dependency Tree</my:currentWWUrl>
<c:set var="url">
- <ww:url action="showArtifactDependees">
- <ww:param name="groupId" value="%{groupId}"/>
- <ww:param name="artifactId" value="%{artifactId}"/>
- <ww:param name="version" value="%{version}"/>
- </ww:url>
+ <s:url action="showArtifactDependees">
+ <s:param name="groupId" value="%{groupId}"/>
+ <s:param name="artifactId" value="%{artifactId}"/>
+ <s:param name="version" value="%{version}"/>
+ </s:url>
</c:set>
<my:currentWWUrl url="${url}">Used By</my:currentWWUrl>
<c:set var="url">
- <ww:url action="showArtifactMailingLists">
- <ww:param name="groupId" value="%{groupId}"/>
- <ww:param name="artifactId" value="%{artifactId}"/>
- <ww:param name="version" value="%{version}"/>
- </ww:url>
+ <s:url action="showArtifactMailingLists">
+ <s:param name="groupId" value="%{groupId}"/>
+ <s:param name="artifactId" value="%{artifactId}"/>
+ <s:param name="version" value="%{version}"/>
+ </s:url>
</c:set>
<my:currentWWUrl url="${url}">Mailing Lists</my:currentWWUrl>
<%-- POSTPONED to 1.0-alpha-2
<redback:ifAnyAuthorized permissions="archiva-access-reports">
<c:set var="url">
- <ww:url action="showArtifactReports">
- <ww:param name="groupId" value="%{groupId}"/>
- <ww:param name="artifactId" value="%{artifactId}"/>
- <ww:param name="version" value="%{version}"/>
- </ww:url>
+ <s:url action="showArtifactReports">
+ <s:param name="groupId" value="%{groupId}"/>
+ <s:param name="artifactId" value="%{artifactId}"/>
+ <s:param name="version" value="%{version}"/>
+ </s:url>
</c:set>
<my:currentWWUrl url="${url}">Reports</my:currentWWUrl>
</redback:ifAnyAuthorized>
<%-- http://www.opensymphony.com/webwork/wikidocs/File%20Upload%20Interceptor.html --%>
-<%@ taglib prefix="ww" uri="/webwork" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html>
<head>
<title>Upload Artifact</title>
- <ww:head/>
+ <s:head/>
</head>
<body>
<div id="contentArea">
- <ww:actionerror/>
- <ww:actionmessage/>
+ <s:actionerror/>
+ <s:actionmessage/>
- <ww:form action="upload!doUpload" method="post" enctype="multipart/form-data" validate="true">
+ <s:form action="upload!doUpload" method="post" enctype="multipart/form-data" validate="true">
<%@ include file="/WEB-INF/jsp/include/uploadForm.jspf" %>
- <ww:submit/>
- </ww:form>
+ <s:submit/>
+ </s:form>
</div>
</body>
~ under the License.\r
--%>\r
\r
-<%@ taglib uri="/webwork" prefix="ww" %>\r
+<%@ taglib uri="/struts-tags" prefix="s" %>\r
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>\r
<%@ attribute name="action" %>\r
<%@ attribute name="namespace" %>\r
<%@ attribute name="url" %>\r
\r
<c:set var="currentUrl">\r
- <ww:url/>\r
+ <s:url/>\r
</c:set>\r
<c:if test="${!empty (action) && !empty (namespace)}">\r
<c:set var="url">\r
- <ww:url action="${action}" namespace="${namespace}"/>\r
+ <s:url action="%{action}" namespace="%{namespace}"/>\r
</c:set>\r
</c:if>\r
<c:set var="text">\r
<filter>
<filter-name>webwork-cleanup</filter-name>
- <filter-class>com.opensymphony.webwork.dispatcher.ActionContextCleanUp</filter-class>
+ <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class>
</filter>
<filter>
<filter>
<filter-name>webwork</filter-name>
- <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+ <filter-class>org.apache.struts2.dispatcher.FilterDispatcher</filter-class>
</filter>
<!-- this must be before the sitemesh filter -->
-<@ww.iterator value="parameters.list">
+<@s.iterator value="parameters.list">
<#if parameters.listKey?exists>
<#assign itemKey = stack.findValue(parameters.listKey)/>
<#else>
<label for="${parameters.id?html}${itemKey?html}"><#rt/>
${itemValue}<#t/>
</label><br/>
-</@ww.iterator>
+</@s.iterator>
-<@ww.iterator value="parameters.list">
+<@s.iterator value="parameters.list">
<#if parameters.listKey?exists>
<#assign itemKey = stack.findValue(parameters.listKey)/>
<#else>
<label for="${parameters.id?html}${itemKey?html}"><#rt/>
${itemValue}<#t/>
</label><br/>
-</@ww.iterator>
+</@s.iterator>
<input type="hidden"<#rt/>
name="${parameters.name?default("")?html}"<#rt/>
<#if parameters.nameValue?exists>
- value="<@ww.property value="parameters.nameValue"/>"<#rt/>
+ value="<@s.property value="parameters.nameValue"/>"<#rt/>
</#if>
<#if parameters.id?exists>
id="${parameters.id?html}"<#rt/>
* under the License.
*/
-import com.opensymphony.xwork.ActionSupport;
+import com.opensymphony.xwork2.ActionSupport;
import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
* under the License.
*/
-import com.opensymphony.xwork.Action;
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
-import org.apache.maven.archiva.configuration.Configuration;
+import com.opensymphony.xwork2.Action;
import org.apache.maven.archiva.configuration.OrganisationInformation;
-import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.easymock.MockControl;
/**
* @author <a href="mailto:james@atlassian.com">James William Dumay</a>
* under the License.
*/
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.OrganisationInformation;
import org.apache.maven.archiva.configuration.Configuration;
* under the License.
*/
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
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.policies.ReleasesPolicy;
import org.apache.maven.archiva.policies.SnapshotsPolicy;
import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
import org.codehaus.plexus.registry.RegistryException;
import org.easymock.MockControl;
* under the License.
*/
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
import org.codehaus.plexus.registry.RegistryException;
import org.easymock.MockControl;
package org.apache.maven.archiva.web.action.admin.connectors.proxy;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
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.ProxyConnectorConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
import org.codehaus.plexus.registry.RegistryException;
import org.easymock.MockControl;
* under the License.
*/
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
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.policies.ReleasesPolicy;
import org.apache.maven.archiva.policies.SnapshotsPolicy;
import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
import org.codehaus.plexus.registry.RegistryException;
import org.easymock.MockControl;
package org.apache.maven.archiva.web.action.admin.connectors.proxy;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
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.ProxyConnectorConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
import org.codehaus.plexus.registry.RegistryException;
import org.easymock.MockControl;
* under the License.
*/
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
import org.codehaus.plexus.registry.RegistryException;
import org.easymock.MockControl;
* under the License.
*/
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.configuration.functors.ProxyConnectorConfigurationOrderComparator;
import org.apache.maven.archiva.web.action.AbstractWebworkTestCase;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
import org.codehaus.plexus.registry.RegistryException;
import org.easymock.MockControl;
* under the License.
*/
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.codehaus.plexus.redback.role.RoleManager;
-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.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
return AbstractManagedRepositoriesAction.class.getName().replace( '.', '/' ) + "Test.xml";
}
+ @Override
protected void setUp()
throws Exception
{
* under the License.
*/
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
-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.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
* under the License.
*/
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
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.security.ArchivaRoleConstants;
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException;
-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;
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
* under the License.
*/
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
import java.util.Collections;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration;
-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.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
* under the License.
*/
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.codehaus.plexus.redback.role.RoleManager;
-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.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
* under the License.
*/
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
-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.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
import com.meterware.servletunit.ServletRunner;
import com.meterware.servletunit.ServletUnitClient;
-import com.opensymphony.xwork.Action;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
-import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
+import com.opensymphony.xwork2.Action;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
+import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
import org.codehaus.plexus.spring.PlexusInSpringTestCase;
/**
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration;
-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.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
import com.meterware.servletunit.ServletRunner;
import com.meterware.servletunit.ServletUnitClient;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* RepositoryGroupsActionTest
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration;
-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.spring.PlexusInSpringTestCase;
import org.easymock.MockControl;
-import com.opensymphony.xwork.Action;
+import com.opensymphony.xwork2.Action;
/**
* SortRepositoriesActionTest
</component>
<component>
- <role>com.opensymphony.xwork.Action</role>
+ <role>com.opensymphony.xwork2.Action</role>
<role-hint>addManagedRepositoryAction</role-hint>
<implementation>org.apache.maven.archiva.web.action.admin.repositories.AddManagedRepositoryAction</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
</component>
<component>
- <role>com.opensymphony.xwork.Action</role>
+ <role>com.opensymphony.xwork2.Action</role>
<role-hint>deleteManagedRepositoryAction</role-hint>
<implementation>org.apache.maven.archiva.web.action.admin.repositories.DeleteManagedRepositoryAction</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
</component>
<component>
- <role>com.opensymphony.xwork.Action</role>
+ <role>com.opensymphony.xwork2.Action</role>
<role-hint>editManagedRepositoryAction</role-hint>
<implementation>org.apache.maven.archiva.web.action.admin.repositories.EditManagedRepositoryAction</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
<implementation>org.apache.maven.archiva.web.action.admin.repositories.RoleManagerStub</implementation>
</component>
<component>
- <role>com.opensymphony.xwork.Action</role>
+ <role>com.opensymphony.xwork2.Action</role>
<role-hint>deleteManagedRepositoryAction</role-hint>
<implementation>org.apache.maven.archiva.web.action.admin.repositories.DeleteManagedRepositoryAction</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
<lifecycle-handler>basic</lifecycle-handler>
</component>
<component>
- <role>com.opensymphony.xwork.Action</role>
+ <role>com.opensymphony.xwork2.Action</role>
<role-hint>repositoriesAction</role-hint>
<implementation>org.apache.maven.archiva.web.action.admin.repositories.RepositoriesAction</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
</dependency>
<dependency>
<groupId>org.codehaus.redback</groupId>
- <artifactId>redback-xwork-integration</artifactId>
+ <artifactId>redback-struts2-integration</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.redback</groupId>
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
-import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork2.ActionContext;
/**
* @author <a href="mailto:james@atlassian.com">James William Dumay</a> Portions from the Apache Jackrabbit Project
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystemConstants;
-import org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator;
+import org.codehaus.plexus.redback.struts2.filter.authentication.HttpAuthenticator;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.opensymphony.xwork.ActionContext;
+import com.opensymphony.xwork2.ActionContext;
/**
* @author <a href="mailto:james@atlassian.com">James William Dumay</a>
import org.codehaus.plexus.redback.authorization.UnauthorizedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.policy.AccountLockedException;
-import org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator;
+import org.codehaus.plexus.redback.struts2.filter.authentication.HttpAuthenticator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.security.ArchivaXworkUser;
import org.apache.maven.archiva.security.ServletAuthenticator;
-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;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.users.User;
-import org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator;
+import org.codehaus.plexus.redback.struts2.filter.authentication.HttpAuthenticator;
public class ArchivaDavSessionProviderTest extends TestCase
{
<field-name>mimeTypes</field-name>
</requirement>
<requirement>
- <role>org.codehaus.plexus.redback.xwork.filter.authentication.HttpAuthenticator</role>
+ <role>org.codehaus.plexus.redback.struts2.filter.authentication.HttpAuthenticator</role>
<role-hint>basic</role-hint>
<field-name>httpAuth</field-name>
</requirement>
<exclude>ant:ant-optional</exclude>
<!-- exclude>org.apache.maven.wagon:wagon-http-lightweight</exclude -->
<exclude>xom:xom</exclude>
+ <exclude>org.codehaus.plexus:plexus-xwork-integration</exclude>
</excludes>
</bannedDependencies>
</rules>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-spring</artifactId>
- <version>1.0</version>
+ <version>1.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
</exclusion>
</exclusions>
</dependency>
+
+ <!-- redback -->
+
<dependency>
<groupId>org.codehaus.redback</groupId>
<artifactId>redback-rbac-memory</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<scope>test</scope>
<exclusions>
<exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<version>${redback.version}</version>
<exclusions>
<exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<version>${redback.version}</version>
<exclusions>
<exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<version>${redback.version}</version>
<exclusions>
<exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<version>${redback.version}</version>
<exclusions>
<exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.redback</groupId>
- <artifactId>redback-taglib</artifactId>
+ <artifactId>redback-struts2-taglib</artifactId>
<version>${redback.version}</version>
<exclusions>
<exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.redback</groupId>
- <artifactId>redback-xwork-content</artifactId>
+ <artifactId>redback-struts2-content</artifactId>
<version>${redback.version}</version>
<type>war</type>
<exclusions>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.redback</groupId>
- <artifactId>redback-xwork-integration</artifactId>
+ <artifactId>redback-struts2-integration</artifactId>
<version>${redback.version}</version>
<exclusions>
<exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
+ </exclusion>
</exclusions>
</dependency>
+
+ <!-- redback -->
+
<dependency>
<groupId>org.codehaus.plexus.registry</groupId>
<artifactId>plexus-registry-api</artifactId>
<version>${wagon.version}</version>
</dependency>
<dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- <version>2.2.6</version>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>2.0.11.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-spring-plugin</artifactId>
+ <version>2.0.11.2</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>2.5.1</version>
+ <version>2.5.5</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>2.5.1</version>
+ <version>2.5.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>2.5.5</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-xwork-integration</artifactId>
- <version>1.0-alpha-7</version>
- <exclusions>
- <exclusion>
- <groupId>velocity</groupId>
- <artifactId>velocity-dep</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache</artifactId>
<properties>
<maven.version>2.0.8</maven.version>
<wagon.version>1.0-beta-4</wagon.version>
- <redback.version>1.1.1</redback.version>
+ <redback.version>1.2-SNAPSHOT</redback.version>
<jetty.version>6.1.6</jetty.version>
</properties>
<profiles>
projects / archiva.git / commitdiff