Changeset f3d931d


Ignore:
Timestamp:
May 5, 2017 11:41:19 AM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
cd76457
Parents:
ffb3e27c
Message:

Blockfile: Move from i2p.jar to addressbook.jar
http://zzz.i2p/topics/2274

Files:
8 edited
22 moved

Legend:

Unmodified
Added
Removed
  • apps/addressbook/java/src/net/i2p/router/naming/BlockfileNamingService.java

    rffb3e27c rf3d931d  
    66 * your children, but it might.  Use at your own risk.
    77 */
    8 package net.i2p.client.naming;
     8package net.i2p.router.naming;
    99
    1010import java.io.BufferedReader;
     
    3131
    3232import net.i2p.I2PAppContext;
     33import net.i2p.client.naming.DummyNamingService;
     34import net.i2p.client.naming.HostsTxtNamingService;
     35import net.i2p.client.naming.NamingService;
     36import net.i2p.client.naming.NamingServiceListener;
     37import net.i2p.client.naming.SingleFileNamingService;
    3338import net.i2p.crypto.SigType;
    3439import net.i2p.data.DataFormatException;
     
    96101 * All host names are converted to lower case.
    97102 *
    98  * @since 0.8.7
     103 * @since 0.8.7, moved from core to addressbook in 0.9.31
    99104 */
    100105public class BlockfileNamingService extends DummyNamingService {
  • build.xml

    rffb3e27c rf3d931d  
    720720            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
    721721            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    722             <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:net.metanotion:net.metanotion.*:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util" />
     722            <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util" />
    723723            <group title="Streaming Library" packages="net.i2p.client.streaming:net.i2p.client.streaming.impl" />
    724724            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters:com.maxmind.geoip" />
    725725            <group title="Router Console" packages="net.i2p.router.web:net.i2p.router.update:net.i2p.router.news" />
    726726            <!-- apps and bridges starting here, alphabetical please -->
    727             <group title="Addressbook Application" packages="net.i2p.addressbook" />
     727            <group title="Addressbook Application" packages="net.i2p.addressbook:net.i2p.router.naming:net.metanotion:net.metanotion.*" />
    728728            <group title="BOB Bridge" packages="net.i2p.BOB" />
    729729            <group title="BOB Demos" packages="net.i2p.BOB.Demos.echo.echoclient:net.i2p.BOB.Demos.echo.echoserver" />
  • core/java/src/net/i2p/client/naming/DummyNamingService.java

    rffb3e27c rf3d931d  
    2020/**
    2121 * A Dummy naming service that can only handle base64 and b32 destinations.
     22 *
     23 * @since public since 0.9.31
    2224 */
    23 class DummyNamingService extends NamingService {
     25public class DummyNamingService extends NamingService {
    2426
    2527    protected static final int BASE32_HASH_LENGTH = 52;   // 1 + Hash.HASH_LENGTH * 8 / 5
  • core/java/src/net/i2p/client/naming/NamingService.java

    rffb3e27c rf3d931d  
    3838    /** what classname should be used as the naming service impl? */
    3939    public static final String PROP_IMPL = "i2p.naming.impl";
    40     private static final String DEFAULT_IMPL = "net.i2p.client.naming.BlockfileNamingService";
     40    private static final String DEFAULT_IMPL = "net.i2p.router.naming.BlockfileNamingService";
     41    private static final String OLD_DEFAULT_IMPL = "net.i2p.client.naming.BlockfileNamingService";
    4142    private static final String BACKUP_IMPL = "net.i2p.client.naming.HostsTxtNamingService";
    4243   
     
    752753    public static final synchronized NamingService createInstance(I2PAppContext context) {
    753754        NamingService instance = null;
     755        String dflt = context.isRouterContext() ? DEFAULT_IMPL : BACKUP_IMPL;
    754756        String impl = context.getProperty(PROP_IMPL, DEFAULT_IMPL);
     757        if (impl.equals(OLD_DEFAULT_IMPL))
     758            impl = dflt;
    755759        try {
    756760            Class<?> cls = Class.forName(impl);
  • core/java/src/net/i2p/client/naming/SingleFileNamingService.java

    rffb3e27c rf3d931d  
    269269     *
    270270     *  @param options non-null
    271      *  @since 0.9.26, package private since 0.9.30
    272      */
    273     static void writeOptions(Properties options, Writer out) throws IOException {
     271     *  @since 0.9.26, package private since 0.9.30, public since 0.9.31
     272     */
     273    public static void writeOptions(Properties options, Writer out) throws IOException {
    274274        boolean started = false;
    275275        for (Map.Entry<Object, Object> e : options.entrySet()) {
  • core/java/src/net/i2p/util/CommandLine.java

    rffb3e27c rf3d931d  
    2222        "freenet.support.CPUInformation.CPUID",
    2323        "net.i2p.CoreVersion",
    24         "net.i2p.client.naming.BlockfileNamingService",
    2524        "net.i2p.crypto.CertUtil",
    2625        "net.i2p.crypto.CryptoCheck",
  • router/java/build.xml

    rffb3e27c rf3d931d  
    6767            <manifest>
    6868                <!-- so people with very old wrapper.config files will still work with Jetty 6 -->
    69                 <attribute name="Class-Path" value="i2p.jar jetty-i2p.jar jetty-java5-threadpool.jar jetty-rewrite-handler.jar jetty-sslengine.jar jetty-start.jar jetty-util.jar" />
     69                <attribute name="Class-Path" value="i2p.jar addressbook.jar jetty-i2p.jar jetty-rewrite-handler.jar jetty-start.jar jetty-util.jar" />
    7070                <attribute name="Specification-Title" value="I2P Router" />
    7171                <attribute name="Specification-Version" value="${release.number}" />
  • router/java/src/net/i2p/router/CommandLine.java

    rffb3e27c rf3d931d  
    2121        "net.i2p.router.RouterLaunch",
    2222        "net.i2p.router.RouterVersion",
     23        "net.i2p.router.naming.BlockfileNamingService",
    2324        "net.i2p.router.peermanager.ProfileOrganizer",
    2425        "net.i2p.router.tasks.CryptoChecker",
  • router/java/src/net/i2p/router/RouterVersion.java

    rffb3e27c rf3d931d  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 0;
     21    public final static long BUILD = 1;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.