This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.contentloader-2.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentloader.git
commit b5f20131f58457361876abbbb7694883b98e6ea1 Author: Justin Edelson <[email protected]> AuthorDate: Thu Feb 18 15:08:43 2010 +0000 SLING-1212 - upgrading to Jackrabbit 2. Also includes re-revert of SLING-1363 and implementation of SLING-1330. Thanks to Felix for getting this started. git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentloader@911430 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 23 +++++++++++----------- .../internal/DefaultContentCreator.java | 12 +++++------ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 6215a69..764f8b5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,9 +7,9 @@ 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 @@ -92,6 +92,7 @@ <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> + <version>2.0</version> </dependency> <dependency> <groupId>org.apache.sling</groupId> @@ -124,6 +125,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-api</artifactId> + <version>2.0.0</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> @@ -145,7 +152,7 @@ <version>1.4</version> <scope>provided</scope> </dependency> - <!-- Testing --> + <!-- Testing --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -154,18 +161,12 @@ <groupId>org.jmock</groupId> <artifactId>jmock-junit4</artifactId> </dependency> - + <!-- for security content loader (users/groups/acls) --> <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-api</artifactId> - <version>1.5.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.7-SNAPSHOT</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java b/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java index d9efe3a..961cdf1 100644 --- a/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java +++ b/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java @@ -47,13 +47,13 @@ import javax.jcr.RepositoryException; 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; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
