1
0
mirror of https://github.com/apache/archiva.git synced 2025-02-22 10:17:25 +00:00

Behold! Struts2!

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches@700721 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James William Dumay 2008-10-01 09:11:06 +00:00
parent d852e0b87d
commit a3651081a3
133 changed files with 1006 additions and 929 deletions
archiva-struts2/archiva-modules/archiva-web/archiva-webapp
pom.xml
src/main
java/org/apache/maven/archiva/web
resources
webapp

@ -120,8 +120,8 @@
<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>
@ -146,23 +146,28 @@
<!-- 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>
@ -310,12 +315,16 @@
</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>
@ -399,7 +408,7 @@
<configuration>
<roleDefaults>
<roleDefault>
<role>com.opensymphony.xwork.Action</role>
<role>com.opensymphony.xwork2.Action</role>
<instantiation-strategy>per-lookup</instantiation-strategy>
</roleDefault>
</roleDefaults>

@ -22,14 +22,13 @@
import java.util.Collections;
import java.util.List;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork2.ActionContext;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.database.browsing.BrowsingResults;
import org.apache.maven.archiva.database.browsing.RepositoryBrowsing;
import org.apache.maven.archiva.security.*;
import org.apache.maven.archiva.security.ArchivaXworkUser;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
/**
* Browse the repository.
@ -37,7 +36,7 @@
* @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

@ -0,0 +1,54 @@
package org.apache.maven.archiva.web.action;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import com.opensymphony.xwork2.ActionSupport;
import java.util.Map;
import org.apache.struts2.interceptor.SessionAware;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
/**
* LogEnabled and SessionAware ActionSupport
*/
public abstract class PlexusActionSupport
extends ActionSupport
implements LogEnabled, SessionAware
{
protected Map session;
private Logger logger;
public void setSession( Map map )
{
//noinspection AssignmentToCollectionOrArrayFieldFromParameter
this.session = map;
}
public void enableLogging( Logger logger )
{
this.logger = logger;
}
protected Logger getLogger()
{
return logger;
}
}

