You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/07/24 16:15:48 UTC

karaf git commit: [KARAF-3805] Deal with non standard features classifier in kar file

Repository: karaf
Updated Branches:
  refs/heads/master b888ac02e -> 5047794da


[KARAF-3805] Deal with non standard features classifier in kar file


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5047794d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5047794d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5047794d

Branch: refs/heads/master
Commit: 5047794daa9b27e614d4349849e52956e5898f0c
Parents: b888ac0
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jul 24 16:15:09 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Jul 24 16:15:09 2015 +0200

----------------------------------------------------------------------
 .../java/org/apache/karaf/kar/internal/Kar.java | 10 +++--
 .../org/apache/karaf/util/maven/Parser.java     | 13 +++++-
 .../java/org/apache/karaf/util/ParserTest.java  | 42 ++++++++++++++++++++
 3 files changed, 61 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/5047794d/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
----------------------------------------------------------------------
diff --git a/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java b/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
index 9500733..c2a8dd5 100644
--- a/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
+++ b/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
@@ -24,7 +24,9 @@ import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.jar.Attributes;
 import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
@@ -118,9 +120,11 @@ public class Kar {
                     File destFile = new File(repoDir, path);
                     extract(zipIs, entry, destFile);
                     if (scanForRepos && featureDetector.isFeaturesRepository(destFile)) {
-                        // String uri = Parser.pathToMaven(path);
-                        // featureRepos.add(URI.create(uri));
-                        featureRepos.add(destFile.toURI());
+                        Map map = new HashMap<>();
+                        String uri = Parser.pathToMaven(path, map);
+                        if (map.get("classifier") != null && ((String) map.get("classifier")).equalsIgnoreCase("features"))
+                            featureRepos.add(URI.create(uri));
+                        else featureRepos.add(destFile.toURI());
                     }
                 }
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/5047794d/util/src/main/java/org/apache/karaf/util/maven/Parser.java
----------------------------------------------------------------------
diff --git a/util/src/main/java/org/apache/karaf/util/maven/Parser.java b/util/src/main/java/org/apache/karaf/util/maven/Parser.java
index f1e5704..23644c7 100644
--- a/util/src/main/java/org/apache/karaf/util/maven/Parser.java
+++ b/util/src/main/java/org/apache/karaf/util/maven/Parser.java
@@ -19,6 +19,7 @@
 package org.apache.karaf.util.maven;
 
 import java.net.MalformedURLException;
+import java.util.Map;
 
 /**
  * Parser for mvn: protocol.<br/>
@@ -162,7 +163,7 @@ public class Parser
         return new Parser(uri.substring("mvn:".length())).getArtifactPath();
     }
 
-    public static String pathToMaven(String location) {
+    public static String pathToMaven(String location, Map parts) {
         String[] p = location.split("/");
         if (p.length >= 4 && p[p.length-1].startsWith(p[p.length-3] + "-" + p[p.length-2])) {
             String artifactId = p[p.length-3];
@@ -178,6 +179,12 @@ public class Parser
             }
             type = p[p.length-1].substring(p[p.length-1].lastIndexOf('.') + 1);
             sb.append("mvn:");
+            if (parts != null) {
+                parts.put("artifactId", artifactId);
+                parts.put("version", version);
+                parts.put("classifier", classifier);
+                parts.put("type", type);
+            }
             for (int j = 0; j < p.length - 3; j++) {
                 if (j > 0) {
                     sb.append('.');
@@ -199,6 +206,10 @@ public class Parser
         return location;
     }
 
+    public static String pathToMaven(String location) {
+        return pathToMaven(location, null);
+    }
+
     /**
      * Parses the artifact part of the url ( without the repository).
      *

http://git-wip-us.apache.org/repos/asf/karaf/blob/5047794d/util/src/test/java/org/apache/karaf/util/ParserTest.java
----------------------------------------------------------------------
diff --git a/util/src/test/java/org/apache/karaf/util/ParserTest.java b/util/src/test/java/org/apache/karaf/util/ParserTest.java
new file mode 100644
index 0000000..d15487a
--- /dev/null
+++ b/util/src/test/java/org/apache/karaf/util/ParserTest.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.util;
+
+import junit.framework.Assert;
+import org.apache.karaf.util.maven.Parser;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ParserTest {
+
+    private final static String PATH_WITH_CLASSIFIER = "org/apache/karaf/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT-feature.xml";
+    private final static String PATH_WITHOUT_CLASSIFIER = "org/apache/karaf/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.xml";
+
+    @Test
+    public void parserTest() throws Exception {
+        Map parts = new HashMap();
+        String uri = Parser.pathToMaven(PATH_WITH_CLASSIFIER, parts);
+        Assert.assertEquals("mvn:org.apache.karaf/test/1.0-SNAPSHOT/xml/feature", uri);
+        Assert.assertEquals("feature", parts.get("classifier"));
+        uri = Parser.pathToMaven(PATH_WITHOUT_CLASSIFIER, parts);
+        Assert.assertEquals("mvn:org.apache.karaf/test/1.0-SNAPSHOT/xml", uri);
+        Assert.assertNull(parts.get("classifier"));
+    }
+
+}