You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2009/04/27 17:54:12 UTC

svn commit: r769033 - in /jackrabbit/commons/ocm/trunk: nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/ pom.xml src/main/java/org/apache/jackrabbit/ocm/nodemanagement/

Author: jukka
Date: Mon Apr 27 15:54:12 2009
New Revision: 769033

URL: http://svn.apache.org/viewvc?rev=769033&view=rev
Log:
OCM-1: Move jackrabbit-ocm to JCR Commons

Merge the nodemanagement code to the main OCM codebase. Needs an optional jackrabbit-core dependency.

Added:
    jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/   (props changed)
      - copied from r768978, jackrabbit/commons/ocm/trunk/nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/
Removed:
    jackrabbit/commons/ocm/trunk/nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/
Modified:
    jackrabbit/commons/ocm/trunk/pom.xml

Modified: jackrabbit/commons/ocm/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/ocm/trunk/pom.xml?rev=769033&r1=769032&r2=769033&view=diff
==============================================================================
--- jackrabbit/commons/ocm/trunk/pom.xml (original)
+++ jackrabbit/commons/ocm/trunk/pom.xml Mon Apr 27 15:54:12 2009
@@ -133,13 +133,14 @@
       <version>1.7.0</version>
     </dependency>
 
-    <!-- Test -->
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
       <version>1.5.5</version>
-      <scope>test</scope>
+      <optional>true</optional>
     </dependency>
+
+    <!-- Test -->
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jta_1.0.1B_spec</artifactId>

Propchange: jackrabbit/commons/ocm/trunk/src/main/java/org/apache/jackrabbit/ocm/nodemanagement/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Apr 27 15:54:12 2009
@@ -0,0 +1 @@
+/jackrabbit/branches/1.3/jackrabbit-ocm/nodemanagement/src/main/java/org/apache/jackrabbit/ocm/nodemanagement:631261