diff --git a/apps/routerconsole/jsp/search.jsp b/apps/routerconsole/jsp/search.jsp index 2068819f285e3fce314eeabcfcc21c78ef60c38c..34813b0e5fef6ade44cfe04a99ed8ccfeb9cfe8c 100644 --- a/apps/routerconsole/jsp/search.jsp +++ b/apps/routerconsole/jsp/search.jsp @@ -7,8 +7,8 @@ %> <jsp:useBean class="net.i2p.router.web.SearchHelper" id="searchhelper" scope="request" /> <jsp:setProperty name="searchhelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /> -<jsp:setProperty name="searchhelper" property="engine" value="<%=request.getParameter("engine")%>" /> -<jsp:setProperty name="searchhelper" property="query" value="<%=request.getParameter("query")%>" /> +<jsp:setProperty name="searchhelper" property="engine" value="<%=request.getParameter(\"engine\")%>" /> +<jsp:setProperty name="searchhelper" property="query" value="<%=request.getParameter(\"query\")%>" /> <html><head></head><body><b> <% String url = searchhelper.getURL(); diff --git a/apps/routerconsole/jsp/xhr1.jsi b/apps/routerconsole/jsp/xhr1.jsi index c9722c69b54ab9f60d09eb6708d62f207a05196c..a171d0c852419e4fc786bf1c3f065d83839c0899 100644 --- a/apps/routerconsole/jsp/xhr1.jsi +++ b/apps/routerconsole/jsp/xhr1.jsi @@ -1,13 +1,13 @@ <jsp:useBean class="net.i2p.router.web.SummaryHelper" id="helper" scope="request" /> -<jsp:setProperty name="helper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> -<jsp:setProperty name="helper" property="action" value="<%=request.getParameter("action")%>" /> +<jsp:setProperty name="helper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /> +<jsp:setProperty name="helper" property="action" value="<%=request.getParameter(\"action\")%>" /> <table><tr><td align="left"><b><%=intl._("Version")%>:</b></td><td align="right"> <jsp:getProperty name="helper" property="version" /> </td></tr><tr><td align="left"><b><%=intl._("Uptime")%>:</b></td><td align="right"> <jsp:getProperty name="helper" property="uptime" /> </td></tr></table><hr> -<jsp:setProperty name="helper" property="updateNonce" value="<%=request.getParameter("updateNonce")%>" /> -<jsp:setProperty name="helper" property="consoleNonce" value="<%=request.getParameter("consoleNonce")%>" /> +<jsp:setProperty name="helper" property="updateNonce" value="<%=request.getParameter(\"updateNonce\")%>" /> +<jsp:setProperty name="helper" property="consoleNonce" value="<%=request.getParameter(\"consoleNonce\")%>" /> <% String reqURI = request.getRequestURI(); if (reqURI != null) diff --git a/apps/routerconsole/jsp/xhr1.jsp b/apps/routerconsole/jsp/xhr1.jsp index effeccbbea2a810ebbb1ebc684445abe11f3dc03..95c27683b72ea819fcf865466baee6d18c095e8c 100644 --- a/apps/routerconsole/jsp/xhr1.jsp +++ b/apps/routerconsole/jsp/xhr1.jsp @@ -10,5 +10,5 @@ } %> <jsp:useBean class="net.i2p.router.web.CSSHelper" id="intl" scope="request" /> -<jsp:setProperty name="intl" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> +<jsp:setProperty name="intl" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /> <%@include file="xhr1.jsi" %> diff --git a/build.xml b/build.xml index b7051e473ad302a66b3b05d0bca1c2241fb281b3..2d4f85caef6ad2483cc5f736c2750c50898e7b33 100644 --- a/build.xml +++ b/build.xml @@ -956,7 +956,6 @@ <target name="updaterWithGeoIP" depends="prepupdate, prepgeoupdate, preplicenses, zipit" /> <target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" /> <target name="updaterWithJettyRepack" depends="prepjupdate, preplicenses, repack200, zipit" /> - <target name="updater200WithJetty" depends="prepjupdate, preplicenses, pack200, zipit200" /> <target name="updaterWithJettyFixes" depends="prepjupdatefixes, preplicenses, zipit" /> <target name="updaterWithJettyFixesAndJbigi" depends="prepjupdatefixes, prepjbigiupdate, preplicenses, zipit" /> <target name="updaterWithJettyFixesAndGeoIP" depends="prepjupdatefixes, prepgeoupdate, preplicenses, zipit" />