DevDoc/Netigso: netigso4equinox.diff

core.netigso/src/org/netbeans/core/netigso/NetigsoActivator.java

@@ -48 +48 @@
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.apache.felix.moduleloader.IContent;
-import org.apache.felix.moduleloader.IContentLoader;
-import org.apache.felix.moduleloader.IModule;
-import org.apache.felix.moduleloader.ISearchPolicy;
-import org.apache.felix.moduleloader.IURLPolicy;
-import org.apache.felix.moduleloader.ResourceNotFoundException;
 import org.netbeans.Module;
 import org.netbeans.ProxyClassLoader;
 import org.netbeans.core.startup.MainLookup;
@@ -130 +124 @@
     /** Injects classloader of mi to Felix's bundle.
      */
     private void join(Bundle bundle, ModuleInfo mi) {
-        try {
+        // TODO
+        /*try {
             Method m = findMethod(bundle, "getInfo");
             Object info = m.invoke(bundle);
             Method m2 = findMethod(info, "getCurrentModule");
@@ -139 +134 @@
             m3.invoke(imodule, new ModuleContentLoader(mi));
         } catch (Exception ex) {
             throw new IllegalStateException(ex);
-        }
+        }*/
     }
 
     private static Method findMethod(Object obj, String name, Class... args) throws Exception {
@@ -192 +187 @@
         return (String) obj.getProperty(Constants.SERVICE_DESCRIPTION);
     }
 
-    private static final class ModuleContentLoader implements IContentLoader,
+    /*private static final class ModuleContentLoader implements IContentLoader,
     ISearchPolicy {
         private final ModuleInfo mi;
 
@@ -293 +288 @@
             return null;
         }
 
-    } // end of ModuleContentLoader
+    }*/ // end of ModuleContentLoader
 
 }

core.netigso/src/org/netbeans/core/netigso/NetigsoModuleFactory.java

@@ -58 +58 @@
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
 import java.util.logging.Level;
-import org.apache.felix.framework.Felix;
+import org.eclipse.osgi.launch.EquinoxFactory;
 import org.netbeans.Events;
 import org.netbeans.InvalidException;
 import org.netbeans.Module;
@@ -70 +70 @@
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
+import org.osgi.framework.launch.Framework;
 
 /**
  *
@@ -77 +78 @@
  */
 @ServiceProvider(service=ModuleFactory.class)
 public class NetigsoModuleFactory extends ModuleFactory
-implements Stamps.Updater {
+        implements Stamps.Updater {
     private static NetigsoActivator activator;
-    private static Felix felix;
+    private static Framework equinoxFramework;
     private static Set<String> registered;
 
     static void clear() {
         activator = null;
-        felix = null;
+        equinoxFramework = null;
         readBundles();
     }
 
@@ -125 +126 @@
 
     @Override
     public Module create(
-        File jar, Object history,
-        boolean reloadable, boolean autoload, boolean eager,
+            File jar, Object history,
+            boolean reloadable, boolean autoload, boolean eager,
         ModuleManager mgr, Events ev
     ) throws IOException {
         try {
@@ -146 +147 @@
         }
     }
 
-    synchronized static Felix getContainer() throws BundleException {
+    synchronized static Framework getContainer() throws BundleException {
         if (activator == null) {
             Map<String,Object> configMap = new HashMap<String,Object>();
             // Configure the Felix instance to be embedded.
             //configMap.put(FelixConstants.EMBEDDED_EXECUTION_PROP, "true");
             // Add core OSGi packages to be exported from the class path
             // via the system bundle.
-/*            configMap.put(Constants.FRAMEWORK_SYSTEMPACKAGES,
-                "org.osgi.framework; version=1.4.0," +
-                "org.osgi.service.packageadmin; version=1.2.0," +
-                "org.osgi.service.startlevel; version=1.1.0," +
-                "org.osgi.util.tracker; version=1.3.3,"+
-                "org.osgi.service.url; version=1.0.0");
- */
+            configMap.put(Constants.FRAMEWORK_SYSTEMPACKAGES,
+                    "org.osgi.framework; version=1.4.0," +
+                    "org.osgi.service.packageadmin; version=1.2.0," +
+                    "org.osgi.service.startlevel; version=1.1.0," +
+                    "org.osgi.util.tracker; version=1.3.3," +
+                    "org.osgi.service.url; version=1.0.0");
+            configMap.put(Constants.FRAMEWORK_STORAGE_CLEAN, "onFirstInit");
             // Explicitly specify the directory to use for caching bundles.
-            String ud = System.getProperty("netbeans.user");
+            /*String ud = System.getProperty("netbeans.user");
             if (ud == null) {
-                throw new IllegalStateException();
+            throw new IllegalStateException();
             }
             String cache = ud + File.separator + "var" + File.separator + "cache" + File.separator + "felix";
             configMap.put("felix.cache.profiledir", cache);
             configMap.put("felix.cache.dir", cache);
-            configMap.put(Constants.FRAMEWORK_STORAGE, cache);
+            configMap.put(Constants.FRAMEWORK_STORAGE, cache);*/
             activator = new NetigsoActivator();
             List<BundleActivator> activators = new ArrayList<BundleActivator>();
             activators.add(activator);
             configMap.put("felix.systembundle.activators", activators);
-            felix = new Felix(configMap);
-            felix.init();
-            NetigsoActivator.LOG.finer("Felix initialized"); // NOI18N
+            EquinoxFactory ef = new EquinoxFactory();
+            equinoxFramework = ef.newFramework(configMap);
+            equinoxFramework.init();
+            NetigsoActivator.LOG.finer("Equinox initialized"); // NOI18N
         }
-        return felix;
+        return equinoxFramework;
     }
 
     static void startContainer() throws BundleException {