You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by mc...@apache.org on 2013/11/13 17:20:28 UTC
svn commit: r1541585 - in /qpid/dispatch/trunk: ./ python/qpid/
python/qpid/dispatch/ python/qpid/dispatch/config/
python/qpid/dispatch/qdtoollibs/ python/qpid/dispatch/router/
python/qpid/dispatch/stubs/ python/qpiddx/ python/qpiddx/dispatch/
python/q...
Author: mcpierce
Date: Wed Nov 13 16:20:27 2013
New Revision: 1541585
URL: http://svn.apache.org/r1541585
Log:
QPID-5338: Renamed the top Python package to qpiddx.
This fixes the collision between the embedded library's name and the
public Qpid Python libraries.
Added:
qpid/dispatch/trunk/python/qpiddx/
qpid/dispatch/trunk/python/qpiddx/__init__.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/__init__.py
qpid/dispatch/trunk/python/qpiddx/dispatch/
qpid/dispatch/trunk/python/qpiddx/dispatch/__init__.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/__init__.py
qpid/dispatch/trunk/python/qpiddx/dispatch/config/
qpid/dispatch/trunk/python/qpiddx/dispatch/config/__init__.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/config/__init__.py
qpid/dispatch/trunk/python/qpiddx/dispatch/config/parser.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/config/parser.py
qpid/dispatch/trunk/python/qpiddx/dispatch/config/schema.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/config/schema.py
qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/
qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/__init__.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/qdtoollibs/__init__.py
qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/disp.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/qdtoollibs/disp.py
qpid/dispatch/trunk/python/qpiddx/dispatch/router/
qpid/dispatch/trunk/python/qpiddx/dispatch/router/__init__.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/__init__.py
qpid/dispatch/trunk/python/qpiddx/dispatch/router/configuration.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/configuration.py
qpid/dispatch/trunk/python/qpiddx/dispatch/router/data.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/data.py
qpid/dispatch/trunk/python/qpiddx/dispatch/router/link.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/link.py
qpid/dispatch/trunk/python/qpiddx/dispatch/router/mobile.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/mobile.py
qpid/dispatch/trunk/python/qpiddx/dispatch/router/neighbor.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/neighbor.py
qpid/dispatch/trunk/python/qpiddx/dispatch/router/node.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/node.py
qpid/dispatch/trunk/python/qpiddx/dispatch/router/path.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/path.py
qpid/dispatch/trunk/python/qpiddx/dispatch/router/router_engine.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/router_engine.py
qpid/dispatch/trunk/python/qpiddx/dispatch/router/routing.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/routing.py
qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/
qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/__init__.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/stubs/__init__.py
qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/ioadapter.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/stubs/ioadapter.py
qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/logadapter.py
- copied, changed from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/stubs/logadapter.py
Removed:
qpid/dispatch/trunk/python/qpid/__init__.py
qpid/dispatch/trunk/python/qpid/dispatch/__init__.py
qpid/dispatch/trunk/python/qpid/dispatch/config/__init__.py
qpid/dispatch/trunk/python/qpid/dispatch/config/parser.py
qpid/dispatch/trunk/python/qpid/dispatch/config/schema.py
qpid/dispatch/trunk/python/qpid/dispatch/qdtoollibs/__init__.py
qpid/dispatch/trunk/python/qpid/dispatch/qdtoollibs/disp.py
qpid/dispatch/trunk/python/qpid/dispatch/router/__init__.py
qpid/dispatch/trunk/python/qpid/dispatch/router/configuration.py
qpid/dispatch/trunk/python/qpid/dispatch/router/data.py
qpid/dispatch/trunk/python/qpid/dispatch/router/link.py
qpid/dispatch/trunk/python/qpid/dispatch/router/mobile.py
qpid/dispatch/trunk/python/qpid/dispatch/router/neighbor.py
qpid/dispatch/trunk/python/qpid/dispatch/router/node.py
qpid/dispatch/trunk/python/qpid/dispatch/router/path.py
qpid/dispatch/trunk/python/qpid/dispatch/router/router_engine.py
qpid/dispatch/trunk/python/qpid/dispatch/router/routing.py
qpid/dispatch/trunk/python/qpid/dispatch/stubs/__init__.py
qpid/dispatch/trunk/python/qpid/dispatch/stubs/ioadapter.py
qpid/dispatch/trunk/python/qpid/dispatch/stubs/logadapter.py
Modified:
qpid/dispatch/trunk/CMakeLists.txt
qpid/dispatch/trunk/src/config.c
qpid/dispatch/trunk/tests/router_engine_test.py
Modified: qpid/dispatch/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/CMakeLists.txt?rev=1541585&r1=1541584&r2=1541585&view=diff
==============================================================================
--- qpid/dispatch/trunk/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/CMakeLists.txt Wed Nov 13 16:20:27 2013
@@ -131,34 +131,34 @@ install(FILES etc/qpid-dxrouter.conf DES
## Python modules installation
##
set(PYTHON_STUBS_SOURCES
- python/qpid/dispatch/stubs/__init__.py
- python/qpid/dispatch/stubs/ioadapter.py
- python/qpid/dispatch/stubs/logadapter.py
+ python/qpiddx/dispatch/stubs/__init__.py
+ python/qpiddx/dispatch/stubs/ioadapter.py
+ python/qpiddx/dispatch/stubs/logadapter.py
)
set(PYTHON_ROUTER_SOURCES
- python/qpid/dispatch/router/link.py
- python/qpid/dispatch/router/router_engine.py
- python/qpid/dispatch/router/__init__.py
- python/qpid/dispatch/router/mobile.py
- python/qpid/dispatch/router/node.py
- python/qpid/dispatch/router/routing.py
- python/qpid/dispatch/router/data.py
- python/qpid/dispatch/router/configuration.py
- python/qpid/dispatch/router/neighbor.py
- python/qpid/dispatch/router/path.py
+ python/qpiddx/dispatch/router/link.py
+ python/qpiddx/dispatch/router/router_engine.py
+ python/qpiddx/dispatch/router/__init__.py
+ python/qpiddx/dispatch/router/mobile.py
+ python/qpiddx/dispatch/router/node.py
+ python/qpiddx/dispatch/router/routing.py
+ python/qpiddx/dispatch/router/data.py
+ python/qpiddx/dispatch/router/configuration.py
+ python/qpiddx/dispatch/router/neighbor.py
+ python/qpiddx/dispatch/router/path.py
)
set(PYTHON_CONFIG_SOURCES
- python/qpid/dispatch/config/parser.py
- python/qpid/dispatch/config/__init__.py
- python/qpid/dispatch/config/schema.py
- python/qpid/dispatch/__init__.py
+ python/qpiddx/dispatch/config/parser.py
+ python/qpiddx/dispatch/config/__init__.py
+ python/qpiddx/dispatch/config/schema.py
+ python/qpiddx/dispatch/__init__.py
)
set(PYTHON_TOOLS_SOURCES
- python/qpid/dispatch/qdtoollibs/__init__.py
- python/qpid/dispatch/qdtoollibs/disp.py
+ python/qpiddx/dispatch/qdtoollibs/__init__.py
+ python/qpiddx/dispatch/qdtoollibs/disp.py
)
set(PYTHON_TOOLS_EXECUTABLES
@@ -173,22 +173,22 @@ set(DOC_FILES
)
install(FILES ${PYTHON_STUBS_SOURCES}
- DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid/dispatch/stubs)
+ DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/dispatch/stubs)
install(FILES ${PYTHON_ROUTER_SOURCES}
- DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid/dispatch/router)
+ DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/dispatch/router)
install(FILES ${PYTHON_CONFIG_SOURCES}
- DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid/dispatch/config)
+ DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/dispatch/config)
install(FILES ${PYTHON_TOOLS_SOURCES}
- DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid/dispatch/qdtoollibs)
+ DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/dispatch/qdtoollibs)
-install(FILES python/qpid/__init__.py
- DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid)
+install(FILES python/qpiddx/__init__.py
+ DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx)
-install(FILES python/qpid/dispatch/__init__.py
- DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid/dispatch)
+install(FILES python/qpiddx/dispatch/__init__.py
+ DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/dispatch)
install(PROGRAMS ${PYTHON_TOOLS_EXECUTABLES}
DESTINATION bin)
Copied: qpid/dispatch/trunk/python/qpiddx/__init__.py (from r1540712, qpid/dispatch/trunk/python/qpid/__init__.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/__init__.py?p2=qpid/dispatch/trunk/python/qpiddx/__init__.py&p1=qpid/dispatch/trunk/python/qpid/__init__.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/__init__.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/__init__.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/__init__.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/__init__.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/__init__.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/config/__init__.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/config/__init__.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/config/__init__.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/config/__init__.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/config/__init__.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/config/parser.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/config/parser.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/config/parser.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/config/parser.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/config/parser.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/config/schema.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/config/schema.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/config/schema.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/config/schema.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/config/schema.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/__init__.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/qdtoollibs/__init__.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/__init__.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/__init__.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/qdtoollibs/__init__.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/disp.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/qdtoollibs/disp.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/disp.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/disp.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/qdtoollibs/disp.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/router/__init__.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/__init__.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/router/__init__.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/router/__init__.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/router/__init__.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/router/configuration.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/configuration.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/router/configuration.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/router/configuration.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/router/configuration.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/router/data.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/data.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/router/data.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/router/data.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/router/data.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/router/link.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/link.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/router/link.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/router/link.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/router/link.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/router/mobile.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/mobile.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/router/mobile.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/router/mobile.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/router/mobile.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/router/neighbor.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/neighbor.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/router/neighbor.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/router/neighbor.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/router/neighbor.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/router/node.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/node.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/router/node.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/router/node.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/router/node.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/router/path.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/path.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/router/path.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/router/path.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/router/path.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/router/router_engine.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/router_engine.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/router/router_engine.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/router/router_engine.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/router/router_engine.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/router/routing.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/router/routing.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/router/routing.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/router/routing.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/router/routing.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/__init__.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/stubs/__init__.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/__init__.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/__init__.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/stubs/__init__.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/ioadapter.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/stubs/ioadapter.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/ioadapter.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/ioadapter.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/stubs/ioadapter.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Copied: qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/logadapter.py (from r1540712, qpid/dispatch/trunk/python/qpid/dispatch/stubs/logadapter.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/logadapter.py?p2=qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/logadapter.py&p1=qpid/dispatch/trunk/python/qpid/dispatch/stubs/logadapter.py&r1=1540712&r2=1541585&rev=1541585&view=diff
==============================================================================
(empty)
Modified: qpid/dispatch/trunk/src/config.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/config.c?rev=1541585&r1=1541584&r2=1541585&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/config.c (original)
+++ qpid/dispatch/trunk/src/config.c Wed Nov 13 16:20:27 2013
@@ -22,7 +22,7 @@
#include <qpid/dispatch/alloc.h>
#include <qpid/dispatch/log.h>
-#define PYTHON_MODULE "qpid.dispatch.config"
+#define PYTHON_MODULE "qpiddx.dispatch.config"
static const char *log_module = "CONFIG";
Modified: qpid/dispatch/trunk/tests/router_engine_test.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/router_engine_test.py?rev=1541585&r1=1541584&r2=1541585&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/router_engine_test.py (original)
+++ qpid/dispatch/trunk/tests/router_engine_test.py Wed Nov 13 16:20:27 2013
@@ -18,8 +18,8 @@
#
import unittest
-from qpid.dispatch.router.router_engine import NeighborEngine, PathEngine, Configuration, NodeTracker
-from qpid.dispatch.router.data import LinkState, MessageHELLO
+from qpiddx.dispatch.router.router_engine import NeighborEngine, PathEngine, Configuration, NodeTracker
+from qpiddx.dispatch.router.data import LinkState, MessageHELLO
class Adapter(object):
def __init__(self, domain):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org