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/04/27 09:53:24 UTC
[sling-org-apache-sling-feature-analyser] 08/28: Support variables
in converting from features to provisioning model
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-analyser.git
commit 0dc0ba51d388521acf74b64f6f7219b9a2c570d7
Author: David Bosschaert <da...@gmail.com>
AuthorDate: Tue Mar 20 10:46:52 2018 +0000
Support variables in converting from features to provisioning model
---
src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java b/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
index f2b4b95..8fd9bd5 100644
--- a/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
+++ b/src/test/java/org/apache/sling/feature/analyser/AnalyserTest.java
@@ -28,7 +28,7 @@ import org.apache.sling.feature.support.ArtifactManager;
import org.apache.sling.feature.support.ArtifactManagerConfig;
import org.apache.sling.feature.support.FeatureUtil;
import org.apache.sling.feature.support.json.FeatureJSONReader;
-import org.apache.sling.feature.support.json.FeatureJSONReader.Phase;
+import org.apache.sling.feature.support.json.FeatureJSONReader.SubstituteVariables;
import org.junit.Test;
import java.io.File;
@@ -47,7 +47,7 @@ public class AnalyserTest {
final Analyser analyser = new Analyser(scanner);
try ( final Reader reader = new InputStreamReader(AnalyserTest.class.getResourceAsStream("/feature_complete.json"),
"UTF-8") ) {
- Feature feature = FeatureJSONReader.read(reader, "feature", Phase.RESOLVE);
+ Feature feature = FeatureJSONReader.read(reader, "feature", SubstituteVariables.RESOLVE);
Application app = FeatureUtil.assembleApplication(null, ArtifactManager.getArtifactManager(new ArtifactManagerConfig()),
getTestResolver(), feature);
@@ -62,7 +62,7 @@ public class AnalyserTest {
final Analyser analyser = new Analyser(scanner);
try ( final Reader reader = new InputStreamReader(AnalyserTest.class.getResourceAsStream("/feature_incomplete.json"),
"UTF-8") ) {
- Feature feature = FeatureJSONReader.read(reader, "feature", Phase.RESOLVE);
+ Feature feature = FeatureJSONReader.read(reader, "feature", SubstituteVariables.RESOLVE);
Application app = FeatureUtil.assembleApplication(null, ArtifactManager.getArtifactManager(new ArtifactManagerConfig()),
getTestResolver(), feature);
--
To stop receiving notification emails like this one, please contact
davidb@apache.org.