svn commit: r1487370 - /uima/site/trunk/uima-website/docs/uima-re.html
Author: pkluegl Date: Wed May 29 07:39:55 2013 New Revision: 1487370 URL: http://svn.apache.org/r1487370 Log: no jira - remove intermediate site for ruta Removed: uima/site/trunk/uima-website/docs/uima-re.html
svn commit: r1487384 - /uima/site/trunk/uima-website/docs/textmarker.html
Author: pkluegl Date: Wed May 29 07:52:48 2013 New Revision: 1487384 URL: http://svn.apache.org/r1487384 Log: no jira - remove old site for ruta/textmarker Removed: uima/site/trunk/uima-website/docs/textmarker.html
svn commit: r1487478 - in /uima/uimaj/trunk: uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/ uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/
Author: pkluegl
Date: Wed May 29 13:32:29 2013
New Revision: 1487478
URL: http://svn.apache.org/r1487478
Log:
UIMA-2671
- added getter for type system text to ICasDocument
- store string in DocumentUimaImpl
- use string for extending title tooltip
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/DocumentUimaImpl.java
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/ICasDocument.java
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java?rev=1487478&r1=1487477&r2=1487478&view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor-ide/src/main/java/org/apache/uima/caseditor/ide/DefaultCasDocumentProvider.java
Wed May 29 13:32:29 2013
@@ -420,7 +420,7 @@ public class DefaultCasDocumentProvider
org.apache.uima.caseditor.editor.ICasDocument doc;
try {
- doc = new DocumentUimaImpl(cas, casIn, documentFormat);
+ doc = new DocumentUimaImpl(cas, casIn, documentFormat,
typeSystemFile.getFullPath().makeRelative().toString());
} finally {
try {
casIn.close();
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java?rev=1487478&r1=1487477&r2=1487478&view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AbstractDocument.java
Wed May 29 13:32:29 2013
@@ -187,4 +187,10 @@ public abstract class AbstractDocument i
});
}
}
+
+ public String getTypeSystemText() {
+return null;
+ }
+
+
}
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java?rev=1487478&r1=1487477&r2=1487478&view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationDocument.java
Wed May 29 13:32:29 2013
@@ -270,5 +270,12 @@ class AnnotationDocument extends Documen
}
+ public String getTypeSystemText() {
+if(mDocument != null) {
+ return mDocument.getTypeSystemText();
+}
+return null;
+ }
+
}
Modified:
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java?rev=1487478&r1=1487477&r2=1487478&view=diff
==
---
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
(original)
+++
uima/uimaj/trunk/uimaj-ep-cas-editor/src/main/java/org/apache/uima/caseditor/editor/AnnotationEditor.java
Wed May 29 13:32:29 2013
@@ -590,7 +590,7 @@ public final class AnnotationEditor exte
CasDocumentProviderFactory.instance().getDocumentProvider(input);
setDocumentProvider(new TextDocumentProvider(casDocumentProvider));
-
+
super.init(site, input);
}
@@ -599,6 +599,26 @@ public final class AnnotationEditor exte
}
/**
+ * Retrieves the tooltip of the title.
+ *
+ * @return string of tooltip
+ */
+ @Override
+ public String getTitleToolTip() {
+if (getEditorInput() == null) {
+ return super.getTitleToolTip();
+}
+ICasDocument document = getDocument();
+String typeSystemText = document.getTypeSystemText();
svn commit: r2096 - /dev/uima/eclipse-update-site/ /release/uima/eclipse-update-site/
Author: pkluegl Date: Wed May 29 14:00:16 2013 New Revision: 2096 Log: no jira - moved composite update site (ruta-2.0.1 release) Added: release/uima/eclipse-update-site/ - copied from r2095, dev/uima/eclipse-update-site/ Removed: dev/uima/eclipse-update-site/
svn commit: r2097 - /release/uima/ruta-2.0.1/
Author: pkluegl Date: Wed May 29 14:09:58 2013 New Revision: 2097 Log: no jira - added folder for ruta-2.0.1 Added: release/uima/ruta-2.0.1/
svn commit: r2095 - /release/uima/eclipse-update-site/
Author: pkluegl Date: Wed May 29 13:59:43 2013 New Revision: 2095 Log: no jira - deleted for new composite update site (ruta-2.0.1 release) Removed: release/uima/eclipse-update-site/
svn commit: r2098 - in /release/uima/ruta-2.0.1: ./ issuesFixed/ issuesFixed/css/ issuesFixed/images/ issuesFixed/images/logos/
Author: pkluegl
Date: Wed May 29 14:14:32 2013
New Revision: 2098
Log:
no jira - added ruta-2.0.1 source release to dist/release/uima
Added:
release/uima/ruta-2.0.1/RELEASE_NOTES.html
release/uima/ruta-2.0.1/issuesFixed/
release/uima/ruta-2.0.1/issuesFixed/css/
release/uima/ruta-2.0.1/issuesFixed/css/maven-base.css
release/uima/ruta-2.0.1/issuesFixed/css/maven-theme.css
release/uima/ruta-2.0.1/issuesFixed/css/print.css
release/uima/ruta-2.0.1/issuesFixed/css/site.css
release/uima/ruta-2.0.1/issuesFixed/images/
release/uima/ruta-2.0.1/issuesFixed/images/collapsed.gif (with props)
release/uima/ruta-2.0.1/issuesFixed/images/expanded.gif (with props)
release/uima/ruta-2.0.1/issuesFixed/images/external.png (with props)
release/uima/ruta-2.0.1/issuesFixed/images/icon_error_sml.gif (with props)
release/uima/ruta-2.0.1/issuesFixed/images/icon_info_sml.gif (with props)
release/uima/ruta-2.0.1/issuesFixed/images/icon_success_sml.gif (with
props)
release/uima/ruta-2.0.1/issuesFixed/images/icon_warning_sml.gif (with
props)
release/uima/ruta-2.0.1/issuesFixed/images/logos/
release/uima/ruta-2.0.1/issuesFixed/images/logos/build-by-maven-black.png
(with props)
release/uima/ruta-2.0.1/issuesFixed/images/logos/build-by-maven-white.png
(with props)
release/uima/ruta-2.0.1/issuesFixed/images/logos/maven-feather.png (with
props)
release/uima/ruta-2.0.1/issuesFixed/images/newwindow.png (with props)
release/uima/ruta-2.0.1/issuesFixed/jira-report.html
release/uima/ruta-2.0.1/ruta-2.0.1-source-release.zip (with props)
release/uima/ruta-2.0.1/ruta-2.0.1-source-release.zip.asc
release/uima/ruta-2.0.1/ruta-2.0.1-source-release.zip.md5
release/uima/ruta-2.0.1/ruta-2.0.1-source-release.zip.sha1
Modified:
release/uima/ruta-2.0.1/ (props changed)
Propchange: release/uima/ruta-2.0.1/
--
--- svn:ignore (added)
+++ svn:ignore Wed May 29 14:14:32 2013
@@ -0,0 +1 @@
+.project
Added: release/uima/ruta-2.0.1/RELEASE_NOTES.html
==
--- release/uima/ruta-2.0.1/RELEASE_NOTES.html (added)
+++ release/uima/ruta-2.0.1/RELEASE_NOTES.html Wed May 29 14:14:32 2013
@@ -0,0 +1,76 @@
+
+
+
+ Apache UIMA Ruta v2.0.1 Release Notes
+
+
+Apache UIMA Ruta v2.0.1 Release Notes
+
+Contents
+
+1. What is UIMA Ruta
+2. Major Changes in this Release
+3. How to Get Involved
+4. How to Report Issues
+5. List of JIRA Issues Fixed in this Release
+
+
+1. What is UIMA Ruta?
+
+
+ Apache UIMA™ Ruta is a rule-based script language
supported by Eclipse-based tooling.
+ The language is designed to enable rapid development of text processing
applications within UIMA.
+ 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.
+
+
+2. Major Changes in this Release
+
+Please see the README for this information.
+
+
+
+3. How to Get Involved
+
+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
+http://uima.apache.org/get-involved.html";>
+ http://uima.apache.org/get-involved.html.
+
+
+4. How to Report Issues
+
+The Apache UIMA project uses JIRA for issue tracking. Please report any
+issues you find at
+http://issues.apache.org/jira/browse/uima";>http://issues.apache.org/jira/browse/uima
+
+
+5. List of JIRA Issues Fixed in this Release
+
+Click issuesFixed/jira-report.html
for the list of
+issues fixed in this release.
+
+
+
\ No newline at end of file
Added: release/uima/ruta-2.0.1/issuesFixed/css/maven-base.css
==
--- release/uima/ruta-2.0.1/issuesFixed/css/maven-base.css (added)
+++ release/uima/ruta-2.0.1/issuesFixed/css/maven-base.css Wed May 29 14:14:32
2013
@@ -0,0 +1,151 @@
+body {
+ margin: 0px;
+ padding: 0px;
+}
+img {
+ border:none;
+}
+table {
+ padding:0px;
+ width: 100%;
+ margin-left: -2px;
+ margin-right: -2px;
+}
+acronym {
+ cursor: help;
+ border-bottom: 1px dotted #feb;
+}
+table.bodyTable th, table.bodyTable td {
+ padding: 2px 4px 2px 4px;
+ vertical-align: top;
+}
+div.clear{
+ clear:both;
+ visibility: hidden;
+}
+div.clear hr{
+ display: none;
+}
+#bannerLeft, #bannerRight {
+ font-size: xx-large;
+ font-weight: bold;
+}
+#bannerLeft img, #bannerRight img {
+ margin: 0px;
+}
+.xleft, #bannerLeft img {
+ float:left;
+}
+.xright, #banner
svn commit: r1487497 [1/3] - in /uima/site/trunk/uima-website/docs/d: ruta-2.0.1/ ruta-2.0.1/issuesFixed/ ruta-2.0.1/issuesFixed/css/ ruta-2.0.1/issuesFixed/images/ ruta-2.0.1/issuesFixed/images/logos
Author: pkluegl Date: Wed May 29 14:18:32 2013 New Revision: 1487497 URL: http://svn.apache.org/r1487497 Log: no jira - added ruta documentation to website Added: uima/site/trunk/uima-website/docs/d/ruta-2.0.1/ uima/site/trunk/uima-website/docs/d/ruta-2.0.1/RELEASE_NOTES.html uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/ uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/css/ uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/css/maven-base.css uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/css/maven-theme.css uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/css/print.css uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/css/site.css uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/images/ uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/images/collapsed.gif (with props) uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/images/expanded.gif (with props) uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/images/external.png (with props) uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/images/icon_error_sml.gif (with props) uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/images/icon_info_sml.gif (with props) uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/images/icon_success_sml.gif (with props) uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/images/icon_warning_sml.gif (with props) uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/images/logos/ uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/images/logos/build-by-maven-black.png (with props) uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/images/logos/build-by-maven-white.png (with props) uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/images/logos/maven-feather.png (with props) uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/images/newwindow.png (with props) uima/site/trunk/uima-website/docs/d/ruta-2.0.1/issuesFixed/jira-report.html uima/site/trunk/uima-website/docs/d/ruta-current/ uima/site/trunk/uima-website/docs/d/ruta-current/css/ uima/site/trunk/uima-website/docs/d/ruta-current/css/stylesheet-html.css uima/site/trunk/uima-website/docs/d/ruta-current/images/ uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/ uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/language/ uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/language/basic_token/ uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/language/basic_token/basic_token.png (with props) uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/ uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/apply/ uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/apply/apply.png (with props) uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/create_tree_lists/ uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/create_tree_lists/create_tree_lists.png (with props) uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/explain/ uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/explain/applied_rules_view.png (with props) uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/explain/created_by.png (with props) uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/explain/matched_and_failed.png (with props) uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/explain/rule_elements.png (with props) uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/explain/statistics.png (with props) uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/install/ uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/install/update.png (with props) uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/overview/ uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/overview/screenshot_ruta_perspective_.png (with props) uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/projects/ uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/projects/test_project.PNG (with props) uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/projects/wizard1.PNG (with props) uima/site/trunk/uima-website/docs/d/ruta-current/images/tools/ruta/workbench/projects/wizard2.PNG (with props) uima/site/trunk/uima-website
svn commit: r1487497 [3/3] - in /uima/site/trunk/uima-website/docs/d: ruta-2.0.1/ ruta-2.0.1/issuesFixed/ ruta-2.0.1/issuesFixed/css/ ruta-2.0.1/issuesFixed/images/ ruta-2.0.1/issuesFixed/images/logos
Added: 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=1487497&view=auto == Binary file - no diff available. Propchange: uima/site/trunk/uima-website/docs/d/ruta-current/tools.ruta.book.pdf -- svn:mime-type = application/octet-stream
svn commit: r1487499 - in /uima/site/trunk/uima-website: docs/downloads.html docs/index.html docs/news.html docs/ruta.html docs/sandbox.html xdocs/downloads.xml xdocs/index.xml xdocs/news.xml xdocs/ru
Author: pkluegl Date: Wed May 29 14:29:14 2013 New Revision: 1487499 URL: http://svn.apache.org/r1487499 Log: no jira - replaced download - added news item for ruta-2.0.1 - relinked documentation Modified: uima/site/trunk/uima-website/docs/downloads.html uima/site/trunk/uima-website/docs/index.html uima/site/trunk/uima-website/docs/news.html uima/site/trunk/uima-website/docs/ruta.html uima/site/trunk/uima-website/docs/sandbox.html uima/site/trunk/uima-website/xdocs/downloads.xml uima/site/trunk/uima-website/xdocs/index.xml uima/site/trunk/uima-website/xdocs/news.xml uima/site/trunk/uima-website/xdocs/ruta.xml uima/site/trunk/uima-website/xdocs/sandbox.xml uima/site/trunk/uima-website/xdocs/stylesheets/project.xml Modified: uima/site/trunk/uima-website/docs/downloads.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/downloads.html?rev=1487499&r1=1487498&r2=1487499&view=diff == --- uima/site/trunk/uima-website/docs/downloads.html (original) +++ uima/site/trunk/uima-website/docs/downloads.html Wed May 29 14:29:14 2013 @@ -432,7 +432,7 @@ Other mirrors: - + @@ -450,8 +450,8 @@ Other mirrors: - - + + Artifact @@ -465,32 +465,32 @@ Other mirrors: - - UIMA TextMarker 2.0.0 + + UIMA Ruta 2.0.1 -html +html - zip - [asc] - [md5] - [sha1] + zip + [asc] + [md5] + [sha1] - 05-Mar-2013 + 29-May-2013 - - + + @@ -507,7 +507,7 @@ Other mirrors: - + Modified: uima/site/trunk/uima-website/docs/index.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/index.html?rev=1487499&r1=1487498&r2=1487499&view=diff == --- uima/site/trunk/uima-website/docs/index.html (original) +++ uima/site/trunk/uima-website/docs/index.html Wed May 29 14:29:14 2013 @@ -281,6 +281,9 @@ + +29 May 2013: Apache UIMA Ruta 2.0.1 released + 05 March 2013: Apache UIMA TextMarker 2.0.0 released Modified: uima/site/trunk/uima-website/docs/news.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/news.html?rev=1487499&r1=1487498&r2=1487499&view=diff == --- uima/site/trunk/uima-website/docs/news.html (original) +++ uima/site/trunk/uima-website/docs/news.html Wed May 29 14:29:14 2013 @@ -187,6 +187,13 @@ + 29 May 2013 + + Apache UIMA Ruta 2.0.1 released + + + + 05 March 2013 Apache UIMA TextMarker 2.0.0 released @@ -360,6 +367,28 @@ + +29 May 2013 +– Apache UIMA Ruta 2.0.1 released + + + + + +Apache UIMA Ruta is a rule-based script language supported by Eclipse-based tooling. + The language is designed to enable rapid development of text processing applications within UIMA. + +For a complete list of bugs and improvements included in this release please see +http://uima.apache.org/d/ruta-2.0.1/RELEASE_NOTES.html";>release-notes. + + + + + + + + + 05 March 2013 – Apache UIMA TextMarker 2.0.0 released Modified: uima/site/trunk/uima-website/docs/ruta.html URL: http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/ruta.html?rev=1487499&r1=1487498&r2=1487499&view=diff
svn commit: r2099 - /release/uima/textmarker-2.0.0/
Author: pkluegl Date: Wed May 29 14:40:17 2013 New Revision: 2099 Log: no jira - removed textmarker-2.0.0 Removed: release/uima/textmarker-2.0.0/
svn commit: r1487504 - /uima/site/trunk/uima-website/docs/d/textmarker-2.0.0/
Author: pkluegl Date: Wed May 29 14:41:08 2013 New Revision: 1487504 URL: http://svn.apache.org/r1487504 Log: no jira - removed textmarker-2.0.0 Removed: uima/site/trunk/uima-website/docs/d/textmarker-2.0.0/
svn commit: r1487505 - /uima/site/trunk/uima-website/docs/d/textmarker-current/
Author: pkluegl Date: Wed May 29 14:41:20 2013 New Revision: 1487505 URL: http://svn.apache.org/r1487505 Log: no jira - removed textmarker-2.0.0 Removed: uima/site/trunk/uima-website/docs/d/textmarker-current/
svn commit: r1487509 - in /uima/sandbox/ruta/tags: ruta-2.0.1-rc2/ ruta-2.0.1/
Author: pkluegl Date: Wed May 29 15:10:35 2013 New Revision: 1487509 URL: http://svn.apache.org/r1487509 Log: no jira - renamed released rc Added: uima/sandbox/ruta/tags/ruta-2.0.1/ - copied from r1487508, uima/sandbox/ruta/tags/ruta-2.0.1-rc2/ Removed: uima/sandbox/ruta/tags/ruta-2.0.1-rc2/
svn commit: r1487510 - /uima/sandbox/ruta/tags/ruta-2.0.1-rc1/
Author: pkluegl Date: Wed May 29 15:11:01 2013 New Revision: 1487510 URL: http://svn.apache.org/r1487510 Log: no jira - removed old rc Removed: uima/sandbox/ruta/tags/ruta-2.0.1-rc1/
svn commit: r1487516 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli: DuccJobSubmit.java IUiOptions.java
Author: degenaro
Date: Wed May 29 15:38:07 2013
New Revision: 1487516
URL: http://svn.apache.org/r1487516
Log:
UIMA-2935 temporary restore of --get_meta_time_max
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java?rev=1487516&r1=1487515&r2=1487516&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
Wed May 29 15:38:07 2013
@@ -88,7 +88,7 @@ public class DuccJobSubmit
UiOption.ProcessFailuresLimit,
UiOption.ProcessThreadCount,
UiOption.ProcessPerItemTimeMax,
-//UiOption.ProcessGetMetaTimeMax,
+UiOption.ProcessGetMetaTimeMax,
UiOption.ProcessInitializationTimeMax,
UiOption.Specification,
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java?rev=1487516&r1=1487515&r2=1487516&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
Wed May 29 15:38:07 2013
@@ -674,9 +674,9 @@ public interface IUiOptions
public boolean required() { return false; }
},
-/*
ProcessGetMetaTimeMax {
-public String pname() { return
JobSpecificationProperties.key_process_get_meta_time_max; }
+//public String pname() { return
JobSpecificationProperties.key_process_get_meta_time_max; }
+public String pname() { return "process_get_meta_time_max"; }
public String description() { return "Maximum elapsed time (in
minutes) for processing getMeta."; }
public String argname() { return "integer"; }
public String example() { return null; }
@@ -685,7 +685,6 @@ public interface IUiOptions
public boolean multiargs() { return false; }
public boolean required() { return false; }
},
- */
ProcessInitializationTimeMax {
public String pname() { return
JobSpecificationProperties.key_process_initialization_time_max; }
svn commit: r1487520 - in /uima/sandbox/ruta/trunk: ruta-core/pom.xml ruta-core/src/main/java/org/apache/uima/ruta/expression/RutaExpression.java ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/cor
Author: pkluegl
Date: Wed May 29 15:44:07 2013
New Revision: 1487520
URL: http://svn.apache.org/r1487520
Log:
UIMA-2672
- removed reflections lib
Modified:
uima/sandbox/ruta/trunk/ruta-core/pom.xml
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/RutaExpression.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaCompletionEngine.java
Modified: uima/sandbox/ruta/trunk/ruta-core/pom.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/pom.xml?rev=1487520&r1=1487519&r2=1487520&view=diff
==
--- uima/sandbox/ruta/trunk/ruta-core/pom.xml (original)
+++ uima/sandbox/ruta/trunk/ruta-core/pom.xml Wed May 29 15:44:07 2013
@@ -93,11 +93,6 @@
commons-io
2.4
-
- org.reflections
- reflections
- 0.9.9-RC1
-
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/RutaExpression.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/RutaExpression.java?rev=1487520&r1=1487519&r2=1487520&view=diff
==
---
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/RutaExpression.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/RutaExpression.java
Wed May 29 15:44:07 2013
@@ -31,8 +31,6 @@ import org.apache.uima.cas.text.Annotati
import org.apache.uima.ruta.RutaElement;
import org.apache.uima.ruta.RutaStream;
-import com.google.common.collect.Lists;
-
public class RutaExpression extends RutaElement {
protected List getTargetAnnotation(AnnotationFS annotation,
Type type,
@@ -52,7 +50,7 @@ public class RutaExpression extends Ruta
@SuppressWarnings("unchecked")
Collection intersection = CollectionUtils
.intersection(beginAnchors, endAnchors);
- return Lists.newArrayList(intersection);
+ return new ArrayList(intersection);
}
}
Modified:
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaCompletionEngine.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaCompletionEngine.java?rev=1487520&r1=1487519&r2=1487520&view=diff
==
---
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaCompletionEngine.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaCompletionEngine.java
Wed May 29 15:44:07 2013
@@ -32,7 +32,6 @@ import java.util.List;
import java.util.Set;
import org.apache.uima.UIMAFramework;
-import org.apache.uima.analysis_component.AnalysisComponent;
import org.apache.uima.resource.ResourceManager;
import org.apache.uima.resource.metadata.TypeDescription;
import org.apache.uima.resource.metadata.TypeSystemDescription;
@@ -74,9 +73,6 @@ import org.eclipse.dltk.core.ModelExcept
import org.eclipse.dltk.internal.core.SourceField;
import org.eclipse.dltk.internal.core.SourceMethod;
import org.eclipse.dltk.internal.core.SourceModule;
-import org.reflections.Reflections;
-import org.reflections.scanners.SubTypesScanner;
-import org.reflections.util.ConfigurationBuilder;
public class RutaCompletionEngine extends ScriptCompletionEngine {
@@ -243,11 +239,7 @@ public class RutaCompletionEngine extend
}
} else if (type == ComponentDeclaration.UIMAFIT_ENGINE) {
List engines = new ArrayList();
- Reflections reflections = new Reflections(new
ConfigurationBuilder().addUrls(
- classloader.getURLs()).setScanners(new SubTypesScanner(true)));
- Set subTypesOf = reflections.getStore().getSubTypesOf(
- AnalysisComponent.class.getName());
- engines.addAll(subTypesOf);
+ // TODO: collect engines
for (String string : engines) {
if (match(complString, string)) {
addProposal(complString, string, CompletionProposal.PACKAGE_REF);
svn commit: r1487526 - in /uima/sandbox/ruta/trunk/ruta-ep-ide: src/main/java/org/apache/uima/ruta/ide/ui/templates/RutaUniversalTemplateContextType.java templates/templates.xml
Author: pkluegl
Date: Wed May 29 16:03:20 2013
New Revision: 1487526
URL: http://svn.apache.org/r1487526
Log:
UIMA-2905
- fixed context ids
Modified:
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/templates/RutaUniversalTemplateContextType.java
uima/sandbox/ruta/trunk/ruta-ep-ide/templates/templates.xml
Modified:
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/templates/RutaUniversalTemplateContextType.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/templates/RutaUniversalTemplateContextType.java?rev=1487526&r1=1487525&r2=1487526&view=diff
==
---
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/templates/RutaUniversalTemplateContextType.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/ui/templates/RutaUniversalTemplateContextType.java
Wed May 29 16:03:20 2013
@@ -25,7 +25,7 @@ import org.eclipse.dltk.ui.templates.Scr
import org.eclipse.jface.text.IDocument;
public class RutaUniversalTemplateContextType extends
ScriptTemplateContextType {
- public static final String CONTEXT_TYPE_ID =
"tmUniversalTemplateContextType";
+ public static final String CONTEXT_TYPE_ID =
"rutaUniversalTemplateContextType";
public RutaUniversalTemplateContextType() {
// empty constructor
Modified: uima/sandbox/ruta/trunk/ruta-ep-ide/templates/templates.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/templates/templates.xml?rev=1487526&r1=1487525&r2=1487526&view=diff
==
--- uima/sandbox/ruta/trunk/ruta-ep-ide/templates/templates.xml (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-ide/templates/templates.xml Wed May 29
16:03:20 2013
@@ -20,22 +20,22 @@
${cursor}Type{C() -> A()};
Document{->CALL(${cursor})};
Document{->EXEC(${cursor})};
BLOCK(${cursor}Name)
Document{} {
};
Document{->MARKFAST(${cursor}Type, List)};
svn commit: r1487527 - /uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ActionVerbalizer.java
Author: pkluegl
Date: Wed May 29 16:08:52 2013
New Revision: 1487527
URL: http://svn.apache.org/r1487527
Log:
no jira - added verbalization of TRIM action
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ActionVerbalizer.java
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ActionVerbalizer.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ActionVerbalizer.java?rev=1487527&r1=1487526&r2=1487527&view=diff
==
---
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ActionVerbalizer.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/verbalize/ActionVerbalizer.java
Wed May 29 16:08:52 2013
@@ -58,6 +58,7 @@ import org.apache.uima.ruta.action.SetFe
import org.apache.uima.ruta.action.ShiftAction;
import org.apache.uima.ruta.action.TransferAction;
import org.apache.uima.ruta.action.TrieAction;
+import org.apache.uima.ruta.action.TrimAction;
import org.apache.uima.ruta.action.UnmarkAction;
import org.apache.uima.ruta.action.UnmarkAllAction;
import org.apache.uima.ruta.expression.RutaExpression;
@@ -154,6 +155,8 @@ public class ActionVerbalizer {
return "REMOVEDUPLICATE";
} else if (action instanceof UnmarkAllAction) {
return "UNMARKALL";
+} else if (action instanceof TrimAction) {
+ return "TRIM";
} else if (action instanceof ImplicitMarkAction) {
return "";
} else if (action instanceof ImplicitFeatureAction) {
@@ -462,6 +465,16 @@ public class ActionVerbalizer {
String verbalize = verbalizer.verbalize(a.getType());
String but = a.getList() == null ? "" : ", " +
verbalizer.verbalize(a.getList());
return name + verbalize + but + ")";
+} else if (action instanceof TrimAction) {
+ TrimAction a = (TrimAction) action;
+ TypeListExpression typeList = a.getTypeList();
+ String verbalize = "";
+ if(typeList != null) {
+verbalize = verbalizer.verbalize(typeList);
+ } else if(a.getTypes() != null) {
+verbalize = verbalizer.verbalizeExpressionList(a.getTypes());
+ }
+ return name + verbalize + ")";
} else if (action instanceof ImplicitMarkAction) {
ImplicitMarkAction a = (ImplicitMarkAction) action;
return verbalizer.verbalize(a.getType());
svn commit: r1487580 - in /uima/sandbox/uima-ducc/trunk: uima-ducc-examples/src/main/systemtest/mega-15-min/ uima-ducc-examples/src/main/systemtest/mega-24-hrs/ uima-ducc-examples/src/main/systemtest/
Author: challngr Date: Wed May 29 18:05:59 2013 New Revision: 1487580 URL: http://svn.apache.org/r1487580 Log: UIMA-2593 Fix RM overcounting a dead node with work in limbo. Also fix the system tests to include the random number seed (found while working on this boog). Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-15-min/jobs.prepare.fragment uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-15-min/jobs.prepare.mixed uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-24-hrs/jobs.prepare uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-24-hrs/jobs.prepare.fragment uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-24-hrs/jobs.prepare.mixed uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-30-min/jobs.prepare uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-15-min/jobs.prepare.fragment URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-15-min/jobs.prepare.fragment?rev=1487580&r1=1487579&r2=1487580&view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-15-min/jobs.prepare.fragment (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-15-min/jobs.prepare.fragment Wed May 29 18:05:59 2013 @@ -3,6 +3,11 @@ # Compression of 96 and spread 900 gives a good 15-20 minute test on test system with # 136 15-G shares +random.seed = 0 # a number, for determinate randoms + # or TOD, and the seed will use + # current time of day + + src.dir = jobs.in # where the jobs are dest.dir= jobs # where to put prepared jobs Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-15-min/jobs.prepare.mixed URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-15-min/jobs.prepare.mixed?rev=1487580&r1=1487579&r2=1487580&view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-15-min/jobs.prepare.mixed (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-15-min/jobs.prepare.mixed Wed May 29 18:05:59 2013 @@ -3,6 +3,11 @@ # Compression of 96 and spread 900 gives a good 15-20 minute test on test system with # 136 15-G shares +random.seed = 0 # a number, for determinate randoms + # or TOD, and the seed will use + # current time of day + + src.dir = jobs.in # where the jobs are dest.dir = jobs # where to put prepared jobs Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-24-hrs/jobs.prepare URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-24-hrs/jobs.prepare?rev=1487580&r1=1487579&r2=1487580&view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-24-hrs/jobs.prepare (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-24-hrs/jobs.prepare Wed May 29 18:05:59 2013 @@ -1,6 +1,11 @@ # These jobs represent approximately 144 hours real time; adjust compression accordingly # Compresion of 12 produces an approximately 12 hour test on a system with 136 15G shares +random.seed = 0 # a number, for determinate randoms + # or TOD, and the seed will use + # current time of day + + src.dir = jobs.in # where the jobs are dest.dir= jobs # where to put prepared jobs Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-24-hrs/jobs.prepare.fragment URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-24-hrs/jobs.prepare.fragment?rev=1487580&r1=1487579&r2=1487580&view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/systemtest/mega-24-hrs/jobs.prepare.fragment (original) +++ uima/sandbox/uima-ducc/trun
svn commit: r1487606 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd: IJobDriverAccess.java JobDriver.java JobDriverComponent.java client/CasLimbo.java client/Cas
Author: degenaro
Date: Wed May 29 19:32:49 2013
New Revision: 1487606
URL: http://svn.apache.org/r1487606
Log:
UIMA-2944 DUCC Job Driver (JD) reports stale limbo status
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/IJobDriverAccess.java
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriverComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/CasLimbo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/CasSource.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/IJobDriverAccess.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/IJobDriverAccess.java?rev=1487606&r1=1487605&r2=1487606&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/IJobDriverAccess.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/IJobDriverAccess.java
Wed May 29 19:32:49 2013
@@ -38,4 +38,5 @@ public interface IJobDriverAccess {
public void accountingWorkItemIsRetry(DuccId processId);
public void accountingWorkItemIsError(DuccId processId);
public void accountingWorkItemIsDone(DuccId processId, long time);
+ public void rectifyStatus();
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java?rev=1487606&r1=1487605&r2=1487606&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriver.java
Wed May 29 19:32:49 2013
@@ -1360,5 +1360,11 @@ public class JobDriver extends Thread im
duccErr.error(location, djid, dpid, exception);
}
}
+
+ public void rectifyStatus() {
+ if(casSource != null) {
+ casSource.rectifyStatus();
+ }
+ }
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriverComponent.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriverComponent.java?rev=1487606&r1=1487605&r2=1487606&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriverComponent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/JobDriverComponent.java
Wed May 29 19:32:49 2013
@@ -261,6 +261,7 @@ implements IJobDriverComponent {
duccOut.debug(methodName, null,
duccMsg.fetch("publishing state"));
jdStateDuccEvent = new JdStateDuccEvent();
if(thread != null) {
+ thread.rectifyStatus();
DriverStatusReport dsr =
thread.getDriverStatusReportCopy();
if(dsr == null) {
duccOut.debug(methodName, null,
duccMsg.fetch("dsr is null"));
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/CasLimbo.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/CasLimbo.java?rev=1487606&r1=1487605&r2=1487606&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/CasLimbo.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-jd/src/main/java/org/apache/uima/ducc/jd/client/CasLimbo.java
Wed May 29 19:32:49 2013
@@ -195,4 +195,24 @@ public class CasLimbo {
}
}
}
+
+ public void rectifyStatus() {
+ String location = "rectifyStatus";
+ Iterator iterator = tupleQueue.iterator();
+ if(!iterator.hasNext()) {
+ duccOut.trace(location, getJobId(), "empty");
+ }
+ else {
+ while(iterator.hasNext()) {
+ CasTuple casTuple = iterator.next();
+ if(isAvailable(casTuple)) {
+
svn commit: r1487614 - /uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java
Author: challngr
Date: Wed May 29 19:52:48 2013
New Revision: 1487614
URL: http://svn.apache.org/r1487614
Log:
UIMA-2593
getJobCap needs the adjustment in several places.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java?rev=1487614&r1=1487613&r2=1487614&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java
Wed May 29 19:52:48 2013
@@ -980,9 +980,10 @@ public class RmJob
c++;
}
-c = Math.max(c, assignedShares.size() - pendingRemoves.size()); // if
job is ending we could be fragmented and have to be
- //
careful not to underestimate, or we end up possibly
- //
evicting something that should be left alone.
+int currentResources = assignedShares.size() - pendingRemoves.size();
+c = Math.max(c, currentResources); // if job is ending we could be
fragmented and have to be
+// careful not to underestimate,
or we end up possibly
+// evicting something that should
be left alone.
//
// If waiting for initialization, we have to cap as well on the
maximum number of shares
@@ -1003,7 +1004,7 @@ public class RmJob
if ( resource_class.isUsePrediction() ) {
if (projected_cap < base_cap ) { // If we
project less need, revise the estimate down
-potential_cap = Math.max(projected_cap, assignedShares.size());
+potential_cap = Math.max(projected_cap, currentResources);
}
}
@@ -1014,11 +1015,11 @@ public class RmJob
if ( init_wait ) { // ugly, but
true, if not using initialization caps
actual_cap = potential_cap;
} else if ( resource_class.isExpandByDoubling() ) {
-if ( (assignedShares.size() == 0) ) {
+if ( currentResources == 0 ) {
actual_cap = Math.max(1,
resource_class.getInitializationCap()); // if we shrink to 0, need to restart
from the init cap
actual_cap = Math.min(base_cap, actual_cap);
// must re-min this in case we have a base cap < class init cap
} else {
-actual_cap = Math.min(potential_cap, assignedShares.size()
* 2);
+actual_cap = Math.min(potential_cap, currentResources * 2);
}
} else {
actual_cap = potential_cap;
