From 3f70593ca86b19ff5b5e38bd38dee0908f92f9ad Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Thu, 5 Aug 2004 02:24:00 +0000
Subject: [PATCH] precompile all of the JSPs so that people with JREs instead
of JDKs can load this up
---
apps/i2ptunnel/java/build.xml | 41 ++++++++++++++++++++++++++++---
apps/i2ptunnel/jsp/index.html | 2 ++
apps/i2ptunnel/jsp/web.xml | 6 ++---
apps/routerconsole/java/build.xml | 41 ++++++++++++++++++++++++++++---
apps/routerconsole/jsp/index.html | 2 ++
apps/routerconsole/jsp/web.xml | 6 ++---
6 files changed, 86 insertions(+), 12 deletions(-)
create mode 100644 apps/i2ptunnel/jsp/index.html
create mode 100644 apps/routerconsole/jsp/index.html
diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index 2357f4ccc0..47e9f8943f 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -24,11 +24,46 @@
</jar>
<ant target="war" />
</target>
- <target name="war">
- <war destfile="build/i2ptunnel.war" webxml="../jsp/web.xml"
- basedir="../jsp/" excludes="web.xml">
+ <target name="war" depends="precompilejsp">
+ <war destfile="build/i2ptunnel.war" webxml="../jsp/web-out.xml"
+ basedir="../jsp/" excludes="web.xml, *.java, *.jsp">
</war>
</target>
+ <target name="precompilejsp">
+ <mkdir dir="../jsp/WEB-INF/" />
+ <mkdir dir="../jsp/WEB-INF/classes" />
+ <!-- there are various jspc ant tasks, but they all seem a bit flakey -->
+ <java classname="org.apache.jasper.JspC" fork="true" >
+ <classpath>
+ <pathelement location="../../jetty/jettylib/jasper-compiler.jar" />
+ <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
+ <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
+ <pathelement location="../../jetty/jettylib/ant.jar" />
+ <pathelement location="build/i2ptunnel.jar" />
+ </classpath>
+ <arg value="-d" />
+ <arg value="../jsp/WEB-INF/classes" />
+ <arg value="-v9" />
+ <arg value="-p" />
+ <arg value="net.i2p.i2ptunnel.jsp" />
+ <arg value="-webinc" />
+ <arg value="../jsp/web-fragment.xml" />
+ <arg value="-webapp" />
+ <arg value="../jsp/" />
+ </java>
+ <javac destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="*.java">
+ <classpath>
+ <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
+ <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
+ <pathelement location="build/i2ptunnel.jar" />
+ </classpath>
+ </javac>
+ <copy file="../jsp/web.xml" tofile="../jsp/web-out.xml" />
+ <loadfile property="jspc.web.fragment" srcfile="../jsp/web-fragment.xml" />
+ <replace file="../jsp/web-out.xml">
+ <replacefilter token="<!-- precompiled servlets -->" value="${jspc.web.fragment}" />
+ </replace>
+ </target>
<target name="javadoc">
<mkdir dir="./build" />
<mkdir dir="./build/javadoc" />
diff --git a/apps/i2ptunnel/jsp/index.html b/apps/i2ptunnel/jsp/index.html
new file mode 100644
index 0000000000..ea1321105e
--- /dev/null
+++ b/apps/i2ptunnel/jsp/index.html
@@ -0,0 +1,2 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><title>I2P Router Console</title></head>
+<body><meta http-equiv="refresh" content="0;url=index.jsp" /><a href="index.jsp">Enter</a></body></html>
diff --git a/apps/i2ptunnel/jsp/web.xml b/apps/i2ptunnel/jsp/web.xml
index 9a428440d4..b995397008 100644
--- a/apps/i2ptunnel/jsp/web.xml
+++ b/apps/i2ptunnel/jsp/web.xml
@@ -4,14 +4,14 @@
"http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
<web-app>
+ <!-- precompiled servlets -->
<session-config>
<session-timeout>
30
</session-timeout>
</session-config>
<welcome-file-list>
- <welcome-file>
- index.jsp
- </welcome-file>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
</welcome-file-list>
</web-app>
\ No newline at end of file
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index dd0a76e1ab..b59a4413cc 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -26,11 +26,46 @@
</jar>
<ant target="war" />
</target>
- <target name="war">
- <war destfile="build/routerconsole.war" webxml="../jsp/web.xml"
- basedir="../jsp/" excludes="web.xml">
+ <target name="war" depends="precompilejsp">
+ <war destfile="build/routerconsole.war" webxml="../jsp/web-out.xml"
+ basedir="../jsp/" excludes="web.xml, *.java, *.jsp">
</war>
</target>
+ <target name="precompilejsp">
+ <mkdir dir="../jsp/WEB-INF/" />
+ <mkdir dir="../jsp/WEB-INF/classes" />
+ <!-- there are various jspc ant tasks, but they all seem a bit flakey -->
+ <java classname="org.apache.jasper.JspC" fork="true" >
+ <classpath>
+ <pathelement location="../../jetty/jettylib/jasper-compiler.jar" />
+ <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
+ <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
+ <pathelement location="../../jetty/jettylib/ant.jar" />
+ <pathelement location="build/routerconsole.jar" />
+ </classpath>
+ <arg value="-d" />
+ <arg value="../jsp/WEB-INF/classes" />
+ <arg value="-v9" />
+ <arg value="-p" />
+ <arg value="net.i2p.router.web.jsp" />
+ <arg value="-webinc" />
+ <arg value="../jsp/web-fragment.xml" />
+ <arg value="-webapp" />
+ <arg value="../jsp/" />
+ </java>
+ <javac destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="*.java">
+ <classpath>
+ <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
+ <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
+ <pathelement location="build/routerconsole.jar" />
+ </classpath>
+ </javac>
+ <copy file="../jsp/web.xml" tofile="../jsp/web-out.xml" />
+ <loadfile property="jspc.web.fragment" srcfile="../jsp/web-fragment.xml" />
+ <replace file="../jsp/web-out.xml">
+ <replacefilter token="<!-- precompiled servlets -->" value="${jspc.web.fragment}" />
+ </replace>
+ </target>
<target name="javadoc">
<mkdir dir="./build" />
<mkdir dir="./build/javadoc" />
diff --git a/apps/routerconsole/jsp/index.html b/apps/routerconsole/jsp/index.html
new file mode 100644
index 0000000000..ea1321105e
--- /dev/null
+++ b/apps/routerconsole/jsp/index.html
@@ -0,0 +1,2 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><title>I2P Router Console</title></head>
+<body><meta http-equiv="refresh" content="0;url=index.jsp" /><a href="index.jsp">Enter</a></body></html>
diff --git a/apps/routerconsole/jsp/web.xml b/apps/routerconsole/jsp/web.xml
index 9a428440d4..b995397008 100644
--- a/apps/routerconsole/jsp/web.xml
+++ b/apps/routerconsole/jsp/web.xml
@@ -4,14 +4,14 @@
"http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
<web-app>
+ <!-- precompiled servlets -->
<session-config>
<session-timeout>
30
</session-timeout>
</session-config>
<welcome-file-list>
- <welcome-file>
- index.jsp
- </welcome-file>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
</welcome-file-list>
</web-app>
\ No newline at end of file
--
GitLab