commit 0254a58cc85f5ff67663ec7b000d294858b3c4ba
author Hristo Iliev <hsiliev@gmail.com> Wed Jan 12 21:00:19 2011 +0200
committer Hristo Iliev <hsiliev@gmail.com> Wed Jan 12 21:00:19 2011 +0200
tree ace9b151ffc8d5ed20aa824871129748d0e9b0f8
parent 2fdc2730a89d66d438c2d50c3d71babe48f2b50c

Initial change to allow use of Equinox launcher and P2 SimpleConfigurator

org.eclipse.virgo.osgi.launcher/src/main/java/org/eclipse/virgo/osgi/launcher/parser/ArgumentParser.java

diff --git a/org.eclipse.virgo.osgi.launcher/src/main/java/org/eclipse/virgo/osgi/launcher/parser/ArgumentParser.java b/org.eclipse.virgo.osgi.launcher/src/main/java/org/eclipse/virgo/osgi/launcher/parser/ArgumentParser.java
index 566ebe2..91b6aeb 100644
--- a/org.eclipse.virgo.osgi.launcher/src/main/java/org/eclipse/virgo/osgi/launcher/parser/ArgumentParser.java
+++ b/org.eclipse.virgo.osgi.launcher/src/main/java/org/eclipse/virgo/osgi/launcher/parser/ArgumentParser.java
@@ -75,30 +75,56 @@
 
     /**
      * Parses a comma-separated list of bundle entries in the form <uri>[@start].
-     * @param entryList comma-separated list of bundle entry declarations
+     *
+     * @param entryList  comma-separated list of bundle entry declarations
      * @return an array of bundle entries parsed from the list
-     * 
-     * @see #parseBundleEntry(String)
+     *
+     * @see #parseBundleEntry(String, String)
      */
     public BundleEntry[] parseBundleEntries(String entryList) {
+        return parseBundleEntries(null, entryList);
+    }
+
+    /**
+     * Parses a comma-separated list of bundle entries in the form <uri>[@start].
+     *
+     * @param regionPath location of the bundles
+     * @param entryList  comma-separated list of bundle entry declarations
+     * @return an array of bundle entries parsed from the list
+     * 
+     * @see #parseBundleEntry(String, String)
+     */
+    public BundleEntry[] parseBundleEntries(String regionPath, String entryList) {
         String[] entries = entryList.split(",");
         BundleEntry[] result = new BundleEntry[entries.length];
         for (int x = 0; x < result.length; x++) {
-            result[x] = parseBundleEntry(entries[x]);
+            result[x] = parseBundleEntry(regionPath, entries[x]);
         }
         return result;
     }
 
     /**
      * Parses bundle entry in the form &lt;uri&gt;[@start].
-     * @param decl string to parse
+     *
+     * @param decl       string to parse
      * @return bundle entry denoted by the string
      */
     public BundleEntry parseBundleEntry(String decl) {
+        return parseBundleEntry(null, decl);
+    }
+
+    /**
+     * Parses bundle entry in the form &lt;uri&gt;[@start].
+     *
+     * @param regionPath location of the bundles
+     * @param decl       string to parse
+     * @return bundle entry denoted by the string
+     */
+    public BundleEntry parseBundleEntry(String regionPath, String decl) {
         String[] components = parseCommandComponents(decl, BUNDLE_PATH_DELIMITER, MAXIMUM_BUNDLE_DECLARATION_COMPONENTS);
 
         String path = components[0];
-        URI uri = pathToURI(path);
+        URI uri = pathToURI(regionPath, path);
 
         boolean autoStart = false;
         if (components.length == MAXIMUM_BUNDLE_DECLARATION_COMPONENTS) {
@@ -166,12 +192,12 @@
         return components;
     }
 
-    private URI pathToURI(String path) {
+    private URI pathToURI(String root, String path) {
 
         URI uri = null;
 
         // see if the path is a valid file first
-        File f = new File(path);
+        File f = new File(root, path);
         if (f.exists()) {
             uri = f.getAbsoluteFile().toURI();
         }
@@ -182,12 +208,23 @@
                 URI u = new URI(path);
                 if (u.isAbsolute()) {
                     uri = u;
+
+                    // if we have root folder try to construct a valid file path
+                    if (u.getScheme().equals("file")) {
+                        if (root != null) {
+                            f = new File(root, u.getSchemeSpecificPart());
+                            if (f.exists()) {
+                                uri = f.getAbsoluteFile().toURI();
+                            }
+                        }
+                    }
+
                 }
             } catch (URISyntaxException e) {
             }
         }
         
-        if(uri == null) {
+        if (uri == null) {
             throw new ParseException("Path '" + path +"' is not a valid URI or file path");
         }