@ -42,15 +42,14 @@
import org.apache.maven.archiva.security.ArchivaXworkUser;
import org.apache.maven.archiva.security.PrincipalNotFoundException;
import org.apache.maven.archiva.security.UserRepositories;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.Preparable;
/**
* Search all indexed fields by the given criteria.
*
* @plexus.component role="com.opensymphony.xwork.Action" role-hint="searchAction"
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="searchAction"
*/
public class SearchAction
extends PlexusActionSupport
@ -307,8 +306,7 @@ public String findArtifact()
return RESULTS;
}
@Override
public String doInput()
{
return INPUT;

@ -32,17 +32,16 @@
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

@ -61,12 +61,11 @@
import org.apache.maven.archiva.security.PrincipalNotFoundException;
import org.apache.maven.archiva.security.UserRepositories;
import org.apache.maven.archiva.security.ArchivaXworkUser;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork.Validateable;
import org.apache.struts2.ServletActionContext;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.Preparable;
import com.opensymphony.xwork2.Validateable;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
@ -76,7 +75,7 @@
*
* @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

@ -27,17 +27,17 @@
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

@ -22,9 +22,9 @@
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

@ -19,22 +19,22 @@
* 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

@ -22,7 +22,7 @@
/**
* 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

@ -28,12 +28,12 @@
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;

@ -19,7 +19,7 @@
* 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;

@ -28,7 +28,7 @@
* @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

@ -27,7 +27,7 @@
* @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

@ -24,7 +24,7 @@
/**
* 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
{

@ -28,7 +28,7 @@
* @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

@ -24,7 +24,7 @@
/**
* 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
{

@ -19,7 +19,7 @@
* under the License.
*/
import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork2.Preparable;
import org.apache.maven.archiva.configuration.AbstractRepositoryConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
@ -35,7 +35,7 @@
* @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

@ -30,7 +30,7 @@
* @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

@ -19,7 +19,7 @@
* under the License.
*/
import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork2.Preparable;
import org.apache.commons.collections.CollectionUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
@ -28,12 +28,12 @@
import org.apache.maven.archiva.database.updater.DatabaseConsumers;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.web.action.admin.scanning.AdminRepositoryConsumerComparator;
import org.apache.maven.archiva.web.action.PlexusActionSupport;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
import org.codehaus.plexus.redback.struts2.interceptor.SecureAction;
import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import java.util.Collections;
import java.util.List;
@ -43,7 +43,7 @@
*
* @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

@ -26,16 +26,15 @@
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

@ -25,15 +25,15 @@
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.IndeterminateConfigurationException;
import org.apache.maven.archiva.configuration.LegacyArtifactPath;
import org.apache.maven.archiva.web.action.PlexusActionSupport;
import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
/**
* Delete a LegacyArtifactPath to archiva configuration
*
*
* @since 1.1
* @plexus.component role="com.opensymphony.xwork.Action" role-hint="deleteLegacyArtifactPathAction"
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="deleteLegacyArtifactPathAction"
*/
public class DeleteLegacyArtifactPathAction
extends PlexusActionSupport

@ -30,19 +30,19 @@
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.web.util.ContextUtils;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import org.codehaus.plexus.redback.struts2.interceptor.SecureAction;
import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
import com.opensymphony.webwork.interceptor.ServletRequestAware;
import com.opensymphony.xwork.Preparable;
import org.apache.struts2.interceptor.ServletRequestAware;
import com.opensymphony.xwork2.Preparable;
import org.apache.maven.archiva.web.action.PlexusActionSupport;
/**
* Shows the LegacyArtifactPath Tab for the administrator.
*
* @since 1.1
* @plexus.component role="com.opensymphony.xwork.Action" role-hint="legacyArtifactPathAction"
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="legacyArtifactPathAction"
*/
public class LegacyArtifactPathAction
extends PlexusActionSupport

@ -19,7 +19,7 @@
* under the License.
*/
import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork2.Preparable;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.functors.NotPredicate;
import org.apache.commons.lang.StringUtils;
@ -29,19 +29,19 @@
import org.apache.maven.archiva.configuration.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

@ -19,15 +19,15 @@
* under the License.
*/
import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork2.Preparable;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.web.action.PlexusActionSupport;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import org.codehaus.plexus.redback.struts2.interceptor.SecureAction;
import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
import java.util.List;
@ -37,7 +37,7 @@
* @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

@ -25,14 +25,14 @@
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.

@ -19,8 +19,8 @@
* under the License.
*/
import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork.Validateable;
import com.opensymphony.xwork2.Preparable;
import com.opensymphony.xwork2.Validateable;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@ -35,7 +35,7 @@
* @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

@ -19,8 +19,8 @@
* under the License.
*/
import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork.Validateable;
import com.opensymphony.xwork2.Preparable;
import com.opensymphony.xwork2.Validateable;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
@ -34,7 +34,7 @@
* @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

@ -19,7 +19,7 @@
* under the License.
*/
import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork2.Preparable;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.Configuration;
@ -48,7 +48,7 @@
*
* @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

@ -19,7 +19,7 @@
* under the License.
*/
import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork2.Preparable;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.Configuration;
@ -34,7 +34,7 @@
* @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

@ -19,7 +19,7 @@
* under the License.
*/
import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork2.Preparable;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.Configuration;
@ -30,7 +30,7 @@
*
* @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

@ -19,8 +19,8 @@
* under the License.
*/
import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork.Validateable;
import com.opensymphony.xwork2.Preparable;
import com.opensymphony.xwork2.Validateable;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.Configuration;
@ -37,7 +37,7 @@
* @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

@ -19,7 +19,7 @@
* under the License.
*/
import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork2.Preparable;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.Configuration;
@ -34,7 +34,7 @@
* @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

@ -19,8 +19,8 @@
* under the License.
*/
import com.opensymphony.webwork.interceptor.ServletRequestAware;
import com.opensymphony.xwork.Preparable;
import org.apache.struts2.interceptor.ServletRequestAware;
import com.opensymphony.xwork2.Preparable;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@ -31,11 +31,11 @@
import org.apache.maven.archiva.model.RepositoryContentStatistics;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.web.util.ContextUtils;
import org.apache.maven.archiva.web.action.PlexusActionSupport;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import org.codehaus.plexus.redback.struts2.interceptor.SecureAction;
import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
@ -49,7 +49,7 @@
*
* @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

@ -26,8 +26,8 @@
import javax.servlet.http.HttpServletRequest;
import com.opensymphony.webwork.interceptor.ServletRequestAware;
import com.opensymphony.xwork.Preparable;
import org.apache.struts2.interceptor.ServletRequestAware;
import com.opensymphony.xwork2.Preparable;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.Configuration;
@ -40,7 +40,7 @@
*
* @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

@ -30,7 +30,7 @@
*
* @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

@ -19,8 +19,8 @@
* under the License.
*/
import com.opensymphony.xwork.Preparable;
import com.opensymphony.xwork.Validateable;
import com.opensymphony.xwork2.Preparable;
import com.opensymphony.xwork2.Validateable;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
@ -32,12 +32,13 @@
import org.apache.maven.archiva.configuration.functors.FiletypeToMapClosure;
import org.apache.maven.archiva.repository.scanner.RepositoryContentConsumers;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.web.action.PlexusActionSupport;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
import org.codehaus.plexus.redback.struts2.interceptor.SecureAction;
import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
import org.codehaus.plexus.registry.RegistryException;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import java.util.ArrayList;
import java.util.Collections;
@ -49,7 +50,7 @@
*
* @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

@ -19,8 +19,8 @@
* under the License.
*/
import com.opensymphony.webwork.interceptor.ServletRequestAware;
import com.opensymphony.xwork.Preparable;
import org.apache.struts2.interceptor.ServletRequestAware;
import com.opensymphony.xwork2.Preparable;
import org.apache.maven.archiva.database.ArchivaDAO;
import org.apache.maven.archiva.database.Constraint;
import org.apache.maven.archiva.database.constraints.RangeConstraint;
@ -31,11 +31,11 @@
import org.apache.maven.archiva.model.RepositoryProblem;
import org.apache.maven.archiva.model.RepositoryProblemReport;
import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.web.action.PlexusActionSupport;
import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.xwork.interceptor.SecureAction;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.xwork.interceptor.SecureActionException;
import org.codehaus.plexus.xwork.action.PlexusActionSupport;
import org.codehaus.plexus.redback.struts2.interceptor.SecureAction;
import org.codehaus.plexus.redback.struts2.interceptor.SecureActionBundle;
import org.codehaus.plexus.redback.struts2.interceptor.SecureActionException;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
@ -45,7 +45,7 @@
import java.util.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

@ -19,9 +19,9 @@
* under the License.
*/
import com.opensymphony.webwork.ServletActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.interceptor.Interceptor;
import org.apache.struts2.ServletActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.Interceptor;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import javax.servlet.ServletContext;
@ -30,7 +30,7 @@
* 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

@ -19,8 +19,9 @@
* under the License.
*/
import com.opensymphony.webwork.dispatcher.mapper.ActionMapping;
import com.opensymphony.webwork.dispatcher.mapper.DefaultActionMapper;
import com.opensymphony.xwork2.config.ConfigurationManager;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
import org.apache.struts2.dispatcher.mapper.DefaultActionMapper;
import org.apache.commons.lang.StringUtils;
@ -69,7 +70,7 @@ public class RepositoryActionMapper
private static final String PARAM_VERSION = "version";
public ActionMapping getMapping( HttpServletRequest httpServletRequest )
public ActionMapping getMapping( HttpServletRequest httpServletRequest, ConfigurationManager manager )
{
String path = httpServletRequest.getServletPath();
@ -141,9 +142,10 @@ else if ( METHOD_DEPENDENCY_TREE.equals( parts[3] ) )
}
}
return super.getMapping( httpServletRequest );
return super.getMapping( httpServletRequest, manager );
}
@Override
public String getUriFromActionMapping( ActionMapping actionMapping )
{
Map params = actionMapping.getParams();

@ -52,7 +52,7 @@
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;

@ -19,10 +19,11 @@
* under the License.
*/
import com.opensymphony.webwork.WebWorkException;
import com.opensymphony.webwork.components.Component;
import com.opensymphony.xwork.util.OgnlValueStack;
import org.apache.struts2.StrutsException;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.OgnlValueStack;
import com.opensymphony.xwork2.util.ValueStack;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.database.ArchivaDAO;
@ -51,7 +52,7 @@
*
* @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
@ -82,7 +83,7 @@ public class DownloadArtifact
private DecimalFormat decimalFormat;
public DownloadArtifact( OgnlValueStack stack, PageContext pageContext )
public DownloadArtifact( ValueStack stack, PageContext pageContext )
{
super( stack );
decimalFormat = new DecimalFormat( "#,#00" );
@ -100,6 +101,7 @@ public DownloadArtifact( OgnlValueStack stack, PageContext pageContext )
}
}
@Override
public boolean end( Writer writer, String body )
{
StringBuffer sb = new StringBuffer();
@ -151,7 +153,7 @@ public boolean end( Writer writer, String body )
}
catch ( IOException e )
{
throw new WebWorkException( "IOError: " + e.getMessage(), e );
throw new StrutsException( "IOError: " + e.getMessage(), e );
}
return super.end( writer, body );

