QPID-3046 - Removed pure-python qmf2 from dist/install and renamed to qmf2-prototype.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1076376 13f79535-47bb-0310-9956-ffa450edef68

17 files changed, 1 insertions, 1 deletions

diff --git a/qpid/extras/qmf/setup.py b/qpid/extras/qmf/setup.py
index 2e3ec7a38e..2a81055af4 100755
--- a/qpid/extras/qmf/setup.py
+++ b/qpid/extras/qmf/setup.py
@@ -23,7 +23,7 @@ setup(name="qpid-qmf",
       version="0.9",
       author="Apache Qpid",
       author_email="dev@qpid.apache.org",
-      packages=["qmf", "qmf2", "qmf2.tests"],
+      packages=["qmf"],
       package_dir={"": "src/py"},
       url="http://qpid.apache.org/",
       license="Apache Software License",
diff --git a/qpid/extras/qmf/src/py/qmf2/__init__.py b/qpid/extras/qmf/src/py/qmf2-prototype/__init__.py
index 31d5a2ef58..31d5a2ef58 100644
--- a/qpid/extras/qmf/src/py/qmf2/__init__.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/__init__.py
diff --git a/qpid/extras/qmf/src/py/qmf2/agent.py b/qpid/extras/qmf/src/py/qmf2-prototype/agent.py
index 4ec00bd288..4ec00bd288 100644
--- a/qpid/extras/qmf/src/py/qmf2/agent.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/agent.py
diff --git a/qpid/extras/qmf/src/py/qmf2/common.py b/qpid/extras/qmf/src/py/qmf2-prototype/common.py
index 2e5367f54f..2e5367f54f 100644
--- a/qpid/extras/qmf/src/py/qmf2/common.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/common.py
diff --git a/qpid/extras/qmf/src/py/qmf2/console.py b/qpid/extras/qmf/src/py/qmf2-prototype/console.py
index 9227835b3f..9227835b3f 100644
--- a/qpid/extras/qmf/src/py/qmf2/console.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/console.py
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/__init__.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/__init__.py
index eff9357e1f..eff9357e1f 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/__init__.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/__init__.py
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/agent_discovery.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/agent_discovery.py
index 2c20794aaa..2c20794aaa 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/agent_discovery.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/agent_discovery.py
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/agent_test.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/agent_test.py
index 14d8ada197..14d8ada197 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/agent_test.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/agent_test.py
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/async_method.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/async_method.py
index 2339fc71a9..2339fc71a9 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/async_method.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/async_method.py
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/async_query.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/async_query.py
index b1c01611f7..b1c01611f7 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/async_query.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/async_query.py
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/basic_method.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/basic_method.py
index 8d038bc4c8..8d038bc4c8 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/basic_method.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/basic_method.py
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/basic_query.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/basic_query.py
index 9f5dda6d54..9f5dda6d54 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/basic_query.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/basic_query.py
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/console_test.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/console_test.py
index ac0e064f20..ac0e064f20 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/console_test.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/console_test.py
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/events.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/events.py
index 624c9b3823..624c9b3823 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/events.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/events.py
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/multi_response.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/multi_response.py
index 991fa0114e..991fa0114e 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/multi_response.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/multi_response.py
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/obj_gets.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/obj_gets.py
index 695b096973..695b096973 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/obj_gets.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/obj_gets.py
diff --git a/qpid/extras/qmf/src/py/qmf2/tests/subscriptions.py b/qpid/extras/qmf/src/py/qmf2-prototype/tests/subscriptions.py
index 5c39af4b32..5c39af4b32 100644
--- a/qpid/extras/qmf/src/py/qmf2/tests/subscriptions.py
+++ b/qpid/extras/qmf/src/py/qmf2-prototype/tests/subscriptions.py