From 7aff01ea84e0cc0df9e4423d320dd3ecede63746 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 14 Nov 2011 15:06:23 +0000 Subject: [PATCH] * SusiDNS: Remove .jsp suffixes --- .../i2p/i2ptunnel/I2PTunnelHTTPClient.java | 2 +- .../i2p/router/web/LocaleWebAppHandler.java | 6 +- .../i2p/router/web/SummaryBarRenderer.java | 2 +- apps/susidns/src/WEB-INF/web-template.xml | 28 +++++++ apps/susidns/src/index.html | 6 +- .../src/i2p/susi/dns/AddressbookBean.java | 4 +- apps/susidns/src/jsp/addressbook.jsp | 84 +++++++++---------- apps/susidns/src/jsp/config.jsp | 16 ++-- apps/susidns/src/jsp/details.jsp | 18 ++-- apps/susidns/src/jsp/index.jsp | 14 ++-- apps/susidns/src/jsp/subscriptions.jsp | 16 ++-- history.txt | 6 ++ installer/resources/proxy/denied-header_fr.ht | 2 +- installer/resources/proxy/dnf-header.ht | 2 +- installer/resources/proxy/dnf-header_de.ht | 2 +- installer/resources/proxy/dnf-header_fr.ht | 2 +- installer/resources/proxy/dnf-header_nl.ht | 2 +- installer/resources/proxy/dnf-header_ru.ht | 2 +- installer/resources/proxy/dnf-header_zh.ht | 2 +- installer/resources/proxy/dnfb-header_fr.ht | 2 +- installer/resources/proxy/dnfh-header.ht | 2 +- installer/resources/proxy/dnfh-header_de.ht | 2 +- installer/resources/proxy/dnfh-header_fr.ht | 2 +- installer/resources/proxy/dnfh-header_nl.ht | 2 +- installer/resources/proxy/dnfh-header_ru.ht | 2 +- installer/resources/proxy/dnfh-header_zh.ht | 2 +- .../src/net/i2p/router/RouterVersion.java | 2 +- 27 files changed, 133 insertions(+), 99 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index 666cad9c8..3c413bbea 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -1353,7 +1353,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn "\n" + "" + "
\n" + "

" + diff --git a/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java index ebf5bcf9c..b7a892587 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java @@ -14,14 +14,14 @@ import org.mortbay.jetty.servlet.WebApplicationHandler; * Convert foo.jsp to foo_xx.jsp for language xx. * This is appropriate for jsps with large amounts of text. * - * Also, as of 0.8.2, rewrite "/" and "/index.html" to "/index.jsp",x + * Also, as of 0.8.2, rewrite "/" and "/index.html" to "/index.jsp", * and "/foo" to "/foo.jsp". * * @author zzz */ public class LocaleWebAppHandler extends WebApplicationHandler { - private I2PAppContext _context; + private final I2PAppContext _context; public LocaleWebAppHandler(I2PAppContext ctx) { super(); @@ -32,7 +32,7 @@ public class LocaleWebAppHandler extends WebApplicationHandler * Handle foo.jsp by converting to foo_xx.jsp * for language xx, where xx is the language for the default locale, * or as specified in the routerconsole.lang property. - * Unless language==="en". + * Unless language == "en". */ @Override public void handle(String pathInContext, diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java index db2ba21df..5b0f926da 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -63,7 +63,7 @@ public class SummaryBarRenderer { "
" + - "
") .append(_("Addressbook")) diff --git a/apps/susidns/src/WEB-INF/web-template.xml b/apps/susidns/src/WEB-INF/web-template.xml index 5bb9f74f5..db470f815 100644 --- a/apps/susidns/src/WEB-INF/web-template.xml +++ b/apps/susidns/src/WEB-INF/web-template.xml @@ -14,4 +14,32 @@ index.html index.jsp + + + + + i2p.susi.dns.jsp.config_jsp + /config + + + + i2p.susi.dns.jsp.subscriptions_jsp + /subscriptions + + + + i2p.susi.dns.jsp.addressbook_jsp + /addressbook + + + + i2p.susi.dns.jsp.details_jsp + /details + + + + i2p.susi.dns.jsp.index_jsp + /index + + diff --git a/apps/susidns/src/index.html b/apps/susidns/src/index.html index 288537ac9..d87d78345 100644 --- a/apps/susidns/src/index.html +++ b/apps/susidns/src/index.html @@ -1,11 +1,11 @@ - + susidns -Enter +Enter - \ No newline at end of file + diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java index 2ada2b3b6..63255254d 100644 --- a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java +++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java @@ -259,7 +259,7 @@ public class AddressbookBean if (getBeginInt() > 0) { int newBegin = Math.max(0, getBeginInt() - DISPLAY_SIZE); int newEnd = Math.max(0, getBeginInt() - 1); - message += " " + newBegin + '-' + newEnd + " | "; } @@ -267,7 +267,7 @@ public class AddressbookBean if (getEndInt() < resultCount - 1) { int newBegin = Math.min(resultCount - 1, getEndInt() + 1); int newEnd = Math.min(resultCount, getEndInt() + DISPLAY_SIZE); - message += " | " + newBegin + '-' + newEnd + ""; } diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp index 76f2d6a04..109425f9d 100644 --- a/apps/susidns/src/jsp/addressbook.jsp +++ b/apps/susidns/src/jsp/addressbook.jsp @@ -49,19 +49,19 @@
@@ -77,43 +77,43 @@ ${book.loadBookMessages}

