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 2015/12/13 13:37:25 UTC
svn commit: r1719797 - in /uima/uimafit/trunk:
uimafit-core/src/main/java/org/apache/uima/fit/component/initialize/
uimafit-core/src/main/java/org/apache/uima/fit/factory/
uimafit-core/src/main/java/org/apache/uima/fit/internal/
uimafit-core/src/main/j...
Author: rec
Date: Sun Dec 13 12:37:25 2015
New Revision: 1719797
URL: http://svn.apache.org/viewvc?rev=1719797&view=rev
Log:
[UIMA-4706] ResourceManagerFactory not used everywhere
Modified:
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java
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
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/TypePrioritiesFactory.java
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/DescriptionUtils.java
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/JCasIterable.java
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java
uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java
uima/uimafit/trunk/uimafit-cpe/src/main/java/org/apache/uima/fit/cpe/CpeBuilder.java
Modified: uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java?rev=1719797&r1=1719796&r2=1719797&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/initialize/ConfigurationParameterInitializer.java Sun Dec 13 12:37:25 2015
@@ -31,6 +31,7 @@ import org.apache.uima.UimaContextAdmin;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.fit.internal.ReflectionUtil;
+import org.apache.uima.fit.internal.ResourceManagerFactory;
import org.apache.uima.fit.internal.propertyeditors.PropertyEditorUtil;
import org.apache.uima.resource.ConfigurationManager;
import org.apache.uima.resource.CustomResourceSpecifier;
@@ -193,7 +194,7 @@ public final class ConfigurationParamete
public static void initialize(final Object component, final Map<String, Object> map)
throws ResourceInitializationException {
UimaContextAdmin context = UIMAFramework.newUimaContext(UIMAFramework.getLogger(),
- UIMAFramework.newDefaultResourceManager(), UIMAFramework.newConfigurationManager());
+ ResourceManagerFactory.newResourceManager(), UIMAFramework.newConfigurationManager());
ConfigurationManager cfgMgr = context.getConfigurationManager();
cfgMgr.setSession(context.getSession());
for (Entry<String, Object> e : map.entrySet()) {
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=1719797&r1=1719796&r2=1719797&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 Sun Dec 13 12:37:25 2015
@@ -870,7 +870,18 @@ public final class AnalysisEngineFactory
Object... configurationData) throws InvalidXMLException, IOException {
Import_impl imprt = new Import_impl();
imprt.setName(descriptorName);
- URL url = imprt.findAbsoluteUrl(UIMAFramework.newDefaultResourceManager());
+ URL url;
+ try {
+ url = imprt.findAbsoluteUrl(ResourceManagerFactory.newResourceManager());
+ }
+ catch (ResourceInitializationException e) {
+ if (e.getCause() instanceof IOException) {
+ throw (IOException) e.getCause();
+ }
+ else {
+ throw new IOException(e);
+ }
+ }
ResourceSpecifier specifier = ResourceCreationSpecifierFactory.createResourceCreationSpecifier(
url, configurationData);
return (AnalysisEngineDescription) specifier;
@@ -1291,7 +1302,7 @@ public final class AnalysisEngineFactory
}
fsIndexes.add(FsIndexFactory.createFsIndexCollection(componentClass));
FsIndexCollection aggIndexColl = CasCreationUtils.mergeFsIndexes(fsIndexes,
- UIMAFramework.newDefaultResourceManager());
+ ResourceManagerFactory.newResourceManager());
desc.getAnalysisEngineMetaData().setFsIndexCollection(aggIndexColl);
// set capabilities from the argument to this call or from the annotation present in the
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=1719797&r1=1719796&r2=1719797&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 Sun Dec 13 12:37:25 2015
@@ -164,7 +164,7 @@ public final class CollectionReaderFacto
Object... configurationData) throws UIMAException, IOException {
Import imp = UIMAFramework.getResourceSpecifierFactory().createImport();
imp.setName(descriptorName);
- URL url = imp.findAbsoluteUrl(UIMAFramework.newDefaultResourceManager());
+ URL url = imp.findAbsoluteUrl(ResourceManagerFactory.newResourceManager());
ResourceSpecifier specifier = createResourceCreationSpecifier(url, configurationData);
return UIMAFramework.produceCollectionReader(specifier,
ResourceManagerFactory.newResourceManager(), null);
Modified: uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/TypePrioritiesFactory.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/TypePrioritiesFactory.java?rev=1719797&r1=1719796&r2=1719797&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/TypePrioritiesFactory.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/TypePrioritiesFactory.java Sun Dec 13 12:37:25 2015
@@ -27,8 +27,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.logging.LogFactory;
-import org.apache.uima.UIMAFramework;
import org.apache.uima.fit.internal.MetaDataType;
+import org.apache.uima.fit.internal.ResourceManagerFactory;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceManager;
import org.apache.uima.resource.metadata.TypePriorities;
@@ -114,7 +114,7 @@ public final class TypePrioritiesFactory
}
}
- ResourceManager resMgr = UIMAFramework.newDefaultResourceManager();
+ ResourceManager resMgr = ResourceManagerFactory.newResourceManager();
TypePriorities aggTypePriorities = CasCreationUtils.mergeTypePriorities(typePrioritiesList,
resMgr);
Modified: uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/DescriptionUtils.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/DescriptionUtils.java?rev=1719797&r1=1719796&r2=1719797&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/DescriptionUtils.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/DescriptionUtils.java Sun Dec 13 12:37:25 2015
@@ -57,7 +57,7 @@ public final class DescriptionUtils {
// First we clone, because we perform changes within the descriptor.
AnalysisEngineDescription desc = (AnalysisEngineDescription) aDesc.clone();
- consolidateAggregate(desc, UIMAFramework.newDefaultResourceManager());
+ consolidateAggregate(desc, ResourceManagerFactory.newResourceManager());
return desc;
}
Modified: uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/JCasIterable.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/JCasIterable.java?rev=1719797&r1=1719796&r2=1719797&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/JCasIterable.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/JCasIterable.java Sun Dec 13 12:37:25 2015
@@ -26,6 +26,7 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.collection.CollectionReader;
import org.apache.uima.collection.CollectionReaderDescription;
+import org.apache.uima.fit.internal.ResourceManagerFactory;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceManager;
@@ -64,7 +65,7 @@ public class JCasIterable implements Ite
public JCasIterator iterator() {
try {
- ResourceManager resMgr = UIMAFramework.newDefaultResourceManager();
+ ResourceManager resMgr = ResourceManagerFactory.newResourceManager();
// Create the components
CollectionReader readerInst = UIMAFramework.produceCollectionReader(reader, resMgr, null);
Modified: uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java?rev=1719797&r1=1719796&r2=1719797&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/pipeline/SimplePipeline.java Sun Dec 13 12:37:25 2015
@@ -21,11 +21,7 @@ package org.apache.uima.fit.pipeline;
import static java.util.Arrays.asList;
import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngine;
import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;
-import static org.apache.uima.fit.factory.CollectionReaderFactory.createReader;
-import static org.apache.uima.fit.util.LifeCycleUtil.close;
import static org.apache.uima.fit.util.LifeCycleUtil.collectionProcessComplete;
-import static org.apache.uima.fit.util.LifeCycleUtil.destroy;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -38,6 +34,7 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.cas.CAS;
import org.apache.uima.collection.CollectionReader;
import org.apache.uima.collection.CollectionReaderDescription;
+import org.apache.uima.fit.internal.ResourceManagerFactory;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.Resource;
import org.apache.uima.resource.ResourceInitializationException;
@@ -128,7 +125,7 @@ public final class SimplePipeline {
*/
public static void runPipeline(final CollectionReaderDescription readerDesc,
final AnalysisEngineDescription... descs) throws UIMAException, IOException {
- ResourceManager resMgr = UIMAFramework.newDefaultResourceManager();
+ ResourceManager resMgr = ResourceManagerFactory.newResourceManager();
// Create the components
final CollectionReader reader = UIMAFramework.produceCollectionReader(readerDesc, resMgr, null);
Modified: uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java?rev=1719797&r1=1719796&r2=1719797&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/ExternalResourceFactoryTest.java Sun Dec 13 12:37:25 2015
@@ -57,6 +57,7 @@ import org.apache.uima.fit.component.ini
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.fit.descriptor.ExternalResource;
import org.apache.uima.fit.factory.locator.JndiResourceLocator;
+import org.apache.uima.fit.internal.ResourceManagerFactory;
import org.apache.uima.fit.pipeline.SimplePipeline;
import org.apache.uima.fit.util.SimpleNamedResourceManager;
import org.apache.uima.jcas.JCas;
@@ -115,7 +116,7 @@ public class ExternalResourceFactoryTest
outer.toXML(outerXml);
// Resolving the imports removes the inner AE description
- outer.resolveImports(UIMAFramework.newDefaultResourceManager());
+ outer.resolveImports(ResourceManagerFactory.newResourceManager());
StringWriter outerXml2 = new StringWriter();
outer.toXML(outerXml2);
Modified: uima/uimafit/trunk/uimafit-cpe/src/main/java/org/apache/uima/fit/cpe/CpeBuilder.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-cpe/src/main/java/org/apache/uima/fit/cpe/CpeBuilder.java?rev=1719797&r1=1719796&r2=1719797&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-cpe/src/main/java/org/apache/uima/fit/cpe/CpeBuilder.java (original)
+++ uima/uimafit/trunk/uimafit-cpe/src/main/java/org/apache/uima/fit/cpe/CpeBuilder.java Sun Dec 13 12:37:25 2015
@@ -31,7 +31,6 @@ import java.io.OutputStream;
import java.net.URL;
import java.util.Map;
-import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.analysis_engine.metadata.FixedFlow;
import org.apache.uima.collection.CollectionProcessingEngine;
@@ -44,6 +43,7 @@ import org.apache.uima.collection.metada
import org.apache.uima.collection.metadata.CpeDescriptorException;
import org.apache.uima.collection.metadata.CpeInclude;
import org.apache.uima.collection.metadata.CpeIntegratedCasProcessor;
+import org.apache.uima.fit.internal.ResourceManagerFactory;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceManager;
import org.apache.uima.resource.ResourceSpecifier;
@@ -151,7 +151,7 @@ public class CpeBuilder {
public CollectionProcessingEngine createCpe(StatusCallbackListener aListener)
throws ResourceInitializationException, CpeDescriptorException {
- ResourceManager resMgr = UIMAFramework.newDefaultResourceManager();
+ ResourceManager resMgr = ResourceManagerFactory.newResourceManager();
if (maxProcessingUnitThreadCount == 0) {
cpeDesc.getCpeCasProcessors().setPoolSize(3);
} else {