lee/heritrix3
1
0
Fork 0
mirror of https://github.com/internetarchive/heritrix3.git synced 2026-09-13 01:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

load keytool utility main class dynamically, trying both the old and new (java 8) class names

Browse Source
This commit is contained in:
Noah Levitt
2015-09-23 12:06:11 -07:00
parent 490a257cfe
commit 12dde2b693
4 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commons/src/main/java/org/archive/util/KeyTool.java
+32
View File
@@ -0,0 +1,32 @@
package org.archive.util;
import java.lang.reflect.Method;
/**
* Wrapper for "keytool" utility main class. Loads class dynamically, trying
* both the old java and new class names.
* @see http://kris-sigur.blogspot.com/2014/10/heritrix-java-8-and-sunsecuritytoolskey.html
*/
public class KeyTool {
public static void main(String[] args) {
try {
Class<?> cl;
try {
// java 6 and 7
cl = ClassLoader.getSystemClassLoader().loadClass("sun.security.tools.Keytool");
} catch (ClassNotFoundException e) {
// java 8
cl = ClassLoader.getSystemClassLoader().loadClass("sun.security.tools.keytool.Main");
}
Method main = cl.getMethod("main", new String[0].getClass());
main.invoke(null, (Object) args);
} catch (Exception e) {
if (e instanceof RuntimeException) {
throw (RuntimeException) e;
} else {
throw new RuntimeException(e);
}
}
}
}
engine/src/main/java/org/archive/crawler/Heritrix.java
+1 -2
View File
@@ -55,14 +55,13 @@ import org.archive.crawler.framework.Engine;
import org.archive.crawler.restlet.EngineApplication;
import org.archive.crawler.restlet.RateLimitGuard;
import org.archive.util.ArchiveUtils;
import org.archive.util.KeyTool;
import org.restlet.Component;
import org.restlet.Guard;
import org.restlet.Server;
import org.restlet.data.ChallengeScheme;
import org.restlet.data.Protocol;
import sun.security.tools.KeyTool;
/**
* Main class for Heritrix crawler.
modules/src/test/java/org/archive/modules/fetcher/CookieFetchHTTPIntegrationTest.java
+5 -7
View File
@@ -29,10 +29,6 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.commons.collections.Closure;
import org.apache.commons.httpclient.URIException;
import org.apache.commons.io.FileUtils;
@@ -45,6 +41,7 @@ import org.archive.modules.net.CrawlServer;
import org.archive.modules.net.ServerCache;
import org.archive.spring.ConfigFile;
import org.archive.spring.ConfigPath;
import org.archive.util.KeyTool;
import org.archive.util.TmpDirTestCase;
import org.mortbay.jetty.Request;
import org.mortbay.jetty.Server;
@@ -53,11 +50,12 @@ import org.mortbay.jetty.security.SslSocketConnector;
import org.mortbay.jetty.servlet.SessionHandler;
import org.mortbay.log.Log;
import sun.security.tools.KeyTool;
import com.google.common.io.Files;
@SuppressWarnings("restriction")
import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
public class CookieFetchHTTPIntegrationTest extends ProcessorTestBase {
protected static class TestHandler extends SessionHandler {
modules/src/test/java/org/archive/modules/fetcher/FetchHTTPTest.java
+4 -5
View File
@@ -27,11 +27,8 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.archive.modules.ProcessorTestBase;
import org.archive.util.KeyTool;
import org.archive.util.TmpDirTestCase;
import org.mortbay.jetty.NCSARequestLog;
import org.mortbay.jetty.Request;
@@ -51,7 +48,9 @@ import org.mortbay.jetty.security.SslSocketConnector;
import org.mortbay.jetty.servlet.SessionHandler;
import org.mortbay.log.Log;
import sun.security.tools.KeyTool;
import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
public class FetchHTTPTest extends ProcessorTestBase {