echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

propagate from branch 'i2p.i2p' (head b3d611a1fe034bc89963c54179d5bef3a3147950)

Browse Source 
to branch 'i2p.i2p.zzz.jetty6' (head c83bf7bd62d0e07be0d965f062f01b01864be4d2)
This commit is contained in:
zzz
2012-01-14 18:04:39 +00:00
parent 7df881442a edf5ef588d
commit 23ca49ea8e
135 changed files with 4252 additions and 6998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java
View File

@ -6,6 +6,7 @@ import java.util.List;
import net.i2p.util.FileUtil;
import net.i2p.util.VersionComparator;
import org.mortbay.jetty.Server;
import org.mortbay.http.Version;
import org.tanukisoftware.wrapper.WrapperManager;
@ -15,19 +16,12 @@ public class LogsHelper extends HelperBase {
/** @since 0.8.12 */
public String getJettyVersion() {
return jettyVersion();
return Server.getVersion();
}
/** @since 0.8.13 */
static String jettyVersion() {
try {
String rv = Version.getImplVersion();
if (rv.startsWith("Jetty/"))
rv = rv.substring(6);
return rv;
} catch (Throwable t) {
return "unknown";
}
return Server.getVersion();
}
public String getLogs() {