Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

get RID of org.apache.maven.archiva packages : validator package in webapp 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1164816 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-09-03 07:46:52 +00:00
parent 30e0e0a01f
commit 54eed9ca99
10 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/CronExpressionValidator.java → archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/validator/CronExpressionValidator.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.archiva.web.validator; package org.apache.archiva.web.validator;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java → archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/validator/IntervalValidator.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.archiva.web.validator; package org.apache.archiva.web.validator;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java → archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/validator/SyncedRepositoryValidator.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.archiva.web.validator; package org.apache.archiva.web.validator;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

6
archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml
View File

@ -37,8 +37,8 @@
<validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/> <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/>
<validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/> <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/>
<validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/> <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/>
<validator name="interval" class="org.apache.maven.archiva.web.validator.IntervalValidator"/> <validator name="interval" class="org.apache.archiva.web.validator.IntervalValidator"/>
<validator name="syncedrepo" class="org.apache.maven.archiva.web.validator.SyncedRepositoryValidator"/> <validator name="syncedrepo" class="org.apache.archiva.web.validator.SyncedRepositoryValidator"/>
<validator name="crontab" class="org.apache.maven.archiva.web.validator.CronExpressionValidator"/> <validator name="crontab" class="org.apache.archiva.web.validator.CronExpressionValidator"/>
</validators> </validators>

2
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/validator/utils/ValidatorUtil.java → archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/validator/utils/ValidatorUtil.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.archiva.web.validator.utils; package org.apache.archiva.web.validator.utils;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java
View File

@ -22,7 +22,7 @@ package org.apache.maven.archiva.web.action.admin.appearance;
import com.opensymphony.xwork2.validator.ActionValidatorManager; import com.opensymphony.xwork2.validator.ActionValidatorManager;
import org.apache.maven.archiva.configuration.OrganisationInformation; import org.apache.maven.archiva.configuration.OrganisationInformation;
import org.apache.maven.archiva.web.action.admin.repositories.DefaultActionValidatorManagerFactory; import org.apache.maven.archiva.web.action.admin.repositories.DefaultActionValidatorManagerFactory;
import org.apache.maven.archiva.web.validator.utils.ValidatorUtil; import org.apache.archiva.web.validator.utils.ValidatorUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

4
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathActionTest.java
View File

@ -19,18 +19,16 @@ package org.apache.maven.archiva.web.action.admin.legacy;
* under the License. * under the License.
*/ */
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.validator.ActionValidatorManager; import com.opensymphony.xwork2.validator.ActionValidatorManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.opensymphony.xwork2.validator.DefaultActionValidatorManager;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.maven.archiva.configuration.LegacyArtifactPath; import org.apache.maven.archiva.configuration.LegacyArtifactPath;
import org.apache.maven.archiva.web.action.admin.repositories.DefaultActionValidatorManagerFactory; import org.apache.maven.archiva.web.action.admin.repositories.DefaultActionValidatorManagerFactory;
import org.apache.maven.archiva.web.validator.utils.ValidatorUtil; import org.apache.archiva.web.validator.utils.ValidatorUtil;
public class AddLegacyArtifactPathActionTest extends TestCase public class AddLegacyArtifactPathActionTest extends TestCase
{ {

4
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyActionTest.java
View File

@ -19,18 +19,16 @@ package org.apache.maven.archiva.web.action.admin.networkproxies;
* under the License. * under the License.
*/ */
import com.opensymphony.xwork2.ObjectFactory;
import com.opensymphony.xwork2.validator.ActionValidatorManager; import com.opensymphony.xwork2.validator.ActionValidatorManager;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.opensymphony.xwork2.validator.DefaultActionValidatorManager;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.maven.archiva.configuration.NetworkProxyConfiguration; import org.apache.maven.archiva.configuration.NetworkProxyConfiguration;
import org.apache.maven.archiva.web.action.admin.repositories.DefaultActionValidatorManagerFactory; import org.apache.maven.archiva.web.action.admin.repositories.DefaultActionValidatorManagerFactory;
import org.apache.maven.archiva.web.validator.utils.ValidatorUtil; import org.apache.archiva.web.validator.utils.ValidatorUtil;
public class ConfigureNetworkProxyActionTest extends TestCase public class ConfigureNetworkProxyActionTest extends TestCase
{ {

2
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java
View File

@ -28,7 +28,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.security.ArchivaRoleConstants; import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.web.validator.utils.ValidatorUtil; import org.apache.archiva.web.validator.utils.ValidatorUtil;
import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.registry.Registry; import org.codehaus.plexus.registry.Registry;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.codehaus.redback.integration.interceptor.SecureActionBundle;

2
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java
View File

@ -35,7 +35,7 @@ import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.Configuration;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.security.ArchivaRoleConstants; import org.apache.maven.archiva.security.ArchivaRoleConstants;
import org.apache.maven.archiva.web.validator.utils.ValidatorUtil; import org.apache.archiva.web.validator.utils.ValidatorUtil;
import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.registry.Registry; import org.codehaus.plexus.registry.Registry;
import org.codehaus.redback.integration.interceptor.SecureActionBundle; import org.codehaus.redback.integration.interceptor.SecureActionBundle;