Changeset f3d931d for core


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

Location:
core/java/src/net/i2p
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • 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",
Note: See TracChangeset for help on using the changeset viewer.