This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/master by this push:
new 5d058d7 Moving metadata store providers to metadata folder
5d058d7 is described below
commit 5d058d7f4d93254291e456d2f8cb722159d053aa
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sun Jun 28 10:00:07 2020 +0200
Moving metadata store providers to metadata folder
---
archiva-modules/archiva-web/archiva-webapp/pom.xml | 21 ---------------
.../metadata-store-cassandra/pom.xml | 5 ++--
.../cassandra/CassandraArchivaManager.java | 0
.../cassandra/CassandraMetadataRepository.java | 0
.../CassandraRepositorySessionFactory.java | 0
.../repository/cassandra/CassandraUtils.java | 0
.../cassandra/DefaultCassandraArchivaManager.java | 0
.../cassandra/model/ArtifactMetadataModel.java | 0
.../repository/cassandra/model/ColumnNames.java | 0
.../cassandra/model/MetadataFacetModel.java | 0
.../repository/cassandra/model/Namespace.java | 0
.../repository/cassandra/model/Project.java | 0
.../model/ProjectVersionMetadataModel.java | 0
.../repository/cassandra/model/Repository.java | 0
.../src/main/resources/META-INF/spring-context.xml | 0
.../resources/default-archiva-cassandra.properties | 0
.../filtered-resources/META-INF/spring-context.xml | 0
.../cassandra/CassandraMetadataRepositoryTest.java | 0
.../cassandra/MockRepositoryStorage.java | 0
.../cassandra/RepositoriesNamespaceTest.java | 0
.../src/test/resources/log4j2-test.xml | 0
.../metadata-store-file/pom.xml | 5 ++--
.../repository/file/FileMetadataRepository.java | 0
.../file/FileRepositorySessionFactory.java | 0
.../src/main/resources/META-INF/spring-context.xml | 0
.../file/FileMetadataRepositoryTest.java | 0
.../oak-jcr}/metadata-store-jcr/pom.xml | 5 ++--
.../metadata/repository/jcr/JcrConstants.java | 0
.../repository/jcr/JcrMetadataRepository.java | 0
.../repository/jcr/JcrRepositorySession.java | 0
.../jcr/JcrRepositorySessionFactory.java | 0
.../repository/jcr/OakRepositoryFactory.java | 0
.../src/main/resources/META-INF/spring-context.xml | 0
.../archiva/metadata/repository/jcr/jcr-schema.cnd | 0
.../archiva/metadata/repository/jcr/repository.xml | 0
.../filtered-resources/META-INF/spring-context.xml | 0
.../repository/jcr/JcrMetadataRepositoryTest.java | 0
.../JcrRepositoryStatisticsGatheringTest.java | 0
.../metadata-store-jcr/src/test/repository.xml | 0
.../src/test/resources/artifacts.xml | 0
.../src/test/resources/log4j2-test.xml | 0
.../oak-jcr}/oak-jcr-lucene/.gitignore | 0
.../oak-jcr/oak-jcr-lucene/README.md | 14 ++++++++++
.../oak-jcr}/oak-jcr-lucene/pom.xml | 8 +++++-
.../{ => metadata-store-provider/oak-jcr}/pom.xml | 30 +++++++++++-----------
.../metadata/{ => metadata-store-provider}/pom.xml | 30 +++++++++++-----------
archiva-modules/metadata/pom.xml | 1 +
archiva-modules/plugins/pom.xml | 4 ---
48 files changed, 61 insertions(+), 62 deletions(-)
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml
b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index ca71b12..3d51bed 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -275,27 +275,6 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-lucene-consumers</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queries</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-memory</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-highlighter</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.archiva</groupId>
<artifactId>stage-repository-merge</artifactId>
</dependency>
<dependency>
diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
similarity index 98%
rename from archiva-modules/plugins/metadata-store-cassandra/pom.xml
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
index 07e066b..77beb35 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml
+++
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
@@ -21,12 +21,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>plugins</artifactId>
+ <artifactId>metadata-store-provider</artifactId>
<groupId>org.apache.archiva</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>metadata-store-cassandra</artifactId>
- <name>Archiva Core Plugins :: Cassandra Storage for Metadata</name>
+ <name>Archiva Metadata :: Store Provider :: Cassandra</name>
+ <description>Metadata Provider using Cassandra as backend</description>
<properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base>
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraArchivaManager.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraRepositorySessionFactory.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraUtils.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraUtils.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraUtils.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraUtils.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ArtifactMetadataModel.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ArtifactMetadataModel.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ArtifactMetadataModel.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ArtifactMetadataModel.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ColumnNames.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ColumnNames.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ColumnNames.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ColumnNames.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/MetadataFacetModel.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/MetadataFacetModel.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/MetadataFacetModel.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/MetadataFacetModel.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Namespace.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Namespace.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Namespace.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Namespace.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Project.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Project.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Project.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Project.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/ProjectVersionMetadataModel.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Repository.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Repository.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Repository.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/model/Repository.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/resources/META-INF/spring-context.xml
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/resources/META-INF/spring-context.xml
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/main/resources/META-INF/spring-context.xml
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/resources/META-INF/spring-context.xml
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/main/resources/default-archiva-cassandra.properties
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/resources/default-archiva-cassandra.properties
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/main/resources/default-archiva-cassandra.properties
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/main/resources/default-archiva-cassandra.properties
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/test/filtered-resources/META-INF/spring-context.xml
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/test/filtered-resources/META-INF/spring-context.xml
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/test/filtered-resources/META-INF/spring-context.xml
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/test/filtered-resources/META-INF/spring-context.xml
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/MockRepositoryStorage.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/MockRepositoryStorage.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/MockRepositoryStorage.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/MockRepositoryStorage.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
diff --git
a/archiva-modules/plugins/metadata-store-cassandra/src/test/resources/log4j2-test.xml
b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/test/resources/log4j2-test.xml
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-cassandra/src/test/resources/log4j2-test.xml
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/src/test/resources/log4j2-test.xml
diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml
b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/pom.xml
similarity index 95%
rename from archiva-modules/plugins/metadata-store-file/pom.xml
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-file/pom.xml
index 04ca69f..573b7d3 100644
--- a/archiva-modules/plugins/metadata-store-file/pom.xml
+++
b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/pom.xml
@@ -20,12 +20,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>plugins</artifactId>
+ <artifactId>metadata-store-provider</artifactId>
<groupId>org.apache.archiva</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>metadata-store-file</artifactId>
- <name>Archiva Core Plugins :: File System Backed Metadata Repository</name>
+ <name>Archiva Metadata :: Store Provider :: File System</name>
+ <description>Metadata Provider based on file system</description>
<properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base>
diff --git
a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
diff --git
a/archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileRepositorySessionFactory.java
diff --git
a/archiva-modules/plugins/metadata-store-file/src/main/resources/META-INF/spring-context.xml
b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/main/resources/META-INF/spring-context.xml
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-file/src/main/resources/META-INF/spring-context.xml
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/main/resources/META-INF/spring-context.xml
diff --git
a/archiva-modules/plugins/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
b/archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
rename to
archiva-modules/metadata/metadata-store-provider/metadata-store-file/src/test/java/org/apache/archiva/metadata/repository/file/FileMetadataRepositoryTest.java
diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/pom.xml
similarity index 97%
rename from archiva-modules/plugins/metadata-store-jcr/pom.xml
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/pom.xml
index 20e3a89..b764a33 100644
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/pom.xml
@@ -21,12 +21,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>plugins</artifactId>
+ <artifactId>oak-jcr</artifactId>
<groupId>org.apache.archiva</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>metadata-store-jcr</artifactId>
- <name>Archiva Core Plugins :: JCR Storage for Metadata</name>
+ <name>Archiva Metadata :: Store Provider :: JCR :: OAK</name>
+ <description>Metadata provider that uses JCR Oak as backend</description>
<properties>
<site.staging.base>${project.parent.parent.basedir}</site.staging.base>
diff --git
a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrConstants.java
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrConstants.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrConstants.java
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrConstants.java
diff --git
a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
diff --git
a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySession.java
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySession.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySession.java
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySession.java
diff --git
a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrRepositorySessionFactory.java
diff --git
a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/OakRepositoryFactory.java
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/OakRepositoryFactory.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/OakRepositoryFactory.java
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/OakRepositoryFactory.java
diff --git
a/archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
diff --git
a/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/jcr-schema.cnd
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/jcr-schema.cnd
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/jcr-schema.cnd
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/jcr-schema.cnd
diff --git
a/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml
diff --git
a/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
diff --git
a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
diff --git
a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/repository.xml
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/repository.xml
similarity index 100%
rename from archiva-modules/plugins/metadata-store-jcr/src/test/repository.xml
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/repository.xml
diff --git
a/archiva-modules/plugins/metadata-store-jcr/src/test/resources/artifacts.xml
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/resources/artifacts.xml
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-jcr/src/test/resources/artifacts.xml
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/resources/artifacts.xml
diff --git
a/archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/resources/log4j2-test.xml
similarity index 100%
rename from
archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/resources/log4j2-test.xml
diff --git a/archiva-modules/plugins/oak-jcr-lucene/.gitignore
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/oak-jcr-lucene/.gitignore
similarity index 100%
rename from archiva-modules/plugins/oak-jcr-lucene/.gitignore
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/oak-jcr-lucene/.gitignore
diff --git
a/archiva-modules/metadata/metadata-store-provider/oak-jcr/oak-jcr-lucene/README.md
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/oak-jcr-lucene/README.md
new file mode 100644
index 0000000..360e87f
--- /dev/null
+++
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/oak-jcr-lucene/README.md
@@ -0,0 +1,14 @@
+oak-jcr-lucene
+==============
+
+
+This module is only to provide the oak-lucene dependency with lucene shaded
into a different
+java package.
+Jackrabbit Oak has dependencies to Apache Lucene 4, which is very old and
merely out of support.
+
+We move the lucene dependencies to the package shaded_oak.org.apache.lucene to
allow using
+a more recent version for Archiva.
+
+For some reason the oak-lucene (1.22.3) package is a fat jar that contains the
lucene classes itself,
+therefore we are excluding the lucene dependencies in the pom.
+
diff --git a/archiva-modules/plugins/oak-jcr-lucene/pom.xml
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/oak-jcr-lucene/pom.xml
similarity index 93%
rename from archiva-modules/plugins/oak-jcr-lucene/pom.xml
rename to
archiva-modules/metadata/metadata-store-provider/oak-jcr/oak-jcr-lucene/pom.xml
index 63be95a..7b96010 100644
--- a/archiva-modules/plugins/oak-jcr-lucene/pom.xml
+++
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/oak-jcr-lucene/pom.xml
@@ -21,19 +21,22 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>plugins</artifactId>
+ <artifactId>oak-jcr</artifactId>
<groupId>org.apache.archiva</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>oak-jcr-lucene</artifactId>
+ <name>Archiva Metadata :: Store Provider :: JCR :: Shaded OAK Lucene</name>
+ <description>This module shades the lucene dependencies of jcr oak to avoid
version conflicts</description>
<dependencies>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-lucene</artifactId>
<version>${jcr-oak.version}</version>
+ <!-- Lucene classes are included already in the oak-lucene.jar, so we
exclude this dependency -->
<exclusions>
<exclusion>
<groupId>org.apache.lucene</groupId>
@@ -69,6 +72,8 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- We reapply the original transitive dependencies -->
+ <!-- If you change the version of jcr-oak you may have to check the
dependencies -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-api</artifactId>
@@ -110,6 +115,7 @@
<configuration>
<excludes>
<exclude>dependency-reduced-pom.xml</exclude>
+ <exclude>README.md</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/archiva-modules/metadata/pom.xml
b/archiva-modules/metadata/metadata-store-provider/oak-jcr/pom.xml
similarity index 61%
copy from archiva-modules/metadata/pom.xml
copy to archiva-modules/metadata/metadata-store-provider/oak-jcr/pom.xml
index 10735d4..60c52c5 100644
--- a/archiva-modules/metadata/pom.xml
+++ b/archiva-modules/metadata/metadata-store-provider/oak-jcr/pom.xml
@@ -8,8 +8,7 @@
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,25 +16,26 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>archiva-modules</artifactId>
+ <artifactId>metadata-store-provider</artifactId>
<groupId>org.apache.archiva</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>metadata</artifactId>
- <name>Archiva :: Metadata</name>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
- <properties>
- <site.staging.base>${project.parent.basedir}</site.staging.base>
- </properties>
+ <artifactId>oak-jcr</artifactId>
+ <name>Archiva Metadata :: Store Provider :: JCR :: Parent</name>
+ <description>Parent module for the JCR Provider</description>
+ <packaging>pom</packaging>
<modules>
- <module>metadata-model</module>
- <module>metadata-repository-api</module>
- <module>metadata-statistics-api</module>
- <module>test-repository</module>
+ <module>oak-jcr-lucene</module>
+ <module>metadata-store-jcr</module>
</modules>
+
+
</project>
\ No newline at end of file
diff --git a/archiva-modules/metadata/pom.xml
b/archiva-modules/metadata/metadata-store-provider/pom.xml
similarity index 61%
copy from archiva-modules/metadata/pom.xml
copy to archiva-modules/metadata/metadata-store-provider/pom.xml
index 10735d4..fb17414 100644
--- a/archiva-modules/metadata/pom.xml
+++ b/archiva-modules/metadata/metadata-store-provider/pom.xml
@@ -8,8 +8,7 @@
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,25 +16,26 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>archiva-modules</artifactId>
+ <artifactId>metadata</artifactId>
<groupId>org.apache.archiva</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>metadata</artifactId>
- <name>Archiva :: Metadata</name>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
- <properties>
- <site.staging.base>${project.parent.basedir}</site.staging.base>
- </properties>
+ <artifactId>metadata-store-provider</artifactId>
+ <packaging>pom</packaging>
+ <name>Archiva Metadata :: Store Provider</name>
<modules>
- <module>metadata-model</module>
- <module>metadata-repository-api</module>
- <module>metadata-statistics-api</module>
- <module>test-repository</module>
+ <module>metadata-store-file</module>
+ <module>metadata-store-cassandra</module>
+ <module>oak-jcr</module>
</modules>
+
+
</project>
\ No newline at end of file
diff --git a/archiva-modules/metadata/pom.xml b/archiva-modules/metadata/pom.xml
index 10735d4..90eda55 100644
--- a/archiva-modules/metadata/pom.xml
+++ b/archiva-modules/metadata/pom.xml
@@ -37,5 +37,6 @@
<module>metadata-repository-api</module>
<module>metadata-statistics-api</module>
<module>test-repository</module>
+ <module>metadata-store-provider</module>
</modules>
</project>
\ No newline at end of file
diff --git a/archiva-modules/plugins/pom.xml b/archiva-modules/plugins/pom.xml
index b5d0712..a44a511 100644
--- a/archiva-modules/plugins/pom.xml
+++ b/archiva-modules/plugins/pom.xml
@@ -33,15 +33,11 @@
</properties>
<modules>
- <module>metadata-store-file</module>
<module>repository-statistics</module>
<module>problem-reports</module>
<module>audit</module>
<module>stage-repository-merge</module>
<module>generic-metadata-support</module>
- <module>metadata-store-jcr</module>
- <module>metadata-store-cassandra</module>
- <module>oak-jcr-lucene</module>
</modules>
</project>
