svn commit: r1687777 - in /uima/sandbox/uima-ducc/trunk: src/main/resources/default.ducc.properties uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex
Author: challngr
Date: Fri Jun 26 14:20:04 2015
New Revision: 168
URL: http://svn.apache.org/r168
Log:
UIMA-4109 Merge doc updates for 2.0.0 function.
Modified:
uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex
Modified:
uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties?rev=168r1=1687776r2=168view=diff
==
--- uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties
(original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties Fri
Jun 26 14:20:04 2015
@@ -493,9 +493,15 @@ ducc.uima-as.dd2spring.xsl.path=${DUCC_H
# maximum amount of time to wait for a response from the JD. This value
# is used by the JP when sending requests to the JD.
ducc.process.request.timeout=3
-# define process container class for DD jobs to instantiate and invoke via
reflection
+
+# Define process container class for DD jobs to instantiate and invoke via
reflection.
+# The container provides classpath isolation for user defined analytics.
+# The container is instantiated with classes from a System classloader.
ducc.process.uima.as.container.class =
org.apache.uima.ducc.user.jp.UimaASProcessContainer
-# define process container class for non-DD jobs to instantiate and invoke via
reflection
+
+# Define process container class for non-DD jobs to instantiate and invoke via
reflection.
+# The container provides classpath isolation for user defined analytics.
+# The container is instantiated with classes from a System classloader.
ducc.process.uima.container.class =
org.apache.uima.ducc.user.jp.UimaProcessContainer
# define the sleep time for JP to use when JD sends empty CAS. In this case the
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex?rev=168r1=1687776r2=168view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-properties.tex
Fri Jun 26 14:20:04 2015
@@ -84,6 +84,40 @@
\item[Type] Local
\end{description}
+ \item[ducc.authentication.users.include] \hfill \\
+ Specify users allowed to log in to the web server. This is used only
+ if {\em ducc.authentication.implementor} is the
LinuxAuthenticationManager.
+ \begin{description}
+ \item[Default] All users may log in.
+ \item[Type] Local
+ \end{description}
+
+ \item[ducc.authentication.users.exclude] \hfill \\
+ Specify users not allowed to log in to the webserver. This is used
only
+ if {\em ducc.authentication.implementor} is the
LinuxAuthenticationManager.
+ \begin{description}
+ \item[Default] No users are excluded.
+ \item[Type] Local
+ \end{description}
+
+ \item[ducc.authentication.groups.include] \hfill \\
+ Specify groups allowed to log in. Groups are defined by Unix
authentication. Only
+ users in the groups specified here may log in to the web server.
This is used only
+ if {\em ducc.authentication.implementor} is the
LinuxAuthenticationManager.
+ \begin{description}
+ \item[Default] Users in all groups may log in.
+ \item[Type] Local
+ \end{description}
+
+ \item[ducc.authentication.groups.exclude] \hfill \\
+ Specify groups not allowed to log in. Groups are defined by Unix
authentication.
+ Users in the groups specified here may not log in to the web server.
This is used only
+ if {\em ducc.authentication.implementor} is the
LinuxAuthenticationManager.
+ \begin{description}
+ \item[Default] No users are excluded due to group membership.
+ \item[Type] Local
+ \end{description}
+
\item[ducc.admin.endpoint] \hfill \\
This is the JMS endpoint name used for DUCC administration messages.
\begin{description}
@@ -324,6 +358,21 @@
\item[Type] Local
\end{description}
+ \item[ducc.driver.jetty.max.threads] \hfill \\
+ Max number of threads in Jetty thread pool servicing incoming HTTP
requests.
+ \begin{description}
+ \item[Default] 100
+ \item[Type] Tuning
+ \end{description}
+
+ \item[ducc.driver.jetty.thread.idletime]
svn commit: r1687790 - in /uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta: RutaStream.java rule/WildCardRuleElement.java
Author: pkluegl
Date: Fri Jun 26 15:55:33 2015
New Revision: 1687790
URL: http://svn.apache.org/r1687790
Log:
UIMA-4486
- hotfixed workaround for staying compatible to uima 2.7.0
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java?rev=1687790r1=1687789r2=1687790view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
Fri Jun 26 15:55:33 2015
@@ -556,6 +556,9 @@ public class RutaStream extends FSIterat
if (isVisible(pointer) || !isValid()) {
moveToPrevious();
}
+ if(!isValid()) {
+moveToLast();
+ }
if (isValid()) {
RutaBasic nextBasic = (RutaBasic) get();
// TODO HOTFIX for annotation of length 0
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java?rev=1687790r1=1687789r2=1687790view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
Fri Jun 26 15:55:33 2015
@@ -302,7 +302,7 @@ public class WildCardRuleElement extends
result.add(ruleMatch);
return result;
}
-if(iterator.isValid() !stream.isVisible(iterator.get())) {
+if (iterator.isValid() !stream.isVisible(iterator.get())) {
moveOn(after, iterator, stream);
}
boolean doneHere = false;
@@ -386,8 +386,16 @@ public class WildCardRuleElement extends
} else {
AnnotationFS pointer = stream.getAnchor(after, annotation);
result = cas.getAnnotationIndex(type).iterator(pointer);
-if (!after) {
- result.moveToPrevious();
+if (!result.isValid()) {
+ if (after) {
+result.moveToFirst();
+ } else {
+result.moveToLast();
+ }
+} else {
+ if (!after) {
+result.moveToPrevious();
+ }
}
if (annotation != null result.isValid()) {
// hotfix for index overflow...
@@ -420,8 +428,16 @@ public class WildCardRuleElement extends
result = cas.getAnnotationIndex(type).subiterator(window);
AnnotationFS pointer = stream.getAnchor(after, annotation);
result.moveTo(pointer);
-if (!after) {
- result.moveToPrevious();
+if (!result.isValid()) {
+ if (after) {
+result.moveToFirst();
+ } else {
+result.moveToLast();
+ }
+} else {
+ if (!after) {
+result.moveToPrevious();
+ }
}
}
}
@@ -501,7 +517,7 @@ public class WildCardRuleElement extends
} else {
iterator.moveToPrevious();
}
-while(iterator.isValid() !stream.isVisible(iterator.get())) {
+while (iterator.isValid() !stream.isVisible(iterator.get())) {
if (after) {
iterator.moveToNext();
} else {
svn commit: r1687780 - in /uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta: condition/IfCondition.java condition/ImplicitCondition.java condition/ScoreCondition.java expression/bool/Boole
Author: pkluegl
Date: Fri Jun 26 14:41:00 2015
New Revision: 1687780
URL: http://svn.apache.org/r1687780
Log:
UIMA-4472
- added match context to getters in expressions
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java?rev=1687780r1=1687779r2=1687780view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/IfCondition.java
Fri Jun 26 14:41:00 2015
@@ -38,7 +38,7 @@ public class IfCondition extends Abstrac
@Override
public EvaluatedCondition eval(AnnotationFS annotation, RuleElement element,
RutaStream stream,
InferenceCrowd crowd) {
-return new EvaluatedCondition(this,
expression.getBooleanValue(element.getParent(), null,
+return new EvaluatedCondition(this,
expression.getBooleanValue(element.getParent(), annotation,
stream));
}
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java?rev=1687780r1=1687779r2=1687780view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ImplicitCondition.java
Fri Jun 26 14:41:00 2015
@@ -50,7 +50,7 @@ public class ImplicitCondition extends A
InferenceCrowd crowd) {
if (expr instanceof IBooleanExpression) {
IBooleanExpression be = (IBooleanExpression) expr;
- return new EvaluatedCondition(this,
be.getBooleanValue(element.getParent(), null, stream));
+ return new EvaluatedCondition(this,
be.getBooleanValue(element.getParent(), annotation, stream));
} else if (expr instanceof FeatureMatchExpression) {
FeatureMatchExpression fme = (FeatureMatchExpression) expr;
TypeExpression typeExpr = fme.getTypeExpr(element.getParent());
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java?rev=1687780r1=1687779r2=1687780view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/condition/ScoreCondition.java
Fri Jun 26 14:41:00 2015
@@ -63,8 +63,8 @@ public class ScoreCondition extends Term
if (var != null) {
element.getParent().getEnvironment().setVariableValue(var, score);
}
-boolean value = score = min.getDoubleValue(element.getParent(), null,
stream)
- score = max.getDoubleValue(element.getParent(), null, stream);
+boolean value = score = min.getDoubleValue(element.getParent(),
annotation, stream)
+ score = max.getDoubleValue(element.getParent(), annotation,
stream);
return new EvaluatedCondition(this, value);
}
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java?rev=1687780r1=1687779r2=1687780view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/expression/bool/BooleanNumberExpression.java
Fri Jun 26 14:41:00 2015
@@ -41,8 +41,8 @@ public class BooleanNumberExpression ext
@Override
public boolean getBooleanValue(RutaBlock parent, AnnotationFS annotation,
RutaStream stream) {
-double doubleValue1 = getFristExpression().getDoubleValue(parent, null,
stream);
-double doubleValue2 = getSecondExpression().getDoubleValue(parent, null,
stream);
+double doubleValue1 = getFristExpression().getDoubleValue(parent,
annotation, stream);
+double
svn commit: r1687773 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook: installation.tex logs.tex part4/admin/ducc-users.tex part4/install.tex
Author: challngr
Date: Fri Jun 26 13:23:29 2015
New Revision: 1687773
URL: http://svn.apache.org/r1687773
Log:
UIMA-4109 Conditionally skip hyperref from standalone docs.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/installation.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/logs.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-users.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/install.tex
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/installation.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/installation.tex?rev=1687773r1=1687772r2=1687773view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/installation.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/installation.tex
Fri Jun 26 13:23:29 2015
@@ -18,6 +18,8 @@
%
\documentclass[letterpaper]{article}
+\def\DUCCSTANDALONE{}
+
% space between paragraphs
\usepackage{parskip}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/logs.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/logs.tex?rev=1687773r1=1687772r2=1687773view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/logs.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/logs.tex
Fri Jun 26 13:23:29 2015
@@ -18,6 +18,8 @@
%
\documentclass[letterpaper]{article}
+\def\DUCCSTANDALONE{}
+
% space between paragraphs
\usepackage{parskip}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-users.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-users.tex?rev=1687773r1=1687772r2=1687773view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-users.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/admin/ducc-users.tex
Fri Jun 26 13:23:29 2015
@@ -61,7 +61,7 @@ User mary{ max-allotment = 1000
User antoinette { max-allotment = 720 }
\end{verbatim}
\caption{Sample User Registration}
- \label{fig:class.configuration}
+ \label{fig:user.configuration}
\end{figure}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/install.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/install.tex?rev=1687773r1=1687772r2=1687773view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/install.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part4/install.tex
Fri Jun 26 13:23:29 2015
@@ -321,7 +321,13 @@ $HOME/ducc/logs/job-id
\section{Add additional nodes to the DUCC cluster}
- Additional nodes must meet all \hyperref[sec:install.prerequisites]{\em
prerequisites}.
+ Additional nodes must meet all
+ \ifdefined\DUCCSTANDALONE
+ {\em prerequisites} (listed above).
+ \else
+ \hyperref[sec:install.prerequisites]{\em prerequisites}.
+ \fi
+
If user's home directories are on local filesystems the location for user
logfiles
should be specified to be on a shared filesystem.
@@ -399,7 +405,12 @@ privileged operations.
If a different location is chosen for ducc\_ling the new path needs to be
specified
for ducc.agent.launcher.ducc\_spawn\_path in
\$DUCC\_HOME/resources/site.ducc.properties.
-See more info at see \hyperref[sec:admin.properties-merge] {Properties
merging}.
+See more info at see
+\ifdefined\DUCCSTANDALONE
+{\em properties merging} in the duccbook.
+\else
+\hyperref[sec:admin.properties-merge] {Properties merging}.
+\fi
\section{CGroups Installation and Configuration}
@@ -420,8 +431,12 @@ See more info at see \hyperref[sec:admin
To install and configure CGroups for DUCC:
\begin{enumerate}
- \item Install the appropriate
\hyperref[sec:install.prerequisites]{libcgroup package} at level 0.37
- or above.
+ \item Install the appropriate
+ \ifdefined\DUCCSTANDALONE
+ libcgroup package at level 0.37 or above (see {\em Installation
Prerequisites}).
+ \else
+ \hyperref[sec:install.prerequisites]{libcgroup package} at level 0.37 or
above.
+ \fi
\item Configure /etc/cgconfig.conf as follows:
