svn commit: r885743 - in /sling/whiteboard/fmeschbe/jackrabbit2upgrade/bundles/jcr/contentloader: pom.xml src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java

[fmeschbe]

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;