Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olivier Lamy 2011-10-05 16:44:02 +00:00
parent 3ed9b80b38
commit 621a98296f
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
View File

@ -38,9 +38,11 @@
<bean id="jcr-repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown" lazy-init="true"> <bean id="jcr-repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown" lazy-init="true">
<constructor-arg ref="jcr-config"/> <constructor-arg ref="jcr-config"/>
</bean> </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}/conf/repository.xml"/>
<constructor-arg value="${appserver.base}/jcr"/> <constructor-arg value="${appserver.base}/jcr"/>
</bean> </bean>
</beans> </beans>

2
archiva-modules/plugins/metadata-store-jcr/pom.xml
View File

@ -60,7 +60,7 @@
<dependency> <dependency>
<groupId>org.apache.jackrabbit</groupId> <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId> <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 --> <!-- could trim more, but since it's just for test we don't need to worry -->
<exclusions> <exclusions>
<exclusion> <exclusion>

4
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java → archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
View File

@ -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 * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file
@ -43,7 +43,7 @@ public class ArchivaJcrRepositoryConfig
File configurationFile = new File( file ); File configurationFile = new File( file );
if ( !configurationFile.exists( ) ) 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( LoggerFactory.getLogger( ArchivaJcrRepositoryConfig.class ).info(
"no repository.xml file in path {} so use default from resources path {}", file, resourcePath ); "no repository.xml file in path {} so use default from resources path {}", file, resourcePath );
// use bundled repository.xml // use bundled repository.xml

2
archiva-modules/plugins/metadata-store-jcr/src/main/resources/META-INF/spring-context.xml
View File

@ -30,4 +30,6 @@
<context:annotation-config/> <context:annotation-config/>
<context:component-scan base-package="org.apache.archiva.metadata.repository.jcr"/> <context:component-scan base-package="org.apache.archiva.metadata.repository.jcr"/>
</beans> </beans>

0
archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml → archiva-modules/plugins/metadata-store-jcr/src/main/resources/org/apache/archiva/metadata/repository/jcr/repository.xml
View File