fix test compilation

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1171467 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java
index e3bdbcfdfea9c160e284af359ba040e943fc8ee7..5b192f3c48c8ef16ae2bac5286d3cc45220e4083 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/AbstractRepositoryLayerTestCase.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository;
+package org.apache.archiva.repository;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,8 @@ package org.apache.maven.archiva.repository;
 
 import org.apache.archiva.admin.model.beans.ManagedRepository;
 import org.apache.archiva.admin.model.beans.RemoteRepository;
+import org.apache.archiva.repository.ManagedRepositoryContent;
+import org.apache.archiva.repository.RemoteRepositoryContent;
 import org.junit.Rule;
 import org.junit.rules.TestName;
 import org.junit.runner.RunWith;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/MockConfiguration.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/MockConfiguration.java
index e460ed30dc6158aec757437a37b9d7958d062b22..117983ca2fe131ce5bf60d8bedbb6b2c3a70b82f 100755 (executable)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/MockConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/MockConfiguration.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository;
+package org.apache.archiva.repository;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java
index 55e10a930421bb6fdad8fbe4e4bdf43148aa0162..83267d14c9c37e811d691e50fb7d4d5f9b7a7d50 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository;
+package org.apache.archiva.repository;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java
index 18fbd5a46ada061b7109e7d1b67ae093e7d7d4d7..f557092d30e7a3686b6b892e5d9abc79d251dada 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.content;
+package org.apache.archiva.repository.content;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,10 +19,10 @@ package org.apache.maven.archiva.repository.content;
  * under the License.
  */
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
-import org.apache.maven.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.AbstractRepositoryLayerTestCase;
+import org.apache.archiva.repository.layout.LayoutException;
+import org.apache.commons.lang.StringUtils;
 import org.junit.Test;
 
 import static org.junit.Assert.*;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
index 0b4a10ae73bcb34eccd0deaaa968c1eb85edb6f1..965fbb9ff20822c9ea19dafc1089f0e2cf534a04 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.content;
+package org.apache.archiva.repository.content;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,8 +20,8 @@ package org.apache.maven.archiva.repository.content;
  */
 
 import org.apache.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
-import org.apache.maven.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.AbstractRepositoryLayerTestCase;
+import org.apache.archiva.repository.layout.LayoutException;
 import org.junit.Test;
 
 import static org.junit.Assert.*;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ArtifactExtensionMappingTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ArtifactExtensionMappingTest.java
index 9cfb9032a643f82037463e40a694a840b01d5ce2..0372e88097f2b8d17bb1b040f8dcbf76cac87bf3 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ArtifactExtensionMappingTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ArtifactExtensionMappingTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.content;
+package org.apache.archiva.repository.content;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@ import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator;
 import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider;
 import org.apache.archiva.metadata.repository.storage.maven2.Maven2RepositoryPathTranslator;
 import org.apache.archiva.metadata.repository.storage.maven2.MavenArtifactFacet;
-import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
+import org.apache.archiva.repository.AbstractRepositoryLayerTestCase;
 import org.junit.Test;
 
 import java.util.Collections;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/DefaultPathParserTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/DefaultPathParserTest.java
index 6f86ef225f44f0444b8a18280d6ef59d4444afdf..10cb0c01533cab8d531bd823456a842da95d3a55 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/DefaultPathParserTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/DefaultPathParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.content;
+package org.apache.archiva.repository.content;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@ package org.apache.maven.archiva.repository.content;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
-import org.apache.maven.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.AbstractRepositoryLayerTestCase;
+import org.apache.archiva.repository.layout.LayoutException;
 import org.junit.Test;
 
 import static org.junit.Assert.*;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/FilenameParserTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/FilenameParserTest.java
index 7321f13dfd9a614ac9cac9f34ec28efff6e2936c..99e34acabdd541b3ed32730c14471756799f5ba1 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/FilenameParserTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/FilenameParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.content;
+package org.apache.archiva.repository.content;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/LegacyPathParserTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/LegacyPathParserTest.java
index 6b578169ba018875369780521ec48b7c1cb94b46..930ff10230f87bfe172705c21ec61ee70e0de9eb 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/LegacyPathParserTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/LegacyPathParserTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.content;
+package org.apache.archiva.repository.content;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,8 +23,8 @@ package org.apache.maven.archiva.repository.content;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.LegacyArtifactPath;
 import org.apache.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
