svn commit: r1784339 - /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd

[schor]

Author: schor
Date: Fri Feb 24 22:46:26 2017
New Revision: 1784339

URL: http://svn.apache.org/viewvc?rev=1784339=rev
Log:
[UIMA-5335] Relax xml schema for fsindex labels merged

Modified:

uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd
   (props changed)

Propchange: 
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Feb 24 22:46:26 2017
@@ -0,0 +1,7 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd:933273-944396
+/uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd:1690273-1784338

svn commit: r1784338 - /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd

[schor]

Author: schor
Date: Fri Feb 24 22:45:13 2017
New Revision: 1784338

URL: http://svn.apache.org/viewvc?rev=1784338=rev
Log:
[UIMA-5335] Relax xml schema for fsindex labels

Modified:

uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd

Modified: 
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd
URL: 
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd?rev=1784338=1784337=1784338=diff
==
--- 
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd
 (original)
+++ 
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd
 Fri Feb 24 22:45:13 2017
@@ -398,7 +398,7 @@
 


-   
+   

svn commit: r1784337 - /uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd

[schor]

Author: schor
Date: Fri Feb 24 22:44:36 2017
New Revision: 1784337

URL: http://svn.apache.org/viewvc?rev=1784337=rev
Log:
[UIMA-5335] Relax xml schema for fsindex labels

Modified:
uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd

Modified: 
uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd?rev=1784337=1784336=1784337=diff
==
--- uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd 
(original)
+++ uima/uimaj/trunk/uimaj-core/src/main/resources/resourceSpecifierSchema.xsd 
Fri Feb 24 22:44:36 2017
@@ -398,7 +398,7 @@
 


-   
+   

svn commit: r1784322 - /uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/admin-commands.tex

[degenaro]

Author: degenaro
Date: Fri Feb 24 20:25:59 2017
New Revision: 1784322

URL: http://svn.apache.org/viewvc?rev=1784322=rev
Log:
UIMA-5301 DUCC Book missing start_ducc and stop_ducc option -c head

Modified:

uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/admin-commands.tex

Modified: 
uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/admin-commands.tex
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/admin-commands.tex?rev=1784322=1784321=1784322=diff
==
--- 
uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/admin-commands.tex
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/admin-commands.tex
 Fri Feb 24 20:25:59 2017
@@ -78,9 +78,10 @@ start\_ducc -c sm -c pm -c rm -c or@bj22
 \item[pm]The Process Manager
 \item[sm]The Service Manager
 \item[ws]The Web Server
-\item[agent@node]Node Agents
+\item[agent@node] Node Agents
 \item[broker] ActiveMQ broker
 \item[db] Database
+\item[head] All of the above, except Node Agents
   \end{description}
 
   \item[--nothreading] If specified, the command does not run in 
multi-threaded mode
@@ -213,6 +214,7 @@ start_ducc -c rm
   \item[db] The database.
   \item[broker] The ActiveMQ broker (only if the broker is 
auto-managed).
   \item[agent@node] Node Agent on the specified node.
+  \item[head] All of the above, except Node Agents
   \end{description}
 
   \item[-w, --wait {[time in seconds]}] If given, this signals the 
time to wait

svn commit: r1784316 - /uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java

[burn]

Author: burn
Date: Fri Feb 24 19:27:30 2017
New Revision: 1784316

URL: http://svn.apache.org/viewvc?rev=1784316=rev
Log:
UIMA-5330 Put DUCC jars at head of user's classpath as it may contain old ones

Modified:

uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java?rev=1784316=1784315=1784316=diff
==
--- 
uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java
 Fri Feb 24 19:27:30 2017
@@ -6,9 +6,9 @@
  * 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
@@ -62,7 +62,7 @@ import org.apache.uima.ducc.transport.ev
  * 0|1 long long
  * The first token is 1 if the ping succeeded, 0 otherwise.
  * The second token is the total cumulative work executed by the service.
- * The third token is the current queue depth of the service.   
+ * The third token is the current queue depth of the service.
  */
 
 class PingDriver
