Juan Hernandez has uploaded a new change for review.
Change subject: tools: Remove some notifier dependencies
......................................................................
tools: Remove some notifier dependencies
The script that starts the notifier adds to the classpath some
dependencies that are not needed, this patch removes them.
Change-Id: I592f0c0150b5f7f252ddca9666aa1fa68a0d30e3
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M backend/manager/tools/src/main/conf/engine-notifier.conf
M backend/manager/tools/src/main/shell/engine-notifier.sh
M backend/manager/tools/src/test/resources/conf/connection-test-notifier.conf
M backend/manager/tools/src/test/resources/conf/error-notifier.conf
4 files changed, 0 insertions(+), 42 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/12070/1
diff --git a/backend/manager/tools/src/main/conf/engine-notifier.conf
b/backend/manager/tools/src/main/conf/engine-notifier.conf
index 075cf83..4d65c79 100644
--- a/backend/manager/tools/src/main/conf/engine-notifier.conf
+++ b/backend/manager/tools/src/main/conf/engine-notifier.conf
@@ -3,12 +3,6 @@
# The daemon consists of two major services: notification service and engine
monitoring.
#
-#---------------------------#
-# Engine Libraries Location #
-#---------------------------#
-# A path to the engine libraries folder under Jboss. Required.
-engineLib=/usr/share/ovirt-engine/engine.ear/lib
-
#-------------------------------------#
# Notification Service Configuration: #
#-------------------------------------#
diff --git a/backend/manager/tools/src/main/shell/engine-notifier.sh
b/backend/manager/tools/src/main/shell/engine-notifier.sh
index 0cc518b..dc265ea 100755
--- a/backend/manager/tools/src/main/shell/engine-notifier.sh
+++ b/backend/manager/tools/src/main/shell/engine-notifier.sh
@@ -85,12 +85,6 @@
# Do basic checking of properties in configuration file to ensure
# a) properties are defined
# b) when properties are defined and reference a file system resource, that
the resource exists.
-if [ -z "$engineLib" ]; then
- die "Error: \$engineLib is not defined, please check for this in
configuration file $CONF_FILE\n"
-fi
-if [ ! -d $engineLib ]; then
- die "Error: the oVirt Engine library is missing or not accessible.\n" 5
-fi
# MAIL_SERVER is required!
if [ -z "$MAIL_SERVER" ]; then
@@ -219,14 +213,10 @@
# Add the required jar files from the system wide jars directory:
jar_names='
- antlr
commons-codec
commons-collections
- commons-configuration
- commons-jxpath
commons-lang
commons-logging
- dom4j
javamail
log4j
ovirt-engine/common
@@ -234,8 +224,6 @@
ovirt-engine/tools
ovirt-engine/utils
postgresql-jdbc
- slf4j/api
- glassfish-jaxb/jaxb-impl
'
for jar_name in ${jar_names}
do
@@ -243,24 +231,6 @@
if [ ! -s "${jar_file}" ]
then
die "Error: can't run without missing JAR file: ${jar_file}\n" 5
- fi
- CP=${CP}:${jar_file}
-done
-
-# Add all the needed jar files from the oVirt Engine EAR to the classpath, but
-# try to locate them using the name and not the version. This is important
-# in order to make the script less dependent on the version of oVirt Engine
-# installed:
-jar_names='
- hibernate-validator
- validation-api
-'
-for jar_name in ${jar_names}
-do
- jar_file=$(find ${engineLib} -regex ".*/${jar_name}.*\.jar")
- if [ -z "${jar_file}" -o ! -s "${jar_file}" ]
- then
- die "Error: can't run without missing JAR file:
${engineLib}/${jar_name}*.jar\n" 5
fi
CP=${CP}:${jar_file}
done
diff --git
a/backend/manager/tools/src/test/resources/conf/connection-test-notifier.conf
b/backend/manager/tools/src/test/resources/conf/connection-test-notifier.conf
index eb440c4..104f4aa 100644
---
a/backend/manager/tools/src/test/resources/conf/connection-test-notifier.conf
+++
b/backend/manager/tools/src/test/resources/conf/connection-test-notifier.conf
@@ -15,6 +15,3 @@
# Days to keep history in the event_notification_history table
#DAYS_TO_KEEP_HISTORY=30
-
-# oVirt lib location
-engineLib=/usr/local/jboss-eap-5.1/jboss-as/server/default/deploy/engine.ear/lib
diff --git a/backend/manager/tools/src/test/resources/conf/error-notifier.conf
b/backend/manager/tools/src/test/resources/conf/error-notifier.conf
index 5ebe562..c18ab02 100644
--- a/backend/manager/tools/src/test/resources/conf/error-notifier.conf
+++ b/backend/manager/tools/src/test/resources/conf/error-notifier.conf
@@ -19,6 +19,3 @@
# Days to keep history in the event_notification_history table
DAYS_TO_KEEP_HISTORY=30
-
-# oVirt lib location
-engineLib=/usr/local/jboss-eap-5.1/jboss-as/server/default/deploy/engine.ear/lib
--
To view, visit http://gerrit.ovirt.org/12070
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I592f0c0150b5f7f252ddca9666aa1fa68a0d30e3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
