updated the hello-world script

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

2 files changed, 30 insertions, 75 deletions

diff --git a/python/hello-010-world b/python/hello-010-world
deleted file mode 100755
index a15817cd9d..0000000000
--- a/python/hello-010-world
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-from qpid.connection010 import Connection
-from qpid.spec010 import load
-from qpid.util import connect
-from qpid.datatypes import Message, RangedSet
-from qpid.log import enable, DEBUG, WARN
-
-if "-v" in sys.argv:
-  level = DEBUG
-else:
-  level = WARN
-
-enable("qpid.io.ctl", level)
-enable("qpid.io.cmd", level)
-
-spec = load("../specs/amqp.0-10.xml")
-conn = Connection(connect("0.0.0.0", spec.port), spec)
-conn.start(timeout=10)
-
-ssn = conn.session("my-session", timeout=10)
-
-ssn.queue_declare("asdf")
-
-
-ssn.message_transfer("this", None, None, Message("testing..."))
-props = ssn.delivery_properties(routing_key="asdf")
-ssn.message_transfer("is", None, None, Message(props, "more testing..."))
-ssn.message_transfer("a")
-ssn.message_transfer("test")
-
-m1 = ssn.incoming("this").get(timeout=10)
-print m1
-m2 = ssn.incoming("is").get(timeout=10)
-print m2
-m3 = ssn.incoming("a").get(timeout=10)
-print m3
-m4 = ssn.incoming("test").get(timeout=10)
-print m4
-
-print ssn.sender._completed, ssn.sender.next_id
-ssn.sync(10)
-print ssn.sender.segments
-
-ssn.channel.session_flush(completed=True)
-
-ssn.message_accept(RangedSet(m1.id, m2.id, m3.id, m4.id))
-
-print ssn.queue_query("testing")
-
-ssn.close(timeout=10)
-conn.close(timeout=10)
diff --git a/python/hello-world b/python/hello-world
index 518992409e..cfcaa962d7 100755
--- a/python/hello-world
+++ b/python/hello-world
@@ -1,25 +1,33 @@
 #!/usr/bin/env python
-import qpid
-from qpid.client import Client
-from qpid.content import Content
+from qpid.connection import Connection
+from qpid.util import connect
+from qpid.datatypes import uuid4, Message
 
-client = Client("127.0.0.1", 5672)
-client.start({"LOGIN": "guest", "PASSWORD": "guest"})
-ssn = client.session()
-ssn.open()
-ssn.queue_declare(queue="test")
-ssn.queue_bind(exchange="amq.direct", queue="test", routing_key="test")
-#print ssn.queue_query(queue="test")
-ssn.message_subscribe(queue="test", destination="amq.direct")
-ssn.message_flow("amq.direct", 0, 0xFFFFFFFF)
-ssn.message_flow("amq.direct", 1, 0xFFFFFFFF)
-msg = Content("hello world")
-msg["content_type"] = "text/plain"
-msg["routing_key"] = "test"
-msg["reply_to"] = client.structs.reply_to("asdf", "fdsa")
-msg["application_headers"] = {"x": 1, "y": 2, "z": "zee"}
-ssn.message_transfer(destination="amq.direct", content=msg)
-queue = client.queue("amq.direct")
-msg = queue.get(timeout=10)
-print msg
+# connect to the server and start a session
+conn = Connection(connect("127.0.0.1", 5672))
+conn.start()
+ssn = conn.session(str(uuid4()))
+
+# create a queue
+ssn.queue_declare("test-queue")
+
+# publish a message
+dp = ssn.delivery_properties(routing_key="test-queue")
+mp = ssn.message_properties(content_type="text/plain")
+msg = Message(dp, "Hello World!")
+ssn.message_transfer(message=msg)
+
+# subscribe to a queue
+ssn.message_subscribe(queue="test-queue", destination="messages")
+incoming = ssn.incoming("messages")
+
+# start incoming message flow
+incoming.start()
+
+# grab a message from the queue
+print incoming.get(timeout=10)
+
+# cancel the subscription and close the session and connection
+ssn.message_cancel(destination="messages")
 ssn.close()
+conn.close()