@ -19,7 +19,7 @@
* 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;

@ -19,10 +19,10 @@
* under the License.
*/
import com.opensymphony.webwork.WebWorkException;
import com.opensymphony.webwork.components.Component;
import com.opensymphony.xwork.util.OgnlValueStack;
import org.apache.struts2.StrutsException;
import org.apache.struts2.components.Component;
import com.opensymphony.xwork2.util.ValueStack;
import java.io.IOException;
import java.io.Writer;
import java.util.StringTokenizer;
@ -57,13 +57,14 @@ public class GroupIdLink
private boolean includeTop = false;
public GroupIdLink( OgnlValueStack stack, HttpServletRequest req, HttpServletResponse res )
public GroupIdLink( ValueStack stack, HttpServletRequest req, HttpServletResponse res )
{
super( stack );
this.req = req;
this.res = res;
}
@Override
public boolean end( Writer writer, String body )
{
StringBuffer sb = new StringBuffer();
@ -105,7 +106,7 @@ public boolean end( Writer writer, String body )
}
catch ( IOException e )
{
throw new WebWorkException( "IOError: " + e.getMessage(), e );
throw new StrutsException( "IOError: " + e.getMessage(), e );
}
return super.end( writer, body );
@ -113,16 +114,14 @@ public boolean end( Writer writer, String 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()

@ -19,7 +19,7 @@
* under the License.
*/
import com.opensymphony.webwork.views.jsp.TagUtils;
import org.apache.struts2.views.jsp.TagUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@ -41,6 +41,7 @@ public class GroupIdLinkTag
private boolean includeTop = false;
@Override
public void release()
{
var_ = null;
@ -50,6 +51,7 @@ public void release()
super.release();
}
@Override
public int doEndTag()
throws JspException
{

@ -19,9 +19,9 @@
* under the License.
*/
import com.opensymphony.xwork.validator.ValidationException;
import com.opensymphony.xwork.validator.ValidatorContext;
import com.opensymphony.xwork.validator.validators.FieldValidatorSupport;
import com.opensymphony.xwork2.validator.ValidationException;
import com.opensymphony.xwork2.validator.ValidatorContext;
import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport;
/**
* Reused from Continuum crontab validator
@ -44,4 +44,4 @@ public void validate( Object obj )
return;
}
}
}
}

@ -19,9 +19,9 @@
* 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>

@ -19,9 +19,9 @@
* 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

@ -202,7 +202,7 @@
<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>

@ -73,12 +73,12 @@
<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>

@ -18,14 +18,14 @@
#
# define our own action mapper here
webwork.mapper.class = org.apache.maven.archiva.web.mapper.RepositoryActionMapper
webwork.objectFactory = org.codehaus.plexus.spring.WebWorkPlexusInSpringObjectFactory
webwork.url.includeParams = none
struts.mapper.class = org.apache.maven.archiva.web.mapper.RepositoryActionMapper
struts.objectFactory = org.codehaus.plexus.spring.Struts2PlexusInSpringObjectFactory
struts.url.includeParams = none
#webwork.devMode = true
webwork.multipart.parser=jakarta
struts.devMode = true
struts.multipart.parser=jakarta
# TODO: package up a theme and share with Continuum. Should contain everything from xhtml, and set templateDir to WEB-INF/themes
# Localization
webwork.custom.i18n.resources=org.codehaus.plexus.redback.xwork.default,org.apache.maven.archiva.redback.custom
struts.custom.i18n.resources=org.codehaus.plexus.redback.xwork.default,org.apache.maven.archiva.redback.custom

@ -18,24 +18,21 @@
~ 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"/>
<!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="xwork-security.xml"/>
<include file="struts-security.xml"/>
<package name="base" extends="webwork-default">
<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.xwork.interceptor.ParameterFilterInterceptor"/>
<interceptor name="paramFilter" class="com.opensymphony.xwork2.interceptor.ParameterFilterInterceptor"/>
<interceptor-stack name="configuredArchivaStack">
<interceptor-ref name="redbackForceAdminUser"/>
@ -220,7 +217,7 @@
</package>
<package name="components" namespace="/components" extends="webwork-default">
<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>
@ -496,6 +493,7 @@
</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>
@ -512,5 +510,6 @@
<result>/WEB-INF/jsp/reports/basicReport.jsp</result>
</action>
</package>
</xwork>
-->
</struts>

@ -19,19 +19,19 @@
-->
<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"/>

@ -17,13 +17,13 @@
~ under the License.
--%>
<%@ taglib prefix="ww" uri="/webwork" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html>
<head>
<title>You have access to no repositories</title>
<ww:head/>
<s:head/>
</head>
<body>

@ -17,12 +17,12 @@
~ under the License.
--%>
<%@ taglib prefix="ww" uri="/webwork" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
<head>
<title>Admin: Add Legacy Artifact Path</title>
<ww:head/>
<s:head/>
</head>
<body>
@ -65,17 +65,17 @@
}
</script>
<ww:actionmessage/>
<ww:actionerror/>
<ww:form method="post" action="addLegacyArtifactPath!commit" namespace="/admin" validate="true">
<ww:textfield name="legacyArtifactPath.path" label="Path" size="50" required="true" onchange="parse( this.value )"/>
<ww:textfield name="groupId" label="GroupId" size="20" required="true"/>
<ww:textfield name="artifactId" label="ArtifactId" size="20" required="true"/>
<ww:textfield name="version" label="Version" size="20" required="true"/>
<ww:textfield name="classifier" label="Classifier" size="20" required="false"/>
<ww:textfield name="type" label="Type" size="20" required="true"/>
<ww:submit value="Add Legacy Artifact Path"/>
</ww:form>
<s:actionmessage/>
<s:actionerror/>
<s:form method="post" action="addLegacyArtifactPath!commit" namespace="/admin" validate="true">
<s:textfield name="legacyArtifactPath.path" label="Path" size="50" required="true" onchange="parse( this.value )"/>
<s:textfield name="groupId" label="GroupId" size="20" required="true"/>
<s:textfield name="artifactId" label="ArtifactId" size="20" required="true"/>
<s:textfield name="version" label="Version" size="20" required="true"/>
<s:textfield name="classifier" label="Classifier" size="20" required="false"/>
<s:textfield name="type" label="Type" size="20" required="true"/>
<s:submit value="Add Legacy Artifact Path"/>
</s:form>
<script type="text/javascript">
var ref = document.getElementById("addLegacyArtifactPath_legacyArtifactPath_artifact").value;

@ -17,12 +17,12 @@
~ 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>
@ -31,13 +31,13 @@
<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>

@ -17,12 +17,12 @@
~ 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>
@ -31,12 +31,12 @@
<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();

@ -17,12 +17,12 @@
~ 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>
@ -30,13 +30,13 @@
<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();

@ -17,26 +17,26 @@
~ 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>

@ -17,13 +17,13 @@
~ under the License.
--%>
<%@ taglib prefix="ww" uri="/webwork" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html>
<head>
<title>Admin: Add Managed Repository</title>
<ww:head/>
<s:head/>
</head>
<body>
@ -103,33 +103,33 @@
</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>

@ -17,7 +17,7 @@
~ 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" %>
@ -26,7 +26,7 @@
<html>
<head>
<title>Administration - Database</title>
<ww:head />
<s:head />
</head>
<body>
@ -35,8 +35,8 @@
<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" />
@ -45,21 +45,21 @@
<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>
@ -71,7 +71,7 @@
<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>
@ -107,11 +107,11 @@
</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>
@ -126,7 +126,7 @@
<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>
@ -162,11 +162,11 @@
</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>

@ -17,19 +17,19 @@
~ 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">
@ -43,10 +43,10 @@
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>

@ -17,19 +17,19 @@
~ 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">
@ -43,11 +43,11 @@
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>

@ -17,19 +17,19 @@
~ 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">
@ -60,13 +60,13 @@
</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>

@ -17,19 +17,19 @@
~ 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">
@ -60,14 +60,14 @@
</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>

@ -17,19 +17,19 @@
~ 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">
@ -52,13 +52,13 @@
</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>

@ -17,19 +17,19 @@
~ 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">
@ -39,11 +39,11 @@
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>

@ -17,11 +17,11 @@
~ 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>
@ -33,14 +33,14 @@
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>

@ -17,7 +17,7 @@
~ 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>
@ -33,7 +33,7 @@
<html>
<head>
<title>Admin: ${addedit} Network Proxy</title>
<ww:head/>
<s:head/>
</head>
<body>
@ -44,24 +44,24 @@
<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();

@ -17,13 +17,13 @@
~ under the License.
--%>
<%@ taglib prefix="ww" uri="/webwork" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html>
<head>
<title>Admin : Edit Proxy Connector</title>
<ww:head/>
<s:head/>
</head>
<body>
@ -32,13 +32,13 @@
<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>

@ -17,28 +17,28 @@
~ 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();

@ -17,29 +17,29 @@
~ 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();

@ -17,19 +17,19 @@
~ 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">
@ -39,11 +39,11 @@
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>

@ -18,12 +18,12 @@
--%>
<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>

@ -17,7 +17,7 @@
~ 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" %>
@ -25,7 +25,7 @@
<html>
<head>
<title>Administration - Legacy support</title>
<ww:head/>
<s:head/>
</head>
<body>
@ -34,17 +34,17 @@
<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="addLegacyArtifactPathUrl" action="addLegacyArtifactPath"/>
<ww:a href="%{addLegacyArtifactPathUrl}">
<s:url id="addLegacyArtifactPathUrl" action="addLegacyArtifactPath"/>
<s:a href="%{addLegacyArtifactPathUrl}">
<img src="<c:url value="/images/icons/create.png" />" alt="" width="16" height="16"/>
Add
</ww:a>
</s:a>
</redback:ifAuthorized>
</div>
<h2>Path Mappings</h2>
@ -72,13 +72,13 @@
<div class="controls">
<%-- TODO: make some icons --%>
<redback:ifAnyAuthorized permissions="archiva-manage-configuration">
<ww:url id="deleteLegacyArtifactPath" action="deleteLegacyArtifactPath">
<ww:param name="path" value="%{'${legacyArtifactPath.path}'}"/>
</ww:url>
<ww:a href="%{deleteLegacyArtifactPath}">
<s:url id="deleteLegacyArtifactPath" action="deleteLegacyArtifactPath">
<s:param name="path" value="%{'${legacyArtifactPath.path}'}"/>
</s:url>
<s:a href="%{deleteLegacyArtifactPath}">
<img src="<c:url value="/images/icons/delete.gif" />" alt="" width="16" height="16"/>
Delete
</ww:a>
</s:a>
</redback:ifAnyAuthorized>
</div>

@ -17,7 +17,7 @@
~ 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"%>
@ -25,7 +25,7 @@
<html>
<head>
<title>Administration - Network Proxies</title>
<ww:head />
<s:head />
</head>
<body>
@ -34,16 +34,16 @@
<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>
@ -70,18 +70,18 @@
<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">

@ -17,7 +17,7 @@
~ 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" %>
@ -26,7 +26,7 @@
<html>
<head>
<title>Administration - Proxy Connectors</title>
<ww:head/>
<s:head/>
</head>
<body>
@ -43,18 +43,18 @@
<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>
@ -99,56 +99,56 @@
<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>
@ -171,13 +171,13 @@
<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>

@ -17,7 +17,7 @@
~ 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" %>
@ -25,7 +25,7 @@
<html>
<head>
<title>Administration - Repositories</title>
<ww:head/>
<s:head/>
</head>
<body>
@ -34,17 +34,17 @@
<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>
@ -72,20 +72,20 @@
<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}">
@ -190,10 +190,10 @@
<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>
@ -248,11 +248,11 @@
<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>
@ -278,20 +278,20 @@
<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>

@ -17,7 +17,7 @@
~ 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" %>
@ -26,7 +26,7 @@
<html>
<head>
<title>Administration - Repository Groups</title>
<ww:head/>
<s:head/>
</head>
<body>
@ -41,16 +41,16 @@
<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>
@ -70,12 +70,12 @@
<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"/>"/>
@ -85,11 +85,11 @@
<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>
@ -109,31 +109,31 @@
<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>

@ -17,7 +17,7 @@
~ 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" %>
@ -26,7 +26,7 @@
<html>
<head>
<title>Administration - Repository Scanning</title>
<ww:head />
<s:head />
</head>
<body>
@ -35,13 +35,13 @@
<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">
<!--
@ -78,14 +78,14 @@
<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">
@ -113,27 +113,27 @@
<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>
@ -154,7 +154,7 @@
<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>
@ -190,11 +190,11 @@
</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>
@ -210,7 +210,7 @@
<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>
@ -246,11 +246,11 @@
</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>

@ -17,16 +17,16 @@
~ 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>
@ -37,29 +37,29 @@
<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>

@ -17,13 +17,13 @@
~ under the License.
--%>
<%@ taglib prefix="ww" uri="/webwork" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<html>
<head>
<title>Security Alert Page</title>
<ww:head/>
<s:head/>
</head>
<body>

@ -17,7 +17,7 @@
~ 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" %>
@ -25,7 +25,7 @@
<html>
<head>
<title>Browse Repository</title>
<ww:head/>
<s:head/>
</head>
<body>
@ -48,9 +48,9 @@
<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>
@ -65,10 +65,10 @@
<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>
@ -88,11 +88,11 @@
<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>

@ -17,14 +17,14 @@
~ 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>
@ -40,14 +40,14 @@
<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>

@ -17,14 +17,14 @@
~ 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>
@ -41,9 +41,9 @@
<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>
@ -56,10 +56,10 @@
<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>
@ -73,10 +73,10 @@
<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>

@ -17,10 +17,10 @@
~ 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}">

@ -19,7 +19,7 @@
<%@ 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" %>
@ -30,12 +30,12 @@
<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"/>
@ -81,53 +81,53 @@
<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>

@ -20,7 +20,7 @@
--%>
<%@ 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" %>
@ -52,7 +52,7 @@
</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">
@ -86,11 +86,11 @@
<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>

@ -17,12 +17,12 @@
~ 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">
@ -31,7 +31,7 @@
<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 )
{
@ -55,18 +55,18 @@
<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.
@ -79,7 +79,7 @@
<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>
@ -88,17 +88,17 @@
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>

@ -17,20 +17,20 @@
~ 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>

@ -17,16 +17,16 @@
~ 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>
@ -34,23 +34,23 @@
<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>

@ -17,14 +17,14 @@
~ 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>
@ -32,7 +32,7 @@
<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>
@ -41,10 +41,10 @@
<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>
@ -54,11 +54,11 @@
</c:forEach>
</c:forEach>
<ww:set name="page" value="page"/>
<c:if test="${page > 1}"><a href="<ww:property value='prev' />">&lt;&lt;</a></c:if>
<s:set name="page" value="page"/>
<c:if test="${page > 1}"><a href="<s:property value='prev' />">&lt;&lt;</a></c:if>
Page: ${page}
<ww:set name="isLastPage" value="isLastPage"/>
<c:if test="${!isLastPage}"><a href="<ww:property value='next' />">&gt;&gt;</a></c:if>
<s:set name="isLastPage" value="isLastPage"/>
<c:if test="${!isLastPage}"><a href="<s:property value='next' />">&gt;&gt;</a></c:if>
</div>
</body>

@ -17,12 +17,12 @@
~ 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>
@ -30,7 +30,7 @@
<div id="contentArea">
<ww:text name="The operation generated an empty report."/>
<s:text name="The operation generated an empty report."/>
</div>
</body>

@ -17,12 +17,12 @@
~ 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>
@ -30,12 +30,12 @@
<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>

@ -17,7 +17,7 @@
~ 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" %>
@ -25,7 +25,7 @@
<html>
<head>
<title>Search Results</title>
<ww:head/>
<s:head/>
</head>
<body>
@ -46,40 +46,40 @@
<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>
@ -111,51 +111,51 @@
<%-- 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>
@ -199,12 +199,12 @@
<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>
@ -218,20 +218,20 @@
<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>

@ -17,7 +17,7 @@
~ 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" %>
@ -26,12 +26,12 @@
<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"/>
@ -77,53 +77,53 @@
<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>

@ -19,13 +19,13 @@
<%-- 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>
@ -33,13 +33,13 @@
<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>

@ -17,18 +17,18 @@
~ 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" %>
<%@ attribute name="action" %>
<%@ attribute name="namespace" %>
<%@ attribute name="url" %>
<c:set var="currentUrl">
<ww:url/>
<s:url/>
</c:set>
<c:if test="${!empty (action) && !empty (namespace)}">
<c:set var="url">
<ww:url action="${action}" namespace="${namespace}"/>
<s:url action="%{action}" namespace="%{namespace}"/>
</c:set>
</c:if>
<c:set var="text">

@ -26,7 +26,7 @@
<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>
@ -36,7 +36,7 @@
<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 -->

@ -1,4 +1,4 @@
<@ww.iterator value="parameters.list">
<@s.iterator value="parameters.list">
<#if parameters.listKey?exists>
<#assign itemKey = stack.findValue(parameters.listKey)/>
<#else>
@ -36,4 +36,4 @@
<label for="${parameters.id?html}${itemKey?html}"><#rt/>
${itemValue}<#t/>
</label><br/>
</@ww.iterator>
</@s.iterator>

Some files were not shown because too many files have changed in this diff Show More