Author: brett
Date: Thu Dec 30 02:34:50 2010
New Revision: 1053790
URL: http://svn.apache.org/viewvc?rev=1053790&view=rev
Log:
[MRM-1327] switch to JCR-based backend as the default
Added:
archiva/branches/MRM-1327-jcr-backend-default/archiva-jetty/src/main/conf/repository.xml
- copied, changed from r1051757,
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/test/repository.xml
archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/repository.xml
- copied, changed from r1051757,
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/test/repository.xml
archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml
- copied, changed from r1051757,
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/test/repository.xml
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
Copied:
archiva/branches/MRM-1327-jcr-backend-default/archiva-jetty/src/main/conf/repository.xml
(from r1051757,
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/test/repository.xml)
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-jetty/src/main/conf/repository.xml?p2=archiva/branches/MRM-1327-jcr-backend-default/archiva-jetty/src/main/conf/repository.xml&p1=archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/test/repository.xml&r1=1051757&r2=1053790&rev=1053790&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/test/repository.xml
(original)
+++
archiva/branches/MRM-1327-jcr-backend-default/archiva-jetty/src/main/conf/repository.xml
Thu Dec 30 02:34:50 2010
@@ -7,7 +7,7 @@
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
@@ -21,10 +21,9 @@
"http://jackrabbit.apache.org/dtd/repository-1.6.dtd";>
<Repository>
- <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
- <!--<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
<param name="path" value="${rep.home}/repository"/>
-</FileSystem> -->
+ </FileSystem>
<Security appName="Jackrabbit">
<SecurityManager
class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
workspaceName="security"/>
<AccessManager
class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager"/>
@@ -32,8 +31,6 @@
</Security>
<Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
<Workspace name="${wsp.name}">
- <!--<FileSystem
class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>-->
- <!--<PersistenceManager
class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager"/>-->
<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
<param name="path" value="${wsp.home}"/>
</FileSystem>
@@ -43,11 +40,9 @@
</SearchIndex>
</Workspace>
<Versioning rootPath="${rep.home}/version">
- <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
- <PersistenceManager
class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager"/>
- <!--<FileSystem
class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${rep.home}/version"/>
- </FileSystem>
- <PersistenceManager
class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager"/>-->
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/version"/>
+ </FileSystem>
+ <PersistenceManager
class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager"/>
</Versioning>
</Repository>
Copied:
archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/repository.xml
(from r1051757,
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/test/repository.xml)
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/repository.xml?p2=archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/repository.xml&p1=archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/test/repository.xml&r1=1051757&r2=1053790&rev=1053790&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/test/repository.xml
(original)
+++
archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/repository.xml
Thu Dec 30 02:34:50 2010
@@ -7,7 +7,7 @@
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
@@ -21,10 +21,9 @@
"http://jackrabbit.apache.org/dtd/repository-1.6.dtd";>
<Repository>
- <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
- <!--<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
<param name="path" value="${rep.home}/repository"/>
-</FileSystem> -->
+ </FileSystem>
<Security appName="Jackrabbit">
<SecurityManager
class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
workspaceName="security"/>
<AccessManager
class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager"/>
@@ -32,8 +31,6 @@
</Security>
<Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
<Workspace name="${wsp.name}">
- <!--<FileSystem
class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>-->
- <!--<PersistenceManager
class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager"/>-->
<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
<param name="path" value="${wsp.home}"/>
</FileSystem>
@@ -43,11 +40,9 @@
</SearchIndex>
</Workspace>
<Versioning rootPath="${rep.home}/version">
- <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
- <PersistenceManager
class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager"/>
- <!--<FileSystem
class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${rep.home}/version"/>
- </FileSystem>
- <PersistenceManager
class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager"/>-->
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/version"/>
+ </FileSystem>
+ <PersistenceManager
class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager"/>
</Versioning>
</Repository>
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=1053790&r1=1053789&r2=1053790&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 Dec 30 02:34:50 2010
@@ -280,7 +280,13 @@
</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>
</dependency>
<dependency>
Copied:
archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml
(from r1051757,
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/test/repository.xml)
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml?p2=archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml&p1=archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/test/repository.xml&r1=1051757&r2=1053790&rev=1053790&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/metadata-store-jcr/src/test/repository.xml
(original)
+++
archiva/branches/MRM-1327-jcr-backend-default/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml
Thu Dec 30 02:34:50 2010
@@ -7,7 +7,7 @@
~ "License"); you may not use this file except in compliance
~ with the License. You may obtain a copy of the License at
~
- ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
@@ -21,10 +21,9 @@
"http://jackrabbit.apache.org/dtd/repository-1.6.dtd";>
<Repository>
- <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
- <!--<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
<param name="path" value="${rep.home}/repository"/>
-</FileSystem> -->
+ </FileSystem>
<Security appName="Jackrabbit">
<SecurityManager
class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
workspaceName="security"/>
<AccessManager
class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager"/>
@@ -32,8 +31,6 @@
</Security>
<Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
<Workspace name="${wsp.name}">
- <!--<FileSystem
class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>-->
- <!--<PersistenceManager
class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager"/>-->
<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
<param name="path" value="${wsp.home}"/>
</FileSystem>
@@ -43,11 +40,9 @@
</SearchIndex>
</Workspace>
<Versioning rootPath="${rep.home}/version">
- <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
- <PersistenceManager
class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager"/>
- <!--<FileSystem
class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name="path" value="${rep.home}/version"/>
- </FileSystem>
- <PersistenceManager
class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager"/>-->
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/version"/>
+ </FileSystem>
+ <PersistenceManager
class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager"/>
</Versioning>
</Repository>
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=1053790&r1=1053789&r2=1053790&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 Dec 30 02:34:50 2010
@@ -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">
