You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2006/11/22 17:10:02 UTC
svn commit: r478207 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima:
analysis_engine/impl/UimacppAnalysisEngineImpl.java
impl/CasConsumerFactory_impl.java uimacpp/UimacppAnalysisComponent.java
uimacpp/UimacppAnalysisEngine.java
Author: alally
Date: Wed Nov 22 08:10:01 2006
New Revision: 478207
URL: http://svn.apache.org/viewvc?view=rev&rev=478207
Log:
UIMA-57: renamed UimacppAnalysisEngine to UimacppAnalysisComponent
Added:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java
- copied, changed from r478198, incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisEngine.java
Removed:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisEngine.java
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CasConsumerFactory_impl.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java?view=diff&rev=478207&r1=478206&r2=478207
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java Wed Nov 22 08:10:01 2006
@@ -48,7 +48,7 @@
import org.apache.uima.resource.metadata.ProcessingResourceMetaData;
import org.apache.uima.resource.metadata.TypePriorities;
import org.apache.uima.resource.metadata.TypeSystemDescription;
-import org.apache.uima.uimacpp.UimacppAnalysisEngine;
+import org.apache.uima.uimacpp.UimacppAnalysisComponent;
import org.apache.uima.util.CasCreationUtils;
import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.Level;
@@ -81,7 +81,7 @@
/**
* For a primitive AnalysisEngine only, the Annotator instance that contains the analysis logic.
*/
- private UimacppAnalysisEngine mAnnotator;
+ private UimacppAnalysisComponent mAnnotator;
/**
* For a primitive AnalysisEngine only, the AnnotatorContext instance that the Annotator uses to
@@ -319,11 +319,11 @@
throws ResourceInitializationException {
// create Annotator Context and set Logger
UimaContextAdmin uimaContext = getUimaContextAdmin();
- uimaContext.setLogger(UIMAFramework.getLogger(UimacppAnalysisEngine.class));
+ uimaContext.setLogger(UIMAFramework.getLogger(UimacppAnalysisComponent.class));
mAnnotatorContext = new AnnotatorContext_impl(uimaContext);
if (!mVerificationMode) {
- mAnnotator = new UimacppAnalysisEngine(aDescription, this);
+ mAnnotator = new UimacppAnalysisComponent(aDescription, this);
getUimaContextAdmin().defineCasPool(mAnnotator.getCasInstancesRequired(),
getPerformanceTuningSettings(), mSofaAware);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CasConsumerFactory_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CasConsumerFactory_impl.java?view=diff&rev=478207&r1=478206&r2=478207
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CasConsumerFactory_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CasConsumerFactory_impl.java Wed Nov 22 08:10:01 2006
@@ -30,7 +30,7 @@
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceManager;
import org.apache.uima.resource.ResourceSpecifier;
-import org.apache.uima.uimacpp.UimacppAnalysisEngine;
+import org.apache.uima.uimacpp.UimacppAnalysisComponent;
/**
* Specialized Resource Factory for producing CasConsumers.
@@ -126,13 +126,13 @@
{
throw new ResourceInitializationException(
ResourceInitializationException.ERROR_INITIALIZING_FROM_DESCRIPTOR,
- new Object[] { UimacppAnalysisEngine.class.getName(),
+ new Object[] { UimacppAnalysisComponent.class.getName(),
aSpecifier.getSourceUrlString() });
}
} else {
throw new ResourceInitializationException(
ResourceInitializationException.ERROR_INITIALIZING_FROM_DESCRIPTOR,
- new Object[] { UimacppAnalysisEngine.class.getName(),
+ new Object[] { UimacppAnalysisComponent.class.getName(),
aSpecifier.getSourceUrlString() });
}
} else {
Copied: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java (from r478198, incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisEngine.java)
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java?view=diff&rev=478207&p1=incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisEngine.java&r1=478198&p2=incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java&r2=478207
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisEngine.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java Wed Nov 22 08:10:01 2006
@@ -50,7 +50,7 @@
import org.apache.uima.util.ProcessTrace;
import org.xml.sax.SAXException;
-public class UimacppAnalysisEngine extends AnalysisComponent_ImplBase {
+public class UimacppAnalysisComponent extends AnalysisComponent_ImplBase {
private UimacppEngine engine;
@@ -72,9 +72,9 @@
/**
* current class
*/
- private static final Class CLASS_NAME = UimacppAnalysisEngine.class;
+ private static final Class CLASS_NAME = UimacppAnalysisComponent.class;
- public UimacppAnalysisEngine(AnalysisEngineDescription aeDescription, AnalysisEngineImplBase ae) {
+ public UimacppAnalysisComponent(AnalysisEngineDescription aeDescription, AnalysisEngineImplBase ae) {
super();
this.ae = ae;
this.aeDescription = aeDescription;
@@ -330,7 +330,7 @@
*/
public static int getLoggingLevel() {
- Logger tafLogger = UIMAFramework.getLogger(UimacppAnalysisEngine.class);
+ Logger tafLogger = UIMAFramework.getLogger(UimacppAnalysisComponent.class);
if (tafLogger.isLoggable(Level.FINEST) || tafLogger.isLoggable(Level.FINER)
|| tafLogger.isLoggable(Level.FINE) || tafLogger.isLoggable(Level.CONFIG)
@@ -350,7 +350,7 @@
// System.out.println("CPPJEDIIEnging::log() level=" + msglevel + "src=" + sourceClass +
// "method=" + sourceMethod + "message=" + message);
- Logger tafLogger = UIMAFramework.getLogger(UimacppAnalysisEngine.class);
+ Logger tafLogger = UIMAFramework.getLogger(UimacppAnalysisComponent.class);
Level level = Level.INFO; // default
if (msglevel == TAF_LOGLEVEL_MESSAGE) {
level = Level.INFO;