Changeset 381f3909 for apps


Ignore:
Timestamp:
Jul 7, 2018 12:27:07 PM (2 years ago)
Author:
meeh <meeh@…>
Branches:
master
Children:
27a0d4e, fcf82ea
Parents:
a916c1a2
Message:

Reverted change related to fatjar. We're using "real" base path in any case.

File:
1 edited

Legend:

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

    ra916c1a2 r381f3909  
    408408            System.err.println("ERROR: Unable to create Jetty temporary work directory");
    409409
    410         // NOTE
    411         // This code was added by Meeh @ 22 Apr 2018 for use in the browser bundle.
    412         // In the case of a portable mode, the jar in question isn't routerconsole.jar but itself.
    413         String isPortableStr = System.getProperty("i2p.dir.portableMode");
    414         boolean isPortable = Boolean.parseBoolean(isPortableStr);
    415 
    416         String routerConsoleJar = "";
    417410        // so Jetty can find WebAppConfiguration
    418         if (isPortable) {
    419             try {
    420                 routerConsoleJar = new File(RouterConsoleRunner.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath()).getAbsolutePath();
    421             } catch (URISyntaxException e) {
    422                 // This shouln't be able to happen.
    423                 System.err.println("ERROR: Fatal portable error, can't locate where I (jarfile) am.");
    424                 return; // Yes, cancel at this point.
    425             }
    426         } else {
    427             routerConsoleJar = _context.getBaseDir() + "/lib/routerconsole.jar";
    428         }
    429         System.setProperty("jetty.class.path", routerConsoleJar);
     411        System.setProperty("jetty.class.path", _context.getBaseDir() + "/lib/routerconsole.jar");
    430412        // FIXME
    431413        // http://dev.eclipse.org/mhonarc/lists/jetty-users/msg03487.html
Note: See TracChangeset for help on using the changeset viewer.