Rearranging modules and adding indexer api

Combining the indexer api and repository api into archiva-repository-api
They have bidirectional dependencies so they are put together in one module.

Adding new classes for a generalized indexer api that will be used for interfaces
and implementation independent tasks.

12 files changed, 33 insertions, 41 deletions

diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
index 359c7ebc1..4678950b7 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
@@ -47,7 +47,7 @@ import org.apache.archiva.proxy.common.WagonFactory;
 import org.apache.archiva.proxy.model.RepositoryProxyConnectors;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.content.PathParser;
-import org.apache.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.LayoutException;
 import org.apache.archiva.xml.XMLException;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java
index a15b5d76c..ae8a92281 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/AbstractDefaultRepositoryContent.java
@@ -20,7 +20,6 @@ package org.apache.archiva.repository.content.maven2;
  */
 
 import org.apache.archiva.common.utils.VersionUtil;
-import org.apache.archiva.configuration.FileTypes;
 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;
@@ -30,13 +29,11 @@ import org.apache.archiva.model.ProjectReference;
 import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.RepositoryContent;
 import org.apache.archiva.repository.content.PathParser;
-import org.apache.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.LayoutException;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
 import java.util.List;
 
 /**
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java
index c0bcaaf54..d28a8284b 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/DefaultPathParser.java
@@ -27,7 +27,7 @@ import org.apache.archiva.metadata.repository.storage.maven2.DefaultArtifactMapp
 import org.apache.archiva.metadata.repository.storage.maven2.Maven2RepositoryPathTranslator;
 import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.content.PathParser;
-import org.apache.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.LayoutException;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java
index 847dd7a6b..d5f55fc6e 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java
@@ -28,9 +28,9 @@ import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.model.ProjectReference;
 import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.ContentNotFoundException;
+import org.apache.archiva.repository.LayoutException;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.RepositoryException;
-import org.apache.archiva.repository.layout.LayoutException;
 import org.apache.commons.lang.StringUtils;
 
 import java.io.IOException;
@@ -245,8 +245,8 @@ public class ManagedDefaultRepositoryContent
      * information.
      *
      * @return the Set of available versions, based on the project reference.
-     * @throws org.apache.archiva.repository.layout.LayoutException
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
+     * @throws LayoutException
      */
     @Override
     public Set<String> getVersions( ProjectReference reference )
@@ -395,7 +395,7 @@ public class ManagedDefaultRepositoryContent
      * Convert a path to an artifact reference.
      *
      * @param path the path to convert. (relative or full location path)
-     * @throws org.apache.archiva.repository.layout.LayoutException if the path cannot be converted to an artifact reference.
+     * @throws LayoutException if the path cannot be converted to an artifact reference.
      */
     @Override
     public ArtifactReference toArtifactReference( String path )
@@ -440,7 +440,7 @@ public class ManagedDefaultRepositoryContent
      * @return the ArtifactReference to the first artifact located within the versioned reference. or null if
      *         no artifact was found within the versioned reference.
      * @throws java.io.IOException     if the versioned reference is invalid (example: doesn't exist, or isn't a directory)
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      */
     private ArtifactReference getFirstArtifact( VersionedReference reference )
         throws LayoutException, IOException
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java
index b9c2238fa..17426d8b9 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RemoteDefaultRepositoryContent.java
@@ -22,11 +22,9 @@ package org.apache.archiva.repository.content.maven2;
 import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider;
 import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.model.RepositoryURL;
+import org.apache.archiva.repository.LayoutException;
 import org.apache.archiva.repository.RemoteRepository;
 import org.apache.archiva.repository.RemoteRepositoryContent;
-import org.apache.archiva.repository.layout.LayoutException;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -80,7 +78,7 @@ public class RemoteDefaultRepositoryContent
      * Convert a path to an artifact reference.
      *
      * @param path the path to convert. (relative or full url path)
-     * @throws org.apache.archiva.repository.layout.LayoutException if the path cannot be converted to an artifact reference.
+     * @throws LayoutException if the path cannot be converted to an artifact reference.
      */
     @Override
     public ArtifactReference toArtifactReference( String path )
diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RepositoryRequest.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RepositoryRequest.java
index a1fc5bd62..fa7ec895b 100644
--- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RepositoryRequest.java
+++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/repository/content/maven2/RepositoryRequest.java
@@ -20,9 +20,9 @@ package org.apache.archiva.repository.content.maven2;
  */
 
 import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.repository.LayoutException;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.content.PathParser;
-import org.apache.archiva.repository.layout.LayoutException;
 import org.apache.archiva.repository.metadata.MetadataTools;
 import org.apache.commons.lang.StringUtils;
 
@@ -45,7 +45,7 @@ public class RepositoryRequest
      *
      * @param requestedPath the relative path to the content.
      * @return the ArtifactReference for the requestedPath.
-     * @throws org.apache.archiva.repository.layout.LayoutException if the request path is not layout valid.
+     * @throws LayoutException if the request path is not layout valid.
      */
     public ArtifactReference toArtifactReference( String requestedPath )
         throws LayoutException
@@ -236,7 +236,7 @@ public class RepositoryRequest
      * @param requestedPath the incoming requested path.
      * @param repository    the repository to adjust to.
      * @return the adjusted (to native) path.
-     * @throws org.apache.archiva.repository.layout.LayoutException if the path cannot be parsed.
+     * @throws LayoutException if the path cannot be parsed.
      */
     public String toNativePath( String requestedPath, ManagedRepositoryContent repository )
         throws LayoutException
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
index 0967e225f..c3b85ccf1 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/AbstractDefaultRepositoryContentTestCase.java
@@ -21,7 +21,7 @@ package org.apache.archiva.metadata.repository.storage.maven2;
 
 import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.AbstractRepositoryLayerTestCase;
-import org.apache.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.LayoutException;
 import org.apache.commons.lang.StringUtils;
 import org.junit.Test;
 
@@ -82,7 +82,7 @@ public abstract class AbstractDefaultRepositoryContentTestCase
      * [MRM-432] Oddball version spec.
      * Example of an oddball / unusual version spec.
      *
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      *
      */
     @Test
@@ -103,7 +103,7 @@ public abstract class AbstractDefaultRepositoryContentTestCase
      * [MRM-432] Oddball version spec.
      * Example of an oddball / unusual version spec.
      *
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      *
      */
     @Test
@@ -124,7 +124,7 @@ public abstract class AbstractDefaultRepositoryContentTestCase
      * Test the ejb-client type spec.
      * Type specs are not a 1 to 1 map to the extension.
      * This tests that effect.
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      */
     /* TODO: Re-enabled in the future.
     public void testGoodFooEjbClient()
@@ -145,7 +145,7 @@ public abstract class AbstractDefaultRepositoryContentTestCase
      * [MRM-432] Oddball version spec.
      * Example of an oddball / unusual version spec.
      *
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      *
      */
     @Test
@@ -252,7 +252,7 @@ public abstract class AbstractDefaultRepositoryContentTestCase
     /**
      * Test the classifier, and java-source type spec.
      *
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      *
      */
     @Test
@@ -272,7 +272,7 @@ public abstract class AbstractDefaultRepositoryContentTestCase
     /**
      * A timestamped versioned artifact, should reside in a SNAPSHOT baseversion directory.
      *
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      *
      */
     @Test
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
index 41e62faa3..98bfac076 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/ManagedDefaultRepositoryContentTest.java
@@ -27,9 +27,8 @@ import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.model.ProjectReference;
 import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.EditableManagedRepository;
-import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.content.maven2.ManagedDefaultRepositoryContent;
-import org.apache.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.LayoutException;
 import org.apache.archiva.repository.maven2.MavenManagedRepository;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java
index 0a1c03acf..4af23f6fd 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/RemoteDefaultRepositoryContentTest.java
@@ -23,11 +23,10 @@ import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.RemoteRepository;
 import org.apache.archiva.repository.RemoteRepositoryContent;
 import org.apache.archiva.repository.content.maven2.RemoteDefaultRepositoryContent;
