[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@1753310 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/README b/README
index 8c27862..f68b2c2 100644
--- a/README
+++ b/README
@@ -6,20 +6,20 @@
We use Maven 3.0 for building; download this if needed,
and set the environment variable MAVEN_OPTS to -Xmx800m -XX:MaxPermSize-256m.
-
To build UIMA-DUCC, install Java SDK 7.
Then build from the directory containing this README by issuing the command
mvn clean install.
This builds everything except the source-release.zip file and DUCC documentation.
-To build documentation make sure you have LATEX installed and change the command to:
+To build the documentation make sure you have LATEX installed and set the
+environment variable BUILD_DUCCDOCS=true, or activate the build-duccdocs profile with:
mvn clean install -Pbuild-duccdocs
To build everything including the source-release.zip and documentation, use:
- mvn clean install -Papache-release
+ mvn clean install -Papache-release,build-duccdocs
To setup GPG signing see http://uima.apache.org/one-time-release-setup.html
diff --git a/src/main/legal/LICENSE b/src/main/legal/LICENSE
index 1aa1fea..1189dcb 100644
--- a/src/main/legal/LICENSE
+++ b/src/main/legal/LICENSE
@@ -357,26 +357,14 @@
(activemq) hawtbuf-1.11.jar
-************ !!!!DUPLICATE WITH CASSANDRA commons-cli-1.1.jar
commons-cli-1.2.jar
-******************************************************
-
commons-collections-3.2.1.jar
-
-************ !!!!DUPLICATE WITH CASSANDRA commons-lang-3.2.1
commons-lang-2.6.jar
-****************************************
commons-pool2-2.4.2.jar
-************ !!!!! DUPLICATE WITH ducc/lib and apache-activemq/lib/optional vers 1.2.17
log4j-1.2.16.jar
-****************************************
gson-2.2.2.jar
-************ !!!!! DUPLICATE WITH CASSANDRA guava-16.0
guava-r09.jar
-***************************************
-************ !!!!! DUPLICATE WITH CASSANDRA jna-4.0.0
jna-4.0.0.jar
-***************************************
joda-time-2.1.jar
commons-logging-1.2.0.jar
geronimo-j2ee-management_1.1_spec-1.0.1.jar
@@ -391,10 +379,7 @@
===-The Apache Software License, Version 1.1 ======
-
-*********** !!!!!!!!!!! DUPLICATE found in cassandra and amq/optional
(activemq) commons-codec-1.9.jar
-************************
BCEL 5.1
Resolver
Apache Commons Logging
diff --git a/src/main/scripts/viaducc b/src/main/scripts/viaducc
index f38c110..f71d15e 100755
--- a/src/main/scripts/viaducc
+++ b/src/main/scripts/viaducc
@@ -102,6 +102,8 @@
print " If java_viaducc is used as a 'normal' command, the JRE is searched for in this order:"
print " 1. Use the java specified by -DJAVA_BIN="
print " 2. Use the java configured for DUCC"
+ print ""
+ print " If -jar is used it must be the last JVM arg before any command line args"
print
sys.exit(0)
@@ -186,7 +188,7 @@
if arg.startswith('-'):
# these are the only options that take an argument and require
# a space between the flag and the argument
- if arg in ('-cp', '-classpath', '-jar'):
+ if arg in ('-cp', '-classpath'):
skip_next_arg = True
elif arg.startswith('-xmx'): # maximum Java heap size
maximum_memory_required = parse_memory_string(arg[4:])
diff --git a/uima-ducc-duccdocs/src/site/tex/duccbook/part2/services.tex b/uima-ducc-duccdocs/src/site/tex/duccbook/part2/services.tex
index f773ae4..524bb2b 100644
--- a/uima-ducc-duccdocs/src/site/tex/duccbook/part2/services.tex
+++ b/uima-ducc-duccdocs/src/site/tex/duccbook/part2/services.tex
@@ -465,7 +465,10 @@
\begin{verbatim}
service_ping_dolog = false
\end{verbatim}
-
+
+ If your pinger requires a different version of Java than is used by DUCC, include a
+ setting for the JAVA\_HOME variable in the environment option.
+
A sample service registration may look something like the following. Note that you do not need
to include any of the DUCC jars in the classpath for the pinger. DUCC will add the jars it
requires to interact with the pinger automatically. (However you may need other jars to
@@ -480,7 +483,8 @@
service_ping_dolog = true
service_ping_timeout = 500
service_ping_aruments = Arg1 Arg2
- service_ping_jvm_args = -DXmx50M
+ service_ping_jvm_args = -DXmx50M
+ environment = JAVA_HOME=/share/jdk1.8 OTHER_VARIABLE=something
\end{verbatim}
\paragraph{3. Register and start the service and pinger} Start up your custom service so the pinger with
diff --git a/uima-ducc-duccdocs/src/site/tex/duccbook/part4/install.tex b/uima-ducc-duccdocs/src/site/tex/duccbook/part4/install.tex
index 12886bf..61dffc8 100644
--- a/uima-ducc-duccdocs/src/site/tex/duccbook/part4/install.tex
+++ b/uima-ducc-duccdocs/src/site/tex/duccbook/part4/install.tex
@@ -100,7 +100,7 @@
In order to build DUCC from source the following software is also required:
\begin{itemize}
\item A Subversion client, from \url{http://subversion.apache.org/packages.html}. The
- svn url is \url{https://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk}.
+ svn url is \url{https://svn.apache.org/repos/asf/uima/uima-ducc/trunk}.
\item Apache Maven, from \url{http://maven.apache.org/index.html}
\end{itemize}
@@ -117,7 +117,7 @@
\end{itemize}
More detailed one-time setup instructions for source-level builds via subversion can be found here:
-\url{http://uima.apache.org/one-time-setup.html\#svn-setup}
+\url{http://uima.apache.org/one-time-setup.html#svn-setup}
\section{Building from Source}
@@ -134,6 +134,7 @@
mvn install -Pbuild-duccdocs
\end{verbatim}
if you have LaTeX insalled and wish to do the optional build of documentation.
+The build-duccdocs profile can also activated if the environment valiable BUILD\_DUCCDOCS is set true.
If this is your first Maven build it may take quite a while as Maven downloads all the
open-source pre-requisites. (The pre-requisites are stored in the Maven repository, usually
diff --git a/uima-ducc-duccdocs/src/site/tex/duccbook/part4/sm.tex b/uima-ducc-duccdocs/src/site/tex/duccbook/part4/sm.tex
index 220b369..5a06d92 100644
--- a/uima-ducc-duccdocs/src/site/tex/duccbook/part4/sm.tex
+++ b/uima-ducc-duccdocs/src/site/tex/duccbook/part4/sm.tex
@@ -65,3 +65,6 @@
pinger to protect its integrity by speicfy that argument in their own
service registrations.
+ By default external pingers are launched with the same JRE as used by the DUCC daemons but if the
+ registration contains a entry for the JAVA\_HOME environment variable, that JRE will be used instead.
+
diff --git a/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties b/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties
index 4c620ea..e20ba65 100644
--- a/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties
+++ b/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties
@@ -51,6 +51,6 @@
ducc.rm.fragmentation.threshold = 1
ducc.rm.share.quantum = 15
-ducc.agent.rogue.process.user.exclusion.filter=root,postfix,ntp,nobody,daemon,100,degenaro,messagebus,nslcd,syslog,whoopsie
+ducc.agent.rogue.process.user.exclusion.filter=root,postfix,ntp,nobody,daemon,100,degenaro,messagebus,nslcd,syslog,whoopsie,duccy
ducc.agent.node.metrics.publish.rate=10000
ducc.agent.node.inventory.publish.rate=5000