<%=intl._("Filter")%>: -a -b -c -d -e -f -g -h -i -j -k -l -m -n -o -p -q -r -s -t -u -v -w -x -y -z -0-9 -<%=intl._("other")%> -<%=intl._("all")%>

+a +b +c +d +e +f +g +h +i +j +k +l +m +n +o +p +q +r +s +t +u +v +w +x +y +z +0-9 +<%=intl._("other")%> +<%=intl._("all")%>

<%=intl._("Current filter")%>: ${book.filter} -(<%=intl._("clear filter")%>)

+(<%=intl._("clear filter")%>)
- +

diff --git a/apps/susidns/src/jsp/index.jsp b/apps/susidns/src/jsp/index.jsp index c6acc92f8..99f71ca6b 100644 --- a/apps/susidns/src/jsp/index.jsp +++ b/apps/susidns/src/jsp/index.jsp @@ -49,12 +49,12 @@

@@ -67,7 +67,7 @@

<%=intl._("In the default configuration, the address book is only subscribed to www.i2p2.i2p.")%> -<%=intl._("Subscribing to additional sites is easy, just add them to your subscriptions file.")%> +<%=intl._("Subscribing to additional sites is easy, just add them to your subscriptions file.")%>

<%=intl._("For more information on naming in I2P, see the overview on www.i2p2.i2p.")%> diff --git a/apps/susidns/src/jsp/subscriptions.jsp b/apps/susidns/src/jsp/subscriptions.jsp index 30f106e63..8e2a7042f 100644 --- a/apps/susidns/src/jsp/subscriptions.jsp +++ b/apps/susidns/src/jsp/subscriptions.jsp @@ -45,25 +45,25 @@

${subs.fileName}

