You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2013/06/19 19:11:53 UTC
svn commit: r1494697 - in /qpid/trunk/qpid/cpp/src: ./ tests/
Author: astitcher
Date: Wed Jun 19 17:11:52 2013
New Revision: 1494697
URL: http://svn.apache.org/r1494697
Log:
QPID-4938: No longer build acl or ssl support as plugins
(also remove final references to dead watchdog plugin)
Removed:
qpid/trunk/qpid/cpp/src/acl.mk
qpid/trunk/qpid/cpp/src/ssl.cmake
qpid/trunk/qpid/cpp/src/tests/test_watchdog
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/Makefile.am
qpid/trunk/qpid/cpp/src/ssl.mk
qpid/trunk/qpid/cpp/src/tests/ha_test.py
qpid/trunk/qpid/cpp/src/tests/ha_tests.py
qpid/trunk/qpid/cpp/src/tests/run_acl_tests
qpid/trunk/qpid/cpp/src/tests/run_queue_redirect
qpid/trunk/qpid/cpp/src/tests/sasl_fed
qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex
qpid/trunk/qpid/cpp/src/tests/ssl_test
qpid/trunk/qpid/cpp/src/tests/test_env.sh.in
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1494697&r1=1494696&r2=1494697&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Wed Jun 19 17:11:52 2013
@@ -34,6 +34,7 @@ include(CheckLibraryExists)
include(CheckSymbolExists)
include(FindBoost)
include(FindDoxygen)
+include(FindPkgConfig)
#set (CMAKE_VERBOSE_MAKEFILE ON) # for debugging
@@ -296,6 +297,44 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL SunPr
set (HIDE_SYMBOL_FLAGS "")
endif (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
+if (CMAKE_SYSTEM_NAME STREQUAL Windows)
+ # Allow MSVC user to select 'WinXP-SP3/Windows Server 2003' as build target version
+ set (win32_winnt_default OFF)
+ if (MSVC)
+ set (win32_winnt_default ON)
+ endif (MSVC)
+ option(SET_WIN32_WINNT "In Windows-MSVC build: define _WIN32_WINNT=0x0502 to select target version: Windows XP with SP3" ${win32_winnt_default})
+endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
+
+if (MSVC)
+ add_definitions(
+ /D "_CRT_NONSTDC_NO_WARNINGS"
+ /D "NOMINMAX"
+ /D "WIN32_LEAN_AND_MEAN"
+ /wd4244
+ /wd4800
+ /wd4355
+ /wd4267
+ )
+
+ if (SET_WIN32_WINNT)
+ add_definitions(/D "_WIN32_WINNT=0x0502")
+ endif (SET_WIN32_WINNT)
+
+ # set the RelWithDebInfo compile/link switches to equal Release
+ set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /O2 /Ob2 /D NDEBUG")
+ set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "/debug /INCREMENTAL:NO")
+
+ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src)
+ # Set the windows version for the .NET Binding cpp project
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
+ ${CMAKE_CURRENT_BINARY_DIR}/windows/resources/org.apache.qpid.messaging.rc)
+ # Set the windows version for the .NET Binding sessionreceiver project
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/sessionreceiver/properties/sessionreceiver-AssemblyInfo-template.cs
+ ${CMAKE_CURRENT_BINARY_DIR}/windows/generated_src/sessionreceiver-AssemblyInfo.cs)
+ endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src)
+endif (MSVC)
+
option(ENABLE_WARNINGS "Enable lots of compiler warnings (recommended)" ON)
if (NOT ENABLE_WARNINGS)
set (WARNING_FLAGS "")
@@ -523,6 +562,7 @@ if (HAVE_SASL AND HAVE_SASL_H)
endif (HAVE_SASL AND HAVE_SASL_H)
option(BUILD_SASL "Build with Cyrus SASL support" ${sasl_default})
+
if (BUILD_SASL)
if (NOT HAVE_SASL)
message(FATAL_ERROR "Cyrus SASL support requested but libsasl2 not found")
@@ -540,6 +580,78 @@ if (BUILD_SASL)
set(qpidcommon_sasl_lib sasl2)
endif (BUILD_SASL)
+# Optional SSL/TLS support. Requires Netscape Portable Runtime on Linux.
+
+# According to some cmake docs this is not a reliable way to detect
+# pkg-configed libraries, but it's no worse than what we did under
+# autotools
+pkg_check_modules(NSS nss)
+
+set (ssl_default ${ssl_force})
+if (CMAKE_SYSTEM_NAME STREQUAL Windows)
+ set (ssl_default ON)
+else (CMAKE_SYSTEM_NAME STREQUAL Windows)
+ if (NSS_FOUND)
+ set (ssl_default ON)
+ endif (NSS_FOUND)
+endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
+
+option(BUILD_SSL "Build with support for SSL" ${ssl_default})
+
+if (BUILD_SSL)
+ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
+ set (sslcommon_SOURCES
+ qpid/sys/windows/SslAsynchIO.cpp
+ )
+ set (ssl_SOURCES
+ qpid/broker/windows/SslProtocolFactory.cpp
+ )
+ set (sslconnector_SOURCES
+ qpid/client/windows/SslConnector.cpp
+ )
+ set (windows_ssl_libs Secur32.lib)
+ set (windows_ssl_server_libs Crypt32.lib)
+ else (CMAKE_SYSTEM_NAME STREQUAL Windows)
+ if (NOT NSS_FOUND)
+ message(FATAL_ERROR "nss/nspr not found, required for ssl support")
+ endif (NOT NSS_FOUND)
+
+ foreach(f ${NSS_CFLAGS})
+ set (NSS_COMPILE_FLAGS "${NSS_COMPILE_FLAGS} ${f}")
+ endforeach(f)
+
+ foreach(f ${NSS_LDFLAGS})
+ set (NSS_LINK_FLAGS "${NSS_LINK_FLAGS} ${f}")
+ endforeach(f)
+
+ set (sslcommon_SOURCES
+ qpid/sys/ssl/check.h
+ qpid/sys/ssl/check.cpp
+ qpid/sys/ssl/util.h
+ qpid/sys/ssl/util.cpp
+ qpid/sys/ssl/SslSocket.h
+ qpid/sys/ssl/SslSocket.cpp
+ )
+
+ set (ssl_SOURCES
+ qpid/sys/SslPlugin.cpp
+ )
+
+ set (sslconnector_SOURCES
+ qpid/client/SslConnector.cpp
+ qpid/messaging/amqp/SslTransport.cpp
+ )
+
+ set_source_files_properties (
+ ${sslcommon_SOURCES}
+ ${ssl_SOURCES}
+ ${sslconnector_SOURCES}
+ PROPERTIES
+ COMPILE_FLAGS "${NSS_COMPILE_FLAGS}"
+ )
+ endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
+endif (BUILD_SSL)
+
# See if XML Exchange is desired and prerequisites are available
CHECK_LIBRARY_EXISTS (xerces-c _init "" HAVE_XERCES)
CHECK_INCLUDE_FILE_CXX (xercesc/framework/MemBufInputSource.hpp HAVE_XERCES_H)
@@ -557,6 +669,7 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
option(BUILD_XML "Build with XML Exchange" ${xml_default})
+
if (BUILD_XML)
if (NOT HAVE_XERCES)
message(FATAL_ERROR "XML Exchange support requested but xerces-c library not found")
@@ -591,7 +704,9 @@ endif (BUILD_XML)
# Build the ACL plugin
set (acl_default ON)
+
option(BUILD_ACL "Build ACL enforcement broker plugin" ${acl_default})
+
if (BUILD_ACL)
set (acl_SOURCES
qpid/acl/Acl.cpp
@@ -608,24 +723,12 @@ if (BUILD_ACL)
qpid/acl/AclValidator.cpp
qpid/acl/AclValidator.h
)
- # Windows builds the ACL code into the qpidbroker library; see QPID-1842
- # for history and rationale. If this is changed, remove the acl_SOURCES from
- # the qpidbroker platform-specific source list.
- if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
- add_library (acl MODULE ${acl_SOURCES})
- target_link_libraries (acl qpidbroker ${Boost_PROGRAM_OPTIONS_LIBRARY})
- set_target_properties (acl PROPERTIES
- PREFIX ""
- COMPILE_DEFINITIONS _IN_QPID_BROKER
- LINK_FLAGS "${CATCH_UNDEFINED}")
- install (TARGETS acl
- DESTINATION ${QPIDD_MODULE_DIR}
- COMPONENT ${QPID_COMPONENT_BROKER})
- endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
endif (BUILD_ACL)
set (ha_default ON)
+
option(BUILD_HA "Build Active-Passive HA plugin" ${ha_default})
+
if (BUILD_HA)
set (ha_SOURCES
qpid/ha/QueueSnapshot.h
@@ -689,9 +792,6 @@ endif (BUILD_HA)
# Check for optional RDMA support requirements
include (rdma.cmake)
-# Check for optional SSL support requirements
-include (ssl.cmake)
-
# Check for optional AMQP 1.0 support requirements
include (amqp.cmake)
@@ -704,44 +804,7 @@ set (qpid_memstat_module
qpid/sys/MemStat.cpp
)
-# Allow MSVC user to select 'WinXP-SP3/Windows Server 2003' as build target version
-set (win32_winnt_default OFF)
if (CMAKE_SYSTEM_NAME STREQUAL Windows)
- if (MSVC)
- set (win32_winnt_default ON)
- endif (MSVC)
-endif (CMAKE_SYSTEM_NAME STREQUAL Windows)
-option(SET_WIN32_WINNT "In Windows-MSVC build: define _WIN32_WINNT=0x0502 to select target version: Windows XP with SP3" ${win32_winnt_default})
-
-if (CMAKE_SYSTEM_NAME STREQUAL Windows)
- if (MSVC)
- add_definitions(
- /D "_CRT_NONSTDC_NO_WARNINGS"
- /D "NOMINMAX"
- /D "WIN32_LEAN_AND_MEAN"
- /wd4244
- /wd4800
- /wd4355
- /wd4267
- )
- if (SET_WIN32_WINNT)
- add_definitions(/D "_WIN32_WINNT=0x0502")
- endif (SET_WIN32_WINNT)
-
- # set the RelWithDebInfo compile/link switches to equal Release
- set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /O2 /Ob2 /D NDEBUG")
- set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "/debug /INCREMENTAL:NO")
-
- if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src)
- # Set the windows version for the .NET Binding cpp project
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
- ${CMAKE_CURRENT_BINARY_DIR}/windows/resources/org.apache.qpid.messaging.rc)
- # Set the windows version for the .NET Binding sessionreceiver project
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/sessionreceiver/properties/sessionreceiver-AssemblyInfo-template.cs
- ${CMAKE_CURRENT_BINARY_DIR}/windows/generated_src/sessionreceiver-AssemblyInfo.cs)
- endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src)
- endif (MSVC)
-
set (qpidtypes_platform_SOURCES
qpid/sys/windows/uuid.cpp
)
@@ -767,7 +830,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
qpid/sys/windows/Thread.cpp
qpid/sys/windows/Time.cpp
qpid/client/windows/SaslFactory.cpp
- ${sslcommon_windows_SOURCES}
)
set (qpidcommon_platform_LIBS
@@ -775,14 +837,11 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows)
set (qpidbroker_platform_SOURCES
qpid/broker/windows/BrokerDefaults.cpp
qpid/broker/windows/SaslAuthenticator.cpp
- ${acl_SOURCES}
- ${sslbroker_windows_SOURCES}
)
set (qpidbroker_platform_LIBS
${windows_ssl_libs} ${windows_ssl_server_libs}
)
set (qpidclient_platform_SOURCES
- ${sslclient_windows_SOURCES}
qpid/client/windows/ClientDllMain.cpp
)
set (qpidclient_platform_LIBS
@@ -903,6 +962,7 @@ set (qpidcommon_SOURCES
${rgen_framing_srcs}
${qpidcommon_platform_SOURCES}
${qpidcommon_sasl_source}
+ ${sslcommon_SOURCES}
qpid/assert.cpp
qpid/Address.cpp
qpid/DataDir.cpp
@@ -1005,7 +1065,8 @@ target_link_libraries (qpidcommon qpidty
${qpidcommon_sasl_lib})
set_target_properties (qpidcommon PROPERTIES
VERSION ${qpidcommon_version}
- SOVERSION ${qpidcommon_version_major})
+ SOVERSION ${qpidcommon_version_major}
+ LINK_FLAGS ${NSS_LINK_FLAGS})
install (TARGETS qpidcommon
DESTINATION ${QPID_INSTALL_LIBDIR}
COMPONENT ${QPID_COMPONENT_COMMON})
@@ -1031,6 +1092,7 @@ install_pdb (qpidtypes ${QPID_COMPONENT_
set (qpidclient_SOURCES
${rgen_client_srcs}
${qpidclient_platform_SOURCES}
+ ${sslconnector_SOURCES}
qpid/client/Bounds.cpp
qpid/client/Completion.cpp
qpid/client/Connection.cpp
@@ -1173,6 +1235,8 @@ endif (MSVC)
set (qpidbroker_SOURCES
${mgen_broker_cpp}
${qpidbroker_platform_SOURCES}
+ ${acl_SOURCES}
+ ${ssl_SOURCES}
qpid/amqp_0_10/Connection.h
qpid/amqp_0_10/Connection.cpp
qpid/broker/Broker.cpp
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1494697&r1=1494696&r2=1494697&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Wed Jun 19 17:11:52 2013
@@ -144,6 +144,8 @@ BROKER_CXXFLAGS = -D_IN_QPID_BROKER
## Automake macros to build libraries and executables.
qpidd_CXXFLAGS = $(AM_CXXFLAGS) $(BROKER_CXXFLAGS) -DQPIDD_MODULE_DIR=\"$(dmoduleexecdir)\" -DQPIDD_CONF_FILE=\"$(sysconfdir)/qpidd.conf\" -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\"
+libqpidcommon_la_CXXFLAGS = $(AM_CXXFLAGS)
+libqpidbroker_la_CXXFLAGS = $(AM_CXXFLAGS) $(BROKER_CXXFLAGS)
libqpidclient_la_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDC_MODULE_DIR=\"$(cmoduleexecdir)\" -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\"
qpidd_LDADD = \
@@ -227,7 +229,6 @@ dmoduleexec_LTLIBRARIES =
cmoduleexec_LTLIBRARIES =
include ha.mk
-include acl.mk
include qmf.mk
include qmfc.mk
if HAVE_XML
@@ -294,10 +295,6 @@ RdmaClient_LDADD = \
endif
-if SSL
-include ssl.mk
-endif
-
EXTRA_DIST +=\
CMakeLists.txt \
config.h.cmake \
@@ -579,6 +576,20 @@ libqpidbroker_la_LIBADD = libqpidcommon.
libqpidbroker_la_SOURCES = \
$(mgen_broker_cpp) \
$(posix_broker_src) \
+ qpid/acl/Acl.cpp \
+ qpid/acl/Acl.h \
+ qpid/acl/AclConnectionCounter.cpp \
+ qpid/acl/AclConnectionCounter.h \
+ qpid/acl/AclData.cpp \
+ qpid/acl/AclData.h \
+ qpid/acl/AclPlugin.cpp \
+ qpid/acl/AclReader.cpp \
+ qpid/acl/AclReader.h \
+ qpid/acl/AclResourceCounter.cpp \
+ qpid/acl/AclResourceCounter.h \
+ qpid/acl/AclTopicMatch.h \
+ qpid/acl/AclValidator.cpp \
+ qpid/acl/AclValidator.h \
qpid/amqp_0_10/Connection.cpp \
qpid/amqp_0_10/Connection.h \
qpid/broker/AclModule.h \
@@ -784,7 +795,6 @@ libqpidbroker_la_SOURCES = \
QPIDBROKER_VERSION_INFO = 2:0:0
libqpidbroker_la_LDFLAGS = -version-info $(QPIDBROKER_VERSION_INFO)
-libqpidbroker_la_CXXFLAGS=$(AM_CXXFLAGS) $(BROKER_CXXFLAGS)
if HAVE_PROTON
@@ -929,6 +939,10 @@ libqpidclient_la_SOURCES = \
QPIDCLIENT_VERSION_INFO = 2:0:0
libqpidclient_la_LDFLAGS = -version-info $(QPIDCLIENT_VERSION_INFO)
+if SSL
+include ssl.mk
+endif
+
libqpidtypes_la_LIBADD= -luuid
libqpidtypes_la_SOURCES= \
qpid/types/Exception.cpp \
Modified: qpid/trunk/qpid/cpp/src/ssl.mk
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/ssl.mk?rev=1494697&r1=1494696&r2=1494697&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/ssl.mk (original)
+++ qpid/trunk/qpid/cpp/src/ssl.mk Wed Jun 19 17:11:52 2013
@@ -19,7 +19,7 @@
#
# Makefile fragment, conditionally included in Makefile.am
#
-libsslcommon_la_SOURCES = \
+libqpidcommon_la_SOURCES += \
qpid/sys/ssl/check.h \
qpid/sys/ssl/check.cpp \
qpid/sys/ssl/util.h \
@@ -27,41 +27,21 @@ libsslcommon_la_SOURCES = \
qpid/sys/ssl/SslSocket.h \
qpid/sys/ssl/SslSocket.cpp
-SSLCOMMON_VERSION_INFO = 2:0:0
-libsslcommon_la_LDFLAGS = -version-info $(SSLCOMMON_VERSION_INFO)
-libsslcommon_la_LIBADD= -lnss3 -lssl3 -lnspr4 libqpidcommon.la
-libsslcommon_la_CXXFLAGS=$(AM_CXXFLAGS) $(SSL_CFLAGS)
+libqpidcommon_la_LIBADD += -lnss3 -lssl3 -lnspr4
+libqpidcommon_la_CXXFLAGS += $(SSL_CFLAGS)
-lib_LTLIBRARIES += libsslcommon.la
-
-ssl_la_SOURCES = \
+libqpidbroker_la_SOURCES += \
qpid/sys/SslPlugin.cpp
-ssl_la_LIBADD= libqpidbroker.la libsslcommon.la
-
-ssl_la_CXXFLAGS=$(AM_CXXFLAGS) $(SSL_CFLAGS) -D_IN_QPID_BROKER
-
-ssl_la_LDFLAGS = $(PLUGINLDFLAGS)
+libqpidbroker_la_CXXFLAGS += $(SSL_CFLAGS)
-dmoduleexec_LTLIBRARIES += ssl.la
-
-sslconnector_la_SOURCES = \
+libqpidclient_la_SOURCES += \
qpid/client/SslConnector.cpp
+libqpidclient_la_CXXFLAGS += $(SSL_CFLAGS)
+
if HAVE_PROTON
-sslconnector_la_SOURCES += \
+libqpidclient_la_SOURCES += \
qpid/messaging/amqp/SslTransport.cpp \
qpid/messaging/amqp/SslTransport.h
endif #HAVE_PROTON
-
-
-sslconnector_la_LIBADD = \
- libqpidclient.la \
- libsslcommon.la
-
-sslconnector_la_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\" $(SSL_CFLAGS)
-
-sslconnector_la_LDFLAGS = $(PLUGINLDFLAGS)
-
-cmoduleexec_LTLIBRARIES += \
- sslconnector.la
Modified: qpid/trunk/qpid/cpp/src/tests/ha_test.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ha_test.py?rev=1494697&r1=1494696&r2=1494697&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ha_test.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/ha_test.py Wed Jun 19 17:11:52 2013
@@ -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")
Modified: qpid/trunk/qpid/cpp/src/tests/ha_tests.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ha_tests.py?rev=1494697&r1=1494696&r2=1494697&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ha_tests.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/ha_tests.py Wed Jun 19 17:11:52 2013
@@ -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"))
Modified: qpid/trunk/qpid/cpp/src/tests/run_acl_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_acl_tests?rev=1494697&r1=1494696&r2=1494697&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_acl_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_acl_tests Wed Jun 19 17:11:52 2013
@@ -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
Modified: qpid/trunk/qpid/cpp/src/tests/run_queue_redirect
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_queue_redirect?rev=1494697&r1=1494696&r2=1494697&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_queue_redirect (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_queue_redirect Wed Jun 19 17:11:52 2013
@@ -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 \
Modified: qpid/trunk/qpid/cpp/src/tests/sasl_fed
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/sasl_fed?rev=1494697&r1=1494696&r2=1494697&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/sasl_fed (original)
+++ qpid/trunk/qpid/cpp/src/tests/sasl_fed Wed Jun 19 17:11:52 2013
@@ -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
Modified: qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex?rev=1494697&r1=1494696&r2=1494697&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex (original)
+++ qpid/trunk/qpid/cpp/src/tests/sasl_fed_ex Wed Jun 19 17:11:52 2013
@@ -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 \
Modified: qpid/trunk/qpid/cpp/src/tests/ssl_test
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ssl_test?rev=1494697&r1=1494696&r2=1494697&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ssl_test (original)
+++ qpid/trunk/qpid/cpp/src/tests/ssl_test Wed Jun 19 17:11:52 2013
@@ -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}
Modified: qpid/trunk/qpid/cpp/src/tests/test_env.sh.in
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/test_env.sh.in?rev=1494697&r1=1494696&r2=1494697&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/test_env.sh.in (original)
+++ qpid/trunk/qpid/cpp/src/tests/test_env.sh.in Wed Jun 19 17:11:52 2013
@@ -47,7 +47,6 @@ export QPID_HA_EXEC=$PYTHON_COMMANDS/qpi
# 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:
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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org