Author: brett
Date: Thu Jan 20 04:48:01 2011
New Revision: 1061123
URL: http://svn.apache.org/viewvc?rev=1061123&view=rev
Log:
[MRM-1327] set JCR as default repository
Merged from: r1053790, 1053808
Modified:
archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Modified:
archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1061123&r1=1061122&r2=1061123&view=diff
==============================================================================
---
archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml
(original)
+++
archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/pom.xml
Thu Jan 20 04:48:01 2011
@@ -280,10 +280,17 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>metadata-repository-file</artifactId>
+ <artifactId>metadata-store-jcr</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>${jackrabbit.version}</version>
+ <scope>runtime</scope>
+ <!-- FIXME: exclude dependencies that aren't needed -->
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva</groupId>
<!-- FIXME: temporary coupling to plugin, should be runtime -->
<artifactId>maven2-repository</artifactId>
Modified:
archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=1061123&r1=1061122&r2=1061123&view=diff
==============================================================================
---
archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
Thu Jan 20 04:48:01 2011
@@ -7,7 +7,15 @@
<bean id="loggerManager"
class="org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager"
init-method="initialize"/>
- <alias name="repositorySessionFactory#file"
alias="repositorySessionFactory"/>
+ <alias name="repositorySessionFactory#jcr" alias="repositorySessionFactory"/>
+ <bean id="repository" class="org.apache.jackrabbit.core.RepositoryImpl"
destroy-method="shutdown">
+ <constructor-arg ref="config"/>
+ </bean>
+ <bean id="config" class="org.apache.jackrabbit.core.config.RepositoryConfig"
factory-method="create">
+ <!-- FIXME: better arguments needed? -->
+ <constructor-arg value="${appserver.base}/conf/repository.xml"/>
+ <constructor-arg value="${appserver.base}/data/jcr"/>
+ </bean>
<bean name="wagon#http"
class="org.apache.maven.wagon.providers.http.LightweightHttpWagon"
scope="prototype">
<property name="httpHeaders">
