Author: gsim Date: Fri Oct 10 10:48:20 2014 New Revision: 1630757 URL: http://svn.apache.org/r1630757 Log: rename sender()/receiver() as create_sender()/create_receiver()
Modified: qpid/proton/branches/examples/tutorial/client.py qpid/proton/branches/examples/tutorial/client_http.py qpid/proton/branches/examples/tutorial/db_recv.py qpid/proton/branches/examples/tutorial/db_send.py qpid/proton/branches/examples/tutorial/helloworld.py qpid/proton/branches/examples/tutorial/helloworld_alt.py qpid/proton/branches/examples/tutorial/helloworld_blocking.py qpid/proton/branches/examples/tutorial/helloworld_direct.py qpid/proton/branches/examples/tutorial/helloworld_direct_alt.py qpid/proton/branches/examples/tutorial/helloworld_direct_tornado.py qpid/proton/branches/examples/tutorial/helloworld_simple.py qpid/proton/branches/examples/tutorial/helloworld_simplistic.py qpid/proton/branches/examples/tutorial/helloworld_tornado.py qpid/proton/branches/examples/tutorial/proton_events.py qpid/proton/branches/examples/tutorial/proton_server.py qpid/proton/branches/examples/tutorial/server.py qpid/proton/branches/examples/tutorial/simple_recv.py qpid/proton/branches/examples/tutorial/simple_send.py qpid/proton/branches/examples/tutorial/sync_client.py Modified: qpid/proton/branches/examples/tutorial/client.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/client.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/client.py (original) +++ qpid/proton/branches/examples/tutorial/client.py Fri Oct 10 10:48:20 2014 @@ -25,8 +25,8 @@ class Client(IncomingMessageHandler): def __init__(self, eventloop, host, address, requests): self.eventloop = eventloop self.conn = eventloop.connect(host) - self.sender = self.conn.sender(address) - self.receiver = self.conn.receiver(None, dynamic=True, handler=self) + self.sender = self.conn.create_sender(address) + self.receiver = self.conn.create_receiver(None, dynamic=True, handler=self) self.requests = requests def next_request(self): Modified: qpid/proton/branches/examples/tutorial/client_http.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/client_http.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/client_http.py (original) +++ qpid/proton/branches/examples/tutorial/client_http.py Fri Oct 10 10:48:20 2014 @@ -36,8 +36,8 @@ class ExampleHandler(tornado.web.Request @tornado.web.asynchronous def post(self): self.conn = self.loop.connect("localhost:5672") - self.sender = self.conn.sender("examples") - self.conn.receiver(None, dynamic=True, handler=self) + self.sender = self.conn.create_sender("examples") + self.conn.create_receiver(None, dynamic=True, handler=self) def on_link_open(self, event): req = Message(reply_to=event.link.remote_source.address, body=self.get_body_argument("message")) Modified: qpid/proton/branches/examples/tutorial/db_recv.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/db_recv.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/db_recv.py (original) +++ qpid/proton/branches/examples/tutorial/db_recv.py Fri Oct 10 10:48:20 2014 @@ -31,7 +31,7 @@ class Recv(BaseHandler): # TODO: load last tag from db self.last_id = None self.conn = self.eventloop.connect(self.host, handler=self) - self.conn.receiver(self.address) + self.conn.create_receiver(self.address) def auto_accept(self): return False Modified: qpid/proton/branches/examples/tutorial/db_send.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/db_send.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/db_send.py (original) +++ qpid/proton/branches/examples/tutorial/db_send.py Fri Oct 10 10:48:20 2014 @@ -34,7 +34,7 @@ class Send(BaseHandler): self.records = Queue.Queue(maxsize=50) self.db = Db("src_db", self.eventloop.get_event_trigger()) self.conn = self.eventloop.connect(self.host, handler=self) - self.sender = self.conn.sender(self.address) + self.sender = self.conn.create_sender(self.address) def on_records_loaded(self, event): if self.records.empty() and event.subject == self.sent: Modified: qpid/proton/branches/examples/tutorial/helloworld.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/helloworld.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/helloworld.py (original) +++ qpid/proton/branches/examples/tutorial/helloworld.py Fri Oct 10 10:48:20 2014 @@ -27,8 +27,8 @@ class HelloWorld(proton_events.BaseHandl self.address = address def on_connection_open(self, event): - self.conn.receiver(self.address) - self.conn.sender(self.address) + self.conn.create_receiver(self.address) + self.conn.create_sender(self.address) def on_credit(self, event): event.link.send_msg(Message(body=u"Hello World!")) Modified: qpid/proton/branches/examples/tutorial/helloworld_alt.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/helloworld_alt.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/helloworld_alt.py (original) +++ qpid/proton/branches/examples/tutorial/helloworld_alt.py Fri Oct 10 10:48:20 2014 @@ -38,8 +38,8 @@ class HelloWorld(ErrorHandler): self.address = address def on_connection_open(self, event): - self.conn.receiver(self.address, handler=HelloWorldReceiver()) - self.conn.sender(self.address, handler=HelloWorldSender()) + self.conn.create_receiver(self.address, handler=HelloWorldReceiver()) + self.conn.create_sender(self.address, handler=HelloWorldSender()) def run(self): self.eventloop.run() Modified: qpid/proton/branches/examples/tutorial/helloworld_blocking.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/helloworld_blocking.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/helloworld_blocking.py (original) +++ qpid/proton/branches/examples/tutorial/helloworld_blocking.py Fri Oct 10 10:48:20 2014 @@ -27,8 +27,8 @@ class HelloWorldReceiver(IncomingMessage event.connection.close() conn = BlockingConnection("localhost:5672") -conn.receiver("examples", handler=HelloWorldReceiver()) -sender = conn.sender("examples") +conn.create_receiver("examples", handler=HelloWorldReceiver()) +sender = conn.create_sender("examples") sender.send_msg(Message(body=u"Hello World!")); conn.run() Modified: qpid/proton/branches/examples/tutorial/helloworld_direct.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/helloworld_direct.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/helloworld_direct.py (original) +++ qpid/proton/branches/examples/tutorial/helloworld_direct.py Fri Oct 10 10:48:20 2014 @@ -34,7 +34,7 @@ class HelloWorld(BaseHandler): self.address = address def on_connection_open(self, event): - self.conn.sender(self.address) + self.conn.create_sender(self.address) def on_link_flow(self, event): event.link.send_msg(Message(body=u"Hello World!")) Modified: qpid/proton/branches/examples/tutorial/helloworld_direct_alt.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/helloworld_direct_alt.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/helloworld_direct_alt.py (original) +++ qpid/proton/branches/examples/tutorial/helloworld_direct_alt.py Fri Oct 10 10:48:20 2014 @@ -39,7 +39,7 @@ class HelloWorld(ErrorHandler): self.address = address def on_connection_open(self, event): - self.conn.sender(self.address, handler=HelloWorldSender()) + self.conn.create_sender(self.address, handler=HelloWorldSender()) def on_connection_close(self, event): self.conn.close() Modified: qpid/proton/branches/examples/tutorial/helloworld_direct_tornado.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/helloworld_direct_tornado.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/helloworld_direct_tornado.py (original) +++ qpid/proton/branches/examples/tutorial/helloworld_direct_tornado.py Fri Oct 10 10:48:20 2014 @@ -40,7 +40,7 @@ class HelloWorld(object): self.address = address def on_connection_open(self, event): - self.conn.sender(self.address, handler=HelloWorldSender()) + self.conn.create_sender(self.address, handler=HelloWorldSender()) def on_link_close(self, event): self.closed(event.link.remote_condition) Modified: qpid/proton/branches/examples/tutorial/helloworld_simple.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/helloworld_simple.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/helloworld_simple.py (original) +++ qpid/proton/branches/examples/tutorial/helloworld_simple.py Fri Oct 10 10:48:20 2014 @@ -31,8 +31,8 @@ class HelloWorld(proton_events.BaseHandl event.connection.close() conn = proton_events.connect("localhost:5672", handler=HelloWorld()) -conn.receiver("examples") -conn.sender("examples") +conn.create_receiver("examples") +conn.create_sender("examples") proton_events.run() Modified: qpid/proton/branches/examples/tutorial/helloworld_simplistic.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/helloworld_simplistic.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/helloworld_simplistic.py (original) +++ qpid/proton/branches/examples/tutorial/helloworld_simplistic.py Fri Oct 10 10:48:20 2014 @@ -28,8 +28,8 @@ class HelloWorldReceiver(IncomingMessage eventloop = EventLoop() conn = eventloop.connect("localhost:5672") -conn.receiver("examples", handler=HelloWorldReceiver()) -sender = conn.sender("examples") +conn.create_receiver("examples", handler=HelloWorldReceiver()) +sender = conn.create_sender("examples") sender.send_msg(Message(body=u"Hello World!")); eventloop.run() Modified: qpid/proton/branches/examples/tutorial/helloworld_tornado.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/helloworld_tornado.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/helloworld_tornado.py (original) +++ qpid/proton/branches/examples/tutorial/helloworld_tornado.py Fri Oct 10 10:48:20 2014 @@ -39,11 +39,11 @@ class HelloWorld(object): self.address = address def on_connection_open(self, event): - self.conn.receiver(self.address, handler=HelloWorldReceiver()) + self.conn.create_receiver(self.address, handler=HelloWorldReceiver()) def on_link_open(self, event): if event.link.is_receiver: - self.conn.sender(self.address, handler=HelloWorldSender()) + self.conn.create_sender(self.address, handler=HelloWorldSender()) def on_link_close(self, event): self.closed(event.link.remote_condition) Modified: qpid/proton/branches/examples/tutorial/proton_events.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/proton_events.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/proton_events.py (original) +++ qpid/proton/branches/examples/tutorial/proton_events.py Fri Oct 10 10:48:20 2014 @@ -657,7 +657,7 @@ class MessagingContext(object): handler = property(_get_handler, _set_handler) - def sender(self, target, source=None, name=None, handler=None, tags=None): + def create_sender(self, target, source=None, name=None, handler=None, tags=None): snd = self._get_ssn().sender(name or self._get_id(target, source)) if source: snd.source.address = source @@ -669,7 +669,7 @@ class MessagingContext(object): snd.open() return snd - def receiver(self, source, target=None, name=None, dynamic=False, handler=None): + def create_receiver(self, source, target=None, name=None, dynamic=False, handler=None): rcv = self._get_ssn().receiver(name or self._get_id(source, target)) rcv.source.address = source if dynamic: @@ -681,7 +681,7 @@ class MessagingContext(object): rcv.open() return rcv - def session(self): + def create_session(self): return MessageContext(conn=None, ssn=self._new_ssn()) def close(self): @@ -937,12 +937,12 @@ class BlockingConnection(EventDispatcher self.wait(lambda: not (self.context.conn.state & Endpoint.REMOTE_UNINIT), msg="Opening connection") - def sender(self, address, handler=None): - return BlockingSender(self, self.context.sender(address, handler=handler)) + def create_sender(self, address, handler=None): + return BlockingSender(self, self.context.create_sender(address, handler=handler)) - def receiver(self, address, credit=1, dynamic=False, handler=None): + def create_receiver(self, address, credit=1, dynamic=False, handler=None): return BlockingReceiver( - self, self.context.receiver(address, dynamic=dynamic, handler=handler), credit=credit) + self, self.context.create_receiver(address, dynamic=dynamic, handler=handler), credit=credit) def close(self): self.context.conn.close() Modified: qpid/proton/branches/examples/tutorial/proton_server.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/proton_server.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/proton_server.py (original) +++ qpid/proton/branches/examples/tutorial/proton_server.py Fri Oct 10 10:48:20 2014 @@ -24,7 +24,7 @@ class Server(IncomingMessageHandler): def __init__(self, host, address): self.eventloop = EventLoop(self, FlowController(10)) self.conn = self.eventloop.connect(host) - self.receiver = self.conn.receiver(address) + self.receiver = self.conn.create_receiver(address) self.senders = {} self.relay = None @@ -33,7 +33,7 @@ class Server(IncomingMessageHandler): def on_connection_open(self, event): if "ANONYMOUS-RELAY" in event.connection.remote_offered_capabilities: - self.relay = self.conn.sender(None) + self.relay = self.conn.create_sender(None) def on_connection_close(self, endpoint, error): if error: print "Closed due to %s" % error @@ -47,7 +47,7 @@ class Server(IncomingMessageHandler): if not sender: sender = self.senders.get(reply_to) if not sender: - sender = self.conn.sender(reply_to) + sender = self.conn.create_sender(reply_to) self.senders[reply_to] = sender msg = Message(body=response) if self.relay: Modified: qpid/proton/branches/examples/tutorial/server.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/server.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/server.py (original) +++ qpid/proton/branches/examples/tutorial/server.py Fri Oct 10 10:48:20 2014 @@ -25,7 +25,7 @@ class Server(IncomingMessageHandler): def __init__(self, eventloop, host, address): self.eventloop = eventloop self.conn = eventloop.connect(host, handler=self) - self.receiver = self.conn.receiver(address, handler=self) + self.receiver = self.conn.create_receiver(address, handler=self) self.senders = {} self.relay = None @@ -34,13 +34,13 @@ class Server(IncomingMessageHandler): if not sender: sender = self.senders.get(event.message.reply_to) if not sender: - sender = self.conn.sender(event.message.reply_to) + sender = self.conn.create_sender(event.message.reply_to) self.senders[event.message.reply_to] = sender sender.send_msg(Message(address=event.message.reply_to, body=event.message.body.upper())) def on_connection_open(self, event): if event.connection.remote_offered_capabilities and 'ANONYMOUS-RELAY' in event.connection.remote_offered_capabilities: - self.relay = self.conn.sender(None) + self.relay = self.conn.create_sender(None) def on_connection_close(self, endpoint, error): if error: print "Closed due to %s" % error Modified: qpid/proton/branches/examples/tutorial/simple_recv.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/simple_recv.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/simple_recv.py (original) +++ qpid/proton/branches/examples/tutorial/simple_recv.py Fri Oct 10 10:48:20 2014 @@ -26,7 +26,7 @@ class Recv(proton_events.BaseHandler): try: conn = proton_events.connect("localhost:5672", handler=Recv()) - conn.receiver("examples") + conn.create_receiver("examples") proton_events.run() except KeyboardInterrupt: pass Modified: qpid/proton/branches/examples/tutorial/simple_send.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/simple_send.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/simple_send.py (original) +++ qpid/proton/branches/examples/tutorial/simple_send.py Fri Oct 10 10:48:20 2014 @@ -44,6 +44,6 @@ class Send(proton_events.BaseHandler): try: conn = proton_events.connect("localhost:5672", handler=Send(10000)) - conn.sender("examples") + conn.create_sender("examples") proton_events.run() except KeyboardInterrupt: pass Modified: qpid/proton/branches/examples/tutorial/sync_client.py URL: http://svn.apache.org/viewvc/qpid/proton/branches/examples/tutorial/sync_client.py?rev=1630757&r1=1630756&r2=1630757&view=diff ============================================================================== --- qpid/proton/branches/examples/tutorial/sync_client.py (original) +++ qpid/proton/branches/examples/tutorial/sync_client.py Fri Oct 10 10:48:20 2014 @@ -40,10 +40,10 @@ class SyncRequestClient(IncomingMessageH host:port is used to connect, path is used to identify the remote messaging endpoint. """ self.connection = BlockingConnection(Url(url).defaults(), timeout=timeout) - self.sender = self.connection.sender(url.path) + self.sender = self.connection.create_sender(url.path) # dynamic=true generates a unique address dynamically for this receiver. # credit=1 because we want to receive 1 response message initially. - self.receiver = self.connection.receiver(None, dynamic=True, credit=1, handler=self) + self.receiver = self.connection.create_receiver(None, dynamic=True, credit=1, handler=self) self.response = None def invoke(self, request): --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org