QPID-4938: No longer build acl or ssl support as plugins

(also remove final references to dead watchdog plugin)

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1494697 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 9 insertions, 58 deletions

diff --git a/qpid/cpp/src/tests/ha_test.py b/qpid/cpp/src/tests/ha_test.py
index 9cf721fd01..f3c1d3a957 100755
--- a/qpid/cpp/src/tests/ha_test.py
+++ b/qpid/cpp/src/tests/ha_test.py
@@ -127,7 +127,7 @@ acl allow all all
  """)
             aclf.close()
         if not "--acl-file" in args:
-            args += [ "--acl-file", acl, "--load-module", os.getenv("ACL_LIB") ]
+            args += [ "--acl-file", acl, ]
         args += ["--socket-fd=%s"%ha_port.fileno, "--listen-disable=tcp"]
         Broker.__init__(self, test, args, port=ha_port.port, **kwargs)
         self.qpid_ha_path=os.path.join(os.getenv("PYTHON_COMMANDS"), "qpid-ha")
diff --git a/qpid/cpp/src/tests/ha_tests.py b/qpid/cpp/src/tests/ha_tests.py
index 212e92b0c6..60e3444c45 100755
--- a/qpid/cpp/src/tests/ha_tests.py
+++ b/qpid/cpp/src/tests/ha_tests.py
@@ -581,7 +581,7 @@ acl deny all all
         cluster = HaCluster(
             self, 2,
             args=["--auth", "yes", "--sasl-config", sasl_config,
-                  "--acl-file", acl, "--load-module", os.getenv("ACL_LIB"),
+                  "--acl-file", acl,
                   "--ha-username=zag", "--ha-password=zag", "--ha-mechanism=PLAIN"
                   ],
             client_credentials=Credentials("zag", "zag", "PLAIN"))
diff --git a/qpid/cpp/src/tests/run_acl_tests b/qpid/cpp/src/tests/run_acl_tests
index 5985401fa4..64aaf7c516 100755
--- a/qpid/cpp/src/tests/run_acl_tests
+++ b/qpid/cpp/src/tests/run_acl_tests
@@ -29,13 +29,13 @@ DATA_DIRQ=`pwd`/data_dirq
 trap stop_brokers INT TERM QUIT
 
 start_brokers() {
-    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIR --load-module $ACL_LIB --acl-file policy.acl --auth no --log-enable trace+:acl  --log-to-file local.log > qpidd.port
+    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIR --acl-file policy.acl --auth no --log-enable trace+:acl  --log-to-file local.log > qpidd.port
     LOCAL_PORT=`cat qpidd.port`
-    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIRI --load-module $ACL_LIB --acl-file policy.acl --auth no --connection-limit-per-ip 2   --log-to-file locali.log > qpiddi.port
+    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIRI --acl-file policy.acl --auth no --connection-limit-per-ip 2   --log-to-file locali.log > qpiddi.port
     LOCAL_PORTI=`cat qpiddi.port`
-    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIRU --load-module $ACL_LIB --acl-file policy.acl --auth no --connection-limit-per-user 2 --log-to-file localu.log > qpiddu.port
+    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIRU --acl-file policy.acl --auth no --connection-limit-per-user 2 --log-to-file localu.log > qpiddu.port
     LOCAL_PORTU=`cat qpiddu.port`
-    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIRQ --load-module $ACL_LIB --acl-file policy.acl --auth no --max-queues-per-user 2      --log-to-file localq.log > qpiddq.port
+    ../qpidd --daemon --port 0 --interface 127.0.0.1 --no-module-dir --data-dir $DATA_DIRQ --acl-file policy.acl --auth no --max-queues-per-user 2      --log-to-file localq.log > qpiddq.port
     LOCAL_PORTQ=`cat qpiddq.port`
 }
 
@@ -104,7 +104,7 @@ populate_directories() {
 test_loading_acl_from_absolute_path(){
     POLICY_FILE=$srcdir/policy.acl
     rm -f temp.log
-    PORT=`../qpidd --daemon --port 0 --no-module-dir --no-data-dir --auth no --load-module $ACL_LIB --acl-file $POLICY_FILE -t --log-to-file temp.log  2>/dev/null`
+    PORT=`../qpidd --daemon --port 0 --no-module-dir --no-data-dir --auth no --acl-file $POLICY_FILE -t --log-to-file temp.log  2>/dev/null`
     ACL_FILE=`grep "notice ACL: Read file" temp.log | sed 's/^.*Read file //'`
    $QPIDD_EXEC --no-module-dir -q --port $PORT
    if test "$ACL_FILE" != "\"$POLICY_FILE\""; then
diff --git a/qpid/cpp/src/tests/run_queue_redirect b/qpid/cpp/src/tests/run_queue_redirect
index 412b5689ab..c006fea6d7 100755
--- a/qpid/cpp/src/tests/run_queue_redirect
+++ b/qpid/cpp/src/tests/run_queue_redirect
@@ -30,7 +30,6 @@ start_brokers() {
              --port 0 --interface 127.0.0.1 \
              --no-module-dir \
              --data-dir $DATA_DIR \
-             --load-module $ACL_LIB \
              --acl-file policy.acl \
              --auth no \
              --log-to-file queue_redirect.log \
diff --git a/qpid/cpp/src/tests/sasl_fed b/qpid/cpp/src/tests/sasl_fed
index 1403056e6e..a92ccd7b7a 100755
--- a/qpid/cpp/src/tests/sasl_fed
+++ b/qpid/cpp/src/tests/sasl_fed
@@ -62,7 +62,6 @@ $QPIDD_EXEC                                  \
   --log-source yes                           \
   --log-to-file $tmp_root/qpidd_1.log        \
   --sasl-config=$sasl_config_file            \
-  --load-module acl.so                       \
   --acl-file $tmp_root/sasl_fed.acl          \
   -d > $tmp_root/broker_1_port
 
@@ -81,7 +80,6 @@ $QPIDD_EXEC                                  \
   --log-source yes                           \
   --log-to-file $tmp_root/qpidd_2.log        \
   --sasl-config=$sasl_config_file            \
-  --load-module acl.so                       \
   --acl-file $tmp_root/sasl_fed.acl          \
   -d > $tmp_root/broker_2_port
 
diff --git a/qpid/cpp/src/tests/sasl_fed_ex b/qpid/cpp/src/tests/sasl_fed_ex
index 4ea61c5a2a..d4d5258aa8 100755
--- a/qpid/cpp/src/tests/sasl_fed_ex
+++ b/qpid/cpp/src/tests/sasl_fed_ex
@@ -122,12 +122,9 @@ DST_TCP_PORT=5807
 SRC_TCP_PORT_2=5802
 DST_TCP_PORT_2=5803
 
-SSL_LIB=${moduledir}/ssl.so
-
 export QPID_SSL_CERT_NAME=${TEST_HOSTNAME}
 
 export QPID_NO_MODULE_DIR=1
-export QPID_LOAD_MODULE=$SSLCONNECTOR_LIB
 export QPID_SSL_CERT_DB=${CERT_DIR}
 export QPID_SSL_CERT_PASSWORD_FILE=${CERT_PW_FILE}
 export QPID_SSL_CERT_NAME=${TEST_HOSTNAME}
@@ -161,7 +158,6 @@ COMMON_BROKER_OPTIONS="                          \
       --ssl-cert-name $TEST_HOSTNAME             \
       --no-data-dir                              \
       --no-module-dir                            \
-      --load-module ${SSL_LIB}                   \
       --mgmt-enable=yes                          \
       --log-enable info+                         \
       --log-source yes                           \
diff --git a/qpid/cpp/src/tests/ssl_test b/qpid/cpp/src/tests/ssl_test
index 166892eeb0..7f722361b3 100755
--- a/qpid/cpp/src/tests/ssl_test
+++ b/qpid/cpp/src/tests/ssl_test
@@ -91,7 +91,7 @@ delete_certs() {
 }
 
 # Don't need --no-module-dir or --no-data-dir as they are set as env vars in test_env.sh
-COMMON_OPTS="--daemon --config $CONFIG --load-module $SSL_LIB --ssl-cert-db $CERT_DB --ssl-cert-password-file $CERT_PW_FILE --ssl-cert-name $TEST_HOSTNAME"
+COMMON_OPTS="--daemon --config $CONFIG --ssl-cert-db $CERT_DB --ssl-cert-password-file $CERT_PW_FILE --ssl-cert-name $TEST_HOSTNAME"
 
 # Start new brokers:
 #   $1 must be integer
@@ -124,7 +124,7 @@ stop_brokers() {
 
 pick_port() {
     # We need a fixed port to set --cluster-url. Use qpidd to pick a free port.
-    PICK=`../qpidd --no-module-dir -dp0`
+    PICK=`../qpidd --no-module-dir --listen-disable ssl -dp0`
     ../qpidd --no-module-dir -qp $PICK
     echo $PICK
 }
@@ -173,7 +173,6 @@ start_ssl_broker
 PORT=${PORTS[0]}
 echo "Running SSL test on port $PORT"
 export QPID_NO_MODULE_DIR=1
-export QPID_LOAD_MODULE=$SSLCONNECTOR_LIB
 export QPID_SSL_CERT_DB=${CERT_DB}
 export QPID_SSL_CERT_PASSWORD_FILE=${CERT_PW_FILE}
 
diff --git a/qpid/cpp/src/tests/test_env.sh.in b/qpid/cpp/src/tests/test_env.sh.in
index 6940943b54..bafdacf944 100644
--- a/qpid/cpp/src/tests/test_env.sh.in
+++ b/qpid/cpp/src/tests/test_env.sh.in
@@ -47,7 +47,6 @@ export QPID_HA_EXEC=$PYTHON_COMMANDS/qpid-ha
 
 # Executables
 export QPIDD_EXEC=$top_builddir/src/qpidd
-export QPID_WATCHDOG_EXEC=$top_builddir/src/qpidd_watchdog
 
 # Test executables
 export QPID_TEST_EXEC_DIR=$builddir
@@ -61,11 +60,7 @@ export PATH=$top_builddir/src:$builddir:$srcdir:$PYTHON_COMMANDS:$QPID_TEST_EXEC
 export TEST_STORE_LIB=$testmoduledir/test_store.so
 
 exportmodule() { test -f $moduledir/$2 && eval "export $1=$moduledir/$2"; }
-exportmodule ACL_LIB acl.so
 exportmodule HA_LIB ha.so
-exportmodule SSLCONNECTOR_LIB sslconnector.so
-exportmodule SSL_LIB ssl.so
-exportmodule WATCHDOG_LIB watchdog.so
 exportmodule XML_LIB xml.so
 exportmodule STORE_LIB legacystore.so
 exportmodule AMQP_LIB amqp.so
diff --git a/qpid/cpp/src/tests/test_watchdog b/qpid/cpp/src/tests/test_watchdog
deleted file mode 100755
index 7b638da8a1..0000000000
--- a/qpid/cpp/src/tests/test_watchdog
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-#
-# 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.
-#
-
-# Tests for the watchdog plug-in
-
-source ./test_env.sh
-# Start a broker with  watchdog, freeze it with kill -STOP, verify that it is killed.
-PORT=`$QPIDD_EXEC -dp0 --no-data-dir --auth=no --no-module-dir --load-module $WATCHDOG_LIB --log-to-file=qpidd_watchdog.log --watchdog-interval 2` || exit 1
-PID=`$QPIDD_EXEC --no-module-dir -cp $PORT` || exit 1
-kill -STOP $PID
-sleep 3
-
-if kill -0 $PID 2>/dev/null; then
-    echo "Hung process did not die."
-    kill $PID
-else
-    true
-fi