You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2013/11/20 19:33:40 UTC
svn commit: r1543898 - in /qpid/dispatch/trunk: ./ bin/
python/qpid_dispatch/ python/qpid_dispatch/config/
python/qpid_dispatch/qdtoollibs/ python/qpid_dispatch/router/
python/qpid_dispatch/tools/ python/qpiddx/ src/ tests/ tools/ tools/src/
Author: jross
Date: Wed Nov 20 18:33:39 2013
New Revision: 1543898
URL: http://svn.apache.org/r1543898
Log:
QPID-5365: Clean up file locations
Added:
qpid/dispatch/trunk/README
- copied unchanged from r1543793, qpid/dispatch/trunk/README.md
qpid/dispatch/trunk/bin/
qpid/dispatch/trunk/bin/release.sh
- copied unchanged from r1543793, qpid/dispatch/trunk/release.sh
qpid/dispatch/trunk/python/qpid_dispatch/
- copied from r1543793, qpid/dispatch/trunk/python/qpiddx/
qpid/dispatch/trunk/python/qpid_dispatch/router/engine.py
- copied unchanged from r1543793, qpid/dispatch/trunk/python/qpiddx/router/router_engine.py
qpid/dispatch/trunk/python/qpid_dispatch/tools/
- copied from r1543793, qpid/dispatch/trunk/python/qpiddx/qdtoollibs/
qpid/dispatch/trunk/python/qpid_dispatch/tools/display.py
- copied unchanged from r1543793, qpid/dispatch/trunk/python/qpiddx/qdtoollibs/disp.py
qpid/dispatch/trunk/tools/qdstat
- copied, changed from r1543793, qpid/dispatch/trunk/tools/src/py/qdstat
Removed:
qpid/dispatch/trunk/README.md
qpid/dispatch/trunk/python/qpid_dispatch/qdtoollibs/
qpid/dispatch/trunk/python/qpid_dispatch/router/router_engine.py
qpid/dispatch/trunk/python/qpid_dispatch/tools/disp.py
qpid/dispatch/trunk/python/qpiddx/
qpid/dispatch/trunk/release.sh
qpid/dispatch/trunk/tools/src/
Modified:
qpid/dispatch/trunk/CMakeLists.txt
qpid/dispatch/trunk/python/qpid_dispatch/config/__init__.py
qpid/dispatch/trunk/python/qpid_dispatch/config/parser.py
qpid/dispatch/trunk/python/qpid_dispatch/router/__init__.py
qpid/dispatch/trunk/src/config.c
qpid/dispatch/trunk/src/router_pynode.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=1543898&r1=1543897&r2=1543898&view=diff
==============================================================================
--- qpid/dispatch/trunk/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/CMakeLists.txt Wed Nov 20 18:33:39 2013
@@ -139,64 +139,64 @@ install(FILES etc/qdrouterd.conf DESTINA
## Python modules installation
##
set(PYTHON_STUBS_SOURCES
- python/qpiddx/stubs/__init__.py
- python/qpiddx/stubs/ioadapter.py
- python/qpiddx/stubs/logadapter.py
+ python/qpid_dispatch/stubs/__init__.py
+ python/qpid_dispatch/stubs/ioadapter.py
+ python/qpid_dispatch/stubs/logadapter.py
)
set(PYTHON_ROUTER_SOURCES
- 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
+ python/qpid_dispatch/router/link.py
+ python/qpid_dispatch/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
)
set(PYTHON_CONFIG_SOURCES
- python/qpiddx/config/parser.py
- python/qpiddx/config/__init__.py
- python/qpiddx/config/schema.py
- python/qpiddx/__init__.py
+ python/qpid_dispatch/config/parser.py
+ python/qpid_dispatch/config/__init__.py
+ python/qpid_dispatch/config/schema.py
+ python/qpid_dispatch/__init__.py
)
set(PYTHON_TOOLS_SOURCES
- python/qpiddx/qdtoollibs/__init__.py
- python/qpiddx/qdtoollibs/disp.py
+ python/qpid_dispatch/tools/__init__.py
+ python/qpid_dispatch/tools/display.py
)
set(PYTHON_TOOLS_EXECUTABLES
- tools/src/py/qdstat
+ tools/qdstat
)
set(DOC_FILES
ChangeLog
LICENSE
- README.md
+ README
TODO
)
install(FILES ${PYTHON_STUBS_SOURCES}
- DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/stubs)
+ DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid_dispatch/stubs)
install(FILES ${PYTHON_ROUTER_SOURCES}
- DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/router)
+ DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid_dispatch/router)
install(FILES ${PYTHON_CONFIG_SOURCES}
- DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/config)
+ DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid_dispatch/config)
install(FILES ${PYTHON_TOOLS_SOURCES}
- DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx/qdtoollibs)
+ DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid_dispatch/tools)
-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/__init__.py
- DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpiddx)
+install(FILES python/qpid_dispatch/__init__.py
+ DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid_dispatch)
install(PROGRAMS ${PYTHON_TOOLS_EXECUTABLES}
DESTINATION bin)
Modified: qpid/dispatch/trunk/python/qpid_dispatch/config/__init__.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch/config/__init__.py?rev=1543898&r1=1543793&r2=1543898&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch/config/__init__.py (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch/config/__init__.py Wed Nov 20 18:33:39 2013
@@ -17,4 +17,4 @@
# under the License.
#
-from parser import DXConfig
+from parser import DispatchConfig
Modified: qpid/dispatch/trunk/python/qpid_dispatch/config/parser.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch/config/parser.py?rev=1543898&r1=1543793&r2=1543898&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch/config/parser.py (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch/config/parser.py Wed Nov 20 18:33:39 2013
@@ -166,7 +166,7 @@ class Schema:
-class DXConfig:
+class DispatchConfig:
"""
Configuration File Parser for Qpid Dispatch
Modified: qpid/dispatch/trunk/python/qpid_dispatch/router/__init__.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch/router/__init__.py?rev=1543898&r1=1543793&r2=1543898&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch/router/__init__.py (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch/router/__init__.py Wed Nov 20 18:33:39 2013
@@ -17,4 +17,4 @@
# under the License.
#
-from .router_engine import *
+from .engine import *
Modified: qpid/dispatch/trunk/src/config.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/config.c?rev=1543898&r1=1543897&r2=1543898&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/config.c (original)
+++ qpid/dispatch/trunk/src/config.c Wed Nov 20 18:33:39 2013
@@ -22,7 +22,7 @@
#include <qpid/dispatch/alloc.h>
#include <qpid/dispatch/log.h>
-#define PYTHON_MODULE "qpiddx.config"
+#define PYTHON_MODULE "qpid_dispatch.config"
static const char *log_module = "CONFIG";
@@ -65,17 +65,17 @@ qd_config_t *qd_config(const char *filen
return 0;
}
- config->pClass = PyObject_GetAttrString(config->pModule, "DXConfig");
+ config->pClass = PyObject_GetAttrString(config->pModule, "DispatchConfig");
if (!config->pClass || !PyClass_Check(config->pClass)) {
PyErr_Print();
Py_DECREF(config->pModule);
free_qd_config_t(config);
- qd_log(log_module, LOG_ERROR, "Problem with configuration module: Missing DXConfig class");
+ qd_log(log_module, LOG_ERROR, "Problem with configuration module: Missing DispatchConfig class");
return 0;
}
//
- // Instantiate the DXConfig class, passing in the configuration file name.
+ // Instantiate the DispatchConfig class, passing in the configuration file name.
//
PyObject *pArgs = PyTuple_New(1);
PyObject *fname = PyString_FromString(filename);
Modified: qpid/dispatch/trunk/src/router_pynode.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/router_pynode.c?rev=1543898&r1=1543897&r2=1543898&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/router_pynode.c (original)
+++ qpid/dispatch/trunk/src/router_pynode.c Wed Nov 20 18:33:39 2013
@@ -538,7 +538,7 @@ void qd_router_python_setup(qd_router_t
PyObject* pClass;
PyObject* pArgs;
- pName = PyString_FromString("qpiddx.router");
+ pName = PyString_FromString("qpid_dispatch.router");
pModule = PyImport_Import(pName);
Py_DECREF(pName);
if (!pModule) {
Modified: qpid/dispatch/trunk/tests/router_engine_test.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/router_engine_test.py?rev=1543898&r1=1543897&r2=1543898&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/router_engine_test.py (original)
+++ qpid/dispatch/trunk/tests/router_engine_test.py Wed Nov 20 18:33:39 2013
@@ -18,8 +18,8 @@
#
import unittest
-from qpiddx.router.router_engine import NeighborEngine, PathEngine, Configuration, NodeTracker
-from qpiddx.router.data import LinkState, MessageHELLO
+from qpid_dispatch.router.engine import NeighborEngine, PathEngine, Configuration, NodeTracker
+from qpid_dispatch.router.data import LinkState, MessageHELLO
class Adapter(object):
def __init__(self, domain):
Copied: qpid/dispatch/trunk/tools/qdstat (from r1543793, qpid/dispatch/trunk/tools/src/py/qdstat)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tools/qdstat?p2=qpid/dispatch/trunk/tools/qdstat&p1=qpid/dispatch/trunk/tools/src/py/qdstat&r1=1543793&r2=1543898&rev=1543898&view=diff
==============================================================================
--- qpid/dispatch/trunk/tools/src/py/qdstat (original)
+++ qpid/dispatch/trunk/tools/qdstat Wed Nov 20 18:33:39 2013
@@ -30,7 +30,7 @@ from proton import Messenger, Message
home = os.environ.get("QD_TOOLS_HOME", os.path.normpath("/usr/share/qd-tools"))
sys.path.append(os.path.join(home, "python"))
-from qpiddx.qdtoollibs import Display, Header, Sorter, YN, Commas, TimeLong
+from qpid_dispatch.tools import Display, Header, Sorter, YN, Commas TimeLong
class Config:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org