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/10/02 21:18:33 UTC
[sling-org-apache-sling-feature-cpconverter] branch master updated:
SLING-8760 - [cp2fm] multiple node type registrations are handled as single
registration
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
The following commit(s) were added to refs/heads/master by this push:
new fb37d8d SLING-8760 - [cp2fm] multiple node type registrations are handled as single registration
fb37d8d is described below
commit fb37d8da10d549ddb7c450c869e7f5fb9f7ace99
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Wed Oct 2 23:18:25 2019 +0200
SLING-8760 - [cp2fm] multiple node type registrations are handled as
single registration
---
.../sling/feature/cpconverter/acl/DefaultAclManager.java | 15 ++-------------
.../cpconverter/handlers/NodeTypesEntryHandler.java | 11 ++++++++++-
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/acl/DefaultAclManager.java b/src/main/java/org/apache/sling/feature/cpconverter/acl/DefaultAclManager.java
index 43e7764..a54483e 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/acl/DefaultAclManager.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/acl/DefaultAclManager.java
@@ -97,19 +97,8 @@ public final class DefaultAclManager implements AclManager {
}
}
- if (!nodetypeRegistrationSentences.isEmpty()) {
- formatter.format("register nodetypes%n")
- .format("<<===%n");
-
- for (String nodetypeRegistrationSentence : nodetypeRegistrationSentences) {
- if (nodetypeRegistrationSentence.isEmpty()) {
- formatter.format("%n");
- } else {
- formatter.format("<< %s%n", nodetypeRegistrationSentence);
- }
- }
-
- formatter.format("===>>%n");
+ for (String nodetypeRegistrationSentence : nodetypeRegistrationSentences) {
+ formatter.format("%s%n", nodetypeRegistrationSentence);
}
// system users
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/handlers/NodeTypesEntryHandler.java b/src/main/java/org/apache/sling/feature/cpconverter/handlers/NodeTypesEntryHandler.java
index e45ec27..54032dd 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/handlers/NodeTypesEntryHandler.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/handlers/NodeTypesEntryHandler.java
@@ -38,10 +38,19 @@ public class NodeTypesEntryHandler extends AbstractRegexEntryHandler {
public void handle(String path, Archive archive, Entry entry, ContentPackage2FeatureModelConverter converter)
throws Exception {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(archive.openInputStream(entry)))) {
+ converter.getAclManager().addNodetypeRegistrationSentence("register nodetypes");
+ converter.getAclManager().addNodetypeRegistrationSentence("<<===");
+
String nodetypeRegistrationSentence;
while ((nodetypeRegistrationSentence = reader.readLine()) != null) {
- converter.getAclManager().addNodetypeRegistrationSentence(nodetypeRegistrationSentence);
+ if (nodetypeRegistrationSentence.isEmpty()) {
+ converter.getAclManager().addNodetypeRegistrationSentence("");
+ } else {
+ converter.getAclManager().addNodetypeRegistrationSentence("<< " + nodetypeRegistrationSentence);
+ }
}
+
+ converter.getAclManager().addNodetypeRegistrationSentence("===>>");
}
}