Fix issue when artifact name contains a '-'.

[lgpl/argeo-commons.git] / org.argeo.osgi.boot / src / org / argeo / osgi / boot / a2 / FsA2Source.java

diff --git a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java
index b9f9193ffa512e4c4f0eaab7a7dd060118478350..c0e721941b1a82c8385d43c7dba170b1e5b5490e 100644 (file)
--- a/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java
+++ b/org.argeo.osgi.boot/src/org/argeo/osgi/boot/a2/FsA2Source.java
@@ -43,9 +43,11 @@ public class FsA2Source extends ProvisioningSource {
                                        if (!"jar".equals(ext))
                                                continue modules;
                                        String moduleName = moduleFileName.substring(0, lastDot);
-                                       int firstDash = moduleName.indexOf('-');
-                                       String versionStr = moduleName.substring(firstDash + 1);
-                                       String componentName = moduleName.substring(0, firstDash);
+                                       if (moduleName.endsWith("-SNAPSHOT"))
+                                               moduleName = moduleName.substring(0, moduleName.length() - "-SNAPSHOT".length());
+                                       int lastDash = moduleName.lastIndexOf('-');
+                                       String versionStr = moduleName.substring(lastDash + 1);
+                                       String componentName = moduleName.substring(0, lastDash);
                                        // if(versionStr.endsWith("-SNAPSHOT")) {
                                        // versionStr = readVersionFromModule(modulePath);
                                        // }
@@ -54,9 +56,12 @@ public class FsA2Source extends ProvisioningSource {
                                                version = new Version(versionStr);
                                        } catch (Exception e) {
                                                versionStr = readVersionFromModule(modulePath);
-                                               version = new Version(versionStr);
-                                               // OsgiBootUtils.debug("Ignore " + modulePath + " (" + e.getMessage() + ")");
-                                               // continue modules;
+                                               if (versionStr != null) {
+                                                       version = new Version(versionStr);
+                                               } else {
+                                                       OsgiBootUtils.debug("Ignore " + modulePath + " (" + e.getMessage() + ")");
+                                                       continue modules;
+                                               }
                                        }
                                        A2Component component = contribution.getOrAddComponent(componentName);
                                        A2Module module = component.getOrAddModule(version, modulePath);
@@ -71,7 +76,7 @@ public class FsA2Source extends ProvisioningSource {
        public static void main(String[] args) {
                try {
                        FsA2Source context = new FsA2Source(Paths.get(
-                                       "/home/mbaudier/dev/git/apache2/argeo-commons/dist/argeo-node/target/argeo-node-2.1.74-SNAPSHOT/argeo-node/share/osgi"));
+                                       "/home/mbaudier/dev/git/apache2/argeo-commons/dist/argeo-node/target/argeo-node-2.1.77-SNAPSHOT/share/osgi"));
                        context.load();
                        context.asTree();
                } catch (Exception e) {