Merge pull request #2 from freenet-mobile/sideloaded-plugin-support

Support starting and registering pluins sideloaded.

src/freenet/node/NodeStarter.java

@@ -585,9 +585,11 @@ public static Node createTestNode(TestNodeParameters params) throws NodeInitExce
 	}
 
 	// experimental osgi support
-	public static void start_osgi(String[] args) {
+	public static Node start_osgi(String[] args) {
 		nodestarter_osgi = new NodeStarter();
 		nodestarter_osgi.start(args);
+
+		return nodestarter_osgi.node;
 	}
 
 	// experimental osgi support

src/freenet/pluginmanager/PluginManager.java

@@ -365,6 +365,33 @@ public PluginInfoWrapper startPluginFreenet(final String filename, boolean store
 		return realStartPlugin(new PluginDownLoaderFreenet(client, node, false), filename, store, false);
 	}
 
+	/**
+	 * Registers an externally loaded plugin.
+	 *
+	 * @param plug Plugin instance.
+	 * @return
+	 */
+	public PluginInfoWrapper startPlugin(FredPlugin plug) {
+	    final String filename = plug.getClass().getName();
+		Logger.normal(this, "Loading plugin: " + filename);
+		PluginInfoWrapper pi = null;
+		try {
+			pi = new PluginInfoWrapper(node, plug, filename, true);
+			PluginHandler.startPlugin(PluginManager.this, pi);
+			loadedPlugins.addLoadedPlugin(pi);
+			loadedPlugins.removeFailedPlugin(filename);
+			Logger.normal(this, "Plugin loaded: " + filename);
+		} catch (Throwable e) {
+			Logger.error(this, "Could not load plugin " + filename + " : " + e, e);
+			System.err.println("Could not load plugin " + filename + " : " + e);
+			e.printStackTrace();
+			System.err.println("Plugin "+filename+" is broken, but we want to retry after next startup");
+			Logger.error(this, "Plugin "+filename+" is broken, but we want to retry after next startup");
+		}
+
+		return pi;
+	}
+
 	private PluginInfoWrapper realStartPlugin(final PluginDownLoader<?> pdl, final String filename, final boolean store, boolean alwaysDownload) {
 	    if (!enabled) throw new IllegalStateException("Plugins disabled");
 		if(filename.trim().length() == 0)