removed old python examples

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

18 files changed, 4 insertions, 292 deletions

diff --git a/cpp/examples/README.verify b/cpp/examples/README.verify
index 6d9d67bd42..e1370764c9 100644
--- a/cpp/examples/README.verify
+++ b/cpp/examples/README.verify
@@ -22,14 +22,12 @@ For more information read examples/README.
 
 == The Verify All Script ==
 
-The verify_all script will run C++ examples against itself and against the
-Python examples. The success of the script is determined by comparing its output
+The verify_all script will run each C++ example and compare its output
 against what is expected.
 
 === Arguments ===
 
-The verify_all script expects the path to Qpid trunk as an argument, in order to
-setup the environment for Python examples.
+The verify_all script expects the path to Qpid trunk as an argument.
 
 == The Verify Script ==
 
diff --git a/cpp/examples/direct/verify_cpp_python b/cpp/examples/direct/verify_cpp_python
deleted file mode 100644
index 4dc445ba27..0000000000
--- a/cpp/examples/direct/verify_cpp_python
+++ /dev/null
@@ -1,4 +0,0 @@
-# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify
-py=$PYTHON_EXAMPLES/direct
-clients ./declare_queues ./direct_producer $py/direct_consumer.py
-outputs  ./declare_queues.out ./direct_producer.out $py/direct_consumer.py.out
diff --git a/cpp/examples/direct/verify_cpp_python.in b/cpp/examples/direct/verify_cpp_python.in
deleted file mode 100644
index 1a329be59a..0000000000
--- a/cpp/examples/direct/verify_cpp_python.in
+++ /dev/null
@@ -1,14 +0,0 @@
-==== declare_queues.out
-==== direct_producer.out
-==== direct_consumer.py.out
-Message 0
-Message 1
-Message 2
-Message 3
-Message 4
-Message 5
-Message 6
-Message 7
-Message 8
-Message 9
-That's all, folks!
diff --git a/cpp/examples/direct/verify_python_cpp b/cpp/examples/direct/verify_python_cpp
deleted file mode 100644
index fe4893e120..0000000000
--- a/cpp/examples/direct/verify_python_cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
-py=$PYTHON_EXAMPLES/direct
-clients $py/declare_queues.py $py/direct_producer.py  ./listener
-outputs $py/declare_queues.py.out $py/direct_producer.py.out ./listener.out
-
diff --git a/cpp/examples/direct/verify_python_cpp.in b/cpp/examples/direct/verify_python_cpp.in
deleted file mode 100644
index 6f35255b18..0000000000
--- a/cpp/examples/direct/verify_python_cpp.in
+++ /dev/null
@@ -1,15 +0,0 @@
-==== declare_queues.py.out
-==== direct_producer.py.out
-==== listener.out
-Message: message 0
-Message: message 1
-Message: message 2
-Message: message 3
-Message: message 4
-Message: message 5
-Message: message 6
-Message: message 7
-Message: message 8
-Message: message 9
-Message: That's all, folks!
-Shutting down listener for message_queue
diff --git a/cpp/examples/fanout/verify_cpp_python b/cpp/examples/fanout/verify_cpp_python
deleted file mode 100644
index 6a1ba7ad7d..0000000000
--- a/cpp/examples/fanout/verify_cpp_python
+++ /dev/null
@@ -1,7 +0,0 @@
-# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
-py=$PYTHON_EXAMPLES/fanout
-background "Subscribed"  $py/fanout_consumer.py
-background "Subscribed"  $py/fanout_consumer.py
-clients ./fanout_producer
-outputs ./fanout_producer.out "$py/fanout_consumer.py.out | remove_uuid" "$py/fanout_consumer.pyX.out | remove_uuid"
-
diff --git a/cpp/examples/fanout/verify_cpp_python.in b/cpp/examples/fanout/verify_cpp_python.in
deleted file mode 100644
index 21bafe06de..0000000000
--- a/cpp/examples/fanout/verify_cpp_python.in
+++ /dev/null
@@ -1,27 +0,0 @@
-==== fanout_producer.out
-==== fanout_consumer.py.out | remove_uuid
-Subscribed to queue 
-Message 0
-Message 1
-Message 2
-Message 3
-Message 4
-Message 5
-Message 6
-Message 7
-Message 8
-Message 9
-That's all, folks!
-==== fanout_consumer.pyX.out | remove_uuid
-Subscribed to queue 
-Message 0
-Message 1
-Message 2
-Message 3
-Message 4
-Message 5
-Message 6
-Message 7
-Message 8
-Message 9
-That's all, folks!
diff --git a/cpp/examples/fanout/verify_python_cpp b/cpp/examples/fanout/verify_python_cpp
deleted file mode 100644
index d9b3361523..0000000000
--- a/cpp/examples/fanout/verify_python_cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
-py=$PYTHON_EXAMPLES/fanout
-background "Listening" ./listener
-background "Listening" ./listener
-clients $py/fanout_producer.py
-outputs $py/fanout_producer.py.out "./listener.out | remove_uuid" "./listenerX.out | remove_uuid"
-
diff --git a/cpp/examples/fanout/verify_python_cpp.in b/cpp/examples/fanout/verify_python_cpp.in
deleted file mode 100644
index 8f9e959053..0000000000
--- a/cpp/examples/fanout/verify_python_cpp.in
+++ /dev/null
@@ -1,29 +0,0 @@
-==== fanout_producer.py.out
-==== listener.out | remove_uuid
-Listening
-Message: message 0
-Message: message 1
-Message: message 2
-Message: message 3
-Message: message 4
-Message: message 5
-Message: message 6
-Message: message 7
-Message: message 8
-Message: message 9
-Message: That's all, folks!
-Shutting down listener for 
-==== listenerX.out | remove_uuid
-Listening
-Message: message 0
-Message: message 1
-Message: message 2
-Message: message 3
-Message: message 4
-Message: message 5
-Message: message 6
-Message: message 7
-Message: message 8
-Message: message 9
-Message: That's all, folks!
-Shutting down listener for 
diff --git a/cpp/examples/pub-sub/verify_cpp_python b/cpp/examples/pub-sub/verify_cpp_python
deleted file mode 100644
index f6c6850981..0000000000
--- a/cpp/examples/pub-sub/verify_cpp_python
+++ /dev/null
@@ -1,6 +0,0 @@
-# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
-py=$PYTHON_EXAMPLES/pubsub
-background "Queues created" $py/topic_subscriber.py
-clients ./topic_publisher
-outputs ./topic_publisher.out "$py/topic_subscriber.py.out | remove_uuid | sort"
-
diff --git a/cpp/examples/pub-sub/verify_cpp_python.in b/cpp/examples/pub-sub/verify_cpp_python.in
deleted file mode 100644
index 951d9ad9dd..0000000000
--- a/cpp/examples/pub-sub/verify_cpp_python.in
+++ /dev/null
@@ -1,55 +0,0 @@
-==== topic_publisher.out
-==== topic_subscriber.py.out | remove_uuid | sort
-Message 0
-Message 0
-Message 0
-Message 0
-Message 0
-Message 0
-Message 0
-Message 0
-Message 1
-Message 1
-Message 1
-Message 1
-Message 1
-Message 1
-Message 1
-Message 1
-Message 2
-Message 2
-Message 2
-Message 2
-Message 2
-Message 2
-Message 2
-Message 2
-Message 3
-Message 3
-Message 3
-Message 3
-Message 3
-Message 3
-Message 3
-Message 3
-Message 4
-Message 4
-Message 4
-Message 4
-Message 4
-Message 4
-Message 4
-Message 4
-Messages on 'europe' queue:
-Messages on 'news' queue:
-Messages on 'usa' queue:
-Messages on 'weather' queue:
-Queues created - please start the topic producer
-Subscribing local queue 'local_europe' to europe-'
-Subscribing local queue 'local_news' to news-'
-Subscribing local queue 'local_usa' to usa-'
-Subscribing local queue 'local_weather' to weather-'
-That's all, folks!
-That's all, folks!
-That's all, folks!
-That's all, folks!
diff --git a/cpp/examples/pub-sub/verify_python_cpp b/cpp/examples/pub-sub/verify_python_cpp
deleted file mode 100644
index 2ddaad58c2..0000000000
--- a/cpp/examples/pub-sub/verify_python_cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
-py=$PYTHON_EXAMPLES/pubsub
-background "Listening" ./topic_listener
-clients $py/topic_publisher.py
-outputs $py/topic_publisher.py.out "topic_listener.out | remove_uuid | sort"
-
diff --git a/cpp/examples/pub-sub/verify_python_cpp.in b/cpp/examples/pub-sub/verify_python_cpp.in
deleted file mode 100644
index f2871eb743..0000000000
--- a/cpp/examples/pub-sub/verify_python_cpp.in
+++ /dev/null
@@ -1,59 +0,0 @@
-==== topic_publisher.py.out
-==== topic_listener.out | remove_uuid | sort
-Declaring queue: europe
-Declaring queue: news
-Declaring queue: usa
-Declaring queue: weather
-Listening for messages ...
-Message: That's all, folks! from europe
-Message: That's all, folks! from news
-Message: That's all, folks! from usa
-Message: That's all, folks! from weather
-Message: europe.news 0 from europe
-Message: europe.news 0 from news
-Message: europe.news 1 from europe
-Message: europe.news 1 from news
-Message: europe.news 2 from europe
-Message: europe.news 2 from news
-Message: europe.news 3 from europe
-Message: europe.news 3 from news
-Message: europe.news 4 from europe
-Message: europe.news 4 from news
-Message: europe.weather 0 from europe
-Message: europe.weather 0 from weather
-Message: europe.weather 1 from europe
-Message: europe.weather 1 from weather
-Message: europe.weather 2 from europe
-Message: europe.weather 2 from weather
-Message: europe.weather 3 from europe
-Message: europe.weather 3 from weather
-Message: europe.weather 4 from europe
-Message: europe.weather 4 from weather
-Message: usa.news 0 from news
-Message: usa.news 0 from usa
-Message: usa.news 1 from news
-Message: usa.news 1 from usa
-Message: usa.news 2 from news
-Message: usa.news 2 from usa
-Message: usa.news 3 from news
-Message: usa.news 3 from usa
-Message: usa.news 4 from news
-Message: usa.news 4 from usa
-Message: usa.weather 0 from usa
-Message: usa.weather 0 from weather
-Message: usa.weather 1 from usa
-Message: usa.weather 1 from weather
-Message: usa.weather 2 from usa
-Message: usa.weather 2 from weather
-Message: usa.weather 3 from usa
-Message: usa.weather 3 from weather
-Message: usa.weather 4 from usa
-Message: usa.weather 4 from weather
-Shutting down listener for europe
-Shutting down listener for news
-Shutting down listener for usa
-Shutting down listener for weather
-Subscribing to queue europe
-Subscribing to queue news
-Subscribing to queue usa
-Subscribing to queue weather
diff --git a/cpp/examples/request-response/verify_cpp_python b/cpp/examples/request-response/verify_cpp_python
deleted file mode 100644
index 867af3a92b..0000000000
--- a/cpp/examples/request-response/verify_cpp_python
+++ /dev/null
@@ -1,6 +0,0 @@
-# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
-background "Request server running" $PYTHON_EXAMPLES/request-response/server.py
-clients ./client
-sleep 1
-kill %% 			# Must kill the server.
-outputs "./client.out | remove_uuid" "$PYTHON_EXAMPLES/request-response/server.py.out | remove_uuid"
diff --git a/cpp/examples/request-response/verify_cpp_python.in b/cpp/examples/request-response/verify_cpp_python.in
deleted file mode 100644
index a032293d9b..0000000000
--- a/cpp/examples/request-response/verify_cpp_python.in
+++ /dev/null
@@ -1,15 +0,0 @@
-==== client.out | remove_uuid
-Activating response queue listener for: client
-Request: Twas brillig, and the slithy toves
-Request: Did gire and gymble in the wabe.
-Request: All mimsy were the borogroves,
-Request: And the mome raths outgrabe.
-Waiting for all responses to arrive ...
-Response: TWAS BRILLIG, AND THE SLITHY TOVES
-Response: DID GIRE AND GYMBLE IN THE WABE.
-Response: ALL MIMSY WERE THE BOROGROVES,
-Response: AND THE MOME RATHS OUTGRABE.
-Shutting down listener for client
-==== server.py.out | remove_uuid
-Request server running - run your client now.
-(Times out after 100 seconds ...)
diff --git a/cpp/examples/request-response/verify_python_cpp b/cpp/examples/request-response/verify_python_cpp
deleted file mode 100644
index d6f0fa7152..0000000000
--- a/cpp/examples/request-response/verify_python_cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-# See https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid/bin/verify 
-background "Waiting" ./server
-clients $PYTHON_EXAMPLES/request-response/client.py
-kill %% 			# Must kill the server.
-outputs "$PYTHON_EXAMPLES/request-response/client.py.out | remove_uuid" "server.out | remove_uuid"
diff --git a/cpp/examples/request-response/verify_python_cpp.in b/cpp/examples/request-response/verify_python_cpp.in
deleted file mode 100644
index 1500134619..0000000000
--- a/cpp/examples/request-response/verify_python_cpp.in
+++ /dev/null
@@ -1,18 +0,0 @@
-==== client.py.out | remove_uuid
-Request: Twas brillig, and the slithy toves
-Request: Did gyre and gimble in the wabe.
-Request: All mimsy were the borogroves,
-Request: And the mome raths outgrabe.
-Messages on queue: reply_to:
-Response: TWAS BRILLIG, AND THE SLITHY TOVES
-Response: DID GYRE AND GIMBLE IN THE WABE.
-Response: ALL MIMSY WERE THE BOROGROVES,
-Response: AND THE MOME RATHS OUTGRABE.
-No more messages!
-==== server.out | remove_uuid
-Activating request queue listener for: request
-Waiting for requests
-Request: Twas brillig, and the slithy toves  (reply_to:)
-Request: Did gyre and gimble in the wabe.  (reply_to:)
-Request: All mimsy were the borogroves,  (reply_to:)
-Request: And the mome raths outgrabe.  (reply_to:)
diff --git a/cpp/examples/verify_all b/cpp/examples/verify_all
index 9d71c7498a..cb4c5283fa 100755
--- a/cpp/examples/verify_all
+++ b/cpp/examples/verify_all
@@ -19,8 +19,7 @@
 # under the License.
 #
 
