You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2010/02/14 15:59:26 UTC
svn commit: r910016 - in /qpid/trunk/qpid: cpp/bindings/qmf/tests/
cpp/src/tests/ extras/qmf/ extras/qmf/src/ extras/qmf/src/py/
extras/qmf/src/py/qmf/ extras/qmf/src/py/qmf2/ python/ python/commands/
python/qmf/ python/qmf2/ tools/ tools/src/ tools/sr...
Author: rhs
Date: Sun Feb 14 14:59:24 2010
New Revision: 910016
URL: http://svn.apache.org/viewvc?rev=910016&view=rev
Log:
moved qpid-* tools out of qpid/python into qpid/tools; moved qmf library into extras/qmf
Added:
qpid/trunk/qpid/extras/qmf/
qpid/trunk/qpid/extras/qmf/setup.py (with props)
qpid/trunk/qpid/extras/qmf/src/
qpid/trunk/qpid/extras/qmf/src/py/
qpid/trunk/qpid/extras/qmf/src/py/qmf/
- copied from r910004, qpid/trunk/qpid/python/qmf/
qpid/trunk/qpid/extras/qmf/src/py/qmf2/
- copied from r910004, qpid/trunk/qpid/python/qmf2/
qpid/trunk/qpid/tools/
qpid/trunk/qpid/tools/setup.py (with props)
qpid/trunk/qpid/tools/src/
qpid/trunk/qpid/tools/src/py/
qpid/trunk/qpid/tools/src/py/qpid-cluster
- copied unchanged from r910004, qpid/trunk/qpid/python/commands/qpid-cluster
qpid/trunk/qpid/tools/src/py/qpid-config
- copied unchanged from r910004, qpid/trunk/qpid/python/commands/qpid-config
qpid/trunk/qpid/tools/src/py/qpid-printevents
- copied unchanged from r910004, qpid/trunk/qpid/python/commands/qpid-printevents
qpid/trunk/qpid/tools/src/py/qpid-queue-stats
- copied unchanged from r910004, qpid/trunk/qpid/python/commands/qpid-queue-stats
qpid/trunk/qpid/tools/src/py/qpid-route
- copied unchanged from r910004, qpid/trunk/qpid/python/commands/qpid-route
qpid/trunk/qpid/tools/src/py/qpid-stat
- copied unchanged from r910004, qpid/trunk/qpid/python/commands/qpid-stat
qpid/trunk/qpid/tools/src/py/qpid-tool
- copied unchanged from r910004, qpid/trunk/qpid/python/commands/qpid-tool
Removed:
qpid/trunk/qpid/python/commands/
qpid/trunk/qpid/python/qmf/
qpid/trunk/qpid/python/qmf2/
Modified:
qpid/trunk/qpid/cpp/bindings/qmf/tests/run_interop_tests
qpid/trunk/qpid/cpp/src/tests/run_cli_tests
qpid/trunk/qpid/cpp/src/tests/test_env.sh.in
qpid/trunk/qpid/python/Makefile
qpid/trunk/qpid/python/setup.py
Modified: qpid/trunk/qpid/cpp/bindings/qmf/tests/run_interop_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qmf/tests/run_interop_tests?rev=910016&r1=910015&r2=910016&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qmf/tests/run_interop_tests (original)
+++ qpid/trunk/qpid/cpp/bindings/qmf/tests/run_interop_tests Sun Feb 14 14:59:24 2010
@@ -24,6 +24,8 @@
QPID_DIR=${MY_DIR}/../../../..
BUILD_DIR=../../..
PYTHON_DIR=${QPID_DIR}/python
+QMF_DIR=${QPID_DIR}/extras/qmf
+QMF_DIR_PY=${QMF_DIR}/src/py
BROKER_DIR=${BUILD_DIR}/src
API_DIR=${BUILD_DIR}/bindings/qmf
SPEC_DIR=${QPID_DIR}/specs
@@ -66,7 +68,7 @@
if test -d ${PYTHON_DIR} ; then
start_broker
echo "Running qmf interop tests using broker on port $BROKER_PORT"
- PYTHONPATH=${PYTHON_DIR}:${MY_DIR}
+ PYTHONPATH=${PYTHON_DIR}:${QMF_DIR_PY}:${MY_DIR}
export PYTHONPATH
if test -d ${PYTHON_LIB_DIR} ; then
Modified: qpid/trunk/qpid/cpp/src/tests/run_cli_tests
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_cli_tests?rev=910016&r1=910015&r2=910016&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_cli_tests (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_cli_tests Sun Feb 14 14:59:24 2010
@@ -70,7 +70,7 @@
if test -d ${PYTHON_DIR} ; then
start_brokers
echo "Running CLI tests using brokers on ports $LOCAL_PORT $REMOTE_PORT"
- $PYTHON_COMMANDS/qpid-python-test -m cli_tests -b localhost:$LOCAL_PORT -Dremote-port=$REMOTE_PORT -Dcli-dir=$CLI_DIR $targs $@
+ $QPID_PYTHON_TEST -m cli_tests -b localhost:$LOCAL_PORT -Dremote-port=$REMOTE_PORT -Dcli-dir=$CLI_DIR $targs $@
RETCODE=$?
stop_brokers
if test x$RETCODE != x0; then
Modified: qpid/trunk/qpid/cpp/src/tests/test_env.sh.in
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/test_env.sh.in?rev=910016&r1=910015&r2=910016&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/test_env.sh.in (original)
+++ qpid/trunk/qpid/cpp/src/tests/test_env.sh.in Sun Feb 14 14:59:24 2010
@@ -36,8 +36,10 @@
fi
export QPID_TESTS=$top_srcdir/../tests
export QPID_TESTS_PY=$QPID_TESTS/src/py
-export PYTHON_COMMANDS=$PYTHON_DIR/commands
-export PYTHONPATH=$srcdir:$PYTHON_DIR:$PYTHON_COMMANDS:$QPID_TESTS_PY:$PYTHONPATH
+export QPID_TOOLS=$top_srcdir/../tools
+export QMF_LIB=$top_srcdir/../extras/qmf/src/py
+export PYTHON_COMMANDS=$QPID_TOOLS/src/py
+export PYTHONPATH=$srcdir:$PYTHON_DIR:$PYTHON_COMMANDS:$QPID_TESTS_PY:$QMF_LIB:$PYTHONPATH
export QPID_CONFIG_EXEC=$PYTHON_COMMANDS/qpid-config
export QPID_ROUTE_EXEC=$PYTHON_COMMANDS/qpid-route
export QPID_CLUSTER_EXEC=$PYTHON_COMMANDS/qpid-cluster
Added: qpid/trunk/qpid/extras/qmf/setup.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/qmf/setup.py?rev=910016&view=auto
==============================================================================
--- qpid/trunk/qpid/extras/qmf/setup.py (added)
+++ qpid/trunk/qpid/extras/qmf/setup.py Sun Feb 14 14:59:24 2010
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+from distutils.core import setup
+
+setup(name="qpid-qmf",
+ version="0.7",
+ packages=["qmf", "qmf2", "qmf2.tests"],
+ package_dir={"": "src/py"},
+ url="http://qpid.apache.org/",
+ license="Apache Software License",
+ description="QMF Library")
Propchange: qpid/trunk/qpid/extras/qmf/setup.py
------------------------------------------------------------------------------
svn:executable = *
Modified: qpid/trunk/qpid/python/Makefile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/Makefile?rev=910016&r1=910015&r2=910016&view=diff
==============================================================================
--- qpid/trunk/qpid/python/Makefile (original)
+++ qpid/trunk/qpid/python/Makefile Sun Feb 14 14:59:24 2010
@@ -31,7 +31,7 @@
AMQP_SPEC_DIR=$(PWD)/$(DATA_DIR)/amqp
endif
-DIRS=qmf qpid mllib examples
+DIRS=qpid mllib examples
SRCS=$(shell find $(DIRS) -name "*.py") qpid_config.py
BUILD=build
TARGETS=$(SRCS:%.py=$(BUILD)/%.py)
@@ -71,12 +71,8 @@
install -pm 0644 $(BUILD)/qpid/tests/*.* $(PYTHON_LIB)/qpid/tests
$(PYCC) $(PYTHON_LIB)/qpid
- install -d $(PYTHON_LIB)/qmf
- install -pm 0644 LICENSE.txt NOTICE.txt qmf/*.* $(PYTHON_LIB)/qmf
- $(PYCC) $(PYTHON_LIB)/qmf
-
install -d $(EXEC_PREFIX)
- install -pm 0755 qpid-python-test commands/* $(EXEC_PREFIX)
+ install -pm 0755 qpid-python-test $(EXEC_PREFIX)
clean:
rm -rf $(BUILD)
Modified: qpid/trunk/qpid/python/setup.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/setup.py?rev=910016&r1=910015&r2=910016&view=diff
==============================================================================
--- qpid/trunk/qpid/python/setup.py (original)
+++ qpid/trunk/qpid/python/setup.py Sun Feb 14 14:59:24 2010
@@ -21,15 +21,8 @@
setup(name="qpid",
version="0.7",
- packages=["mllib", "qpid", "qpid.tests", "qmf", "qmf2", "qmf2.tests"],
- scripts=["qpid-python-test",
- "commands/qpid-cluster",
- "commands/qpid-config",
- "commands/qpid-printevents",
- "commands/qpid-queue-stats",
- "commands/qpid-route",
- "commands/qpid-stat",
- "commands/qpid-tool"],
+ packages=["mllib", "qpid", "qpid.tests"],
+ scripts=["qpid-python-test"],
url="http://qpid.apache.org/",
license="Apache Software License",
description="Python language client implementation for Apache Qpid")
Added: qpid/trunk/qpid/tools/setup.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/setup.py?rev=910016&view=auto
==============================================================================
--- qpid/trunk/qpid/tools/setup.py (added)
+++ qpid/trunk/qpid/tools/setup.py Sun Feb 14 14:59:24 2010
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+from distutils.core import setup
+
+setup(name="qpid-tools",
+ version="0.7",
+ scripts=["src/py/qpid-cluster",
+ "src/py/qpid-config",
+ "src/py/qpid-printevents",
+ "src/py/qpid-queue-stats",
+ "src/py/qpid-route",
+ "src/py/qpid-stat",
+ "src/py/qpid-tool"],
+ url="http://qpid.apache.org/",
+ license="Apache Software License",
+ description="Diagnostic and management tools for Apache Qpid brokers.")
Propchange: qpid/trunk/qpid/tools/setup.py
------------------------------------------------------------------------------
svn:executable = *
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org