From 9a089b7da0a2da6f72390d8c977fdcb90a6c28b4 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 24 Jan 2009 17:20:51 +0000 Subject: [PATCH] * Build files: - Don't bundle unneeded XML parser xercesImpl.jar for Jetty (1MB) - Don't include unneeded stuff in Copy, Delete, Exec.jar (300KB) --- apps/jetty/build.xml | 1 - apps/routerconsole/jsp/help.jsp | 5 ++--- build.xml | 13 +++++-------- installer/resources/wrapper.config | 9 ++++----- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml index aaa978354..643dd79fd 100644 --- a/apps/jetty/build.xml +++ b/apps/jetty/build.xml @@ -78,7 +78,6 @@ - diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp index 8580f6e65..d53f93a88 100644 --- a/apps/routerconsole/jsp/help.jsp +++ b/apps/routerconsole/jsp/help.jsp @@ -34,9 +34,8 @@ licenses and dependencies. This webpage is being served as part of the I2P rout client application, which is built off a trimmed down Jetty instance (trimmed down, as in, we do not include the demo apps or other add-ons, and we simplify configuration), allowing you to deploy standard JSP/Servlet web applications into your router. Jetty in turn makes use of -Apache's javax.servlet (javax.servlet.jar) implementation, as well as their xerces-j XML parser (xerces.jar). -Their XML parser requires the Sun XML APIs (JAXP) which is included in binary form (xml-apis.jar) as required -by their binary code license. This product includes software developed by the Apache Software Foundation +Apache's javax.servlet (javax.servlet.jar) implementation. +This product includes software developed by the Apache Software Foundation (http://www.apache.org/).

Another application you can see on this webpage is I2PTunnel diff --git a/build.xml b/build.xml index 9bff4c5c9..a07c41053 100644 --- a/build.xml +++ b/build.xml @@ -60,7 +60,6 @@ - @@ -87,7 +86,7 @@ - + @@ -219,7 +218,6 @@ - @@ -368,17 +366,16 @@ - - + - + - + @@ -449,7 +446,7 @@ - + diff --git a/installer/resources/wrapper.config b/installer/resources/wrapper.config index 2550f4e3d..177bc1c0b 100644 --- a/installer/resources/wrapper.config +++ b/installer/resources/wrapper.config @@ -47,14 +47,13 @@ wrapper.java.classpath.12=lib/jasper-runtime.jar wrapper.java.classpath.13=lib/commons-logging.jar wrapper.java.classpath.14=lib/commons-el.jar wrapper.java.classpath.15=lib/ant.jar -wrapper.java.classpath.16=lib/xercesImpl.jar # java service wrapper, BSD -wrapper.java.classpath.17=lib/wrapper.jar +wrapper.java.classpath.16=lib/wrapper.jar # systray, LGPL -wrapper.java.classpath.18=lib/systray.jar -wrapper.java.classpath.19=lib/systray4j.jar +wrapper.java.classpath.17=lib/systray.jar +wrapper.java.classpath.18=lib/systray4j.jar # BOB -wrapper.java.classpath.20=lib/BOB.jar +wrapper.java.classpath.19=lib/BOB.jar # Java Library Path (location of Wrapper.DLL or libwrapper.so) wrapper.java.library.path.1=.