-# Verify all C++/python example combinations.
-#
+# Verify all examples
 
 verify=`dirname $0`/verify
 topsrcdir=$1
@@ -28,20 +27,13 @@ topbuilddir=$2
 qpidd=$topbuilddir/src/qpidd
 broker_args=$3
 exclude_regexp=$4
-python=${QPID_PYTHON_DIR:-$topsrcdir/python}
 
 trap "$qpidd -q" exit
 QPID_PORT=`$qpidd -dp0 $broker_args` || { echo "Can't run qpidd" ; exit 1; }
-PYTHON_EXAMPLES=$python/examples
-PYTHONPATH=$python:$PYTHONPATH
-export QPID_PORT PYTHON_EXAMPLES PYTHONPATH
+export QPID_PORT
 
-test -d $PYTHON_EXAMPLES || echo "WARNING: No python examples. $PYTHON_EXAMPLES not found."
 find="find $topsrcdir/cpp/examples"
-test -d $PYTHON_EXAMPLES && find="$find $PYTHON_EXAMPLES"
 find="$find -mindepth 2 -name verify"
-test -d $PYTHON_EXAMPLES && \
-    find="$find -o -name verify_cpp_python -o -name verify_python_cpp"
 all_examples=`$find`
 
 if test -z "$exclude_regexp"; then