Changeset 4bda79b


Ignore:
Timestamp:
Mar 15, 2010 7:01:28 PM (10 years ago)
Author:
dev <dev@…>
Branches:
master
Children:
0f1eb46
Parents:
697a9db (diff), 5026cbdc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '7e9ec9156e65514e00e0d9f82be002cf9aadac5f'

and '9df57c2abc8e859828f9edf80e9d104fd6bf6729'

Files:
16 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/src/net/i2p/router/web/PluginUpdateChecker.java

    r697a9db r4bda79b  
    1818
    1919/**
    20  * Download and install a plugin.
     20 * Check for an updated version of a plugin.
    2121 * A plugin is a standard .sud file with a 40-byte signature,
    2222 * a 16-byte version, and a .zip file.
    23  * Unlike for router updates, we need not have the public key
    24  * for the signature in advance.
    2523 *
    26  * The zip file must have a standard directory layout, with
    27  * a plugin.config file at the top level.
    28  * The config file contains properties for the package name, version,
    29  * signing public key, and other settings.
    30  * The zip file will typically contain a webapps/ or lib/ dir,
    31  * and a webapps.config and/or clients.config file.
     24 * So we get the current version and update URL for the installed plugin,
     25 * then fetch the first 56 bytes of the URL, extract the version,
     26 * and compare.
    3227 *
    3328 * @since 0.7.12
  • apps/routerconsole/java/src/net/i2p/router/web/WebAppConfiguration.java

    r697a9db r4bda79b  
    1717 *
    1818 *  A sample line in webapps.config is:
    19  *     webapps.appname.path=foo.jar,$I2P/lib/bar.jar
     19 *     webapps.appname.classpath=foo.jar,$I2P/lib/bar.jar
    2020 *  Unless $I2P is specified the path will be relative to $I2P/lib for
    2121 *  webapps in the installation and appDir/plugins/appname/lib for plugins.
  • apps/routerconsole/java/src/net/i2p/router/web/WebAppStarter.java

    r697a9db r4bda79b  
    1616
    1717/**
    18  *  Start a webappapp classpath as specified in webapps.config.
     18 *  Add, start or stop a webapp.
     19 *  Add to the webapp classpath if specified in webapps.config.
    1920 *
    2021 *  Sadly, setting Class-Path in MANIFEST.MF doesn't work for jetty wars.
    21  *  We could look there ourselves, or look for another properties file in the war,
     22 *  See WebAppConfiguration for more information.
    2223 *  but let's just do it in webapps.config.
    2324 *
    24  *  No, wac.addClassPath() does not work.
     25 *  No, wac.addClassPath() does not work. For more info see:
    2526 *
    2627 *  http://servlets.com/archive/servlet/ReadMsg?msgId=511113&listName=jetty-support
  • core/java/src/net/i2p/CoreVersion.java

    r697a9db r4bda79b  
    1717    /** deprecated */
    1818    public final static String ID = "Monotone";
    19     public final static String VERSION = "0.7.11";
     19    public final static String VERSION = "0.7.12";
    2020
    2121    public static void main(String args[]) {
  • core/java/src/net/i2p/crypto/TrustedUpdate.java

    r697a9db r4bda79b  
    405405     * @return The version string read, or an empty string if no version string
    406406     *         is present.
     407     *
     408     * @since 0.7.12
    407409     */
    408410    public static String getVersionString(InputStream inputStream) {
     
    493495     * @return <code>null</code> if the
    494496     *         data was moved, and an error <code>String</code> otherwise.
     497     *
     498     * @since 0.7.12
    495499     */
    496500    public String migrateFile(File signedFile, File outputFile) {
  • core/java/src/net/i2p/time/Timestamper.java

    r697a9db r4bda79b  
    253253    /**
    254254     * Notify the listeners
     255     *
     256     * @since stratum param added in 0.7.12
    255257     */
    256258    private void stampTime(long now, int stratum) {
  • history.txt

    r697a9db r4bda79b  
    1 2010-03-013 zzz
     1* 2010-03-15  0.7.12 released
     2
     32010-03-13 zzz
    24    * Partial fix for i2ptunnel nonce troubles
    35
  • installer/install.xml

    r697a9db r4bda79b  
    55    <info>
    66        <appname>i2p</appname>
    7         <appversion>0.7.11</appversion>
     7        <appversion>0.7.12</appversion>
    88        <authors>
    99            <author name="I2P" email="http://forum.i2p2.de/"/>
  • installer/resources/initialNews.xml

    r697a9db r4bda79b  
    11<!--
    2 <i2p.news date="$Date: 2010-02-15 00:00:00 $">
    3 <i2p.release version="0.7.11" date="2010/02/15" minVersion="0.6"/>
     2<i2p.news date="$Date: 2010-03-15 00:00:00 $">
     3<i2p.release version="0.7.12" date="2010/03/15" minVersion="0.6"/>
    44-->
    55<h4><ul><li>Congratulations on getting I2P installed!</li></ul></h4>
  • installer/resources/news.xml

    r697a9db r4bda79b  
    11<!--
    2 <i2p.news date="$Date: 2010-02-15 00:00:00 $">
    3 <i2p.release version="0.7.11" date="2010/02/15" minVersion="0.6" />
     2<i2p.news date="$Date: 2010-03-15 00:00:00 $">
     3<i2p.release version="0.7.12" date="2010/03/15" minVersion="0.6" />
    44-->
    5 <h4><ul><li>2010-02-15: <b>0.7.11 <a href="http://www.i2p2.i2p/release-0.7.11.html">Released</a></b></li></ul></h4>
     5<h4><ul><li>2010-03-15: <b>0.7.12 <a href="http://www.i2p2.i2p/release-0.7.12.html">Released</a></b></li></ul></h4>
    66<p>
    7 The 0.7.11 release fixes several issues, some related to clocks, which prevented new routers from quickly integrating into the network.
    8 It also fixes the installer for 64-bit Windows.
    9 The release includes an
    10 update to <a href="http://old.nabble.com/jetty-5.1.15,-6.1.18-and-7.0.0.M2-td23652819.html">Jetty 5.1.15</a>
    11 to fix <a href="http://www.kb.cert.org/vuls/id/402580">this vulnerability</a>.
     7The 0.7.12 release contains support for user-generated plugins. These plugins may contain console web applications,
     8themes, translations, or standalone programs.
     9Some plugins are available for testing at
     10<a href="http://i2pbote.i2p/">i2pbote.i2p</a>
     11and
     12<a href="http://stats.i2p/i2p/plugins/">stats.i2p</a>.
     13We are hopeful this support will enable rapid development of innovative i2p applications.
     14</p><p>
     15The release fixes the blank-page bug when an eepsite is not reachable,
     16and also improves handling of clock skews and IP changes.
     17It adds support for a new, smaller tunnel build message,
     18that will be tested in this release and enabled in the next release.
    1219</p><p>
    1320As usual, the release contains more anonymity and performance improvements,
    14 and an assortment of bug fixes.
     21translation updates, and an assortment of other bug fixes.
    1522Upgrading is recommended.
    1623</p><p>
    17 We already have more big improvements in development for the next two releases.
    18 Please give the
     24The last 6 months of development have dramatically increased the performance and capacity of the network.
     25Please help grow the network.
     26Give the
    1927developers feedback on <a href="irc://127.0.0.1:6668/i2p">IRC #i2p</a> or <a href="http://forum.i2p">forum.i2p</a>
    2028and <a href="http://www.i2p2.i2p/getinvolved.html">get involved</a>,
  • router/java/src/net/i2p/data/i2np/TunnelBuildMessage.java

    r697a9db r4bda79b  
    2020    }
    2121
    22     /** @since 0.7.10 */
     22    /** @since 0.7.12 */
    2323    protected TunnelBuildMessage(I2PAppContext context, int records) {
    2424        super(context);
     
    3232    public void setRecord(int index, ByteArray record) { _records[index] = record; }
    3333    public ByteArray getRecord(int index) { return _records[index]; }
    34     /** @since 0.7.10 */
     34    /** @since 0.7.12 */
    3535    public int getRecordCount() { return RECORD_COUNT; }
    3636   
  • router/java/src/net/i2p/data/i2np/TunnelBuildReplyMessage.java

    r697a9db r4bda79b  
    2121    }
    2222
    23     /** @since 0.7.10 */
     23    /** @since 0.7.12 */
    2424    protected TunnelBuildReplyMessage(I2PAppContext context, int records) {
    2525        super(context);
     
    3333    public void setRecord(int index, ByteArray record) { _records[index] = record; }
    3434    public ByteArray getRecord(int index) { return _records[index]; }
    35     /** @since 0.7.10 */
     35    /** @since 0.7.12 */
    3636    public int getRecordCount() { return RECORD_COUNT; }
    3737   
  • router/java/src/net/i2p/router/RouterVersion.java

    r697a9db r4bda79b  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 11;
     21    public final static long BUILD = 0;
    2222
    2323    /** for example "-test" */
    24     public final static String EXTRA = "-rc";
     24    public final static String EXTRA = "";
    2525    public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
    2626    public static void main(String args[]) {
  • router/java/src/net/i2p/router/startup/ClientAppConfig.java

    r697a9db r4bda79b  
    9494    /*
    9595     * Go through the properties, and return a List of ClientAppConfig structures
     96     *
     97     * @since 0.7.12
    9698     */
    9799    public static List<ClientAppConfig> getClientApps(File cfgFile) {
     
    107109    /*
    108110     * Go through the properties, and return a List of ClientAppConfig structures
     111     *
     112     * @since 0.7.12
    109113     */
    110114    private static List<ClientAppConfig> getClientApps(Properties clientApps) {
  • router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java

    r697a9db r4bda79b  
    507507     *  Only do this for non-fallback tunnels.
    508508     *  @return true if refused because of a duplicate key
     509     *  @since 0.7.12
    509510     */
    510511    private boolean addToBuilding(PooledTunnelCreatorConfig cfg) {
     
    522523     *
    523524     *  @return ptcc or null
     525     *  @since 0.7.12
    524526     */
    525527    PooledTunnelCreatorConfig removeFromBuilding(long id) {
  • router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java

    r697a9db r4bda79b  
    188188    }
    189189
     190    /** @since 0.7.12 */
    190191    private static boolean supportsVariable(RouterContext ctx, Hash h) {
    191192        RouterInfo ri = ctx.netDb().lookupRouterInfoLocally(h);
Note: See TracChangeset for help on using the changeset viewer.