Merge branch 'release/2.0.0'

Netcentric · May 12, 2017 · c2e73cc · c2e73cc
2 parents 792a5f0 + c12c12a
commit c2e73cc
Show file tree

Hide file tree

Showing 118 changed files with 5,243 additions and 4,127 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Access Control Tool for Adobe Experience Manager
 ================================================
 
-The Access Control Tool for Adobe Experience Manager (AC Tool) simplifies the specification and deployment of complex [Access Control Lists in AEM] (http://docs.adobe.com/docs/en/cq/current/administering/security.html#Access%20Control%20Lists%20and%20how%20they%20are%20evaluated).
+The Access Control Tool for Adobe Experience Manager (AC Tool) simplifies the specification and deployment of complex [Access Control Lists in AEM](http://docs.adobe.com/docs/en/cq/current/administering/security.html#Access%20Control%20Lists%20and%20how%20they%20are%20evaluated).
 Instead of [existing solutions](docs/Comparison.md) that build e.g. a content package with actual ACL nodes you can write simple configuration files and deploy them with your content packages.
 
 Features:
@@ -18,11 +18,11 @@ See also our talk at [AdaptTo 2016](https://adapt.to/2016/en/schedule/ac-tool.ht
 
 # Requirements
 
-The AC Tool requires Java 7 and AEM 6.0 SP3 or above (use v1.8.5 for CQ 5.6.1)
+The AC Tool requires Java 7 and AEM 6.1 or above (use v1.x for older versions)
 
 # Installation
 
-The package is available via [Maven](https://repo1.maven.org/maven2/biz/netcentric/cq/tools/accesscontroltool/accesscontroltool-package/). Install it e.g. via CRX package manager.
+The package is available from [the Maven Central repository](https://repo1.maven.org/maven2/biz/netcentric/cq/tools/accesscontroltool/accesscontroltool-package/). Install it e.g. via CRX package manager.
 
 ```
     <groupId>biz.netcentric.cq.tools.accesscontroltool</groupId>
@@ -69,4 +69,4 @@ If needed you can [build the AC Tool yourself](docs/BuildPackage.md).
 
 # License
 
-The AC Tool is licensed under the [Eclipse Public License - v 1.0](LICENSE.txt).
+The AC Tool is licensed under the [Eclipse Public License - v 1.0](LICENSE.txt).
diff --git a/accesscontroltool-bundle/pom.xml b/accesscontroltool-bundle/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>biz.netcentric.cq.tools.accesscontroltool</groupId>
         <artifactId>accesscontroltool</artifactId>
-        <version>1.9.3</version>
+        <version>2.0.0</version>
     </parent>
 
     <!-- ====================================================================== -->
@@ -148,6 +148,12 @@
           <version>6.0.41</version>
         </dependency> 
 
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>oak-core</artifactId>
+            <version>1.2.7</version>
+        </dependency>        
+
         <dependency>
           <groupId>org.apache.jackrabbit</groupId>
           <artifactId>oak-auth-external</artifactId>
@@ -162,13 +168,6 @@
             <scope>test</scope>
         </dependency>          
 
-        <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>oak-core</artifactId>
-            <version>1.3.9</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.hc.core</artifactId>
@@ -198,6 +197,12 @@
                 <instructions>
                     <Embed-Dependency>el-api,jasper-el</Embed-Dependency>
                     <!-- Required to support 6.1 and 6.2 -->
+                    <Export-Package>
+                        biz.netcentric.cq.tools.actool.api,
+                        biz.netcentric.cq.tools.actool.installhook,
+                        biz.netcentric.cq.tools.actool.aceservice,
+                        biz.netcentric.cq.tools.actool.installationhistory
+                    </Export-Package>
                     <Import-Package>
                         org.apache.jackrabbit.oak.spi.security.authentication.external;version="[1.0,3)",
                         *

diff --git a/...q/tools/actool/acls/AceBeanInstaller.java → ...actool/aceinstaller/AceBeanInstaller.java b/...q/tools/actool/acls/AceBeanInstaller.java → ...actool/aceinstaller/AceBeanInstaller.java
@@ -6,15 +6,15 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package biz.netcentric.cq.tools.actool.acls;
+package biz.netcentric.cq.tools.actool.aceinstaller;
 
 import java.util.Map;
 import java.util.Set;
 
 import javax.jcr.Session;
 
 import biz.netcentric.cq.tools.actool.configmodel.AceBean;
-import biz.netcentric.cq.tools.actool.installationhistory.AcInstallationHistoryPojo;
+import biz.netcentric.cq.tools.actool.history.AcInstallationLog;
 
 /** Installs AceBeans to content paths. */
 public interface AceBeanInstaller {
@@ -25,10 +25,10 @@ public interface AceBeanInstaller {
      *
      * @param pathBasedAceMapFromConfig map containing the ACE data from the merged configurations path based
      * @param session the jcr session
-     * @param history history object
+     * @param installationLog the installation log
      * @param authorizablesToRemoveAcesFor
      * @param intermediateSaves whether the session should be saved after each path (for each ACL) */
     void installPathBasedACEs(final Map<String, Set<AceBean>> pathBasedAceMapFromConfig, final Session session,
-            final AcInstallationHistoryPojo history, Set<String> authorizablesToRemoveAcesFor, boolean intermediateSaves) throws Exception;
+            final AcInstallationLog installationLog, Set<String> authorizablesToRemoveAcesFor, boolean intermediateSaves) throws Exception;
 
 }