A2 variants supported

[lgpl/argeo-commons.git] / org.argeo.init / src / org / argeo / init / osgi / OsgiBoot.java

diff --git a/org.argeo.init/src/org/argeo/init/osgi/OsgiBoot.java b/org.argeo.init/src/org/argeo/init/osgi/OsgiBoot.java
index ae343f05b606a472e28beb492584cddfa4f7da01..353e39c798ed2e69c23852a46dc6a49f474ab717 100644 (file)
--- a/org.argeo.init/src/org/argeo/init/osgi/OsgiBoot.java
+++ b/org.argeo.init/src/org/argeo/init/osgi/OsgiBoot.java
@@ -102,11 +102,16 @@ public class OsgiBoot implements OsgiBootConstants {
                } else {
                        for (String source : sources.split(",")) {
                                if (source.trim().equals(A2Source.DEFAULT_A2_URI)) {
+                                       int qmIndex = source.lastIndexOf('?');
+                                       String queryPart = "";
+                                       if (qmIndex >= 0) {
+                                               queryPart = source.substring(qmIndex);
+                                       }
                                        if (Files.exists(homePath))
-                                               provisioningManager
-                                                               .registerSource(A2Source.SCHEME_A2 + "://" + homePath.toString() + "/.local/share/a2");
-                                       provisioningManager.registerSource(A2Source.SCHEME_A2 + ":///usr/local/share/a2");
-                                       provisioningManager.registerSource(A2Source.SCHEME_A2 + ":///usr/share/a2");
+                                               provisioningManager.registerSource(
+                                                               A2Source.SCHEME_A2 + "://" + homePath.toString() + "/.local/share/a2" + queryPart);
+                                       provisioningManager.registerSource(A2Source.SCHEME_A2 + ":///usr/local/share/a2" + queryPart);
+                                       provisioningManager.registerSource(A2Source.SCHEME_A2 + ":///usr/share/a2" + queryPart);
                                } else {
                                        provisioningManager.registerSource(source);
                                }