-import org.apache.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.LayoutException;
 import org.junit.Before;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 import java.util.List;
 
 /**
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java
index 74b2c0df8..f46dfa2d0 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/DefaultPathParserTest.java
@@ -20,8 +20,8 @@ package org.apache.archiva.repository.content.maven2;
  */
 
 import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.repository.LayoutException;
 import org.apache.archiva.repository.content.PathParser;
-import org.apache.archiva.repository.layout.LayoutException;
 import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
 import org.apache.commons.lang.StringUtils;
 import org.junit.Test;
@@ -152,7 +152,7 @@ public class DefaultPathParserTest
      * [MRM-432] Oddball version spec.
      * Example of an oddball / unusual version spec.
      *
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      */
     @Test
     public void testGoodButOddVersionSpecGanymedSsh2()
@@ -172,7 +172,7 @@ public class DefaultPathParserTest
      * [MRM-432] Oddball version spec.
      * Example of an oddball / unusual version spec.
      *
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      */
     @Test
     public void testGoodButOddVersionSpecJavaxComm()
@@ -192,7 +192,7 @@ public class DefaultPathParserTest
      * Test the ejb-client type spec.
      * Type specs are not a 1 to 1 map to the extension.
      * This tests that effect.
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      */
     /* TODO: Re-enabled in the future.
     public void testGoodFooEjbClient()
@@ -213,7 +213,7 @@ public class DefaultPathParserTest
      * [MRM-432] Oddball version spec.
      * Example of an oddball / unusual version spec.
      *
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      */
     @Test
     public void testGoodButOddVersionSpecJavaxPersistence()
@@ -333,7 +333,7 @@ public class DefaultPathParserTest
     /**
      * Test the classifier, and java-source type spec.
      *
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      */
     @Test
     public void testGoodFooLibSources()
@@ -352,7 +352,7 @@ public class DefaultPathParserTest
     /**
      * A timestamped versioned artifact, should reside in a SNAPSHOT baseversion directory.
      *
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      */
     @Test
     public void testGoodSnapshotMavenTest()
@@ -372,7 +372,7 @@ public class DefaultPathParserTest
     /**
      * A timestamped versioned artifact, should reside in a SNAPSHOT baseversion directory.
      *
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      */
     @Test
     public void testGoodLongSnapshotMavenTest()
@@ -401,7 +401,7 @@ public class DefaultPathParserTest
     /**
      * A timestamped versioned artifact, should reside in a SNAPSHOT baseversion directory.
      *
-     * @throws org.apache.archiva.repository.layout.LayoutException
+     * @throws LayoutException
      */
     @Test
     public void testClassifiedSnapshotMavenTest()
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java
index 928482b18..f918c1873 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/content/maven2/RepositoryRequestTest.java
@@ -24,7 +24,7 @@ import org.apache.archiva.configuration.ArchivaConfiguration;
 import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.RepositoryContentProvider;
-import org.apache.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.LayoutException;
 import org.apache.archiva.repository.maven2.MavenManagedRepository;
 import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
 import org.apache.commons.lang.StringUtils;
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
index 650f49fff..7bbf4cb6f 100644
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
+++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
@@ -19,7 +19,6 @@ package org.apache.archiva.repository.metadata;
  * under the License.
  */
 
-import org.apache.archiva.admin.model.beans.ManagedRepository;
 import org.apache.archiva.common.utils.VersionComparator;
 import org.apache.archiva.configuration.ProxyConnectorConfiguration;
 import org.apache.archiva.metadata.repository.storage.maven2.conf.MockConfiguration;
@@ -33,7 +32,7 @@ import org.apache.archiva.repository.AbstractRepositoryLayerTestCase;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.RemoteRepositoryContent;
 import org.apache.archiva.repository.RepositoryContentProvider;
-import org.apache.archiva.repository.layout.LayoutException;
+import org.apache.archiva.repository.LayoutException;
 import org.apache.archiva.repository.maven2.MavenManagedRepository;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;