svn commit: r1492107 - in /uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/images/tools/ruta/workbench/textruler: textruler.png textruler_pref.png
Author: pkluegl Date: Wed Jun 12 08:12:31 2013 New Revision: 1492107 URL: http://svn.apache.org/r1492107 Log: UIMA-2777 - replaced screenshot Modified: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/images/tools/ruta/workbench/textruler/textruler.png uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/images/tools/ruta/workbench/textruler/textruler_pref.png Modified: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/images/tools/ruta/workbench/textruler/textruler.png URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/images/tools/ruta/workbench/textruler/textruler.png?rev=1492107r1=1492106r2=1492107view=diff == Binary files - no diff available. Modified: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/images/tools/ruta/workbench/textruler/textruler_pref.png URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/images/tools/ruta/workbench/textruler/textruler_pref.png?rev=1492107r1=1492106r2=1492107view=diff == Binary files - no diff available.
svn commit: r1492121 - /uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.textruler.xml
Author: pkluegl Date: Wed Jun 12 09:14:01 2013 New Revision: 1492121 URL: http://svn.apache.org/r1492121 Log: UIMA-2704 - added section about textruler usage Modified: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.textruler.xml Modified: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.textruler.xml URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.textruler.xml?rev=1492121r1=1492120r2=1492121view=diff == --- uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.textruler.xml (original) +++ uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.textruler.xml Wed Jun 12 09:14:01 2013 @@ -38,7 +38,8 @@ under the License. para This section gives a short introduction about the included features and learners, and how to use the framework to learn UIMA Ruta rules. First, the available rule learning algorithms are introduced in xref linkend=section.tools.ruta.workbench.textruler.learner/. Then, -the user interface and the usage is explained in xref linkend=section.tools.ruta.workbench.textruler.ui/ using an exemplary UIMA Ruat project. +the user interface and the usage is explained in xref linkend=section.tools.ruta.workbench.textruler.ui/ and +xref linkend=section.tools.ruta.workbench.textruler.example/ illustrates the usage with an exemplary UIMA Ruta project. /para section id=section.tools.ruta.workbench.textruler.learner titleIncluded rule learning algorithms/title @@ -176,10 +177,10 @@ under the License. para The name of the rule learner KEP (knowledge engineering patterns) is derived from the idea that humans use different engineering patterns to write annotation rules. This algorithms implements simple rule induction methods for some patterns, such as boundary detection -or annotation-based restriction of the window. The results are then combined in order to take adavantage of the combination of +or annotation-based restriction of the window. The results are then combined in order to take advantage of the combination of the different kinds of induced rules. Since the single rules are constructed according to how humans engineer the annotations rules, the resulting rule set should resemble more a handcrafted rule set. Furthermore, by exploiting the synergy of the patterns, solutions for -some annotation are much simplier. The following parameters are available. For a more detailed description of the parameters, +some annotation are much simpler. The following parameters are available. For a more detailed description of the parameters, please refer to the implementation. /para para @@ -197,6 +198,23 @@ under the License. section id=section.tools.ruta.workbench.textruler.ui titleThe TextRuler view/title para +The TextRuler view is normally located in the lower center of the UIMA Ruta perspective and is the main +user interface to configure and start the rule learning algorithms. The view consists of four parts (cf. xref linkend=figure.tools.ruta.workbench.textruler.main/): +The toolbar contains buttons for starting (green button) and stopping (red button) the learning process, +and one button that opening the preference page (blue gears) for configuring the rule induction algorithms cf. xref linkend=figure.tools.ruta.workbench.textruler.pref/. +The upper part of the view contains text fields for defining the set of utilized documents. quoteTraining Data/quote +points to the absolute location of the folder containing the gold standard documents. quoteAdditional Data/quote points +to the absolute location of documents that can be additionally used by the algorithms. These documents are currently only needed +by the TraBal algorithm, which tries to learn correction rules for the error in those documents. quoteTest Data/quote is not yet available. +Finally, quotePreprocess Script/quote points to the absolute location of a UIMA Ruta script, which contains all necessary types and can be applied +on the documents before the algorithms start in order to add additional annotations as learning features. The preprocessing can be skipped. +All text fields support drag and drop: the user can drag a file in the script explorer and drop it in the respective text field. +In the center of the view, the target types, for which rule should be induced, can be specified in the quoteInformation Types/quote list. +The list quoteFeatured Feature Types/quote specify the filtering settings, but it is discourage to change these settings. The user is able to drop +a simple text file, which contains a type with complete
svn commit: r1492122 - /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java
Author: degenaro
Date: Wed Jun 12 09:20:13 2013
New Revision: 1492122
URL: http://svn.apache.org/r1492122
Log:
UIMA-2984 DUCC webserver (WS) employs wrong class for Authentication
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java?rev=1492122r1=1492121r2=1492122view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java
Wed Jun 12 09:20:13 2013
@@ -19,6 +19,7 @@
package org.apache.uima.ducc.ws.server;
import java.io.IOException;
+import java.util.Properties;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -48,6 +49,26 @@ public class DuccHandlerUserAuthenticati
private static DuccWebSessionManager duccWebSessionManager =
DuccWebSessionManager.getInstance();
+ public DuccHandlerUserAuthentication() {
+ initializeAuthenticator();
+ }
+
+ private void initializeAuthenticator() {
+ String methodName = initializeAuthenticator;
+ try {
+ Properties properties = DuccWebProperties.get();
+ String key = ducc.authentication.implementer;
+ if(properties.containsKey(key)) {
+ String value = properties.getProperty(key);
+ Class? authenticationImplementer =
Class.forName(value);
+ iAuthenticationManager =
(IAuthenticationManager)authenticationImplementer.newInstance();
+ }
+ }
+ catch(Exception e) {
+ duccLogger.error(methodName, jobid, e);
+ }
+ }
+
protected boolean isAuthenticated(HttpServletRequest
request,HttpServletResponse response) {
String methodName = isAuthenticated;
boolean retVal = false;
svn commit: r1492123 - in /uima/sandbox/ruta/trunk/ruta-docbook/src/docbook: tools.ruta.language.xml tools.ruta.overview.xml tools.ruta.workbench.install.xml
Author: pkluegl Date: Wed Jun 12 09:20:49 2013 New Revision: 1492123 URL: http://svn.apache.org/r1492123 Log: UIMA-2973 - svn - source release for example projects Modified: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.xml uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.install.xml Modified: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.xml URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.xml?rev=1492123r1=1492122r2=1492123view=diff == --- uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.xml (original) +++ uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.language.xml Wed Jun 12 09:20:49 2013 @@ -601,13 +601,8 @@ FeatureAssignment - ( StringExpressio The UIMA Ruta language can be extended with external actions, conditions, type functions, boolean functions, string functions and number functions. An exemplary implementation of each kind of extension can be found in the project - uri - https://svn.apache.org/repos/asf/uima/sandbox/ruta/trunk/example-projects/ruta-ep-example-extensions - /uri - and a simple UIMA Ruta project, which uses these extensions, is located at - uri - https://svn.apache.org/repos/asf/uima/sandbox/ruta/trunk/example-projects/ExtensionsExample - /uri + quoteruta-ep-example-extensions/quote and a simple UIMA Ruta project, which uses these extensions, is located at + quoteExtensionsExample/quote. Both projects are part of the source release of UIMA ruta and are located in the quoteexample-projects/quote folder. /para /section /chapter \ No newline at end of file Modified: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml?rev=1492123r1=1492122r2=1492123view=diff == --- uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml (original) +++ uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.overview.xml Wed Jun 12 09:20:49 2013 @@ -69,8 +69,8 @@ under the License. UIMA Ruta rules can also be applied on CAS without using the UIMA Ruta Workbench. xref linkend=ugr.tools.ruta.ae.basic.apply/ contains examples how to execute UIMA Ruta rules in plain java. A good way to get started with UIMA Ruta is to play around with an exemplary UIMA Ruta project, e.g., - urihttps://svn.apache.org/repos/asf/uima/sandbox/ruta/trunk/example-projects/ExampleProject/uri. This UIMA Ruta project - contains some simple rules for processing citation metadata. + quoteExampleProject/quote in the example-projects of the UIMA Ruta source release. + This UIMA Ruta project contains some simple rules for processing citation metadata. /para para xref linkend=ugr.tools.ruta.language.language/ and xref linkend=ugr.tools.ruta.workbench/ provide Modified: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.install.xml URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.install.xml?rev=1492123r1=1492122r2=1492123view=diff == --- uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.install.xml (original) +++ uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.install.xml Wed Jun 12 09:20:49 2013 @@ -120,14 +120,7 @@ under the License. Several times within this chapter we use a UIMA Ruta example project to illustrate the use of the UIMA Ruta Workbench. -The example project -can be downloaded per -emphasissvn/emphasis -from -ulink - url=https://svn.apache.org/repos/asf/uima/sandbox/ruta/trunk/example-projects/ExampleProject;https://svn.apache.org/repos/asf/uima/sandbox/ruta/trunk/example-projects/ExampleProject -/ulink -. +The quoteExampleProject/quote project is part of the source release of UIMA Ruta (example-projects folder). /para para To import this project into the workbench do
svn commit: r1492177 - in /uima/sandbox/ruta/trunk/ruta-docbook/src/docbook: images/tools/ruta/workbench/cde/ images/tools/ruta/workbench/cde/cde.png tools.ruta.workbench.cde.xml tools.ruta.workbench.
Author: pkluegl Date: Wed Jun 12 12:57:24 2013 New Revision: 1492177 URL: http://svn.apache.org/r1492177 Log: UIMA-2859 - added section about constraint driven evaluation Added: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/images/tools/ruta/workbench/cde/ uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/images/tools/ruta/workbench/cde/cde.png (with props) uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.cde.xml Modified: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.xml Added: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/images/tools/ruta/workbench/cde/cde.png URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/images/tools/ruta/workbench/cde/cde.png?rev=1492177view=auto == Binary file - no diff available. Propchange: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/images/tools/ruta/workbench/cde/cde.png -- svn:mime-type = application/octet-stream Added: uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.cde.xml URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.cde.xml?rev=1492177view=auto == --- uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.cde.xml (added) +++ uima/sandbox/ruta/trunk/ruta-docbook/src/docbook/tools.ruta.workbench.cde.xml Wed Jun 12 12:57:24 2013 @@ -0,0 +1,90 @@ +?xml version=1.0 encoding=UTF-8? +!DOCTYPE section PUBLIC -//OASIS//DTD DocBook XML V4.4//EN +http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd;[ +!ENTITY imgroot images/tools/ruta/workbench/ +!ENTITY % uimaents SYSTEM ../../target/docbook-shared/entities.ent +%uimaents; +] +!-- +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. +-- + +section id=section.tools.ruta.workbench.cde + titleUIMA Ruta CDE perspective/title + para +The UIMA Ruta CDE (Constraint-Driven Evaluation) provides some views and functionality to investigate and evaluate a set +of annotated documents using domain and background knowledge formalized as constraints and UIMA Ruta rules. +xref linkend=figure.tools.ruta.workbench.cde/ provides an overview of the perspective. Its views are described in the following. + /para + figure id=figure.tools.ruta.workbench.cde + titleThe UIMA Ruta cde framework + /title + mediaobject +imageobject role=html + imagedata width=776px format=PNG align=center +fileref=imgroot;cde/cde.png / +/imageobject +imageobject role=fo + imagedata width=5.4in format=PNG align=center +fileref=imgroot;cde/cde.png / +/imageobject +textobject + phraseUIMA Ruta CDE perspective/phrase +/textobject + /mediaobject +/figure + section id=section.tools.ruta.workbench.cde.documents + titleCDE Documents view/title + para + This view provides the general functionality to specify, which set of documents should be evaluated. The green start button in the toolbar + starts the evaluation process with the given configuration specified in the different views. + The text field quoteDocuments/quote specifies the set of documents that have been annotated by an arbitrary model or set of rules. + These xmiCAS documents can contain additional annotations, which are used by the simple rule-based constraints. The text field quoteTest Data/quote + specifies an optional folder with gold standard documents. These documents can be applied for comparing the resulting CDE value to an F1 score. + The text field quoteType System/quote refers to a type system descriptor, which defines all types that are needed for the evaluation. + Each text field is sensitive to drag and drop. The use can select a folder in the script explorer and drag and drop it on the text field. + Directly below the text fields, the values of different evaluation measures are given comparing the resulting CDE value to the F1 score. + These values are of course only available, if annotated gold
svn commit: r1492212 - in /uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers: RerunActionHandler.java SelectTypesDialog.java
Author: pkluegl
Date: Wed Jun 12 14:03:11 2013
New Revision: 1492212
URL: http://svn.apache.org/r1492212
Log:
UIMA-2985
- fixed exclude types in testing view
Modified:
uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java
uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/SelectTypesDialog.java
Modified:
uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java?rev=1492212r1=1492211r2=1492212view=diff
==
---
uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java
Wed Jun 12 14:03:11 2013
@@ -26,6 +26,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngine;
@@ -103,12 +105,16 @@ public class RerunActionHandler implemen
private class RerunHandlerJob extends Job {
ExecutionEvent event;
-String viewCasName;
+private final String viewCasName;
-RerunHandlerJob(ExecutionEvent event, String scriptName, String
viewCasName) {
+private final ListString excludedTypes;
+
+RerunHandlerJob(ExecutionEvent event, String scriptName, String
viewCasName,
+ListString excludedTypes) {
super(Testing + scriptName + ...);
this.event = event;
this.viewCasName = viewCasName;
+ this.excludedTypes = excludedTypes;
setUser(true);
}
@@ -133,10 +139,12 @@ public class RerunActionHandler implemen
desc = engineDescriptorPath.toPortableString();
XMLInputSource in2 = new XMLInputSource(desc);
Object descriptor = UIMAFramework.getXMLParser().parse(in2);
-CAS runCas = ae.newCAS();
+CAS runCas = getEmptyCas(descriptor);
+CAS testCas = getEmptyCas(descriptor);
for (TestCasData td : testCasData) {
runCas.reset();
+ testCas.reset();
String elementName = r.getLocation().lastSegment();
monitor.setTaskName(Evaluating + td.getPath().lastSegment());
int lastIndexOf =
elementName.lastIndexOf(RutaEngine.SCRIPT_FILE_EXTENSION);
@@ -144,39 +152,50 @@ public class RerunActionHandler implemen
elementName = elementName.substring(0, lastIndexOf);
}
- CAS testCas = getTestCas(descriptor);
- FileInputStream inputStream = null;
+ FileInputStream inputStreamTest = null;
try {
-inputStream = new FileInputStream(new
File(td.getPath().toPortableString()));
-XmiCasDeserializer.deserialize(inputStream, testCas, true);
+inputStreamTest = new FileInputStream(new
File(td.getPath().toPortableString()));
+XmiCasDeserializer.deserialize(inputStreamTest, testCas, true);
} finally {
-if (inputStream != null) {
- inputStream.close();
+if (inputStreamTest != null) {
+ inputStreamTest.close();
}
}
-
- for (IteratorCAS iterator = testCas.getViewIterator();
iterator.hasNext();) {
-CAS each = iterator.next();
-String viewName = each.getViewName();
-try {
- CAS view = runCas.getView(viewName);
- view.setDocumentText(each.getDocumentText());
-
-} catch (Exception e) {
- RutaAddonsPlugin.error(e);
+ FileInputStream inputStreamRun = null;
+ try {
+inputStreamRun = new FileInputStream(new
File(td.getPath().toPortableString()));
+XmiCasDeserializer.deserialize(inputStreamRun, runCas, true);
+ } finally {
+if (inputStreamRun != null) {
+ inputStreamRun.close();
}
}
-
testCas = testCas.getView(viewCasName);
runCas = runCas.getView(viewCasName);
+ if (excludedTypes != null !excludedTypes.isEmpty()) {
+ListAnnotationFS toRemove = new LinkedListAnnotationFS();
+for (String eachType : excludedTypes) {
+ Type type = runCas.getTypeSystem().getType(eachType);
+ if (type != null
runCas.getTypeSystem().subsumes(runCas.getAnnotationType(), type)) {
+AnnotationIndexAnnotationFS annotationIndex =
runCas.getAnnotationIndex(type);
+for (AnnotationFS annotationFS : annotationIndex) {
+
svn commit: r1492270 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli: ducc-cancel.tex ducc-process-cancel.tex ducc-process-submit.tex ducc-reserve.tex ducc-servic
Author: challngr
Date: Wed Jun 12 16:34:16 2013
New Revision: 1492270
URL: http://svn.apache.org/r1492270
Log:
UIMA-2682 Duccbook updates.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-cancel.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-process-cancel.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-process-submit.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-reserve.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-service-cancel.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-service-submit.tex
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-cancel.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-cancel.tex?rev=1492270r1=1492269r2=1492270view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-cancel.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-cancel.tex
Wed Jun 12 16:34:16 2013
@@ -19,24 +19,24 @@
\paragraph{Options:}
\begin{description}
-\item[--debug ]
+\item[$--$debug ]
Prints internal debugging information, intended for DUCC developers
or extended problem determination.
-\item[--id {[jobid]}]
+\item[$--$id {[jobid]}]
The ID is the id of the job to cancel.
-\item[--reason {[quoted string]}]
+\item[$--$reason {[quoted string]}]
Optional. This specifies the reason the job is canceled for display
in the web server. Note that
the shell requires a quoted string. Example:
\begin{verbatim}
ducc_cancel --id 12 --reason This is a pretty good reason.
\end{verbatim}
-\item[-dpid {[pid]}]
+\item[$--$dpid {[pid]}]
If specified only this DUCC process will be canceled. If not
specified, then entire job will be canceled. The {\em pid} is the
DUCC-assigned process ID of the
process to cancel. This is the ID in the first column of the Web
Server's job details page, under
the column labeled ``Id''.
-\item[--help]
+\item[$--$help]
Prints the usage text to the console.
-\item[--role\_administrator] The command is being issued in the role
of a DUCC administrator.
+\item[$--$role\_administrator] The command is being issued in the role
of a DUCC administrator.
If the user is not also a registered administrator this flag is
ignored. (This helps to
protect administrators from accidentally canceling jobs they do not
own.)
\end{description}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-process-cancel.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-process-cancel.tex?rev=1492270r1=1492269r2=1492270view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-process-cancel.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-process-cancel.tex
Wed Jun 12 16:34:16 2013
@@ -6,6 +6,8 @@
\section{ducc\_process\_cancel}
\paragraph{Description:}
+The cancel CLI is used to cancel a process that has previously been
submitted but which has not yet
+completed.
\paragraph{Usage:}
\begin{description}
@@ -16,15 +18,15 @@
\paragraph{Options:}
\begin{description}
-\item[--debug ]
+\item[$--$debug ]
Prints internal debugging information, intended for DUCC developers
or extended problem determination.
-\item[--id {[jobid]}]
+\item[$--$id {[jobid]}]
The DUCC ID is the id of the process to cancel.
-\item[--help]
+\item[$--$help]
Prints the usage text to the console.
-\item[--reason]
+\item[$--$reason]
Optional. This specifies the reason the process is canceled, for
display in the web server.
-\item[--role\_administrator] The command is being issued in the role
of a DUCC administrator.
+\item[$--$role\_administrator] The command is being issued in the role
of a DUCC administrator.
If the user is not also a registered administrator this flag is
ignored. (This helps to
protect administrators from inadvertantly canceling work they do not
own.)
svn commit: r1492293 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli: ducc-monitor.tex ducc-perf-stats.tex ducc-services.tex ducc-unreserve.tex
Author: challngr
Date: Wed Jun 12 17:16:43 2013
New Revision: 1492293
URL: http://svn.apache.org/r1492293
Log:
UIMA-2682 Duccbook updates.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-monitor.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-perf-stats.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-unreserve.tex
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-monitor.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-monitor.tex?rev=1492293r1=1492292r2=1492293view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-monitor.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-monitor.tex
Wed Jun 12 17:16:43 2013
@@ -1,3 +1,8 @@
+%%
+%% ducc_monitor is currently unsupported. Perhaps it will come back after
+%% release 1. So the doc skeleton is preserved.
+%%
+
% Create well-known link to this spot for HTML version
\ifpdf
\else
@@ -14,21 +19,21 @@
\paragraph{Usage:}
\begin{description}
\item[Executable Jar] java -jar \ducchome/lib/uima-ducc-monitor.jar {\em
options}
-\item[Script wrapper] java -jar \ducchome/bin/ducc-monitor {\em options}
+\item[Script wrapper] \ducchome/bin/ducc-monitor {\em options}
\item[Java Main] java -cp \ducchome/lib/uima-ducc-monitor.jar
org.apache.uima.ducc.cli.DuccJobMonitor {\em options}
\end{description}
\paragraph{Options:}
\begin{description}
-\item[--debug ]
+\item[$--$debug ]
Prints internal debugging information, intended for DUCC developers
or extended problem determination.
-\item[--id {[jobid]}]
+\item[$--$id {[jobid]}]
The ID is the id of the job to monitor.
-\item[--help]
+\item[$--$help]
Prints the usage text to the console.
-\item[--quiet]
+\item[$--$quiet]
Disable CLI informational miessages;
-\item[timestamp]
+\item[--timestamp]
Enables timestamps on the monitor messages.
\end{description}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-perf-stats.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-perf-stats.tex?rev=1492293r1=1492292r2=1492293view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-perf-stats.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-perf-stats.tex
Wed Jun 12 17:16:43 2013
@@ -20,10 +20,10 @@
\paragraph{Options:}
\begin{description}
-\item[--job id] This specifies the job to report on.
-\item[--directory dir] This specifies the job's log directory. (DUCC
writes usage information into this
- directory.)
-\item[--report {[summary or workitems or processes]}]
+\item[$--$job id] This specifies the job to report on.
+\item[$--$directory dir] This specifies the job's log directory. (DUCC
writes usage information into this
+ directory as the job is running.)
+\item[$--$report {[summary or workitems or processes]}]
This specifies the type of report:
\begin{description}
\item[summary] This produces a per-AE summary of the performance
of that AE, including
@@ -37,7 +37,7 @@
maximum memory usage, page faults, swap space in use, maximum
swap used, \%CPU,
garbage collection statistics, and work item statistics
(processed, errors, retried, etc.).
\end{description}
-\item[--help] Prints the usage text to the console.
+\item[$--$help] Prints the usage text to the console.
\end{description}
\paragraph{Notes:}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex?rev=1492293r1=1492292r2=1492293view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex
Wed Jun 12
svn commit: r1492296 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli: ducc-process-cancel.tex ducc-services.tex ducc-unreserve.tex
Author: challngr
Date: Wed Jun 12 17:21:24 2013
New Revision: 1492296
URL: http://svn.apache.org/r1492296
Log:
UIMA-2682 Duccbook updates.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-process-cancel.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-unreserve.tex
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-process-cancel.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-process-cancel.tex?rev=1492296r1=1492295r2=1492296view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-process-cancel.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-process-cancel.tex
Wed Jun 12 17:21:24 2013
@@ -28,7 +28,7 @@
Optional. This specifies the reason the process is canceled, for
display in the web server.
\item[$--$role\_administrator] The command is being issued in the role
of a DUCC administrator.
If the user is not also a registered administrator this flag is
ignored. (This helps to
- protect administrators from inadvertantly canceling work they do not
own.)
+ protect administrators from inadvertently canceling work they do not
own.)
\end{description}
\paragraph{Notes:}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex?rev=1492296r1=1492295r2=1492296view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex
Wed Jun 12 17:21:24 2013
@@ -29,17 +29,17 @@
unregistered DUCC optionally stops the service instance, if any,
and discard the
saved specification.
-\item[Start] The start function instructs DUCC to alllocate
resources for a service and to
- start it in those resources. The service remains running until
explictly stopped. DUCC
+\item[Start] The start function instructs DUCC to allocate
resources for a service and to
+ start it in those resources. The service remains running until
explicitly stopped. DUCC
will attempt to keep the service instances running if they
should fail. The start function
is also used to increase the number of running service instances
if desired.
\item[Stop] The stop function stops some or all service instances.
\item[Query] The query function returns detailed information about
all known services, both
- registerd and otherwise.
+ registered and otherwise.
-\item[Modify] The modify function allows some aspectes of a
registered service to be updated
+\item[Modify] The modify function allows some aspects of a
registered service to be updated
without reregistereing the service. It optionally alters the
running service instances to
conform with the updates.
\end{description}
@@ -76,7 +76,7 @@
\item[$--$register {[specification file] [options]}] The
specification file is optional. If
specified, it has the same contents as described for the
\hyperref[sec:cli.service-submit]{{\em
ducc\_service\_submit}} command. As with {\em
ducc\_service\_submit}, any of the
- keywords in the specification may be overriden on the command
line.
+ keywords in the specification may be overridden on the command
line.
\item[$--$autostart {[true or false]}] This indicates whether to
register the service as
an autostarted service. If not specified, the default is {\em
false}.
@@ -91,8 +91,8 @@
\subsection{ducc\_services $--$start Options}
-The start function instructs DUCC to alllocate resources for a service and
to start it in those
-resources. The service remains running until explictly stopped. DUCC will
attempt to keep the
+The start function instructs DUCC to allocate resources for a service and
to start it in those
+resources. The service remains running until explicitly stopped. DUCC will
attempt to keep the
service instances running if they should fail. The start function
svn commit: r1492341 - /uima/build/trunk/uima-build-resources/pom.xml
Author: schor
Date: Wed Jun 12 18:37:03 2013
New Revision: 1492341
URL: http://svn.apache.org/r1492341
Log:
no Jira - cleanup POM: Now that this pom is inheriting from the uima-wide pom
it doesn't need it's own plugin-management section for the maven-changes-plugin
- that section was duplicating the one in the parent, and was also out of
date. Removed it.
Modified:
uima/build/trunk/uima-build-resources/pom.xml
Modified: uima/build/trunk/uima-build-resources/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources/pom.xml?rev=1492341r1=1492340r2=1492341view=diff
==
--- uima/build/trunk/uima-build-resources/pom.xml (original)
+++ uima/build/trunk/uima-build-resources/pom.xml Wed Jun 12 18:37:03 2013
@@ -57,44 +57,6 @@
/properties
build
-pluginManagement
- plugins
-
-!-- generate the issuesFixed report of Jiras fixed in this release --
-!-- uses the property jiraVersion to select the version --
-!-- run using mvn changes:jira-report -N -DjiraVersion=xx where
- xx is the jira internal version number which you can get
- from the Jira url (see parameter fixforversion=xx)
- by going to https://issues.apache.org/jira/browse/UIMA
- and selecting Releases and then going to the
- particular version and looking in the url for
- that version. --
-plugin
- groupIdorg.apache.maven.plugins/groupId
- artifactIdmaven-changes-plugin/artifactId
- version2.3/version
- executions
-execution
- iddefault-cli/id
- goalsgoaljira-report/goal/goals
- !-- don't use generate-sources - because javadoc plugin
re-exec's that --
- phasegenerate-resources/phase
- configuration
-fixVersionIds${jiraVersion}/fixVersionIds
-columnNamesType,Key,Status,Summary/columnNames
-resolutionIdsFixed/resolutionIds
-statusIdsClosed,Resolved/statusIds
-sortColumnNamesType,Key,Status/sortColumnNames
-outputDirectory${basedir}/issuesFixed//outputDirectory
-maxEntries1000/maxEntries !-- hopefully, bigger than ever
needed --
- /configuration
-/execution
- /executions
-
-/plugin
-
- /plugins
-/pluginManagement
plugins
svn commit: r1492381 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2: cli/ducc-services.tex ducc-api.tex job-logs.tex services.tex webserver/job-details.tex webserver
Author: challngr
Date: Wed Jun 12 19:18:00 2013
New Revision: 1492381
URL: http://svn.apache.org/r1492381
Log:
UIMA-2682 Duccbook updates.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/ducc-api.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/job-logs.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/services.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/webserver/job-details.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/webserver/services.tex
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex?rev=1492381r1=1492380r2=1492381view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex
Wed Jun 12 19:18:00 2013
@@ -66,7 +66,7 @@
Prints the usage text to the console.
\end{description}
-\subsection{ducc\_services $--$register Options}
+\subsection{ducc\_services --register Options}
\label{subsec:cli.ducc-services.register}
The {\em register} function submits a service specification to DUCC.
DUCC stores this
information until it is {\em unregistered}. Once registered, a service
may be
@@ -89,7 +89,7 @@
\end{description}
-\subsection{ducc\_services $--$start Options}
+\subsection{ducc\_services --start Options}
The start function instructs DUCC to allocate resources for a service and
to start it in those
resources. The service remains running until explicitly stopped. DUCC will
attempt to keep the
@@ -129,7 +129,7 @@ ducc_services --start UIMA-AS:Service23:
\end{verbatim}
\end{description}
-\subsection{ducc\_services $--$stop Options}
+\subsection{ducc\_services --stop Options}
The stop function instructs DUCC to stop some number of service instances.
If no specific number
is specified, all instances are stopped. This is used only for registered
services. Use
\hyperref[sec:cli.service-cancel]{{\em ducc\_service\_cancel}} command to
stop submitted services.
@@ -170,7 +170,7 @@ ducc_services --stop UIMA-AS:Service23:t
\end{description}
-\subsection{ducc\_services $--$modify Options}
+\subsection{ducc\_services --modify Options}
The modify function dynamically updates some of the attributes of a
registered service.
\begin{description}
@@ -217,7 +217,7 @@ ducc_services --stop UIMA-AS:Service23:t
\end{verbatim}
\end{description}
-\subsection{ducc\_services $--$query Options}
+\subsection{ducc\_services --query Options}
The query function returns details about all known services of all types
and classes, including
the DUCC ids of the service instances (for submitted and registered
services), the DUCC ids of
the jobs using each service, and a summary of each service's queue and
performance statistics,
@@ -225,7 +225,7 @@ ducc_services --stop UIMA-AS:Service23:t
All information returned by {\em ducc\_services $--$query} is also
available via the
\hyperref[ws:services-page]{Services Page} of the Web Server as well as
the DUCC Service API (see
-the \href{apidocs/index.html}{JavaDoc}).
+the JavaDoc).
\begin{description}
\item[$--$query {[service-id or endpoint]}] This indicates that a service
is to be stopped. The
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/ducc-api.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/ducc-api.tex?rev=1492381r1=1492380r2=1492381view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/ducc-api.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/ducc-api.tex
Wed Jun 12 19:18:00 2013
@@ -1,8 +1,8 @@
\section{Overview Of The DUCC API}
- The DUCC API provides a simple programatic interface to DUCC for submission
and
- cancelation of work. The DUCC CLI is implemented using the API and
provides a
- model for how to use the API.
+ The DUCC API provides a simple programmatic (Java) interface to DUCC for
submission and
+ cancellation of work. (Note that the DUCC CLI is implemented using the API
and provides a
+ model for how to use the API.)
svn commit: r1492445 - /uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
Author: cwiklik
Date: Wed Jun 12 22:00:56 2013
New Revision: 1492445
URL: http://svn.apache.org/r1492445
Log:
UIMA-2668 Modified sendExceptionToClient to prevent NPE
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
URL:
http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java?rev=1492445r1=1492444r2=1492445view=diff
==
---
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
(original)
+++
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
Wed Jun 12 22:00:56 2013
@@ -2013,7 +2013,11 @@ public class AggregateAnalysisEngineCont
private boolean sendExceptionToClient(CacheEntry cacheEntry, CasStateEntry
casStateEntry,
Endpoint replyEndpoint) throws Exception {
-// Dont send CASes to the client if the input CAS is in failed state. One
+
+ if ( casStateEntry == null ) {
+ return false;
+ }
+ // Dont send CASes to the client if the input CAS is in failed state.
One
// of the descendant CASes may have failed in one of the delegates. Any
// exception on descendant CAS causes the input CAS to be returned to the
// client with an exception but only when all its descendant CASes are
