svn commit: r1851039 - /uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/RegExpRuleTest.java
Author: vmorari
Date: Fri Jan 11 13:14:49 2019
New Revision: 1851039
URL: http://svn.apache.org/viewvc?rev=1851039=rev
Log:
UIMA-5947: added test.
Modified:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/RegExpRuleTest.java
Modified:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/RegExpRuleTest.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/RegExpRuleTest.java?rev=1851039=1851038=1851039=diff
==
---
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/RegExpRuleTest.java
(original)
+++
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/RegExpRuleTest.java
Fri Jan 11 13:14:49 2019
@@ -36,6 +36,7 @@ import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
+import org.junit.Assert;
import org.junit.Test;
public class RegExpRuleTest {
@@ -147,4 +148,23 @@ public class RegExpRuleTest {
RutaTestUtils.assertAnnotationsEquals(cas, 2, 2, "concept", "a");
}
+ @Test
+ public void testPartitioningInSequentialMatching() throws Exception {
+String document = "11\n11ab\n1122\n11";
+String script = " ";
+
+script += "\"11\" -> T1;\r\n";
+script += "\"[0-9]\" -> T2;\r\n";
+script += "ADDRETAINTYPE(WS);\r\n";
+script += "a:(T1 Annotation*{PARTOF({W,T2})}){-> T3};\r\n";
+script += "REMOVERETAINTYPE(WS);";
+
+CAS cas = RutaTestUtils.getCAS(document);
+Ruta.apply(cas, script);
+
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 4, "11", "11", "11", "11");
+Assert.assertEquals(10,
+
cas.getAnnotationIndex(cas.getTypeSystem().getType(RutaTestUtils.TYPE +
"2")).size());
+RutaTestUtils.assertAnnotationsEquals(cas, 3, 4, "11", "11ab", "1122",
"11");
+ }
}
svn commit: r1851078 - /uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/wrapper/JUnitServiceWrapperTestCase.java
Author: cwiklik
Date: Fri Jan 11 16:54:45 2019
New Revision: 1851078
URL: http://svn.apache.org/viewvc?rev=1851078=rev
Log:
UIMA-5954 modified paths of things to use system user.name
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/wrapper/JUnitServiceWrapperTestCase.java
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/wrapper/JUnitServiceWrapperTestCase.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/wrapper/JUnitServiceWrapperTestCase.java?rev=1851078=1851077=1851078=diff
==
---
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/wrapper/JUnitServiceWrapperTestCase.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/wrapper/JUnitServiceWrapperTestCase.java
Fri Jan 11 16:54:45 2019
@@ -148,10 +148,10 @@ public class JUnitServiceWrapperTestCase
System.setProperty("ducc.deploy.service.type",
"NotesService");
System.setProperty("ducc.deploy.JpType", "uima");
System.setProperty("ducc.deploy.JpAeDescriptor","NoOpAE");
-
System.setProperty("ducc.deploy.JobDirectory","/home/cwiklik/ducc/logs");
+
System.setProperty("ducc.deploy.JobDirectory","/home/"+System.getProperty("user.name")+"/ducc/logs");
System.setProperty("ducc.deploy.JpFlowController","org.apache.uima.flow.FixedFlowController");
-
System.setProperty("ducc.process.log.dir","/home/cwiklik/ducc/logs/2/");
- System.setProperty("ducc.job.id","2");
+
System.setProperty("ducc.process.log.dir","/home/"+System.getProperty("user.name")+"/ducc/logs/2000/");
+ System.setProperty("ducc.job.id","2000");
ServiceWrapper service = new ServiceWrapper();
Timer fTimer = new Timer("testPullService Timer");
svn commit: r1851060 - in /uima/ruta/trunk/ruta-core/src: main/antlr3/org/apache/uima/ruta/parser/ main/java/org/apache/uima/ruta/rule/ main/java/org/apache/uima/ruta/verbalize/ test/java/org/apache/u
Author: vmorari
Date: Fri Jan 11 15:26:46 2019
New Revision: 1851060
URL: http://svn.apache.org/viewvc?rev=1851060=rev
Log:
UIMA-5955: allowed multiple inlined rule blocks. added test.
Modified:
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/rule/AbstractRuleElement.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleElement.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRule.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ScriptVerbalizer.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/InlinedRulesTest.java
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=1851060=1851059=1851060=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
Fri Jan 11 15:26:46 2019
@@ -998,7 +998,7 @@ String label = null;
re1 = ruleElementAnnotationType[container] {re = re1;}
| re2 = ruleElementLiteral[container] {re = re2;}
| (ruleElementComposed[null])=>re3 = ruleElementComposed[container] {re
= re3;}
- | (ruleElementWildCard[null])=> re5 = ruleElementWildCard[container]
{re = re5;}
+ | (ruleElementWildCard[null])=> re4 = ruleElementWildCard[container]
{re = re4;}
| (ruleElementOptional[null])=> re5 = ruleElementOptional[container]
{re = re5;}
)
{
@@ -1006,18 +1006,19 @@ String label = null;
re.setStartAnchor(start != null);
}
(t = (THEN2)
+ {innerConditionRules = new ArrayList();}
LCURLY
(rule = simpleStatement {innerConditionRules.add(rule);})+
RCURLY
- {re.setInlinedConditionRules(innerConditionRules);}
-
- )?
- (t = (THEN)
+ {re.addInlinedConditionRules(innerConditionRules);}
+ )*
+ (t = (THEN)
+ {innerActionRules = new ArrayList();}
LCURLY
(rule = simpleStatement {innerActionRules.add(rule);})+
RCURLY
- {re.setInlinedActionRules(innerActionRules);}
- )?
+ {re.addInlinedActionRules(innerActionRules);}
+ )*
;
ruleElementWildCard [RuleElementContainer container] returns
[AbstractRuleElement re = null]
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java?rev=1851060=1851059=1851060=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/AbstractRuleElement.java
Fri Jan 11 15:26:46 2019
@@ -54,9 +54,9 @@ public abstract class AbstractRuleElemen
@SuppressWarnings("unchecked")
protected final InferenceCrowd emptyCrowd = new
InferenceCrowd(Collections.EMPTY_LIST);
- protected List inlinedConditionRules;
+ protected List> inlinedConditionRuleBlocks = new
ArrayList<>();
- protected List inlinedActionRules;
+ protected List> inlinedActionRuleBlocks = new
ArrayList<>();
public AbstractRuleElement(RuleElementQuantifier quantifier,
List conditions, List
actions,
@@ -89,25 +89,25 @@ public abstract class AbstractRuleElemen
}
}
- protected List processInlinedActionRules(RuleMatch ruleMatch,
RutaStream stream,
+ protected List> processInlinedActionRules(RuleMatch
ruleMatch, RutaStream stream,
InferenceCrowd crowd) {
-if (inlinedActionRules != null && !inlinedActionRules.isEmpty()) {
- return processInlinedRules(inlinedActionRules, ruleMatch, stream, crowd);
+if (inlinedActionRuleBlocks != null && !inlinedActionRuleBlocks.isEmpty())
{
+ return processInlinedRules(inlinedActionRuleBlocks, ruleMatch, stream,
crowd);
}
return null;
}
- protected List processInlinedConditionRules(RuleMatch
ruleMatch, RutaStream stream,
+ protected List> processInlinedConditionRules(RuleMatch
ruleMatch, RutaStream stream,
InferenceCrowd crowd) {
-if (inlinedConditionRules != null && !inlinedConditionRules.isEmpty()) {
- return processInlinedRules(inlinedConditionRules, ruleMatch, stream,
crowd);
+if (inlinedConditionRuleBlocks != null &&
!inlinedConditionRuleBlocks.isEmpty()) {
+ return processInlinedRules(inlinedConditionRuleBlocks, ruleMatch,
stream, crowd);
}
return null;
}
- protected List
svn commit: r1851066 - in /uima/uima-ducc/trunk/uima-ducc-pullservice/src: main/java/org/apache/uima/ducc/ps/service/ main/java/org/apache/uima/ducc/ps/service/main/ test/java/org/apache/uima/ducc/ps/
Author: cwiklik
Date: Fri Jan 11 15:49:00 2019
New Revision: 1851066
URL: http://svn.apache.org/viewvc?rev=1851066=rev
Log:
UIMA-5954 Modified to generate DD if a given DD does not exist
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/ServiceConfiguration.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/main/ServiceWrapper.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/wrapper/JUnitServiceWrapperTestCase.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/test/ae/NoOpAE.java
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/ServiceConfiguration.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/ServiceConfiguration.java?rev=1851066=1851065=1851066=diff
==
---
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/ServiceConfiguration.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/ServiceConfiguration.java
Fri Jan 11 15:49:00 2019
@@ -19,6 +19,8 @@
package org.apache.uima.ducc.ps.service;
+import java.util.List;
+
import org.apache.uima.ducc.ps.service.errors.ServiceInitializationException;
public class ServiceConfiguration {
@@ -249,12 +251,48 @@ public class ServiceConfiguration {
Integer.valueOf(System.getProperty("ducc.process.thread.sleep.time"));
}
jpType = System.getProperty("ducc.deploy.JpType");
+ if ( System.getProperty("ducc.deploy.JpAeDescriptor") != null )
{
+
setAeDescriptor(System.getProperty("ducc.deploy.JpAeDescriptor"));
+ }
+ if ( System.getProperty("ducc.deploy.JobDirectory") != null ) {
+
setJobDirectory(System.getProperty("ducc.deploy.JobDirectory") );
+ }
+ if ( System.getProperty("ducc.deploy.JpFlowController") != null
) {
+
setJpFlowController(System.getProperty("ducc.deploy.JpFlowController"));
+ }
+ if ( System.getProperty("ducc.deploy.JpCmDescriptor") != null ) {
+
setCmDescriptor(System.getProperty("ducc.deploy.JpCmDescriptor"));
+ }
+ if ( System.getProperty("ducc.deploy.JpCcDescriptor") != null )
{
+
setCcDescriptor(System.getProperty("ducc.deploy.JpCcDescriptor"));
+}
+ if ( System.getProperty("ducc.deploy.JpCmOverrides") != null ) {
+
setCmOverrides(System.getProperty("ducc.deploy.JpCmOverrides"));
+ }
+ if ( System.getProperty("ducc.deploy.JpAeOverrides") != null ) {
+
setAeOverrides(System.getProperty("ducc.deploy.JpAeOverrides"));
+ }
+ if ( System.getProperty("ducc.deploy.JpCcOverrides") != null ) {
+
setCcOverrides(System.getProperty("ducc.deploy.JpCcOverrides"));
+ }
+ if ( System.getProperty("ducc.job.id") != null ) {
+ setJobId(System.getProperty("ducc.job.id"));
+ }
+/*
+ List cmOverrides =
getPropertyListString("ducc.deploy.JpCmOverrides");
+ List aeOverrides =
getPropertyListString("ducc.deploy.JpAeOverrides");
+ List ccOverrides =
getPropertyListString("ducc.deploy.JpCcOverrides");
+*/
+
serviceJmxConnectURL = System.getProperty("ducc.jmx.port");
customRegistryClass =
System.getProperty("ducc.deploy.registry.class");
customProcessorClass =
System.getProperty("ducc.deploy.custom.processor.class");
processType =
System.getProperty("ducc.deploy.components");//=job-process
duccHome = System.getenv("DUCC_HOME");
- jobId = System.getenv("DUCC_JOBID");
+ if ( getJobId() == null ) {
+ setJobId(System.getenv("DUCC_JOBID"));
+ }
+
duccProcessId = System.getenv("DUCC_PROCESSID");
duccProcessUniqueId = System.getenv("DUCC_PROCESS_UNIQUEID");
monitorPort = System.getenv("DUCC_STATE_UPDATE_PORT");
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/main/ServiceWrapper.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/main/ServiceWrapper.java?rev=1851066=1851065=1851066=diff
==
svn commit: r1851098 - /uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/wrapper/JUnitServiceWrapperTestCase.java
Author: cwiklik
Date: Fri Jan 11 20:22:49 2019
New Revision: 1851098
URL: http://svn.apache.org/viewvc?rev=1851098=rev
Log:
UIMA-5954 modified to save generated ae descriptor in a working dir and delete
it when test is done
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/wrapper/JUnitServiceWrapperTestCase.java
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/wrapper/JUnitServiceWrapperTestCase.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/wrapper/JUnitServiceWrapperTestCase.java?rev=1851098=1851097=1851098=diff
==
---
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/wrapper/JUnitServiceWrapperTestCase.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-pullservice/src/test/java/org/apache/uima/ducc/ps/service/wrapper/JUnitServiceWrapperTestCase.java
Fri Jan 11 20:22:49 2019
@@ -18,6 +18,7 @@
*/
package org.apache.uima.ducc.ps.service.wrapper;
+import java.io.File;
import java.util.Timer;
import java.util.TimerTask;
@@ -143,14 +144,15 @@ public class JUnitServiceWrapperTestCase
String tasURL = "http://localhost:"+super.getPort()+"/test";
try {
+
System.setProperty("ducc.deploy.JdURL", tasURL);
System.setProperty("ducc.deploy.JpThreadCount","4");
System.setProperty("ducc.deploy.service.type",
"NotesService");
System.setProperty("ducc.deploy.JpType", "uima");
System.setProperty("ducc.deploy.JpAeDescriptor","NoOpAE");
-
System.setProperty("ducc.deploy.JobDirectory","/home/"+System.getProperty("user.name")+"/ducc/logs");
+
System.setProperty("ducc.deploy.JobDirectory",System.getProperty("user.dir"));
System.setProperty("ducc.deploy.JpFlowController","org.apache.uima.flow.FixedFlowController");
-
System.setProperty("ducc.process.log.dir","/home/"+System.getProperty("user.name")+"/ducc/logs/2000/");
+
System.setProperty("ducc.process.log.dir",System.getProperty("user.dir"));
System.setProperty("ducc.job.id","2000");
ServiceWrapper service = new ServiceWrapper();
@@ -161,7 +163,7 @@ public class JUnitServiceWrapperTestCase
service.initialize(new String[]
{analysisEngineDescriptor});
service.start();
-
+
} catch (ServiceInitializationException e) {
throw e;
@@ -170,6 +172,20 @@ public class JUnitServiceWrapperTestCase
} finally {
monitor.stop();
super.stopJetty();
+ File directory = new
File(System.getProperty("user.dir").
+
concat("/").concat(System.getProperty("ducc.job.id")));
+
+ if ( directory.exists() ) {
+ for (File f : directory.listFiles()) {
+ if (f.getName().startsWith("uima-ae-")) {
+ f.delete();
+ System.out.println("Removed generated
descriptor:"+f.getAbsolutePath());
+ }
+ }
+ directory.delete();
+
+ }
+
}
}
