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 2012/12/25 15:50:10 UTC
svn commit: r1425748 [5/5] - in /uima/sandbox/uimafit/trunk:
uimafit-examples/src/main/java/org/apache/
uimafit-examples/src/main/java/org/apache/uima/
uimafit-examples/src/main/java/org/apache/uima/fit/
uimafit-examples/src/main/java/org/apache/uima/f...
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/JCasBuilderTest.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/JCasBuilderTest.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/JCasBuilderTest.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/JCasBuilderTest.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/JCasBuilderTest.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/JCasBuilderTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/JCasBuilderTest.java Tue Dec 25 14:50:04 2012
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory;
+package org.apache.uima.fit.factory;
import static org.apache.commons.io.FileUtils.readFileToString;
import static org.apache.uima.fit.factory.AnalysisEngineFactory.createPrimitive;
@@ -26,13 +26,12 @@ import java.io.File;
import org.apache.uima.analysis_engine.AnalysisEngine;
import org.apache.uima.fit.ComponentTestBase;
-import org.apache.uima.fit.factory.JCasBuilder;
+import org.apache.uima.fit.component.xwriter.CASDumpWriter;
+import org.apache.uima.fit.type.Sentence;
+import org.apache.uima.fit.type.Token;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import org.uimafit.component.xwriter.CASDumpWriter;
-import org.uimafit.type.Sentence;
-import org.uimafit.type.Token;
/**
* @author Richard Eckart de Castilho
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/JCasBuilderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/JCasFactoryTest.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/JCasFactoryTest.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/JCasFactoryTest.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/JCasFactoryTest.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/JCasFactoryTest.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/JCasFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/JCasFactoryTest.java Tue Dec 25 14:50:04 2012
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory;
+package org.apache.uima.fit.factory;
import static org.junit.Assert.assertEquals;
@@ -22,11 +22,9 @@ import java.io.IOException;
import org.apache.uima.UIMAException;
import org.apache.uima.fit.ComponentTestBase;
-import org.apache.uima.fit.factory.AnnotationFactory;
-import org.apache.uima.fit.factory.JCasFactory;
+import org.apache.uima.fit.type.Token;
import org.apache.uima.fit.util.JCasUtil;
import org.junit.Test;
-import org.uimafit.type.Token;
/**
* @author Steven Bethard, Philip Ogren
@@ -52,9 +50,9 @@ public class JCasFactoryTest extends Com
@Test
public void testFromPath() throws UIMAException {
jCas = JCasFactory.createJCasFromPath(
- "src/test/resources/org/uimafit/type/AnalyzedText.xml",
- "src/test/resources/org/uimafit/type/Sentence.xml",
- "src/test/resources/org/uimafit/type/Token.xml");
+ "src/test/resources/org/apache/uima/fit/type/AnalyzedText.xml",
+ "src/test/resources/org/apache/uima/fit/type/Sentence.xml",
+ "src/test/resources/org/apache/uima/fit/type/Token.xml");
jCas.setDocumentText("For great 20 minute talks, check out TED.com.");
AnnotationFactory.createAnnotation(jCas, 0, 3, Token.class);
assertEquals("For", JCasUtil.selectByIndex(jCas, Token.class, 0).getCoveredText());
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/JCasFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/LoggingTest.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/LoggingTest.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/LoggingTest.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/LoggingTest.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/LoggingTest.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/LoggingTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/LoggingTest.java Tue Dec 25 14:50:04 2012
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory;
+package org.apache.uima.fit.factory;
import static org.apache.uima.fit.factory.AnalysisEngineFactory.createPrimitive;
import static org.apache.uima.fit.factory.CollectionReaderFactory.createCollectionReader;
@@ -36,24 +36,23 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.cas.AbstractCas;
import org.apache.uima.cas.CAS;
import org.apache.uima.collection.CollectionException;
-import org.apache.uima.fit.factory.JCasFactory;
+import org.apache.uima.fit.component.CasAnnotator_ImplBase;
+import org.apache.uima.fit.component.CasCollectionReader_ImplBase;
+import org.apache.uima.fit.component.CasConsumer_ImplBase;
+import org.apache.uima.fit.component.CasFlowController_ImplBase;
+import org.apache.uima.fit.component.CasMultiplier_ImplBase;
+import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
+import org.apache.uima.fit.component.JCasCollectionReader_ImplBase;
+import org.apache.uima.fit.component.JCasConsumer_ImplBase;
+import org.apache.uima.fit.component.JCasFlowController_ImplBase;
+import org.apache.uima.fit.component.JCasMultiplier_ImplBase;
+import org.apache.uima.fit.component.Resource_ImplBase;
import org.apache.uima.flow.Flow;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceSpecifier;
import org.apache.uima.util.Progress;
import org.junit.Test;
-import org.uimafit.component.CasAnnotator_ImplBase;
-import org.uimafit.component.CasCollectionReader_ImplBase;
-import org.uimafit.component.CasConsumer_ImplBase;
-import org.uimafit.component.CasFlowController_ImplBase;
-import org.uimafit.component.CasMultiplier_ImplBase;
-import org.uimafit.component.JCasAnnotator_ImplBase;
-import org.uimafit.component.JCasCollectionReader_ImplBase;
-import org.uimafit.component.JCasConsumer_ImplBase;
-import org.uimafit.component.JCasFlowController_ImplBase;
-import org.uimafit.component.JCasMultiplier_ImplBase;
-import org.uimafit.component.Resource_ImplBase;
/**
* @author Richard Eckart de Castilho
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/LoggingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ResourceCreationSpecifierFactoryTest.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/ResourceCreationSpecifierFactoryTest.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ResourceCreationSpecifierFactoryTest.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ResourceCreationSpecifierFactoryTest.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/ResourceCreationSpecifierFactoryTest.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/ResourceCreationSpecifierFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ResourceCreationSpecifierFactoryTest.java Tue Dec 25 14:50:04 2012
@@ -14,15 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory;
+package org.apache.uima.fit.factory;
import java.awt.Point;
-import org.apache.uima.fit.factory.ResourceCreationSpecifierFactory;
-import org.apache.uima.fit.factory.UimaContextFactory;
+import org.apache.uima.fit.factory.testAes.ParameterizedAE;
import org.apache.uima.resource.ResourceCreationSpecifier;
import org.junit.Test;
-import org.uimafit.factory.testAes.ParameterizedAE;
/**
* @author Steven Bethard, Philip Ogren
@@ -34,7 +32,7 @@ public class ResourceCreationSpecifierFa
@Test(expected = IllegalArgumentException.class)
public void test4() throws Exception {
ResourceCreationSpecifierFactory.createResourceCreationSpecifier(
- "src/main/resources/org/uimafit/component/NoOpAnnotator.xml",
+ "src/main/resources/org/apache/uima/fit/component/NoOpAnnotator.xml",
new String[] { "test" });
}
@@ -46,7 +44,7 @@ public class ResourceCreationSpecifierFa
@Test(expected = IllegalArgumentException.class)
public void test2() throws Exception {
ResourceCreationSpecifierFactory.createResourceCreationSpecifier(
- "src/main/resources/org/uimafit/component/NoOpAnnotator.xml",
+ "src/main/resources/org/apache/uima/fit/component/NoOpAnnotator.xml",
new Object[] { "test", new Point(0, 5) });
}
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/ResourceCreationSpecifierFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/SofaMappingFactoryTest.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/SofaMappingFactoryTest.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/SofaMappingFactoryTest.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/SofaMappingFactoryTest.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/SofaMappingFactoryTest.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/SofaMappingFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/SofaMappingFactoryTest.java Tue Dec 25 14:50:04 2012
@@ -14,14 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory;
+package org.apache.uima.fit.factory;
import static org.junit.Assert.assertEquals;
import org.apache.uima.analysis_engine.metadata.SofaMapping;
-import org.apache.uima.fit.factory.SofaMappingFactory;
+import org.apache.uima.fit.component.NoOpAnnotator;
import org.junit.Test;
-import org.uimafit.component.NoOpAnnotator;
/**
* @author Philip Ogren
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/SofaMappingFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/TypePrioritiesFactoryTest.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/TypePrioritiesFactoryTest.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/TypePrioritiesFactoryTest.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/TypePrioritiesFactoryTest.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/TypePrioritiesFactoryTest.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/TypePrioritiesFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/TypePrioritiesFactoryTest.java Tue Dec 25 14:50:04 2012
@@ -17,13 +17,12 @@
limitations under the License.
*/
-package org.uimafit.factory;
+package org.apache.uima.fit.factory;
import static org.apache.uima.fit.factory.TypePrioritiesFactory.createTypePriorities;
import static org.apache.uima.fit.factory.TypeSystemDescriptionFactory.createTypeSystemDescription;
import static org.junit.Assert.assertEquals;
-import org.apache.uima.fit.factory.TypePrioritiesFactory;
import org.apache.uima.jcas.tcas.Annotation;
import org.apache.uima.resource.metadata.TypePriorities;
import org.apache.uima.util.CasCreationUtils;
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/TypePrioritiesFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactoryTest.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/TypeSystemDescriptionFactoryTest.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactoryTest.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactoryTest.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/TypeSystemDescriptionFactoryTest.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/TypeSystemDescriptionFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactoryTest.java Tue Dec 25 14:50:04 2012
@@ -14,18 +14,17 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory;
+package org.apache.uima.fit.factory;
-import org.apache.uima.fit.factory.TypeSystemDescriptionFactory;
+import static org.apache.uima.fit.factory.TypeSystemDescriptionFactory.createTypeSystemDescription;
+import static org.junit.Assert.assertNotNull;
+
+import org.apache.uima.fit.type.AnalyzedText;
+import org.apache.uima.fit.type.Sentence;
+import org.apache.uima.fit.type.Token;
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.junit.Test;
-import org.uimafit.type.AnalyzedText;
-import org.uimafit.type.Sentence;
-import org.uimafit.type.Token;
-
-import static org.apache.uima.fit.factory.TypeSystemDescriptionFactory.createTypeSystemDescription;
-import static org.junit.Assert.*;
/**
* @author Steven Bethard, Philip Ogren
@@ -35,9 +34,9 @@ public class TypeSystemDescriptionFactor
@Test
public void testFromPath() throws Exception {
TypeSystemDescriptionFactory.createTypeSystemDescriptionFromPath(
- "src/test/resources/org/uimafit/type/AnalyzedText.xml",
- "src/test/resources/org/uimafit/type/Sentence.xml",
- "src/test/resources/org/uimafit/type/Token.xml").resolveImports();
+ "src/test/resources/org/apache/uima/fit/type/AnalyzedText.xml",
+ "src/test/resources/org/apache/uima/fit/type/Sentence.xml",
+ "src/test/resources/org/apache/uima/fit/type/Token.xml").resolveImports();
}
@Test
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/TypeSystemDescriptionFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/UimaContextFactoryTest.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/UimaContextFactoryTest.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/UimaContextFactoryTest.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/UimaContextFactoryTest.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/UimaContextFactoryTest.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/UimaContextFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/UimaContextFactoryTest.java Tue Dec 25 14:50:04 2012
@@ -14,12 +14,11 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory;
+package org.apache.uima.fit.factory;
import static org.junit.Assert.assertEquals;
import org.apache.uima.UimaContext;
-import org.apache.uima.fit.factory.UimaContextFactory;
import org.apache.uima.resource.ResourceInitializationException;
import org.junit.Test;
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/UimaContextFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/initializable/InitializableFactoryTest.java Tue Dec 25 14:50:04 2012
@@ -23,15 +23,13 @@ import static org.junit.Assert.assertTru
import org.apache.uima.UimaContext;
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
+import org.apache.uima.fit.component.xwriter.XWriterFileNamer;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.fit.factory.UimaContextFactory;
-import org.apache.uima.fit.factory.initializable.Initializable;
-import org.apache.uima.fit.factory.initializable.InitializableFactory;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
import org.junit.Test;
-import org.uimafit.component.xwriter.XWriterFileNamer;
/**
* @author Philip Ogren
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator1.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/Annotator1.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator1.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator1.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/Annotator1.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/Annotator1.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator1.java Tue Dec 25 14:50:04 2012
@@ -14,15 +14,15 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory.testAes;
+package org.apache.uima.fit.factory.testAes;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.CASException;
+import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
+import org.apache.uima.fit.component.ViewCreatorAnnotator;
import org.apache.uima.fit.descriptor.SofaCapability;
import org.apache.uima.jcas.JCas;
-import org.uimafit.component.JCasAnnotator_ImplBase;
-import org.uimafit.component.ViewCreatorAnnotator;
/**
* @author Philip Ogren
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator1.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator2.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/Annotator2.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator2.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator2.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/Annotator2.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/Annotator2.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator2.java Tue Dec 25 14:50:04 2012
@@ -14,17 +14,17 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory.testAes;
+package org.apache.uima.fit.factory.testAes;
import java.util.Arrays;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.CASException;
+import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
+import org.apache.uima.fit.component.ViewCreatorAnnotator;
import org.apache.uima.fit.descriptor.SofaCapability;
import org.apache.uima.jcas.JCas;
-import org.uimafit.component.JCasAnnotator_ImplBase;
-import org.uimafit.component.ViewCreatorAnnotator;
/**
* @author Philip Ogren
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator2.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator3.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/Annotator3.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator3.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator3.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/Annotator3.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/Annotator3.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator3.java Tue Dec 25 14:50:04 2012
@@ -14,15 +14,15 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory.testAes;
+package org.apache.uima.fit.factory.testAes;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.CASException;
+import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
+import org.apache.uima.fit.component.ViewCreatorAnnotator;
import org.apache.uima.fit.descriptor.SofaCapability;
import org.apache.uima.jcas.JCas;
-import org.uimafit.component.JCasAnnotator_ImplBase;
-import org.uimafit.component.ViewCreatorAnnotator;
/**
* @author Philip Ogren
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator3.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator4.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/Annotator4.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator4.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator4.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/Annotator4.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/Annotator4.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator4.java Tue Dec 25 14:50:04 2012
@@ -15,22 +15,22 @@
limitations under the License.
*/
-package org.uimafit.factory.testAes;
+package org.apache.uima.fit.factory.testAes;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.FSIterator;
+import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
import org.apache.uima.fit.descriptor.TypeCapability;
+import org.apache.uima.fit.type.Token;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.tcas.Annotation;
-import org.uimafit.component.JCasAnnotator_ImplBase;
-import org.uimafit.type.Token;
/**
*
* @author Philip Ogren
*
*/
-@TypeCapability(inputs = "org.uimafit.type.Token", outputs = "org.uimafit.type.Token:pos")
+@TypeCapability(inputs = "org.apache.uima.fit.type.Token", outputs = "org.apache.uima.fit.type.Token:pos")
public class Annotator4 extends JCasAnnotator_ImplBase {
@Override
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/Annotator4.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE1.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/FlowAE1.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE1.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE1.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/FlowAE1.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/FlowAE1.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE1.java Tue Dec 25 14:50:04 2012
@@ -14,12 +14,12 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory.testAes;
+package org.apache.uima.fit.factory.testAes;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
+import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
import org.apache.uima.fit.util.TypeSystemUtil;
import org.apache.uima.jcas.JCas;
-import org.uimafit.component.JCasAnnotator_ImplBase;
/**
* @author Philip Ogren
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE1.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE2.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/FlowAE2.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE2.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE2.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/FlowAE2.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/FlowAE2.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE2.java Tue Dec 25 14:50:04 2012
@@ -14,14 +14,14 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory.testAes;
+package org.apache.uima.fit.factory.testAes;
import java.util.Arrays;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
+import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
import org.apache.uima.fit.util.TypeSystemUtil;
import org.apache.uima.jcas.JCas;
-import org.uimafit.component.JCasAnnotator_ImplBase;
/**
* @author Philip Ogren
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE2.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE3.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/FlowAE3.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE3.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE3.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/FlowAE3.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/FlowAE3.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE3.java Tue Dec 25 14:50:04 2012
@@ -14,12 +14,12 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory.testAes;
+package org.apache.uima.fit.factory.testAes;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
+import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
import org.apache.uima.fit.util.TypeSystemUtil;
import org.apache.uima.jcas.JCas;
-import org.uimafit.component.JCasAnnotator_ImplBase;
/**
* @author Philip Ogren
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/FlowAE3.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/ParameterizedAE.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/ParameterizedAE.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/ParameterizedAE.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE.java Tue Dec 25 14:50:04 2012
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory.testAes;
+package org.apache.uima.fit.factory.testAes;
import java.io.File;
import java.util.LinkedList;
@@ -24,10 +24,10 @@ import java.util.regex.Pattern;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
+import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.fit.descriptor.SofaCapability;
import org.apache.uima.jcas.JCas;
-import org.uimafit.component.JCasAnnotator_ImplBase;
/**
* @author Philip Ogren
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE2.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/ParameterizedAE2.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE2.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE2.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/ParameterizedAE2.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/ParameterizedAE2.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE2.java Tue Dec 25 14:50:04 2012
@@ -17,13 +17,13 @@
limitations under the License.
*/
-package org.uimafit.factory.testAes;
+package org.apache.uima.fit.factory.testAes;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
+import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
import org.apache.uima.fit.descriptor.ExternalResource;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.Resource_ImplBase;
-import org.uimafit.component.JCasAnnotator_ImplBase;
/**
* Parametrized AE for testing {@link ExternalResource} annotations.
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ParameterizedAE2.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/ReversableTestFlowController.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/ReversableTestFlowController.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/ReversableTestFlowController.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java Tue Dec 25 14:50:04 2012
@@ -15,7 +15,7 @@
limitations under the License.
*/
-package org.uimafit.factory.testAes;
+package org.apache.uima.fit.factory.testAes;
import java.util.ArrayList;
import java.util.Collections;
@@ -41,7 +41,7 @@ import org.apache.uima.jcas.JCas;
* NOTE: this class extends org.uimafit.component.JCasFlowController_ImplBase
*/
-public class ReversableTestFlowController extends org.uimafit.component.JCasFlowController_ImplBase {
+public class ReversableTestFlowController extends org.apache.uima.fit.component.JCasFlowController_ImplBase {
public static final String PARAM_REVERSE_ORDER = ConfigurationParameterFactory
.createConfigurationParameterName(ReversableTestFlowController.class, "reverseOrder");
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ReversableTestFlowController.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ViewNames.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/ViewNames.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ViewNames.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ViewNames.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/ViewNames.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testAes/ViewNames.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ViewNames.java Tue Dec 25 14:50:04 2012
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory.testAes;
+package org.apache.uima.fit.factory.testAes;
import org.apache.uima.cas.CAS;
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testAes/ViewNames.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testCrs/SingleFileXReader.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testCrs/SingleFileXReader.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testCrs/SingleFileXReader.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java Tue Dec 25 14:50:04 2012
@@ -15,7 +15,7 @@
limitations under the License.
*/
-package org.uimafit.factory.testCrs;
+package org.apache.uima.fit.factory.testCrs;
import java.io.File;
import java.io.FileInputStream;
@@ -26,12 +26,12 @@ import org.apache.uima.cas.CAS;
import org.apache.uima.cas.impl.XCASDeserializer;
import org.apache.uima.cas.impl.XmiCasDeserializer;
import org.apache.uima.collection.CollectionException;
+import org.apache.uima.fit.component.CasCollectionReader_ImplBase;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.fit.factory.ConfigurationParameterFactory;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.util.Progress;
import org.apache.uima.util.ProgressImpl;
-import org.uimafit.component.CasCollectionReader_ImplBase;
import org.xml.sax.SAXException;
/**
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReader.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReaderTest.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testCrs/SingleFileXReaderTest.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReaderTest.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReaderTest.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testCrs/SingleFileXReaderTest.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testCrs/SingleFileXReaderTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReaderTest.java Tue Dec 25 14:50:04 2012
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory.testCrs;
+package org.apache.uima.fit.factory.testCrs;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testCrs/SingleFileXReaderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testRes/TestExternalResource.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testRes/TestExternalResource.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testRes/TestExternalResource.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testRes/TestExternalResource.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testRes/TestExternalResource.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testRes/TestExternalResource.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testRes/TestExternalResource.java Tue Dec 25 14:50:04 2012
@@ -16,12 +16,12 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory.testRes;
+package org.apache.uima.fit.factory.testRes;
import static org.junit.Assert.assertEquals;
+import org.apache.uima.fit.component.Resource_ImplBase;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
-import org.uimafit.component.Resource_ImplBase;
/**
* @author Richard Eckart de Castilho
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testRes/TestExternalResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testRes/TestSharedResourceObject.java (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testRes/TestSharedResourceObject.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testRes/TestSharedResourceObject.java?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testRes/TestSharedResourceObject.java&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testRes/TestSharedResourceObject.java&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/uimafit/factory/testRes/TestSharedResourceObject.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testRes/TestSharedResourceObject.java Tue Dec 25 14:50:04 2012
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-package org.uimafit.factory.testRes;
+package org.apache.uima.fit.factory.testRes;
import static org.junit.Assert.assertEquals;
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/testRes/TestSharedResourceObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/pipeline/CpePipelineTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/pipeline/CpePipelineTest.java?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/pipeline/CpePipelineTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/pipeline/CpePipelineTest.java Tue Dec 25 14:50:04 2012
@@ -26,7 +26,6 @@ import junit.framework.Assert;
import org.apache.uima.fit.factory.AnalysisEngineFactory;
import org.apache.uima.fit.factory.CollectionReaderFactory;
-import org.apache.uima.fit.pipeline.CpePipeline;
import org.apache.uima.fit.pipeline.SimplePipelineTest.Annotator;
import org.apache.uima.fit.pipeline.SimplePipelineTest.Reader;
import org.apache.uima.fit.pipeline.SimplePipelineTest.Writer;
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/pipeline/SimplePipelineTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/pipeline/SimplePipelineTest.java?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/pipeline/SimplePipelineTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/pipeline/SimplePipelineTest.java Tue Dec 25 14:50:04 2012
@@ -26,17 +26,16 @@ import junit.framework.Assert;
import org.apache.uima.UimaContext;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.collection.CollectionException;
+import org.apache.uima.fit.component.JCasAnnotator_ImplBase;
+import org.apache.uima.fit.component.JCasCollectionReader_ImplBase;
import org.apache.uima.fit.factory.AnalysisEngineFactory;
import org.apache.uima.fit.factory.CollectionReaderFactory;
-import org.apache.uima.fit.pipeline.SimplePipeline;
+import org.apache.uima.fit.type.Sentence;
import org.apache.uima.fit.util.JCasUtil;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.util.Progress;
import org.junit.Test;
-import org.uimafit.component.JCasAnnotator_ImplBase;
-import org.uimafit.component.JCasCollectionReader_ImplBase;
-import org.uimafit.type.Sentence;
/**
* @author Steven Bethard
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/testing/factory/TokenBuilderTest.java Tue Dec 25 14:50:04 2012
@@ -28,13 +28,13 @@ import org.apache.uima.UIMAException;
import org.apache.uima.cas.FSIndex;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.fit.ComponentTestBase;
+import org.apache.uima.fit.type.Sentence;
+import org.apache.uima.fit.type.Token;
import org.apache.uima.fit.util.JCasUtil;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.tcas.Annotation;
import org.apache.uima.pear.util.FileUtil;
import org.junit.Test;
-import org.uimafit.type.Sentence;
-import org.uimafit.type.Token;
/**
* @author Steven Bethard, Philip Ogren
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/CasUtilTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/CasUtilTest.java?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/CasUtilTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/CasUtilTest.java Tue Dec 25 14:50:04 2012
@@ -40,11 +40,10 @@ import org.apache.uima.cas.FeatureStruct
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.fit.ComponentTestBase;
-import org.apache.uima.fit.util.JCasUtil;
+import org.apache.uima.fit.type.Token;
import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.jcas.tcas.Annotation;
import org.junit.Test;
-import org.uimafit.type.Token;
/**
* Test cases for {@link JCasUtil}.
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/ContainmentIndexTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/ContainmentIndexTest.java?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/ContainmentIndexTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/ContainmentIndexTest.java Tue Dec 25 14:50:04 2012
@@ -30,11 +30,10 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.uima.fit.ComponentTestBase;
-import org.apache.uima.fit.util.ContainmentIndex;
+import org.apache.uima.fit.type.Sentence;
+import org.apache.uima.fit.type.Token;
import org.apache.uima.fit.util.ContainmentIndex.Type;
import org.junit.Test;
-import org.uimafit.type.Sentence;
-import org.uimafit.type.Token;
/**
* Unit test for {@link ContainmentIndex}.
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/FSCollectionFactoryTest.java Tue Dec 25 14:50:04 2012
@@ -22,18 +22,32 @@ package org.apache.uima.fit.util;
import static java.util.Arrays.asList;
import static org.apache.commons.lang.ArrayUtils.toObject;
-import static org.apache.uima.fit.util.FSCollectionFactory.*;
+import static org.apache.uima.fit.util.FSCollectionFactory.create;
+import static org.apache.uima.fit.util.FSCollectionFactory.createBooleanArray;
+import static org.apache.uima.fit.util.FSCollectionFactory.createByteArray;
+import static org.apache.uima.fit.util.FSCollectionFactory.createDoubleArray;
+import static org.apache.uima.fit.util.FSCollectionFactory.createFSArray;
+import static org.apache.uima.fit.util.FSCollectionFactory.createFSList;
+import static org.apache.uima.fit.util.FSCollectionFactory.createFloatArray;
+import static org.apache.uima.fit.util.FSCollectionFactory.createFloatList;
+import static org.apache.uima.fit.util.FSCollectionFactory.createIntArray;
+import static org.apache.uima.fit.util.FSCollectionFactory.createIntegerList;
+import static org.apache.uima.fit.util.FSCollectionFactory.createLongArray;
+import static org.apache.uima.fit.util.FSCollectionFactory.createShortArray;
+import static org.apache.uima.fit.util.FSCollectionFactory.createStringArray;
+import static org.apache.uima.fit.util.FSCollectionFactory.createStringList;
import static org.junit.Assert.assertEquals;
+
import java.util.ArrayList;
import java.util.Collection;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.fit.factory.JCasFactory;
+import org.apache.uima.fit.type.Token;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.tcas.Annotation;
import org.junit.Before;
import org.junit.Test;
-import org.uimafit.type.Token;
/**
* @author Richard Eckart de Castilho
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java Tue Dec 25 14:50:04 2012
@@ -58,7 +58,9 @@ import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.Type;
import org.apache.uima.fit.ComponentTestBase;
-import org.apache.uima.fit.util.JCasUtil;
+import org.apache.uima.fit.type.AnalyzedText;
+import org.apache.uima.fit.type.Sentence;
+import org.apache.uima.fit.type.Token;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.cas.EmptyFSList;
import org.apache.uima.jcas.cas.FSArray;
@@ -67,9 +69,6 @@ import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.jcas.tcas.Annotation;
import org.apache.uima.util.CasCreationUtils;
import org.junit.Test;
-import org.uimafit.type.AnalyzedText;
-import org.uimafit.type.Sentence;
-import org.uimafit.type.Token;
/**
* Test cases for {@link JCasUtil}.
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/SimplePipelineTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/SimplePipelineTest.java?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/SimplePipelineTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/SimplePipelineTest.java Tue Dec 25 14:50:04 2012
@@ -24,11 +24,11 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.fit.ComponentTestBase;
import org.apache.uima.fit.factory.AnalysisEngineFactory;
import org.apache.uima.fit.factory.JCasFactory;
+import org.apache.uima.fit.factory.testAes.Annotator1;
+import org.apache.uima.fit.factory.testAes.Annotator2;
+import org.apache.uima.fit.factory.testAes.Annotator3;
import org.apache.uima.fit.pipeline.SimplePipeline;
import org.junit.Test;
-import org.uimafit.factory.testAes.Annotator1;
-import org.uimafit.factory.testAes.Annotator2;
-import org.uimafit.factory.testAes.Annotator3;
/**
* @author Philip Ogren
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/TypeSystemUtil.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/TypeSystemUtil.java?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/TypeSystemUtil.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/util/TypeSystemUtil.java Tue Dec 25 14:50:04 2012
@@ -16,9 +16,8 @@
*/
package org.apache.uima.fit.util;
-import org.apache.uima.fit.util.JCasUtil;
+import org.apache.uima.fit.type.AnalyzedText;
import org.apache.uima.jcas.JCas;
-import org.uimafit.type.AnalyzedText;
/**
* @author Philip Ogren
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/META-INF/org.uimafit/fsindexes.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/resources/META-INF/org.uimafit/fsindexes.txt?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/resources/META-INF/org.uimafit/fsindexes.txt (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/resources/META-INF/org.uimafit/fsindexes.txt Tue Dec 25 14:50:04 2012
@@ -1 +1 @@
-classpath*:org/uimafit/index/**/*.xml
+classpath*:org/apache/uima/fit/index/**/*.xml
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/META-INF/org.uimafit/types.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/resources/META-INF/org.uimafit/types.txt?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/resources/META-INF/org.uimafit/types.txt (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/resources/META-INF/org.uimafit/types.txt Tue Dec 25 14:50:04 2012
@@ -1 +1 @@
-classpath*:org/uimafit/type/**/*.xml
+classpath*:org/apache/uima/fit/type/**/*.xml
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/descriptor/DefaultValueAE1.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/descriptor/DefaultValueAE1.xml?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/descriptor/DefaultValueAE1.xml (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/descriptor/DefaultValueAE1.xml Tue Dec 25 14:50:04 2012
@@ -2,7 +2,7 @@
<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
<primitive>true</primitive>
- <annotatorImplementationName>org.uimafit.component.initialize.ConfigurationParameterInitializerTest$DefaultValueAE1</annotatorImplementationName>
+ <annotatorImplementationName>org.apache.uima.fit.component.initialize.ConfigurationParameterInitializerTest$DefaultValueAE1</annotatorImplementationName>
<analysisEngineMetaData>
<name/>
<configurationParameters/>
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/descriptor/DefaultValueAE2.xml
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/descriptor/DefaultValueAE2.xml?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/descriptor/DefaultValueAE2.xml (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/descriptor/DefaultValueAE2.xml Tue Dec 25 14:50:04 2012
@@ -2,7 +2,7 @@
<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
<primitive>true</primitive>
- <annotatorImplementationName>org.uimafit.component.initialize.ConfigurationParameterInitializerTest$DefaultValueAE2</annotatorImplementationName>
+ <annotatorImplementationName>org.apache.uima.fit.component.initialize.ConfigurationParameterInitializerTest$DefaultValueAE2</annotatorImplementationName>
<analysisEngineMetaData>
<name/>
<configurationParameters/>
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/docs/test.xcas
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/docs/test.xcas?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/docs/test.xcas (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/docs/test.xcas Tue Dec 25 14:50:04 2012
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><CAS version="2"><uima.cas.Sofa _indexed="0" _id="1" sofaNum="1" sofaID="_InitialView" mimeType="text" sofaString="... the more knowledge advances the more it becomes possible to condense it into little books."/><uima.tcas.DocumentAnnotation _indexed="1" _id="8" _ref_sofa="1" begin="0" end="94" language="x-unspecified"/><org.uimafit.type.Token _indexed="1" _id="13" _ref_sofa="1" begin="0" end="3" pos="." stem="..."/><org.uimafit.type.Token _indexed="1" _id="19" _ref_sofa="1" begin="4" end="7" pos="T" stem="the"/><org.uimafit.type.Token _indexed="1" _id="25" _ref_sofa="1" begin="8" end="12" pos="M" stem="more"/><org.uimafit.type.Token _indexed="1" _id="31" _ref_sofa="1" begin="13" end="22" pos="K" stem="knowledge"/><org.uimafit.type.Token _indexed="1" _id="37" _ref_sofa="1" begin="23" end="31" pos="A" stem="advance"/><org.uimafit.type.Token _indexed="1" _id="43" _ref_sofa="1" begin="32" end="35" pos="T" stem="the"/><org.uimafit.type.Token
_indexed="1" _id="49" _ref_sofa="1" begin="36" end="40" pos="M" stem="more"/><org.uimafit.type.Token _indexed="1" _id="55" _ref_sofa="1" begin="41" end="43" pos="I" stem="it"/><org.uimafit.type.Token _indexed="1" _id="61" _ref_sofa="1" begin="44" end="51" pos="B" stem="become"/><org.uimafit.type.Token _indexed="1" _id="67" _ref_sofa="1" begin="52" end="60" pos="P" stem="possible"/><org.uimafit.type.Token _indexed="1" _id="73" _ref_sofa="1" begin="61" end="63" pos="T" stem="to"/><org.uimafit.type.Token _indexed="1" _id="79" _ref_sofa="1" begin="64" end="72" pos="C" stem="condense"/><org.uimafit.type.Token _indexed="1" _id="85" _ref_sofa="1" begin="73" end="75" pos="I" stem="it"/><org.uimafit.type.Token _indexed="1" _id="91" _ref_sofa="1" begin="76" end="80" pos="I" stem="into"/><org.uimafit.type.Token _indexed="1" _id="97" _ref_sofa="1" begin="81" end="87" pos="L" stem="little"/><org.uimafit.type.Token _indexed="1" _id="103" _ref_sofa="1" begin="88" end="93" pos="B" stem="bo
ok"/><org.uimafit.type.Token _indexed="1" _id="109" _ref_sofa="1" begin="93" end="94" pos="." stem="."/><org.uimafit.type.Sentence _indexed="1" _id="115" _ref_sofa="1" begin="0" end="94"/></CAS>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><CAS version="2"><uima.cas.Sofa _indexed="0" _id="1" sofaNum="1" sofaID="_InitialView" mimeType="text" sofaString="... the more knowledge advances the more it becomes possible to condense it into little books."/><uima.tcas.DocumentAnnotation _indexed="1" _id="8" _ref_sofa="1" begin="0" end="94" language="x-unspecified"/><org.apache.uima.fit.type.Token _indexed="1" _id="13" _ref_sofa="1" begin="0" end="3" pos="." stem="..."/><org.apache.uima.fit.type.Token _indexed="1" _id="19" _ref_sofa="1" begin="4" end="7" pos="T" stem="the"/><org.apache.uima.fit.type.Token _indexed="1" _id="25" _ref_sofa="1" begin="8" end="12" pos="M" stem="more"/><org.apache.uima.fit.type.Token _indexed="1" _id="31" _ref_sofa="1" begin="13" end="22" pos="K" stem="knowledge"/><org.apache.uima.fit.type.Token _indexed="1" _id="37" _ref_sofa="1" begin="23" end="31" pos="A" stem="advance"/><org.apache.uima.fit.type.Token _indexed="1" _id="43" _ref_sofa="1" begin="32" end=
"35" pos="T" stem="the"/><org.apache.uima.fit.type.Token _indexed="1" _id="49" _ref_sofa="1" begin="36" end="40" pos="M" stem="more"/><org.apache.uima.fit.type.Token _indexed="1" _id="55" _ref_sofa="1" begin="41" end="43" pos="I" stem="it"/><org.apache.uima.fit.type.Token _indexed="1" _id="61" _ref_sofa="1" begin="44" end="51" pos="B" stem="become"/><org.apache.uima.fit.type.Token _indexed="1" _id="67" _ref_sofa="1" begin="52" end="60" pos="P" stem="possible"/><org.apache.uima.fit.type.Token _indexed="1" _id="73" _ref_sofa="1" begin="61" end="63" pos="T" stem="to"/><org.apache.uima.fit.type.Token _indexed="1" _id="79" _ref_sofa="1" begin="64" end="72" pos="C" stem="condense"/><org.apache.uima.fit.type.Token _indexed="1" _id="85" _ref_sofa="1" begin="73" end="75" pos="I" stem="it"/><org.apache.uima.fit.type.Token _indexed="1" _id="91" _ref_sofa="1" begin="76" end="80" pos="I" stem="into"/><org.apache.uima.fit.type.Token _indexed="1" _id="97" _ref_sofa="1" begin="81" end="87"
pos="L" stem="little"/><org.apache.uima.fit.type.Token _indexed="1" _id="103" _ref_sofa="1" begin="88" end="93" pos="B" stem="book"/><org.apache.uima.fit.type.Token _indexed="1" _id="109" _ref_sofa="1" begin="93" end="94" pos="." stem="."/><org.apache.uima.fit.type.Sentence _indexed="1" _id="115" _ref_sofa="1" begin="0" end="94"/></CAS>
\ No newline at end of file
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/docs/test.xmi
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/docs/test.xmi?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/docs/test.xmi (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/resources/data/docs/test.xmi Tue Dec 25 14:50:04 2012
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:type="http:///org/uimafit/type.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView" mimeType="text" sofaString="Me and all my friends are non-conformists."/><tcas:DocumentAnnotation xmi:id="8" sofa="1" begin="0" end="42" language="x-unspecified"/><type:Token xmi:id="13" sofa="1" begin="0" end="2" pos="M" stem="me"/><type:Token xmi:id="19" sofa="1" begin="3" end="6" pos="A" stem="and"/><type:Token xmi:id="25" sofa="1" begin="7" end="10" pos="A" stem="all"/><type:Token xmi:id="31" sofa="1" begin="11" end="13" pos="M" stem="my"/><type:Token xmi:id="37" sofa="1" begin="14" end="21" pos="F" stem="friend"/><type:Token xmi:id="43" sofa="1" begin="22" end="25" pos="A" stem="are"/><type:Token xmi:id="49" sofa="1" begin="26" end="29" pos="N" stem="non"/><type:Token xmi:id="55" so
fa="1" begin="29" end="30" pos="-" stem="-"/><type:Token xmi:id="61" sofa="1" begin="30" end="41" pos="C" stem="conformist"/><type:Token xmi:id="67" sofa="1" begin="41" end="42" pos="." stem="."/><type:Sentence xmi:id="73" sofa="1" begin="0" end="42"/><cas:View sofa="1" members="8 13 19 25 31 37 43 49 55 61 67 73"/></xmi:XMI>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:cas="http:///uima/cas.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:type="http:///org/apache/uima/fit/type.ecore" xmlns:tcas="http:///uima/tcas.ecore" xmi:version="2.0"><cas:NULL xmi:id="0"/><cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView" mimeType="text" sofaString="Me and all my friends are non-conformists."/><tcas:DocumentAnnotation xmi:id="8" sofa="1" begin="0" end="42" language="x-unspecified"/><type:Token xmi:id="13" sofa="1" begin="0" end="2" pos="M" stem="me"/><type:Token xmi:id="19" sofa="1" begin="3" end="6" pos="A" stem="and"/><type:Token xmi:id="25" sofa="1" begin="7" end="10" pos="A" stem="all"/><type:Token xmi:id="31" sofa="1" begin="11" end="13" pos="M" stem="my"/><type:Token xmi:id="37" sofa="1" begin="14" end="21" pos="F" stem="friend"/><type:Token xmi:id="43" sofa="1" begin="22" end="25" pos="A" stem="are"/><type:Token xmi:id="49" sofa="1" begin="26" end="29" pos="N" stem="non"/><type:Token xmi:id
="55" sofa="1" begin="29" end="30" pos="-" stem="-"/><type:Token xmi:id="61" sofa="1" begin="30" end="41" pos="C" stem="conformist"/><type:Token xmi:id="67" sofa="1" begin="41" end="42" pos="." stem="."/><type:Sentence xmi:id="73" sofa="1" begin="0" end="42"/><cas:View sofa="1" members="8 13 19 25 31 37 43 49 55 61 67 73"/></xmi:XMI>
\ No newline at end of file
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/factory/testCrs/SingleFileXReader.xml (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/factory/testCrs/SingleFileXReader.xml)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/factory/testCrs/SingleFileXReader.xml?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/factory/testCrs/SingleFileXReader.xml&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/factory/testCrs/SingleFileXReader.xml&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/factory/testCrs/SingleFileXReader.xml (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/factory/testCrs/SingleFileXReader.xml Tue Dec 25 14:50:04 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<collectionReaderDescription xmlns="http://uima.apache.org/resourceSpecifier">
<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
- <implementationName>org.uimafit.factory.testCrs.SingleFileXReader</implementationName>
+ <implementationName>org.apache.uima.fit.factory.testCrs.SingleFileXReader</implementationName>
<processingResourceMetaData>
<name>SingleFileXReader</name>
<description>/*
@@ -24,13 +24,13 @@
<vendor/>
<configurationParameters>
<configurationParameter>
- <name>org.uimafit.factory.testCrs.SingleFileXReader.fileName</name>
+ <name>org.apache.uima.fit.factory.testCrs.SingleFileXReader.fileName</name>
<type>String</type>
<multiValued>false</multiValued>
<mandatory>true</mandatory>
</configurationParameter>
<configurationParameter>
- <name>org.uimafit.factory.testCrs.SingleFileXReader.xmlScheme</name>
+ <name>org.apache.uima.fit.factory.testCrs.SingleFileXReader.xmlScheme</name>
<type>String</type>
<multiValued>false</multiValued>
<mandatory>false</mandatory>
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/factory/testCrs/SingleFileXReader.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/factory/testCrs/SingleFileXReader.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/index/AutoImportableIndex.xml (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/index/AutoImportableIndex.xml)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/index/AutoImportableIndex.xml?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/index/AutoImportableIndex.xml&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/index/AutoImportableIndex.xml&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/index/AutoImportableIndex.xml (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/index/AutoImportableIndex.xml Tue Dec 25 14:50:04 2012
@@ -3,7 +3,7 @@
<fsIndexes>
<fsIndexDescription>
<label>Automatically Scanned Index</label>
- <typeName>org.uimafit.type.Token</typeName>
+ <typeName>org.apache.uima.fit.type.Token</typeName>
<kind>sorted</kind>
<keys>
<fsIndexKey>
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/index/AutoImportableIndex.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/index/AutoImportableIndex.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/AnalyzedText.xml (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/type/AnalyzedText.xml)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/AnalyzedText.xml?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/AnalyzedText.xml&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/type/AnalyzedText.xml&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/type/AnalyzedText.xml (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/AnalyzedText.xml Tue Dec 25 14:50:04 2012
@@ -6,7 +6,7 @@
<vendor/>
<types>
<typeDescription>
- <name>org.uimafit.type.AnalyzedText</name>
+ <name>org.apache.uima.fit.type.AnalyzedText</name>
<description/>
<supertypeName>uima.tcas.Annotation</supertypeName>
<features>
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/AnalyzedText.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/AnalyzedText.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/Sentence.xml (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/type/Sentence.xml)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/Sentence.xml?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/Sentence.xml&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/type/Sentence.xml&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/type/Sentence.xml (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/Sentence.xml Tue Dec 25 14:50:04 2012
@@ -20,7 +20,7 @@
<vendor/>
<types>
<typeDescription>
- <name>org.uimafit.type.Sentence</name>
+ <name>org.apache.uima.fit.type.Sentence</name>
<description/>
<supertypeName>uima.tcas.Annotation</supertypeName>
</typeDescription>
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/Sentence.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/Sentence.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/Token.xml (from r1425747, uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/type/Token.xml)
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/Token.xml?p2=uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/Token.xml&p1=uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/type/Token.xml&r1=1425747&r2=1425748&rev=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/uimafit/type/Token.xml (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/Token.xml Tue Dec 25 14:50:04 2012
@@ -20,7 +20,7 @@
<vendor/>
<types>
<typeDescription>
- <name>org.uimafit.type.Token</name>
+ <name>org.apache.uima.fit.type.Token</name>
<description/>
<supertypeName>uima.tcas.Annotation</supertypeName>
<features>
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/Token.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: uima/sandbox/uimafit/trunk/uimafit/src/test/resources/org/apache/uima/fit/type/Token.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: uima/sandbox/uimafit/trunk/wiki/TypeDescriptorDetection.wiki
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/wiki/TypeDescriptorDetection.wiki?rev=1425748&r1=1425747&r2=1425748&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/wiki/TypeDescriptorDetection.wiki (original)
+++ uima/sandbox/uimafit/trunk/wiki/TypeDescriptorDetection.wiki Tue Dec 25 14:50:04 2012
@@ -7,16 +7,16 @@ UIMA component and to each created CAS,
= Making types auto-detectable =
-The provider of a type system should create a file `META-INF/org.uimafit/types.txt` in the classpath. This file should define the locations of the type system descriptions. Assume that a type `org.uimafit.type.Token` is specified in the TSD `org/uimafit/type/Token.xml`, then the file should have the following contents:
+The provider of a type system should create a file `META-INF/org.uimafit/types.txt` in the classpath. This file should define the locations of the type system descriptions. Assume that a type `org.uimafit.type.Token` is specified in the TSD `org/apache/uima/fit/type/Token.xml`, then the file should have the following contents:
{{{
-classpath*:org/uimafit/type/Token.xml
+classpath*:org/apache/uima/fit/type/Token.xml
}}}
-To specify multiple TSDs, add additonal lines to the file. If you have a large number of TSDs, you may prefer to add a pattern. Assume that we have a large number of TSDs under `org/uimafit/type`, we can use the following pattern which recursively scans the package `org.uimafit.type` and all sub-packages for XML files and tries to load them as TSDs.
+To specify multiple TSDs, add additonal lines to the file. If you have a large number of TSDs, you may prefer to add a pattern. Assume that we have a large number of TSDs under `org/apache/uima/fit/type`, we can use the following pattern which recursively scans the package `org.uimafit.type` and all sub-packages for XML files and tries to load them as TSDs.
{{{
-classpath*:org/uimafit/type/**/*.xml
+classpath*:org/apache/uima/fit/type/**/*.xml
}}}
Try to design your packages structure in a way that TSDs and JCas wrapper classes generated from them are separate from the rest of your code.
@@ -24,7 +24,7 @@ Try to design your packages structure in
If it is not possible or inconvenient to add the `types.txt` file, patterns can also be specified using a system property. Multiple patterns may be specified separated by semicolon:
{{{
-org.uimafit.type.import_pattern=classpath*:org/uimafit/type/**/*.xml
+org.apache.uima.fit.type.import_pattern=classpath*:org/apache/uima/fit/type/**/*.xml
}}}
= Using type auto-detection =
@@ -73,7 +73,7 @@ Voilá, the result is a type system co
I recommend
# to put type system descriptors into packages resembling a namespace you "own" and to use a package-scoped wildcard search
{{{
-classpath*:org/uimafit/type/**/*.xml`
+classpath*:org/apache/uima/fit/type/**/*.xml`
}}}
# or when putting descriptors into a "well-known" package like `desc.type`, that `types.txt` file should explicitly list all type system descriptors instead of using a wildcard search or
{{{