summaryrefslogtreecommitdiffstats
path: root/archiva-modules
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2011-10-05 16:44:02 +0000
committerOlivier Lamy <olamy@apache.org>2011-10-05 16:44:02 +0000
commit621a98296ff6fb128f07a7670401a24a3c09e398 (patch)
tree9d1d8083edd0d765f69c55792f9b0c3059304a33 /archiva-modules
parent3ed9b80b3827c63255967149b196aa88aa76e7b2 (diff)
downloadarchiva-621a98296ff6fb128f07a7670401a24a3c09e398.tar.gz
archiva-621a98296ff6fb128f07a7670401a24a3c09e398.zip
move jcr related classes to store-jcr module
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1179311 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
-rwxr-xr-xarchiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml4
-rw-r--r--archiva-modules/plugins/metadata-store-jcr/pom.xml2
-rw-r--r--archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java (renamed from archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java)4
-rw-r--r--archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml2
-rw-r--r--archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml (renamed from archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml)0
5 files changed, 8 insertions, 4 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
index 13ffc0015..633a11516 100755
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
@@ -38,9 +38,11 @@
<bean id="jcr-repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown" lazy-init="true">
<constructor-arg ref="jcr-config"/>
</bean>
- <bean id="jcr-config" class="org.apache.archiva.web.startup.ArchivaJcrRepositoryConfig" factory-method="create">
+
+ <bean id="jcr-config" class="org.apache.archiva.metadata.repository.jcr.ArchivaJcrRepositoryConfig" factory-method="create">
<constructor-arg value="${appserver.base}/conf/repository.xml"/>
<constructor-arg value="${appserver.base}/jcr"/>
</bean>
+
</beans> \ No newline at end of file
diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index b4138bf71..347af4203 100644
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <scope>test</scope>
+ <scope>provided</scope>
<!-- could trim more, but since it's just for test we don't need to worry -->
<exclusions>
<exclusion>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
index 54bc98ba1..e6e5740c4 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.web.startup;
+package org.apache.archiva.metadata.repository.jcr;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -43,7 +43,7 @@ public class ArchivaJcrRepositoryConfig
File configurationFile = new File( file );
if ( !configurationFile.exists( ) )
{
- String resourcePath = "org/apache/archiva/repository.xml";
+ String resourcePath = "org/apache/archiva/metadata/repository/jcr/repository.xml";
LoggerFactory.getLogger( ArchivaJcrRepositoryConfig.class ).info(
"no repository.xml file in path {} so use default from resources path {}", file, resourcePath );
// use bundled repository.xml
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml b/archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
index 878017083..fd2e154b5 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
@@ -30,4 +30,6 @@
<context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.metadata.repository.jcr"/>
+
+
</beans> \ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml b/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml
index 4cf264f3e..4cf264f3e 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml