diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java index b8ea32bc91a202e5cdd3b151b14c87b5ef0ee9ea..15a9bf9b5c03d7dfb543f5314804653256aebcd5 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java @@ -183,8 +183,7 @@ public class StatSummarizer implements Runnable { def.setGridY(false); } //System.out.println("rendering: path=" + path + " dsNames[0]=" + dsNames[0] + " dsNames[1]=" + dsNames[1] + " lsnr.getName=" + _listener.getName()); - // Let's set anti-aliasing on and see what happens.. - def.setAntiAliasing(true); + def.setAntiAliasing(false); //System.out.println("Rendering: \n" + def.exportXmlTemplate()); //System.out.println("*****************\nData: \n" + _listener.getData().dump()); RrdGraph graph = new RrdGraph(def); diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp index ae65c69e417cbe0729fb1e4f7ff84f90d642f964..9532602fa4e78701bb67b736378f0d828dc0d146 100644 --- a/apps/routerconsole/jsp/summaryframe.jsp +++ b/apps/routerconsole/jsp/summaryframe.jsp @@ -13,7 +13,6 @@ <title>Summary Bar</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <% - out.print("<center>\n"); // try hard to avoid an error page in the iframe after shutdown String action = request.getParameter("action"); String d = request.getParameter("refresh"); @@ -50,7 +49,6 @@ shutdownSoon = true; } } - out.print("</center>\n"); %> <%@include file="css.jsp" %> </head> diff --git a/checklist.txt b/checklist.txt index 17f8d9753b0b7f91c83a18136779c441853199be..e65134b7cdae102776720a46bfce211d4afb1781 100644 --- a/checklist.txt +++ b/checklist.txt @@ -49,8 +49,8 @@ Until the build script gets this ability, you need to rename some files: you probably don't need to rename i2pupdate.sud Generate hashes: - sha1sum i2p*0.7.xx.* - sha1sum i2pupdate.sud + sha256sum i2p*0.7.xx.* + sha256sum i2pupdate.sud now GPG-sign an announcement with the hashes Generate PGP signatures: @@ -65,14 +65,12 @@ Website files to change: Sync with mtn.i2p2.i2p announcements.html announcements_de.html - download.html (change SHA1s) - download_de.html (change SHA1s) + download.html (change SHA256s) + download_de.html (change SHA256s) index.html index_de.html hosts.txt (copy from mtn) release-x.y.z.html (new) Sync with mtn.i2p2.i2p -Copy news.xml to subscription location - -Announce on #i2p, forum.i2p, Syndie, freshmeat +Announce on #i2p, forum.i2p diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index fecc6c9a89c47864547e777bc5512fe27bc3e6e4..78790b91ae3fb0d1ba97d7c36fec1351d85bbb21 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -14,8 +14,9 @@ package net.i2p; * */ public class CoreVersion { - public final static String ID = "$Revision: 1.72 $ $Date: 2008-08-24 12:00:00 $"; - public final static String VERSION = "0.7.5"; + /** deprecated */ + public final static String ID = "Monotone"; + public final static String VERSION = "0.7.6"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/history.txt b/history.txt index cc7cbddf52ff34e57e658d5134d37a982726ae7e..10ce5688d4e86af6b3a393eedb06fd56fc9bca1f 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,13 @@ +* 2009-07-31 0.7.6 released + +2009-07-31 zzz + * Update versions, package release + * Fix snark.css link + * Revert graph antialias enable + * Remove <center> from iframe head + * Fix tunnels.jsp HTML + * Prevent linux-only installer screen from displaying on windows + 2009-07-28 zzz * Add new reseed URL (thanks eche|on!) diff --git a/initialNews.xml b/initialNews.xml index f505ddb5be8316544f99b9f4b5c178f07685835a..1572c2ad4dfd65b9ade1f3d6f38fcabfb8ebde09 100644 --- a/initialNews.xml +++ b/initialNews.xml @@ -1,5 +1,5 @@ -<i2p.news date="$Date: 2009-06-29 00:00:00 $"> - <i2p.release version="0.7.5" date="2009/06/29" minVersion="0.6"/> +<i2p.news date="$Date: 2009-07-31 00:00:00 $"> + <i2p.release version="0.7.6" date="2009/07/31" minVersion="0.6"/> <h4>Congratulations on getting I2P installed!</h4> <ul> <li> diff --git a/installer/install.xml b/installer/install.xml index c7b0aafbea95bffca68f2ccacb0f5fa0a9159546..1988e5e2a2a2b20fb4cd0b678e7a3136c8d17517 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -4,7 +4,7 @@ <info> <appname>i2p</appname> - <appversion>0.7.5</appversion> + <appversion>0.7.6</appversion> <authors> <author name="I2P" email="http://forum.i2p2.de/"/> </authors> @@ -95,7 +95,9 @@ <panel classname="InstallPanel"/> <panel classname="ShortcutPanel"><os family="windows" /></panel> <!-- <panel classname="ProcessPanel"><os family="windows" /></panel> --> - <panel classname="XInfoPanel" ><os family="unix|mac" /></panel> + <!-- unix|mac doesn't work, displays for windows too --> + <panel classname="XInfoPanel" ><os family="unix" /></panel> + <panel classname="XInfoPanel" ><os family="mac" /></panel> <panel classname="SimpleFinishPanel"/> </panels> diff --git a/installer/resources/themes/console/snark.css b/installer/resources/themes/console/snark.css index f72a1967f98b4d7716728bc6828d87756c99b539..f78956ad1a2f836c84a5778f4408825fdfcd508c 100644 --- a/installer/resources/themes/console/snark.css +++ b/installer/resources/themes/console/snark.css @@ -92,7 +92,7 @@ th { font-size: 8pt; border-top: 1px outset #001; border-bottom: 1px inset #001; - background: #f91 url('.../console/images/tabletitleorangealt.png') repeat-x; + background: #f91 url('/themes/console/images/tabletitleorange.png') repeat-x; text-align: left; } @@ -323,4 +323,4 @@ div.configsection a:hover{ background: #eef; -moz-box-shadow: inset 0px 0px 1px 0px #002; background: #ddf url('../console/light/images/tabletile.png'); -} \ No newline at end of file +} diff --git a/news.xml b/news.xml index c0f62dc7d3788b56220b0789b3449398ff1f4511..be13ee443240b761926fe8c967a8df5a50be2c5e 100644 --- a/news.xml +++ b/news.xml @@ -1,5 +1,5 @@ -<i2p.news date="$Date: 2009-06-29 00:00:00 $"> - <i2p.release version="0.7.5" date="2009/06/29" minVersion="0.6" +<i2p.news date="$Date: 2009-07-31 00:00:00 $"> + <i2p.release version="0.7.6" date="2009/07/31" minVersion="0.6" anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud" publicurl="http://dev.i2p.net/i2p/i2pupdate.sud" anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html" @@ -10,35 +10,43 @@ anonlogs="http://i2p/Nf3ab-ZFkmI-LyMt7GjgT-jfvZ3zKDl0L96pmGQXF1B82W2Bfjf0n7~288vafocjFLnQnVcmZd~-p0-Oolfo9aW2Rm-AhyqxnxyLlPBqGxsJBXjPhm1JBT4Ia8FB-VXt0BuY0fMKdAfWwN61-tj4zIcQWRxv3DFquwEf035K~Ra4SWOqiuJgTRJu7~o~DzHVljVgWIzwf8Z84cz0X33pv-mdG~~y0Bsc2qJVnYwjjR178YMcRSmNE0FVMcs6f17c6zqhMw-11qjKpY~EJfHYCx4lBWF37CD0obbWqTNUIbL~78vxqZRT3dgAgnLixog9nqTO-0Rh~NpVUZnoUi7fNR~awW5U3Cf7rU7nNEKKobLue78hjvRcWn7upHUF45QqTDuaM3yZa7OsjbcH-I909DOub2Q0Dno6vIwuA7yrysccN1sbnkwZbKlf4T6~iDdhaSLJd97QCyPOlbyUfYy9QLNExlRqKgNVJcMJRrIual~Lb1CLbnzt0uvobM57UpqSAAAA/meeting141" publiclogs="http://www.i2p.net/meeting141" /> <p> -<h4><ul><li>2009-06-29: <b>0.7.5 <a href="http://www.i2p2.i2p/release-0.7.5.html">Released</a></b></li></ul></h4> +<h4><ul><li>2009-07-31: <b>0.7.6 <a href="http://www.i2p2.i2p/release-0.7.6.html">Released</a></b></li></ul></h4> </p><p> -I2P version 0.7.5 foremost addresses network stability issues -by adjusting how exploratory tunnels are built if a router nears -its connection limit, and also by distinguishing between -connected peers and other non-failing peers while picking them -for inclusion in tunnels. +I2P version 0.7.6 contains additional fixes for network stability issues +related to tunnel building and connection limits. +While the 0.7.5 release greatly improved the congestion that +appeared UTC evenings and weekends, it was not eliminated; +this release should improve the situation further. </p><p> -This version also delivers fixes to installer behaviour on Windows, -to the Router Console, NTCP transport and UPnP mechanism. +This version also has new console themes by dr|z3d, +which may be selected on <a href="/configui.jsp">the new UI configuration page</a>. +Sorry, the new themes are not available for IE browsers. </p><p> -Additionally, version 0.7.5 changes the "news.xml" file location -where I2P routers check whether a new version is available. -Instead of the old URL (http://complication.i2p/news.xml) -a new location (http://echelon.i2p./news.xml) will be used. -If your router uses default updater settings, it will start using -the new URL automatically. If not, you will need to visit -<a href="configupdate.jsp">configupdate.jsp</a>, and change it manually. -For a while after this update, the old news.xml location will also -redirect all HTTP requests to the new one. +The default tunnel length variance is changed from 1 to 0. +This mainly affects exploratory tunnels and iMule. +<a href="http://zzz.i2p/topics/260">As explained on zzz.i2p</a>, +a non-zero variance adds very little protection, at great cost +in resources. +Should you wish to reconfigure your exploratory settings back to the old variance of 1, +or change to length 3 variance 0, +you may do so on <a href="configtunnels.jsp">the config tunnels page</a>. +iMule settings are best changed within that application. </p><p> -Finally, since Complication is withdrawing from the I2P project, -to make some far-reaching changes in his life, this update removes -Complication's public key from the list of release signing keys. -You should expect the next release to be signed by zzz instead. -If you have non-default updater settings, you may want to remove -Complication's public key manually, by visiting <a href="configupdate.jsp">configupdate.jsp</a>, -and removing the key line starting with the characters "JHFA". -If you wish to verify whether this information is correct, -please check the GPG-signed release announcement. +I2P now stores temporary data in the system temp directory +(generally /var/tmp on Linux and %TEMP% on Windows). +For new installs only, +user data is in $HOME/.i2p on Linux/Mac and +%APPDATA%\I2P on Windows. +</p><p> +The release contains several changes to reduce resource usage +(memory, CPU, and connections) and the usual assortment of bug fixes. +Upgrading is recommended. +</p><p> +This is the first release built and signed by zzz. +Thanks again to Complication for his many contributions to the project +over the past five years. +I2P is undergoing the most rapid development in years. Please give the +developers feedback on IRC #i2p or <a href="http://forum.i2p">forum.i2p</a> +and <a href="http://www.i2p2.i2p/getinvolved.html">get involved</a>! </p> </i2p.news> diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 23d4b1f0db89ba2c753028d103ccd73e1d34c80b..8aa072fcf9438648320c85ef3852d1e13da4f6b8 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,9 +18,9 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 34; + public final static long BUILD = 0; /** for example "-test" */ - public final static String EXTRA = "-rc"; + public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION); diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java index 99b1e58a3eb65c4ef29eefad63c25f29382cd9ee..7524e12c33a3f6158dc91ee66abe30575def3d35 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -622,8 +622,8 @@ public class TunnelPoolManager implements TunnelManagerFacade { out.write('\n'); } out.write("<tr><td align=\"center\"><b>Tunnels</b><td align=\"center\"><b>" + tunnelCount); - out.write("</b><td align=\"center\"> <td align=\"center\"><b>" + partCount); - out.write("<td align=\"center\"> </b></table>\n"); + out.write("</b><td> </td><td align=\"center\"><b>" + partCount); + out.write("</b><td> </td></tr></table>\n"); } /** @return total number of non-fallback expl. + client tunnels */