From 54eed9ca99cdabd7eb44aafd19ab0cffd067cd53 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 3 Sep 2011 07:46:52 +0000 Subject: [PATCH] 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 --- .../archiva/web/validator/CronExpressionValidator.java | 2 +- .../archiva/web/validator/IntervalValidator.java | 2 +- .../archiva/web/validator/SyncedRepositoryValidator.java | 2 +- .../archiva-webapp/src/main/resources/validators.xml | 6 +++--- .../archiva/web/validator/utils/ValidatorUtil.java | 2 +- .../admin/appearance/EditOrganizationInfoActionTest.java | 2 +- .../admin/legacy/AddLegacyArtifactPathActionTest.java | 4 +--- .../networkproxies/ConfigureNetworkProxyActionTest.java | 4 +--- .../admin/repositories/AddManagedRepositoryActionTest.java | 2 +- .../admin/repositories/EditManagedRepositoryActionTest.java | 2 +- 10 files changed, 12 insertions(+), 16 deletions(-) rename archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/{maven => }/archiva/web/validator/CronExpressionValidator.java (97%) rename archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/{maven => }/archiva/web/validator/IntervalValidator.java (97%) rename archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/{maven => }/archiva/web/validator/SyncedRepositoryValidator.java (98%) rename archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/{maven => }/archiva/web/validator/utils/ValidatorUtil.java (98%) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/CronExpressionValidator.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/validator/CronExpressionValidator.java similarity index 97% rename from archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/CronExpressionValidator.java rename to archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/validator/CronExpressionValidator.java index 8524d3d8c..2f96beb62 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/CronExpressionValidator.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/validator/CronExpressionValidator.java @@ -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 diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/validator/IntervalValidator.java similarity index 97% rename from archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java rename to archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/validator/IntervalValidator.java index 5a143d873..5f58b66ad 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/IntervalValidator.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/validator/IntervalValidator.java @@ -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 diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/validator/SyncedRepositoryValidator.java similarity index 98% rename from archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java rename to archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/validator/SyncedRepositoryValidator.java index 36e463f6a..5efff802b 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/validator/SyncedRepositoryValidator.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/validator/SyncedRepositoryValidator.java @@ -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 diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml index d126e2a3b..b24bc71f5 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/validators.xml @@ -37,8 +37,8 @@ - - - + + + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/validator/utils/ValidatorUtil.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/validator/utils/ValidatorUtil.java similarity index 98% rename from archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/validator/utils/ValidatorUtil.java rename to archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/validator/utils/ValidatorUtil.java index 36e4651fd..9696868aa 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/validator/utils/ValidatorUtil.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/validator/utils/ValidatorUtil.java @@ -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 diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java index 78207d346..88e85b0a6 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/appearance/EditOrganizationInfoActionTest.java @@ -22,7 +22,7 @@ package org.apache.maven.archiva.web.action.admin.appearance; import com.opensymphony.xwork2.validator.ActionValidatorManager; import org.apache.maven.archiva.configuration.OrganisationInformation; 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.HashMap; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathActionTest.java index e649f9221..f8e89b15d 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathActionTest.java @@ -19,18 +19,16 @@ package org.apache.maven.archiva.web.action.admin.legacy; * under the License. */ -import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.validator.ActionValidatorManager; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.opensymphony.xwork2.validator.DefaultActionValidatorManager; import junit.framework.TestCase; import org.apache.maven.archiva.configuration.LegacyArtifactPath; 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 { diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyActionTest.java index 1695de328..da478ccbd 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/networkproxies/ConfigureNetworkProxyActionTest.java @@ -19,18 +19,16 @@ package org.apache.maven.archiva.web.action.admin.networkproxies; * under the License. */ -import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.validator.ActionValidatorManager; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.opensymphony.xwork2.validator.DefaultActionValidatorManager; import junit.framework.TestCase; import org.apache.maven.archiva.configuration.NetworkProxyConfiguration; 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 { diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java index badce92fd..06a1b354a 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/AddManagedRepositoryActionTest.java @@ -28,7 +28,7 @@ import org.apache.commons.io.FileUtils; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.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.registry.Registry; import org.codehaus.redback.integration.interceptor.SecureActionBundle; diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java index 2a513650c..05c439513 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/admin/repositories/EditManagedRepositoryActionTest.java @@ -35,7 +35,7 @@ import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.maven.archiva.security.ArchivaRoleConstants; -import org.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.registry.Registry; import org.codehaus.redback.integration.interceptor.SecureActionBundle;