svn commit: r10301 - in /release/uima/eclipse-update-site/ruta: ./ features/ plugins/
Author: pkluegl Date: Tue Aug 25 15:45:59 2015 New Revision: 10301 Log: no jira - add ruta-2.3.1 to update site Added: release/uima/eclipse-update-site/ruta/features/org.apache.uima.ruta.feature_2.3.1.jar (with props) release/uima/eclipse-update-site/ruta/features/org.apache.uima.ruta.feature_2.3.1.jar.asc release/uima/eclipse-update-site/ruta/features/org.apache.uima.ruta.feature_2.3.1.jar.md5 release/uima/eclipse-update-site/ruta/features/org.apache.uima.ruta.feature_2.3.1.jar.sha1 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.addons_2.3.1.jar (with props) release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.addons_2.3.1.jar.asc release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.addons_2.3.1.jar.md5 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.addons_2.3.1.jar.pack.gz (with props) release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.addons_2.3.1.jar.pack.gz.asc release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.addons_2.3.1.jar.pack.gz.md5 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.addons_2.3.1.jar.pack.gz.sha1 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.addons_2.3.1.jar.sha1 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.caseditor_2.3.1.jar (with props) release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.caseditor_2.3.1.jar.asc release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.caseditor_2.3.1.jar.md5 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.caseditor_2.3.1.jar.pack.gz (with props) release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.caseditor_2.3.1.jar.pack.gz.asc release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.caseditor_2.3.1.jar.pack.gz.md5 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.caseditor_2.3.1.jar.pack.gz.sha1 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.caseditor_2.3.1.jar.sha1 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.core.ext_2.3.1.jar (with props) release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.core.ext_2.3.1.jar.asc release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.core.ext_2.3.1.jar.md5 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.core.ext_2.3.1.jar.pack.gz (with props) release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.core.ext_2.3.1.jar.pack.gz.asc release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.core.ext_2.3.1.jar.pack.gz.md5 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.core.ext_2.3.1.jar.pack.gz.sha1 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.core.ext_2.3.1.jar.sha1 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.engine_2.3.1.jar (with props) release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.engine_2.3.1.jar.asc release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.engine_2.3.1.jar.md5 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.engine_2.3.1.jar.pack.gz (with props) release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.engine_2.3.1.jar.pack.gz.asc release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.engine_2.3.1.jar.pack.gz.md5 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.engine_2.3.1.jar.pack.gz.sha1 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.engine_2.3.1.jar.sha1 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.ide.ui_2.3.1.jar (with props) release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.ide.ui_2.3.1.jar.asc release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.ide.ui_2.3.1.jar.md5 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.ide.ui_2.3.1.jar.pack.gz (with props) release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.ide.ui_2.3.1.jar.pack.gz.asc release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.ide.ui_2.3.1.jar.pack.gz.md5 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.ide.ui_2.3.1.jar.pack.gz.sha1 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.ide.ui_2.3.1.jar.sha1 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.ide_2.3.1.jar (with props) release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.ide_2.3.1.jar.asc release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.ide_2.3.1.jar.md5 release/uima/eclipse-update-site/ruta/plugins/org.apache.uima.ruta.ide_2.3.1.jar.pack.gz (with props)
svn commit: r1697711 - /uima/site/trunk/uima-website/docs/d/ruta-2.3.1/tools.ruta.book.html
Author: pkluegl Date: Tue Aug 25 16:06:40 2015 New Revision: 1697711 URL: http://svn.apache.org/r1697711 Log: no jira - copy ruta-2.3.1 docs Added: uima/site/trunk/uima-website/docs/d/ruta-2.3.1/tools.ruta.book.html - copied unchanged from r1697710, uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html
svn commit: r1697719 - /uima/ruta/trunk/pom.xml
Author: pkluegl
Date: Tue Aug 25 16:18:02 2015
New Revision: 1697719
URL: http://svn.apache.org/r1697719
Log:
no jira - updated jira version
Modified:
uima/ruta/trunk/pom.xml
Modified: uima/ruta/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/pom.xml?rev=1697719r1=1697718r2=1697719view=diff
==
--- uima/ruta/trunk/pom.xml (original)
+++ uima/ruta/trunk/pom.xml Tue Aug 25 16:18:02 2015
@@ -22,7 +22,7 @@
descriptionThe top project for Apache UIMA Ruta/description
url${uimaWebsiteUrl}/url
properties
-jiraVersion12329281/jiraVersion
+jiraVersion12333294/jiraVersion
!--
assembly.attachfalse/assembly.attach
--
svn commit: r1697733 - in /uima/sandbox/uima-ducc/trunk: uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/
Author: challngr
Date: Tue Aug 25 16:49:56 2015
New Revision: 1697733
URL: http://svn.apache.org/r1697733
Log:
UIMA-4569 RM should report allocations in GB instead of shares - eliminate
warnings in eclipse.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java?rev=1697733r1=1697732r2=1697733view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeConfiguration.java
Tue Aug 25 16:49:56 2015
@@ -654,7 +654,7 @@ public class NodeConfiguration
props.setProperty(share-quantum,
+SystemPropertyResolver.getIntProperty(ducc.rm.share.quantum, 15));
} else {
try {
-int quantum = Integer.parseInt(q);
+ Integer.parseInt(q); // insure
it's a number
} catch (NumberFormatException e) {
throw new IllegalConfigurationException(Value for
\share-quantum\ in nodepool + props.getProperty(name) + is not a
number.);
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java?rev=1697733r1=1697732r2=1697733view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java
Tue Aug 25 16:49:56 2015
@@ -741,11 +741,6 @@ class NodePool
String methodName = rearrangeVirtual;
if ( allMachines.containsKey(m.key()) ) {
int v_order = m.getVirtualShareOrder();
-
-if ( v_order 0 ) {
- int stop_here = 1;
- stop_here++;
-}
int r_order = m.getShareOrder();
logger.trace(methodName, null, m.getId(), order, order,
v_order, v_order, r_order, r_order);
svn commit: r1697706 [1/3] - in /uima/site/trunk/uima-website: docs/d/ruta-current/tools.ruta.book.html docs/d/ruta-current/tools.ruta.book.pdf docs/downloads.html docs/ruta.html xdocs/ruta.xml xdocs/
Author: pkluegl Date: Tue Aug 25 15:55:47 2015 New Revision: 1697706 URL: http://svn.apache.org/r1697706 Log: no jira - started to update website Modified: uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.pdf uima/site/trunk/uima-website/docs/downloads.html uima/site/trunk/uima-website/docs/ruta.html uima/site/trunk/uima-website/xdocs/ruta.xml uima/site/trunk/uima-website/xdocs/stylesheets/project.xml
svn commit: r1697712 - /uima/site/trunk/uima-website/docs/d/ruta-2.3.1/css/
Author: pkluegl Date: Tue Aug 25 16:06:55 2015 New Revision: 1697712 URL: http://svn.apache.org/r1697712 Log: no jira - copy ruta-2.3.1 docs Added: uima/site/trunk/uima-website/docs/d/ruta-2.3.1/css/ - copied from r1697711, uima/site/trunk/uima-website/docs/d/ruta-current/css/
svn commit: r1697710 - /uima/site/trunk/uima-website/docs/d/ruta-2.3.1/tools.ruta.book.pdf
Author: pkluegl Date: Tue Aug 25 16:06:22 2015 New Revision: 1697710 URL: http://svn.apache.org/r1697710 Log: no jira - copy ruta-2.3.1 docs Added: uima/site/trunk/uima-website/docs/d/ruta-2.3.1/tools.ruta.book.pdf - copied unchanged from r1697709, uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.pdf
svn commit: r1697714 - /uima/site/trunk/uima-website/docs/d/ruta-2.3.1/issuesFixed/
Author: pkluegl Date: Tue Aug 25 16:07:51 2015 New Revision: 1697714 URL: http://svn.apache.org/r1697714 Log: no jira - copy ruta-2.3.1 docs Added: uima/site/trunk/uima-website/docs/d/ruta-2.3.1/issuesFixed/ - copied from r1697713, uima/site/trunk/uima-website/docs/d/ruta-2.3.0/issuesFixed/
svn commit: r1697713 - /uima/site/trunk/uima-website/docs/d/ruta-2.3.1/images/
Author: pkluegl Date: Tue Aug 25 16:07:10 2015 New Revision: 1697713 URL: http://svn.apache.org/r1697713 Log: no jira - copy ruta-2.3.1 docs Added: uima/site/trunk/uima-website/docs/d/ruta-2.3.1/images/ - copied from r1697712, uima/site/trunk/uima-website/docs/d/ruta-current/images/
svn commit: r10300 - in /release/uima/ruta-2.3.1: ./ issuesFixed/ issuesFixed/css/ issuesFixed/images/ issuesFixed/images/logos/
Author: pkluegl Date: Tue Aug 25 15:39:58 2015 New Revision: 10300 Log: no jira - add release to dist Added: release/uima/ruta-2.3.1/RELEASE_NOTES.html (with props) release/uima/ruta-2.3.1/issuesFixed/ release/uima/ruta-2.3.1/issuesFixed/css/ release/uima/ruta-2.3.1/issuesFixed/css/maven-base.css (with props) release/uima/ruta-2.3.1/issuesFixed/css/maven-theme.css (with props) release/uima/ruta-2.3.1/issuesFixed/css/print.css (with props) release/uima/ruta-2.3.1/issuesFixed/css/site.css (with props) release/uima/ruta-2.3.1/issuesFixed/images/ release/uima/ruta-2.3.1/issuesFixed/images/collapsed.gif (with props) release/uima/ruta-2.3.1/issuesFixed/images/expanded.gif (with props) release/uima/ruta-2.3.1/issuesFixed/images/external.png (with props) release/uima/ruta-2.3.1/issuesFixed/images/icon_error_sml.gif (with props) release/uima/ruta-2.3.1/issuesFixed/images/icon_info_sml.gif (with props) release/uima/ruta-2.3.1/issuesFixed/images/icon_success_sml.gif (with props) release/uima/ruta-2.3.1/issuesFixed/images/icon_warning_sml.gif (with props) release/uima/ruta-2.3.1/issuesFixed/images/logos/ release/uima/ruta-2.3.1/issuesFixed/images/logos/build-by-maven-black.png (with props) release/uima/ruta-2.3.1/issuesFixed/images/logos/build-by-maven-white.png (with props) release/uima/ruta-2.3.1/issuesFixed/images/logos/maven-feather.png (with props) release/uima/ruta-2.3.1/issuesFixed/images/newwindow.png (with props) release/uima/ruta-2.3.1/issuesFixed/jira-report.html (with props) release/uima/ruta-2.3.1/ruta-2.3.1-source-release.zip (with props) release/uima/ruta-2.3.1/ruta-2.3.1-source-release.zip.asc release/uima/ruta-2.3.1/ruta-2.3.1-source-release.zip.md5 release/uima/ruta-2.3.1/ruta-2.3.1-source-release.zip.sha1 Added: release/uima/ruta-2.3.1/RELEASE_NOTES.html == --- release/uima/ruta-2.3.1/RELEASE_NOTES.html (added) +++ release/uima/ruta-2.3.1/RELEASE_NOTES.html Tue Aug 25 15:39:58 2015 @@ -0,0 +1,77 @@ +html + !-- + *** + * 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. + *** + -- + +head + titleApache UIMA Ruta v2.3.1 Release Notes/title +/head +body +h1Apache UIMA Ruta#8482; v2.3.1 Release Notes/h1 + +h2Contents/h2 +p +a href=#what.is.uima-as1. What is UIMA Ruta/abr/ +a href=#major.changes2. Major Changes in this Release/abr/ +a href=#get.involved3. How to Get Involved/abr/ +a href=#report.issues4. How to Report Issues/abr/ +a href=#list.issues5. List of JIRA Issues Fixed in this Release/a +/p + +h2a name=what.is.uima-as1. What is UIMA Ruta?/a/h2 + + p + Apache UIMA Ruta#8482; is a rule-based script language supported by Eclipse-based tooling. + The language is designed to enable rapid development of text processing applications within Apache UIMA#8482;. + A special focus lies on the intuitive and flexible domain specific language for defining + patterns of annotations. The Eclipse-based tooling for Ruta, called the Ruta Workbench, + was created to support the user and to facilitate every step when writing Ruta rules. Both the + Ruta rule language and the Ruta Workbench integrate smoothly with Apache UIMA. + /p + +h2a name=major.changes2. Major Changes in this Release/a/h2 +p + This is a bugfix release. It fixes diverse problems of the rule inference, the ruta-maven-plugin and the UIMA Ruta Workbench. +/p + + +h2a name=get.involved3. How to Get Involved/a/h2 +p +The Apache UIMA Ruta project really needs and appreciates any contributions, +including documentation help, source code and feedback. If you are interested +in contributing, please visit +a href=http://uima.apache.org/get-involved.html; + http://uima.apache.org/get-involved.html/a. +/p + +h2a name=report.issues4. How to Report Issues/a/h2 +p +The Apache UIMA project uses JIRA for issue tracking. Please report any +issues
svn commit: r1697708 - /uima/site/trunk/uima-website/docs/d/ruta-2.3.1/
Author: pkluegl Date: Tue Aug 25 16:05:04 2015 New Revision: 1697708 URL: http://svn.apache.org/r1697708 Log: no jira - add folder for ruta-2.3.1 Added: uima/site/trunk/uima-website/docs/d/ruta-2.3.1/
svn commit: r1697722 - in /uima/site/trunk/uima-website: docs/index.html docs/news.html xdocs/index.xml xdocs/news.xml
Author: pkluegl Date: Tue Aug 25 16:27:51 2015 New Revision: 1697722 URL: http://svn.apache.org/r1697722 Log: no jira - updated news for ruta-2.3.1 Modified: uima/site/trunk/uima-website/docs/index.html uima/site/trunk/uima-website/docs/news.html uima/site/trunk/uima-website/xdocs/index.xml uima/site/trunk/uima-website/xdocs/news.xml Modified: uima/site/trunk/uima-website/docs/index.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/index.html?rev=1697722r1=1697721r2=1697722view=diff == --- uima/site/trunk/uima-website/docs/index.html (original) +++ uima/site/trunk/uima-website/docs/index.html Tue Aug 25 16:27:51 2015 @@ -305,6 +305,10 @@ blockquote class=sectionBody p ul + li +a href=news.html#25 Aug 201525 August 2015: strongApache UIMA Ruta 2.3.1 released/strong/a + /li + li a href=news.html#11 Aug 20111 August 2015: strongApache UIMA DUCC 2.0.0 released/strong/a /li Modified: uima/site/trunk/uima-website/docs/news.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/news.html?rev=1697722r1=1697721r2=1697722view=diff == --- uima/site/trunk/uima-website/docs/news.html (original) +++ uima/site/trunk/uima-website/docs/news.html Tue Aug 25 16:27:51 2015 @@ -204,6 +204,13 @@ blockquote class=sectionBody table class=subsectionToc tr + td25 August 2015/td + tda href='#25 Aug 2015' + Apache UIMA Ruta 2.3.1 released +/a + /td + /tr + tr td11 August 2015/td tda href='#11 Aug 2015' Apache UIMA DUCC 2.0.0 released @@ -516,6 +523,27 @@ trtd + + a name=25 Aug 2015 +h225 Aug 2015 +ndash; Apache UIMA Ruta 2.3.1 released +/h2 + /a + /td/tr + trtd +blockquote class=subsectionBody +pThis is a bugfix release. It fixes diverse problems of the rule inference, + the ruta-maven-plugin and the UIMA Ruta Workbench./p +pFor a complete list of bugs and improvements included in this release please see + a href=http://uima.apache.org/d/ruta-2.3.1/issuesFixed/jira-report.html;issue report/a. + /p +/blockquote +/td/tr +/table + table class=subsectionTable +trtd + + a name=11 Aug 2015 h211 Aug 2015 Modified: uima/site/trunk/uima-website/xdocs/index.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/index.xml?rev=1697722r1=1697721r2=1697722view=diff == --- uima/site/trunk/uima-website/xdocs/index.xml (original) +++ uima/site/trunk/uima-website/xdocs/index.xml Tue Aug 25 16:27:51 2015 @@ -138,6 +138,10 @@ p ul + li +a href=news.html#25 Aug 201525 August 2015: strongApache UIMA Ruta 2.3.1 released/strong/a + /li + li a href=news.html#11 Aug 20111 August 2015: strongApache UIMA DUCC 2.0.0 released/strong/a /li Modified: uima/site/trunk/uima-website/xdocs/news.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/news.xml?rev=1697722r1=1697721r2=1697722view=diff == --- uima/site/trunk/uima-website/xdocs/news.xml (original) +++ uima/site/trunk/uima-website/xdocs/news.xml Tue Aug 25 16:27:51 2015 @@ -29,10 +29,20 @@ /properties body + section name=Apache UIMA News subsectionToc/ + subsection name=25 Aug 2015 date = 25 August 2015 title=Apache UIMA Ruta 2.3.1 released + + pThis is a bugfix release. It fixes diverse problems of the rule inference, + the ruta-maven-plugin and the UIMA Ruta Workbench./p + pFor a complete list of bugs and improvements included in this release please see + a href=http://uima.apache.org/d/ruta-2.3.1/issuesFixed/jira-report.html;issue report/a. + /p + /subsection + subsection name=11 Aug 2015 date = 11 August 2015 title=Apache UIMA DUCC 2.0.0 released pDUCC stands for Distributed UIMA Cluster Computing. DUCC is a cluster
svn commit: r1697675 - /uima/uimaj/branches/experiment-v3-jcas/uimaj-jet-expander/src/org/apache/uima/util/jet/JetExpander.java
Author: schor
Date: Tue Aug 25 13:51:58 2015
New Revision: 1697675
URL: http://svn.apache.org/r1697675
Log:
no Jira - replace StringBuffer with StringBuilder in Jet Expander generated
code for jcasgen
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-jet-expander/src/org/apache/uima/util/jet/JetExpander.java
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-jet-expander/src/org/apache/uima/util/jet/JetExpander.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-jet-expander/src/org/apache/uima/util/jet/JetExpander.java?rev=1697675r1=1697674r2=1697675view=diff
==
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-jet-expander/src/org/apache/uima/util/jet/JetExpander.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-jet-expander/src/org/apache/uima/util/jet/JetExpander.java
Tue Aug 25 13:51:58 2015
@@ -87,7 +87,7 @@ public class JetExpander {
try {
i = outputStart();
expand(i);
- fileWriter.write(\nreturn
stringBuffer.toString();\n }\n});
+ fileWriter.write(\nreturn
stringBuilder.toString();\n }\n});
fileWriter.close();
} catch (IOException e2) {
e2.printStackTrace();
@@ -186,7 +186,7 @@ public class JetExpander {
}
fileWriter.write( {\n\n);
fileWriter.write( public String generate(Object argument) {\n);
-fileWriter.write(StringBuffer stringBuffer = new StringBuffer();\n);
+fileWriter.write(StringBuilder stringBuilder = new
StringBuilder();\n);
return in.indexOf('\n', nextQuotePos);
}
@@ -205,10 +205,10 @@ public class JetExpander {
// String [] lines = in.substring(i,trigger).split(\n,-1);
// for (int j = 0; j lines.length; j++) {
-// fileWriter.write(\nstringBuffer.append(\ +
lines[j] +
+// fileWriter.write(\nstringBuilder.append(\ +
lines[j] +
//((j lines.length-1) ? \\n : ) + \););
// }
- fileWriter.write(\nstringBuffer.append(\
+ fixupStr(i, trigger) + \););
+ fileWriter.write(\n
stringBuilder.append(\ + fixupStr(i, trigger) + \););
if (in.charAt(trigger+2) == '@') {
i = doInclude(trigger+3);
@@ -230,7 +230,7 @@ public class JetExpander {
continue;
}
else {
- fileWriter.write(\nstringBuffer.append(\ + fixupStr(i,
in.length()) + \););
+ fileWriter.write(\nstringBuilder.append(\ + fixupStr(i,
in.length()) + \););
break;
}
}
@@ -265,7 +265,7 @@ public class JetExpander {
int doInsert(int i) throws IOException {
int insertEnd = in.indexOf(%, i);
- fileWriter.write(\nstringBuffer.append( + in.substring(i,
insertEnd) + ););
+ fileWriter.write(\nstringBuilder.append( +
in.substring(i, insertEnd) + ););
return insertEnd + 2;
}
}
svn commit: r10299 - /release/uima/ruta-2.3.1/
Author: pkluegl Date: Tue Aug 25 15:35:17 2015 New Revision: 10299 Log: no jira - add folder for release Added: release/uima/ruta-2.3.1/
svn commit: r1697706 [3/3] - in /uima/site/trunk/uima-website: docs/d/ruta-current/tools.ruta.book.html docs/d/ruta-current/tools.ruta.book.pdf docs/downloads.html docs/ruta.html xdocs/ruta.xml xdocs/
Modified: uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.pdf URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.pdf?rev=1697706r1=1697705r2=1697706view=diff == Binary files - no diff available. Modified: uima/site/trunk/uima-website/docs/downloads.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/downloads.html?rev=1697706r1=1697705r2=1697706view=diff == --- uima/site/trunk/uima-website/docs/downloads.html (original) +++ uima/site/trunk/uima-website/docs/downloads.html Tue Aug 25 15:55:47 2015 @@ -1413,26 +1413,26 @@ Other mirrors: select name=Preferred tr td class=downloadtitleh3 class=downloadartifact - a href=../d/ruta-2.3.0/RELEASE_NOTES.html - UIMA Ruta 2.3.0/a/h3/td + a href=../d/ruta-2.3.1/RELEASE_NOTES.html + UIMA Ruta 2.3.1/a/h3/td td -div class=htmltxta href='../d/ruta-2.3.0/RELEASE_NOTES.html'html/a/div +div class=htmltxta href='../d/ruta-2.3.1/RELEASE_NOTES.html'html/a/div /td td /td td table class=downloadentries tr - tda href='[preferred]/uima//ruta-2.3.0/ruta-2.3.0-source-release.zip'zip/a/td - td[a href='http://www.apache.org/dist/uima//ruta-2.3.0/ruta-2.3.0-source-release.zip.asc'asc/a]/td - td[a href='http://www.apache.org/dist/uima//ruta-2.3.0/ruta-2.3.0-source-release.zip.md5'md5/a]/td - td[a href='http://www.apache.org/dist/uima//ruta-2.3.0/ruta-2.3.0-source-release.zip.sha1'sha1/a]/td + tda href='[preferred]/uima//ruta-2.3.1/ruta-2.3.1-source-release.zip'zip/a/td + td[a href='http://www.apache.org/dist/uima//ruta-2.3.1/ruta-2.3.1-source-release.zip.asc'asc/a]/td + td[a href='http://www.apache.org/dist/uima//ruta-2.3.1/ruta-2.3.1-source-release.zip.md5'md5/a]/td + td[a href='http://www.apache.org/dist/uima//ruta-2.3.1/ruta-2.3.1-source-release.zip.sha1'sha1/a]/td /tr /table /td td - div class=htmltxt05-Jun-2015/div + div class=htmltxt25-Aug-2015/div /td /tr Modified: uima/site/trunk/uima-website/docs/ruta.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/ruta.html?rev=1697706r1=1697705r2=1697706view=diff == --- uima/site/trunk/uima-website/docs/ruta.html (original) +++ uima/site/trunk/uima-website/docs/ruta.html Tue Aug 25 15:55:47 2015 @@ -385,7 +385,7 @@ lt;dependencygt; lt;groupIdgt;org.apache.uimalt;/groupIdgt; lt;artifactIdgt;ruta-corelt;/artifactIdgt; - lt;versiongt;2.3.0lt;/versiongt; + lt;versiongt;2.3.1lt;/versiongt; lt;/dependencygt; /pre subsubsection Modified: uima/site/trunk/uima-website/xdocs/ruta.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/ruta.xml?rev=1697706r1=1697705r2=1697706view=diff == --- uima/site/trunk/uima-website/xdocs/ruta.xml (original) +++ uima/site/trunk/uima-website/xdocs/ruta.xml Tue Aug 25 15:55:47 2015 @@ -152,7 +152,7 @@ under the License. lt;dependency lt;groupIdorg.apache.uimalt;/groupId lt;artifactIdruta-corelt;/artifactId - lt;version2.3.0lt;/version + lt;version2.3.1lt;/version lt;/dependency /pre subsubsection Modified: uima/site/trunk/uima-website/xdocs/stylesheets/project.xml URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/stylesheets/project.xml?rev=1697706r1=1697705r2=1697706view=diff == --- uima/site/trunk/uima-website/xdocs/stylesheets/project.xml (original) +++ uima/site/trunk/uima-website/xdocs/stylesheets/project.xml Tue Aug 25 15:55:47 2015 @@ -228,11 +228,15 @@ /downloads downloads version=Ruta title=Apache UIMA Ruta withreleasedate=true +download name=UIMA Ruta 2.3.1 subdirectory=ruta-2.3.1 releasedate=25-Aug-2015 + releasenotes filename=ruta-2.3.1/RELEASE_NOTES fhtml/f /releasenotes + source filename=ruta-2.3.1-source-release fzip/f /source +/download +!-- download name=UIMA Ruta 2.3.0 subdirectory=ruta-2.3.0 releasedate=05-Jun-2015 releasenotes filename=ruta-2.3.0/RELEASE_NOTES fhtml/f /releasenotes source filename=ruta-2.3.0-source-release fzip/f /source /download -!-- downloads version=Ruta title=Apache UIMA Ruta withreleasedate=true
svn commit: r1697715 - /uima/site/trunk/uima-website/docs/d/ruta-2.3.1/RELEASE_NOTES.html
Author: pkluegl Date: Tue Aug 25 16:09:47 2015 New Revision: 1697715 URL: http://svn.apache.org/r1697715 Log: no jira - copy ruta-2.3.1 docs Added: uima/site/trunk/uima-website/docs/d/ruta-2.3.1/RELEASE_NOTES.html - copied unchanged from r1697714, uima/site/trunk/uima-website/docs/d/ruta-2.3.0/RELEASE_NOTES.html
svn commit: r1697706 [2/3] - in /uima/site/trunk/uima-website: docs/d/ruta-current/tools.ruta.book.html docs/d/ruta-current/tools.ruta.book.pdf docs/downloads.html docs/ruta.html xdocs/ruta.xml xdocs/
Modified: uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html?rev=1697706r1=1697705r2=1697706view=diff == --- uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html (original) +++ uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.html Tue Aug 25 15:55:47 2015 @@ -2,7 +2,7 @@ meta http-equiv=Content-Type content=text/html; charset=ISO-8859-1 titleApache UIMA Ruta#8482; Guide and Reference/titlelink rel=stylesheet type=text/css href=css/stylesheet-html.cssmeta name=generator content=DocBook XSL-NS Stylesheets V1.76.1/headbody bgcolor=white text=black link=#FF vlink=#840084 alink=#FFdiv lang=en class=book title=Apache UIMA Ruta#8482; Guide and Reference id=d5e1div xmlns:d=http://docbook.org/ns/docbook; class=titlepagedivdivh1 class=titleApache UIMA Ruta#8482; Guide and Reference/h1/divdivdiv class=authorgroup h3 class=corpauthorWritten and maintained by the Apache UIMA Development Community/h3 -/div/divdivp class=releaseinfoVersion 2.3.0/p/divdivp class=copyrightCopyright copy; 2011, 2015 The Apache Software Foundation/p/divdivdiv class=legalnotice title=Legal Noticea name=d5e8/a +/div/divdivp class=releaseinfoVersion 2.3.1/p/divdivp class=copyrightCopyright copy; 2011, 2015 The Apache Software Foundation/p/divdivdiv class=legalnotice title=Legal Noticea name=d5e8/a p /p p title=License and Disclaimer bLicense and Disclaimer.nbsp;/b @@ -35,11 +35,11 @@ the trademark or service mark. /p -/div/divdivp class=pubdateMay, 2015/p/div/divhr/divdiv class=tocpbTable of Contents/b/pdldtspan class=chaptera href=#ugr.tools.ruta.overview1. Apache UIMA Ruta Overview/a/span/dtdddldtspan class=sectiona href=#ugr.tools.ruta.overview.intro1.1. What is Apache UIMA Ruta?/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.overview.gettingstarted1.2. Getting started/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.overview.coreconcepts1.3. Core Concepts/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.overview.examples1.4. Learning by Example/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.ae1.5. UIMA Analysis Engines/a/span/dtdddldtspan class=sectiona href=#ugr.tools.ruta.ae.basic1.5.1. Ruta Engine/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.ae.annotationwriter1.5.2. Annotation Writer/a/span/dtd tspan class=sectiona href=#ugr.tools.ruta.ae.plaintext1.5.3. Plain Text Annotator/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.ae.modifier1.5.4. Modifier/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.ae.html1.5.5. HTML Annotator/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.ae.htmlconverter1.5.6. HTML Converter/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.ae.stylemap1.5.7. Style Map Creator/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.ae.cutter1.5.8. Cutter/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.ae.view1.5.9. View Writer/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.ae.xmi1.5.10. XMI Writer/a/span/dt/dl/dd/dl/dddtspan class=chaptera href=#ugr.tools.ruta.language.language2. Apache UIMA Ruta Language/a/span/dtdddldtspan class=sectiona href=#ugr.tools.ruta.language.syntax2 .1. Syntax/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.language.anchoring2.2. Rule elements and their matching order/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.language.seeding2.3. Basic annotations and tokens/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.language.quantifier2.4. Quantifiers/a/span/dtdddldtspan class=sectiona href=#ugr.tools.ruta.language.quantifier.sg2.4.1. * Star Greedy/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.language.quantifier.sr2.4.2. *? Star Reluctant/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.language.quantifier.pg2.4.3. + Plus Greedy/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.language.quantifier.pr2.4.4. +? Plus Reluctant/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.language.quantifier.qg2.4.5. ? Question Greedy/a/span/dtdtspan class=sectiona href=#ugr.tool s.ruta.language.quantifier.qr2.4.6. ?? Question Reluctant/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.language.quantifier.mmg2.4.7. [x,y] Min Max Greedy/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.language.quantifier.mmr2.4.8. [x,y]? Min Max Reluctant/a/span/dt/dl/dddtspan class=sectiona href=#ugr.tools.ruta.language.declarations2.5. Declarations/a/span/dtdddldtspan class=sectiona href=#ugr.tools.ruta.language.declarations.type2.5.1. Types/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.language.declarations.variable2.5.2. Variables/a/span/dtdtspan class=sectiona href=#ugr.tools.ruta.language.declarations.ressource2.5.3. Resources/a/span/dtdtspan
svn commit: r1697717 - in /uima/site/trunk/uima-website/docs/d/ruta-2.3.1: RELEASE_NOTES.html issuesFixed/jira-report.html
Author: pkluegl
Date: Tue Aug 25 16:11:03 2015
New Revision: 1697717
URL: http://svn.apache.org/r1697717
Log:
no jira - update for ruta-2.3.1
Modified:
uima/site/trunk/uima-website/docs/d/ruta-2.3.1/RELEASE_NOTES.html
uima/site/trunk/uima-website/docs/d/ruta-2.3.1/issuesFixed/jira-report.html
Modified: uima/site/trunk/uima-website/docs/d/ruta-2.3.1/RELEASE_NOTES.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/d/ruta-2.3.1/RELEASE_NOTES.html?rev=1697717r1=1697716r2=1697717view=diff
==
--- uima/site/trunk/uima-website/docs/d/ruta-2.3.1/RELEASE_NOTES.html (original)
+++ uima/site/trunk/uima-website/docs/d/ruta-2.3.1/RELEASE_NOTES.html Tue Aug
25 16:11:03 2015
@@ -21,10 +21,10 @@
--
head
- titleApache UIMA Ruta v2.3.0 Release Notes/title
+ titleApache UIMA Ruta v2.3.1 Release Notes/title
/head
body
-h1Apache UIMA Ruta#8482; v2.3.0 Release Notes/h1
+h1Apache UIMA Ruta#8482; v2.3.1 Release Notes/h1
h2Contents/h2
p
@@ -48,49 +48,9 @@
h2a name=major.changes2. Major Changes in this Release/a/h2
p
- This release requires an update of script projects and its descriptors,
- e.g, in the UIMA Ruta Workbench by deleting all descriptors and updating the
script project.
- Right-click on a project and select UIMA Ruta - Convert to UIMA Ruta
project
+ This is a bugfix release. It fixes diverse problems of the rule inference,
the ruta-maven-plugin and the UIMA Ruta Workbench.
/p
-p
-h3UIMA Ruta Language and Analysis Engine:/h3
-ul
- li
-Requires Java 7
- /li
- li
-Maven Plugin for UIMA Ruta
- /li
- li
-Extensions and simplifications of the language (external resources, null
values, more syntactic sugar)
- /li
- li
-Improvements to Analysis Engines (RutaEngine, HtmlConverter)
- /li
- li
-More exemplary script projects
- /li
- li
-Many, many bug fixes
- /li
- /ul
-h3UIMA Ruta Workbench:/h3
- ul
- li
-Requires Java 7
- /li
- li
-Works now also in other project structures (Maven projects)
- /li
- li
-Bug fixes
- /li
- /ul
-/p
-p
-Please see the a href=READMEREADME/a for further information.
-/p
-
+
h2a name=get.involved3. How to Get Involved/a/h2
p
Modified:
uima/site/trunk/uima-website/docs/d/ruta-2.3.1/issuesFixed/jira-report.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/d/ruta-2.3.1/issuesFixed/jira-report.html?rev=1697717r1=1697716r2=1697717view=diff
==
--- uima/site/trunk/uima-website/docs/d/ruta-2.3.1/issuesFixed/jira-report.html
(original)
+++ uima/site/trunk/uima-website/docs/d/ruta-2.3.1/issuesFixed/jira-report.html
Tue Aug 25 16:11:03 2015
@@ -1,5 +1,5 @@
!DOCTYPE html PUBLIC -//W3C//DTD XHTML 1.0 Transitional//EN
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd;
-!-- Generated by Apache Maven Doxia at May 28, 2015 --
+!-- Generated by Apache Maven Doxia at Aug 17, 2015 --
html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en
head
meta http-equiv=Content-Type content=text/html; charset=UTF-8 /
@@ -10,7 +10,7 @@
@import url(./css/site.css);
/style
link rel=stylesheet href=./css/print.css type=text/css
media=print /
-meta name=Date-Revision-mmdd content=20150528 /
+meta name=Date-Revision-mmdd content=20150817 /
meta http-equiv=Content-Language content=en /
/head
@@ -24,7 +24,7 @@
div class=xleft
-span id=publishDateLast Published: 2015-05-28/span
+span id=publishDateLast Published: 2015-08-17/span
nbsp;| span id=projectVersionVersion:
${project.version}/span
/div
div class=xright
@@ -47,7 +47,7 @@
/div
div id=bodyColumn
div id=contentBox
-div class=sectionh2JIRA Reporta name=JIRA_Report/a/h2a
name=JIRA_Report/atable border=0 class=bodyTabletr
class=athType/ththKey/ththStatus/ththSummary/th/trtr
class=btdBug/tdtda class=externalLink
href=https://issues.apache.org/jira/browse/UIMA-3910;UIMA-3910/a/tdtdClosed/tdtdCompile
time error in INT variable/td/trtr class=atdBug/tdtda
class=externalLink
href=https://issues.apache.org/jira/browse/UIMA-3920;UIMA-3920/a/tdtdClosed/tdtdRuta:
problem with feature expressions of ambiguous types/td/trtr
class=btdBug/tdtda class=externalLink
href=https://issues.apache.org/jira/browse/UIMA-3925;UIMA-3925/a/tdtdClosed/tdtdRuta:
Comments before package declaration/td/trtr class=atdBug/tdtda
class=externalLink
href=https://issues.apache.org/jira/browse/UIMA-4021;UIMA-4021/a/tdtdClosed/tdtdRuta:
problem with conjunctive rule ele
ments with feature matches/td/trtr class=btdBug/tdtda
class=externalLink
href=https://issues.apache.org/jira/browse/UIMA-4022;UIMA-4022/a/tdtdClosed/tdtdRuta:
Inside/out and right-to-left matching of conjunctive rule
svn commit: r1697603 - /uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
Author: pkluegl
Date: Tue Aug 25 08:34:46 2015
New Revision: 1697603
URL: http://svn.apache.org/r1697603
Log:
UIMA-4568
- added test without uimaFIT
Modified:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
Modified:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java?rev=1697603r1=1697602r2=1697603view=diff
==
---
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
(original)
+++
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
Tue Aug 25 08:34:46 2015
@@ -21,29 +21,62 @@ package org.apache.uima.ruta.engine;
import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngine;
import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngine;
+import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
+import org.apache.uima.resource.ResourceConfigurationException;
import org.apache.uima.resource.ResourceInitializationException;
+import org.apache.uima.resource.ResourceSpecifier;
+import org.apache.uima.resource.metadata.TypeSystemDescription;
+import org.apache.uima.util.CasCreationUtils;
import org.apache.uima.util.InvalidXMLException;
+import org.apache.uima.util.XMLInputSource;
import org.junit.Test;
public class StackedScriptsTest {
private static final String DOC_TEXT = This is a simple test.;
+
private static final int LINES = 1;
+ String rules1 = CW{-T1};;
+ String rules2 = T1 W{-T2} W{-T3};;
+ String rules3 = W{PARTOF({T1,T2,T3})-T4};;
+
+
@Test
- public void test() throws ResourceInitializationException,
InvalidXMLException, IOException, AnalysisEngineProcessException {
-String rules1 = CW{-T1};;
-String rules2 = T1 W{-T2} W{-T3};;
-String rules3 = W{PARTOF({T1,T2,T3})-T4};;
+ public void testWithUimaFit() throws ResourceInitializationException,
InvalidXMLException,
+ IOException, AnalysisEngineProcessException,
ResourceConfigurationException {
AnalysisEngine rutaAE1 = createEngine(RutaEngine.class,
RutaEngine.PARAM_RULES, rules1);
AnalysisEngine rutaAE2 = createEngine(RutaEngine.class,
RutaEngine.PARAM_RULES, rules2);
AnalysisEngine rutaAE3 = createEngine(RutaEngine.class,
RutaEngine.PARAM_RULES, rules3);
+processAndTest(rutaAE1, rutaAE2, rutaAE3);
+
+ }
+
+ @Test
+ public void testWithoutUimaFit() throws ResourceInitializationException,
InvalidXMLException,
+ IOException, AnalysisEngineProcessException,
ResourceConfigurationException {
+
+AnalysisEngine rutaAE1 = createAnalysisEngine(rules1);
+AnalysisEngine rutaAE2 = createAnalysisEngine(rules2);
+AnalysisEngine rutaAE3 = createAnalysisEngine(rules3);
+
+processAndTest(rutaAE1, rutaAE2, rutaAE3);
+
+ }
+
+ private void processAndTest(AnalysisEngine rutaAE1, AnalysisEngine rutaAE2,
AnalysisEngine rutaAE3)
+ throws ResourceInitializationException, IOException,
InvalidXMLException,
+ AnalysisEngineProcessException {
StringBuilder sb = new StringBuilder();
for (int i = 0; i LINES; i++) {
sb.append(DOC_TEXT);
@@ -54,13 +87,37 @@ public class StackedScriptsTest {
rutaAE1.process(cas);
rutaAE2.process(cas);
rutaAE3.process(cas);
-
+
RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, This);
RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, is);
RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, a);
RutaTestUtils.assertAnnotationsEquals(cas, 4, 3, This, is, a);
-
}
-
+
+ private AnalysisEngine createAnalysisEngine(String rules) throws IOException,
+ InvalidXMLException, ResourceInitializationException,
ResourceConfigurationException {
+URL url = RutaEngine.class.getClassLoader().getResource(BasicEngine.xml);
+if (url == null) {
+ url =
RutaTestUtils.class.getClassLoader().getResource(org/apache/uima/ruta/TestEngine.xml);
+}
+XMLInputSource in = new XMLInputSource(url);
+ResourceSpecifier specifier =
UIMAFramework.getXMLParser().parseResourceSpecifier(in);
+AnalysisEngineDescription aed = (AnalysisEngineDescription) specifier;
+
+TypeSystemDescription basicTypeSystem =
aed.getAnalysisEngineMetaData().getTypeSystem();
+for (int i = 1; i = 50; i++) {
+ basicTypeSystem.addType(RutaTestUtils.TYPE + i, Type for Testing,
uima.tcas.Annotation);
+}
+CollectionTypeSystemDescription tsds = new
ArrayListTypeSystemDescription();
+tsds.add(basicTypeSystem);
+
svn commit: r1697639 - in /uima/ruta/trunk/ruta-core/src: main/java/org/apache/uima/ruta/engine/RutaEngine.java test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
Author: pkluegl
Date: Tue Aug 25 10:07:34 2015
New Revision: 1697639
URL: http://svn.apache.org/r1697639
Log:
UIMA-4568
- removed debug logging
- removed dirty uimafit test
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
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=1697639r1=1697638r2=1697639view=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 Aug 25 10:07:34 2015
@@ -528,9 +528,6 @@ public class RutaEngine extends JCasAnno
CAS cas = jcas.getCas();
-// TODO: added logging method calls temporarily for UIMA-4568
-logInfoForFirstBasic(begin of process, cas);
-
if (reloadScript || (!initialized
!cas.getViewName().equals(CAS.NAME_DEFAULT_SOFA))) {
initializeScript(cas.getViewName());
} else {
@@ -690,38 +687,9 @@ public class RutaEngine extends JCasAnno
simpleGreedyForComposed, crowd);
stream.initalizeBasics();
-// TODO: added logging method calls temporarily for UIMA-4568
-logInfoForFirstBasic(after initBasics, cas);
return stream;
}
- private void logInfoForFirstBasic(String context, CAS cas) {
-AnnotationIndexAnnotationFS index =
cas.getAnnotationIndex(cas.getTypeSystem().getType(
-BASIC_TYPE));
-if (index.size() == 0) {
- getLogger().info(context + : + rules + - no RutaBasic yet);
-} else {
- AnnotationFS next = index.iterator().next();
- if (next instanceof RutaBasic) {
-RutaBasic basic = (RutaBasic) next;
-getLogger().info(context + - first RutaBasic: +
basic.getBegin()+|+basic.getEnd() + addr: + basic.getAddress());
-Collection?[] beginMap = basic.getBeginMap();
-int counter = 0;
-for (Collection? collection : beginMap) {
- if (collection != null) {
-for (Object object : collection) {
- if (object != null) {
-counter++;
- }
-}
- }
-}
-
-getLogger().info(context + : + rules + - size of beginMap: +
counter);
- }
-}
- }
-
private ListType seedAnnotations(CAS cas) throws
AnalysisEngineProcessException {
ListType result = new ArrayListType();
if (seeders != null) {
Modified:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java?rev=1697639r1=1697638r2=1697639view=diff
==
---
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
(original)
+++
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
Tue Aug 25 10:07:34 2015
@@ -52,17 +52,6 @@ public class StackedScriptsTest {
String rules3 = W{PARTOF({T1,T2,T3})-T4};;
- @Test
- public void testWithUimaFit() throws ResourceInitializationException,
InvalidXMLException,
- IOException, AnalysisEngineProcessException,
ResourceConfigurationException {
-
-AnalysisEngine rutaAE1 = createEngine(RutaEngine.class,
RutaEngine.PARAM_RULES, rules1);
-AnalysisEngine rutaAE2 = createEngine(RutaEngine.class,
RutaEngine.PARAM_RULES, rules2);
-AnalysisEngine rutaAE3 = createEngine(RutaEngine.class,
RutaEngine.PARAM_RULES, rules3);
-
-processAndTest(rutaAE1, rutaAE2, rutaAE3);
-
- }
@Test
public void testWithUimaFitAggregated() throws
ResourceInitializationException,
@@ -77,6 +66,7 @@ public class StackedScriptsTest {
CAS cas = getCAS();
aae.process(cas);
+
checkResult(cas);
}
svn commit: r1697633 - /uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
Author: pkluegl
Date: Tue Aug 25 09:55:01 2015
New Revision: 1697633
URL: http://svn.apache.org/r1697633
Log:
UIMA-4568
- added test with a clean uimaFIT approach
Modified:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
Modified:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java?rev=1697633r1=1697632r2=1697633view=diff
==
---
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
(original)
+++
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
Tue Aug 25 09:55:01 2015
@@ -19,6 +19,7 @@
package org.apache.uima.ruta.engine;
import static org.apache.uima.fit.factory.AnalysisEngineFactory.createEngine;
+import static
org.apache.uima.fit.factory.AnalysisEngineFactory.createEngineDescription;
import java.io.IOException;
import java.net.URL;
@@ -46,10 +47,11 @@ public class StackedScriptsTest {
private static final int LINES = 1;
String rules1 = CW{-T1};;
+
String rules2 = T1 W{-T2} W{-T3};;
+
String rules3 = W{PARTOF({T1,T2,T3})-T4};;
-
-
+
@Test
public void testWithUimaFit() throws ResourceInitializationException,
InvalidXMLException,
IOException, AnalysisEngineProcessException,
ResourceConfigurationException {
@@ -63,9 +65,25 @@ public class StackedScriptsTest {
}
@Test
+ public void testWithUimaFitAggregated() throws
ResourceInitializationException,
+ InvalidXMLException, IOException, AnalysisEngineProcessException,
+ ResourceConfigurationException {
+
+AnalysisEngine aae = createEngine(createEngineDescription(
+createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES,
rules1),
+createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES,
rules2),
+createEngineDescription(RutaEngine.class, RutaEngine.PARAM_RULES,
rules3)));
+
+CAS cas = getCAS();
+
+aae.process(cas);
+checkResult(cas);
+ }
+
+ @Test
public void testWithoutUimaFit() throws ResourceInitializationException,
InvalidXMLException,
IOException, AnalysisEngineProcessException,
ResourceConfigurationException {
-
+
AnalysisEngine rutaAE1 = createAnalysisEngine(rules1);
AnalysisEngine rutaAE2 = createAnalysisEngine(rules2);
AnalysisEngine rutaAE3 = createAnalysisEngine(rules3);
@@ -77,23 +95,32 @@ public class StackedScriptsTest {
private void processAndTest(AnalysisEngine rutaAE1, AnalysisEngine rutaAE2,
AnalysisEngine rutaAE3)
throws ResourceInitializationException, IOException,
InvalidXMLException,
AnalysisEngineProcessException {
-StringBuilder sb = new StringBuilder();
-for (int i = 0; i LINES; i++) {
- sb.append(DOC_TEXT);
- sb.append(\n);
-}
-CAS cas = RutaTestUtils.getCAS(sb.toString());
+CAS cas = getCAS();
rutaAE1.process(cas);
rutaAE2.process(cas);
rutaAE3.process(cas);
+checkResult(cas);
+ }
+
+ private void checkResult(CAS cas) {
RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, This);
RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, is);
RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, a);
RutaTestUtils.assertAnnotationsEquals(cas, 4, 3, This, is, a);
}
+ private CAS getCAS() throws ResourceInitializationException, IOException,
InvalidXMLException {
+StringBuilder sb = new StringBuilder();
+for (int i = 0; i LINES; i++) {
+ sb.append(DOC_TEXT);
+ sb.append(\n);
+}
+CAS cas = RutaTestUtils.getCAS(sb.toString());
+return cas;
+ }
+
private AnalysisEngine createAnalysisEngine(String rules) throws IOException,
InvalidXMLException, ResourceInitializationException,
ResourceConfigurationException {
URL url = RutaEngine.class.getClassLoader().getResource(BasicEngine.xml);
svn commit: r1697766 - /uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java
Author: rec
Date: Tue Aug 25 20:33:43 2015
New Revision: 1697766
URL: http://svn.apache.org/r1697766
Log:
[UIMA-4571] ConfigurationParameterFactory.setParameter() should attempt type
coercion
- Do coercion for ConfigurationParameter-type parameters
Modified:
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java
Modified:
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java
URL:
http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java?rev=1697766r1=1697765r2=1697766view=diff
==
---
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java
(original)
+++
uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/factory/ConfigurationParameterFactory.java
Tue Aug 25 20:33:43 2015
@@ -605,19 +605,25 @@ public final class ConfigurationParamete
} else if (aSpec instanceof ResourceCreationSpecifier) {
ResourceMetaData md = ((ResourceCreationSpecifier) aSpec).getMetaData();
- if
(md.getConfigurationParameterDeclarations().getConfigurationParameter(null,
name) == null) {
+ ConfigurationParameter param = md.getConfigurationParameterDeclarations()
+ .getConfigurationParameter(null, name);
+ if (param == null) {
throw new IllegalArgumentException(Cannot set undeclared parameter [
+ name + ]);
}
- md.getConfigurationParameterSettings().setParameterValue(name, value);
+ md.getConfigurationParameterSettings().setParameterValue(name,
+ convertParameterValue(param, value));
} else if (aSpec instanceof ConfigurableDataResourceSpecifier) {
ResourceMetaData md = ((ConfigurableDataResourceSpecifier)
aSpec).getMetaData();
- if
(md.getConfigurationParameterDeclarations().getConfigurationParameter(null,
name) == null) {
+ ConfigurationParameter param = md.getConfigurationParameterDeclarations()
+ .getConfigurationParameter(null, name);
+ if (param == null) {
throw new IllegalArgumentException(Cannot set undeclared parameter [
+ name + ]);
}
- md.getConfigurationParameterSettings().setParameterValue(name, value);
+ md.getConfigurationParameterSettings().setParameterValue(name,
+ convertParameterValue(param, value));
} else {
throw new IllegalClassException(Unsupported resource specifier class [
+ aSpec.getClass()
+ ]);
