Return-Path: 
 <commits-return-6468-apmail-sling-commits-archive=sling.apache.org@sling.apache.org>
Delivered-To: apmail-sling-commits-archive@www.apache.org
Received: (qmail 83135 invoked from network); 1 Dec 2009 11:41:39 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 1 Dec 2009 11:41:39 -0000
Received: (qmail 14870 invoked by uid 500); 1 Dec 2009 11:41:39 -0000
Delivered-To: apmail-sling-commits-archive@sling.apache.org
Received: (qmail 14815 invoked by uid 500); 1 Dec 2009 11:41:39 -0000
Mailing-List: contact commits-help@sling.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@sling.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@sling.apache.org>
List-Post: <mailto:commits@sling.apache.org>
List-Id: <commits.sling.apache.org>
Reply-To: dev@sling.apache.org
Delivered-To: mailing list commits@sling.apache.org
Received: (qmail 14806 invoked by uid 99); 1 Dec 2009 11:41:39 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 11:41:39 +0000
X-ASF-Spam-Status: No, hits=-2.8 required=5.0
	tests=AWL,BAYES_00
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Dec 2009 11:41:36 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 77EB6238890A; Tue,  1 Dec 2009 11:41:16 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r885743 - in
 /sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/contentloader:
 pom.xml
 src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
Date: Tue, 01 Dec 2009 11:41:16 -0000
To: commits@sling.apache.org
From: fmeschbe@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091201114116.77EB6238890A@eris.apache.org>

Author: fmeschbe
Date: Tue Dec  1 11:41:15 2009
New Revision: 885743

URL: http://svn.apache.org/viewvc?rev=885743&view=rev
Log:
SLING-1212 Migrate to JCR 2.0

Modified:
    sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/contentloader/pom.xml
    sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java

Modified: sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/contentloader/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/contentloader/pom.xml?rev=885743&r1=885742&r2=885743&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/contentloader/pom.xml (original)
+++ sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/contentloader/pom.xml Tue Dec  1 11:41:15 2009
@@ -147,14 +147,16 @@
         
         <!-- for security content loader (users/groups/acls) -->
         <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-api</artifactId>
-            <version>1.5.0</version>
+            <groupId>javax.jcr</groupId>
+            <artifactId>jcr</artifactId>
+            <version>2.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.base</artifactId>
-            <version>2.0.4-incubator</version>
+            <version>2.0.5-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

Modified: sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java?rev=885743&r1=885742&r2=885743&view=diff
==============================================================================
--- sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java (original)
+++ sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java Tue Dec  1 11:41:15 2009
@@ -43,13 +43,13 @@
 import javax.jcr.Session;
 import javax.jcr.Value;
 import javax.jcr.ValueFactory;
+import javax.jcr.security.AccessControlEntry;
+import javax.jcr.security.AccessControlList;
+import javax.jcr.security.AccessControlManager;
+import javax.jcr.security.AccessControlPolicy;
+import javax.jcr.security.AccessControlPolicyIterator;
+import javax.jcr.security.Privilege;
 
-import org.apache.jackrabbit.api.jsr283.security.AccessControlEntry;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlList;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlManager;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicy;
-import org.apache.jackrabbit.api.jsr283.security.AccessControlPolicyIterator;
-import org.apache.jackrabbit.api.jsr283.security.Privilege;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.Group;
 import org.apache.jackrabbit.api.security.user.User;