-import org.apache.maven.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.AbstractRepositoryLayerTestCase;
+import org.apache.archiva.repository.layout.LayoutException;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContentTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
index f6b8b9a0b5508c96e62acf49fb3250bf45dc8fb1..9dd4124fb5df7929da4c2dfe122843bb511d9cb9 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.content;
+package org.apache.archiva.repository.content;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,8 +27,8 @@ import org.apache.maven.archiva.configuration.FileTypes;
 import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.model.ProjectReference;
 import org.apache.archiva.model.VersionedReference;
-import org.apache.maven.archiva.repository.ManagedRepositoryContent;
-import org.apache.maven.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.ManagedRepositoryContent;
+import org.apache.archiva.repository.layout.LayoutException;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContentTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContentTest.java
index 99ce8ae018075d678b4bb10bb468842ac882b33c..0298630a34206f8ae8c0c5d237e80e7b4597817d 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContentTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContentTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.content;
+package org.apache.archiva.repository.content;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ import org.apache.archiva.common.utils.VersionComparator;
 import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.model.ProjectReference;
 import org.apache.archiva.model.VersionedReference;
-import org.apache.maven.archiva.repository.ManagedRepositoryContent;
-import org.apache.maven.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.ManagedRepositoryContent;
+import org.apache.archiva.repository.layout.LayoutException;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContentTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContentTest.java
index 75ba208dc60b95ecd754e213aedeb78294b6a33a..96f89c82521263f8695bb318a1292950a43e3350 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContentTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContentTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.content;
+package org.apache.archiva.repository.content;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@ package org.apache.maven.archiva.repository.content;
 
 import org.apache.archiva.admin.model.beans.RemoteRepository;
 import org.apache.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.repository.RemoteRepositoryContent;
-import org.apache.maven.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.RemoteRepositoryContent;
+import org.apache.archiva.repository.layout.LayoutException;
 import org.junit.Before;
 
 import javax.inject.Inject;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContentTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContentTest.java
index 352c9107dbb869854035a5276b7e0ea2b10be547..837abb8c5dea3cbc932116969c5df03cd6cbe7bc 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContentTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContentTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.content;
+package org.apache.archiva.repository.content;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@ package org.apache.maven.archiva.repository.content;
 
 import org.apache.archiva.admin.model.beans.RemoteRepository;
 import org.apache.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.repository.RemoteRepositoryContent;
-import org.apache.maven.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.RemoteRepositoryContent;
+import org.apache.archiva.repository.layout.LayoutException;
 import org.junit.Before;
 
 import javax.inject.Inject;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RepositoryRequestTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RepositoryRequestTest.java
index 70d414a2d4f93950a94535c2598ca5a904ba3c74..b7c65d6797d094863b9b82a50838d915e3deb5e7 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RepositoryRequestTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RepositoryRequestTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.content;
+package org.apache.archiva.repository.content;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,9 +23,9 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.common.utils.FileUtil;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
-import org.apache.maven.archiva.repository.ManagedRepositoryContent;
-import org.apache.maven.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.AbstractRepositoryLayerTestCase;
+import org.apache.archiva.repository.ManagedRepositoryContent;
+import org.apache.archiva.repository.layout.LayoutException;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.test.context.ContextConfiguration;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
index b53857322b75e96d16752718d3e99af4f9082f1c..25590d8e5f082c52462249290105e6b80bb23254 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.metadata;
+package org.apache.archiva.repository.metadata;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -30,11 +30,11 @@ import org.apache.archiva.policies.CachedFailuresPolicy;
 import org.apache.archiva.policies.ChecksumPolicy;
 import org.apache.archiva.policies.ReleasesPolicy;
 import org.apache.archiva.policies.SnapshotsPolicy;
-import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
-import org.apache.maven.archiva.repository.ManagedRepositoryContent;
-import org.apache.maven.archiva.repository.MockConfiguration;
-import org.apache.maven.archiva.repository.RemoteRepositoryContent;
-import org.apache.maven.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.AbstractRepositoryLayerTestCase;
+import org.apache.archiva.repository.ManagedRepositoryContent;
+import org.apache.archiva.repository.MockConfiguration;
+import org.apache.archiva.repository.RemoteRepositoryContent;
+import org.apache.archiva.repository.layout.LayoutException;
 import org.custommonkey.xmlunit.DetailedDiff;
 import org.custommonkey.xmlunit.Diff;
 import org.junit.Test;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java
index b0069d1e66fa0c60b2876713dcb1c1292ff15e68..d015e73e8bd7ce5939034f1b097608358fa9b934 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.metadata;
+package org.apache.archiva.repository.metadata;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java
index 0f6bc26f2cc7f767715b1e00c59757eefc00ec9d..373c8de9bfd653ad3d399ec46192ca834e48f1b9 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.repository.metadata;
+package org.apache.archiva.repository.metadata;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one