QPID-4952: Renamed the Swig Python binding module to qpid_messaging

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

3 files changed, 25 insertions, 24 deletions

diff --git a/qpid/cpp/bindings/qpid/python/CMakeLists.txt b/qpid/cpp/bindings/qpid/python/CMakeLists.txt
index 853625f153..15f9bbb9f7 100644
--- a/qpid/cpp/bindings/qpid/python/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/python/CMakeLists.txt
@@ -24,12 +24,12 @@ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i PROPERTIES CPLU
 set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/python.i
    PROPERTIES SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/bindings")
 
-list(APPEND SWIG_MODULE_cqpid_python_EXTRA_DEPS
+list(APPEND SWIG_MODULE_qpid_messaging_python_EXTRA_DEPS
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/qpid/qpid.i
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/qpid/swig_python_typemaps.i
 )
-swig_add_module(cqpid python ${CMAKE_CURRENT_SOURCE_DIR}/python.i)
-swig_link_libraries(cqpid qpidmessaging qpidtypes ${PYTHON_LIBRARIES})
+swig_add_module(qpid_messaging python ${CMAKE_CURRENT_SOURCE_DIR}/python.i)
+swig_link_libraries(qpid_messaging qpidmessaging qpidtypes ${PYTHON_LIBRARIES})
 
 set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing")
 include_directories(${PYTHON_INCLUDE_PATH}
@@ -39,17 +39,17 @@ include_directories(${PYTHON_INCLUDE_PATH}
 ##------------------------------------
 ## Install the complete Python binding
 ##------------------------------------
-install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile cqpid.py
+install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m py_compile qpid_messaging.py
                               WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
-install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile cqpid.py
+install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile qpid_messaging.py
                               WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cqpid.py
-              ${CMAKE_CURRENT_BINARY_DIR}/cqpid.pyc
-              ${CMAKE_CURRENT_BINARY_DIR}/cqpid.pyo
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qpid_messaging.py
+              ${CMAKE_CURRENT_BINARY_DIR}/qpid_messaging.pyc
+              ${CMAKE_CURRENT_BINARY_DIR}/qpid_messaging.pyo
         DESTINATION ${PYTHON_SITEARCH_PACKAGES}
         COMPONENT ${QPID_COMPONENT_CLIENT}
         )
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/_cqpid.so
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/_qpid_messaging.so
         DESTINATION ${PYTHON_SITEARCH_PACKAGES}
         COMPONENT ${QPID_COMPONENT_CLIENT}
         )
diff --git a/qpid/cpp/bindings/qpid/python/extra_dist/CMakeLists.txt b/qpid/cpp/bindings/qpid/python/extra_dist/CMakeLists.txt
index dbb0102db1..8ddd7869ae 100644
--- a/qpid/cpp/bindings/qpid/python/extra_dist/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/python/extra_dist/CMakeLists.txt
@@ -49,10 +49,10 @@ SET_SOURCE_FILES_PROPERTIES (${CMAKE_CURRENT_SOURCE_DIR}/python.i
 SET_SOURCE_FILES_PROPERTIES (${CMAKE_CURRENT_SOURCE_DIR}/python.i
   PROPERTIES SWIG_FLAGS "-I${QPID_INCLUDE_DIR}")
 
-SWIG_ADD_MODULE (cqpid_python python
+SWIG_ADD_MODULE (qpid_messaging_python python
   ${CMAKE_CURRENT_SOURCE_DIR}/python.i)
 
-SWIG_LINK_LIBRARIES (cqpid_python
+SWIG_LINK_LIBRARIES (qpid_messaging_python
   qpidmessaging
   qpidtypes
   ${PYTHON_LIBRARIES})
@@ -61,9 +61,9 @@ SWIG_LINK_LIBRARIES (cqpid_python
 ## Install the bindings
 ## --------------------
 
-INSTALL (CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -m py_compile cqpid.py
+INSTALL (CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -m py_compile qpid_messaging.py
                                WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
-INSTALL (CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile cqpid.py
+INSTALL (CODE "EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -O -m py_compile qpid_messaging.py
                                WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
 
 SET_SOURCE_FILES_PROPERTIES (${swig_generated_file_fullname}
@@ -75,12 +75,12 @@ INCLUDE_DIRECTORIES (
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/cqpid.py
-               ${CMAKE_CURRENT_BINARY_DIR}/cqpid.pyc
-               ${CMAKE_CURRENT_BINARY_DIR}/cqpid.pyo
+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/qpid_messaging.py
+               ${CMAKE_CURRENT_BINARY_DIR}/qpid_messaging.pyc
+               ${CMAKE_CURRENT_BINARY_DIR}/qpid_messaging.pyo
   DESTINATION ${PYTHON_SITEARCH_PACKAGES})
 
-INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/_cqpid_python.so
-  RENAME _cqpid.so
+INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/_qpid_messaging_python.so
+  RENAME _qpid_messaging.so
   DESTINATION ${PYTHON_SITEARCH_PACKAGES})
 
diff --git a/qpid/cpp/bindings/qpid/python/python.i b/qpid/cpp/bindings/qpid/python/python.i
index 2a3153d2c4..fdc2bbc4f8 100644
--- a/qpid/cpp/bindings/qpid/python/python.i
+++ b/qpid/cpp/bindings/qpid/python/python.i
@@ -17,7 +17,8 @@
  * under the License.
  */
 
-%module cqpid
+%module qpid_messaging
+
 %include "std_string.i"
 %include "qpid/swig_python_typemaps.i"
 
@@ -29,7 +30,7 @@
 /*
  * Exceptions
  *
- * The convention below is that exceptions in _cqpid.so have the same
+ * The convention below is that exceptions in _qpid_messaging.so have the same
  * names as in the C++ library.  They get renamed to their Python
  * equivalents when brought into the Python wrapping
  */
@@ -39,12 +40,12 @@ static PyObject* exception;
 %}
 %init %{
     exception = PyErr_NewException(
-        (char *) ("_cqpid." #exception), parent, NULL);
+        (char *) ("_qpid_messaging." #exception), parent, NULL);
     Py_INCREF(exception);
     PyModule_AddObject(m, #exception, exception);
 %}
 %pythoncode %{
-    exception = _cqpid. ## exception
+    exception = _qpid_messaging. ## exception
 %}
 %enddef
 
@@ -176,7 +177,7 @@ QPID_EXCEPTION(UnauthorizedAccess, SessionError)
                      if v:
                          clean_opts[k] = v
                  args.append(clean_opts)
-             this = _cqpid.new_Connection(*args)
+             this = _qpid_messaging.new_Connection(*args)
              try: self.this.append(this)
              except: self.this = this
 
@@ -341,7 +342,7 @@ QPID_EXCEPTION(UnauthorizedAccess, SessionError)
                       subject=None, user_id=None, reply_to=None,
                       correlation_id=None, durable=None, priority=None,
                       ttl=None, properties=None):
-             this = _cqpid.new_Message('')
+             this = _qpid_messaging.new_Message('')
              try: self.this.append(this)
              except: self.this = this
              if not content is None: