svn commit: r1636562 - in /uima/ruta/trunk/ruta-core/src: main/java/org/apache/uima/ruta/engine/ main/resources/org/apache/uima/ruta/engine/ test/java/org/apache/uima/ruta/engine/ test/resources/org/a
Author: pkluegl
Date: Tue Nov 4 12:32:11 2014
New Revision: 1636562
URL: http://svn.apache.org/r1636562
Log:
UIMA-4085
- fixed and added test
Added:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/PlainTextAnnotatorTest.java
(with props)
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/PlainTextAnnotatorTest.txt
(with props)
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/PlainTextAnnotator.java
uima/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/PlainTextTypeSystem.xml
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/PlainTextAnnotator.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/PlainTextAnnotator.java?rev=1636562&r1=1636561&r2=1636562&view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/PlainTextAnnotator.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/PlainTextAnnotator.java
Tue Nov 4 12:32:11 2014
@@ -36,6 +36,8 @@ public class PlainTextAnnotator extends
public static final String TYPE_LINE = "org.apache.uima.ruta.type.Line";
public static final String TYPE_WSLINE = "org.apache.uima.ruta.type.WSLine";
+
+ public static final String TYPE_EMPTYLINE =
"org.apache.uima.ruta.type.EmptyLine";
public static final String TYPE_PARAGRAPH =
"org.apache.uima.ruta.type.Paragraph";
@@ -46,6 +48,7 @@ public class PlainTextAnnotator extends
BufferedReader br = new BufferedReader(new StringReader(documentText));
Type lineType = cas.getTypeSystem().getType(TYPE_LINE);
Type wsLineType = cas.getTypeSystem().getType(TYPE_WSLINE);
+Type emptyLineType = cas.getTypeSystem().getType(TYPE_EMPTYLINE);
Type paragraphType = cas.getTypeSystem().getType(TYPE_PARAGRAPH);
int offsetTillNow = 0;
@@ -70,7 +73,13 @@ public class PlainTextAnnotator extends
paragraphBegin = offsetTillNow;
}
-if (wsLine && !emptyLine) {
+if (wsLine && emptyLine) {
+ // do not create annotation with length 0
+ // instead append the line break to the annotation
+ AnnotationFS newEmptyLineFS = cas.createAnnotation(emptyLineType,
offsetTillNow, offsetTillNow
+ + nlLength);
+ cas.addFsToIndexes(newEmptyLineFS);
+} else if (wsLine && !emptyLine) {
AnnotationFS newWSLineFS = cas.createAnnotation(wsLineType,
offsetTillNow, offsetTillNow
+ eachLine.length());
cas.addFsToIndexes(newWSLineFS);
@@ -89,6 +98,10 @@ public class PlainTextAnnotator extends
AnnotationFS newParaFS = cas.createAnnotation(paragraphType,
paragraphBegin,
offsetAfterLine);
cas.addFsToIndexes(newParaFS);
+} else if (offsetAfterLine == documentText.length()) {
+ AnnotationFS newParaFS = cas.createAnnotation(paragraphType,
paragraphBegin,
+ offsetAfterLine);
+ cas.addFsToIndexes(newParaFS);
}
if (wsLine) {
lastWasEmpty = true;
Modified:
uima/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/PlainTextTypeSystem.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/PlainTextTypeSystem.xml?rev=1636562&r1=1636561&r2=1636562&view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/PlainTextTypeSystem.xml
(original)
+++
uima/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/PlainTextTypeSystem.xml
Tue Nov 4 12:32:11 2014
@@ -1,4 +1,5 @@
+
-
http://uima.apache.org/resourceSpecifier";>
PlainTextTypeSystem
@@ -37,6 +37,11 @@
org.apache.uima.ruta.type.WSLine
+ org.apache.uima.ruta.type.EmptyLine
+
+
+ org.apache.uima.ruta.type.EmptyLine
+
org.apache.uima.ruta.type.AnyLine
Added:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/PlainTextAnnotatorTest.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/PlainTextAnnotatorTest.java?rev=1636562&view=auto
==
---
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/PlainTextAnnotatorTest.java
(added)
+++
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/PlainTextAnnotatorTest.java
Tue Nov 4 12:32:11 2014
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyri
svn commit: r1636576 - in /uima/ruta/trunk/ruta-core/src: main/java/org/apache/uima/ruta/engine/ main/java/org/apache/uima/ruta/seed/ main/resources/org/apache/uima/ruta/engine/ test/java/org/apache/u
Author: pkluegl
Date: Tue Nov 4 13:26:36 2014
New Revision: 1636576
URL: http://svn.apache.org/r1636576
Log:
UIMA-4086
- extended definition of NBSP
- NBSP isa SPACE
- added test
Added:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NBSPWSTest.java
(with props)
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.flex
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.java
uima/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/BasicEngine.xml
uima/ruta/trunk/ruta-core/src/main/resources/org/apache/uima/ruta/engine/BasicTypeSystem.xml
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/BasicTypeSystem.xml
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/TestEngine.xml
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/TypeAliasTestEngine.xml
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/CWEngine.xml
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/SWEngine.xml
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/SimpleEngine.xml
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java?rev=1636576&r1=1636575&r2=1636576&view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
Tue Nov 4 13:26:36 2014
@@ -230,7 +230,7 @@ public class RutaEngine extends JCasAnno
public static final String PARAM_DEFAULT_FILTERED_TYPES =
"defaultFilteredTypes";
@ConfigurationParameter(name = PARAM_DEFAULT_FILTERED_TYPES, mandatory =
false, defaultValue = {
- "org.apache.uima.ruta.type.SPACE", "org.apache.uima.ruta.type.NBSP",
+ "org.apache.uima.ruta.type.SPACE",
"org.apache.uima.ruta.type.BREAK", "org.apache.uima.ruta.type.MARKUP" })
private String[] defaultFilteredTypes;
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.flex
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.flex?rev=1636576&r1=1636575&r2=1636576&view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.flex
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.flex
Tue Nov 4 13:26:36 2014
@@ -86,7 +86,7 @@ SPACE=[ \t]
}
-\xA0| |  {
+\u00A0|\u202F|\uFEFF|\u2007|\u180E| |  {
NBSP t = new NBSP(cas);
t.setBegin(yychar);
t.setEnd(yychar + yytext().length());
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.java?rev=1636576&r1=1636575&r2=1636576&view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.java
Tue Nov 4 13:26:36 2014
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.3 on 28.11.12 14:06 */
+/* The following code was generated by JFlex 1.4.3 on 04.11.14 14:02 */
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,10 +19,14 @@
* under the License.
*/
+
package org.apache.uima.ruta.seed;
+import java.util.*;
+import java.util.regex.*;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.jcas.JCas;
+
import org.apache.uima.ruta.type.AMP;
import org.apache.uima.ruta.type.BREAK;
import org.apache.uima.ruta.type.CAP;
@@ -40,10 +44,12 @@ import org.apache.uima.ruta.type.SPACE;
import org.apache.uima.ruta.type.SPECIAL;
import org.apache.uima.ruta.type.SW;
+
/**
- * This class is a scanner generated by http://www.jflex.de/";>JFlex 1.4.3 on 28.11.12
- * 14:06 from the specification file
- *
D:/work/workspace-ruta-uima/uimaj-ruta/src/main/java/org/apache/uima/ruta/seed/SeedLexer.flex
+ * This class is a scanner generated by
+ * http://www.jflex.de/";>JFlex 1.4.3
+ * on 04.11.14 14:02 from the specification file
+ *
D:/work/workspace-uima-ruta5/ruta/ruta-core/src/main/java/org/apache/uima/ruta/seed/SeedLexer.flex
*/
class SeedLexer {
@@ -57,160 +63,208 @@ class SeedLexer {
public static final int YYINIT
svn commit: r1636577 - /uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.basic_annotations.xml
Author: pkluegl Date: Tue Nov 4 13:29:53 2014 New Revision: 1636577 URL: http://svn.apache.org/r1636577 Log: UIMA-4086 - documentation: NBSP isa SPACE Modified: uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.basic_annotations.xml Modified: uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.basic_annotations.xml URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.basic_annotations.xml?rev=1636577&r1=1636576&r2=1636577&view=diff == --- uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.basic_annotations.xml (original) +++ uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.basic_annotations.xml Tue Nov 4 13:29:53 2014 @@ -131,7 +131,7 @@ NBSP -ANY +SPACE non breaking space
svn commit: r1636596 - /uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasDumpWriter.java
Author: rec
Date: Tue Nov 4 14:52:22 2014
New Revision: 1636596
URL: http://svn.apache.org/r1636596
Log:
[UIMA-3024] CASDumpWriter is sensitive to type system changes
- As a last resort try sorting by CAS address.
Modified:
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasDumpWriter.java
Modified:
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasDumpWriter.java
URL:
http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasDumpWriter.java?rev=1636596&r1=1636595&r2=1636596&view=diff
==
---
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasDumpWriter.java
(original)
+++
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasDumpWriter.java
Tue Nov 4 14:52:22 2014
@@ -41,6 +41,7 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.Type;
+import org.apache.uima.cas.impl.FeatureStructureImpl;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.resource.ResourceInitializationException;
@@ -206,7 +207,19 @@ public class CasDumpWriter extends CasCo
return end;
}
- return aO1.getType().getName().compareTo(aO2.getType().getName());
+ int name =
aO1.getType().getName().compareTo(aO2.getType().getName());
+ if (name != 0) {
+return name;
+ }
+
+ // Last resort: try the address.
+ if (aO1 instanceof FeatureStructureImpl && aO2 instanceof
FeatureStructureImpl) {
+return ((FeatureStructureImpl) aO1).getAddress()
+- ((FeatureStructureImpl) aO2).getAddress();
+ }
+
+ // Fall back to name.
+ return name;
}
});
svn commit: r1636609 - in /uima/ruta/trunk/ruta-core/src: main/antlr3/org/apache/uima/ruta/parser/ main/java/org/apache/uima/ruta/ main/java/org/apache/uima/ruta/expression/ main/java/org/apache/uima/
Author: pkluegl
Date: Tue Nov 4 15:31:20 2014
New Revision: 1636609
URL: http://svn.apache.org/r1636609
Log:
UIMA-4062
- extended core parser for external resources for word lists/tables
- added test, only for parsing right now
Added:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/ExternalWordListExpression.java
(with props)
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/resource/ExternalWordTableExpression.java
(with props)
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ExternalWordResourceTest.java
(with props)
Modified:
uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaLexer.g
uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java
Modified:
uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaLexer.g
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaLexer.g?rev=1636609&r1=1636608&r2=1636609&view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaLexer.g
(original)
+++
uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaLexer.g
Tue Nov 4 15:31:20 2014
@@ -61,6 +61,10 @@ WORDTABLE
: 'WORDTABLE'
;
+RESOURCE
+ : 'RESOURCE'
+ ;
+
AND
: 'AND'
;
Modified:
uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g?rev=1636609&r1=1636608&r2=1636609&view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
(original)
+++
uima/ruta/trunk/ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/RutaParser.g
Tue Nov 4 15:31:20 2014
@@ -422,11 +422,15 @@ List vars = new ArrayList args = new ArrayList();
+}
:
+ RESOURCE LPAREN name = dottedId (COMMA arg = stringExpression
{args.add(arg);} )* RPAREN
+ {expr = ExpressionFactory.createExternalWordListExpression(name, args);}
+ |
id = Identifier
{expr = ExpressionFactory.createReferenceWordListExpression(id);}
|
@@ -2026,7 +2036,13 @@ wordListExpression returns [WordListExpr
wordTableExpression returns [WordTableExpression expr = null]
+@init {
+List args = new ArrayList();
+}
:
+ RESOURCE LPAREN name = dottedId (COMMA arg = stringExpression
{args.add(arg);} )* RPAREN
+ {expr = ExpressionFactory.createExternalWordTableExpression(name,
args);}
+ |
id = Identifier
{expr = ExpressionFactory.createReferenceWordTableExpression(id);}
|
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java?rev=1636609&r1=1636608&r2=1636609&view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaEnvironment.java
Tue Nov 4 15:31:20 2014
@@ -773,7 +773,8 @@ public class RutaEnvironment {
String path = lle.getText();
RutaWordList wordList = getWordList(path);
return wordList;
- } else if (clazz.equals(RutaWordList.class)) {
+ } else if (clazz.equals(RutaWordList.class) && value instanceof String) {
+ // TODO: ExtenralWordTableExpression will be ignored
RutaWordList list = getWordList((String) value);
return list;
} else if (clazz.equals(RutaTable.class) && value instanceof
LiteralWordTableExpression) {
@@ -781,7 +782,8 @@ public class RutaEnvironment {
String path = lte.getText();
RutaTable table = getWordTable(path);
return table;
- } else if (clazz.equals(RutaTable.class)) {
+ } else if (clazz.equals(RutaTable.class) && value instanceof String) {
+// TODO: ExtenralWordTableExpression will be ignored, and add a method
like for word lists
RutaTable table = getWordTable((String) value);
return table;
} else if (clazz.equals(List.class) && value instanceof ListExpression) {
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java?rev=1636609&r1=1636608&r2=1636609
svn commit: r1636624 - /uima/sandbox/uima-ducc/trunk/uima-ducc-container/pom.xml
Author: cwiklik
Date: Tue Nov 4 16:02:20 2014
New Revision: 1636624
URL: http://svn.apache.org/r1636624
Log:
UIMA-4087 modified to copy jars to known location before tests are run
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/pom.xml
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/pom.xml?rev=1636624&r1=1636623&r2=1636624&view=diff
==
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/pom.xml (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/pom.xml Tue Nov 4
16:02:20 2014
@@ -71,5 +71,177 @@
+
+
+
+
+ org.eclipse.m2e
+ lifecycle-mapping
+ 1.0.0
+
+
+
+
+
+
org.apache.uima
+
uima-build-helper-maven-plugin
+
[5,)
+
+
copy-from-apache-dist
+
+
+
+
+
+
+
+
+
+
+
org.apache.maven.plugins
+
maven-dependency-plugin
+
[2.3,)
+
+ copy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ org.apache.uima
+ uima-build-helper-maven-plugin
+
+
+ foo
+ validate
+ copy-from-apache-dist
+
+ ${org.apache.uima.version}
+ uimaj
+
+
+
+ bar
+ validate
+ copy-from-apache-dist
+
+ ${org.apache.uima.as.version}
+ uima-as
+ tar.gz
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+
+ unpack Uimaj Bin
+ validate
+ unpack
+
+true
+
+
+org.apache.uima
+uimaj
+${org.apache.uima.version}
+zip
+bin
+
${project.build.directory}/uimaj
+
+
+
+
+
+
+
+ unpack uima-as Bin
+ validate
+ unpack
+
+true
+
+
+org.apache.uima
+uima-as
+${org.apache.uima.as.version}
+tar.gz
+bin
+
${project.build.directory}/uima-as
+
+
+
+
+
+
+
+ copy xstream
+
svn commit: r1636670 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common: ContainerLogger.java IContainerLogger.java IEntityId.java
Author: degenaro
Date: Tue Nov 4 18:11:56 2014
New Revision: 1636670
URL: http://svn.apache.org/r1636670
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for
container (system) code.
License at top of file.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IContainerLogger.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IEntityId.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java?rev=1636670&r1=1636669&r2=1636670&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java
Tue Nov 4 18:11:56 2014
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
package org.apache.uima.ducc.container.common;
import java.text.SimpleDateFormat;
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IContainerLogger.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IContainerLogger.java?rev=1636670&r1=1636669&r2=1636670&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IContainerLogger.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IContainerLogger.java
Tue Nov 4 18:11:56 2014
@@ -1,6 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
package org.apache.uima.ducc.container.common;
-
public interface IContainerLogger {
public enum Component { JD, JP };
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IEntityId.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IEntityId.java?rev=1636670&r1=1636669&r2=1636670&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IEntityId.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IEntityId.java
Tue Nov 4 18:11:56 2014
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this fil
svn commit: r1636674 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-container/src: main/java/org/apache/uima/ducc/container/common/ main/java/org/apache/uima/ducc/container/jd/fsm/wi/ main/java/org/apac
Author: degenaro
Date: Tue Nov 4 18:18:38 2014
New Revision: 1636674
URL: http://svn.apache.org/r1636674
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for
container (system) code.
WorkItem statistics: Finished min/max/avg; Running min/max
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Assertion.java
(with props)
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/IRunningWorkItemStatistics.java
(with props)
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/RunningWorkItemStatistics.java
(with props)
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEnd.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/Dispatcher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/IWorkItem.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/IWorkItemStatistics.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/Tod.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WorkItem.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WorkItemStatistics.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Assertion.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Assertion.java?rev=1636674&view=auto
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Assertion.java
(added)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Assertion.java
Tue Nov 4 18:18:38 2014
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.container.common;
+
+import org.apache.uima.ducc.container.jd.JobDriver;
+
+public class Assertion {
+
+ private static IContainerLogger logger =
ContainerLogger.getLogger(JobDriver.class,
IContainerLogger.Component.JD.name());
+
+ public static void nonNegative(long value) {
+ String location = "nonNegative";
+ if(value < 0) {
+ logger.error(location, IEntityId.null_id, value);
+ throw new RuntimeException();
+ }
+ }
+}
Propchange:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Assertion.java
--
svn:eol-style = native
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java?rev=1636674&r1=1636673&r2=1636674&view=diff
==
svn commit: r1636690 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test: java/org/apache/uima/ducc/container/jd/test/ java/org/apache/uima/ducc/container/jd/test/helper/ resources/
Author: degenaro
Date: Tue Nov 4 18:58:43 2014
New Revision: 1636690
URL: http://svn.apache.org/r1636690
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for
container (system) code.
Remove jars for JUnit testing now provided via Maven.
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Utilities.java
(with props)
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc-user.jar
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/resources/uimaj-as-core-2.4.2.jar
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/resources/uimaj-as-core-2.6.0.jar
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/resources/uimaj-core-2.4.2.jar
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/resources/uimaj-core-2.6.0.jar
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/resources/xstream-1.3.1.jar
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/ThreadInfoFactory.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java?rev=1636690&r1=1636689&r2=1636690&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
Tue Nov 4 18:58:43 2014
@@ -33,6 +33,7 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.jd.test.helper.Testing;
import org.apache.uima.ducc.container.jd.test.helper.ThreadInfo;
import org.apache.uima.ducc.container.jd.test.helper.ThreadInfoFactory;
+import org.apache.uima.ducc.container.jd.test.helper.Utilities;
import org.apache.uima.ducc.container.net.iface.IMetaCas;
import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction.Type;
import org.apache.uima.ducc.container.net.impl.MetaCasTransaction;
@@ -140,14 +141,6 @@ public class TestDispatcher {
return transCommon(dispatcher, trans, reqNo);
}
- private String[] jarList260 = {
- "/ducc-user.jar",
- "/ducc-test.jar",
- "/uimaj-as-core-2.6.0.jar",
- "/uimaj-core-2.6.0.jar",
- "/xstream-1.3.1.jar"
- };
-
// single node:pid:tid
@Test
@@ -160,7 +153,7 @@ public class TestDispatcher {
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
String crCfg = null;
- JobDriverCommon.setInstance(jarList260, crXml, crCfg);
+ JobDriverCommon.setInstance(Utilities.jarList, crXml,
crCfg);
int size =
JobDriverCommon.getInstance().getMap().size();
debug("map size:"+size);
Dispatcher dispatcher = new Dispatcher();
@@ -203,7 +196,7 @@ public class TestDispatcher {
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
String crCfg = null;
- JobDriverCommon.setInstance(jarList260, crXml, crCfg);
+ JobDriverCommon.setInstance(Utilities.jarList, crXml,
crCfg);
int size =
JobDriverCommon.getInstance().getMap().size();
debug("map size:"+size);
Dispatcher dispatcher = new Dispatcher();
@@ -248,7 +241,7 @@ public class TestDispatcher {
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
String crCfg = null;
- JobDriverCommon.setInstance(jarList260, crXml, crCfg);
+ JobDriverCommon.setInstance(Utilities.jarList, crXml,
crCfg);
int size =
JobDriverCommon.getInstance().getMap().size();
debug("map size:"+size);
Dispatcher dispatcher = new Dispatcher();
Modified:
uima/s
svn commit: r1636693 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-container: ./ src/test/java/org/apache/uima/ducc/container/jd/test/ src/test/java/org/apache/uima/ducc/container/jd/test/helper/ src/t
Author: degenaro
Date: Tue Nov 4 19:27:44 2014
New Revision: 1636693
URL: http://svn.apache.org/r1636693
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for
container (system) code.
Remove test jar for JUnit testing now provided via "/" in Utilities.userCP
which gives rise to /org/apache/uima/ducc/user/jd/test/helper/CR100.class.
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/mkresources.xml
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc-test.jar
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Utilities.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java?rev=1636693&r1=1636692&r2=1636693&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
Tue Nov 4 19:27:44 2014
@@ -153,7 +153,7 @@ public class TestDispatcher {
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
String crCfg = null;
- JobDriverCommon.setInstance(Utilities.jarList, crXml,
crCfg);
+ JobDriverCommon.setInstance(Utilities.userCP, crXml,
crCfg);
int size =
JobDriverCommon.getInstance().getMap().size();
debug("map size:"+size);
Dispatcher dispatcher = new Dispatcher();
@@ -196,7 +196,7 @@ public class TestDispatcher {
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
String crCfg = null;
- JobDriverCommon.setInstance(Utilities.jarList, crXml,
crCfg);
+ JobDriverCommon.setInstance(Utilities.userCP, crXml,
crCfg);
int size =
JobDriverCommon.getInstance().getMap().size();
debug("map size:"+size);
Dispatcher dispatcher = new Dispatcher();
@@ -241,7 +241,7 @@ public class TestDispatcher {
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
String crCfg = null;
- JobDriverCommon.setInstance(Utilities.jarList, crXml,
crCfg);
+ JobDriverCommon.setInstance(Utilities.userCP, crXml,
crCfg);
int size =
JobDriverCommon.getInstance().getMap().size();
debug("map size:"+size);
Dispatcher dispatcher = new Dispatcher();
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java?rev=1636693&r1=1636692&r2=1636693&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
Tue Nov 4 19:27:44 2014
@@ -85,11 +85,11 @@ public class TestSuite {
}
}
- private void testIncludeAll(String[] jarList, String crXml, String
crCfg) {
+ private void testIncludeAll(String[] userCP, String crXml, String
crCfg) {
try {
- URL[] classLoaderUrls = new URL[jarList.length];
+ URL[] classLoaderUrls = new URL[userCP.length];
int i = 0;
- for(String jar : jarList) {
+ for(String jar : userCP) {
classLoaderUrls[i] =
this.getClass().getResource(jar);
i++;
}
@@ -110,15 +110,15 @@ public class TestSuite {
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
String crCfg = null;
-
svn commit: r1636705 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-container/src: main/java/org/apache/uima/ducc/container/common/ test/java/org/apache/uima/ducc/container/jd/test/ test/java/org/apache
Author: degenaro
Date: Tue Nov 4 19:52:50 2014
New Revision: 1636705
URL: http://svn.apache.org/r1636705
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for
container (system) code.
Silence JUnit tests.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestJson.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestWiFsm.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java?rev=1636705&r1=1636704&r2=1636705&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java
Tue Nov 4 19:52:50 2014
@@ -46,6 +46,16 @@ public class ContainerLogger implements
setComponent(component);
}
+ private static boolean silentRunning = false;
+
+ public static void setSilentRunning() {
+ silentRunning = true;
+ }
+
+ public static void resetSilentRunning() {
+ silentRunning = false;
+ }
+
private String clazz = null;
private String component = null;
@@ -93,7 +103,9 @@ public class ContainerLogger implements
text.append(location);
text.append(" ");
text.append(format(args));
- System.out.println(text);
+ if(!silentRunning) {
+ System.out.println(text);
+ }
}
@Override
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java?rev=1636705&r1=1636704&r2=1636705&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
Tue Nov 4 19:52:50 2014
@@ -25,6 +25,7 @@ import java.io.File;
import java.net.URL;
import java.util.Random;
+import org.apache.uima.ducc.container.common.ContainerLogger;
import org.apache.uima.ducc.container.jd.JobDriverCommon;
import org.apache.uima.ducc.container.jd.mh.Dispatcher;
import org.apache.uima.ducc.container.jd.mh.iface.IOperatingInfo;
@@ -56,27 +57,30 @@ public class TestDispatcher {
@Before
public void setUp() throws Exception {
+ if(!Testing.isVerbose()) {
+ ContainerLogger.setSilentRunning();
+ }
+ else {
+ ContainerLogger.resetSilentRunning();
+ }
}
@After
public void tearDown() throws Exception {
}
- private boolean debug = true;
- private boolean asExpected = true;
-
private void out_println(String message) {
System.out.println(message);
}
private void debug(String message) {
- if(debug) {
+ if(Testing.isDebug()) {
out_println(message);
}
}
private void asExpected(String text) {
- if(asExpected) {
+ if(Testing.isVerbose()) {
String message = "as expected: "+text;
out_println(message);
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestJson.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestJson.java?rev=1636705&r1=1636704&r2=1636705&view=diff
===
svn commit: r1636715 - /uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java
Author: degenaro
Date: Tue Nov 4 20:00:10 2014
New Revision: 1636715
URL: http://svn.apache.org/r1636715
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for
container (system) code.
Temporarily disable JUinit tests for ducc-container project.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java?rev=1636715&r1=1636714&r2=1636715&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java
Tue Nov 4 20:00:10 2014
@@ -20,7 +20,7 @@ package org.apache.uima.ducc.container.j
public class Testing {
- private static boolean disabled = false;
+ private static boolean disabled = true;
private static boolean verbose = false;
private static boolean warned = false;
private static boolean debug = false;
svn commit: r1636727 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test: TestSuite.java helper/Testing.java
Author: degenaro
Date: Tue Nov 4 20:24:17 2014
New Revision: 1636727
URL: http://svn.apache.org/r1636727
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for
container (system) code.
Enable JUinit tests for ducc-container project, but disable MetaCas prefix
verification which fails under Maven build.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java?rev=1636727&r1=1636726&r2=1636727&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
Tue Nov 4 20:24:17 2014
@@ -237,8 +237,10 @@ public class TestSuite {
assertTrue(seqNo == 1);
String serializedCas = (String)mc.getSerializedCas();
asExpected("cas = "+serializedCas);
- String prefix = "http:///uima/cas.ecore\"";;
- assertTrue(serializedCas.startsWith(prefix));
+ if(Testing.isVerifyPrefix()) {
+ String prefix = "http:///uima/cas.ecore\"";;
+ assertTrue(serializedCas.startsWith(prefix));
+ }
String documentText = mc.getDocumentText();
asExpected("documentText = "+documentText);
assertTrue(documentText.equals("1"));
@@ -269,8 +271,10 @@ public class TestSuite {
assertTrue(seqNo == c);
String serializedCas = (String)mc.getSerializedCas();
asExpected("cas = "+serializedCas);
- String prefix = "http:///uima/cas.ecore\"";;
- assertTrue(serializedCas.startsWith(prefix));
+ if(Testing.isVerifyPrefix()) {
+ String prefix = "http:///uima/cas.ecore\"";;
+ assertTrue(serializedCas.startsWith(prefix));
+ }
String documentText = mc.getDocumentText();
asExpected("documentText = "+documentText);
assertTrue(documentText.equals(""+c));
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java?rev=1636727&r1=1636726&r2=1636727&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Testing.java
Tue Nov 4 20:24:17 2014
@@ -20,11 +20,13 @@ package org.apache.uima.ducc.container.j
public class Testing {
- private static boolean disabled = true;
+ private static boolean disabled = false;
private static boolean verbose = false;
private static boolean warned = false;
private static boolean debug = false;
+ private static boolean verifyPrefix = false;
+
public static boolean isDisabled(String name ) {
if(disabled) {
if(!warned) {
@@ -42,4 +44,8 @@ public class Testing {
public static boolean isDebug() {
return debug;
}
+
+ public static boolean isVerifyPrefix() {
+ return verifyPrefix;
+ }
}
