qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcpie...@apache.org
Subject svn commit: r1541931 - in /qpid/dispatch/trunk: ./ python/qpiddx/config/ python/qpiddx/dispatch/ python/qpiddx/dispatch/config/ python/qpiddx/dispatch/qdtoollibs/ python/qpiddx/dispatch/router/ python/qpiddx/dispatch/stubs/ python/qpiddx/qdtoollibs/ py...
Date Thu, 14 Nov 2013 15:29:29 GMT
Author: mcpierce
Date: Thu Nov 14 15:29:28 2013
New Revision: 1541931

URL: http://svn.apache.org/r1541931
Log:
QPID-5338: Removed the dispatch package from under qpiddx

The package was redundant.

Added:
    qpid/dispatch/trunk/python/qpiddx/config/
    qpid/dispatch/trunk/python/qpiddx/config/__init__.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/config/__init__.py
    qpid/dispatch/trunk/python/qpiddx/config/parser.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/config/parser.py
    qpid/dispatch/trunk/python/qpiddx/config/schema.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/config/schema.py
    qpid/dispatch/trunk/python/qpiddx/qdtoollibs/
    qpid/dispatch/trunk/python/qpiddx/qdtoollibs/__init__.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/__init__.py
    qpid/dispatch/trunk/python/qpiddx/qdtoollibs/disp.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/disp.py
    qpid/dispatch/trunk/python/qpiddx/router/
    qpid/dispatch/trunk/python/qpiddx/router/__init__.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/__init__.py
    qpid/dispatch/trunk/python/qpiddx/router/configuration.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/configuration.py
    qpid/dispatch/trunk/python/qpiddx/router/data.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/data.py
    qpid/dispatch/trunk/python/qpiddx/router/link.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/link.py
    qpid/dispatch/trunk/python/qpiddx/router/mobile.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/mobile.py
    qpid/dispatch/trunk/python/qpiddx/router/neighbor.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/neighbor.py
    qpid/dispatch/trunk/python/qpiddx/router/node.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/node.py
    qpid/dispatch/trunk/python/qpiddx/router/path.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/path.py
    qpid/dispatch/trunk/python/qpiddx/router/router_engine.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/router_engine.py
    qpid/dispatch/trunk/python/qpiddx/router/routing.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/routing.py
    qpid/dispatch/trunk/python/qpiddx/stubs/
    qpid/dispatch/trunk/python/qpiddx/stubs/__init__.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/__init__.py
    qpid/dispatch/trunk/python/qpiddx/stubs/ioadapter.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/ioadapter.py
    qpid/dispatch/trunk/python/qpiddx/stubs/logadapter.py
      - copied, changed from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/logadapter.py
Removed:
    qpid/dispatch/trunk/python/qpiddx/dispatch/__init__.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/config/__init__.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/config/parser.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/config/schema.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/__init__.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/disp.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/router/__init__.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/router/configuration.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/router/data.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/router/link.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/router/mobile.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/router/neighbor.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/router/node.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/router/path.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/router/router_engine.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/router/routing.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/__init__.py
    qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/ioadapter.py
    qpid/dispatch/trunk/python/qpiddx/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=1541931&r1=1541930&r2=1541931&view=diff
==============================================================================
--- qpid/dispatch/trunk/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/CMakeLists.txt Thu Nov 14 15:29:28 2013
@@ -131,34 +131,34 @@ install(FILES etc/qpid-dxrouter.conf DES
 ## Python modules installation
 ##
 set(PYTHON_STUBS_SOURCES
-    python/qpiddx/dispatch/stubs/__init__.py
-    python/qpiddx/dispatch/stubs/ioadapter.py
-    python/qpiddx/dispatch/stubs/logadapter.py
+    python/qpiddx/stubs/__init__.py
+    python/qpiddx/stubs/ioadapter.py
+    python/qpiddx/stubs/logadapter.py
 )
 
 set(PYTHON_ROUTER_SOURCES
-    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
+    python/qpiddx/router/link.py
+    python/qpiddx/router/router_engine.py
+    python/qpiddx/router/__init__.py
+    python/qpiddx/router/mobile.py
+    python/qpiddx/router/node.py
+    python/qpiddx/router/routing.py
+    python/qpiddx/router/data.py
+    python/qpiddx/router/configuration.py
+    python/qpiddx/router/neighbor.py
+    python/qpiddx/router/path.py
 )
 
 set(PYTHON_CONFIG_SOURCES
-    python/qpiddx/dispatch/config/parser.py
-    python/qpiddx/dispatch/config/__init__.py
-    python/qpiddx/dispatch/config/schema.py
-    python/qpiddx/dispatch/__init__.py
+    python/qpiddx/config/parser.py
+    python/qpiddx/config/__init__.py
+    python/qpiddx/config/schema.py
+    python/qpiddx/__init__.py
 )
 
 set(PYTHON_TOOLS_SOURCES
-    python/qpiddx/dispatch/qdtoollibs/__init__.py
-    python/qpiddx/dispatch/qdtoollibs/disp.py
+    python/qpiddx/qdtoollibs/__init__.py
+    python/qpiddx/qdtoollibs/disp.py
 )
 
 set(PYTHON_TOOLS_EXECUTABLES
@@ -173,22 +173,22 @@ set(DOC_FILES
 )
 
 install(FILES ${PYTHON_STUBS_SOURCES}
-        DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/dispatch/stubs)
+        DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/stubs)
 
 install(FILES ${PYTHON_ROUTER_SOURCES}
-        DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/dispatch/router)
+        DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/router)
 
 install(FILES ${PYTHON_CONFIG_SOURCES}
-        DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/dispatch/config)
+        DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/config)
 
 install(FILES ${PYTHON_TOOLS_SOURCES}
-        DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/dispatch/qdtoollibs)
+        DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/qdtoollibs)
 
 install(FILES python/qpiddx/__init__.py
         DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx)
 
