Changeset db45e74


Ignore:
Timestamp:
Jun 29, 2009 2:51:02 PM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
3fee5a3
Parents:
206e45b
Message:

Cleanup after prop from i2p.i2p:

Files:
5 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • android/build.xml

    r206e45b rdb45e74  
    156156
    157157    <target name="buildrouter" depends="dirs" >
    158         <!-- for now, we just need the ReseedHandler from routerconsole -->
    159         <ant dir="../apps/routerconsole/java" target="compile" />
    160         <jar destfile="${external-libs}/routerconsole.jar" >
    161             <fileset dir="../apps/routerconsole/java/build/obj/" >
    162                 <include name="net/i2p/router/web/ContextHelper.class" />
    163                 <include name="net/i2p/router/web/ReseedHandler.class" />
    164                 <include name="net/i2p/router/web/ReseedHandler$ReseedRunner.class" />
    165             </fileset>
    166         </jar>
    167 
    168         <!-- build router and core (actually the routerconsole builds these anyway) -->
     158        <!-- build router and core -->
    169159        <ant dir=".." target="buildrouter" />
    170160
     
    176166        <unjar src="../build/i2p.jar" dest="tmp/" />
    177167        <delete file="tmp/net/i2p/util/LogWriter.class" />
    178         <delete file="tmp/net/i2p/util/FileStreamFactory.class" />
    179         <delete file="tmp/net/i2p/util/I2PFile.class" />
    180168        <!-- org.bouncycastle.crypto already in android
    181169             but we need a little trickery because our HMac is incompatible...
     
    207195        <!-- some resources -->
    208196        <mkdir dir="res/drawable/" />
    209         <copy file="../apps/routerconsole/jsp/i2plogo.png" todir="res/drawable/" />
     197        <copy file="../installer/resources/themes/console/images/i2plogo.png" todir="res/drawable/" />
    210198        <copy file="../installer/resources/blocklist.txt" tofile="res/raw/blocklist_txt" />
    211199    </target>
  • android/src/net/i2p/router/I2PAndroid.java

    r206e45b rdb45e74  
    1414import net.i2p.router.Router;
    1515import net.i2p.router.web.ContextHelper;
    16 import net.i2p.router.web.ReseedChecker;
    17 import net.i2p.util.I2PFile;
     16// import net.i2p.util.NativeBigInteger;
    1817
    1918public class I2PAndroid extends Activity
     
    3130        debugStuff();
    3231        initialize();
     32        // 300ms per run
     33        // 5x slower than java on my server and 50x slower than native on my server
     34        // NativeBigInteger.main(null);
    3335    }
    3436
     
    4547        Router.main(null);
    4648        System.err.println("Router.main finished");
    47 
    48         ReseedChecker.checkReseed();
    4949    }
    5050
  • core/java/src/net/i2p/data/DataHelper.java

    r206e45b rdb45e74  
    3838
    3939import net.i2p.util.ByteCache;
    40 import net.i2p.util.FileStreamFactory;
    4140import net.i2p.util.OrderedProperties;
    4241import net.i2p.util.ReusableGZIPInputStream;
     
    219218    }
    220219    public static void loadProps(Properties props, File file, boolean forceLowerCase) throws IOException {
    221         loadProps(props, FileStreamFactory.getFileInputStream(file), forceLowerCase);
     220        loadProps(props, new FileInputStream(file), forceLowerCase);
    222221    }
    223222    public static void loadProps(Properties props, InputStream inStr) throws IOException {
  • router/java/src/net/i2p/router/KeyManager.java

    r206e45b rdb45e74  
    2727import net.i2p.data.SigningPublicKey;
    2828import net.i2p.util.Clock;
    29 import net.i2p.util.FileStreamFactory;
    3029import net.i2p.util.Log;
    3130
     
    205204            try {
    206205                if (exists) {
    207                     out = FileStreamFactory.getFileOutputStream(keyFile);
     206                    out = new FileOutputStream(keyFile);
    208207                    structure.writeBytes(out);
    209208                    return structure;
    210209                } else {
    211210                    if (keyFile.exists()) {
    212                         in = FileStreamFactory.getFileInputStream(keyFile);
     211                        in = new FileInputStream(keyFile);
    213212                        structure.readBytes(in);
    214213                        return structure;
  • router/java/src/net/i2p/router/startup/LoadRouterInfoJob.java

    r206e45b rdb45e74  
    7777           
    7878            if (_keysExist) {
    79                 fis2 = FileStreamFactory.getFileInputStream(rkf);
     79                fis2 = new FileInputStream(rkf);
    8080                PrivateKey privkey = new PrivateKey();
    8181                privkey.readBytes(fis2);
Note: See TracChangeset for help on using the changeset viewer.