svn commit: r740052 - /tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/BundleUtil.java

[rfeng]

Author: rfeng
Date: Mon Feb  2 18:09:34 2009
New Revision: 740052

URL: http://svn.apache.org/viewvc?rev=740052&view=rev
Log:
Derive the osgi version from maven

Modified:
    
tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/BundleUtil.java

Modified: 
tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/BundleUtil.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/BundleUtil.java?rev=740052&r1=740051&r2=740052&view=diff
==============================================================================
--- 
tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/BundleUtil.java
 (original)
+++ 
tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/BundleUtil.java
 Mon Feb  2 18:09:34 2009
@@ -44,6 +44,8 @@
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -127,7 +129,7 @@
             Set<File> jars = new HashSet<File>();
             jars.add(file);
             String name = file.getName().substring(0, 
file.getName().lastIndexOf(".jar"));
-            manifest = libraryManifest(jars, name, name, "0.0.0", null);
+            manifest = libraryManifest(jars, name, name, jarVersion(name), 
null);
         }
         return manifest;
     }
@@ -407,6 +409,25 @@
             }
         }
     }
+    
+    private static Pattern pattern = Pattern.compile("-([0-9.]+)");
+
+    /**
+     * Returns the version number to use for the given JAR file.
+     *   
+     * @param jarFile
+     * @return
+     */
+    private static String jarVersion(String jarFile) {
+        Matcher matcher = pattern.matcher(jarFile);
+        String version = "0.0.0";
+        if (matcher.find()) {
+            version = matcher.group().substring(1); // Remove -
+            return osgiVersion(version);
+        } else {
+            return version;
+        }
+    }
 
     /**
      * Convert the maven version into OSGi version