diff options
| author | Brett Porter <brett@apache.org> | 2011-01-20 04:48:01 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2011-01-20 04:48:01 +0000 |
| commit | 5ac2cdbf96d0039dab2631d4b70cf848bbe18ea3 (patch) | |
| tree | 158caba5dbc07c03560448130fddaf8367567595 | |
| parent | 9bdfddc1d3d4f804cf497a4951c75f132e33ad5f (diff) | |
| download | archiva-5ac2cdbf96d0039dab2631d4b70cf848bbe18ea3.tar.gz archiva-5ac2cdbf96d0039dab2631d4b70cf848bbe18ea3.zip | |
[MRM-1327] set JCR as default repository
Merged from: r1053790, 1053808
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-1327-jcr-backend-default@1061123 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 9 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml | 10 |
2 files changed, 17 insertions, 2 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 778230519..3899dfb7c 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml index 6cf66939e..aabbe9be7 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml @@ -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"> |