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/05/15 22:49:25 UTC
[sling-org-apache-sling-feature-cpconverter] branch master updated:
ordering log moved inside ordering method
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 7bd53bc ordering log moved inside ordering method
7bd53bc is described below
commit 7bd53bc594cf6497fff0cc068e62c649ec72ec2f
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Thu May 16 00:49:18 2019 +0200
ordering log moved inside ordering method
---
.../cpconverter/ContentPackage2FeatureModelConverter.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
index 6c2d81e..13cdde5 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/ContentPackage2FeatureModelConverter.java
@@ -19,7 +19,6 @@ package org.apache.sling.feature.cpconverter;
import static java.util.Objects.requireNonNull;
import java.io.File;
-import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -124,12 +123,8 @@ public class ContentPackage2FeatureModelConverter extends BaseVaultPackageScanne
public void convert(File...contentPackages) throws Exception {
requireNonNull(contentPackages , "Null content-package(s) can not be converted.");
- logger.info("Ordering input content-package(s) {}...", Arrays.toString(contentPackages));
-
Collection<VaultPackage> orderedContentPackages = firstPass(contentPackages);
- logger.info("New content-package(s) order: {}", orderedContentPackages);
-
for (VaultPackage vaultPackage : orderedContentPackages) {
try {
mainPackageAssembler = VaultPackageAssembler.create(vaultPackage);
@@ -222,10 +217,14 @@ public class ContentPackage2FeatureModelConverter extends BaseVaultPackageScanne
logger.info("content-package '{}' successfully read!", contentPackage);
}
+ logger.info("Ordering input content-package(s) {}...", idFileMap.keySet());
+
for (VaultPackage pack : new HashSet<VaultPackage>(idPackageMapping.values())) {
orderDependencies(idFileMap, idPackageMapping, pack, new HashSet<PackageId>());
}
+ logger.info("New content-package(s) order: {}", idFileMap.keySet());
+
return idFileMap.values();
}