You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by si...@apache.org on 2019/07/02 15:47:51 UTC
[sling-org-apache-sling-feature-cpconverter] branch
avoid_subpackages_flattering updated (02107c2 -> cf4ba51)
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a change to branch avoid_subpackages_flattering
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git.
from 02107c2 SLING-8544 - [cp2fm] service users need to be created with intermediate path
add b6af63e SLING-8555 - Converter generates broken repoinit statements when package contains type indicators for restriction
add d934281 SLING-8544 - [cp2fm] service users need to be created with intermediate path
new cf4ba51 Merge branch 'master' into avoid_subpackages_flattering
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 6 ++++
.../feature/cpconverter/acl/DefaultAclManager.java | 2 +-
.../handlers/RepPolicyEntryHandler.java | 10 +++++--
.../handlers/SystemUsersEntryHandler.java | 12 ++++++--
.../feature/cpconverter/acl/AclManagerTest.java | 16 +++++++++--
.../handlers/RepPolicyEntryHandlerTest.java | 33 +++++++++++++++-------
.../handlers/SystemUsersEntryHandlerTest.java | 11 +++++++-
7 files changed, 70 insertions(+), 20 deletions(-)
[sling-org-apache-sling-feature-cpconverter] 01/01: Merge branch
'master' into avoid_subpackages_flattering
Posted by si...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch avoid_subpackages_flattering
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
commit cf4ba516dd5150f866ffcb1ef13d7b4afca0d3ef
Merge: 02107c2 d934281
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Tue Jul 2 17:47:45 2019 +0200
Merge branch 'master' into avoid_subpackages_flattering
# Conflicts:
# src/main/java/org/apache/sling/feature/cpconverter/acl/DefaultAclManager.java
# src/test/java/org/apache/sling/feature/cpconverter/acl/AclManagerTest.java
# src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPolicyEntryHandlerTest.java
# src/test/java/org/apache/sling/feature/cpconverter/handlers/SystemUsersEntryHandlerTest.java
pom.xml | 6 ++++
.../feature/cpconverter/acl/DefaultAclManager.java | 2 +-
.../handlers/RepPolicyEntryHandler.java | 10 +++++--
.../handlers/SystemUsersEntryHandler.java | 12 ++++++--
.../feature/cpconverter/acl/AclManagerTest.java | 16 +++++++++--
.../handlers/RepPolicyEntryHandlerTest.java | 33 +++++++++++++++-------
.../handlers/SystemUsersEntryHandlerTest.java | 11 +++++++-
7 files changed, 70 insertions(+), 20 deletions(-)
diff --cc src/test/java/org/apache/sling/feature/cpconverter/acl/AclManagerTest.java
index 8dc0a08,a4af09b..b70baed
--- a/src/test/java/org/apache/sling/feature/cpconverter/acl/AclManagerTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/acl/AclManagerTest.java
@@@ -23,8 -24,9 +24,10 @@@ import static org.mockito.Mockito.mock
import static org.mockito.Mockito.when;
import java.io.File;
+ import java.io.StringReader;
import java.nio.file.Paths;
+import java.util.Arrays;
+ import java.util.List;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Extension;
@@@ -73,9 -78,9 +79,9 @@@ public class AclManagerTest
assertNotNull(repoinitExtension);
// acs-commons-on-deploy-scripts-service will be missed
- String expected = "create service user acs-commons-package-replication-status-event-service with path /home/users/system/public\n" +
- String expected = "create service user acs-commons-package-replication-status-event-service with path /asd/public\n" +
++ String expected = "create service user acs-commons-package-replication-status-event-service with path /asd/public\n" +
"create path (sling:Folder) /asd\n" +
- "create path (sling:Folder) /asd/public\n" +
+ "create path (sling:Folder) /asd/public\n" +
"set ACL for acs-commons-package-replication-status-event-service\n" +
"allow jcr:read,crx:replicate,jcr:removeNode on /asd/public\n" +
"end\n" +
diff --cc src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPolicyEntryHandlerTest.java
index a8eea3f,546c6f8..97022a8
--- a/src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPolicyEntryHandlerTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/handlers/RepPolicyEntryHandlerTest.java
@@@ -27,8 -27,9 +27,10 @@@ import static org.mockito.Mockito.spy
import static org.mockito.Mockito.when;
import java.io.File;
+ import java.io.StringReader;
import java.nio.file.Paths;
+import java.util.Arrays;
+ import java.util.List;
import org.apache.jackrabbit.vault.fs.io.Archive;
import org.apache.jackrabbit.vault.fs.io.Archive.Entry;
diff --cc src/test/java/org/apache/sling/feature/cpconverter/handlers/SystemUsersEntryHandlerTest.java
index c43d3a5,b33ff3f..9dd5050
--- a/src/test/java/org/apache/sling/feature/cpconverter/handlers/SystemUsersEntryHandlerTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/handlers/SystemUsersEntryHandlerTest.java
@@@ -25,7 -25,8 +25,9 @@@ import static org.mockito.ArgumentMatch
import static org.mockito.Mockito.*;
import java.io.File;
+import java.util.Arrays;
+ import java.io.StringReader;
+ import java.util.List;
import org.apache.jackrabbit.vault.fs.io.Archive;
import org.apache.jackrabbit.vault.fs.io.Archive.Entry;