Author: olamy
Date: Wed Oct 5 16:44:02 2011
New Revision: 1179311
URL: http://svn.apache.org/viewvc?rev=1179311&view=rev
Log:
move jcr related classes to store-jcr module
Added:
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
(contents, props changed)
- copied, changed from r1179247,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml
(contents, props changed)
- copied, changed from r1179247,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml?rev=1179311&r1=1179310&r2=1179311&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
Wed Oct 5 16:44:02 2011
@@ -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
Modified: archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml?rev=1179311&r1=1179310&r2=1179311&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-store-jcr/pom.xml Wed Oct 5
16:44:02 2011
@@ -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>
Copied:
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
(from r1179247,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java?p2=archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java&r1=1179247&r2=1179311&rev=1179311&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
Wed Oct 5 16:44:02 2011
@@ -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
Propchange:
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml?rev=1179311&r1=1179310&r2=1179311&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
Wed Oct 5 16:44:02 2011
@@ -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
Copied:
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml
(from r1179247,
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml?p2=archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml&r1=1179247&r2=1179311&rev=1179311&view=diff
==============================================================================
(empty)
Propchange:
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
