Author: pauls Date: Tue Sep 12 09:50:21 2017 New Revision: 1808096 URL: http://svn.apache.org/viewvc?rev=1808096&view=rev Log: Wrap featureprovider in a builder context where applicable.
Modified: sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java Modified: sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java?rev=1808096&r1=1808095&r2=1808096&view=diff ============================================================================== --- sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java (original) +++ sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/FeatureUtil.java Tue Sep 12 09:50:21 2017 @@ -29,6 +29,7 @@ import org.apache.sling.feature.Applicat import org.apache.sling.feature.ArtifactId; import org.apache.sling.feature.Feature; import org.apache.sling.feature.process.ApplicationBuilder; +import org.apache.sling.feature.process.BuilderContext; import org.apache.sling.feature.process.FeatureProvider; import org.apache.sling.feature.support.json.FeatureJSONReader; @@ -216,8 +217,7 @@ public class FeatureUtil { */ public static Application assembleApplication( Application app, - final List<String> featureFiles, - final ArtifactManager artifactManager) + final ArtifactManager artifactManager, final String... featureFiles) throws IOException { final List<Feature> features = new ArrayList<>(); for(final String initFile : featureFiles) { @@ -236,7 +236,7 @@ public class FeatureUtil { throw new IOException("No features found."); } - app = ApplicationBuilder.assemble(app, new FeatureProvider() { + app = ApplicationBuilder.assemble(app, new BuilderContext(new FeatureProvider() { @Override public Feature provide(final ArtifactId id) { @@ -252,7 +252,7 @@ public class FeatureUtil { } return null; } - }, features); + }), features); // check framework if ( app.getFramework() == null ) {