-install(FILES python/qpiddx/dispatch/__init__.py
-        DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/dispatch)
+install(FILES python/qpiddx/__init__.py
+        DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx)
 
 install(PROGRAMS ${PYTHON_TOOLS_EXECUTABLES}
         DESTINATION bin)

Copied: qpid/dispatch/trunk/python/qpiddx/config/__init__.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/config/__init__.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/config/__init__.py?p2=qpid/dispatch/trunk/python/qpiddx/config/__init__.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/config/__init__.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/config/parser.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/config/parser.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/config/parser.py?p2=qpid/dispatch/trunk/python/qpiddx/config/parser.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/config/parser.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/config/schema.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/config/schema.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/config/schema.py?p2=qpid/dispatch/trunk/python/qpiddx/config/schema.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/config/schema.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/qdtoollibs/__init__.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/__init__.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/qdtoollibs/__init__.py?p2=qpid/dispatch/trunk/python/qpiddx/qdtoollibs/__init__.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/__init__.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/qdtoollibs/disp.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/disp.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/qdtoollibs/disp.py?p2=qpid/dispatch/trunk/python/qpiddx/qdtoollibs/disp.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/qdtoollibs/disp.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/router/__init__.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/__init__.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/router/__init__.py?p2=qpid/dispatch/trunk/python/qpiddx/router/__init__.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/router/__init__.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/router/configuration.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/configuration.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/router/configuration.py?p2=qpid/dispatch/trunk/python/qpiddx/router/configuration.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/router/configuration.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/router/data.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/data.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/router/data.py?p2=qpid/dispatch/trunk/python/qpiddx/router/data.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/router/data.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/router/link.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/link.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/router/link.py?p2=qpid/dispatch/trunk/python/qpiddx/router/link.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/router/link.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/router/mobile.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/mobile.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/router/mobile.py?p2=qpid/dispatch/trunk/python/qpiddx/router/mobile.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/router/mobile.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/router/neighbor.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/neighbor.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/router/neighbor.py?p2=qpid/dispatch/trunk/python/qpiddx/router/neighbor.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/router/neighbor.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/router/node.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/node.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/router/node.py?p2=qpid/dispatch/trunk/python/qpiddx/router/node.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/router/node.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/router/path.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/path.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/router/path.py?p2=qpid/dispatch/trunk/python/qpiddx/router/path.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/router/path.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/router/router_engine.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/router_engine.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/router/router_engine.py?p2=qpid/dispatch/trunk/python/qpiddx/router/router_engine.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/router/router_engine.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/router/routing.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/router/routing.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/router/routing.py?p2=qpid/dispatch/trunk/python/qpiddx/router/routing.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/router/routing.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/stubs/__init__.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/__init__.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/stubs/__init__.py?p2=qpid/dispatch/trunk/python/qpiddx/stubs/__init__.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/__init__.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/stubs/ioadapter.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/ioadapter.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/stubs/ioadapter.py?p2=qpid/dispatch/trunk/python/qpiddx/stubs/ioadapter.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/ioadapter.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Copied: qpid/dispatch/trunk/python/qpiddx/stubs/logadapter.py (from r1541730, qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/logadapter.py)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpiddx/stubs/logadapter.py?p2=qpid/dispatch/trunk/python/qpiddx/stubs/logadapter.py&p1=qpid/dispatch/trunk/python/qpiddx/dispatch/stubs/logadapter.py&r1=1541730&r2=1541931&rev=1541931&view=diff
==============================================================================
    (empty)

Modified: qpid/dispatch/trunk/src/config.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/config.c?rev=1541931&r1=1541930&r2=1541931&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/config.c (original)
+++ qpid/dispatch/trunk/src/config.c Thu Nov 14 15:29:28 2013
@@ -22,7 +22,7 @@
 #include <qpid/dispatch/alloc.h>
 #include <qpid/dispatch/log.h>
 
-#define PYTHON_MODULE "qpiddx.dispatch.config"
+#define PYTHON_MODULE "qpiddx.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=1541931&r1=1541930&r2=1541931&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/router_engine_test.py (original)
+++ qpid/dispatch/trunk/tests/router_engine_test.py Thu Nov 14 15:29:28 2013
@@ -18,8 +18,8 @@
 #
 
 import unittest
-from qpiddx.dispatch.router.router_engine import NeighborEngine, PathEngine, Configuration,
NodeTracker
-from qpiddx.dispatch.router.data import LinkState, MessageHELLO
+from qpiddx.router.router_engine import NeighborEngine, PathEngine, Configuration, NodeTracker
+from qpiddx.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


Mime
View raw message