[maven-release-plugin] copy for tag uima-ducc-2.1.0
git-svn-id: https://svn.apache.org/repos/asf/uima/uima-ducc/tags/uima-ducc-2.1.0@1753576 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE_NOTES.html b/RELEASE_NOTES.html
index dfea483..6e27db9 100755
--- a/RELEASE_NOTES.html
+++ b/RELEASE_NOTES.html
@@ -48,7 +48,9 @@
<ul>
-<li>DUCC framework runs on Java 7 or Java 8, each supporting applications using either JRE </li>
+<li>DUCC framework now runs on Java 7 or Java 8 and supports applications using either JRE.
+ Note that some job and other history data are saved as Java serialized objects and not
+ portable between Java 7 and Java 8.</li>
<li>Ubuntu and RHEL 7 support </li>
<li>cgroup enhancements </li>
<ul>
diff --git a/src/main/legal/LICENSE b/src/main/legal/LICENSE
index 1189dcb..c2502d8 100644
--- a/src/main/legal/LICENSE
+++ b/src/main/legal/LICENSE
@@ -274,6 +274,7 @@
xbean-spring-3.18.jar
jetty v9.2.13.v20150730
+ jetty-all-9.2.13.v20150730.jar
jetty-proxy-9.2.13.v20150730.jar
jetty-quickstart-9.2.13.v20150730.jar
jetty-rewrite-9.2.13.v20150730.jar
@@ -343,7 +344,7 @@
(cassandra server) stream-2.5.2.jar
(cassandra server) super-csv-2.1.0.jar
(cassandra server) thrift-server-0.3.7.jar
-
+ (cassandra) jna-4.0.0.jar
(webserver) org.mortbay.jasper.apache-jsp-8.0.9.M3.jar
(webserver) org.mortbay.jasper.apache-el-8.0.9.M3.jar
(webserver) org.apache.taglibs.taglibs-standard-impl-1.2.1.jar
@@ -352,26 +353,23 @@
(webserver) jetty-jsp-jdt-2.3.3.jar
(webserver) JPagination
-
-
(activemq) hawtbuf-1.11.jar
-
-
commons-cli-1.2.jar
commons-collections-3.2.1.jar
commons-lang-2.6.jar
commons-pool2-2.4.2.jar
log4j-1.2.16.jar
gson-2.2.2.jar
- guava-r09.jar
- jna-4.0.0.jar
+ guava-14.0.1.jar
+ jna-4.2.2.jar
joda-time-2.1.jar
- commons-logging-1.2.0.jar
+ commons-logging-1.2.jar
geronimo-j2ee-management_1.1_spec-1.0.1.jar
geronimo-jms_1.1_spec-1.1.1.jar
geronimo-servlet_3.0_spec-1.0.jar
httpcore-4.4.4.jar
httpclient-4.5.1.jar
+ log4j-1.2.17.jar
===-Apache Software License v 1.0 =============
xpp3-1.1.4c.jar
@@ -399,19 +397,24 @@
===-MIT License =============
(cassandra) high-scale-lib-1.0.6.jar
-
-***** DUPLICATE CASSANDRA /cassandra-server/lib/slf4j-api-1.7.2.jar
-
- slf4j-api-1.6.4.jar
-
-**************************************************************
-
- slf4j-log4j-1.7.13.jar
+ (cassandra) slf4j-api-1.7.2.jar
+ (activemq) slf4j-api-1.7.13.jar
+ slf4j-log4j12-1.7.13.jar
jcl-over-slf4j-1.7.13.jar
+
+ (webserver)jgrowl-1.3
+ (webserver)sorttable.js v.2
+ (webserver)clueTip 1.2.6
+ (webserver)jQuery v2.0.3
+ (webserver)jQuery UI v.1.11.0
+ (webserver)DataTables v.1.10.1
+ (webserver)DataTables-plugins v.1.10.1
+ (webserver>navigation
(webserver)javax.mail.glassfish_1.4.1.v201005082020.jar
iso-relax
(webserver)javax.mail.glassfish_1.4.1.v201005082020.jar
RelaxNG Object Model/Parser
+
(webserver)libpam4j-1.7.jar
(webserver)sorttable.js v.2
(webserver)clueTip 1.2.6
diff --git a/src/main/resources/default.ducc.properties b/src/main/resources/default.ducc.properties
index 65f723c..1654dae 100644
--- a/src/main/resources/default.ducc.properties
+++ b/src/main/resources/default.ducc.properties
@@ -32,20 +32,19 @@
# 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
+# with the -n option on start_ducc.
#
-# For a new installation the first two entries below MUST be modified.
+# The first two entries here are customized in site.ducc.properties by ducc_post_install.
#
# ====================================================================================
-
-# Identify the node where DUCC runs. Updated by ducc_post_install.
+# The name of the node where DUCC runs.
ducc.head = <head-node>
-# Name the JVM. Updated by ducc_post_install
+# The full name of the Java command.
ducc.jvm = <full-path-to-java-command>
-# The name of the cluster as shown by the Web Server
+# The name of the cluster as shown by the Web Server.
ducc.cluster.name=Apache UIMA-DUCC
# Specify location of private resources directory. UIMA-3892
diff --git a/uima-ducc-examples/src/main/uima-ducc-vm/cron/autostart.sh b/uima-ducc-examples/src/main/uima-ducc-vm/cron/autostart.sh
index 277a73f..86af810 100644
--- a/uima-ducc-examples/src/main/uima-ducc-vm/cron/autostart.sh
+++ b/uima-ducc-examples/src/main/uima-ducc-vm/cron/autostart.sh
@@ -28,24 +28,21 @@
/bin/echo "killall -9 java python service"
/usr/bin/killall -9 java python service >/dev/null 2>&1
/bin/echo "mkdir logdir"
- /bin/mkdir /tmp/degenaro >/dev/null 2>&1
- /bin/mkdir /tmp/degenaro/ducc >/dev/null 2>&1
- /bin/mkdir /tmp/degenaro/ducc/logs >/dev/null 2>&1
/bin/echo "start DUCC"
- cd ~/ducc/install/examples/systemtest
+ cd ~/ducc_runtime/examples/systemtest
./start_sim --nothreading -n ducc.nodes -c all
- /bin/sleep 90
+ /bin/sleep 180
/bin/echo "start registered services"
- cd ~/ducc/install/bin
+ cd ~/ducc_runtime/bin
./ducc_services --start 0 --role_administrator
./ducc_services --start 1 --role_administrator
./ducc_services --start 2 --role_administrator
./ducc_services --start 3 --role_administrator
./ducc_services --start 4 --role_administrator
./ducc_services --start 5 --role_administrator
- /bin/sleep 30
+ /bin/sleep 60
/bin/echo "start workload manager"
- cd ~/ducc/install/examples/uima-ducc-vm/driver
+ cd ~/ducc_runtime/examples/uima-ducc-vm/driver
./driver_start >/dev/null 2>&1
#else
# /bin/echo "DUCC is running"
diff --git a/uima-ducc-examples/src/main/uima-ducc-vm/cron/cleanup.sh b/uima-ducc-examples/src/main/uima-ducc-vm/cron/cleanup.sh
index 8101d36..d9f9a32 100644
--- a/uima-ducc-examples/src/main/uima-ducc-vm/cron/cleanup.sh
+++ b/uima-ducc-examples/src/main/uima-ducc-vm/cron/cleanup.sh
@@ -18,22 +18,21 @@
# under the License.
# -----------------------------------------------------------------------
-# this section reports what the script will remove
-togo=`find /tmp/degenaro/ducc/logs/ -maxdepth 1 -name "[0-9]*" -mtime +7 | wc -l`
-echo Removing $togo directories in /tmp/degenaro/ducc/logs/
-find /tmp/degenaro/ducc/logs/ -maxdepth 1 -name "[0-9]*" -mtime +7 | xargs -i ls -ld {}
-togo=`find /home/degenaro/ducc/logs/ -maxdepth 1 -name "[0-9]*" -mtime +7 | wc -l`
-echo Removing $togo directories in /home/degenaro/ducc/logs/
-find /home/degenaro/ducc/logs/ -maxdepth 1 -name "[0-9]*" -mtime +7 | xargs -i ls -ld {}
-togo=`find /tmp/ducc/driver/ -maxdepth 4 -name "[0-9]*" -mtime +7 | wc -l`
-echo Removing $togo directories in /tmp/ducc/driver/
-find /tmp/ducc/driver/ -maxdepth 4 -name "[0-9]*" -mtime +7 | xargs -i ls -ld {}
-togo=`find /tmp/ -maxdepth 1 -name "*.xml" -mtime +7 | wc -l`
-echo Removing $togo xml files in /tmp
+# handle /home/duccy/spool/
+togo=`find /home/duccy/spool/* -mtime +7 -user duccy`
+echo Removing $togo
+`find /home/duccy/spool/* -mtime +7 -user duccy | xargs -i rm -rf {}`
-# this section actually removes stuff
-find /tmp/degenaro/ducc/logs/ -maxdepth 1 -name "[0-9]*" -mtime +7 | xargs -i rm -rf {}
-find /home/degenaro/ducc/logs/ -maxdepth 1 -name "[0-9]*" -mtime +7 | xargs -i rm -rf {}
-find /tmp/ducc/driver/ -maxdepth 4 -name "[0-9]*" -mtime +7 | xargs -i rm -rf {}
-find /tmp/ -maxdepth 1 -name "*.xml" -mtime +7 | xargs -i rm -f {}
+# handle /home/duccy/ducc/logs/
+
+togo=`find /home/duccy/ducc/logs/* -mtime +7 -user duccy`
+echo Removing $togo
+`find /home/duccy/ducc/logs/* -mtime +7 -user duccy | xargs -i rm -rf {}`
+
+# handle /tmp/UIMA*
+
+togo=`find /tmp -mtime +7 -user duccy`
+echo Removing $togo
+`find /tmp -mtime +7 -user duccy | xargs -i rm -rf {}`
+
diff --git a/uima-ducc-examples/src/main/uima-ducc-vm/cron/crontab.txt b/uima-ducc-examples/src/main/uima-ducc-vm/cron/crontab.txt
index bbc36cf..d1dda7f 100644
--- a/uima-ducc-examples/src/main/uima-ducc-vm/cron/crontab.txt
+++ b/uima-ducc-examples/src/main/uima-ducc-vm/cron/crontab.txt
@@ -1,2 +1,2 @@
-*/5 * * * * /home/degenaro/ducc/install/examples/uima-ducc-vm/cron/autostart.sh
-* 22 * * * /home/degenaro/ducc/install/examples/uima-ducc-vm/cron/cleanup.sh
\ No newline at end of file
+*/5 * * * * /home/duccy/ducc_runtime/examples/uima-ducc-vm/cron/autostart.sh
+* 22 * * * /home/duccy/ducc_runtime/examples/uima-ducc-vm/cron/cleanup.sh
diff --git a/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java b/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
index 2b46fb1..1651b54 100644
--- a/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
+++ b/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
@@ -99,7 +99,7 @@
private DuccWorkMap workMap = orchestratorCommonArea.getWorkMap();
private StateJobAccounting stateJobAccounting = StateJobAccounting.getInstance();
- IHistoryPersistenceManager hpm = orchestratorCommonArea.getHistoryPersistencemanager();
+ private IHistoryPersistenceManager hpm = orchestratorCommonArea.getHistoryPersistencemanager();
private boolean jobDriverTerminated(DuccWorkJob duccWorkJob) {
String methodName = "jobDriverTerminated";
