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 2013/08/24 17:52:08 UTC
svn commit: r1517156 - in /uima/sandbox/uimafit/trunk/uimafit-examples/src:
main/java/org/apache/uima/fit/examples/experiment/pos/
main/java/org/apache/uima/fit/examples/getstarted/
main/java/org/apache/uima/fit/examples/resource/ main/java/org/apache/...
Author: rec
Date: Sat Aug 24 15:52:08 2013
New Revision: 1517156
URL: http://svn.apache.org/r1517156
Log:
[UIMA-3217] Review the examples
- Removed empty JavaDoc comments
- Formatting
- Write output to target
- Use auto-type detection in more places
- Rely on @ExternalResource annotation
- Added test for ex6
- Updated references to org/uimafit
Added:
uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ex6/
uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ex6/Example6Test.java (with props)
Removed:
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/resources/org/apache/uima/fit/tutorial/
Modified:
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/BaselineTagger.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/Evaluator.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/GoldTagger.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/LineReader.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/RunExperiment.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/SentenceAndTokenCopier.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/ViewNames.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickAE.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickDescriptor.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickPipeline.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/resource/ExternalResourceExample.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotator.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotatorDescriptor.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotatorPipeline.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex2/RoomNumberAnnotator.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex2/RoomNumberAnnotatorPipeline.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/StringMapResource.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/StringMapResource_impl.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/UimaAcronymAnnotator.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/UimaMeetingAnnotator.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateAnnotation.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateTimeAnnotation.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/Meeting.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/RoomNumber.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/TimeAnnotation.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaAcronym.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaMeeting.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Token.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ExamplesTestBase.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotator2Test.java
uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/xmi/XmiTest.java
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/BaselineTagger.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/BaselineTagger.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/BaselineTagger.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/BaselineTagger.java Sat Aug 24 15:52:08 2013
@@ -29,8 +29,6 @@ import org.apache.uima.jcas.JCas;
* This "baseline" part-of-speech tagger isn't very sophisticated! Notice, however, that the tagger
* operates on the default view. This will be mapped to the "system" view when we run our
* experiment.
- *
- *
*/
public class BaselineTagger extends JCasAnnotator_ImplBase {
@@ -45,5 +43,4 @@ public class BaselineTagger extends JCas
}
}
}
-
}
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/Evaluator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/Evaluator.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/Evaluator.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/Evaluator.java Sat Aug 24 15:52:08 2013
@@ -39,8 +39,6 @@ import org.apache.uima.jcas.JCas;
* very simple approach to evaluation of part-of-speech tags that will not likely suffice in
* real-world scenarios for a number of reasons (e.g. no confusion matrix, assumes gold-standard
* tokens and sentences in the system view, etc.)
- *
- *
*/
@SofaCapability(inputSofas = { GOLD_VIEW, SYSTEM_VIEW })
public class Evaluator extends JCasAnnotator_ImplBase {
@@ -88,5 +86,4 @@ public class Evaluator extends JCasAnnot
float accuracy = (float) totalCorrect / total;
System.out.println("accuracy: " + NumberFormat.getPercentInstance().format(accuracy));
}
-
}
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/GoldTagger.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/GoldTagger.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/GoldTagger.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/GoldTagger.java Sat Aug 24 15:52:08 2013
@@ -37,8 +37,6 @@ import org.apache.uima.jcas.JCas;
* This AE assumes that their is part-of-speech tagged text in the default view with the format
* "word/tag word/tag...". It converts this data into Token objects and plain text which are posted
* to the GOLD_VIEW.
- *
- *
*/
@SofaCapability(inputSofas = CAS.NAME_DEFAULT_SOFA, outputSofas = GOLD_VIEW)
public class GoldTagger extends JCasAnnotator_ImplBase {
@@ -46,18 +44,8 @@ public class GoldTagger extends JCasAnno
@Override
public void process(JCas jCas) throws AnalysisEngineProcessException {
try {
- JCas defaultView = jCas.getView(CAS.NAME_DEFAULT_SOFA); // see
- // javadoc
- // comment
- // for
- // SofaCapability
- // for why
- // we have
- // to
- // retrieve
- // the
- // default
- // view from
+ JCas defaultView = jCas.getView(CAS.NAME_DEFAULT_SOFA);
+ // see JavaDoc comment for SofaCapability for why we have to retrieve the default view from
// the JCas
String tagData = defaultView.getDocumentText();
@@ -88,5 +76,4 @@ public class GoldTagger extends JCasAnno
throw new AnalysisEngineProcessException(ce);
}
}
-
}
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/LineReader.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/LineReader.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/LineReader.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/LineReader.java Sat Aug 24 15:52:08 2013
@@ -37,8 +37,6 @@ import org.apache.uima.util.ProgressImpl
*
* This collection reader takes a single file and produces one JCas for each line in the file
* putting the text of the line into the default view.
- *
- *
*/
public class LineReader extends JCasCollectionReader_ImplBase {
@@ -73,5 +71,4 @@ public class LineReader extends JCasColl
Progress progress = new ProgressImpl(lineIndex, lines.length, Progress.ENTITIES);
return new Progress[] { progress };
}
-
}
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/RunExperiment.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/RunExperiment.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/RunExperiment.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/RunExperiment.java Sat Aug 24 15:52:08 2013
@@ -29,16 +29,14 @@ import org.apache.uima.fit.component.xwr
import org.apache.uima.fit.factory.AggregateBuilder;
import org.apache.uima.fit.factory.AnalysisEngineFactory;
import org.apache.uima.fit.factory.CollectionReaderFactory;
-import org.apache.uima.fit.factory.TypeSystemDescriptionFactory;
import org.apache.uima.fit.pipeline.SimplePipeline;
-import org.apache.uima.resource.metadata.TypeSystemDescription;
/**
* This class demonstrates a very common (though simplified) experimental setup in which gold
* standard data is available for some task and you want to evaluate how well your analysis engine
* works against that data. Here we are evaluating "BaselineTagger" which is a (ridiculously) simple
* part-of-speech tagger against the part-of-speech tags found in
- * "src/main/resources/org/uimafit/examples/pos/sample.txt.pos".
+ * "src/main/resources/org/apache/uima/fit/examples/pos/sample.txt.pos".
* <p>
* The basic strategy is as follows:
* <ul>
@@ -53,20 +51,16 @@ import org.apache.uima.resource.metadata
*
* Please see comments in the code for details on how the UIMA pipeline is set up and run for this
* task.
- *
- *
*/
public class RunExperiment {
public static void main(String[] args) throws UIMAException, IOException {
- String samplePosFileName = "src/main/resources/org/uimafit/examples/pos/sample.txt.pos";
-
- TypeSystemDescription typeSystem = TypeSystemDescriptionFactory.createTypeSystemDescription();
+ String samplePosFileName = "src/main/resources/org/apache/uima/fit/examples/pos/sample.txt.pos";
// The lineReader simply copies the lines from the input file into the
// default view - one line per CAS
CollectionReader lineReader = CollectionReaderFactory.createReader(LineReader.class,
- typeSystem, LineReader.PARAM_INPUT_FILE, samplePosFileName);
+ LineReader.PARAM_INPUT_FILE, samplePosFileName);
AggregateBuilder builder = new AggregateBuilder();
@@ -74,13 +68,13 @@ public class RunExperiment {
// along with their part-of-speech tags which will be added to the
// GOLD_VIEW
AnalysisEngineDescription goldTagger = AnalysisEngineFactory.createEngineDescription(
- GoldTagger.class, typeSystem);
+ GoldTagger.class);
builder.add(goldTagger);
// The textCopier creates the SYSTEM_VIEW and set the text of this view
// to that of the text found in GOLD_VIEW
AnalysisEngineDescription textCopier = AnalysisEngineFactory.createEngineDescription(
- ViewTextCopierAnnotator.class, typeSystem,
+ ViewTextCopierAnnotator.class,
ViewTextCopierAnnotator.PARAM_SOURCE_VIEW_NAME, ViewNames.GOLD_VIEW,
ViewTextCopierAnnotator.PARAM_DESTINATION_VIEW_NAME, ViewNames.SYSTEM_VIEW);
builder.add(textCopier);
@@ -88,28 +82,27 @@ public class RunExperiment {
// The sentenceAndTokenCopier copies Token and Sentence annotations in
// the GOLD_VIEW into the SYSTEM_VIEW
AnalysisEngineDescription sentenceAndTokenCopier = AnalysisEngineFactory
- .createEngineDescription(SentenceAndTokenCopier.class, typeSystem);
+ .createEngineDescription(SentenceAndTokenCopier.class);
builder.add(sentenceAndTokenCopier, ViewNames.VIEW1, ViewNames.GOLD_VIEW, ViewNames.VIEW2,
ViewNames.SYSTEM_VIEW);
// The baselineTagger is run on the SYSTEM_VIEW
AnalysisEngineDescription baselineTagger = AnalysisEngineFactory.createEngineDescription(
- BaselineTagger.class, typeSystem);
+ BaselineTagger.class);
builder.add(baselineTagger, CAS.NAME_DEFAULT_SOFA, ViewNames.SYSTEM_VIEW);
// The evaluator will compare the part-of-speech tags in the SYSTEM_VIEW
// with those in the GOLD_VIEW
AnalysisEngineDescription evaluator = AnalysisEngineFactory.createEngineDescription(
- Evaluator.class, typeSystem);
+ Evaluator.class);
builder.add(evaluator);
// The xWriter writes out the contents of each CAS (one per sentence) to
// an XMI file. It is instructive to open one of these
- // xmi files in the CAS Visual Debugger and look at the contents of each
+ // XMI files in the CAS Visual Debugger and look at the contents of each
// view.
AnalysisEngineDescription xWriter = AnalysisEngineFactory.createEngineDescription(
- XWriter.class, typeSystem, XWriter.PARAM_OUTPUT_DIRECTORY_NAME,
- "src/main/resources/org/uimafit/examples/pos/xmi");
+ XWriter.class, XWriter.PARAM_OUTPUT_DIRECTORY_NAME, "target/examples/pos/xmi");
builder.add(xWriter);
// runs the collection reader and the aggregate AE.
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/SentenceAndTokenCopier.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/SentenceAndTokenCopier.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/SentenceAndTokenCopier.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/SentenceAndTokenCopier.java Sat Aug 24 15:52:08 2013
@@ -32,10 +32,7 @@ import org.apache.uima.jcas.JCas;
/**
* This simple AE copies tokens and sentences from one view to another.
- *
- *
*/
-
@SofaCapability(inputSofas = { VIEW1, VIEW2 })
public class SentenceAndTokenCopier extends JCasAnnotator_ImplBase {
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/ViewNames.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/ViewNames.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/ViewNames.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/experiment/pos/ViewNames.java Sat Aug 24 15:52:08 2013
@@ -18,10 +18,6 @@
*/
package org.apache.uima.fit.examples.experiment.pos;
-/**
- *
- *
- */
public class ViewNames {
public static final String GOLD_VIEW = "GOLD_VIEW";
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickAE.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickAE.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickAE.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickAE.java Sat Aug 24 15:52:08 2013
@@ -23,8 +23,6 @@ import org.apache.uima.fit.component.JCa
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.jcas.JCas;
-/**
- */
public class GetStartedQuickAE extends JCasAnnotator_ImplBase {
public static final String PARAM_STRING = "stringParam";
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickDescriptor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickDescriptor.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickDescriptor.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickDescriptor.java Sat Aug 24 15:52:08 2013
@@ -27,10 +27,6 @@ import org.apache.uima.fit.factory.Analy
import org.apache.uima.resource.ResourceInitializationException;
import org.xml.sax.SAXException;
-/**
- *
- *
- */
public class GetStartedQuickDescriptor {
public static void main(String[] args) throws ResourceInitializationException,
@@ -44,6 +40,6 @@ public class GetStartedQuickDescriptor {
"uimaFIT");
// Write the descriptor to an XML file
- analysisEngineDescription.toXML(new FileOutputStream("GetStartedQuickAE.xml"));
+ analysisEngineDescription.toXML(new FileOutputStream("target/examples/GetStartedQuickAE.xml"));
}
}
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickPipeline.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickPipeline.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickPipeline.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/getstarted/GetStartedQuickPipeline.java Sat Aug 24 15:52:08 2013
@@ -24,10 +24,6 @@ import org.apache.uima.fit.factory.Analy
import org.apache.uima.fit.factory.JCasFactory;
import org.apache.uima.jcas.JCas;
-/**
- *
- *
- */
public class GetStartedQuickPipeline {
public static void main(String[] args) throws UIMAException {
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/resource/ExternalResourceExample.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/resource/ExternalResourceExample.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/resource/ExternalResourceExample.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/resource/ExternalResourceExample.java Sat Aug 24 15:52:08 2013
@@ -66,7 +66,7 @@ public class ExternalResourceExample {
* was properly initialized by uimaFIT
*/
public static class Annotator extends org.apache.uima.fit.component.JCasAnnotator_ImplBase {
- final static String MODEL_KEY = "Model";
+ final static String MODEL_KEY = "model";
@ExternalResource(key = MODEL_KEY)
private SharedModel model;
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotator.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotator.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotator.java Sat Aug 24 15:52:08 2013
@@ -37,8 +37,6 @@ import org.apache.uima.jcas.JCas;
* <li>The super class was changed to org.apache.uima.fit.component.JCasAnnotator_ImplBase</li>
* <li>The class is annotated with org.apache.uima.fit.descriptor.TypeCapability</li>
* </ul>
- *
- *
*/
@TypeCapability(outputs = { "org.apache.uima.tutorial.RoomNumber",
"org.apache.uima.tutorial.RoomNumber:building" })
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotatorDescriptor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotatorDescriptor.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotatorDescriptor.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotatorDescriptor.java Sat Aug 24 15:52:08 2013
@@ -23,32 +23,20 @@ import java.io.FileOutputStream;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.fit.factory.AnalysisEngineFactory;
-import org.apache.uima.fit.factory.TypeSystemDescriptionFactory;
-import org.apache.uima.resource.ResourceInitializationException;
-import org.apache.uima.resource.metadata.TypeSystemDescription;
/**
- * This class provides a main method which shows how to generate an xml descriptor file using the
+ * This class provides a main method which shows how to generate an XML descriptor file using the
* RoomNumberAnnotator class definition. The resulting XML descriptor file is the same as the one
* provided in the uimaj-examples except that instead of building the file in parallel with the
* class definition, it is now built completely by using the class definition.
- *
- *
*/
public class RoomNumberAnnotatorDescriptor {
- public static AnalysisEngineDescription createDescriptor() throws ResourceInitializationException {
- TypeSystemDescription typeSystemDescription = TypeSystemDescriptionFactory
- .createTypeSystemDescription();
- return AnalysisEngineFactory.createEngineDescription(RoomNumberAnnotator.class,
- typeSystemDescription);
- }
-
public static void main(String[] args) throws Exception {
- File outputDirectory = new File("target/example-output/ex1/");
+ File outputDirectory = new File("target/examples/ex1/");
outputDirectory.mkdirs();
- AnalysisEngineDescription aed = createDescriptor();
+ AnalysisEngineDescription aed = AnalysisEngineFactory
+ .createEngineDescription(RoomNumberAnnotator.class);
aed.toXML(new FileOutputStream(new File(outputDirectory, "RoomNumberAnnotator.xml")));
}
-
}
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotatorPipeline.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotatorPipeline.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotatorPipeline.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotatorPipeline.java Sat Aug 24 15:52:08 2013
@@ -19,28 +19,20 @@
package org.apache.uima.fit.examples.tutorial.ex1;
import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngine;
-import static org.apache.uima.fit.factory.JCasFactory.createJCas;
-import static org.apache.uima.fit.factory.TypeSystemDescriptionFactory.createTypeSystemDescription;
import static org.apache.uima.fit.util.JCasUtil.select;
import org.apache.uima.UIMAException;
import org.apache.uima.analysis_engine.AnalysisEngine;
import org.apache.uima.fit.examples.tutorial.type.RoomNumber;
import org.apache.uima.jcas.JCas;
-import org.apache.uima.resource.metadata.TypeSystemDescription;
-/**
- *
- *
- */
public class RoomNumberAnnotatorPipeline {
public static void main(String[] args) throws UIMAException {
String text = "The meeting was moved from Yorktown 01-144 to Hawthorne 1S-W33.";
- TypeSystemDescription tsd = createTypeSystemDescription("org.apache.uima.fit.examples.tutorial.type.RoomNumber");
- JCas jCas = createJCas(tsd);
+ AnalysisEngine analysisEngine = createEngine(RoomNumberAnnotator.class);
+ JCas jCas = analysisEngine.newJCas();
jCas.setDocumentText(text);
- AnalysisEngine analysisEngine = createEngine(RoomNumberAnnotator.class, tsd);
analysisEngine.process(jCas);
for (RoomNumber roomNumber : select(jCas, RoomNumber.class)) {
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex2/RoomNumberAnnotator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex2/RoomNumberAnnotator.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex2/RoomNumberAnnotator.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex2/RoomNumberAnnotator.java Sat Aug 24 15:52:08 2013
@@ -47,9 +47,7 @@ import org.apache.uima.util.Level;
* <li>mPatterns and mLocations is annotated with @ConfigurationParameters</li>
* <li>the initialize method was removed</li>
* </ul>
- *
*/
-
@TypeCapability(outputs = { "org.apache.uima.tutorial.RoomNumber",
"org.apache.uima.tutorial.RoomNumber:building" })
public class RoomNumberAnnotator extends JCasAnnotator_ImplBase {
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex2/RoomNumberAnnotatorPipeline.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex2/RoomNumberAnnotatorPipeline.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex2/RoomNumberAnnotatorPipeline.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex2/RoomNumberAnnotatorPipeline.java Sat Aug 24 15:52:08 2013
@@ -26,10 +26,6 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.fit.examples.tutorial.type.RoomNumber;
import org.apache.uima.jcas.JCas;
-/**
- *
- *
- */
public class RoomNumberAnnotatorPipeline {
public static void main(String[] args) throws UIMAException {
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/StringMapResource.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/StringMapResource.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/StringMapResource.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/StringMapResource.java Sat Aug 24 15:52:08 2013
@@ -18,11 +18,6 @@
*/
package org.apache.uima.fit.examples.tutorial.ex6;
-/**
- *
- *
- */
-
public interface StringMapResource {
String get(String aKey);
}
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/StringMapResource_impl.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/StringMapResource_impl.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/StringMapResource_impl.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/StringMapResource_impl.java Sat Aug 24 15:52:08 2013
@@ -30,10 +30,6 @@ import org.apache.uima.resource.DataReso
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.SharedResourceObject;
-/**
- *
- *
- */
public class StringMapResource_impl implements StringMapResource, SharedResourceObject {
private Map<String, String> mMap = new HashMap<String, String>();
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/UimaAcronymAnnotator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/UimaAcronymAnnotator.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/UimaAcronymAnnotator.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/UimaAcronymAnnotator.java Sat Aug 24 15:52:08 2013
@@ -19,10 +19,7 @@
package org.apache.uima.fit.examples.tutorial.ex6;
import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;
-import static org.apache.uima.fit.factory.ExternalResourceFactory.bindResource;
import static org.apache.uima.fit.factory.ExternalResourceFactory.createExternalResourceDescription;
-import static org.apache.uima.fit.factory.TypeSystemDescriptionFactory.createTypeSystemDescription;
-
import java.io.File;
import java.io.FileOutputStream;
import java.util.StringTokenizer;
@@ -33,10 +30,6 @@ import org.apache.uima.fit.descriptor.Ex
import org.apache.uima.fit.descriptor.TypeCapability;
import org.apache.uima.fit.examples.tutorial.type.UimaAcronym;
import org.apache.uima.jcas.JCas;
-import org.apache.uima.resource.ExternalResourceDescription;
-import org.apache.uima.resource.ResourceInitializationException;
-import org.apache.uima.resource.metadata.TypeSystemDescription;
-import org.apache.uima.util.InvalidXMLException;
/**
* Annotates UIMA acronyms and provides their expanded forms. When combined in an aggregate TAE with
@@ -48,10 +41,10 @@ import org.apache.uima.util.InvalidXMLEx
"org.apache.uima.examples.tutorial.UimaAcronym:expandedForm" })
public class UimaAcronymAnnotator extends JCasAnnotator_ImplBase {
- static final String RESOURCE_ACRONYM_TABLE = "AcronymTable";
+ static final String RES_ACRONYM_TABLE = "acronymTable";
- @ExternalResource(key = RESOURCE_ACRONYM_TABLE)
- private StringMapResource mMap;
+ @ExternalResource(key = RES_ACRONYM_TABLE)
+ private StringMapResource acronymTable;
@Override
public void process(JCas aJCas) {
@@ -62,7 +55,7 @@ public class UimaAcronymAnnotator extend
while (tokenizer.hasMoreTokens()) {
String token = tokenizer.nextToken();
// look up token in map to see if it is an acronym
- String expandedForm = mMap.get(token);
+ String expandedForm = acronymTable.get(token);
if (expandedForm != null) {
// create annotation
UimaAcronym annot = new UimaAcronym(aJCas, pos, pos + token.length());
@@ -74,20 +67,16 @@ public class UimaAcronymAnnotator extend
}
}
- public static AnalysisEngineDescription createDescription() throws InvalidXMLException,
- ResourceInitializationException {
- TypeSystemDescription tsd = createTypeSystemDescription("org.apache.uima.fit.examples.tutorial.type.TypeSystem");
- AnalysisEngineDescription aed = createEngineDescription(UimaAcronymAnnotator.class, tsd);
- ExternalResourceDescription erd = createExternalResourceDescription("UimaAcronymTableFile",
- StringMapResource_impl.class, "file:org/uimafit/tutorial/ex6/uimaAcronyms.txt");
- bindResource(aed, RESOURCE_ACRONYM_TABLE, erd);
- return aed;
- }
-
public static void main(String[] args) throws Exception {
- File outputDirectory = new File("src/main/resources/org/uimafit/examples/tutorial/ex6/");
+ File outputDirectory = new File("target/examples/tutorial/ex6/");
outputDirectory.mkdirs();
- AnalysisEngineDescription aed = createDescription();
+
+ AnalysisEngineDescription aed = createEngineDescription(
+ UimaAcronymAnnotator.class,
+ UimaAcronymAnnotator.RES_ACRONYM_TABLE,
+ createExternalResourceDescription(StringMapResource_impl.class,
+ "file:org/apache/uima/fit/examples/tutorial/ex6/uimaAcronyms.txt"));
+
aed.toXML(new FileOutputStream(new File(outputDirectory, "UimaAcronymAnnotator.xml")));
}
}
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/UimaMeetingAnnotator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/UimaMeetingAnnotator.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/UimaMeetingAnnotator.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/ex6/UimaMeetingAnnotator.java Sat Aug 24 15:52:08 2013
@@ -19,9 +19,7 @@
package org.apache.uima.fit.examples.tutorial.ex6;
import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;
-import static org.apache.uima.fit.factory.ExternalResourceFactory.bindResource;
import static org.apache.uima.fit.factory.ExternalResourceFactory.createExternalResourceDescription;
-import static org.apache.uima.fit.factory.TypeSystemDescriptionFactory.createTypeSystemDescription;
import static org.apache.uima.fit.util.JCasUtil.select;
import java.io.File;
@@ -30,8 +28,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
-import org.apache.uima.UimaContext;
-import org.apache.uima.analysis_component.AnalysisComponent;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
@@ -42,37 +38,19 @@ import org.apache.uima.fit.examples.tuto
import org.apache.uima.fit.factory.AggregateBuilder;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ExternalResourceDescription;
-import org.apache.uima.resource.ResourceAccessException;
-import org.apache.uima.resource.ResourceInitializationException;
-import org.apache.uima.resource.metadata.TypeSystemDescription;
/**
* Example annotator that iterates over Meeting annotations and annotates a meeting as a UimaMeeting
* if a UIMA acronym occurs in close proximity to that meeting. When combined in an aggregate TAE
* with the UimaAcronymAnnotator, demonstrates the use of the ResourceManager to share data between
* annotators.
- *
*/
@TypeCapability(inputs = "org.apache.uima.tutorial.Meeting", outputs = "org.apache.uima.tutorial.UimaMeeting")
public class UimaMeetingAnnotator extends JCasAnnotator_ImplBase {
- static final String RESOURCE_UIMA_TERM_TABLE = "UimaTermTable";
+ static final String RES_UIMA_TERM_TABLE = "uimaTermTable";
- @ExternalResource(key = RESOURCE_UIMA_TERM_TABLE)
- private StringMapResource mMap;
-
- /**
- * @see AnalysisComponent#initialize(UimaContext)
- */
- @Override
- public void initialize(UimaContext aContext) throws ResourceInitializationException {
- super.initialize(aContext);
- try {
- // get a reference to the String Map Resource
- mMap = (StringMapResource) getContext().getResourceObject("UimaTermTable");
- } catch (ResourceAccessException e) {
- throw new ResourceInitializationException(e);
- }
- }
+ @ExternalResource(key = RES_UIMA_TERM_TABLE)
+ private StringMapResource uimaTermTable;
/**
* @see JCasAnnotator_ImplBase#process(JCas)
@@ -92,7 +70,7 @@ public class UimaMeetingAnnotator extend
for (Meeting meeting : select(aJCas, Meeting.class)) {
// get span of text within 50 chars on either side of meeting
- // (window size should probably be a config. param)
+ // (window size should probably be a configuration parameter)
int begin = meeting.getBegin() - 50;
int end = meeting.getEnd() + 50;
if (begin < 0) {
@@ -108,15 +86,14 @@ public class UimaMeetingAnnotator extend
while (tokenizer.hasMoreTokens()) {
String token = tokenizer.nextToken();
// look up token in map to see if it is an acronym
- if (mMap.get(token) != null) {
+ if (uimaTermTable.get(token) != null) {
// create annotation
UimaMeeting annot = new UimaMeeting(aJCas, meeting.getBegin(), meeting.getEnd());
annot.setRoom(meeting.getRoom());
annot.setDate(meeting.getDate());
annot.setStartTime(meeting.getStartTime());
annot.setEndTime(meeting.getEndTime());
- // Add annotation to a list, to be later added to the
- // indexes.
+ // Add annotation to a list, to be later added to the indexes.
// We need to do this because it's not allowed to add to an
// index that you're currently iterating over.
uimaMeetings.add(annot);
@@ -131,30 +108,20 @@ public class UimaMeetingAnnotator extend
}
public static void main(String[] args) throws Exception {
- File outputDirectory = new File("src/main/resources/org/uimafit/tutorial/ex6/");
+ File outputDirectory = new File("target/examples/tutorial/ex6/");
outputDirectory.mkdirs();
- TypeSystemDescription tsd = createTypeSystemDescription("org.apache.uima.fit.tutorial.type.TypeSystem");
- AnalysisEngineDescription aed = createEngineDescription(UimaMeetingAnnotator.class, tsd);
-
- aed.toXML(new FileOutputStream(new File(outputDirectory, "UimaMeetingAnnotator.xml")));
+ ExternalResourceDescription resource = createExternalResourceDescription(
+ StringMapResource_impl.class,
+ "file:org/apache/uima/fit/examples/tutorial/ex6/uimaAcronyms.txt");
AggregateBuilder builder = new AggregateBuilder();
- builder.add(createEngineDescription("org.apache.uima.fit.tutorial.ex6.UimaAcronymAnnotator"));
- builder.add(createEngineDescription("org.apache.uima.fit.tutorial.ex6.UimaMeetingAnnotator"));
+ builder.add(createEngineDescription(UimaAcronymAnnotator.class,
+ UimaAcronymAnnotator.RES_ACRONYM_TABLE, resource));
+ builder.add(createEngineDescription(UimaMeetingAnnotator.class,
+ UimaMeetingAnnotator.RES_UIMA_TERM_TABLE, resource));
AnalysisEngineDescription aggregate = builder.createAggregateDescription();
- ExternalResourceDescription erd = createExternalResourceDescription("UimaAcronymTableFile",
- StringMapResource_impl.class, "file:org/uimafit/tutorial/ex6/uimaAcronyms.txt");
-
- // bindResource(aggregate,
- // UimaAcronymAnnotator.class.getName()+"/"+UimaAcronymAnnotator.RESOURCE_ACRONYM_TABLE,
- // erd);
- bindResource(aggregate, RESOURCE_UIMA_TERM_TABLE, erd); // UimaMeetingAnnotator.class.getName()+"/"+
-
- // bindResource(aggregate, "UimaAcronymTableFile", erd);
- // bindResource(aggregate, RESOURCE_UIMA_TERM_TABLE, erd);
-
aggregate.toXML(new FileOutputStream(new File(outputDirectory, "UimaMeetingDetectorTAE.xml")));
}
}
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateAnnotation.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateAnnotation.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateAnnotation.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateAnnotation.java Sat Aug 24 15:52:08 2013
@@ -25,7 +25,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
* Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimaFIT-examples/src/main/resources /org/uimafit/examples/TypeSystem.xml
+ * /Academic/workspace/uimaFIT-examples/src/main/resources /org/apache/uima/fit/examples/TypeSystem.xml
*
* @generated
*/
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateTimeAnnotation.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateTimeAnnotation.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateTimeAnnotation.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/DateTimeAnnotation.java Sat Aug 24 15:52:08 2013
@@ -26,7 +26,7 @@ import org.apache.uima.jcas.tcas.Annotat
/**
* Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimaFIT-examples/src/main/resources /org/uimafit/examples/TypeSystem.xml
+ * /Academic/workspace/uimaFIT-examples/src/main/resources /org/apache/uima/fit/examples/TypeSystem.xml
*
* @generated
*/
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/Meeting.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/Meeting.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/Meeting.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/Meeting.java Sat Aug 24 15:52:08 2013
@@ -26,7 +26,7 @@ import org.apache.uima.jcas.tcas.Annotat
/**
* Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimaFIT-examples/src/main/resources /org/uimafit/examples/TypeSystem.xml
+ * /Academic/workspace/uimaFIT-examples/src/main/resources /org/apache/uima/fit/examples/TypeSystem.xml
*
* @generated
*/
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/RoomNumber.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/RoomNumber.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/RoomNumber.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/RoomNumber.java Sat Aug 24 15:52:08 2013
@@ -26,7 +26,7 @@ import org.apache.uima.jcas.tcas.Annotat
/**
* Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimaFIT-examples/src/main/resources /org/uimafit/examples/TypeSystem.xml
+ * /Academic/workspace/uimaFIT-examples/src/main/resources /org/apache/uima/fit/examples/TypeSystem.xml
*
* @generated
*/
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/TimeAnnotation.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/TimeAnnotation.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/TimeAnnotation.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/TimeAnnotation.java Sat Aug 24 15:52:08 2013
@@ -25,7 +25,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
* Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimaFIT-examples/src/main/resources /org/uimafit/examples/TypeSystem.xml
+ * /Academic/workspace/uimaFIT-examples/src/main/resources /org/apache/uima/fit/examples/TypeSystem.xml
*
* @generated
*/
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaAcronym.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaAcronym.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaAcronym.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaAcronym.java Sat Aug 24 15:52:08 2013
@@ -26,7 +26,7 @@ import org.apache.uima.jcas.tcas.Annotat
/**
* Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimaFIT-examples/src/main/resources /org/uimafit/examples/TypeSystem.xml
+ * /Academic/workspace/uimaFIT-examples/src/main/resources /org/apache/uima/fit/examples/TypeSystem.xml
*
* @generated
*/
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaMeeting.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaMeeting.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaMeeting.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/tutorial/type/UimaMeeting.java Sat Aug 24 15:52:08 2013
@@ -25,7 +25,7 @@ import org.apache.uima.jcas.cas.TOP_Type
/**
* Updated by JCasGen Fri Jun 11 20:10:52 MDT 2010 XML source: C:/Users/Philip/Documents
- * /Academic/workspace/uimaFIT-examples/src/main/resources /org/uimafit/examples/TypeSystem.xml
+ * /Academic/workspace/uimaFIT-examples/src/main/resources /org/apache/uima/fit/examples/TypeSystem.xml
*
* @generated
*/
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Sentence.java Sat Aug 24 15:52:08 2013
@@ -27,7 +27,7 @@ import org.apache.uima.jcas.tcas.Annotat
/**
* Updated by JCasGen Wed Jul 14 10:08:01 MDT 2010 XML source: C:/Users/Philip/Documents
* /Academic/workspace/uimafit-parent/uimaFIT-examples/src
- * /main/resources/org/uimafit/examples/TypeSystem.xml
+ * /main/resources/org/apache/uima/fit/examples/TypeSystem.xml
*
* @generated
*/
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Token.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Token.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Token.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/main/java/org/apache/uima/fit/examples/type/Token.java Sat Aug 24 15:52:08 2013
@@ -27,7 +27,7 @@ import org.apache.uima.jcas.tcas.Annotat
/**
* Updated by JCasGen Wed Jul 14 10:08:01 MDT 2010 XML source: C:/Users/Philip/Documents
* /Academic/workspace/uimafit-parent/uimaFIT-examples/src
- * /main/resources/org/uimafit/examples/TypeSystem.xml
+ * /main/resources/org/apache/uima/fit/examples/TypeSystem.xml
*
* @generated
*/
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ExamplesTestBase.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ExamplesTestBase.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ExamplesTestBase.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ExamplesTestBase.java Sat Aug 24 15:52:08 2013
@@ -34,10 +34,6 @@ import org.apache.uima.resource.metadata
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.junit.Before;
-/**
- *
- *
- */
public class ExamplesTestBase {
private static ThreadLocal<JCas> JCAS = new ThreadLocal<JCas>();
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotator2Test.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotator2Test.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotator2Test.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ex1/RoomNumberAnnotator2Test.java Sat Aug 24 15:52:08 2013
@@ -31,8 +31,6 @@ import org.junit.Test;
/**
* This class demonstrates some simple tests using uimaFIT using the ExamplesTestBase. These tests
* have the advantage that a new JCas is not created for each test.
- *
- *
*/
public class RoomNumberAnnotator2Test extends ExamplesTestBase {
@@ -52,5 +50,4 @@ public class RoomNumberAnnotator2Test ex
assertEquals("01-144", roomNumber.getCoveredText());
assertEquals("Yorktown", roomNumber.getBuilding());
}
-
}
Added: uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ex6/Example6Test.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ex6/Example6Test.java?rev=1517156&view=auto
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ex6/Example6Test.java (added)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ex6/Example6Test.java Sat Aug 24 15:52:08 2013
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.uima.fit.examples.tutorial.ex6;
+
+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.ExternalResourceFactory.createExternalResourceDescription;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.apache.uima.analysis_engine.AnalysisEngine;
+import org.apache.uima.fit.examples.tutorial.type.Meeting;
+import org.apache.uima.fit.examples.tutorial.type.UimaAcronym;
+import org.apache.uima.fit.examples.tutorial.type.UimaMeeting;
+import org.apache.uima.fit.factory.AggregateBuilder;
+import org.apache.uima.fit.util.JCasUtil;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.resource.ExternalResourceDescription;
+import org.junit.Test;
+
+public class Example6Test {
+
+ @Test
+ public void test1() throws Exception {
+ // This resource is shared between the UimaAcronymAnnotator and UimaMeetingAnnotator
+ ExternalResourceDescription resource = createExternalResourceDescription(
+ StringMapResource_impl.class,
+ "file:src/main/resources/org/apache/uima/fit/examples/tutorial/ex6/uimaAcronyms.txt");
+
+ AggregateBuilder builder = new AggregateBuilder();
+ builder.add(createEngineDescription(UimaAcronymAnnotator.class,
+ UimaAcronymAnnotator.RES_ACRONYM_TABLE, resource));
+ builder.add(createEngineDescription(UimaMeetingAnnotator.class,
+ UimaMeetingAnnotator.RES_UIMA_TERM_TABLE, resource));
+ AnalysisEngine engine = createEngine(builder.createAggregateDescription());
+
+ JCas jCas = engine.newJCas();
+ jCas.setDocumentText("Let's meet to talk about the CPE. The meeting is over at Yorktown 01-144");
+ new Meeting(jCas, 0, 33).addToIndexes();
+
+ engine.process(jCas);
+
+ UimaAcronym uimaAcronym = JCasUtil.selectByIndex(jCas, UimaAcronym.class, 0);
+ assertNotNull(uimaAcronym);
+ assertEquals("CPE", uimaAcronym.getCoveredText());
+ assertEquals("Collection Processing Engine", uimaAcronym.getExpandedForm());
+
+ UimaMeeting uimaMeeting = JCasUtil.selectByIndex(jCas, UimaMeeting.class, 0);
+ assertNotNull(uimaMeeting);
+ assertEquals("Let's meet to talk about the CPE.", uimaMeeting.getCoveredText());
+ }
+}
Propchange: uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/tutorial/ex6/Example6Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/xmi/XmiTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/xmi/XmiTest.java?rev=1517156&r1=1517155&r2=1517156&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/xmi/XmiTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit-examples/src/test/java/org/apache/uima/fit/examples/xmi/XmiTest.java Sat Aug 24 15:52:08 2013
@@ -18,7 +18,6 @@
*/
package org.apache.uima.fit.examples.xmi;
-import static org.apache.uima.fit.factory.TypeSystemDescriptionFactory.createTypeSystemDescription;
import static org.apache.uima.fit.util.JCasUtil.select;
import static org.junit.Assert.assertEquals;
@@ -34,15 +33,12 @@ import org.apache.uima.fit.factory.JCasF
import org.apache.uima.fit.pipeline.SimplePipeline;
import org.apache.uima.fit.util.JCasUtil;
import org.apache.uima.jcas.JCas;
-import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.junit.Test;
/**
* This test demonstrates testing a "downstream" AnalysisEngine by means of an XMI-serialized CAS.
* Here we have two "upstream" analysis engines, Annotator1 and Annotator2, which add annotations
* used by Annotator3.
- *
- *
*/
public class XmiTest extends ExamplesTestBase {
@@ -76,8 +72,8 @@ public class XmiTest extends ExamplesTes
* Annotator3 manually, but this approach can be tedious, time consuming, error prone, and results
* in a lot of code.
* <p>
- * The xmi file is generated once by running {@link #main(String[])}. Hopefully, it will not be
- * necessary to regenerate the xmi file often.
+ * The XMI file is generated once by running {@link #main(String[])}. Hopefully, it will not be
+ * necessary to regenerate the XMI file often.
*/
@Test
public void testWithXmi() throws Exception {
@@ -91,16 +87,15 @@ public class XmiTest extends ExamplesTes
}
/**
- * Here we generate an xmi file that will be used by {@link #testWithXmi()}.
+ * Here we generate an XMI file that will be used by {@link #testWithXmi()}.
*/
public static void main(String[] args) throws Exception {
- TypeSystemDescription tsd = createTypeSystemDescription("org.apache.uima.fit.examples.TypeSystem");
- AnalysisEngine a1 = AnalysisEngineFactory.createEngine(Annotator1.class, tsd);
- AnalysisEngine a2 = AnalysisEngineFactory.createEngine(Annotator2.class, tsd);
- AnalysisEngine xWriter = AnalysisEngineFactory.createEngine(XWriter.class, tsd,
+ AnalysisEngine a1 = AnalysisEngineFactory.createEngine(Annotator1.class);
+ AnalysisEngine a2 = AnalysisEngineFactory.createEngine(Annotator2.class);
+ AnalysisEngine xWriter = AnalysisEngineFactory.createEngine(XWriter.class,
XWriter.PARAM_OUTPUT_DIRECTORY_NAME,
"src/main/resources/org/apache/uima/fit/examples/xmi");
- JCas jCas = JCasFactory.createJCas(tsd);
+ JCas jCas = JCasFactory.createJCas();
jCas.setDocumentText("betgetjetletmetnetpetsetvetwetyet");
a1.process(jCas);
a2.process(jCas);
@@ -134,7 +129,7 @@ public class XmiTest extends ExamplesTes
}
/**
- * creates a sentence from the begining of each token whose pos tag is "m" to the end of the text.
+ * creates a sentence from the beginning of each token whose pos tag is "m" to the end of the text.
*/
public static class Annotator3 extends JCasAnnotator_ImplBase {
@Override
@@ -146,5 +141,4 @@ public class XmiTest extends ExamplesTes
}
}
}
-
}