You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by an...@apache.org on 2021/08/31 12:38:29 UTC
[sling-org-apache-sling-feature-cpconverter] 01/01: SLING-10755 :
DefaultAclManager.CONTENT_XML_FILE_NAME should be replace by filevault
constant
This is an automated email from the ASF dual-hosted git repository.
angela pushed a commit to branch SLING-10755
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
commit 4f72f32a8a5d43c68f613911c720b6064cb5f643
Author: angela <an...@adobe.com>
AuthorDate: Tue Aug 31 14:38:17 2021 +0200
SLING-10755 : DefaultAclManager.CONTENT_XML_FILE_NAME should be replace by filevault constant
---
.../feature/cpconverter/accesscontrol/DefaultAclManager.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/accesscontrol/DefaultAclManager.java b/src/main/java/org/apache/sling/feature/cpconverter/accesscontrol/DefaultAclManager.java
index 4fc5b74..c6fed64 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/accesscontrol/DefaultAclManager.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/accesscontrol/DefaultAclManager.java
@@ -71,12 +71,12 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import static org.apache.jackrabbit.vault.util.Constants.DOT_CONTENT_XML;
+
public class DefaultAclManager implements AclManager, EnforceInfo {
private static final Logger log = LoggerFactory.getLogger(DefaultAclManager.class);
-
- private static final String CONTENT_XML_FILE_NAME = ".content.xml";
-
+
private final RepoPath enforcePrincipalBasedSupportedPath;
private final String systemRelPath;
@@ -431,7 +431,7 @@ public class DefaultAclManager implements AclManager, EnforceInfo {
platformPath += platformPath.isEmpty() ? platformname : "/" + platformname;
boolean segmentAdded = false;
for (VaultPackageAssembler packageAssembler : packageAssemblers) {
- File currentContent = packageAssembler.getEntry(platformPath + "/" + CONTENT_XML_FILE_NAME);
+ File currentContent = packageAssembler.getEntry(platformPath + "/" + DOT_CONTENT_XML);
if (currentContent.isFile()) {
segmentAdded = addSegment(cp, part, currentContent);
if (segmentAdded) {