${subs.messages}
- +
diff --git a/history.txt b/history.txt index 0fbe342a8..5377be76b 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,9 @@ +2011-11-14 zzz + * Console: Remove % chart at bottom of tunnels.jsp + * Profiles: Only use same-country metric for countries with + lots of I2P users + * SusiDNS: Remove .jsp suffixes + 2011-11-12 zzz * Installer: Fix Ukrainian translation (ticket #550) thx rndnick diff --git a/installer/resources/proxy/denied-header_fr.ht b/installer/resources/proxy/denied-header_fr.ht index 0f05e5a61..1e49b64ea 100644 --- a/installer/resources/proxy/denied-header_fr.ht +++ b/installer/resources/proxy/denied-header_fr.ht @@ -12,7 +12,7 @@ Proxy-Connection: close

Avertissement I2P: Requête refusée

diff --git a/installer/resources/proxy/dnf-header.ht b/installer/resources/proxy/dnf-header.ht index bb00373a0..b008ae4b0 100644 --- a/installer/resources/proxy/dnf-header.ht +++ b/installer/resources/proxy/dnf-header.ht @@ -12,7 +12,7 @@ Proxy-Connection: close

Warning: Eepsite Unreachable

diff --git a/installer/resources/proxy/dnf-header_de.ht b/installer/resources/proxy/dnf-header_de.ht index f2398e179..6dceaa75d 100644 --- a/installer/resources/proxy/dnf-header_de.ht +++ b/installer/resources/proxy/dnf-header_de.ht @@ -12,7 +12,7 @@ Proxy-Connection: close

Warnung: Eepseite unerreichbar

diff --git a/installer/resources/proxy/dnf-header_fr.ht b/installer/resources/proxy/dnf-header_fr.ht index e0dea2799..e2292882e 100644 --- a/installer/resources/proxy/dnf-header_fr.ht +++ b/installer/resources/proxy/dnf-header_fr.ht @@ -12,7 +12,7 @@ Proxy-Connection: close

Avertissement I2P: site eep non joignable

diff --git a/installer/resources/proxy/dnf-header_nl.ht b/installer/resources/proxy/dnf-header_nl.ht index 9bd31407a..52662289a 100644 --- a/installer/resources/proxy/dnf-header_nl.ht +++ b/installer/resources/proxy/dnf-header_nl.ht @@ -12,7 +12,7 @@ Proxy-Connection: close

Waarschuwing: Eepsite Onbereikbaar

diff --git a/installer/resources/proxy/dnf-header_ru.ht b/installer/resources/proxy/dnf-header_ru.ht index 4303fa553..35aa27bab 100644 --- a/installer/resources/proxy/dnf-header_ru.ht +++ b/installer/resources/proxy/dnf-header_ru.ht @@ -12,7 +12,7 @@ Proxy-Connection: close
diff --git a/installer/resources/proxy/dnf-header_zh.ht b/installer/resources/proxy/dnf-header_zh.ht index 56a6be3d6..771c79a77 100644 --- a/installer/resources/proxy/dnf-header_zh.ht +++ b/installer/resources/proxy/dnf-header_zh.ht @@ -12,7 +12,7 @@ Proxy-Connection: close

警告: 匿名站点不可达

diff --git a/installer/resources/proxy/dnfb-header_fr.ht b/installer/resources/proxy/dnfb-header_fr.ht index c7ed858f4..6cb0614ef 100644 --- a/installer/resources/proxy/dnfb-header_fr.ht +++ b/installer/resources/proxy/dnfb-header_fr.ht @@ -12,7 +12,7 @@ Proxy-Connection: close

Avertissement I2P: destination eep site incorrecte

diff --git a/installer/resources/proxy/dnfh-header.ht b/installer/resources/proxy/dnfh-header.ht index 7ff802b57..757dc4091 100644 --- a/installer/resources/proxy/dnfh-header.ht +++ b/installer/resources/proxy/dnfh-header.ht @@ -12,7 +12,7 @@ Proxy-Connection: close

Warning: Eepsite Not Found in Addressbook

diff --git a/installer/resources/proxy/dnfh-header_de.ht b/installer/resources/proxy/dnfh-header_de.ht index b49789b85..08fe5ed26 100644 --- a/installer/resources/proxy/dnfh-header_de.ht +++ b/installer/resources/proxy/dnfh-header_de.ht @@ -12,7 +12,7 @@ Proxy-Connection: close

Warnung: Eepseite nicht im Adressbuch gefunden

diff --git a/installer/resources/proxy/dnfh-header_fr.ht b/installer/resources/proxy/dnfh-header_fr.ht index 157173973..5e666cdf2 100644 --- a/installer/resources/proxy/dnfh-header_fr.ht +++ b/installer/resources/proxy/dnfh-header_fr.ht @@ -12,7 +12,7 @@ Proxy-Connection: close

Avertissement I2P: site eep non trouvé dans le carnet d'adresses

diff --git a/installer/resources/proxy/dnfh-header_nl.ht b/installer/resources/proxy/dnfh-header_nl.ht index 7a1e367ed..8e1591b03 100644 --- a/installer/resources/proxy/dnfh-header_nl.ht +++ b/installer/resources/proxy/dnfh-header_nl.ht @@ -12,7 +12,7 @@ Proxy-Connection: close

Waarschuwing: Eepsite Niet Gevonden in Adresboek

diff --git a/installer/resources/proxy/dnfh-header_ru.ht b/installer/resources/proxy/dnfh-header_ru.ht index 8e7482b3f..95a44ea0d 100644 --- a/installer/resources/proxy/dnfh-header_ru.ht +++ b/installer/resources/proxy/dnfh-header_ru.ht @@ -12,7 +12,7 @@ Proxy-Connection: close
diff --git a/installer/resources/proxy/dnfh-header_zh.ht b/installer/resources/proxy/dnfh-header_zh.ht index 122ea6f1c..1f4c5f362 100644 --- a/installer/resources/proxy/dnfh-header_zh.ht +++ b/installer/resources/proxy/dnfh-header_zh.ht @@ -12,7 +12,7 @@ Proxy-Connection: close

警告: 地址簿中的找不到此站点

diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 282c18b42..0725033fa 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 2; + public final static long BUILD = 3; /** for example "-test" */ public final static String EXTRA = "";