svn commit: r1609144 - /uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties
Author: degenaro
Date: Wed Jul 9 13:22:01 2014
New Revision: 1609144
URL: http://svn.apache.org/r1609144
Log:
UIMA-3896 updated decoration description (for uima-ducc-demo.a.o)
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties?rev=1609144r1=1609143r2=1609144view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties
Wed Jul 9 13:22:01 2014
@@ -74,11 +74,8 @@ ducc.broker.hostname=${ducc.head}
ducc.broker.port=61617
# Broker decorations:
-#maxInactivityDuration: 0, turn off broker detection of inactive
connections
#useCompression: true, compress JMS cargo
-#closeAsync: false, block waiting until the JMS connection is closed. This
-# setting reduces number of open sockets.
-ducc.broker.url.decoration=wireFormat.maxInactivityDuration=0jms.useCompression=truecloseAsync=false
+ducc.broker.url.decoration=jms.useCompression=true
ducc.broker.name=${ducc.head}
@@ -202,6 +199,9 @@ ducc.ws.jsp.compilation.directory = /tmp
ducc.ws.login.enabled = false
# Specify precalculate machines (default is true)
ducc.ws.precalculate.machines = true
+# For node fisualization - if true,strip domain names from labels for cleaner
visuals
+ducc.ws.visualization.strip.domain = true
+
# == Web Server Configuration block ==
# == Job Driver Configuration block ==
@@ -451,7 +451,7 @@ ducc.uima-as.endpoint.params=transferExc
# saxon8.jar - Saxon is an XSLT and XQuery processor. It is used by UIMA-AS
# when deploying a service.
-ducc.uima-as.saxon.jar.path=file:${DUCC_HOME}/lib/saxon/saxon8.jar
+ducc.uima-as.saxon.jar.path=file:${DUCC_HOME}/apache-uima/saxon/saxon8.jar
# dd2spring.xsl - contains a set of rules used when transforming
# UIMA-AS deployment descriptor into SpringFramework's
svn commit: r1609143 - /uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties.original
Author: degenaro
Date: Wed Jul 9 13:21:47 2014
New Revision: 1609143
URL: http://svn.apache.org/r1609143
Log:
UIMA-3896 updated decoration description (for uima-ducc-demo.a.o)
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties.original
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties.original
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties.original?rev=1609143view=auto
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties.original
(added)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties.original
Wed Jul 9 13:21:47 2014
@@ -0,0 +1,467 @@
+# ---
+# 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.
+# ---
+
+#
+# This configuration file contains most of the specifications for DUCC.
+#
+# Two other important customizable files define the classes and nodes.
+#
+# The class definition file is specified by the property
'ducc.rm.class.definitions'
+# and a sample called ducc.classes has been provided in DUCC_HOME/resources.
+#
+# Node definitions are by default taken from ducc.nodes but this may be
overridden
+# with the -n option on start_ducc
+#
+# For a new installation the first two entries below MUST be modified.
+#
+#
+
+
+# Identify the node where DUCC runs. Updated by ducc_post_install.
+ducc.head = head-node
+
+# Name the JVM. Updated by ducc_post_install
+ducc.jvm = full-path-to-java-command
+
+# The name of the cluster as shown by the Web Server
+ducc.cluster.name=Apache UIMA-DUCC
+
+# Name any site-local jars
+#ducc.local.jars =
+
+# Declare which components to load into the jvm on process startup.
+ducc.jms.provider=activemq
+
+# ---
+# ---
+# Define the ActivemQ broker configuration.
+#ducc.broker.protocol - Ddefine broker protocol. Should typically be
+# tcp. *** Dont specify : or // ***
+# ducc.broker.hostname- The name of the host where the broker is running.
+# ducc.broker.port- The broker's connection port
+# ducc.broker.url.decoration - The broker *client* url decoration.
+#recoveryInterval=3 - Specifies an interval between recovery
attempts,
+# i.e when a connection is being refreshed,
+# in milliseconds
+#jms.useCompression=true - Compress message body
+# ducc.broker.name- the broker name - must match the actual broker name
+# in the broker config. THIS IS NOT THE BROKER
HOSTNAME
+# WHICH IS CONFIGURED IN ducc.broker.hostname.
+# ducc.broker.jmx.port- the Broker's jmx port
+#
+ducc.broker.protocol=tcp
+ducc.broker.hostname=${ducc.head}
+ducc.broker.port=61617
+
+# Broker decorations:
+#useCompression: true, compress JMS cargo
+ducc.broker.url.decoration=jms.useCompression=true
+
+ducc.broker.name=localhost
+ducc.broker.jmx.port=1100
+#
+# ActiveMQ credentials file used to authenticate DUCC daemons with the broker.
+#
+ducc.broker.credentials.file=${DUCC_HOME}/resources/private/ducc-broker-credentials.properties
+
+# ActiveMQ Auto-management configuration
+#docc.broker.automanage- if true, DUCC will start and stop the broker
as needed.
+#Otherwise, the installation is responsible for
+#manageing ActiveMQ
+#ducc.broker.memor.options - If automanaged, the memory configuration
passed to the JVM
+#ducc.broker.configuration - If automanaged, the location of the
svn commit: r1609194 [2/2] - in /uima/ruta/trunk/ruta-ep-addons: ./ src/main/java/org/apache/uima/ruta/check/
Modified:
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/check/UpdateTaskHandler.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/check/UpdateTaskHandler.java?rev=1609194r1=1609193r2=1609194view=diff
==
---
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/check/UpdateTaskHandler.java
(original)
+++
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/check/UpdateTaskHandler.java
Wed Jul 9 14:54:59 2014
@@ -26,7 +26,10 @@ import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.uima.UIMAFramework;
import org.apache.uima.cas.CAS;
@@ -51,7 +54,6 @@ import org.eclipse.core.runtime.IProgres
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.jface.viewers.TreeViewer;
@@ -82,16 +84,19 @@ public class UpdateTaskHandler implement
this.previousSelection = previousSelection;
}
-CheckAnnotationUpdateTaskJob(AnnotationCheckComposite composite,
AnnotationCheckTreeNode previousSelection ) {
- this(composite.getDocumentSource(), composite.getDocumentSink(),
composite.getTypeSystem(),
+CheckAnnotationUpdateTaskJob(AnnotationCheckComposite composite,
+AnnotationCheckTreeNode previousSelection) {
+ this(composite.getDocumentSource(), composite.getDocumentSink(),
composite.getPathToTypeSystem(),
composite, previousSelection);
}
+@Override
public IStatus run(IProgressMonitor monitor) {
- ListString selectedTypes = composite.getSelectedTypes();
-
+ MapString, SetString typesToCheck = composite.getCheckedTypes();
+
File dir = new File(documentSource);
File[] listFiles = dir.listFiles(new FilenameFilter() {
+@Override
public boolean accept(File file, String string) {
return string.endsWith(.xmi);
}
@@ -144,17 +149,23 @@ public class UpdateTaskHandler implement
RutaAddonsPlugin.error(e);
}
CheckDocument element = getCheckDocument(docs, file.getAbsolutePath());
-boolean documentAlreadyDone = documentAlreadyDoneforTypes(element,
selectedTypes);
+boolean documentAlreadyDone = documentAlreadyDoneforTypes(element, new
LinkedListString(
+typesToCheck.keySet()));
if (!documentAlreadyDone) {
AnnotationCheckTreeNode node = new AnnotationCheckTreeNode(root,
element);
root.addChild(node);
AnnotationIndexAnnotationFS annotationIndex =
cas.getAnnotationIndex();
for (AnnotationFS each : annotationIndex) {
boolean annotationAlreadyDoneforTypes =
annotationAlreadyDoneforTypes(each,
-selectedTypes, element.checkedTypes);
+typesToCheck.keySet(), element.checkedTypes);
if (!annotationAlreadyDoneforTypes) {
CheckElement ac = new CheckAnnotation(each);
AnnotationCheckTreeNode anode = new
AnnotationCheckTreeNode(node, ac);
+ for (String feature :
typesToCheck.get(each.getType().getName())) {
+anode.addChild(new FeatureCheckTreeNode(anode,
each.getType().getFeatureByBaseName(
+feature),
each.getFeatureValueAsString(each.getType().getFeatureByBaseName(
+feature;
+ }
if (treePath == null) {
treePath = new TreePath(new Object[] { root, node, anode });
}
@@ -166,22 +177,29 @@ public class UpdateTaskHandler implement
}
}
}
- if(previousSelection != null) {
+ if (root.getChildren().length == 0) {
+return Status.OK_STATUS;
+ }
+ if (previousSelection != null) {
CheckElement element = previousSelection.getElement();
TreePath oldPath = getPathTo(element, root);
-if(oldPath != null) {
+if (oldPath != null) {
treePath = oldPath;
}
}
final TreeSelection firstSelection = new TreeSelection(treePath);
-
+
cas.release();
composite.setOldDocs(docs);
composite.getDisplay().asyncExec(new Runnable() {
+@Override
public void run() {
TreeViewer treeView = composite.getTreeViewer();
treeView.setInput(root);
treeView.setSelection(firstSelection, true);
+ treeView.expandToLevel(
+ ((AnnotationCheckTreeNode)
firstSelection.getFirstElement()).getParent(),
+
svn commit: r1609266 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main: java/org/apache/uima/ducc/ws/server/nodeviz/ webapp/root/$banner/
Author: challngr
Date: Wed Jul 9 18:48:22 2014
New Revision: 1609266
URL: http://svn.apache.org/r1609266
Log:
UIMA-3900 Center titles. Put viz into the nav menu.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c0-menu.jsp
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java?rev=1609266r1=1609265r2=1609266view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java
Wed Jul 9 18:48:22 2014
@@ -50,7 +50,7 @@ class JobFragment
{
if ( type == DuccType.Undefined ) {
fillColor = 0,0,0;
-textColor = 256,256,256;
+textColor = 255,255,255;
} else {
int color_index = (user + ).hashCode(); // we add because
orginal viz did and this keeps the colors consistent.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java?rev=1609266r1=1609265r2=1609266view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java
Wed Jul 9 18:48:22 2014
@@ -81,11 +81,29 @@ public class Markup
out.append(\ y=\);
out.append((y*YSCALE) );
out.append(\ font-family=\helvetica\ font-size=\10\
font-weight=\bold\ );
+out.append( text-anchor=\middle\);
out.append( fill=\black\ );
out.append(label);
out.append(/text);
}
+ void centeredText(float x, float y, String label, String color, int
fontsize)
+{
+ out.append(text x=\);
+out.append(Float.toString(x * XSCALE));
+out.append(\ y=\);
+out.append(Float.toString(y * YSCALE));
+out.append(\ font-family=\helvetica\ font-size=\);
+out.append(Integer.toString(fontsize));
+out.append(\ fill=\);
+out.append(color);
+out.append(\);
+out.append( text-anchor=\middle\);
+out.append();
+out.append(label);
+out.append(/text);
+ }
+
void text(float x, float y, String label, String color, int fontsize)
{
out.append(text x=\);
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java?rev=1609266r1=1609265r2=1609266view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java
Wed Jul 9 18:48:22 2014
@@ -245,6 +245,7 @@ public class NodeViz
visualization =
html +
div id=\viz-header\ style=\text-align:center\ +
+
Sort By +
i onclick=\ducc_viz_node_sorter('size')\
id=\ducc-viz-sort-size\ style=\color:red\Size /i +
i onclick=\ducc_viz_node_sorter('name')\
id=\ducc-viz-sort-name\\Name/i +
@@ -267,7 +268,7 @@ public class NodeViz
/div +
br +
//div id=\nodelist\ style=\background-color:e5e5e5\ +
-div id=\nodelist\ style=\background-color:ee\ +
+div id=\nodelist\
style=\background-color:ee;padding:3\ +
page +
/div +
script +
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java
URL:
svn commit: r1609328 - /uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java
Author: burn Date: Wed Jul 9 22:09:10 2014 New Revision: 1609328 URL: http://svn.apache.org/r1609328 Log: UIMA-3933 APs now accept the --service_dependency option Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java?rev=1609328r1=1609327r2=1609328view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java Wed Jul 9 22:09:10 2014 @@ -55,6 +55,7 @@ public class DuccManagedReservationSubmi UiOption.WorkingDirectory, UiOption.WaitForCompletion, UiOption.CancelOnInterrupt, +UiOption.ServiceDependency, }; /**
svn commit: r1609333 - /uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
Author: burn
Date: Wed Jul 9 22:31:49 2014
New Revision: 1609333
URL: http://svn.apache.org/r1609333
Log:
UIMA-3933 Set DUCC_PROCESS_LOG_PREFIX in environment for APs jobs
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java?rev=1609333r1=1609332r2=1609333view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
Wed Jul 9 22:31:49 2014
@@ -53,7 +53,6 @@ public class DuccCommandExecutor extends
NodeAgent.COMPONENT_NAME);
@SuppressWarnings(unused)
private static AtomicInteger nextPort = new AtomicInteger(3);
- private static int SIGTERM_KILL_EXITCODE = 143;
public DuccCommandExecutor(NodeAgent agent, ICommandLine cmdLine,String
host, String ip, Process managedProcess)
throws Exception {
@@ -470,7 +469,7 @@ public class DuccCommandExecutor extends
switch(
((ManagedProcess)super.managedProcess).getDuccProcess().getProcessType() ) {
case Pop:
// Both JD and POP arbitrary process are POPs. Assume this is
an arbitrary process
-processType = -POP-;
+ processType = -POP-;
if ( cmdLine instanceof JavaCommandLine ) {
ListString options =
((JavaCommandLine)cmdLine).getOptions();
for(String option : options ) {
@@ -485,13 +484,12 @@ public class DuccCommandExecutor extends
}
break;
case Service:
-//processType = -AP-;
+ //processType = -AP-;
break;
case Job_Uima_AS_Process:
-processType = -UIMA-;
-
((JavaCommandLine)cmdLine).addOption(-Dducc.deploy.components=uima-as);
-
((JavaCommandLine)cmdLine).setClassName(org.apache.uima.ducc.common.main.DuccService);
-
+ processType = -UIMA-;
+
((JavaCommandLine)cmdLine).addOption(-Dducc.deploy.components=uima-as);
+
((JavaCommandLine)cmdLine).setClassName(org.apache.uima.ducc.common.main.DuccService);
break;
}
// if (
((ManagedProcess)super.managedProcess).getDuccProcess().getProcessType().equals(ProcessType.Pop))
{
@@ -532,6 +530,7 @@ public class DuccCommandExecutor extends
operationalProperties.add(-D+NodeAgent.ProcessStateUpdatePort+=+System.getProperty(NodeAgent.ProcessStateUpdatePort));
}
}
+ // NOTE - These are redundant since the information is also in
the environment for both Java and non-Java processes
operationalProperties.add(-Dducc.process.log.dir=+processLogDir);
operationalProperties.add(-Dducc.process.log.basename=+processLogFile);
//((ManagedProcess)super.managedProcess).getWorkDuccId()+ processType+host);
operationalProperties.add(-Dducc.job.id=+((ManagedProcess)super.managedProcess).getWorkDuccId());
@@ -544,10 +543,9 @@ public class DuccCommandExecutor extends
} else {
cmd = Utils.concatAllArrays(new String[] {executable},
operationalProperties.toArray(operationalPropertiesArray),
cmdLine.getCommandLine());
}
- // add JobId to the env
- if ( processEnv != null ) {
- processEnv.put(JobId,
String.valueOf(((ManagedProcess)super.managedProcess).getWorkDuccId().getFriendly()));
- }
+ // add JobId and the log prefix to the env so additional
similarly-named log files can be created
+ processEnv.put(JobId,
String.valueOf(((ManagedProcess)super.managedProcess).getWorkDuccId().getFriendly()));
+ processEnv.put(DUCC_PROCESS_LOG_PREFIX, processLogDir +
processLogFile);
}
return cmd;
} catch( Exception ex) {
