Author: ate
Date: Mon Sep 10 06:26:10 2012
New Revision: 1382650
URL: http://svn.apache.org/viewvc?rev=1382650&view=rev
Log:
RAVE-696: Create new rave-web-jcr module providing a JCR based implementation
of the rave-web-hmvc provided page model and controllers and integration of
other content services
Added:
rave/sandbox/content-services/rave-web-jcr/
rave/sandbox/content-services/rave-web-jcr/pom.xml (with props)
rave/sandbox/content-services/rave-web-jcr/rave-web-jcr.iml
rave/sandbox/content-services/rave-web-jcr/src/
rave/sandbox/content-services/rave-web-jcr/src/main/
rave/sandbox/content-services/rave-web-jcr/src/main/java/
rave/sandbox/content-services/rave-web-jcr/src/test/
rave/sandbox/content-services/rave-web-jcr/src/test/java/
rave/sandbox/content-services/rave-web-jcr/src/test/resources/
Modified:
rave/sandbox/content-services/pom.xml
Modified: rave/sandbox/content-services/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/pom.xml?rev=1382650&r1=1382649&r2=1382650&view=diff
==============================================================================
--- rave/sandbox/content-services/pom.xml (original)
+++ rave/sandbox/content-services/pom.xml Mon Sep 10 06:26:10 2012
@@ -189,6 +189,7 @@
<module>rave-jcr-integration</module>
<module>rave-jcr-utils</module>
<module>rave-web-hmvc</module>
+ <module>rave-web-jcr</module>
<module>rave-jcr-tools</module>
<!-- disable incomple simple-app module
<module>simple-app</module>
Added: rave/sandbox/content-services/rave-web-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/pom.xml?rev=1382650&view=auto
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/pom.xml (added)
+++ rave/sandbox/content-services/rave-web-jcr/pom.xml Mon Sep 10 06:26:10 2012
@@ -0,0 +1,133 @@
+<?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-web-jcr</artifactId>
+ <name>Apache Rave :: rave-web-jcr</name>
+ <description>Apache Rave Web JCR</description>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.rave.sandbox.jcr</groupId>
+ <artifactId>rave-web-hmvc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave.sandbox.jcr</groupId>
+ <artifactId>rave-jcr-data-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave.sandbox.jcr</groupId>
+ <artifactId>rave-jcr-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave.sandbox.jcr</groupId>
+ <artifactId>rave-jcr-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-core</artifactId>
+ <version>${apache.rave.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <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>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+
+ <!-- Test -->
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-tests</artifactId>
+ <version>${apache.jackrabbit.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: rave/sandbox/content-services/rave-web-jcr/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: rave/sandbox/content-services/rave-web-jcr/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: rave/sandbox/content-services/rave-web-jcr/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: rave/sandbox/content-services/rave-web-jcr/rave-web-jcr.iml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-jcr/rave-web-jcr.iml?rev=1382650&view=auto
==============================================================================
--- rave/sandbox/content-services/rave-web-jcr/rave-web-jcr.iml (added)
+++ rave/sandbox/content-services/rave-web-jcr/rave-web-jcr.iml Mon Sep 10
06:26:10 2012
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module
org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true"
type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6"
inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java"
isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java"
isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources"
isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="rave-web-hmvc" />
+ <orderEntry type="module" module-name="rave-jcr-page-configuration" />
+ <orderEntry type="library" name="Maven: org.apache:jackrabbit-ocm:2.0.0"
level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven:
javax.jcr:jcr:2.0" level="project" />
+ <orderEntry type="library" name="Maven:
commons-digester:commons-digester:1.7" level="project" />
+ <orderEntry type="library" name="Maven:
commons-beanutils:commons-beanutils:1.7.0" level="project" />
+ <orderEntry type="library" name="Maven:
commons-collections:commons-collections:3.1" level="project" />
+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04"
level="project" />
+ <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.1"
level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.6.1"
level="project" />
+ <orderEntry type="library" name="Maven: cglib:cglib:2.2" level="project" />
+ <orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-jcr-commons:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-core:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven: concurrent:concurrent:1.3.4"
level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:1.4"
level="project" />
+ <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.3"
level="project" />
+ <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.4"
level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-api:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-spi-commons:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.jackrabbit:jackrabbit-spi:2.4.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tika:tika-core:1.2"
level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.lucene:lucene-core:3.0.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.derby:derby:10.5.3.0_1"
level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.6.1"
level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-context:3.1.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-aop:3.1.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0"
level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-asm:3.1.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-beans:3.1.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-core:3.1.2.RELEASE" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven:
commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-expression:3.1.2.RELEASE" level="project" />
+ <orderEntry type="module" module-name="rave-jcr-data-model" />
+ <orderEntry type="module" module-name="rave-jcr-config" />
+ <orderEntry type="library" name="Maven:
com.fasterxml.jackson.core:jackson-core:2.0.0" level="project" />
+ <orderEntry type="library" name="Maven:
com.fasterxml.jackson.core:jackson-databind:2.0.0" level="project" />
+ <orderEntry type="library" name="Maven:
com.fasterxml.jackson.core:jackson-annotations:2.0.0" level="project" />
+ <orderEntry type="module" module-name="rave-jcr-utils" />
+ <orderEntry type="module" module-name="rave-jcr-service" />
+ <orderEntry type="module" module-name="rave-core" />
+ <orderEntry type="module" module-name="rave-commons" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-web:3.1.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.openjpa:openjpa:2.2.0"
level="project" />
+ <orderEntry type="library" name="Maven: net.sourceforge.serp:serp:1.13.1"
level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.7"
level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.geronimo.specs:geronimo-jpa_2.0_spec:1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.6.9"
level="project" />
+ <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.6.9"
level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.shindig:shindig-common:2.5.0-beta3" level="project" />
+ <orderEntry type="library" name="Maven: com.google.inject:guice:3.0"
level="project" />
+ <orderEntry type="library" name="Maven: javax.inject:javax.inject:1"
level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2"
level="project" />
+ <orderEntry type="library" name="Maven:
com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6"
level="project" />
+ <orderEntry type="library" name="Maven:
commons-fileupload:commons-fileupload:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven:
org.apache.commons:commons-lang3:3.1" level="project" />
+ <orderEntry type="library" name="Maven: joda-time:joda-time:2.0"
level="project" />
+ <orderEntry type="library" name="Maven: org.json:json:20090211"
level="project" />
+ <orderEntry type="library" name="Maven: net.oauth.core:oauth:20100527"
level="project" />
+ <orderEntry type="library" name="Maven:
com.thoughtworks.xstream:xstream:1.4.2" level="project" />
+ <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1"
level="project" />
+ <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c"
level="project" />
+ <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.5.2"
level="project" />
+ <orderEntry type="library" name="Maven: de.odysseus.juel:juel-impl:2.2.4"
level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework.security:spring-security-web:3.1.1.RELEASE" level="project"
/>
+ <orderEntry type="library" name="Maven:
org.springframework:spring-jdbc:3.0.7.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-tx:3.0.7.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework.security:spring-security-core:3.1.1.RELEASE"
level="project" />
+ <orderEntry type="library" name="Maven:
org.codehaus.jackson:jackson-mapper-asl:1.8.1" level="project" />
+ <orderEntry type="library" name="Maven:
org.codehaus.jackson:jackson-core-asl:1.8.1" level="project" />
+ <orderEntry type="library" name="Maven: com.ibm.icu:icu4j:4.8.1.1"
level="project" />
+ <orderEntry type="library" name="Maven:
net.tanesha.recaptcha4j:recaptcha4j:0.0.7" level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-context-support:3.1.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.18"
level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-webmvc:3.1.2.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven:
org.springframework:spring-test:3.1.2.RELEASE" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven:
javax.servlet:servlet-api:2.5" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven:
javax.servlet.jsp:jsp-api:2.1" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven:
javax.el:el-api:1.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven:
org.apache.jackrabbit:jackrabbit-jcr-tests:2.4.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven:
org.easymock:easymock:3.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven:
cglib:cglib-nodep:2.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven:
org.objenesis:objenesis:1.2" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven:
org.slf4j:slf4j-log4j12:1.6.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: log4j:log4j:1.2.16"
level="project" />
+ </component>
+</module>
+
