svn commit: r1162018 - in /karaf/branches/karaf-2.2.x/deployer/kar/src: main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java

[jbonofre]

Author: jbonofre
Date: Fri Aug 26 08:02:32 2011
New Revision: 1162018

URL: http://svn.apache.org/viewvc?rev=1162018&view=rev
Log:
[KARAF-826] Kar deployer now looks for features classifier.

Modified:
    
karaf/branches/karaf-2.2.x/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
    
karaf/branches/karaf-2.2.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java

Modified: 
karaf/branches/karaf-2.2.x/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
URL: 
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java?rev=1162018&r1=1162017&r2=1162018&view=diff
==============================================================================
--- 
karaf/branches/karaf-2.2.x/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
 (original)
+++ 
karaf/branches/karaf-2.2.x/deployer/kar/src/main/java/org/apache/karaf/deployer/kar/KarArtifactInstaller.java
 Fri Aug 26 08:02:32 2011
@@ -42,6 +42,7 @@ import org.xml.sax.SAXParseException;
 
 public class KarArtifactInstaller implements ArtifactInstaller {
 
+    public static final String FEATURES_CLASSIFIER = "features";
        private final Logger logger = 
LoggerFactory.getLogger(KarArtifactInstaller.class);
 
        private static final String KAR_SUFFIX = ".kar";
@@ -242,7 +243,7 @@ public class KarArtifactInstaller implem
 
     static URI pathToMvnUri(String path) {
         String[] bits = path.split("/");
-        String classifier = "feature";
+        String classifier = FEATURES_CLASSIFIER;
         String artifactType = "xml";
         String version = bits[bits.length - 2];
         String artifactId = bits[bits.length - 3];

Modified: 
karaf/branches/karaf-2.2.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
URL: 
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java?rev=1162018&r1=1162017&r2=1162018&view=diff
==============================================================================
--- 
karaf/branches/karaf-2.2.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
 (original)
+++ 
karaf/branches/karaf-2.2.x/deployer/kar/src/test/java/org/apache/karaf/deployer/kar/KarArtifactInstallerTest.java
 Fri Aug 26 08:02:32 2011
@@ -201,8 +201,8 @@ public class KarArtifactInstallerTest {
 
     @Test
     public void testPathToMvnUri() throws Exception {
-        URI uri = 
KarArtifactInstaller.pathToMvnUri("org/apache/geronimo/features/org.apache.geronimo.transaction.kar/3.1.1-SNAPSHOT/org.apache.geronimo.transaction.kar-3.1.1-SNAPSHOT-feature.xml");
-        assert 
"mvn:org.apache.geronimo.features/org.apache.geronimo.transaction.kar/3.1.1-SNAPSHOT/xml/feature".equals(uri.toString());
+        URI uri = 
KarArtifactInstaller.pathToMvnUri("org/apache/geronimo/features/org.apache.geronimo.transaction.kar/3.1.1-SNAPSHOT/org.apache.geronimo.transaction.kar-3.1.1-SNAPSHOT-features.xml");
+        assert 
"mvn:org.apache.geronimo.features/org.apache.geronimo.transaction.kar/3.1.1-SNAPSHOT/xml/features".equals(uri.toString());
     }
                        
 }