propagate from branch 'i2p.i2p' (head 0a3db5b65f8fdc3e91000c9dff9e679401b52f72)

to branch 'i2p.i2p.zzz.jetty6' (head da78bc5726f3715ec8083aa86bcaa6c05896b8d6)

apps/susidns/src/WEB-INF/lib/README.txt

@@ -0,0 +1,12 @@
+These are 1.2 libs downloaded from http://jstl.java.net/download.html
+Licenses: Common Development and Distribution License (CDDL) version 1.0 + GNU General Public License (GPL) version 2
+          https://glassfish.dev.java.net/public/CDDL+GPL.html
+
+1.2 libs are compatible with JSP 2.1 containers.
+See http://www.coderanch.com/how-to/java/JstlTagLibDefinitions for more info.
+
+The previous files were version 1.1.2 for JSP 2.0.
+Old names kept so they are overwritten in the update and are in the classpath.
+
+jstl-api-1.2.jar  -> jstl.jar
+jstl-impl-1.2.jar -> standard.jar

apps/susidns/src/build.xml

@@ -17,9 +17,10 @@
         <pathelement location="${lib}/jasper-compiler.jar" />
         <pathelement location="${lib}/jasper-runtime.jar" />
         <pathelement location="${lib}/javax.servlet.jar" />
+        <pathelement location="${lib}/jsp-api.jar" />
         <pathelement location="${lib}/commons-logging.jar" />
         <pathelement location="${lib}/commons-el.jar" />
-        <pathelement location="${lib}/ant.jar" />
+        <pathelement location="${ant.home}/lib/ant.jar" />
         <pathelement location="../../../core/java/build/i2p.jar" />
  	</path>
 	<property name="javac.compilerargs" value="" />

apps/susidns/src/jsp/addressbook.jsp

@@ -29,6 +29,7 @@
 
 %>
 <%@page pageEncoding="UTF-8"%>
+<%@page trimDirectiveWhitespaces="true"%>
 <%@ page contentType="text/html"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application" />

apps/susidns/src/jsp/config.jsp

@@ -29,6 +29,7 @@
 
 %>
 <%@page pageEncoding="UTF-8"%>
+<%@page trimDirectiveWhitespaces="true"%>
 <%@ page contentType="text/html" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application"/>

apps/susidns/src/jsp/details.jsp

@@ -26,6 +26,7 @@
 
 %>
 <%@page pageEncoding="UTF-8"%>
+<%@page trimDirectiveWhitespaces="true"%>
 <%@ page contentType="text/html"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application" />

apps/susidns/src/jsp/index.jsp

@@ -29,6 +29,7 @@
 
 %>
 <%@page pageEncoding="UTF-8"%>
+<%@page trimDirectiveWhitespaces="true"%>
 <%@ page contentType="text/html"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application" />

apps/susidns/src/jsp/subscriptions.jsp

@@ -29,6 +29,7 @@
 
 %>
 <%@page pageEncoding="UTF-8"%>
+<%@page trimDirectiveWhitespaces="true"%>
 <%@ page contentType="text/html"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <jsp:useBean id="version" class="i2p.susi.dns.VersionBean" scope="application" />