You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ma...@apache.org on 2012/08/09 16:08:02 UTC
svn commit: r1371219 - in /rave/sandbox/content-services: rave-jcr-config/
rave-jcr-config/src/main/java/org/apache/rave/jcr/config/
rave-jcr-config/src/main/java/org/apache/rave/jcr/config/exc/
rave-jcr-config/src/main/java/org/apache/rave/jcr/config/...
Author: marijan
Date: Thu Aug 9 14:08:00 2012
New Revision: 1371219
URL: http://svn.apache.org/viewvc?rev=1371219&view=rev
Log:
RAVE-695 Create new rave-jcr-ocm module providing JCR based Object Content Mapping (OCM) support
- move to own (bootstrap) module
Added:
rave/sandbox/content-services/rave-jcr-integration/page-configuration/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/pom.xml (with props)
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/ConfigManager.java (contents, props changed)
- copied, changed from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/ConfigManager.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java (contents, props changed)
- copied, changed from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/exc/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/exc/InvalidConfigurationException.java (contents, props changed)
- copied, changed from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/exc/InvalidConfigurationException.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageConfiguration.java (contents, props changed)
- copied, changed from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/JcrPageConfiguration.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageDefinition.java (contents, props changed)
- copied, changed from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/JcrPageDefinition.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java (contents, props changed)
- copied, changed from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java (contents, props changed)
- copied, changed from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java (contents, props changed)
- copied, changed from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java (contents, props changed)
- copied, changed from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/META-INF/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/META-INF/rave/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/META-INF/rave/module.json
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/rave-page-config.cnd
- copied, changed from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/resources/rave-config.cnd
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/sample-page-config.json
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/jcr/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/jcr/config/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/jcr/config/BaseConfigTest.java (contents, props changed)
- copied, changed from r1371176, rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/config/BaseConfigTest.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/jcr/config/JcrConfigManagerTest.java (contents, props changed)
- copied, changed from r1371176, rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/config/JcrConfigManagerTest.java
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/repository.xml (with props)
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/workspaces/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/workspaces/default/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/workspaces/default/workspace.xml (with props)
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/log4j.dtd (with props)
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/log4j.xml (with props)
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/org/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/org/apache/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/org/apache/rave/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/org/apache/rave/jcr/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/org/apache/rave/jcr/jackrabbit/
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/org/apache/rave/jcr/jackrabbit/repository.xml (with props)
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/repositoryHelperPool.properties (with props)
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/repositoryStubImpl.properties (with props)
rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/resources.jar
Removed:
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/ConfigManager.java
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/exc/InvalidConfigurationException.java
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/JcrPageConfiguration.java
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/JcrPageDefinition.java
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java
rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java
rave/sandbox/content-services/rave-jcr-config/src/main/resources/rave-config.cnd
rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/config/BaseConfigTest.java
rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/config/JcrConfigManagerTest.java
Modified:
rave/sandbox/content-services/rave-jcr-config/pom.xml
rave/sandbox/content-services/rave-jcr-integration/pom.xml
rave/sandbox/content-services/rave-web-hmvc/pom.xml
Modified: rave/sandbox/content-services/rave-jcr-config/pom.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-config/pom.xml?rev=1371219&r1=1371218&r2=1371219&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-jcr-config/pom.xml (original)
+++ rave/sandbox/content-services/rave-jcr-config/pom.xml Thu Aug 9 14:08:00 2012
@@ -37,10 +37,7 @@
<dependencies>
- <dependency>
- <groupId>org.apache</groupId>
- <artifactId>jackrabbit-ocm</artifactId>
- </dependency>
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
Added: rave/sandbox/content-services/rave-jcr-integration/page-configuration/pom.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/pom.xml?rev=1371219&view=auto
==============================================================================
--- rave/sandbox/content-services/rave-jcr-integration/page-configuration/pom.xml (added)
+++ rave/sandbox/content-services/rave-jcr-integration/page-configuration/pom.xml Thu Aug 9 14:08:00 2012
@@ -0,0 +1,71 @@
+<?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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.rave.sandbox.jcr</groupId>
+ <artifactId>rave-jcr-integration</artifactId>
+ <version>sandbox-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>rave-jcr-page-configuration</artifactId>
+ <name>Apache Rave :: rave-jcr-page-configuration</name>
+ <description>Apache Rave JCR Page Configuration</description>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache</groupId>
+ <artifactId>jackrabbit-ocm</artifactId>
+ </dependency>
+ <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-core</artifactId>
+ <version>${apache.jackrabbit.version}</version>
+ </dependency>
+
+ <!-- Test -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-tests</artifactId>
+ <version>${apache.jackrabbit.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ </dependencies>
+
+
+</project>
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Copied: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/ConfigManager.java (from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/ConfigManager.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/ConfigManager.java?p2=rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/ConfigManager.java&p1=rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/ConfigManager.java&r1=1371176&r2=1371219&rev=1371219&view=diff
==============================================================================
(empty)
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/ConfigManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/ConfigManager.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java (from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java?p2=rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java&p1=rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java&r1=1371176&r2=1371219&rev=1371219&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java (original)
+++ rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java Thu Aug 9 14:08:00 2012
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
public class JcrConfigManager implements ConfigManager {
private static Logger log = LoggerFactory.getLogger(JcrConfigManager.class);
- public static final String RAVE_CND = "rave-config.cnd";
+ public static final String RAVE_CND = "rave-page-config.cnd";
private Session session;
private String configPath;
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/JcrConfigManager.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/exc/InvalidConfigurationException.java (from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/exc/InvalidConfigurationException.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/exc/InvalidConfigurationException.java?p2=rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/exc/InvalidConfigurationException.java&p1=rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/exc/InvalidConfigurationException.java&r1=1371176&r2=1371219&rev=1371219&view=diff
==============================================================================
(empty)
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/exc/InvalidConfigurationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/exc/InvalidConfigurationException.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageConfiguration.java (from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/JcrPageConfiguration.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageConfiguration.java?p2=rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageConfiguration.java&p1=rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/JcrPageConfiguration.java&r1=1371176&r2=1371219&rev=1371219&view=diff
==============================================================================
(empty)
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageDefinition.java (from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/JcrPageDefinition.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageDefinition.java?p2=rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageDefinition.java&p1=rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/JcrPageDefinition.java&r1=1371176&r2=1371219&rev=1371219&view=diff
==============================================================================
(empty)
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageDefinition.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java (from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java?p2=rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java&p1=rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java&r1=1371176&r2=1371219&rev=1371219&view=diff
==============================================================================
(empty)
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/JcrPageFragment.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java (from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java?p2=rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java&p1=rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java&r1=1371176&r2=1371219&rev=1371219&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java (original)
+++ rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java Thu Aug 9 14:08:00 2012
@@ -27,7 +27,7 @@ import org.apache.jackrabbit.ocm.mapper.
* Page configuration contains PageDefinition and PageFragment
*
* @version "$Id$"
- * @see PageDefinition
+ * @see org.apache.rave.jcr.config.model.api.PageDefinition
* @see PageFragment
*/
@Node(isInterface = true, jcrType = "mix:referenceable", discriminator = false)
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java (from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java?p2=rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java&p1=rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java&r1=1371176&r2=1371219&rev=1371219&view=diff
==============================================================================
(empty)
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageDefinition.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java (from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java?p2=rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java&p1=rave/sandbox/content-services/rave-jcr-config/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java&r1=1371176&r2=1371219&rev=1371219&view=diff
==============================================================================
(empty)
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/java/org/apache/rave/jcr/config/model/api/PageFragment.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/META-INF/rave/module.json
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/META-INF/rave/module.json?rev=1371219&view=auto
==============================================================================
--- rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/META-INF/rave/module.json (added)
+++ rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/META-INF/rave/module.json Thu Aug 9 14:08:00 2012
@@ -0,0 +1,18 @@
+{
+ "name":"pageconfiguration",
+ "namespaces":{
+ "rave":"http://www.apache.org/rave/config/1.0"
+ },
+ "cnds":{
+ "rave":{
+ "file":"rave-config.cnd"
+ }
+ },
+ "contents":{
+ "raveconfig":{
+ "file":"sample-page-config.json",
+ "parent":"/pageconfiguration",
+ "importBehavior":"merge"
+ }
+ }
+}
Copied: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/rave-page-config.cnd (from r1371176, rave/sandbox/content-services/rave-jcr-config/src/main/resources/rave-config.cnd)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/rave-page-config.cnd?p2=rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/rave-page-config.cnd&p1=rave/sandbox/content-services/rave-jcr-config/src/main/resources/rave-config.cnd&r1=1371176&r2=1371219&rev=1371219&view=diff
==============================================================================
(empty)
Added: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/sample-page-config.json
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/sample-page-config.json?rev=1371219&view=auto
==============================================================================
--- rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/sample-page-config.json (added)
+++ rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/main/resources/sample-page-config.json Thu Aug 9 14:08:00 2012
@@ -0,0 +1,3 @@
+{
+ "jcr:primaryType":"raveconfig:pageconfiguration"
+}
\ No newline at end of file
Copied: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/jcr/config/BaseConfigTest.java (from r1371176, rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/config/BaseConfigTest.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/jcr/config/BaseConfigTest.java?p2=rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/jcr/config/BaseConfigTest.java&p1=rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/config/BaseConfigTest.java&r1=1371176&r2=1371219&rev=1371219&view=diff
==============================================================================
(empty)
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/jcr/config/BaseConfigTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/jcr/config/BaseConfigTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/jcr/config/JcrConfigManagerTest.java (from r1371176, rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/config/JcrConfigManagerTest.java)
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/jcr/config/JcrConfigManagerTest.java?p2=rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/jcr/config/JcrConfigManagerTest.java&p1=rave/sandbox/content-services/rave-jcr-config/src/test/java/org/apache/rave/jcr/config/JcrConfigManagerTest.java&r1=1371176&r2=1371219&rev=1371219&view=diff
==============================================================================
(empty)
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/jcr/config/JcrConfigManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/java/org/apache/rave/jcr/config/JcrConfigManagerTest.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/repository.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/repository.xml?rev=1371219&view=auto
==============================================================================
--- rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/repository.xml (added)
+++ rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/repository.xml Thu Aug 9 14:08:00 2012
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+ 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 1.6//EN" "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
+<Repository>
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
+
+ <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"/>
+
+ <Security appName="Jackrabbit">
+ <SecurityManager class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager" workspaceName="security"/>
+ <AccessManager class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager"/>
+ <LoginModule class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule"/>
+ </Security>
+
+ <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default" maxIdleTime="2"/>
+
+ <Workspace name="${wsp.name}">
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemBundlePersistenceManager"/>
+ </Workspace>
+
+ <Versioning rootPath="${rep.home}/version">
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemBundlePersistenceManager"/>
+ </Versioning>
+
+</Repository>
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/repository.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/repository.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/workspaces/default/workspace.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/workspaces/default/workspace.xml?rev=1371219&view=auto
==============================================================================
--- rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/workspaces/default/workspace.xml (added)
+++ rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/workspaces/default/workspace.xml Thu Aug 9 14:08:00 2012
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+ -->
+<Workspace name="default">
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemBundlePersistenceManager"/>
+</Workspace>
\ No newline at end of file
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/workspaces/default/workspace.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/repository/workspaces/default/workspace.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/log4j.dtd
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/log4j.dtd?rev=1371219&view=auto
==============================================================================
--- rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/log4j.dtd (added)
+++ rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/log4j.dtd Thu Aug 9 14:08:00 2012
@@ -0,0 +1,230 @@
+<?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.
+ -->
+
+<!-- Authors: Chris Taylor, Ceki Gulcu. -->
+
+<!-- Version: 1.2 -->
+
+<!-- A configuration element consists of optional renderer
+elements,appender elements, categories and an optional root
+element. -->
+
+<!ELEMENT log4j:configuration (renderer*, appender*,plugin*, (category|logger)*,root?,
+ (categoryFactory|loggerFactory)?)>
+
+<!-- The "threshold" attribute takes a level value below which -->
+<!-- all logging statements are disabled. -->
+
+<!-- Setting the "debug" enable the printing of internal log4j logging -->
+<!-- statements. -->
+
+<!-- By default, debug attribute is "null", meaning that we not do touch -->
+<!-- internal log4j logging settings. The "null" value for the threshold -->
+<!-- attribute can be misleading. The threshold field of a repository -->
+<!-- cannot be set to null. The "null" value for the threshold attribute -->
+<!-- simply means don't touch the threshold field, the threshold field -->
+<!-- keeps its old value. -->
+
+<!ATTLIST log4j:configuration
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ threshold (all|trace|debug|info|warn|error|fatal|off|null) "null"
+ debug (true|false|null) "null"
+ reset (true|false) "false"
+>
+
+<!-- renderer elements allow the user to customize the conversion of -->
+<!-- message objects to String. -->
+
+<!ELEMENT renderer EMPTY>
+<!ATTLIST renderer
+ renderedClass CDATA #REQUIRED
+ renderingClass CDATA #REQUIRED
+>
+
+<!-- Appenders must have a name and a class. -->
+<!-- Appenders may contain an error handler, a layout, optional parameters -->
+<!-- and filters. They may also reference (or include) other appenders. -->
+<!ELEMENT appender (errorHandler?, param*,
+ rollingPolicy?, triggeringPolicy?, connectionSource?,
+ layout?, filter*, appender-ref*)>
+<!ATTLIST appender
+ name CDATA #REQUIRED
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT layout (param*)>
+<!ATTLIST layout
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT filter (param*)>
+<!ATTLIST filter
+ class CDATA #REQUIRED
+>
+
+<!-- ErrorHandlers can be of any class. They can admit any number of -->
+<!-- parameters. -->
+
+<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)>
+<!ATTLIST errorHandler
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT root-ref EMPTY>
+
+<!ELEMENT logger-ref EMPTY>
+<!ATTLIST logger-ref
+ ref CDATA #REQUIRED
+>
+
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
+
+
+<!-- The priority class is org.apache.log4j.Level by default -->
+<!ELEMENT priority (param*)>
+<!ATTLIST priority
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+<!-- The level class is org.apache.log4j.Level by default -->
+<!ELEMENT level (param*)>
+<!ATTLIST level
+ class CDATA #IMPLIED
+ value CDATA #REQUIRED
+>
+
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named category. -->
+<!ELEMENT category (param*,(priority|level)?,appender-ref*)>
+<!ATTLIST category
+ class CDATA #IMPLIED
+ name CDATA #REQUIRED
+ additivity (true|false) "true"
+>
+
+<!-- If no level element is specified, then the configurator MUST not -->
+<!-- touch the level of the named logger. -->
+
+<!ELEMENT logger (level?,appender-ref*)>
+<!ATTLIST logger
+ name CDATA #REQUIRED
+ additivity (true|false) "true"
+>
+
+
+<!ELEMENT categoryFactory (param*)>
+<!ATTLIST categoryFactory
+ class CDATA #REQUIRED>
+
+<!ELEMENT loggerFactory (param*)>
+<!ATTLIST loggerFactory
+ class CDATA #REQUIRED>
+
+<!ELEMENT appender-ref EMPTY>
+<!ATTLIST appender-ref
+ ref CDATA #REQUIRED
+>
+
+<!-- plugins must have a name and class and can have optional parameters -->
+<!ELEMENT plugin (param*, connectionSource?)>
+<!ATTLIST plugin
+ name CDATA #REQUIRED
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT connectionSource (dataSource?, param*)>
+<!ATTLIST connectionSource
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT dataSource (param*)>
+<!ATTLIST dataSource
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT triggeringPolicy ((param|filter)*)>
+<!ATTLIST triggeringPolicy
+ name CDATA #IMPLIED
+ class CDATA #REQUIRED
+>
+
+<!ELEMENT rollingPolicy (param*)>
+<!ATTLIST rollingPolicy
+ name CDATA #IMPLIED
+ class CDATA #REQUIRED
+>
+
+
+<!-- If no priority element is specified, then the configurator MUST not -->
+<!-- touch the priority of root. -->
+<!-- The root category always exists and cannot be subclassed. -->
+<!ELEMENT root (param*, (priority|level)?, appender-ref*)>
+
+
+<!-- ==================================================================== -->
+<!-- A logging event -->
+<!-- ==================================================================== -->
+<!ELEMENT log4j:eventSet (log4j:event*)>
+<!ATTLIST log4j:eventSet
+ xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"
+ version (1.1|1.2) "1.2"
+ includesLocationInfo (true|false) "true"
+>
+
+
+
+<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?,
+ log4j:locationInfo?, log4j:properties?) >
+
+<!-- The timestamp format is application dependent. -->
+<!ATTLIST log4j:event
+ logger CDATA #REQUIRED
+ level CDATA #REQUIRED
+ thread CDATA #REQUIRED
+ timestamp CDATA #REQUIRED
+ time CDATA #IMPLIED
+>
+
+<!ELEMENT log4j:message (#PCDATA)>
+<!ELEMENT log4j:NDC (#PCDATA)>
+
+<!ELEMENT log4j:throwable (#PCDATA)>
+
+<!ELEMENT log4j:locationInfo EMPTY>
+<!ATTLIST log4j:locationInfo
+ class CDATA #REQUIRED
+ method CDATA #REQUIRED
+ file CDATA #REQUIRED
+ line CDATA #REQUIRED
+>
+
+<!ELEMENT log4j:properties (log4j:data*)>
+
+<!ELEMENT log4j:data EMPTY>
+<!ATTLIST log4j:data
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/log4j.dtd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/log4j.dtd
------------------------------------------------------------------------------
svn:keywords = Id
Added: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/log4j.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/log4j.xml?rev=1371219&view=auto
==============================================================================
--- rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/log4j.xml (added)
+++ rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/log4j.xml Thu Aug 9 14:08:00 2012
@@ -0,0 +1,51 @@
+<?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 log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <!-- ====================================================================== -->
+ <!-- A P P E N D E R S -->
+ <!-- ====================================================================== -->
+
+ <!-- console -->
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} %-5p %m - at %c.%M(%F:%L)%n"/>
+ </layout>
+ </appender>
+
+ <!-- ====================================================================== -->
+ <!-- L O G G E R S -->
+ <!-- ====================================================================== -->
+ <category additivity="false" name="org.apache.jackrabbit.core">
+ <level value="warn"/>
+ <appender-ref ref="console"/>
+ </category>
+ <category additivity="false" name="org.apache.rave.jcr">
+ <level value="debug"/>
+ <appender-ref ref="console"/>
+ </category>
+
+ <root>
+ <level value="debug"/>
+ <appender-ref ref="console"/>
+ </root>
+
+</log4j:configuration>
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/log4j.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/log4j.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/org/apache/rave/jcr/jackrabbit/repository.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/org/apache/rave/jcr/jackrabbit/repository.xml?rev=1371219&view=auto
==============================================================================
--- rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/org/apache/rave/jcr/jackrabbit/repository.xml (added)
+++ rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/org/apache/rave/jcr/jackrabbit/repository.xml Thu Aug 9 14:08:00 2012
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!--
+ 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 1.6//EN" "http://jackrabbit.apache.org/dtd/repository-1.6.dtd">
+<Repository>
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
+
+ <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"/>
+
+ <Security appName="Jackrabbit">
+ <SecurityManager class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager" workspaceName="security"/>
+ <AccessManager class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager"/>
+ <LoginModule class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule"/>
+ </Security>
+
+ <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default" maxIdleTime="2"/>
+
+ <Workspace name="${wsp.name}">
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemBundlePersistenceManager"/>
+ </Workspace>
+
+ <Versioning rootPath="${rep.home}/version">
+ <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/>
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemBundlePersistenceManager"/>
+ </Versioning>
+
+</Repository>
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/org/apache/rave/jcr/jackrabbit/repository.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/org/apache/rave/jcr/jackrabbit/repository.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/repositoryHelperPool.properties
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/repositoryHelperPool.properties?rev=1371219&view=auto
==============================================================================
--- rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/repositoryHelperPool.properties (added)
+++ rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/repositoryHelperPool.properties Thu Aug 9 14:08:00 2012
@@ -0,0 +1,21 @@
+#
+# 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.
+#
+
+# first helper uses default values
+helper.0.=
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/repositoryHelperPool.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/repositoryHelperPool.properties
------------------------------------------------------------------------------
svn:keywords = Id
Added: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/repositoryStubImpl.properties
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/repositoryStubImpl.properties?rev=1371219&view=auto
==============================================================================
--- rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/repositoryStubImpl.properties (added)
+++ rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/repositoryStubImpl.properties Thu Aug 9 14:08:00 2012
@@ -0,0 +1,17 @@
+# 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.
+
+# Stub implementation class
+javax.jcr.tck.repository_stub_impl=org.apache.jackrabbit.core.JackrabbitRepositoryStub
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/repositoryStubImpl.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/repositoryStubImpl.properties
------------------------------------------------------------------------------
svn:keywords = Id
Added: rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/resources.jar
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/resources.jar?rev=1371219&view=auto
==============================================================================
Files rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/resources.jar (added) and rave/sandbox/content-services/rave-jcr-integration/page-configuration/src/test/resources/resources.jar Thu Aug 9 14:08:00 2012 differ
Modified: rave/sandbox/content-services/rave-jcr-integration/pom.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-integration/pom.xml?rev=1371219&r1=1371218&r2=1371219&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-jcr-integration/pom.xml (original)
+++ rave/sandbox/content-services/rave-jcr-integration/pom.xml Thu Aug 9 14:08:00 2012
@@ -48,6 +48,7 @@
<module>module1</module>
<module>module2</module>
<module>test</module>
+ <module>page-configuration</module>
</modules>
</project>
Modified: rave/sandbox/content-services/rave-web-hmvc/pom.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/pom.xml?rev=1371219&r1=1371218&r2=1371219&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/pom.xml (original)
+++ rave/sandbox/content-services/rave-web-hmvc/pom.xml Thu Aug 9 14:08:00 2012
@@ -41,6 +41,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.rave.sandbox.jcr</groupId>
+ <artifactId>rave-jcr-page-configuration</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.rave</groupId>
<artifactId>rave-core</artifactId>
<version>${apache.rave.version}</version>