Add includes and excludes

[gpl/argeo-slc.git] / runtime / org.argeo.slc.lib.detached / src / main / java / org / argeo / slc / lib / detached / DetachedLauncher.java

diff --git a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java
index d0ceb56b77cc5175dbb70fa762a49dcd4ed3330d..d9ff2f6be118c7f2fbd84e01fae688f1fb2d1ad5 100644 (file)
--- a/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java
+++ b/runtime/org.argeo.slc.lib.detached/src/main/java/org/argeo/slc/lib/detached/DetachedLauncher.java
@@ -1,6 +1,9 @@
 package org.argeo.slc.lib.detached;
 
 import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -10,6 +13,7 @@ import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ResourceLoaderAware;
+import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.osgi.context.BundleContextAware;
@@ -27,6 +31,9 @@ public class DetachedLauncher extends JvmProcess implements BundleContextAware,
        private String xmlapisBundleName = "com.springsource.org.apache.xmlcommons";
        private String xercesBundleName = "com.springsource.org.apache.xerces";
 
+       private List<String> excludeBundleNames = new ArrayList<String>();
+       private List<String> includeBundleUrls = new ArrayList<String>();
+
        /**
         * Required by Spring for JDK 1.4. see
         * http://forum.springsource.org/showthread.php?t=74555
@@ -54,17 +61,22 @@ public class DetachedLauncher extends JvmProcess implements BundleContextAware,
                StringBuffer osgiLocations = new StringBuffer("");
                bundles: for (Bundle bundle : bundleContext.getBundles()) {
                        String name = bundle.getSymbolicName();
+
+                       if (excludeBundleNames.contains(name))
+                               continue bundles;// skip excluded
+
                        String location = bundle.getLocation();
+                       location = removeInitialReference(location);
 
                        // Special bundles
                        if (osgibootBundleName.equals(name))
-                               getClasspath().add(findOsgiboot(bundle));
+                               getClasspath().add(asResource(location));
                        else if (equinoxBundleName.equals(name))
                                continue bundles;// skip framework
                        else if (xmlapisBundleName.equals(name) && prependXmlJars)
-                               getPBootClasspath().add(asResource(bundle.getLocation()));
+                               getPBootClasspath().add(asResource(location));
                        else if (xercesBundleName.equals(name) && prependXmlJars)
-                               getPBootClasspath().add(asResource(bundle.getLocation()));
+                               getPBootClasspath().add(asResource(location));
 
                        if (location.startsWith("file:")) {
                                File file = new File(location.substring("file:".length()));
@@ -79,24 +91,45 @@ public class DetachedLauncher extends JvmProcess implements BundleContextAware,
                        }
                }
 
+               for (String url : includeBundleUrls) {
+                       if (osgiBundles.length() != 0)
+                               osgiBundles.append(',');
+                       osgiBundles.append(url);
+               }
+
                getSystemProperties().setProperty("osgi.bundles",
                                osgiBundles.toString());
                getSystemProperties().setProperty("slc.osgi.locations",
                                osgiLocations.toString());
        }
 
-       protected Resource findOsgiboot(Bundle bundle) {
-               String location = bundle.getLocation();
+       protected String removeInitialReference(String location) {
                if (location.startsWith("initial@reference:file:"))
-                       location = System.getProperty("osgi.install.area") + "/../"
+                       location = System.getProperty("osgi.install.area")
                                        + location.substring("initial@reference:file:".length());
                if (location.charAt(location.length() - 1) == '/')
                        location.substring(0, location.length() - 1);
-               return asResource(location);
+               return location;
        }
 
        protected Resource asResource(String location) {
-               Resource res = resourceLoader.getResource(location);
+               // Resource res = resourceLoader.getResource(location);
+
+               final Resource res;
+               if (location.startsWith("file:")) {
+                       File file = new File(location.substring("file:".length()));
+                       if (!file.exists())
+                               throw new SlcException("File " + file + " does not exist");
+
+                       try {
+                               res = new FileSystemResource(file.getCanonicalFile());
+                       } catch (IOException e) {
+                               throw new SlcException("Cannot create resource based on "
+                                               + file, e);
+                       }
+               } else
+                       res = resourceLoader.getResource(location);
+
                if (log.isDebugEnabled())
                        log.debug("Converted " + location + " to " + res);
                return res;
@@ -134,4 +167,12 @@ public class DetachedLauncher extends JvmProcess implements BundleContextAware,
                this.prependXmlJars = prependXmlJars;
        }
 
+       public void setExcludeBundleNames(List<String> excludeBundleNames) {
+               this.excludeBundleNames = excludeBundleNames;
+       }
+
+       public void setIncludeBundleUrls(List<String> includeBundleUrls) {
+               this.includeBundleUrls = includeBundleUrls;
+       }
+
 }