+ <%=intl._("The plugins listed below are started by the webConsole client and run in the same JVM as the router. They are usually web applications accessible through the router console.")%>
+
<%=intl._("To install a plugin, enter the URL to download the plugin from:")%>
diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java
index dfa9d7c21..b4fa75381 100644
--- a/router/java/src/net/i2p/router/RouterContext.java
+++ b/router/java/src/net/i2p/router/RouterContext.java
@@ -62,7 +62,7 @@ public class RouterContext extends I2PAppContext {
private Calculator _capacityCalc;
- private static List _contexts = new ArrayList(1);
+ private static List _contexts = new ArrayList(1);
public RouterContext(Router router) { this(router, null); }
public RouterContext(Router router, Properties envProps) {
@@ -148,7 +148,7 @@ public class RouterContext extends I2PAppContext {
* context is created or a router is shut down.
*
*/
- public static List listContexts() { return _contexts; }
+ public static List listContexts() { return _contexts; }
/** what router is this context working for? */
public Router router() { return _router; }
diff --git a/router/java/src/net/i2p/router/startup/ClientAppConfig.java b/router/java/src/net/i2p/router/startup/ClientAppConfig.java
index 54342a895..b08e7577d 100644
--- a/router/java/src/net/i2p/router/startup/ClientAppConfig.java
+++ b/router/java/src/net/i2p/router/startup/ClientAppConfig.java
@@ -4,6 +4,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Properties;
@@ -72,6 +73,26 @@ public class ClientAppConfig {
*/
public static List getClientApps(RouterContext ctx) {
Properties clientApps = getClientAppProps(ctx);
+ return getClientApps(clientApps);
+ }
+
+ /*
+ * Go through the properties, and return a List of ClientAppConfig structures
+ */
+ public static List getClientApps(File cfgFile) {
+ Properties clientApps = new Properties();
+ try {
+ DataHelper.loadProps(clientApps, cfgFile);
+ } catch (IOException ioe) {
+ return Collections.EMPTY_LIST;
+ }
+ return getClientApps(clientApps);
+ }
+
+ /*
+ * Go through the properties, and return a List of ClientAppConfig structures
+ */
+ private static List getClientApps(Properties clientApps) {
List rv = new ArrayList(8);
int i = 0;
while (true) {
diff --git a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
index 0f86f5b61..663c56025 100644
--- a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
+++ b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
@@ -48,16 +48,20 @@ public class LoadClientAppsJob extends JobImpl {
}
}
}
- private class DelayedRunClient extends JobImpl {
+
+ public static class DelayedRunClient extends JobImpl {
private String _className;
private String _clientName;
private String _args[];
+ private Log _log;
+
public DelayedRunClient(RouterContext enclosingContext, String className, String clientName, String args[], long delay) {
super(enclosingContext);
_className = className;
_clientName = clientName;
_args = args;
- getTiming().setStartAfter(LoadClientAppsJob.this.getContext().clock().now() + delay);
+ _log = enclosingContext.logManager().getLog(LoadClientAppsJob.class);
+ getTiming().setStartAfter(getContext().clock().now() + delay);
}
public String getName() { return "Delayed client job"; }
public void runJob() {