[sling-org-apache-sling-feature-launcher] branch master updated: Move file based artifact management into separate package

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-launcher.git


The following commit(s) were added to refs/heads/master by this push:
     new b98e7b2  Move file based artifact management into separate package
b98e7b2 is described below

commit b98e7b26cd0bcf2d52caa73fd5ee6b4be18aeeb5
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Mon Oct 1 14:17:47 2018 +0200

    Move file based artifact management into separate package
---
 .../sling/feature/launcher/impl/FeatureProcessor.java     | 15 ++++++---------
 .../sling/feature/launcher/impl/LauncherConfig.java       |  6 +++---
 .../java/org/apache/sling/feature/launcher/impl/Main.java |  7 +++----
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java 
b/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
index 2e77570..dd5c2bb 100644
--- a/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
+++ b/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
@@ -39,9 +39,8 @@ import org.apache.sling.feature.FeatureConstants;
 import org.apache.sling.feature.builder.BuilderContext;
 import org.apache.sling.feature.builder.FeatureBuilder;
 import org.apache.sling.feature.builder.FeatureExtensionHandler;
-import org.apache.sling.feature.io.ArtifactHandler;
-import org.apache.sling.feature.io.ArtifactManager;
-import org.apache.sling.feature.io.IOUtils;
+import org.apache.sling.feature.io.file.ArtifactHandler;
+import org.apache.sling.feature.io.file.ArtifactManager;
 import org.apache.sling.feature.io.json.FeatureJSONReader;
 import org.apache.sling.feature.launcher.spi.LauncherPrepareContext;
 import org.apache.sling.feature.launcher.spi.extensions.ExtensionHandler;
@@ -78,13 +77,11 @@ public class FeatureProcessor {
 
         for (final String initFile : config.getFeatureFiles())
         {
-            try
-            {
-                final Feature f = IOUtils.getFeature(initFile, 
artifactManager);
+            final ArtifactHandler featureArtifact = 
artifactManager.getArtifactHandler(initFile);
+            try (final FileReader r = new 
FileReader(featureArtifact.getFile())) {
+                final Feature f = FeatureJSONReader.read(r, 
featureArtifact.getUrl());
                 features.add(f);
-            }
-            catch (Exception ex)
-            {
+            } catch (Exception ex) {
                 throw new IOException("Error reading feature: " + initFile, 
ex);
             }
         }
diff --git 
a/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java 
b/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java
index 54e9ba0..47ad3df 100644
--- a/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java
+++ b/src/main/java/org/apache/sling/feature/launcher/impl/LauncherConfig.java
@@ -22,14 +22,14 @@ import java.util.Arrays;
 import java.util.LinkedHashSet;
 
 import org.apache.sling.feature.KeyValueMap;
-import org.apache.sling.feature.io.DefaultArtifactManagerConfig;
-import org.apache.sling.feature.io.spi.ArtifactProviderContext;
+import org.apache.sling.feature.io.file.ArtifactManagerConfig;
+import org.apache.sling.feature.io.file.spi.ArtifactProviderContext;
 
 /**
  * This class holds the configuration of the launcher.
  */
 public class LauncherConfig
-    extends DefaultArtifactManagerConfig
+    extends ArtifactManagerConfig
     implements ArtifactProviderContext {
 
     private static final String HOME = "launcher";
diff --git a/src/main/java/org/apache/sling/feature/launcher/impl/Main.java 
b/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
index 9839f54..0d551eb 100644
--- a/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
+++ b/src/main/java/org/apache/sling/feature/launcher/impl/Main.java
@@ -37,10 +37,9 @@ import org.apache.commons.cli.ParseException;
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.ArtifactId;
 import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.io.ArtifactHandler;
-import org.apache.sling.feature.io.ArtifactManager;
-import org.apache.sling.feature.io.DefaultArtifactManager;
 import org.apache.sling.feature.io.IOUtils;
+import org.apache.sling.feature.io.file.ArtifactHandler;
+import org.apache.sling.feature.io.file.ArtifactManager;
 import org.apache.sling.feature.io.json.FeatureJSONWriter;
 import org.apache.sling.feature.launcher.impl.launchers.FrameworkLauncher;
 import org.apache.sling.feature.launcher.spi.Launcher;
@@ -211,7 +210,7 @@ public class Main {
 
         final Launcher launcher = new FrameworkLauncher();
 
-        try (ArtifactManager artifactManager = 
DefaultArtifactManager.getArtifactManager(launcherConfig)) {
+        try (ArtifactManager artifactManager = 
ArtifactManager.getArtifactManager(launcherConfig)) {
 
             Main.LOG().info("Artifact Repositories: {}", 
Arrays.toString(launcherConfig.getRepositoryUrls()));
             Main.LOG().info("Assembling provisioning model...");