@@ -70,10 +70,10 @@ class PingDriver
SmConstants
 {
 /**
-* 
+*
 */
 
-   private DuccLogger logger = 
DuccLogger.getLogger(this.getClass().getName(), COMPONENT_NAME);
+   private DuccLogger logger = 
DuccLogger.getLogger(this.getClass().getName(), COMPONENT_NAME);
 
 String[] jvm_args;
 String endpoint;
@@ -118,17 +118,17 @@ class PingDriver
 boolean shutdown = false;
 PingStopper pingStopper = null;
 Timer timer = null;
-
+
 ServiceState pingState = ServiceState.Waiting;
 DuccProperties meta_props;
-
+
 PingDriver(ServiceSet sset)
-{
+{
 this.sset = sset;
 DuccProperties job_props = sset.getJobProperties();
 meta_props = sset.getMetaProperties();
 
-// establish the default pinger, then see if another pinger is 
specified and set it.
+// establish the default pinger, then see if another pinger is 
specified and set it.
 this.ping_class= 
System.getProperty("ducc.sm.default.monitor.class", 
"org.apache.uima.ducc.cli.UimaAsPing");
 this.ping_class= 
job_props.getStringProperty(UiOption.ServicePingClass.pname(),  
this.ping_class);
 
@@ -144,22 +144,22 @@ class PingDriver
 if ( real_class != null ) {
 this.ping_class = real_class;
 }
-logger.info("", sset.getId(), "Using ping class", 
this.ping_class); 
+logger.info("", sset.getId(), "Using ping class", 
this.ping_class);
 }
-
+
 this.endpoint  = meta_props.getStringProperty("endpoint");
 this.user  = meta_props.getStringProperty("user");
 this.max_instances = 
Integer.parseInt(System.getProperty("ducc.sm.max.instances", "10"));
 
 this.ping_arguments= resolveStringProperty 
(UiOption.ServicePingArguments.pname() , ping_props, job_props, null);
 String jvm_args_str= resolveStringProperty 
(UiOption.ServicePingJvmArgs.pname()   , ping_props, job_props, "");
-
+
 this.meta_ping_timeout = resolveIntProperty
(UiOption.ServicePingTimeout.pname()   , ping_props, job_props, 
ServiceManagerComponent.meta_ping_timeout);
 this.do_log= 
resolveBooleanProperty(UiOption.ServicePingDoLog.pname() , ping_props, 
job_props, false);
 this.classpath = resolveStringProperty 
(UiOption.ServicePingClasspath.pname() , ping_props, job_props, 
System.getProperty("java.class.path"));
-this.working_directory = resolveStringProperty 
(UiOption.WorkingDirectory.pname() , ping_props, job_props, null); // cli 
always puts this into job props, no default 
+this.working_directory = resolveStringProperty 
(UiOption.WorkingDirectory.pname() , ping_props, job_props, null); // cli 
always puts this into job props, no default
 
-this.log_directory = resolveStringProperty 
(UiOption.LogDirectory.pname() , ping_props, job_props, null); // 
cli always puts this into job props, no default 
+this.log_directory = resolveStringProperty 
(UiOption.LogDirectory.pname() , ping_props, job_props, null); // 
cli always puts this into job props, no default
 

svn commit: r1784299 - in /uima/ruta/trunk/ruta-core/src: main/java/org/apache/uima/ruta/ main/java/org/apache/uima/ruta/descriptor/ main/java/org/apache/uima/ruta/engine/ main/java/org/apache/uima/ru

[pkluegl]

Author: pkluegl
Date: Fri Feb 24 16:50:56 2017
New Revision: 1784299

URL: http://svn.apache.org/viewvc?rev=1784299=rev
Log:
UIMA-5219
- added some primitive type usage info

Modified:

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TypeUsageInformation.java

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorFactory.java

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/expression/ExpressionFactory.java

uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java?rev=1784299=1784298=1784299=diff
==
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaScriptFactory.java
 Fri Feb 24 16:50:56 2017
@@ -40,7 +40,6 @@ import org.apache.uima.ruta.expression.b
 import org.apache.uima.ruta.expression.number.INumberExpression;
 import org.apache.uima.ruta.expression.string.IStringExpression;
 import org.apache.uima.ruta.expression.type.ITypeExpression;
-import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
 import org.apache.uima.ruta.rule.AbstractRuleElement;
 import org.apache.uima.ruta.rule.ComposedRuleElement;
 import org.apache.uima.ruta.rule.ConjunctRulesRuleElement;
@@ -72,13 +71,10 @@ public class RutaScriptFactory {
 
   private ExpressionFactory expressionFactory;
 
-  private TypeUsageInformation typeUsage;
-
-  public RutaScriptFactory(ExpressionFactory expressionFactory, 
TypeUsageInformation typeUsage) {
+  public RutaScriptFactory(ExpressionFactory expressionFactory) {
 super();
-this.typeUsage = typeUsage;
 if (expressionFactory == null) {
-  this.expressionFactory = new ExpressionFactory(typeUsage);
+  this.expressionFactory = new ExpressionFactory();
 } else {
   this.expressionFactory = expressionFactory;
 }

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TypeUsageInformation.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TypeUsageInformation.java?rev=1784299=1784298=1784299=diff
==
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TypeUsageInformation.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TypeUsageInformation.java
 Fri Feb 24 16:50:56 2017
@@ -19,8 +19,13 @@
 package org.apache.uima.ruta;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 
+import org.apache.uima.cas.Type;
+import org.apache.uima.ruta.block.RutaBlock;
+
 /**
  * Container for storing information about the usage of types and annotations 
within a ruta
  * script/module.
@@ -30,6 +35,8 @@ public class TypeUsageInformation {
 
   private List mentionedTypes;
 
+  private Collection usedTypes;
+  
   public TypeUsageInformation() {
 super();
 mentionedTypes = new ArrayList<>();
@@ -43,4 +50,27 @@ public class TypeUsageInformation {
 return mentionedTypes;
   }
 
+  public void resolveTypes(RutaModule module) {
+usedTypes = new HashSet<>();
+resolveTypes(module.getRootBlock());
+for (RutaModule rutaModule : module.getScripts().values()) {
+  resolveTypes(rutaModule.getRootBlock());
+}
+
+  }
+
+  private void resolveTypes(RutaBlock rootBlock) {
+for (String mention : mentionedTypes) {
+  Type type = rootBlock.getEnvironment().getType(mention);
+  if(type != null) {
+usedTypes.add(type.getName());
+  }
+}
+  }
+
+  public Collection getUsedTypes() {
+return usedTypes;
+  }
+
+  
 }

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorFactory.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorFactory.java?rev=1784299=1784298=1784299=diff
==
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorFactory.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorFactory.java
 Fri Feb 24 16:50:56 2017
@@ -137,7 +137,7 @@ public class RutaDescriptorFactory {
 parser.setDescriptorInformation(descInfo);
 
 ExpressionFactory expressionFactory = new ExpressionFactory();
-RutaScriptFactory 

svn commit: r1784289 - /uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ConditionedAnnotationTypeExpression.java

[pkluegl]

Author: pkluegl
Date: Fri Feb 24 16:03:01 2017
New Revision: 1784289

URL: http://svn.apache.org/viewvc?rev=1784289=rev
Log:
UIMA-5332 + UIMA-5331
- fix import

Modified:

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ConditionedAnnotationTypeExpression.java

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ConditionedAnnotationTypeExpression.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ConditionedAnnotationTypeExpression.java?rev=1784289=1784288=1784289=diff
==
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ConditionedAnnotationTypeExpression.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ConditionedAnnotationTypeExpression.java
 Fri Feb 24 16:03:01 2017
@@ -19,22 +19,12 @@
 
 package org.apache.uima.ruta.expression;
 
-import static org.junit.Assert.assertNotNull;
-
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
-import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.ruta.RutaStream;
 import org.apache.uima.ruta.condition.AbstractRutaCondition;
-import org.apache.uima.ruta.expression.annotation.IAnnotationExpression;
-import org.apache.uima.ruta.expression.annotation.IAnnotationListExpression;
-import org.apache.uima.ruta.expression.feature.FeatureExpression;
-import org.apache.uima.ruta.expression.feature.FeatureMatchExpression;
-import org.apache.uima.ruta.expression.type.ITypeExpression;
 import org.apache.uima.ruta.rule.EvaluatedCondition;
 import org.apache.uima.ruta.rule.MatchContext;
 import org.apache.uima.ruta.visitor.InferenceCrowd;

svn commit: r1784287 [2/2] - in /uima/ruta/trunk: ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/ ruta-core/src/main/java/org/apache/uima/ruta/ ruta-core/src/main/java/org/apache/uima/ruta/desc

[pkluegl]

Modified: 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java?rev=1784287=1784286=1784287=diff
==
--- 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java
 Fri Feb 24 15:45:45 2017
@@ -217,5 +217,26 @@ public class AnnotationFeatureExpression
 RutaTestUtils.assertAnnotationsEquals(cas, 10, 1, "Some");
 
   }
+  
+  @Test
+  public void testFeatureMatch() throws Exception {
+String document = "This is a test.";
+String script = "";
+script += "Document{-> CREATE(Struct1, \"a\" = SW.begin == 8)};\n";
+script += "Struct1.a{-> T1};\n";
+
+Map complexTypes = new TreeMap();
+complexTypes.put("Struct1", "uima.tcas.Annotation");
+Map features = new TreeMap();
+List list = new ArrayList();
+features.put("Struct1", list);
+list.add(new TestFeature("a", "", "uima.tcas.Annotation"));
+list.add(new TestFeature("as", "", "uima.cas.FSArray"));
+
+CAS cas = RutaTestUtils.getCAS(document, complexTypes, features);
+Ruta.apply(cas, script);
+
+RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "a");
+  }
 
 }

Modified: 
uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.syntax.xml
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.syntax.xml?rev=1784287=1784286=1784287=diff
==
--- uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.syntax.xml 
(original)
+++ uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.syntax.xml Fri 
Feb 24 15:45:45 2017
@@ -125,9 +125,10 @@ RuleElements   -> RuleElement+
 RuleElement-> (Identifier ":")? "@"? 
 RuleElementType | RuleElementLiteral
 | RuleElementComposed | RuleElementWildCard
-RuleElementType->  MatchReference OptionalRuleElementPart
-RuleElementWithCA  ->  MatchReference ("{" Conditions?  Actions? "}")?
-MatchReference -> TypeExpression | FeatureMatchExpression
+RuleElementType->  AnnotationTypeExpr OptionalRuleElementPart
+RuleElementWithCA  ->  AnnotationTypeExpr ("{" Conditions?  Actions? "}")?
+AnnotationTypeExpr -> (TypeExpression | AnnotationExpression) 
+  (Operator)? Expression ("{" Conditions "}")?
 FeatureMatchExpression -> TypeExpression ( "." Feature)+ 
   ( Operator (Expression | "null"))?
 RuleElementLiteral ->  SimpleStringExpression OptionalRuleElementPart

Modified: uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml?rev=1784287=1784286=1784287=diff
==
--- uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml (original)
+++ uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml Fri Feb 24 
15:45:45 2017
@@ -413,6 +413,21 @@ Entity{-> MentionedAfter, MentionedAfter
 
 
 
+  Expressions for annoations can be extended by a feature match and also 
conditions. This does also apply for type expressions
+  that represent annoations. This functionality is illustrated with a 
simple example:
+
+
+
+
+  Here, an annotation of the type EmplRelation ios created 
for each sentence.
+  The feature employeeRef is filled with one 
Employee annotation.
+  This annotation is specified by its type Employee. The 
first annotation
+  of this type within the matched sentence, which coveres the text 
Peter and also
+  ends with a Sentence annotation, is selected.
+
+
+
   In the last examples, the values of features were defined as annotation 
types. However, also primitive 
   types can be used, as will be shown in the next example, together with a 
short introduction of variables.
 

Modified: 
uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g?rev=1784287=1784286=1784287=diff
==
--- 
uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g
 (original)
+++ 

svn commit: r1784287 [1/2] - in /uima/ruta/trunk: ruta-core/src/main/antlr3/org/apache/uima/ruta/parser/ ruta-core/src/main/java/org/apache/uima/ruta/ ruta-core/src/main/java/org/apache/uima/ruta/desc

[pkluegl]

Author: pkluegl
Date: Fri Feb 24 15:45:45 2017
New Revision: 1784287

URL: http://svn.apache.org/viewvc?rev=1784287=rev
Log:
UIMA-5332 + UIMA-5331
- adapt grammars and inference
UIMA-5219
- prepare

Added:

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/TypeUsageInformation.java
   (with props)

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ConditionedAnnotationTypeExpression.java
   (with props)

uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java
   (with props)

uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/ConditionedAnnotationTypeExpressionTest.java
   (with props)

uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ConditionedAnnotationTypeExpression.java
   (with props)
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/RutaScriptFactory.java

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorFactory.java

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/expression/AnnotationTypeExpression.java

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/ExpressionFactory.java

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/feature/GenericFeatureExpression.java

uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/visitor/InferenceCrowd.java

uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java
uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.syntax.xml
uima/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml

uima/ruta/trunk/ruta-ep-ide/src/main/antlr3/org/apache/uima/ruta/ide/core/parser/RutaParser.g

uima/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/parser/ast/ExpressionFactory.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=1784287=1784286=1784287=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 Feb 24 15:45:45 2017
@@ -106,7 +106,6 @@ import org.apache.uima.ruta.rule.quantif
 @parser::members {
 private List vars = new ArrayList();   
 private int level = 0;
-private RutaScriptFactory factory = new RutaScriptFactory();
 private RutaExternalFactory external;
 private String namespace;
 private String moduleName;
@@ -114,7 +113,16 @@ private ResourceManager resourceManager;
 private UimaContext context;
 
 private RutaDescriptorInformation descInfo;
+private ExpressionFactory expressionFactory;
+private RutaScriptFactory factory;
 
+public void setScriptFactory(RutaScriptFactory factory) {
+   this.factory = factory;
+}
+
+public void setExpressionFactory(ExpressionFactory factory) {
+   this.expressionFactory = factory;
+}
 
 public void setDescriptorInformation(RutaDescriptorInformation descInfo) {
   this.descInfo = descInfo;  
@@ -133,7 +141,6 @@ public void setExternalFactory(RutaExter
 }
public void setContext(UimaContext context){
this.context = context;
-   factory.setContext(context);
}
 
public void emitErrorMessage(String msg) {
@@ -1032,21 +1039,21 @@ ruleElementMatchPart [RuleElementContain
(
 (annotationAddressExpression)=>addressExpr = annotationAddressExpression 
  {
-MatchReference mr = 
ExpressionFactory.createMatchReference(addressExpr);
+MatchReference mr = 
expressionFactory.createMatchReference(addressExpr);
 re = factory.createRuleElement(mr, container, 
$blockDeclaration::env);
  } 
  
 |
 (typeFunction)=> tf = typeFunction 
 {
-   MatchReference mr = ExpressionFactory.createMatchReference(tf);
+   MatchReference mr = expressionFactory.createMatchReference(tf);
re = factory.createRuleElement(mr, container, $blockDeclaration::env);
 }
 
 |
  match = dottedIdWithIndex2 ((comp = LESS | comp = GREATER | comp = 
GREATEREQUAL | comp = LESSEQUAL |comp =  EQUAL | comp = NOTEQUAL) arg = 
argument)?
  {
-MatchReference mr = ExpressionFactory.createMatchReference(match, 
comp, arg);
+MatchReference mr = expressionFactory.createMatchReference(match, 
comp, arg);
 re = factory.createRuleElement(mr, container, 
$blockDeclaration::env);
  }
  
@@ -1110,7 +1117,7 @@ rawActions returns [Listfe = featureExpression 

svn commit: r1784286 - /uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java

[degenaro]

Author: degenaro
Date: Fri Feb 24 15:07:54 2017
New Revision: 1784286

URL: http://svn.apache.org/viewvc?rev=1784286=rev
Log:
UIMA-5302 DUCC Web Server (WS) System Broker page incomplete for Preference 
Table Style = Scroll

Modified:

uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java

Modified: 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1784286=1784285=1784286=diff
==
--- 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
 (original)
+++ 
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
 Fri Feb 24 15:07:54 2017
@@ -1818,7 +1818,7 @@ public class DuccHandlerJsonFormat exten
 
Map> topicAttributes = 
brokerHelper.getEntityAttributes();

-   if(topics.size() > 0) {
+   if(topicAttributes.size() > 0) {
for(Entry> entry : 
topicAttributes.entrySet()) {
String topic = entry.getKey();
String attrValue;
@@ -1860,6 +1860,7 @@ public class DuccHandlerJsonFormat exten
}
}
data.addAll(topics);
+   data.addAll(queues);
}

jsonResponse.add("aaData", data);