QPID-5115: AMQP 1.0 client support built in to qpidmessaging for all platforms

This commit disposes of the amqpc library and moves the functions into the
qpidmessaging library. Now any client that loads qpidmessaging gets amqp0-10
and amqp1.0 selectable through the connection protocol option. C++ brokers
still must load the amqp library to enable 1.0 support.



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

6 files changed, 7 insertions, 15 deletions

diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt
index cde80194df..c7822f64df 100644
--- a/cpp/src/CMakeLists.txt
+++ b/cpp/src/CMakeLists.txt
@@ -1196,6 +1196,7 @@ install (DIRECTORY ../include/qpid
 install_pdb (qpidclient ${QPID_COMPONENT_CLIENT})
 
 set (qpidmessaging_SOURCES
+     ${amqpc_SOURCES}
      qpid/messaging/AddressImpl.h
      qpid/messaging/ConnectionImpl.h
      qpid/messaging/ReceiverImpl.h
@@ -1243,7 +1244,7 @@ set (qpidmessaging_SOURCES
 add_msvc_version (qpidmessaging library dll)
 
 add_library (qpidmessaging SHARED ${qpidmessaging_SOURCES})
-target_link_libraries (qpidmessaging qpidtypes qpidclient qpidcommon)
+target_link_libraries (qpidmessaging qpidtypes qpidclient qpidcommon ${PROTON_LIBRARIES})
 set_target_properties (qpidmessaging PROPERTIES
                        LINK_FLAGS "${HIDE_SYMBOL_FLAGS} ${LINK_VERSION_SCRIPT_FLAG}"
                        COMPILE_FLAGS "${HIDE_SYMBOL_FLAGS}"
diff --git a/cpp/src/amqp.cmake b/cpp/src/amqp.cmake
index 133fb5c051..52316d22b3 100644
--- a/cpp/src/amqp.cmake
+++ b/cpp/src/amqp.cmake
@@ -163,15 +163,6 @@ if (BUILD_AMQP)
          qpid/messaging/amqp/TcpTransport.h
          qpid/messaging/amqp/TcpTransport.cpp
         )
-    add_library (amqpc MODULE ${amqpc_SOURCES})
-    target_link_libraries (amqpc qpidmessaging qpidtypes qpidclient qpidcommon ${PROTON_LIBRARIES})
-    set_target_properties (amqpc PROPERTIES
-                           PREFIX ""
-                           LINK_FLAGS "${CATCH_UNDEFINED}")
-
-    install (TARGETS amqpc
-             DESTINATION ${QPIDC_MODULE_DIR}
-             COMPONENT ${QPID_COMPONENT_CLIENT})
 
     if (WIN32)
         set(proton_dll  "${PROTON_LIBRARY_DIRS}/${PROTON_LIBRARIES}.dll")
@@ -186,4 +177,8 @@ if (BUILD_AMQP)
                 COMPONENT   ${QPID_COMPONENT_COMMON}
                 CONFIGURATIONS Debug)
     endif (WIN32)
+else (BUILD_AMQP)
+    # ensure that qpid build ignores proton
+    UNSET( amqpc_SOURCES )
+    UNSET( PROTON_LIBRARIES )
 endif (BUILD_AMQP)
diff --git a/cpp/src/tests/brokertest.py b/cpp/src/tests/brokertest.py
index 2786454399..d1f020a945 100644
--- a/cpp/src/tests/brokertest.py
+++ b/cpp/src/tests/brokertest.py
@@ -424,7 +424,6 @@ class BrokerTest(TestCase):
     ha_lib = os.getenv("HA_LIB")
     xml_lib = os.getenv("XML_LIB")
     amqp_lib = os.getenv("AMQP_LIB")
-    amqpc_lib = os.getenv("AMQPC_LIB")
     qpid_config_exec = os.getenv("QPID_CONFIG_EXEC")
     qpid_route_exec = os.getenv("QPID_ROUTE_EXEC")
     receiver_exec = os.getenv("RECEIVER_EXEC")
diff --git a/cpp/src/tests/interlink_tests.py b/cpp/src/tests/interlink_tests.py
index 608d4ac890..c7269ac5e9 100755
--- a/cpp/src/tests/interlink_tests.py
+++ b/cpp/src/tests/interlink_tests.py
@@ -46,7 +46,6 @@ class AmqpBrokerTest(BrokerTest):
     """
     def setUp(self):
         BrokerTest.setUp(self)
-        os.putenv("QPID_LOAD_MODULE", BrokerTest.amqpc_lib)
         self.port_holder = HaPort(self)
         self.broker = self.amqp_broker(port_holder=self.port_holder)
         self.default_config = Config(self.broker)
diff --git a/cpp/src/tests/swig_python_tests b/cpp/src/tests/swig_python_tests
index a10878f712..3741e3c699 100755
--- a/cpp/src/tests/swig_python_tests
+++ b/cpp/src/tests/swig_python_tests
@@ -52,8 +52,7 @@ echo "Running swigged python tests using broker on port $QPID_PORT"
 export PYTHONPATH=$PYTHONPATH:$PYTHONPATH_SWIG
 export QPID_USE_SWIG_CLIENT=1
 $QPID_PYTHON_TEST -m qpid.tests.messaging.message -m qpid_tests.broker_0_10.priority -m qpid_tests.broker_0_10.lvq -m qpid_tests.broker_0_10.new_api -b localhost:$QPID_PORT -I $srcdir/failing-amqp0-10-python-tests || FAILED=1
-if [[ -a $AMQPC_LIB ]] ; then
-    export QPID_LOAD_MODULE=$AMQPC_LIB
+if [[ -a $AMQP_LIB ]] ; then
     $QPID_PYTHON_TEST --define="protocol_version=amqp1.0" -m qpid_tests.broker_1_0 -m qpid_tests.broker_0_10.new_api -m assertions -b localhost:$QPID_PORT -I $srcdir/failing-amqp1.0-python-tests || FAILED=1
 fi
 stop_broker
diff --git a/cpp/src/tests/test_env.sh.in b/cpp/src/tests/test_env.sh.in
index 486034ca3b..f45d3708a2 100644
--- a/cpp/src/tests/test_env.sh.in
+++ b/cpp/src/tests/test_env.sh.in
@@ -67,7 +67,6 @@ exportmodule HA_LIB ha.so
 exportmodule XML_LIB xml.so
 exportmodule STORE_LIB legacystore.so
 exportmodule AMQP_LIB amqp.so
-exportmodule AMQPC_LIB amqpc.so
 
 # Qpid options
 export QPID_NO_MODULE_DIR=1	# Don't accidentally load installed modules