X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.init%2Fsrc%2Forg%2Fargeo%2Finit%2Fa2%2FFsA2Source.java;h=067537d5911d24bddd7fe8fa2bec73688bcc85de;hb=dea32138f55d1c80f75515793ed15be0e89e6d61;hp=949dbdf81dec07b0753b2009c753a2fc02c2564f;hpb=6bbc3a40f506bd559413ea234f262dfeb5f29001;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.init/src/org/argeo/init/a2/FsA2Source.java b/org.argeo.init/src/org/argeo/init/a2/FsA2Source.java
index 949dbdf81..067537d59 100644
--- a/org.argeo.init/src/org/argeo/init/a2/FsA2Source.java
+++ b/org.argeo.init/src/org/argeo/init/a2/FsA2Source.java
@@ -43,27 +43,28 @@ public class FsA2Source extends AbstractProvisioningSource implements A2Source {
 					String ext = moduleFileName.substring(lastDot + 1);
 					if (!"jar".equals(ext))
 						continue modules;
-					String moduleName = moduleFileName.substring(0, lastDot);
-					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);
+//					String moduleName = moduleFileName.substring(0, lastDot);
+//					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);
 					// }
 					Version version;
-					try {
+//					try {
+//						version = new Version(versionStr);
+//					} catch (Exception e) {
+					String versionStr = readVersionFromModule(modulePath);
+					String componentName = readSymbolicNameFromModule(modulePath);
+					if (versionStr != null) {
 						version = new Version(versionStr);
-					} catch (Exception e) {
-						versionStr = readVersionFromModule(modulePath);
-						if (versionStr != null) {
-							version = new Version(versionStr);
-						} else {
-							OsgiBootUtils.debug("Ignore " + modulePath + " (" + e.getMessage() + ")");
-							continue modules;
-						}
+					} else {
+						OsgiBootUtils.debug("Ignore " + modulePath + " since version cannot be found");
+						continue modules;
 					}
+//					}
 					A2Component component = contribution.getOrAddComponent(componentName);
 					A2Module module = component.getOrAddModule(version, modulePath);
 					if (OsgiBootUtils.isDebug())