You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2013/10/18 15:05:03 UTC
svn commit: r1533438 - in /sling/trunk: bundles/jcr/it-jackrabbit-oak/pom.xml
bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
bundles/jcr/oak-server/pom.xml pom.xml
Author: bdelacretaz
Date: Fri Oct 18 13:05:02 2013
New Revision: 1533438
URL: http://svn.apache.org/r1533438
Log:
SLING-3190 - Oak-based SlingRepository (moved from whiteboard)
Modified:
sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
sling/trunk/bundles/jcr/oak-server/pom.xml
sling/trunk/pom.xml
Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml?rev=1533438&r1=1533437&r2=1533438&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml (original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml Fri Oct 18 13:05:02 2013
@@ -9,17 +9,17 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
- <relativePath>16</relativePath>
+ <version>18</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.repository.it</artifactId>
+ <artifactId>org.apache.sling.jcr.repository.it-jackrabbit-oak</artifactId>
<packaging>jar</packaging>
<version>0.0.2-SNAPSHOT</version>
- <name>SlingRepository Integration Tests</name>
- <description>Tests various SlingRepository implementations</description>
+ <name>Apache Sling SlingRepository Integration Tests</name>
+ <description>Tests and compares our Jackrabbit and Oak SlingRepository implementations</description>
<inceptionYear>2013</inceptionYear>
<properties>
Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java?rev=1533438&r1=1533437&r2=1533438&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java (original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java Fri Oct 18 13:05:02 2013
@@ -97,7 +97,7 @@ public class OakRepositoryIT extends Sli
mavenBundle("org.apache.sling", "org.apache.sling.jcr.base", "2.1.2"),
// Oak
- mavenBundle("org.apache.sling", "org.apache.sling.whiteboard.bdelacretaz.oak.server", "0.0.1-SNAPSHOT"),
+ mavenBundle("org.apache.sling", "org.apache.sling.jcr.oak.server", "0.0.1-SNAPSHOT"),
mavenBundle("com.google.guava", "guava", "14.0.1"),
mavenBundle("com.google.code.findbugs", "jsr305", "2.0.0"),
mavenBundle("org.apache.jackrabbit", "jackrabbit-api", "2.7.1"),
Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1533438&r1=1533437&r2=1533438&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Fri Oct 18 13:05:02 2013
@@ -23,17 +23,17 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>15</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <version>18</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
- <artifactId>org.apache.sling.whiteboard.bdelacretaz.oak.server</artifactId>
+ <artifactId>org.apache.sling.jcr.oak.server</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Apache Sling WHITEBOARD PROTOTYPE Oak Server</name>
+ <name>Apache Sling Oak Repository Server</name>
<description>
- This bundle provides a WHITEBOARD PROTOTYPE SlingRepository based on Apache Oak.
+ This bundle provides a SlingRepository based on Apache Oak.
</description>
<properties>
Modified: sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1533438&r1=1533437&r2=1533438&view=diff
==============================================================================
--- sling/trunk/pom.xml (original)
+++ sling/trunk/pom.xml Fri Oct 18 13:05:02 2013
@@ -149,6 +149,8 @@
<module>bundles/jcr/webdav</module>
<module>bundles/jcr/davex</module>
<module>bundles/jcr/webconsole</module>
+ <module>bundles/jcr/oak-server</module>
+ <module>bundles/jcr/it-jackrabbit-oak</module>
<!-- Servlets -->
<module>bundles/servlets/resolver</module>