You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2018/05/05 19:36:40 UTC
[sling-org-apache-sling-feature-modelconverter] branch master
updated: Remove dependency on resolver for now,
until the resolver has stabilised
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-modelconverter.git
The following commit(s) were added to refs/heads/master by this push:
new 2169110 Remove dependency on resolver for now, until the resolver has stabilised
2169110 is described below
commit 2169110e84a85cccd6a4d63e347e9bd7949dd957
Author: David Bosschaert <bo...@adobe.com>
AuthorDate: Sat May 5 20:36:07 2018 +0100
Remove dependency on resolver for now, until the resolver has stabilised
---
pom.xml | 6 ------
.../apache/sling/feature/modelconverter/FeatureToProvisioning.java | 6 ++----
src/main/java/org/apache/sling/feature/modelconverter/Main.java | 3 ++-
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 45c2d50..bba1cbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,12 +139,6 @@
</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.provisioning.model</artifactId>
<version>1.8.2</version>
<scope>provided</scope>
diff --git a/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java b/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java
index 50f9892..9896aff 100644
--- a/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java
+++ b/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java
@@ -27,10 +27,7 @@ import org.apache.sling.feature.FeatureConstants;
import org.apache.sling.feature.KeyValueMap;
import org.apache.sling.feature.io.ArtifactManager;
import org.apache.sling.feature.io.IOUtils;
-import org.apache.sling.feature.io.json.ApplicationJSONReader;
import org.apache.sling.feature.io.json.FeatureJSONReader.SubstituteVariables;
-import org.apache.sling.feature.resolver.ApplicationResolverAssembler;
-import org.apache.sling.feature.resolver.FeatureResolver;
import org.apache.sling.provisioning.model.Artifact;
import org.apache.sling.provisioning.model.Configuration;
import org.apache.sling.provisioning.model.Feature;
@@ -41,7 +38,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.StringReader;
@@ -79,6 +75,7 @@ public class FeatureToProvisioning {
convert(newFeature, feature.getVariables(), feature.getBundles(), feature.getConfigurations(), feature.getFrameworkProperties(), feature.getExtensions(), output);
}
+ /*
public static void convert(List<File> files, String output, boolean createApp, ArtifactManager am) throws Exception {
try (FeatureResolver fr = null) { // TODO we could use the resolver: new FrameworkResolver(am)
if ( createApp ) {
@@ -99,6 +96,7 @@ public class FeatureToProvisioning {
}
}
}
+ */
private static void convert(final Application app, final int index, final String outputFile) {
String featureName;
diff --git a/src/main/java/org/apache/sling/feature/modelconverter/Main.java b/src/main/java/org/apache/sling/feature/modelconverter/Main.java
index dca7c27..fec8644 100644
--- a/src/main/java/org/apache/sling/feature/modelconverter/Main.java
+++ b/src/main/java/org/apache/sling/feature/modelconverter/Main.java
@@ -194,7 +194,8 @@ public class Main {
output = createApp ? "application.txt" : "feature.txt";
}
try {
- FeatureToProvisioning.convert(files, output, createApp, am);
+ throw new IOException("Not yet supported");
+ // FeatureToProvisioning.convert(files, output, createApp, am);
} catch ( final IOException ioe) {
LOGGER.error("Unable to read feature/application files " + ioe.getMessage(), ioe);
System.exit(1);
--
To stop receiving notification emails like this one, please contact
davidb@apache.org.