svn commit: r1797202 - /sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java

[cziegeler]

Author: cziegeler
Date: Thu Jun  1 11:39:33 2017
New Revision: 1797202

URL: http://svn.apache.org/viewvc?rev=1797202&view=rev
Log:
Support slinstart and slingfeature artifacts

Modified:
    
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java

Modified: 
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
URL: 
http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java?rev=1797202&r1=1797201&r2=1797202&view=diff
==============================================================================
--- 
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
 (original)
+++ 
sling/whiteboard/cziegeler/feature-modelconverter/src/main/java/org/apache/sling/feature/modelconverter/impl/Main.java
 Thu Jun  1 11:39:33 2017
@@ -34,6 +34,9 @@ import org.apache.sling.feature.Artifact
 import org.apache.sling.feature.Extension;
 import org.apache.sling.feature.ExtensionType;
 import org.apache.sling.feature.json.ApplicationJSONWriter;
+import org.apache.sling.feature.support.ArtifactHandler;
+import org.apache.sling.feature.support.ArtifactManager;
+import org.apache.sling.feature.support.ArtifactManagerConfig;
 import org.apache.sling.feature.support.Logger;
 import org.apache.sling.provisioning.model.Artifact;
 import org.apache.sling.provisioning.model.ArtifactGroup;
@@ -226,6 +229,7 @@ public class Main {
             }
         });
 
+
         final Model effectiveModel = ModelUtility.getEffectiveModel(nextModel, 
options);
         for(final Feature feature : effectiveModel.getFeatures()) {
             for(final RunMode runMode : feature.getRunModes()) {
@@ -235,7 +239,11 @@ public class Main {
                         if ( "slingstart".equals(a.getType())
                              || "slingfeature".equals(a.getType())) {
 
-                            Logger.LOG.warn("Ignoring referenced model: {0}", 
a);
+                            final ArtifactManagerConfig cfg = new 
ArtifactManagerConfig();
+                            final ArtifactManager mgr = 
ArtifactManager.getArtifactManager(cfg);
+
+                            final ArtifactHandler handler = 
mgr.getArtifactHandler(a.toMvnUrl());
+                            model = processModel(model, handler.getFile());
 
                             removeList.add(a);
                         }