You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by at...@apache.org on 2012/03/22 15:19:46 UTC
svn commit: r1303795 - in /incubator/rave/sandbox/content-services: ./
demo-portal/ demo-portal/src/ demo-portal/src/main/
demo-portal/src/main/webapp/ demo-portal/src/main/webapp/META-INF/
demo-portal/src/main/webapp/WEB-INF/ rave-jcr-service/ rave-jc...
Author: ate
Date: Thu Mar 22 14:19:45 2012
New Revision: 1303795
URL: http://svn.apache.org/viewvc?rev=1303795&view=rev
Log:
RAVE-517: Create new rave-jcr war module providing a JCR/Jackrabbit service for Rave
- initial basic setup, which includes:
- a rave-jcr-service jar module providing the wiring and access to a shared/cross-context javax.jcr.Repository instance
- a rave-jcr war module which just bundles Jackrabbit and the above rave-jcr-service
- a rave-demo-portal to provide and showcase the content services and integration features
- the maven groupId for these, and the parent rave-content-services, have been set to org.apache.rave.sandbox.jcr to provide proper isolation
- the barest minimal usage of the rave-jcr now can be tested by running the rave-demo-portal (mvn cargo:start) and invoke: http://localhost:8080/portal/jcr/jcr.repository.vendor (output: Apache Software Foundation)
this is only a temporary usage of course!
Added:
incubator/rave/sandbox/content-services/demo-portal/ (with props)
incubator/rave/sandbox/content-services/demo-portal/pom.xml (with props)
incubator/rave/sandbox/content-services/demo-portal/src/
incubator/rave/sandbox/content-services/demo-portal/src/main/
incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/
incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/META-INF/
incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/META-INF/context.xml (with props)
incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/
incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/web.xml (with props)
incubator/rave/sandbox/content-services/rave-jcr/ (with props)
incubator/rave/sandbox/content-services/rave-jcr-service/ (with props)
incubator/rave/sandbox/content-services/rave-jcr-service/pom.xml (with props)
incubator/rave/sandbox/content-services/rave-jcr-service/src/
incubator/rave/sandbox/content-services/rave-jcr-service/src/main/
incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/
incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/
incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/
incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/
incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/
incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/
incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ContextRepositoryAvailableFilter.java (with props)
incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ContextRepositoryServlet.java (with props)
incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/jackrabbit/
incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/jackrabbit/JackrabbitRepositoryServlet.java (with props)
incubator/rave/sandbox/content-services/rave-jcr/pom.xml (with props)
incubator/rave/sandbox/content-services/rave-jcr/src/
incubator/rave/sandbox/content-services/rave-jcr/src/main/
incubator/rave/sandbox/content-services/rave-jcr/src/main/resources/
incubator/rave/sandbox/content-services/rave-jcr/src/main/resources/log4j.xml (with props)
incubator/rave/sandbox/content-services/rave-jcr/src/main/webapp/
incubator/rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/
incubator/rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/web.xml (with props)
Modified:
incubator/rave/sandbox/content-services/pom.xml
Propchange: incubator/rave/sandbox/content-services/demo-portal/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 22 14:19:45 2012
@@ -0,0 +1,4 @@
+.settings
+.classpath
+.project
+target
Added: incubator/rave/sandbox/content-services/demo-portal/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/content-services/demo-portal/pom.xml?rev=1303795&view=auto
==============================================================================
--- incubator/rave/sandbox/content-services/demo-portal/pom.xml (added)
+++ incubator/rave/sandbox/content-services/demo-portal/pom.xml Thu Mar 22 14:19:45 2012
@@ -0,0 +1,245 @@
+<?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.
+
+ $Id$
+-->
+<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-content-services</artifactId>
+ <version>sandbox-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>rave-demo-portal</artifactId>
+ <name>Apache Rave :: rave-demo-portal</name>
+ <description>Apache Rave Demo Portal</description>
+ <packaging>war</packaging>
+
+ <properties>
+
+ <cargo.version>1.1.0</cargo.version>
+ <!-- if you want a remote debugging on a different a address override on command line with -Dcargo.debug.addres=xxxx -->
+ <cargo.debug.address>8000</cargo.debug.address>
+ <!-- if you want to start remote debugging session suspended override on command line with -Dcargo.debug.suspend=y -->
+ <cargo.debug.suspend>n</cargo.debug.suspend>
+ <cargo.args />
+
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.wookie</groupId>
+ <artifactId>wookie</artifactId>
+ <version>0.9.2-incubating</version>
+ <type>war</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-portal-dependencies</artifactId>
+ <version>${apache.rave.version}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-portal-resources</artifactId>
+ <version>${apache.rave.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-shindig</artifactId>
+ <version>${apache.rave.version}</version>
+ <type>war</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-demo-gadgets</artifactId>
+ <version>${apache.rave.version}</version>
+ <type>war</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.rave.sandbox.jcr</groupId>
+ <artifactId>rave-jcr</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave.sandbox.jcr</groupId>
+ <artifactId>rave-jcr-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Default database -->
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
+
+ <!-- log4j logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- mail -->
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${javax.mail.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${javax.activation.version}</version>
+ </dependency>
+
+ <!-- apacheds-server-jndi needed for embedded Apache DS, not needed for external LDAP -->
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-server-jndi</artifactId>
+ <version>${apacheds.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <finalName>rave-content-portal</finalName>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <overlays>
+ <overlay>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-portal-resources</artifactId>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>${cargo.version}</version>
+ <configuration>
+ <wait>true</wait>
+ <configuration>
+ <properties>
+ <cargo.jvmargs>
+ <![CDATA[-Dh2.bindAddress="localhost" -Xdebug -Xrunjdwp:transport=dt_socket,address=${cargo.debug.address},server=y,suspend=${cargo.debug.suspend} -noverify ${javaagent} ${cargo.args}]]>
+ </cargo.jvmargs>
+ <cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
+ </properties>
+ <home>${project.build.directory}/tomcat6x</home>
+ <deployables>
+ <deployable>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-shindig</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/ROOT</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.rave.sandbox.jcr</groupId>
+ <artifactId>rave-jcr</artifactId>
+ <type>war</type>
+ <properties>
+ <context>${rave.repository.context.path}</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-demo-gadgets</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/demogadgets</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.rave.sandbox.jcr</groupId>
+ <artifactId>rave-demo-portal</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/portal</context>
+ </properties>
+ </deployable>
+ </deployables>
+ </configuration>
+ <container>
+ <containerId>tomcat6x</containerId>
+ <timeout>180000</timeout>
+ <zipUrlInstaller>
+ <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
+ <url>
+ http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.35/bin/apache-tomcat-6.0.35.tar.gz
+ </url>
+ </zipUrlInstaller>
+ <systemProperties>
+ <net.sf.ehcache.skipUpdateCheck>true</net.sf.ehcache.skipUpdateCheck>
+
+ <repository.home>${rave.repository.home}</repository.home>
+ <repository.config>${rave.repository.config}</repository.config>
+ <repository.context.path>${rave.repository.context.path}</repository.context.path>
+
+ </systemProperties>
+ <dependencies>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <classpath>extra</classpath>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <classpath>extra</classpath>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <classpath>shared</classpath>
+ </dependency>
+ </dependencies>
+ </container>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Propchange: incubator/rave/sandbox/content-services/demo-portal/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/rave/sandbox/content-services/demo-portal/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: incubator/rave/sandbox/content-services/demo-portal/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/META-INF/context.xml?rev=1303795&view=auto
==============================================================================
--- incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/META-INF/context.xml (added)
+++ incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/META-INF/context.xml Thu Mar 22 14:19:45 2012
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='utf-8'?>
+<Context crossContext="true">
+ <!-- Disable session persistence across Tomcat restarts -->
+ <Manager pathname="" />
+</Context>
Propchange: incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/META-INF/context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/META-INF/context.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/META-INF/context.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/web.xml?rev=1303795&view=auto
==============================================================================
--- incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/web.xml (added)
+++ incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/web.xml Thu Mar 22 14:19:45 2012
@@ -0,0 +1,107 @@
+<?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.
+
+ $Id$
+-->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="RaveDemoPortal"
+ version="2.5">
+
+ <display-name>Rave Demo Portal</display-name>
+
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>
+ /WEB-INF/applicationContext.xml
+ /WEB-INF/dataContext.xml
+ /WEB-INF/applicationContext-security.xml
+ </param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>org.apache.rave.portal.web.context.RaveContextLoaderListener</listener-class>
+ </listener>
+
+ <!-- Filter to ensure Content Repository is loaded -->
+ <filter>
+ <filter-name>contentRepositoryAvailableFilter</filter-name>
+ <filter-class>org.apache.rave.jcr.servlet.ContextRepositoryAvailableFilter</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>springSecurityFilterChain</filter-name>
+ <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>contentRepositoryAvailableFilter</filter-name>
+ <url-pattern>/jcr/*</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>springSecurityFilterChain</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <!-- Exposes rave-jcr content repository -->
+ <servlet>
+ <servlet-name>contextRepository</servlet-name>
+ <servlet-class>org.apache.rave.jcr.servlet.ContextRepositoryServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- Handles all requests into the application -->
+ <servlet>
+ <servlet-name>dispatcher</servlet-name>
+ <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!-- temporary exposure of ContextRepositoryServlet to show dynamic access to repository descriptor values -->
+ <servlet-mapping>
+ <servlet-name>contextRepository</servlet-name>
+ <url-pattern>/jcr/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>dispatcher</servlet-name>
+ <url-pattern>/app/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>dispatcher</servlet-name>
+ <url-pattern>/index.html</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>dispatcher</servlet-name>
+ <url-pattern>/login</url-pattern>
+ </servlet-mapping>
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+
+ <error-page>
+ <exception-type>java.lang.Throwable</exception-type>
+ <location>/WEB-INF/jsp/views/error.jsp</location>
+ </error-page>
+</web-app>
Propchange: incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: incubator/rave/sandbox/content-services/demo-portal/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/rave/sandbox/content-services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/content-services/pom.xml?rev=1303795&r1=1303794&r2=1303795&view=diff
==============================================================================
--- incubator/rave/sandbox/content-services/pom.xml (original)
+++ incubator/rave/sandbox/content-services/pom.xml Thu Mar 22 14:19:45 2012
@@ -16,10 +16,12 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
+
+ @version $Id$
-->
<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"
- >
+ 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>
@@ -29,24 +31,39 @@
<relativePath>../rave-master-pom/pom.xml</relativePath>
</parent>
- <groupId>org.apache.rave.sandbox</groupId>
+ <groupId>org.apache.rave.sandbox.jcr</groupId>
<artifactId>rave-content-services</artifactId>
<name>Apache Rave :: rave-content-services</name>
<description>Apache Rave Content Services Sandbox project</description>
<packaging>pom</packaging>
<version>sandbox-SNAPSHOT</version>
-
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <servlet-api.version>2.5</servlet-api.version>
- <javax.jcr.version>2.0</javax.jcr.version>
-
+
<apache.rave.version>0.10-incubating-SNAPSHOT</apache.rave.version>
<apache.jackrabbit.version>2.4.0</apache.jackrabbit.version>
-
+ <apacheds.version>1.5.5</apacheds.version>
+
+ <javax.jcr.version>2.0</javax.jcr.version>
+ <servlet-api.version>2.5</servlet-api.version>
+ <jsp-api.version>2.1</jsp-api.version>
+ <el-api.version>1.0</el-api.version>
+ <javax.mail.version>1.4.4</javax.mail.version>
+ <javax.activation.version>1.1</javax.activation.version>
+
+ <com.h2database.version>1.3.154</com.h2database.version>
+ <org.slf4j.version>1.6.1</org.slf4j.version>
+ <log4j.version>1.2.16</log4j.version>
+ <junit.version>4.7</junit.version>
+
+ <rave.repository.home>${project.build.directory}/storage/rave_jcr</rave.repository.home>
+ <rave.repository.config />
+ <rave.repository.context.path>/jcr</rave.repository.context.path>
+
+ <javaagent />
</properties>
-
+
<dependencyManagement>
<dependencies>
@@ -63,6 +80,62 @@
<version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>${jsp-api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>${el-api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${com.h2database.version}</version>
+ </dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${org.slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${org.slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${org.slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Test -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>${easymock.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -79,29 +152,21 @@
<artifactId>jcr</artifactId>
</dependency>
+ <!-- Exclude commons-logging by adding it as a provided dependency -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
-
- <profiles>
- <profile>
- <id>dist</id>
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
+ <modules>
+ <module>rave-jcr-service</module>
+ <module>rave-jcr</module>
+ <module>demo-portal</module>
+ </modules>
<build>
<defaultGoal>install</defaultGoal>
Propchange: incubator/rave/sandbox/content-services/rave-jcr/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 22 14:19:45 2012
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project
Propchange: incubator/rave/sandbox/content-services/rave-jcr-service/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 22 14:19:45 2012
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project
Added: incubator/rave/sandbox/content-services/rave-jcr-service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/content-services/rave-jcr-service/pom.xml?rev=1303795&view=auto
==============================================================================
--- incubator/rave/sandbox/content-services/rave-jcr-service/pom.xml (added)
+++ incubator/rave/sandbox/content-services/rave-jcr-service/pom.xml Thu Mar 22 14:19:45 2012
@@ -0,0 +1,48 @@
+<?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.
+
+ $Id$
+-->
+<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-content-services</artifactId>
+ <version>sandbox-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>rave-jcr-service</artifactId>
+ <name>Apache Rave :: rave-jcr-service</name>
+ <description>Apache Rave JCR Service</description>
+ <packaging>jar</packaging>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-servlet</artifactId>
+ <version>${apache.jackrabbit.version}</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: incubator/rave/sandbox/content-services/rave-jcr-service/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/rave/sandbox/content-services/rave-jcr-service/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: incubator/rave/sandbox/content-services/rave-jcr-service/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ContextRepositoryAvailableFilter.java
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ContextRepositoryAvailableFilter.java?rev=1303795&view=auto
==============================================================================
--- incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ContextRepositoryAvailableFilter.java (added)
+++ incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ContextRepositoryAvailableFilter.java Thu Mar 22 14:19:45 2012
@@ -0,0 +1,138 @@
+/*
+ * 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.
+ */
+package org.apache.rave.jcr.servlet;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.jcr.Repository;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Convenient servlet request filter which will intercept and forward to a predefined temporary forward path when
+ * a {@link Repository} is not (yet) available from the servlet context.
+ * <p>
+ * The filter can be configured with the following filter config or servlet context parameters:
+ * <dl>
+ * <dt>javax.jcr.Repository</dt>
+ * <dd><em>This is a servlet context parameter (only):</em><br/>
+ * The name of the servlet context attribute under which the {@link Repository} instance is looked up. Default: <code>javax.jcr.Repository</code></dd>
+ * <dt>forward.path</dt>
+ * <dd>The forward path to render when the {@link Repository} is not available. If undefined a build in message will be rendered.</dd>
+ * <dt>automatic.refresh.time</dt>
+ * <dd>Time in seconds > 0 when an automatic refresh of the original path is requested. Default: 5</dd>
+ * </dl>
+ * </p>
+ *
+ * @version $Id$
+ *
+ */
+public class ContextRepositoryAvailableFilter implements Filter
+{
+ public static final String CONTEXT_REPOSITORY_KEY = "javax.jcr.Repository";
+
+ /** Parameter name for the automatic refresh after x seconds.
+ Default: 5 seconds. When the repository is unavailable and a refresh wait time > 0 is defined
+ a meta header refresh will set accordingly.
+ * */
+ public static final String REFRESH_TIME_PARAM = "automatic.refresh.time";
+
+ /** Parameter name for the forward path to render the wait or unavailable message, optional.
+ Default: undefined. When undefined a build in message will be rendered.*/
+ public static final String FORWARD_PARAM = "forward.path";
+
+ private ServletContext servletContext;
+ private String contextRepositoryKey;
+ private String refreshTime = "5";
+ private String forwardPath = null;
+
+ public void init(FilterConfig filterConfig) throws ServletException {
+ this.servletContext = filterConfig.getServletContext();
+ contextRepositoryKey = servletContext.getInitParameter(CONTEXT_REPOSITORY_KEY);
+ if (contextRepositoryKey == null) {
+ contextRepositoryKey = CONTEXT_REPOSITORY_KEY;
+ }
+
+ String param = filterConfig.getInitParameter(REFRESH_TIME_PARAM);
+ if (param != null) {
+ refreshTime = null;
+ try {
+ int value = Integer.parseInt(param);
+ if (value > -1) {
+ refreshTime = Integer.toString(value);
+ }
+ }
+ catch (Exception e) {
+ filterConfig.getServletContext().log("Failed to parse init parameter "+REFRESH_TIME_PARAM, e);
+ }
+ }
+ forwardPath = filterConfig.getInitParameter(FORWARD_PARAM);
+ }
+
+ protected boolean isRepositoryAvailable() {
+ Repository repo = (Repository)servletContext.getAttribute(contextRepositoryKey);
+ return (repo != null && repo.getDescriptor(Repository.SPEC_VERSION_DESC) != null);
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+ if (isRepositoryAvailable()) {
+ chain.doFilter(request, response);
+ }
+ else {
+ HttpServletResponse resp = (HttpServletResponse)response;
+
+ // disable caching
+ resp.setHeader("Cache-Control", "private, no-store, no-cache, must-revalidate");
+
+ // optionally set automatic refresh
+ if (refreshTime != null) {
+ resp.setHeader("Refresh", refreshTime);
+ }
+
+ RequestDispatcher dispatcher = (forwardPath != null ? request.getRequestDispatcher(forwardPath) : null);
+ if (dispatcher != null) {
+ dispatcher.forward(request, response);
+ }
+ else
+ {
+ resp.setContentType("text/html");
+ PrintWriter out = resp.getWriter();
+ out.println("<html><head><title>Repository currently unavailable</title></head>");
+ out.println("<body><p>The Repository is currently unavailable</p><br/>");
+ if (refreshTime != null) {
+ out.println("This page will refresh automatically in "+refreshTime+" seconds ...");
+ }
+ out.println("</body></html>");
+ out.flush();
+ out.close();
+ }
+ }
+ }
+
+ public void destroy() {
+ }
+}
Propchange: incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ContextRepositoryAvailableFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ContextRepositoryAvailableFilter.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ContextRepositoryServlet.java
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ContextRepositoryServlet.java?rev=1303795&view=auto
==============================================================================
--- incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ContextRepositoryServlet.java (added)
+++ incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ContextRepositoryServlet.java Thu Mar 22 14:19:45 2012
@@ -0,0 +1,96 @@
+/*
+ * 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.
+ */
+package org.apache.rave.jcr.servlet;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
+/**
+ * Extended version of the Jackrabbit ContextRepositoryServlet to allow overriding of the
+ * servlet config path parameter, indicating a cross-context lookup of the Repository,
+ * through a system property or as a servlet context parameter.
+ * <p>
+ * First a context specific system property <code>repository.context.path</code> will be evaluated
+ * using a postfix of the current context path without leading /, separated by a . (dot).<br/>
+ * For example, when current context path is <code>/myapp</code> the Jackrabbit ContextRepositoryServlet path
+ * init parameter can be overridden as system property using <code>-Drepository.context.path.myapp=[/contextpath]</code>
+ * </p>
+ * <p>
+ * If no matching context specific system property is found, a global
+ * system property will be evaluated using the <code>repository.context.path</code> parameter name.<br/>
+ * For example using a system property using <code>-Drepository.context.path=[/contextpath]</code>
+ * </p>
+ * <p>
+ * If neiter is specified nor the inherited servlet config <code>path</code> init parameter, a
+ * a servlet context parameter named <code>repository.context.path</code> is looked for.
+ * </p>
+ * <p>
+ * Finally if none of the above resulted in a value, no cross-context repository lookup with be done
+ * and the repository then is assumed to be provided in the current context.
+ * </p>
+ *
+ * @version $Id$
+ */
+public class ContextRepositoryServlet extends org.apache.jackrabbit.servlet.ContextRepositoryServlet {
+ private static final long serialVersionUID = 1L;
+
+ public static final String PATH_PARAM = "path";
+ public static final String REPOSITORY_PATH_PARAM = "repository.context.path";
+
+ private String repositoryContextPath;
+
+ protected boolean isEmpty(String value) {
+ return value == null || value.isEmpty();
+ }
+
+ @Override
+ public String getInitParameter(String name) {
+ if (PATH_PARAM.equals(name) && !isEmpty(repositoryContextPath)) {
+ return repositoryContextPath;
+ }
+ return super.getInitParameter(name);
+ }
+
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ // build context path name postfix for system property lookup
+ String contextPath = config.getServletContext().getContextPath();
+ if (contextPath.startsWith("/")) {
+ contextPath = contextPath.substring(1);
+ }
+ if (!contextPath.isEmpty()) {
+ contextPath = "." + contextPath;
+ }
+ // first check for a context specific system property named REPOSITORY_PATH_PARAM.<context path name>
+ repositoryContextPath = System.getProperty(REPOSITORY_PATH_PARAM+contextPath);
+ if (isEmpty(repositoryContextPath)) {
+ // Check for a global system property named REPOSITORY_PATH_PARAM
+ repositoryContextPath = System.getProperty(REPOSITORY_PATH_PARAM);
+ }
+ if (isEmpty(repositoryContextPath)) {
+ // Check for the default servlet config specific init parameter
+ repositoryContextPath = config.getInitParameter(PATH_PARAM);
+ }
+ if (isEmpty(repositoryContextPath)) {
+ // Finally check for a servlet context init parameter named REPOSITORY_PATH_PARAM
+ repositoryContextPath = config.getServletContext().getInitParameter(REPOSITORY_PATH_PARAM);
+ }
+ super.init(config);
+ }
+}
Propchange: incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ContextRepositoryServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/ContextRepositoryServlet.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/jackrabbit/JackrabbitRepositoryServlet.java
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/jackrabbit/JackrabbitRepositoryServlet.java?rev=1303795&view=auto
==============================================================================
--- incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/jackrabbit/JackrabbitRepositoryServlet.java (added)
+++ incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/jackrabbit/JackrabbitRepositoryServlet.java Thu Mar 22 14:19:45 2012
@@ -0,0 +1,141 @@
+/*
+ * 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.
+ */
+package org.apache.rave.jcr.servlet.jackrabbit;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
+/**
+ * Extended version of the JackrabbitRepositoryServlet to allow overriding of the
+ * <code>repository.home</code> and <code>repository.config</code> location init parameters through system properties.
+ * <p>
+ * First a context specific system property will be evaluated using a postfix
+ * of the context path without leading /, separated by a . (dot).<br/>
+ * For example, when the current context path is <code>/myjcr</code> the <code>repository.home</code>
+ * parameter can be overridden as system property using <code>-Drepository.home.myjcr=[location]</code>
+ * </p>
+ * <p>
+ * If no matching context specific system property is found, a global
+ * system property will be evaluated using the repository home or config location
+ * parameter names.<br/>
+ * For example by setting a system property <code>-Drepository.home=[location]</code>
+ * </p>
+ * <p>
+ * If also no repository home or config parameter is specified as
+ * servlet init parameter nor as servlet context parameter, a different default <code>repository.home</code>
+ * location will be set pointing within the web application itself:
+ * <ul>
+ * <li><code>repository.home: WEB-INF/storage</code></li>
+ * </ul>
+ * </p>
+ *
+ * @version $Id$
+ */
+public class JackrabbitRepositoryServlet extends org.apache.jackrabbit.servlet.jackrabbit.JackrabbitRepositoryServlet {
+
+ private static final long serialVersionUID = 1L;
+
+ /** Parameter name of the repository storage directory */
+ public static final String REPOSITORY_DIRECTORY_PARAM = "repository.home";
+
+ /** Parameter name of the repository config file */
+ public static final String REPOSITORY_CONFIG_PARAM = "repository.config";
+
+ /** Default repository storage directory */
+ public static final String DEFAULT_REPOSITORY_DIRECTORY = "WEB-INF/storage";
+
+ private String repositoryDirectory;
+ private String repositoryConfig;
+
+ protected boolean isEmpty(String value) {
+ return value == null || value.isEmpty();
+ }
+
+ protected String getLocationParam(ServletConfig config, String parameterName, String defaultValue) throws ServletException {
+ // build context path name postfix for system property lookup
+ String contextPath = config.getServletContext().getContextPath();
+ if (contextPath.startsWith("/")) {
+ contextPath = contextPath.substring(1);
+ }
+ if (!contextPath.isEmpty()) {
+ contextPath = "." + contextPath;
+ }
+ // first check for a context specific system property named <parameterName>.<context path name>
+ String location = System.getProperty(parameterName+contextPath);
+ if (isEmpty(location) && !contextPath.isEmpty()) {
+ // Check for a global system property named <parameterName>
+ location = System.getProperty(parameterName);
+ }
+ if (isEmpty(location)) {
+ // Check for a servlet config init parameter named <parameterName>
+ location = config.getInitParameter(parameterName);
+ }
+ if (isEmpty(location)) {
+ // Check for a servlet context parameter named <parameterName>
+ location = config.getServletContext().getInitParameter(parameterName);
+ }
+ if (isEmpty(location)) {
+ // if still not found, use provided default value
+ location = defaultValue;
+ }
+ if (!isEmpty(location)) {
+ // check for absolute path
+ if (location.startsWith("file:")) {
+ try
+ {
+ location = new URL(location).getFile();
+ }
+ catch (MalformedURLException e)
+ {
+ throw new ServletException("Cannot determine parameter "+parameterName+" location "+ location);
+ }
+ }
+ else if (!location.startsWith("/")) {
+ // try to parse the relative path
+ String result = config.getServletContext().getRealPath(location);
+ if (result == null) {
+ throw new ServletException("Cannot determine parameter "+parameterName+" location "+ location);
+ }
+ location = result;
+ }
+ }
+ return location;
+ }
+
+ @Override
+ protected String getInitParameter(String name, String def) {
+ if (REPOSITORY_DIRECTORY_PARAM.equals(name) && !isEmpty(repositoryDirectory)) {
+ return repositoryDirectory;
+ }
+ else if (REPOSITORY_CONFIG_PARAM.equals(name) && !isEmpty(repositoryConfig)) {
+ return repositoryConfig;
+ }
+ return super.getInitParameter(name, def);
+ }
+
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ repositoryDirectory = getLocationParam(config, REPOSITORY_DIRECTORY_PARAM, DEFAULT_REPOSITORY_DIRECTORY);
+ repositoryConfig = getLocationParam(config, REPOSITORY_CONFIG_PARAM, null);
+ super.init(config);
+ }
+}
Propchange: incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/jackrabbit/JackrabbitRepositoryServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/rave/sandbox/content-services/rave-jcr-service/src/main/java/org/apache/rave/jcr/servlet/jackrabbit/JackrabbitRepositoryServlet.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: incubator/rave/sandbox/content-services/rave-jcr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/content-services/rave-jcr/pom.xml?rev=1303795&view=auto
==============================================================================
--- incubator/rave/sandbox/content-services/rave-jcr/pom.xml (added)
+++ incubator/rave/sandbox/content-services/rave-jcr/pom.xml Thu Mar 22 14:19:45 2012
@@ -0,0 +1,65 @@
+<?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.
+
+ $Id$
+-->
+<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-content-services</artifactId>
+ <version>sandbox-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>rave-jcr</artifactId>
+ <name>Apache Rave :: rave-jcr</name>
+ <description>Apache Rave JCR</description>
+ <packaging>war</packaging>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.rave.sandbox.jcr</groupId>
+ <artifactId>rave-jcr-service</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>${apache.jackrabbit.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: incubator/rave/sandbox/content-services/rave-jcr/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/rave/sandbox/content-services/rave-jcr/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: incubator/rave/sandbox/content-services/rave-jcr/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/rave/sandbox/content-services/rave-jcr/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/content-services/rave-jcr/src/main/resources/log4j.xml?rev=1303795&view=auto
==============================================================================
--- incubator/rave/sandbox/content-services/rave-jcr/src/main/resources/log4j.xml (added)
+++ incubator/rave/sandbox/content-services/rave-jcr/src/main/resources/log4j.xml Thu Mar 22 14:19:45 2012
@@ -0,0 +1,47 @@
+<?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.
+
+ $Id$
+-->
+<!DOCTYPE log4j:configuration PUBLIC "-//LOGGER" "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <!-- Appenders -->
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-5p: %c - %m%n" />
+ </layout>
+ </appender>
+
+ <logger name="org.jackrabbit">
+ <level value="warn" />
+ </logger>
+
+ <logger name="org.apache.rave">
+ <level value="warn" />
+ </logger>
+
+ <!-- Root Logger -->
+ <root>
+ <priority value="warn" />
+ <appender-ref ref="console" />
+ </root>
+
+</log4j:configuration>
\ No newline at end of file
Propchange: incubator/rave/sandbox/content-services/rave-jcr/src/main/resources/log4j.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/rave/sandbox/content-services/rave-jcr/src/main/resources/log4j.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: incubator/rave/sandbox/content-services/rave-jcr/src/main/resources/log4j.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/web.xml?rev=1303795&view=auto
==============================================================================
--- incubator/rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/web.xml (added)
+++ incubator/rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/web.xml Thu Mar 22 14:19:45 2012
@@ -0,0 +1,62 @@
+<?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.
+-->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="rave-jcr"
+ version="2.5">
+ <display-name>Rave JCR</display-name>
+ <description>Rave JCR</description>
+
+ <servlet>
+ <servlet-name>Repository</servlet-name>
+ <servlet-class>org.apache.rave.jcr.servlet.jackrabbit.JackrabbitRepositoryServlet</servlet-class>
+<!--
+ <init-param>
+ <description>The Servlet context attribute name under which to expose the repository.
+ Default value is javax.jcr.Repository if undefined.
+ Also, this parameter can be overriden with a system property named 'repository.context.attribute'.</description>
+ <param-name>repository.context.attribute</param-name>
+ <param-value>javax.jcr.Repository</param-value>
+ </init-param>
+-->
+ <init-param>
+ <description>The location for the repository files. Unless the location starts
+ with file: or /, the location is resolved as context relative.
+ Also, this parameter can be overriden with a system property named 'repository.home'.</description>
+ <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.
+ Also, this parameter can be overriden with a system property named 'repository.config'.
+ If undefined, the default is to lookup or create a repository.xml file under the repository.home location.
+ </description>
+ <param-name>repository.config</param-name>
+ <param-value>WEB-INF/repository.xml</param-value>
+ </init-param>
+-->
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+
+</web-app>
Propchange: incubator/rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: incubator/rave/sandbox/content-services/rave-jcr/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain