summaryrefslogtreecommitdiffstats
path: root/archiva-modules/metadata
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-10-29 20:41:00 +0000
committerOlivier Lamy <olamy@apache.org>2012-10-29 20:41:00 +0000
commit632257925a672a9634b2284b029f1b23c3eb997a (patch)
tree3aff29fba716f5c196cbe0e0ee8b8325b1011eec /archiva-modules/metadata
parentfbb9de609cd41d18bb442db5d04d093d590607dd (diff)
downloadarchiva-632257925a672a9634b2284b029f1b23c3eb997a.tar.gz
archiva-632257925a672a9634b2284b029f1b23c3eb997a.zip
[MRM-1704] Refactor to remove maven specific part from various repository/metadata apis
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1403489 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/metadata')
-rw-r--r--archiva-modules/metadata/metadata-repository-api/pom.xml9
-rw-r--r--archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryStorage.java6
-rw-r--r--archiva-modules/metadata/pom.xml3
3 files changed, 16 insertions, 2 deletions
diff --git a/archiva-modules/metadata/metadata-repository-api/pom.xml b/archiva-modules/metadata/metadata-repository-api/pom.xml
index 41b47234e..f6a362315 100644
--- a/archiva-modules/metadata/metadata-repository-api/pom.xml
+++ b/archiva-modules/metadata/metadata-repository-api/pom.xml
@@ -46,6 +46,10 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-layer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-repository-admin-api</artifactId>
</dependency>
<dependency>
@@ -83,7 +87,10 @@
javax.inject,
org.apache.archiva.metadata.model;version=${project.version},
org.springframework.stereotype;version="[3,4)",
- org.slf4j;resolution:=optional
+ org.slf4j;resolution:=optional,
+ org.apache.archiva.model,
+ org.apache.archiva.policies,
+ org.apache.archiva.repository
</Import-Package>
</instructions>
</configuration>
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryStorage.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryStorage.java
index b480a8d00..b4bd8eae4 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryStorage.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/storage/RepositoryStorage.java
@@ -23,6 +23,9 @@ import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.model.ProjectMetadata;
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
import org.apache.archiva.metadata.repository.filter.Filter;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.policies.ProxyDownloadException;
+import org.apache.archiva.repository.ManagedRepositoryContent;
import java.util.Collection;
@@ -53,4 +56,7 @@ public interface RepositoryStorage
// FIXME: reconsider this API, do we want to expose storage format in the form of a path?
ArtifactMetadata readArtifactMetadataFromPath( String repoId, String path )
throws RepositoryStorageRuntimeException;
+
+ void applyServerSideRelocation( ManagedRepositoryContent managedRepository, ArtifactReference artifact )
+ throws ProxyDownloadException;
}
diff --git a/archiva-modules/metadata/pom.xml b/archiva-modules/metadata/pom.xml
index b7baaf837..f6f41c9b4 100644
--- a/archiva-modules/metadata/pom.xml
+++ b/archiva-modules/metadata/pom.xml
@@ -30,6 +30,7 @@
<modules>
<module>metadata-model</module>
<module>metadata-repository-api</module>
+ <module>metadata-model-maven2</module>
<module>test-repository</module>
</modules>
-</project>
+</project> \ No newline at end of file