You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2013/10/24 23:53:16 UTC
svn commit: r1535571 - in /qpid/dispatch/trunk: ./ etc/
python/qpid/dispatch/qdtoollibs/ router/ tools/src/py/
tools/src/py/qdtoollibs/
Author: tross
Date: Thu Oct 24 21:53:15 2013
New Revision: 1535571
URL: http://svn.apache.org/r1535571
Log:
QPID-5258 - Prepare for release
- Renamed the executable to qpid-dxrouterd
- Renamed the configuration file to qpid-dxrouter.conf
- Moved the tool utilities to the python subtree
- Install the tool executable
Added:
qpid/dispatch/trunk/etc/qpid-dxrouter.conf
- copied, changed from r1535508, qpid/dispatch/trunk/etc/qpid-dispatch.conf
qpid/dispatch/trunk/python/qpid/dispatch/qdtoollibs/
- copied from r1535508, qpid/dispatch/trunk/tools/src/py/qdtoollibs/
Removed:
qpid/dispatch/trunk/etc/qpid-dispatch.conf
qpid/dispatch/trunk/tools/src/py/qdtoollibs/
Modified:
qpid/dispatch/trunk/CMakeLists.txt
qpid/dispatch/trunk/config.sh
qpid/dispatch/trunk/python/qpid/dispatch/qdtoollibs/__init__.py
qpid/dispatch/trunk/router/CMakeLists.txt
qpid/dispatch/trunk/tools/src/py/qdstat
Modified: qpid/dispatch/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/CMakeLists.txt?rev=1535571&r1=1535570&r2=1535571&view=diff
==============================================================================
--- qpid/dispatch/trunk/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/CMakeLists.txt Thu Oct 24 21:53:15 2013
@@ -125,7 +125,7 @@ install(TARGETS qpid-dispatch
file(GLOB headers "include/qpid/dispatch/*.h")
install(FILES ${headers} DESTINATION ${INCLUDE_INSTALL_DIR}/qpid/dispatch)
install(FILES include/qpid/dispatch.h DESTINATION ${INCLUDE_INSTALL_DIR}/qpid)
-install(FILES etc/qpid-dispatch.conf DESTINATION ${SYSCONF_INSTALL_DIR}/qpid)
+install(FILES etc/qpid-dxrouter.conf DESTINATION ${SYSCONF_INSTALL_DIR}/qpid)
##
## Python modules installation
@@ -156,6 +156,15 @@ set(PYTHON_CONFIG_SOURCES
python/qpid/dispatch/__init__.py
)
+set(PYTHON_TOOLS_SOURCES
+ python/qpid/dispatch/qdtoollibs/__init__.py
+ python/qpid/dispatch/qdtoollibs/disp.py
+)
+
+set(PYTHON_TOOLS_EXECUTABLES
+ tools/src/py/qdstat
+)
+
set(DOC_FILES
ChangeLog
LICENSE
@@ -172,12 +181,18 @@ install(FILES ${PYTHON_ROUTER_SOURCES}
install(FILES ${PYTHON_CONFIG_SOURCES}
DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid/dispatch/config)
+install(FILES ${PYTHON_TOOLS_SOURCES}
+ DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid/dispatch/qdtoollibs)
+
install(FILES python/qpid/__init__.py
DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid)
install(FILES python/qpid/dispatch/__init__.py
DESTINATION ${PYTHON_SITELIB_PACKAGES}/qpid/dispatch)
+install(PROGRAMS ${PYTHON_TOOLS_EXECUTABLES}
+ DESTINATION bin)
+
install(FILES ${DOC_FILES}
DESTINATION ${DOC_INSTALL_DIR}/qpid-dispatch)
##
Modified: qpid/dispatch/trunk/config.sh
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/config.sh?rev=1535571&r1=1535570&r2=1535571&view=diff
==============================================================================
--- qpid/dispatch/trunk/config.sh (original)
+++ qpid/dispatch/trunk/config.sh Thu Oct 24 21:53:15 2013
@@ -22,6 +22,6 @@ cd $(dirname ${BASH_SOURCE[0]}) > /dev/n
export QPID_DISPATCH_HOME=$(pwd)
cd - > /dev/null
-export PYTHONPATH=$QPID_DISPATCH_HOME/python:$QPID_DISPATCH_HOME/tools/src/py:$PYTHONPATH
+export PYTHONPATH=$QPID_DISPATCH_HOME/python:$PYTHONPATH
export PATH=$QPID_DISPATCH_HOME/tools/src/py:$PATH
Copied: qpid/dispatch/trunk/etc/qpid-dxrouter.conf (from r1535508, qpid/dispatch/trunk/etc/qpid-dispatch.conf)
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/etc/qpid-dxrouter.conf?p2=qpid/dispatch/trunk/etc/qpid-dxrouter.conf&p1=qpid/dispatch/trunk/etc/qpid-dispatch.conf&r1=1535508&r2=1535571&rev=1535571&view=diff
==============================================================================
--- qpid/dispatch/trunk/etc/qpid-dispatch.conf (original)
+++ qpid/dispatch/trunk/etc/qpid-dxrouter.conf Thu Oct 24 21:53:15 2013
@@ -100,26 +100,26 @@ listener {
sasl-mechanisms: ANONYMOUS
}
-listener {
- label: Router Interconnect Access
- role: inter-router
- addr: 0.0.0.0
- port: 5671
- sasl-mechanisms: EXTERNAL
- ssl-profile: ssl-profile-name
- require-peer-auth: yes
- allow-unsecured: yes
-}
-
-connector {
- label: Router Uplink
- role: inter-router
- addr: backbone.enterprise.com
- port: amqps
- sasl-mechanisms: EXTERNAL
- ssl-profile: ssl-profile-name
- allow-redirect: no
-}
+##listener {
+## label: Router Interconnect Access
+## role: inter-router
+## addr: 0.0.0.0
+## port: 5671
+## sasl-mechanisms: EXTERNAL
+## ssl-profile: ssl-profile-name
+## require-peer-auth: yes
+## allow-unsecured: yes
+##}
+
+##connector {
+## label: Router Uplink
+## role: inter-router
+## addr: backbone.enterprise.com
+## port: amqps
+## sasl-mechanisms: EXTERNAL
+## ssl-profile: ssl-profile-name
+## allow-redirect: no
+##}
##
Modified: qpid/dispatch/trunk/python/qpid/dispatch/qdtoollibs/__init__.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid/dispatch/qdtoollibs/__init__.py?rev=1535571&r1=1535508&r2=1535571&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid/dispatch/qdtoollibs/__init__.py (original)
+++ qpid/dispatch/trunk/python/qpid/dispatch/qdtoollibs/__init__.py Thu Oct 24 21:53:15 2013
@@ -17,5 +17,5 @@
# under the License.
#
-from qdtoollibs.disp import *
+from .disp import *
Modified: qpid/dispatch/trunk/router/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/router/CMakeLists.txt?rev=1535571&r1=1535570&r2=1535571&view=diff
==============================================================================
--- qpid/dispatch/trunk/router/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/router/CMakeLists.txt Thu Oct 24 21:53:15 2013
@@ -18,7 +18,7 @@
##
-set(DEFAULT_CONFIG_PATH "/etc/qpid/qpid-dispatch.conf" CACHE string "Default Config File Path")
+set(DEFAULT_CONFIG_PATH "/etc/qpid/qpid-dxrouter.conf" CACHE string "Default Config File Path")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
@@ -31,8 +31,8 @@ set(router_SOURCES
src/main.c
)
-add_executable(dispatch-router ${router_SOURCES})
-target_link_libraries(dispatch-router qpid-dispatch ${proton_lib})
+add_executable(qpid-dxrouterd ${router_SOURCES})
+target_link_libraries(qpid-dxrouterd qpid-dispatch ${proton_lib})
-install(TARGETS dispatch-router RUNTIME DESTINATION bin)
+install(TARGETS qpid-dxrouterd RUNTIME DESTINATION bin)
Modified: qpid/dispatch/trunk/tools/src/py/qdstat
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tools/src/py/qdstat?rev=1535571&r1=1535570&r2=1535571&view=diff
==============================================================================
--- qpid/dispatch/trunk/tools/src/py/qdstat (original)
+++ qpid/dispatch/trunk/tools/src/py/qdstat Thu Oct 24 21:53:15 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 qdtoollibs import Display, Header, Sorter, YN, Commas, TimeLong
+from qpid.dispatch.qdtoollibs 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