Author: ate
Date: Wed Oct 10 12:15:17 2012
New Revision: 1396560
URL: http://svn.apache.org/viewvc?rev=1396560&view=rev
Log:
RAVE-693: keep sandbox-content-services in sync with latest Rave trunk
- bump to Rave 0.17-SNAPSHOT
- bump to latest Jackrabbit 2.4.3
- use h2database for rave-jcr (instead of default Derby)
- ensure rave-jcr-console uses same spring 3.1.2 and jackrabbit 2.4.3 versions
Added:
rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/repository.xml
(with props)
Modified:
rave/sandbox/content-services/pom.xml
rave/sandbox/content-services/rave-jcr-console/pom.xml
rave/sandbox/content-services/rave-jcr/pom.xml
rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/web.xml
Modified: rave/sandbox/content-services/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/pom.xml?rev=1396560&r1=1396559&r2=1396560&view=diff
==============================================================================
--- rave/sandbox/content-services/pom.xml (original)
+++ rave/sandbox/content-services/pom.xml Wed Oct 10 12:15:17 2012
@@ -41,12 +41,13 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <apache.rave.version>0.16-SNAPSHOT</apache.rave.version>
+ <apache.rave.version>0.17-SNAPSHOT</apache.rave.version>
<apache.wookie.version>0.10.0-incubating</apache.wookie.version>
- <apache.jackrabbit.version>2.4.1</apache.jackrabbit.version>
+ <apache.jackrabbit.version>2.4.3</apache.jackrabbit.version>
<apache.tika.version>1.2</apache.tika.version>
<apacheds.version>1.5.5</apacheds.version>
<org.springframework.version>3.1.2.RELEASE</org.springframework.version>
+ <com.h2database.version>1.3.167</com.h2database.version>
<javax.jcr.version>2.0</javax.jcr.version>
<servlet-api.version>2.5</servlet-api.version>
Modified: rave/sandbox/content-services/rave-jcr-console/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-console/pom.xml?rev=1396560&r1=1396559&r2=1396560&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-jcr-console/pom.xml (original)
+++ rave/sandbox/content-services/rave-jcr-console/pom.xml Wed Oct 10 12:15:17
2012
@@ -33,7 +33,6 @@
<properties>
<hippo-jcr-console.version>1.01.00-SNAPSHOT</hippo-jcr-console.version>
-
<hippo-jcr-console.springframework.version>3.1.2.RELEASE</hippo-jcr-console.springframework.version>
</properties>
<!-- temporarily add hippo snapshot repository until hippo-jcr-console is
released -->
@@ -70,6 +69,18 @@
<type>war</type>
</dependency>
+ <!-- override jackrabbit dependencies to ensure same versions are used -->
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>${apache.jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-servlet</artifactId>
+ <version>${apache.jackrabbit.version}</version>
+ </dependency>
+
<!-- override spring dependencies to make them same version as used in
Rave -->
<dependency>
<groupId>org.springframework</groupId>
@@ -122,10 +133,35 @@
<version>${org.springframework.version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${org.springframework.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-taglibs</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-acl</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
<!-- adding slf4j and log4j dependencies to be bundled (not provided) -->
<dependency>
Modified: rave/sandbox/content-services/rave-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr/pom.xml?rev=1396560&r1=1396559&r2=1396560&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-jcr/pom.xml (original)
+++ rave/sandbox/content-services/rave-jcr/pom.xml Wed Oct 10 12:15:17 2012
@@ -54,6 +54,12 @@
<artifactId>jackrabbit-core</artifactId>
<version>${apache.jackrabbit.version}</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -61,6 +67,12 @@
<version>${apache.jackrabbit.version}</version>
</dependency>
<dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${com.h2database.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>compile</scope>
Added:
rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/repository.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/repository.xml?rev=1396560&view=auto
==============================================================================
---
rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/repository.xml
(added)
+++
rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/repository.xml
Wed Oct 10 12:15:17 2012
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "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
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!DOCTYPE Repository
+ PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 2.0//EN"
+ "http://jackrabbit.apache.org/dtd/repository-2.0.dtd";>
+<Repository>
+
+ <!--
+ virtual file system where the repository stores global state
+ (e.g. registered namespaces, custom node types, etc.)
+ -->
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/repository"/>
+ </FileSystem>
+
+ <!--
+ data store configuration
+ -->
+ <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"/>
+
+ <!--
+ security configuration
+ -->
+ <Security appName="Jackrabbit">
+ <!--
+ security manager:
+ class: FQN of class implementing the JackrabbitSecurityManager
interface
+ -->
+ <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager"
workspaceName="security">
+ <!--
+ workspace access:
+ class: FQN of class implementing the WorkspaceAccessManager interface
+ -->
+ <!-- <WorkspaceAccessManager class="..."/> -->
+ <!-- <param name="config" value="${rep.home}/security.xml"/> -->
+ </SecurityManager>
+
+ <!--
+ access manager:
+ class: FQN of class implementing the AccessManager interface
+ -->
+ <AccessManager
class="org.apache.jackrabbit.core.security.DefaultAccessManager">
+ <!-- <param name="config" value="${rep.home}/access.xml"/> -->
+ </AccessManager>
+
+ <LoginModule
class="org.apache.jackrabbit.core.security.authentication.DefaultLoginModule">
+ <!--
+ anonymous user name ('anonymous' is the default value)
+ -->
+ <param name="anonymousId" value="anonymous"/>
+ <!--
+ administrator user id (default value if param is missing is 'admin')
+ -->
+ <param name="adminId" value="admin"/>
+ </LoginModule>
+ </Security>
+
+ <!--
+ location of workspaces root directory and name of default workspace
+ -->
+ <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
+ <!--
+ workspace configuration template:
+ used to create the initial workspace if there's no workspace yet
+ -->
+ <Workspace name="${wsp.name}">
+ <!--
+ virtual file system of the workspace:
+ class: FQN of class implementing the FileSystem interface
+ -->
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${wsp.home}"/>
+ </FileSystem>
+
+ <!--
+ persistence manager of the workspace:
+ class: FQN of class implementing the PersistenceManager interface
+ -->
+ <PersistenceManager
class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
+ <param name="url" value="jdbc:h2:file:${wsp.home}/db"/>
+ <param name="schemaObjectPrefix" value="${wsp.name}_"/>
+ <param name="minBlobSize" value="4194304"/>
+ </PersistenceManager>
+
+ <!--
+ Search index and the file system it uses.
+ class: FQN of class implementing the QueryHandler interface
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${wsp.home}/index"/>
+ <param name="supportHighlighting" value="true"/>
+ </SearchIndex>
+ </Workspace>
+
+ <!--
+ Configures the versioning
+ -->
+ <Versioning rootPath="${rep.home}/version">
+ <!--
+ Configures the filesystem to use for versioning for the respective
+ persistence manager
+ -->
+ <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+ <param name="path" value="${rep.home}/version" />
+ </FileSystem>
+
+ <!--
+ Configures the persistence manager to be used for persisting version
state.
+ Please note that the current versioning implementation is based on
+ a 'normal' persistence manager, but this could change in future
+ implementations.
+ -->
+ <PersistenceManager
class="org.apache.jackrabbit.core.persistence.pool.H2PersistenceManager">
+ <param name="url" value="jdbc:h2:file:${rep.home}/version/db"/>
+ <param name="schemaObjectPrefix" value="version_"/>
+ <param name="minBlobSize" value="4194304"/>
+ </PersistenceManager>
+ </Versioning>
+
+ <!--
+ Search index for content that is shared repository wide
+ (/jcr:system tree, contains mainly versions)
+ -->
+ <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+ <param name="path" value="${rep.home}/repository/index"/>
+ <param name="supportHighlighting" value="true"/>
+ </SearchIndex>
+
+ <!--
+ Run with a cluster journal
+ -->
+ <Cluster id="node1">
+ <Journal class="org.apache.jackrabbit.core.journal.MemoryJournal"/>
+ </Cluster>
+
+</Repository>
Propchange:
rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/repository.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/repository.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange:
rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/repository.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/web.xml?rev=1396560&r1=1396559&r2=1396560&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/web.xml
(original)
+++ rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/web.xml Wed
Oct 10 12:15:17 2012
@@ -45,7 +45,7 @@
<param-name>repository.home</param-name>
<param-value>WEB-INF/storage</param-value>
</init-param>
-<!--
+
<init-param>
<description>The location of the repository configuration file. Unless
the location
starts with file: or /, the location is resolved as context relative.
@@ -55,7 +55,6 @@
<param-name>repository.config</param-name>
<param-value>WEB-INF/repository.xml</param-value>
</init-param>
--->
<load-on-startup>0</load-on-startup>
</servlet>
