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

[cziegeler]

Author: cziegeler
Date: Fri Aug  4 12:27:37 2017
New Revision: 1804109

URL: http://svn.apache.org/viewvc?rev=1804109&view=rev
Log:
Fix include of sling models

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=1804109&r1=1804108&r2=1804109&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
 Fri Aug  4 12:27:37 2017
@@ -16,6 +16,19 @@
  */
 package org.apache.sling.feature.modelconverter.impl;
 
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.commons.cli.BasicParser;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -52,19 +65,6 @@ import org.osgi.framework.Constants;
 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.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 public class Main {
 
     private static Logger LOGGER;
@@ -388,7 +388,13 @@ public class Main {
                             final ArtifactManagerConfig cfg = new 
ArtifactManagerConfig();
                             final ArtifactManager mgr = 
ArtifactManager.getArtifactManager(cfg);
 
-                            final ArtifactHandler handler = 
mgr.getArtifactHandler(a.toMvnUrl());
+                            final ArtifactId correctedId = new 
ArtifactId(a.getGroupId(),
+                                    a.getArtifactId(),
+                                    a.getVersion(),
+                                    "slingstart".equals(a.getType()) ? 
"slingfeature" : a.getClassifier(),
+                                    "txt");
+
+                            final ArtifactHandler handler = 
mgr.getArtifactHandler(correctedId.toMvnUrl());
                             model = processModel(model, handler.getFile());
 
                             removeList.add(a);