You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2017/10/09 15:55:50 UTC
svn commit: r1811581 - in
/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource:
ResourceManager.java impl/ResourceManager_impl.java
Author: schor
Date: Mon Oct 9 15:55:50 2017
New Revision: 1811581
URL: http://svn.apache.org/viewvc?rev=1811581&view=rev
Log:
[UIMA-5609] change impl of setExternalClassLoader
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java?rev=1811581&r1=1811580&r2=1811581&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java Mon Oct 9 15:55:50 2017
@@ -25,6 +25,7 @@ import java.net.URL;
import java.util.List;
import java.util.Map;
+import org.apache.uima.internal.util.UIMAClassLoader;
import org.apache.uima.resource.impl.ResourceManager_impl;
import org.apache.uima.resource.metadata.ResourceManagerConfiguration;
import org.apache.uima.util.XMLizable;
@@ -331,8 +332,13 @@ public interface ResourceManager {
public void setExtensionClassPath(ClassLoader parent, String classpath, boolean resolveResource)
throws MalformedURLException;
- default void setExtensionClassLoader(ClassLoader parent, boolean resolveResources) {
- ((ResourceManager_impl)this).setExtensionClassLoaderImpl(parent, resolveResources);
+ /**
+ * Set an extension class loader into the Resource Manager
+ * @param uimaExtensionClassLoader the loader to use
+ * @param resolveResources true to also use this to resolve resources
+ */
+ default void setExtensionClassLoader(UIMAClassLoader uimaExtensionClassLoader, boolean resolveResources) {
+ ((ResourceManager_impl)this).setExtensionClassLoaderImpl(uimaExtensionClassLoader, resolveResources);
}
/**
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java?rev=1811581&r1=1811580&r2=1811581&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java Mon Oct 9 15:55:50 2017
@@ -328,9 +328,10 @@ public class ResourceManager_impl implem
}
// https://issues.apache.org/jira/browse/UIMA-5553
+ // https://issues.apache.org/jira/browse/UIMA-5609
// synchronized because the other methods that set the extension class loader are.
- public synchronized void setExtensionClassLoaderImpl(ClassLoader parent, boolean resolveResource) {
- uimaCL = new UIMAClassLoader(new URL[0], parent);
+ public synchronized void setExtensionClassLoaderImpl(UIMAClassLoader uimaExtensionClassLoader, boolean resolveResource) {
+ uimaCL = uimaExtensionClassLoader;
if (resolveResource) {
// set UIMA extension ClassLoader also to resolve resources
getRelativePathResolver().setPathResolverClassLoader(uimaCL);