You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2014/04/28 22:36:32 UTC
svn commit: r1590784 - in /uima/uimafit/trunk: ./
uimafit-core/src/main/java/org/apache/uima/fit/factory/
uimafit-core/src/main/java/org/apache/uima/fit/internal/
Author: rec
Date: Mon Apr 28 20:36:31 2014
New Revision: 1590784
URL: http://svn.apache.org/r1590784
Log:
[UIMA-3692] Classloading inconsistencies
- Added an experimental API to control resource managers used by uimaFIT
Added:
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/ResourceManagerFactory.java
- copied unchanged from r1590775, uima/uimafit/branches/2.0.x/uimafit-core/src/main/java/org/apache/uima/fit/internal/ResourceManagerFactory.java
Modified:
uima/uimafit/trunk/ (props changed)
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/CollectionReaderFactory.java
Propchange: uima/uimafit/trunk/
------------------------------------------------------------------------------
Merged /uima/uimafit/branches/2.0.x:r1590775
Modified: uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java?rev=1590784&r1=1590783&r2=1590784&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java Mon Apr 28 20:36:31 2014
@@ -56,6 +56,7 @@ import org.apache.uima.fit.descriptor.So
import org.apache.uima.fit.descriptor.TypeCapability;
import org.apache.uima.fit.factory.ConfigurationParameterFactory.ConfigurationData;
import org.apache.uima.fit.internal.ReflectionUtil;
+import org.apache.uima.fit.internal.ResourceManagerFactory;
import org.apache.uima.flow.FlowControllerDescription;
import org.apache.uima.resource.ExternalResourceDescription;
import org.apache.uima.resource.ResourceInitializationException;
@@ -105,7 +106,7 @@ public final class AnalysisEngineFactory
public static AnalysisEngine createEngine(String descriptorName, Object... configurationData)
throws InvalidXMLException, IOException, ResourceInitializationException {
AnalysisEngineDescription aed = createEngineDescription(descriptorName, configurationData);
- return UIMAFramework.produceAnalysisEngine(aed);
+ return UIMAFramework.produceAnalysisEngine(aed, ResourceManagerFactory.newResourceManager(), null);
}
/**
@@ -201,11 +202,13 @@ public final class AnalysisEngineFactory
public static AnalysisEngine createEngine(AnalysisEngineDescription desc,
Object... configurationData) throws ResourceInitializationException {
if (configurationData == null || configurationData.length == 0) {
- return UIMAFramework.produceAnalysisEngine(desc, null, null);
+ return UIMAFramework.produceAnalysisEngine(desc, ResourceManagerFactory.newResourceManager(),
+ null);
} else {
AnalysisEngineDescription descClone = (AnalysisEngineDescription) desc.clone();
ResourceCreationSpecifierFactory.setConfigurationParameters(descClone, configurationData);
- return UIMAFramework.produceAnalysisEngine(descClone);
+ return UIMAFramework.produceAnalysisEngine(descClone,
+ ResourceManagerFactory.newResourceManager(), null);
}
}
@@ -767,7 +770,8 @@ public final class AnalysisEngineFactory
ResourceInitializationException {
AnalysisEngineDescription desc = createEngineDescriptionFromPath(descriptorPath,
configurationData);
- return UIMAFramework.produceAnalysisEngine(desc);
+ return UIMAFramework.produceAnalysisEngine(desc, ResourceManagerFactory.newResourceManager(),
+ null);
}
/**
Modified: uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/CollectionReaderFactory.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/CollectionReaderFactory.java?rev=1590784&r1=1590783&r2=1590784&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/CollectionReaderFactory.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/CollectionReaderFactory.java Mon Apr 28 20:36:31 2014
@@ -39,6 +39,7 @@ import org.apache.uima.UIMAFramework;
import org.apache.uima.collection.CollectionReader;
import org.apache.uima.collection.CollectionReaderDescription;
import org.apache.uima.fit.factory.ConfigurationParameterFactory.ConfigurationData;
+import org.apache.uima.fit.internal.ResourceManagerFactory;
import org.apache.uima.resource.ExternalResourceDescription;
import org.apache.uima.resource.ResourceCreationSpecifier;
import org.apache.uima.resource.ResourceInitializationException;
@@ -77,7 +78,8 @@ public final class CollectionReaderFacto
Object... configurationData) throws UIMAException, IOException {
CollectionReaderDescription desc = createReaderDescriptionFromPath(descriptorPath,
configurationData);
- return UIMAFramework.produceCollectionReader(desc);
+ return UIMAFramework.produceCollectionReader(desc, ResourceManagerFactory.newResourceManager(),
+ null);
}
/**
@@ -164,7 +166,8 @@ public final class CollectionReaderFacto
imp.setName(descriptorName);
URL url = imp.findAbsoluteUrl(UIMAFramework.newDefaultResourceManager());
ResourceSpecifier specifier = createResourceCreationSpecifier(url, configurationData);
- return UIMAFramework.produceCollectionReader(specifier);
+ return UIMAFramework.produceCollectionReader(specifier,
+ ResourceManagerFactory.newResourceManager(), null);
}
/**
@@ -405,7 +408,8 @@ public final class CollectionReaderFacto
Object... configurationData) throws ResourceInitializationException {
CollectionReaderDescription descClone = (CollectionReaderDescription) desc.clone();
ResourceCreationSpecifierFactory.setConfigurationParameters(descClone, configurationData);
- return UIMAFramework.produceCollectionReader(descClone);
+ return UIMAFramework.produceCollectionReader(descClone,
+ ResourceManagerFactory.newResourceManager(), null);
}
/**