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/06/22 10:20:22 UTC
[sling-org-apache-sling-feature-cpconverter] branch master updated:
iterate sub(-sub)* content-packages scan & version resolutions
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 271c850 iterate sub(-sub)* content-packages scan & version resolutions
271c850 is described below
commit 271c8503b7147ed393a51b6ab99d4bac40a6f5df
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Sat Jun 22 12:20:13 2019 +0200
iterate sub(-sub)* content-packages scan & version resolutions
---
.../handlers/VersionResolverContentPackageEntryHandler.java | 9 ++++++++-
.../cpconverter/vltpkg/RecollectorVaultPackageScanner.java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/handlers/VersionResolverContentPackageEntryHandler.java b/src/main/java/org/apache/sling/feature/cpconverter/handlers/VersionResolverContentPackageEntryHandler.java
index 2a57822..dc55464 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/handlers/VersionResolverContentPackageEntryHandler.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/handlers/VersionResolverContentPackageEntryHandler.java
@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
+import org.apache.sling.feature.cpconverter.vltpkg.RecollectorVaultPackageScanner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,9 +29,12 @@ public final class VersionResolverContentPackageEntryHandler extends AbstractCon
private final Logger logger = LoggerFactory.getLogger(getClass());
+ private final RecollectorVaultPackageScanner scanner;
+
private final Map<PackageId, String> subContentPackages;
- public VersionResolverContentPackageEntryHandler(Map<PackageId, String> subContentPackages) {
+ public VersionResolverContentPackageEntryHandler(RecollectorVaultPackageScanner scanner, Map<PackageId, String> subContentPackages) {
+ this.scanner = scanner;
this.subContentPackages = subContentPackages;
}
@@ -65,6 +69,9 @@ public final class VersionResolverContentPackageEntryHandler extends AbstractCon
if (addPackage) {
subContentPackages.put(currentId, path);
+
+ // iteratively traverse the sub(-sub)*content-packages
+ scanner.traverse(contentPackage);
}
}
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/RecollectorVaultPackageScanner.java b/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/RecollectorVaultPackageScanner.java
index 1d0a747..79925dd 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/RecollectorVaultPackageScanner.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/vltpkg/RecollectorVaultPackageScanner.java
@@ -37,7 +37,7 @@ public final class RecollectorVaultPackageScanner extends BaseVaultPackageScanne
Map<PackageId, String> subContentPackages) {
super(packageManager, strictValidation);
this.converter = converter;
- handler = new VersionResolverContentPackageEntryHandler(subContentPackages);
+ handler = new VersionResolverContentPackageEntryHandler(this, subContentPackages);
}
@Override