* Webapps: Allow additions to a webapp classpath. This will let us:

- Pull jstl.jar and standard.jar out of susidns.war - Remove 100KB of duplicate classes from i2psnark.war - Add classpaths for plugins
2010-02-06 18:40:55 +00:00
parent 375118fe02
commit 9b141bd9dd
3 changed files with 162 additions and 7 deletions
--- a/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java
@@ -0,0 +1,91 @@
+package net.i2p.router.web;
+
+import java.io.File;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import net.i2p.I2PAppContext;
+
+import org.mortbay.jetty.servlet.WebApplicationContext;
+
+
+/**
+ *  Add to the webapp classpath as specified in webapps.config.
+ *  This allows us to reference classes that are not in the classpath
+ *  specified in wrapper.config, since old installations have
+ *  individual jars and not lib/*.jar specified in wrapper.config.
+ *
+ *  A sample line in webapps.config is:
+ *     webapps.appname.path=foo.jar,$I2P/lib/bar.jar
+ *  Unless $I2P is specified the path will be relative to $I2P/lib for
+ *  webapps in the installation and appDir/plugins/appname/lib for plugins.
+ *
+ *  Sadly, setting Class-Path in MANIFEST.MF doesn't work for jetty wars.
+ *  We could look there ourselves, or look for another properties file in the war,
+ *  but let's just do it in webapps.config.
+ *
+ *  No, wac.addClassPath() does not work. For more info see:
+ *
+ *  http://servlets.com/archive/servlet/ReadMsg?msgId=511113&listName=jetty-support
+ *
+ *  @since 0.7.12
+ *  @author zzz
+ */
+public class WebAppConfiguration implements WebApplicationContext.Configuration {
+    private WebApplicationContext _wac;
+
+    private static final String CLASSPATH = ".classpath";
+
+    public void setWebApplicationContext(WebApplicationContext context) {
+       _wac = context;
+    }
+
+    public WebApplicationContext getWebApplicationContext() {
+        return _wac;
+    }
+
+    public void configureClassPath() throws Exception {
+        String ctxPath = _wac.getContextPath();
+        //System.err.println("Configure Class Path " + ctxPath);
+        if (ctxPath.equals("/"))
+            return;
+        String appName = ctxPath.substring(1);
+
+        I2PAppContext i2pContext = I2PAppContext.getGlobalContext();
+        File libDir = new File(i2pContext.getBaseDir(), "lib");
+        File pluginLibDir = new File(i2pContext.getAppDir(),
+                                        PluginUpdateHandler.PLUGIN_DIR + ctxPath + '/' + "lib");
+        File dir = libDir;
+        String cp;
+        if (ctxPath.equals("/susidns")) {
+            // jars moved from the .war to lib/ in 0.7.12
+            cp = "jstl.jar,standard.jar";
+        } else if (ctxPath.equals("/i2psnark")) {
+            // duplicate classes removed from the .war in 0.7.12
+            cp = "i2psnark.jar";
+        } else if (pluginLibDir.exists()) {
+            Properties props = RouterConsoleRunner.webAppProperties(pluginLibDir.getAbsolutePath());
+            cp = props.getProperty(RouterConsoleRunner.PREFIX + appName + CLASSPATH);
+            dir = pluginLibDir;
+        } else {
+            Properties props = RouterConsoleRunner.webAppProperties();
+            cp = props.getProperty(RouterConsoleRunner.PREFIX + appName + CLASSPATH);
+        }
+        if (cp == null)
+            return;
+        StringTokenizer tok = new StringTokenizer(cp, " ,");
+        while (tok.hasMoreTokens()) {
+            String elem = tok.nextToken().trim();
+            String path;
+            if (elem.startsWith("$I2P"))
+                path = i2pContext.getBaseDir().getAbsolutePath() + '/' + elem.substring(4);
+            else
+                path = dir.getAbsolutePath() + '/' + elem;
+            System.err.println("Adding " + path + " to classpath for " + appName);
+            _wac.addClassPath(path);
+        }
+    }
+
+    public void configureDefaults() {}
+    public void configureWebApp() {}
+}