--- src/java/org/apache/nutch/plugin/PluginClassLoader.java 2017-03-29 04:06:50.000000000 +0000
+++ src/java/org/apache/nutch/plugin/PluginClassLoader.java 2017-04-27 14:22:06.034806764 +0000
@@ -20,20 +20,26 @@
import java.net.URLClassLoader;
import java.util.Arrays;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
/**
- * The PluginClassLoader contains only classes of the runtime
- * libraries setuped in the plugin manifest file and exported libraries of
- * plugins that are required pluguin. Libraries can be exported or not. Not
- * exported libraries are only used in the plugin own
+ * The PluginClassLoader is a child-first classloader that only
+ * contains classes of the runtime libraries setuped in the plugin manifest
+ * file and exported libraries of plugins that are required plugins. Libraries
+ * can be exported or not. Not exported libraries are only used in the plugin own
* PluginClassLoader. Exported libraries are available for
* PluginClassLoader of plugins that depends on these plugins.
*
- * @author joa23
*/
public class PluginClassLoader extends URLClassLoader {
private URL[] urls;
private ClassLoader parent;
+ private ClassLoader system;
/**
* Construtor
@@ -48,9 +55,129 @@
this.urls = urls;
this.parent = parent;
+ system = getSystemClassLoader();
}
@Override
+ protected synchronized Class loadClass(String name, boolean resolve)
+ throws ClassNotFoundException {
+
+ // First, check if the class has already been loaded
+ Class c = findLoadedClass(name);
+
+ if (c == null) {
+ try {
+ // checking local
+ c = findClass(name);
+ } catch (ClassNotFoundException e) {
+ c = loadClassFromParent(name, resolve);
+ } catch(SecurityException e){
+ c = loadClassFromParent(name, resolve);
+ }
+ }
+
+ if (resolve)
+ resolveClass(c);
+ return c;
+ }
+
+ private Class loadClassFromParent(String name, boolean resolve) throws ClassNotFoundException {
+ // checking parent
+ // This call to loadClass may eventually call findClass
+ // again, in case the parent doesn't find anything.
+ Class c;
+ try {
+ c = super.loadClass(name, resolve);
+ } catch (ClassNotFoundException e) {
+ c = loadClassFromSystem(name);
+ } catch (SecurityException e){
+ c = loadClassFromSystem(name);
+ }
+ return c;
+ }
+
+ private Class loadClassFromSystem(String name) throws ClassNotFoundException{
+ Class c = null;
+ if (system != null) {
+ // checking system: jvm classes, endorsed, cmd classpath,
+ c = system.loadClass(name);
+ }
+ return c;
+ }
+
+ @Override
+ public URL getResource(String name) {
+ URL url = findResource(name);
+ if (url == null)
+ url = super.getResource(name);
+
+ if (url == null && system != null)
+ url = system.getResource(name);
+
+ return url;
+ }
+
+ @Override
+ public Enumeration getResources(String name) throws IOException {
+ /**
+ * Similar to super, but local resources are enumerated before parent
+ * resources
+ */
+ Enumeration systemUrls = null;
+ if (system != null) {
+ systemUrls = system.getResources(name);
+ }
+
+ Enumeration localUrls = findResources(name);
+ Enumeration parentUrls = null;
+ if (getParent() != null) {
+ parentUrls = getParent().getResources(name);
+ }
+
+ final List urls = new ArrayList();
+ if (localUrls != null) {
+ while (localUrls.hasMoreElements()) {
+ URL local = localUrls.nextElement();
+ urls.add(local);
+ }
+ }
+
+ if (systemUrls != null) {
+ while (systemUrls.hasMoreElements()) {
+ urls.add(systemUrls.nextElement());
+ }
+ }
+
+ if (parentUrls != null) {
+ while (parentUrls.hasMoreElements()) {
+ urls.add(parentUrls.nextElement());
+ }
+ }
+
+ return new Enumeration() {
+ Iterator iter = urls.iterator();
+
+ public boolean hasMoreElements() {
+ return iter.hasNext();
+ }
+
+ public URL nextElement() {
+ return iter.next();
+ }
+ };
+ }
+
+ public InputStream getResourceAsStream(String name) {
+ URL url = getResource(name);
+ try {
+ return url != null ? url.openStream() : null;
+ } catch (IOException e) {
+ }
+ return null;
+ }
+
+
+ @Override
public int hashCode() {
final int PRIME = 31;
int result = 1;
diff -Naur ../tmp/apache-nutch-1.13/src/plugin/parse-tika/plugin.xml ./src/plugin/parse-tika/plugin.xml
--- ../tmp/apache-nutch-1.13/src/plugin/parse-tika/plugin.xml 2017-03-29 04:06:50.000000000 +0000
+++ ./src/plugin/parse-tika/plugin.xml 2017-04-27 17:47:48.405758085 +0000
@@ -103,7 +103,6 @@
-
diff -Naur ../tmp/apache-nutch-1.13/src/plugin/indexer-solr/plugin.xml ./src/plugin/indexer-solr/plugin.xml
--- ../tmp/apache-nutch-1.13/src/plugin/indexer-solr/plugin.xml 2017-03-29 04:06:50.000000000 +0000
+++ ./src/plugin/indexer-solr/plugin.xml 2017-04-27 19:50:09.056664493 +0000
@@ -27,7 +27,6 @@
-
diff -Naur ../tmp/apache-nutch-1.13/src/plugin/parse-tika/ivy.xml ./src/plugin/parse-tika/ivy.xml
--- ../tmp/apache-nutch-1.13/src/plugin/parse-tika/ivy.xml 2017-03-29 04:06:50.000000000 +0000
+++ ./src/plugin/parse-tika/ivy.xml 2017-04-27 20:34:35.223566873 +0000
@@ -37,9 +37,10 @@
-
-
-
+
+
+
+
diff -Naur ../tmp/apache-nutch-1.13/src/plugin/parsefilter-naivebayes/plugin.xml ./src/plugin/parsefilter-naivebayes/plugin.xml
--- ../tmp/apache-nutch-1.13/src/plugin/parsefilter-naivebayes/plugin.xml 2017-03-29 04:06:50.000000000 +0000
+++ ./src/plugin/parsefilter-naivebayes/plugin.xml 2017-05-01 12:48:37.282691583 +0000
@@ -35,7 +35,6 @@
-