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 2017/02/14 22:50:37 UTC
svn commit: r1783044 - in /uima/uimafit-v3/trunk: uimafit-core/
uimafit-core/src/main/java/org/apache/uima/fit/internal/
uimafit-core/src/test/java/org/apache/uima/fit/factory/
uimafit-core/src/test/java/org/apache/uima/fit/util/
uimafit-core/src/test/...
Author: rec
Date: Tue Feb 14 22:50:37 2017
New Revision: 1783044
URL: http://svn.apache.org/viewvc?rev=1783044&view=rev
Log:
[UIMA-5323] Adjust uimaFIT v3 branch to actually build against UIMA v3
- Comment out Log4J logging test as that no longer works against the log4j2
- Update reference data to accommodate the new ID that is printed after the type name when rendering an FS to string
- Adjust classname tests that checked for old v2 classes
Modified:
uima/uimafit-v3/trunk/uimafit-core/pom.xml
uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/ExtendedLogger.java
uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/LoggingTest.java
uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/util/FSUtilTest.java
uima/uimafit-v3/trunk/uimafit-core/src/test/resources/data/reference/JCasBuilderTest.dump
uima/uimafit-v3/trunk/uimafit-core/src/test/resources/data/reference/test.xmi.dump
uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/resources/data/reference/JCasBuilderTest.dump
uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/resources/data/reference/test.xmi.dump
uima/uimafit-v3/trunk/uimafit-parent/pom.xml
Modified: uima/uimafit-v3/trunk/uimafit-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/pom.xml?rev=1783044&r1=1783043&r2=1783044&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/pom.xml (original)
+++ uima/uimafit-v3/trunk/uimafit-core/pom.xml Tue Feb 14 22:50:37 2017
@@ -70,30 +70,6 @@
<version>1.5</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.15</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>jmxtools</artifactId>
- <groupId>com.sun.jdmk</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jmxri</artifactId>
- <groupId>com.sun.jmx</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jms</artifactId>
- <groupId>javax.jms</groupId>
- </exclusion>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<licenses>
<license>
Modified: uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/ExtendedLogger.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/ExtendedLogger.java?rev=1783044&r1=1783043&r2=1783044&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/ExtendedLogger.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/ExtendedLogger.java Tue Feb 14 22:50:37 2017
@@ -208,6 +208,11 @@ public class ExtendedLogger implements L
context.getLogger().setResourceManager(resourceManager);
}
+ @Override
+ public String rb(String bundleName, String msgKey, Object... parameters) {
+ return I18nUtil.localizeMessage(bundleName, msgKey, parameters, getExtensionClassLoader());
+ }
+
/**
* Logs a message at {@link Level#FINE}.
*
Modified: uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/LoggingTest.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/LoggingTest.java?rev=1783044&r1=1783043&r2=1783044&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/LoggingTest.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/LoggingTest.java Tue Feb 14 22:50:37 2017
@@ -32,11 +32,6 @@ import java.util.logging.Level;
import java.util.logging.LogManager;
import java.util.logging.LogRecord;
-import org.apache.log4j.Appender;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
-import org.apache.log4j.spi.LocationInfo;
-import org.apache.log4j.spi.LoggingEvent;
import org.apache.uima.UIMAFramework;
import org.apache.uima.UimaContextAdmin;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
@@ -115,56 +110,56 @@ public class LoggingTest {
}
}
- @Test
- public void testLog4JLogger() {
- final List<LoggingEvent> records = new ArrayList<LoggingEvent>();
-
- BasicConfigurator.configure();
-
- // Tell the logger to log everything
- Logger rootLogger = org.apache.log4j.LogManager.getRootLogger();
- org.apache.log4j.Level oldLevel = rootLogger.getLevel();
- rootLogger.setLevel(org.apache.log4j.Level.ALL);
- Appender appender = (Appender) rootLogger.getAllAppenders().nextElement();
- // Capture the logging output without actually logging it
- appender.addFilter(new org.apache.log4j.spi.Filter() {
- @Override
- public int decide(LoggingEvent event) {
- records.add(event);
- LocationInfo l = event.getLocationInformation();
- System.out.printf("[%s:%s] %s%n", l.getFileName(), l.getLineNumber(), event.getMessage());
- return org.apache.log4j.spi.Filter.DENY;
- }
- });
-
- try {
- UimaContextAdmin ctx = new RootUimaContext_impl();
- ctx.setLogger(Log4jLogger_impl.getInstance());
- ExtendedLogger logger = new ExtendedLogger(ctx);
-
- logger.setLevel(org.apache.uima.util.Level.ALL);
- trigger(logger);
- logger.setLevel(org.apache.uima.util.Level.OFF);
- trigger(logger);
-
- assertEquals(10, records.size());
- assertEquals(org.apache.log4j.Level.ALL, records.get(0).getLevel());
- assertEquals(org.apache.log4j.Level.ALL, records.get(1).getLevel());
- assertEquals(org.apache.log4j.Level.DEBUG, records.get(2).getLevel());
- assertEquals(org.apache.log4j.Level.DEBUG, records.get(3).getLevel());
- assertEquals(org.apache.log4j.Level.INFO, records.get(4).getLevel());
- assertEquals(org.apache.log4j.Level.INFO, records.get(5).getLevel());
- assertEquals(org.apache.log4j.Level.WARN, records.get(6).getLevel());
- assertEquals(org.apache.log4j.Level.WARN, records.get(7).getLevel());
- assertEquals(org.apache.log4j.Level.ERROR, records.get(8).getLevel());
- assertEquals(org.apache.log4j.Level.ERROR, records.get(9).getLevel());
- } finally {
- if (oldLevel != null) {
- rootLogger.setLevel(oldLevel);
- appender.clearFilters();
- }
- }
- }
+// @Test
+// public void testLog4JLogger() {
+// final List<LoggingEvent> records = new ArrayList<LoggingEvent>();
+//
+// BasicConfigurator.configure();
+//
+// // Tell the logger to log everything
+// Logger rootLogger = org.apache.log4j.LogManager.getRootLogger();
+// org.apache.log4j.Level oldLevel = rootLogger.getLevel();
+// rootLogger.setLevel(org.apache.log4j.Level.ALL);
+// Appender appender = (Appender) rootLogger.getAllAppenders().nextElement();
+// // Capture the logging output without actually logging it
+// appender.addFilter(new org.apache.log4j.spi.Filter() {
+// @Override
+// public int decide(LoggingEvent event) {
+// records.add(event);
+// LocationInfo l = event.getLocationInformation();
+// System.out.printf("[%s:%s] %s%n", l.getFileName(), l.getLineNumber(), event.getMessage());
+// return org.apache.log4j.spi.Filter.DENY;
+// }
+// });
+//
+// try {
+// UimaContextAdmin ctx = new RootUimaContext_impl();
+// ctx.setLogger(Log4jLogger_impl.getInstance());
+// ExtendedLogger logger = new ExtendedLogger(ctx);
+//
+// logger.setLevel(org.apache.uima.util.Level.ALL);
+// trigger(logger);
+// logger.setLevel(org.apache.uima.util.Level.OFF);
+// trigger(logger);
+//
+// assertEquals(10, records.size());
+// assertEquals(org.apache.log4j.Level.ALL, records.get(0).getLevel());
+// assertEquals(org.apache.log4j.Level.ALL, records.get(1).getLevel());
+// assertEquals(org.apache.log4j.Level.DEBUG, records.get(2).getLevel());
+// assertEquals(org.apache.log4j.Level.DEBUG, records.get(3).getLevel());
+// assertEquals(org.apache.log4j.Level.INFO, records.get(4).getLevel());
+// assertEquals(org.apache.log4j.Level.INFO, records.get(5).getLevel());
+// assertEquals(org.apache.log4j.Level.WARN, records.get(6).getLevel());
+// assertEquals(org.apache.log4j.Level.WARN, records.get(7).getLevel());
+// assertEquals(org.apache.log4j.Level.ERROR, records.get(8).getLevel());
+// assertEquals(org.apache.log4j.Level.ERROR, records.get(9).getLevel());
+// } finally {
+// if (oldLevel != null) {
+// rootLogger.setLevel(oldLevel);
+// appender.clearFilters();
+// }
+// }
+// }
private void trigger(ExtendedLogger aLogger) {
if (aLogger.isTraceEnabled()) {
Modified: uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/util/FSUtilTest.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/util/FSUtilTest.java?rev=1783044&r1=1783043&r2=1783044&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/util/FSUtilTest.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/util/FSUtilTest.java Tue Feb 14 22:50:37 2017
@@ -128,7 +128,7 @@ public class FSUtilTest {
getFeature(fs, "AnnotationValue", FeatureStructure.class).getClass().getName());
}
else {
- assertEquals(AnnotationImpl.class.getName(),
+ assertEquals(Annotation.class.getName(),
getFeature(fs, "AnnotationValue", FeatureStructure.class).getClass().getName());
}
assertEquals(0, getFeature(fs, "AnnotationValue", AnnotationFS.class).getBegin());
@@ -205,7 +205,7 @@ public class FSUtilTest {
assertEquals(Annotation.class.getName(),
getFeature(fs, "AnnotationListValue", AnnotationFS[].class)[0].getClass().getName());
} else {
- assertEquals(AnnotationImpl.class.getName(),
+ assertEquals(Annotation.class.getName(),
getFeature(fs, "AnnotationListValue", AnnotationFS[].class)[0].getClass().getName());
}
Modified: uima/uimafit-v3/trunk/uimafit-core/src/test/resources/data/reference/JCasBuilderTest.dump
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/test/resources/data/reference/JCasBuilderTest.dump?rev=1783044&r1=1783043&r2=1783044&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/test/resources/data/reference/JCasBuilderTest.dump (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/test/resources/data/reference/JCasBuilderTest.dump Tue Feb 14 22:50:37 2017
@@ -2,7 +2,7 @@
-------- View _InitialView begin ----------------------------------
-DocumentAnnotation
+DocumentAnnotation:10
sofa: _InitialView
begin: 0
end: 89
@@ -11,52 +11,52 @@ DocumentAnnotation
CAS-Text:
This sentence is not annotated. But this sentences is annotated. And here every token is.
[But this sentences is annotated. ]
-Sentence
+Sentence:2
sofa: _InitialView
begin: 32
end: 65
[And here every token is.]
-Sentence
+Sentence:9
sofa: _InitialView
begin: 65
end: 89
[And]
-Token
+Token:3
sofa: _InitialView
begin: 65
end: 68
pos: <null>
stem: <null>
[here]
-Token
+Token:4
sofa: _InitialView
begin: 69
end: 73
pos: <null>
stem: <null>
[every]
-Token
+Token:5
sofa: _InitialView
begin: 74
end: 79
pos: <null>
stem: <null>
[token]
-Token
+Token:6
sofa: _InitialView
begin: 80
end: 85
pos: <null>
stem: <null>
[is]
-Token
+Token:7
sofa: _InitialView
begin: 86
end: 88
pos: <null>
stem: <null>
[.]
-Token
+Token:8
sofa: _InitialView
begin: 88
end: 89
@@ -64,6 +64,4 @@ Token
stem: <null>
-------- View _InitialView end ----------------------------------
-======== CAS 0 end ==================================
-
-
+======== CAS 0 end ==================================
\ No newline at end of file
Modified: uima/uimafit-v3/trunk/uimafit-core/src/test/resources/data/reference/test.xmi.dump
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/test/resources/data/reference/test.xmi.dump?rev=1783044&r1=1783043&r2=1783044&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/test/resources/data/reference/test.xmi.dump (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/test/resources/data/reference/test.xmi.dump Tue Feb 14 22:50:37 2017
@@ -2,7 +2,7 @@
-------- View _InitialView begin ----------------------------------
-DocumentAnnotation
+DocumentAnnotation:2
sofa: _InitialView
begin: 0
end: 42
@@ -11,75 +11,75 @@ DocumentAnnotation
CAS-Text:
Me and all my friends are non-conformists.
[Me and all my friends are non-conformists.]
-Sentence
+Sentence:13
sofa: _InitialView
begin: 0
end: 42
[Me]
-Token
+Token:3
sofa: _InitialView
begin: 0
end: 2
pos: "M"
stem: "me"
[and]
-Token
+Token:4
sofa: _InitialView
begin: 3
end: 6
pos: "A"
stem: "and"
[all]
-Token
+Token:5
sofa: _InitialView
begin: 7
end: 10
pos: "A"
stem: "all"
[my]
-Token
+Token:6
sofa: _InitialView
begin: 11
end: 13
pos: "M"
stem: "my"
[friends]
-Token
+Token:7
sofa: _InitialView
begin: 14
end: 21
pos: "F"
stem: "friend"
[are]
-Token
+Token:8
sofa: _InitialView
begin: 22
end: 25
pos: "A"
stem: "are"
[non]
-Token
+Token:9
sofa: _InitialView
begin: 26
end: 29
pos: "N"
stem: "non"
[-]
-Token
+Token:10
sofa: _InitialView
begin: 29
end: 30
pos: "-"
stem: "-"
[conformists]
-Token
+Token:11
sofa: _InitialView
begin: 30
end: 41
pos: "C"
stem: "conformist"
[.]
-Token
+Token:12
sofa: _InitialView
begin: 41
end: 42
@@ -87,6 +87,4 @@ Token
stem: "."
-------- View _InitialView end ----------------------------------
-======== CAS 0 end ==================================
-
-
+======== CAS 0 end ==================================
\ No newline at end of file
Modified: uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/resources/data/reference/JCasBuilderTest.dump
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/resources/data/reference/JCasBuilderTest.dump?rev=1783044&r1=1783043&r2=1783044&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/resources/data/reference/JCasBuilderTest.dump (original)
+++ uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/resources/data/reference/JCasBuilderTest.dump Tue Feb 14 22:50:37 2017
@@ -2,7 +2,7 @@
-------- View _InitialView begin ----------------------------------
-DocumentAnnotation
+DocumentAnnotation:10
sofa: _InitialView
begin: 0
end: 89
@@ -11,52 +11,52 @@ DocumentAnnotation
CAS-Text:
This sentence is not annotated. But this sentences is annotated. And here every token is.
[But this sentences is annotated. ]
-Sentence
+Sentence:2
sofa: _InitialView
begin: 32
end: 65
[And here every token is.]
-Sentence
+Sentence:9
sofa: _InitialView
begin: 65
end: 89
[And]
-Token
+Token:3
sofa: _InitialView
begin: 65
end: 68
pos: <null>
stem: <null>
[here]
-Token
+Token:4
sofa: _InitialView
begin: 69
end: 73
pos: <null>
stem: <null>
[every]
-Token
+Token:5
sofa: _InitialView
begin: 74
end: 79
pos: <null>
stem: <null>
[token]
-Token
+Token:6
sofa: _InitialView
begin: 80
end: 85
pos: <null>
stem: <null>
[is]
-Token
+Token:7
sofa: _InitialView
begin: 86
end: 88
pos: <null>
stem: <null>
[.]
-Token
+Token:8
sofa: _InitialView
begin: 88
end: 89
@@ -64,6 +64,4 @@ Token
stem: <null>
-------- View _InitialView end ----------------------------------
-======== CAS 0 end ==================================
-
-
+======== CAS 0 end ==================================
\ No newline at end of file
Modified: uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/resources/data/reference/test.xmi.dump
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/resources/data/reference/test.xmi.dump?rev=1783044&r1=1783043&r2=1783044&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/resources/data/reference/test.xmi.dump (original)
+++ uima/uimafit-v3/trunk/uimafit-legacy-support/src/test/resources/data/reference/test.xmi.dump Tue Feb 14 22:50:37 2017
@@ -2,7 +2,7 @@
-------- View _InitialView begin ----------------------------------
-DocumentAnnotation
+DocumentAnnotation:2
sofa: _InitialView
begin: 0
end: 42
@@ -11,75 +11,75 @@ DocumentAnnotation
CAS-Text:
Me and all my friends are non-conformists.
[Me and all my friends are non-conformists.]
-Sentence
+Sentence:13
sofa: _InitialView
begin: 0
end: 42
[Me]
-Token
+Token:3
sofa: _InitialView
begin: 0
end: 2
pos: "M"
stem: "me"
[and]
-Token
+Token:4
sofa: _InitialView
begin: 3
end: 6
pos: "A"
stem: "and"
[all]
-Token
+Token:5
sofa: _InitialView
begin: 7
end: 10
pos: "A"
stem: "all"
[my]
-Token
+Token:6
sofa: _InitialView
begin: 11
end: 13
pos: "M"
stem: "my"
[friends]
-Token
+Token:7
sofa: _InitialView
begin: 14
end: 21
pos: "F"
stem: "friend"
[are]
-Token
+Token:8
sofa: _InitialView
begin: 22
end: 25
pos: "A"
stem: "are"
[non]
-Token
+Token:9
sofa: _InitialView
begin: 26
end: 29
pos: "N"
stem: "non"
[-]
-Token
+Token:10
sofa: _InitialView
begin: 29
end: 30
pos: "-"
stem: "-"
[conformists]
-Token
+Token:11
sofa: _InitialView
begin: 30
end: 41
pos: "C"
stem: "conformist"
[.]
-Token
+Token:12
sofa: _InitialView
begin: 41
end: 42
@@ -87,6 +87,4 @@ Token
stem: "."
-------- View _InitialView end ----------------------------------
-======== CAS 0 end ==================================
-
-
+======== CAS 0 end ==================================
\ No newline at end of file
Modified: uima/uimafit-v3/trunk/uimafit-parent/pom.xml
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-parent/pom.xml?rev=1783044&r1=1783043&r2=1783044&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-parent/pom.xml (original)
+++ uima/uimafit-v3/trunk/uimafit-parent/pom.xml Tue Feb 14 22:50:37 2017
@@ -14,9 +14,9 @@
<inceptionYear>2012</inceptionYear>
<properties>
<spring.version>3.2.16.RELEASE</spring.version>
- <uima.version>2.9.0</uima.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <uima.version>3.0.0-alpha02-SNAPSHOT</uima.version>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<!--
BACKWARD_COMPATIBLE_IMPLEMENTER - patch version (=.=.+)
BACKWARD_COMPATIBLE_USER - minor version (=.+.0)