You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2018/06/27 13:50:21 UTC
[sling-org-apache-sling-feature-launcher] branch master updated:
Remove dependency on resolver and analyzer which are not needed for now and
update feature and feature.io dependency to 0.1.3-SNAPSHOT.
This is an automated email from the ASF dual-hosted git repository.
pauls 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 6d4e37d Remove dependency on resolver and analyzer which are not needed for now and update feature and feature.io dependency to 0.1.3-SNAPSHOT.
6d4e37d is described below
commit 6d4e37d65ad5bf447dd784ab51fd13f886fe33d3
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Wed Jun 27 15:50:16 2018 +0200
Remove dependency on resolver and analyzer which are not needed for now and update feature and feature.io dependency to 0.1.3-SNAPSHOT.
---
pom.xml | 18 +++---------------
.../sling/feature/launcher/impl/FeatureProcessor.java | 15 ---------------
.../org/apache/sling/feature/launcher/impl/Main.java | 2 +-
.../launcher/impl/launchers/AbstractRunner.java | 2 +-
4 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9c5aabf..2062ac6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
- <includeArtifactIds>org.apache.sling.feature.analyser,osgi.core,org.apache.sling.feature.resolver,org.apache.felix.utils,commons-lang,org.apache.sling.feature,org.apache.sling.feature.io,org.apache.sling.commons.johnzon,org.apache.felix.converter,commons-cli,slf4j-api,slf4j-simple,osgi.core</includeArtifactIds>
+ <includeArtifactIds>osgi.core,commons-lang,org.apache.sling.feature,org.apache.sling.feature.io,org.apache.sling.commons.johnzon,org.apache.felix.converter,commons-cli,slf4j-api,slf4j-simple</includeArtifactIds>
</configuration>
</execution>
</executions>
@@ -109,25 +109,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.io</artifactId>
- <version>0.1.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.feature.resolver</artifactId>
- <version>0.1.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.feature.analyser</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>0.1.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
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 bc9cd00..d922b7b 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
@@ -27,24 +27,17 @@ import org.apache.sling.feature.io.ArtifactManager;
import org.apache.sling.feature.io.json.ApplicationJSONReader;
import org.apache.sling.feature.io.json.ApplicationJSONWriter;
import org.apache.sling.feature.launcher.impl.LauncherConfig.StartupMode;
-import org.apache.sling.feature.resolver.ApplicationResolverAssembler;
-import org.apache.sling.feature.resolver.FeatureResolver;
-import org.apache.sling.feature.resolver.FrameworkResolver;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.StringReader;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
import javax.json.Json;
import javax.json.JsonArray;
import javax.json.JsonReader;
-import javax.json.JsonString;
-import javax.json.JsonValue;
public class FeatureProcessor {
@@ -69,14 +62,6 @@ public class FeatureProcessor {
app = ApplicationJSONReader.read(r);
}
- } else {
- try (FeatureResolver resolver = new FrameworkResolver(artifactManager, Collections.emptyMap())) {
- app = ApplicationResolverAssembler.assembleApplication(null, artifactManager, resolver,
- org.apache.sling.feature.io.IOUtils.getFeatureFiles(config.getHomeDirectory(), config.getFeatureFiles()).toArray(new String[0]));
- } catch (Exception ex) {
- Main.LOG().error("Error while assembling application: {}", ex.getMessage(), ex);
- System.exit(1);
- }
}
// write application back
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 1b7b35e..3c0fcd7 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
@@ -23,7 +23,6 @@ import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
import org.apache.commons.cli.BasicParser;
import org.apache.commons.cli.CommandLine;
@@ -130,6 +129,7 @@ public class Main {
}
}
+
public static void main(final String[] args) {
// setup logging
System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info");
diff --git a/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java b/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java
index 81cbb2f..9603946 100644
--- a/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java
+++ b/src/main/java/org/apache/sling/feature/launcher/impl/launchers/AbstractRunner.java
@@ -290,7 +290,7 @@ public abstract class AbstractRunner implements Callable<Integer> {
{
if (waitRequested.get() == 0) {
try {
- Thread.sleep(50);
+ Thread.sleep(500);
} catch (InterruptedException e) {
e.printStackTrace();
}