You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by le...@apache.org on 2018/02/28 04:43:17 UTC

[07/10] any23 git commit: ANY23-321 Add openie toggle functionality to service

ANY23-321 Add openie toggle functionality to service


Project: http://git-wip-us.apache.org/repos/asf/any23/repo
Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/69109f36
Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/69109f36
Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/69109f36

Branch: refs/heads/master
Commit: 69109f36a2ee279c5f031423e16af6b49ea8dbfd
Parents: 073190b
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Fri Feb 23 09:58:54 2018 -0800
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Fri Feb 23 09:58:54 2018 -0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/any23/servlet/Servlet.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/any23/blob/69109f36/service/src/main/java/org/apache/any23/servlet/Servlet.java
----------------------------------------------------------------------
diff --git a/service/src/main/java/org/apache/any23/servlet/Servlet.java b/service/src/main/java/org/apache/any23/servlet/Servlet.java
index 1ab542c..154f41d 100644
--- a/service/src/main/java/org/apache/any23/servlet/Servlet.java
+++ b/service/src/main/java/org/apache/any23/servlet/Servlet.java
@@ -19,6 +19,8 @@ package org.apache.any23.servlet;
 
 import org.apache.any23.configuration.DefaultConfiguration;
 import org.apache.any23.extractor.ExtractionParameters;
+import org.apache.any23.extractor.ExtractorRegistry;
+import org.apache.any23.extractor.ExtractorRegistryImpl;
 import org.apache.any23.http.HTTPClient;
 import org.apache.any23.plugin.Any23PluginManager;
 import org.apache.any23.servlet.conneg.Any23Negotiator;
@@ -100,7 +102,13 @@ public class Servlet extends HttpServlet {
             File openIEJarPath = new File(webappClasspath.getParentFile().getPath() + "/lib/apache-any23-openie");
             boolean loadedJars = pManager.loadJARDir(openIEJarPath);
             if (loadedJars) {
-                LOG.info("Successful dynamic classloading of apache-any23-openie directory from webapp lib.");
+                ExtractorRegistry r = ExtractorRegistryImpl.getInstance();
+                try {
+                    pManager.getExtractors().forEachRemaining(r::register);
+                } catch (IOException e) {
+                    LOG.error("Error during dynamic classloading of JARs from OpenIE runtime directory {}", openIEJarPath.toString(), e);
+                }
+                LOG.info("Successful dynamic classloading of JARs from OpenIE runtime directory {}", openIEJarPath.toString());
             }
         }
         final ExtractionParameters eps = getExtractionParameters(req);