You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2016/04/14 20:06:05 UTC
svn commit: r1739147 [41/44] - in /qpid/site:
input/releases/qpid-proton-master/
input/releases/qpid-proton-master/proton/c/api/
input/releases/qpid-proton-master/proton/c/api/search/
input/releases/qpid-proton-master/proton/cpp/api/ input/releases/qpi...
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_recv.cpp.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_recv.cpp.html.in?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_recv.cpp.html.in (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_recv.cpp.html.in Thu Apr 14 18:05:59 2016
@@ -2,16 +2,19 @@
<h1>simple_recv.cpp</h1>
<div class="highlight"><pre><span></span><span class="cp">#include</span> <span class="cpf">"options.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/connection.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/container.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/event.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/delivery.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/handler.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/link.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/value.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/message_id.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/value.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><iostream></span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><map></span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"fake_cpp11.hpp"</span><span class="cp"></span>
+
<span class="k">class</span> <span class="nc">simple_recv</span> <span class="o">:</span> <span class="k">public</span> <span class="n">proton</span><span class="o">::</span><span class="n">handler</span> <span class="p">{</span>
<span class="k">private</span><span class="o">:</span>
<span class="n">proton</span><span class="o">::</span><span class="n">url</span> <span class="n">url</span><span class="p">;</span>
@@ -22,25 +25,23 @@
<span class="k">public</span><span class="o">:</span>
<span class="n">simple_recv</span><span class="p">(</span><span class="k">const</span> <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="o">&</span><span class="n">s</span><span class="p">,</span> <span class="kt">int</span> <span class="n">c</span><span class="p">)</span> <span class="o">:</span> <span class="n">url</span><span class="p">(</span><span class="n">s</span><span class="p">),</span> <span class="n">expected</span><span class="p">(</span><span class="n">c</span><span class="p">),</span> <span class="n">received</span><span class="p">(</span><span class="mi">0</span><span class="p">)</span> <span class="p">{}</span>
- <span class="kt">void</span> <span class="n">on_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">receiver</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">open_receiver</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
+ <span class="kt">void</span> <span class="n">on_container_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">receiver</span> <span class="o">=</span> <span class="n">c</span><span class="p">.</span><span class="n">open_receiver</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"simple_recv listening on "</span> <span class="o"><<</span> <span class="n">url</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">proton</span><span class="o">::</span><span class="n">message</span><span class="o">&</span> <span class="n">msg</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">();</span>
-
+ <span class="kt">void</span> <span class="n">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">delivery</span> <span class="o">&</span><span class="n">d</span><span class="p">,</span> <span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="o">&</span><span class="n">msg</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="k">if</span> <span class="p">(</span><span class="n">msg</span><span class="p">.</span><span class="n">id</span><span class="p">().</span><span class="n">get</span><span class="o"><</span><span class="kt">uint64_t</span><span class="o">></span><span class="p">()</span> <span class="o"><</span> <span class="n">received</span><span class="p">)</span> <span class="p">{</span>
<span class="k">return</span><span class="p">;</span> <span class="c1">// Ignore duplicate</span>
<span class="p">}</span>
-
+
<span class="k">if</span> <span class="p">(</span><span class="n">expected</span> <span class="o">==</span> <span class="mi">0</span> <span class="o">||</span> <span class="n">received</span> <span class="o"><</span> <span class="n">expected</span><span class="p">)</span> <span class="p">{</span>
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="n">msg</span><span class="p">.</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="n">received</span><span class="o">++</span><span class="p">;</span>
-
+
<span class="k">if</span> <span class="p">(</span><span class="n">received</span> <span class="o">==</span> <span class="n">expected</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">e</span><span class="p">.</span><span class="n">receiver</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
- <span class="n">e</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
+ <span class="n">d</span><span class="p">.</span><span class="n">link</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
+ <span class="n">d</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
<span class="p">}</span>
<span class="p">}</span>
@@ -48,7 +49,7 @@
<span class="kt">int</span> <span class="nf">main</span><span class="p">(</span><span class="kt">int</span> <span class="n">argc</span><span class="p">,</span> <span class="kt">char</span> <span class="o">**</span><span class="n">argv</span><span class="p">)</span> <span class="p">{</span>
<span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">address</span><span class="p">(</span><span class="s">"127.0.0.1:5672/examples"</span><span class="p">);</span>
-
+
<span class="kt">int</span> <span class="n">message_count</span> <span class="o">=</span> <span class="mi">100</span><span class="p">;</span>
<span class="n">options</span> <span class="n">opts</span><span class="p">(</span><span class="n">argc</span><span class="p">,</span> <span class="n">argv</span><span class="p">);</span>
@@ -57,7 +58,7 @@
<span class="k">try</span> <span class="p">{</span>
<span class="n">opts</span><span class="p">.</span><span class="n">parse</span><span class="p">();</span>
-
+
<span class="n">simple_recv</span> <span class="n">recv</span><span class="p">(</span><span class="n">address</span><span class="p">,</span> <span class="n">message_count</span><span class="p">);</span>
<span class="n">proton</span><span class="o">::</span><span class="n">container</span><span class="p">(</span><span class="n">recv</span><span class="p">).</span><span class="n">run</span><span class="p">();</span>
@@ -67,7 +68,7 @@
<span class="p">}</span> <span class="k">catch</span> <span class="p">(</span><span class="k">const</span> <span class="n">std</span><span class="o">::</span><span class="n">exception</span><span class="o">&</span> <span class="n">e</span><span class="p">)</span> <span class="p">{</span>
<span class="n">std</span><span class="o">::</span><span class="n">cerr</span> <span class="o"><<</span> <span class="n">e</span><span class="p">.</span><span class="n">what</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="p">}</span>
-
+
<span class="k">return</span> <span class="mi">1</span><span class="p">;</span>
<span class="p">}</span>
</pre></div>
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_send.cpp
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_send.cpp?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_send.cpp (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_send.cpp Thu Apr 14 18:05:59 2016
@@ -21,15 +21,16 @@
#include "options.hpp"
+#include "proton/connection.hpp"
#include "proton/container.hpp"
-#include "proton/event.hpp"
#include "proton/handler.hpp"
-#include "proton/connection.hpp"
#include "proton/value.hpp"
#include <iostream>
#include <map>
+#include "fake_cpp11.hpp"
+
class simple_send : public proton::handler {
private:
proton::url url;
@@ -41,18 +42,16 @@ class simple_send : public proton::handl
public:
simple_send(const std::string &s, int c) : url(s), sent(0), confirmed(0), total(c) {}
- void on_start(proton::event &e) {
- sender = e.container().open_sender(url);
+ void on_container_start(proton::container &c) override {
+ sender = c.open_sender(url);
}
- void on_sendable(proton::event &e) {
- proton::sender sender = e.sender();
-
+ void on_sendable(proton::sender &sender) override {
while (sender.credit() && sent < total) {
proton::message msg;
std::map<std::string, int> m;
m["sequence"] = sent + 1;
-
+
msg.id(sent + 1);
msg.body(m);
@@ -61,16 +60,16 @@ class simple_send : public proton::handl
}
}
- void on_delivery_accept(proton::event &e) {
+ void on_delivery_accept(proton::delivery &d) override {
confirmed++;
-
+
if (confirmed == total) {
std::cout << "all messages confirmed" << std::endl;
- e.connection().close();
+ d.connection().close();
}
}
- void on_transport_close(proton::event &e) {
+ void on_transport_close(proton::transport &) override {
sent = confirmed;
}
};
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_send.cpp.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_send.cpp.html.in?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_send.cpp.html.in (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/simple_send.cpp.html.in Thu Apr 14 18:05:59 2016
@@ -2,15 +2,16 @@
<h1>simple_send.cpp</h1>
<div class="highlight"><pre><span></span><span class="cp">#include</span> <span class="cpf">"options.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/connection.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/container.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/event.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/handler.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/connection.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/value.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><iostream></span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><map></span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"fake_cpp11.hpp"</span><span class="cp"></span>
+
<span class="k">class</span> <span class="nc">simple_send</span> <span class="o">:</span> <span class="k">public</span> <span class="n">proton</span><span class="o">::</span><span class="n">handler</span> <span class="p">{</span>
<span class="k">private</span><span class="o">:</span>
<span class="n">proton</span><span class="o">::</span><span class="n">url</span> <span class="n">url</span><span class="p">;</span>
@@ -22,18 +23,16 @@
<span class="k">public</span><span class="o">:</span>
<span class="n">simple_send</span><span class="p">(</span><span class="k">const</span> <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="o">&</span><span class="n">s</span><span class="p">,</span> <span class="kt">int</span> <span class="n">c</span><span class="p">)</span> <span class="o">:</span> <span class="n">url</span><span class="p">(</span><span class="n">s</span><span class="p">),</span> <span class="n">sent</span><span class="p">(</span><span class="mi">0</span><span class="p">),</span> <span class="n">confirmed</span><span class="p">(</span><span class="mi">0</span><span class="p">),</span> <span class="n">total</span><span class="p">(</span><span class="n">c</span><span class="p">)</span> <span class="p">{}</span>
- <span class="kt">void</span> <span class="n">on_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">sender</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">open_sender</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
+ <span class="kt">void</span> <span class="n">on_container_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">sender</span> <span class="o">=</span> <span class="n">c</span><span class="p">.</span><span class="n">open_sender</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_sendable</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">proton</span><span class="o">::</span><span class="n">sender</span> <span class="n">sender</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">sender</span><span class="p">();</span>
-
+ <span class="kt">void</span> <span class="n">on_sendable</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">sender</span> <span class="o">&</span><span class="n">sender</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="k">while</span> <span class="p">(</span><span class="n">sender</span><span class="p">.</span><span class="n">credit</span><span class="p">()</span> <span class="o">&&</span> <span class="n">sent</span> <span class="o"><</span> <span class="n">total</span><span class="p">)</span> <span class="p">{</span>
<span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="n">msg</span><span class="p">;</span>
<span class="n">std</span><span class="o">::</span><span class="n">map</span><span class="o"><</span><span class="n">std</span><span class="o">::</span><span class="n">string</span><span class="p">,</span> <span class="kt">int</span><span class="o">></span> <span class="n">m</span><span class="p">;</span>
<span class="n">m</span><span class="p">[</span><span class="s">"sequence"</span><span class="p">]</span> <span class="o">=</span> <span class="n">sent</span> <span class="o">+</span> <span class="mi">1</span><span class="p">;</span>
-
+
<span class="n">msg</span><span class="p">.</span><span class="n">id</span><span class="p">(</span><span class="n">sent</span> <span class="o">+</span> <span class="mi">1</span><span class="p">);</span>
<span class="n">msg</span><span class="p">.</span><span class="n">body</span><span class="p">(</span><span class="n">m</span><span class="p">);</span>
@@ -42,16 +41,16 @@
<span class="p">}</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_delivery_accept</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_delivery_accept</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">delivery</span> <span class="o">&</span><span class="n">d</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="n">confirmed</span><span class="o">++</span><span class="p">;</span>
-
+
<span class="k">if</span> <span class="p">(</span><span class="n">confirmed</span> <span class="o">==</span> <span class="n">total</span><span class="p">)</span> <span class="p">{</span>
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"all messages confirmed"</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
- <span class="n">e</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
+ <span class="n">d</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_transport_close</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_transport_close</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">transport</span> <span class="o">&</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="n">sent</span> <span class="o">=</span> <span class="n">confirmed</span><span class="p">;</span>
<span class="p">}</span>
<span class="p">};</span>
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl.cpp
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl.cpp?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl.cpp (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl.cpp Thu Apr 14 18:05:59 2016
@@ -20,15 +20,17 @@
*/
#include "proton/acceptor.hpp"
+#include "proton/connection_options.hpp"
+#include "proton/connection.hpp"
#include "proton/container.hpp"
-#include "proton/event.hpp"
#include "proton/handler.hpp"
-#include "proton/connection_options.hpp"
-#include "proton/transport.hpp"
#include "proton/ssl.hpp"
+#include "proton/transport.hpp"
#include <iostream>
+#include "fake_cpp11.hpp"
+
using proton::connection_options;
using proton::ssl_client_options;
using proton::ssl_server_options;
@@ -45,14 +47,14 @@ std::string find_CN(const std::string &)
struct server_handler : public proton::handler {
proton::acceptor acceptor;
- void on_connection_open(proton::event &e) {
+ void on_connection_open(proton::connection &c) override {
std::cout << "Inbound server connection connected via SSL. Protocol: " <<
- e.connection().transport().ssl().protocol() << std::endl;
+ c.transport().ssl().protocol() << std::endl;
acceptor.close();
}
- void on_message(proton::event &e) {
- std::cout << e.message().body() << std::endl;
+ void on_message(proton::delivery &d, proton::message &m) override {
+ std::cout << m.body() << std::endl;
}
};
@@ -65,13 +67,13 @@ class hello_world_direct : public proton
public:
hello_world_direct(const proton::url& u) : url(u) {}
- void on_start(proton::event &e) {
+ void on_container_start(proton::container &c) override {
// Configure listener. Details vary by platform.
ssl_certificate server_cert = platform_certificate("tserver", "tserverpw");
ssl_server_options ssl_srv(server_cert);
connection_options server_opts;
server_opts.ssl_server_options(ssl_srv).handler(&s_handler);
- e.container().server_connection_options(server_opts);
+ c.server_connection_options(server_opts);
// Configure client with a Certificate Authority database populated with the server's self signed certificate.
// Since the test certifcate's credentials are unlikely to match this host's name, downgrade the verification
@@ -79,28 +81,28 @@ class hello_world_direct : public proton
connection_options client_opts;
ssl_client_options ssl_cli(platform_CA("tserver"), proton::ssl::VERIFY_PEER);
client_opts.ssl_client_options(ssl_cli);
- e.container().client_connection_options(client_opts);
+ c.client_connection_options(client_opts);
- s_handler.acceptor = e.container().listen(url);
- e.container().open_sender(url);
+ s_handler.acceptor = c.listen(url);
+ c.open_sender(url);
}
- void on_connection_open(proton::event &e) {
- std::string subject = e.connection().transport().ssl().remote_subject();
+ void on_connection_open(proton::connection &c) override {
+ std::string subject = c.transport().ssl().remote_subject();
std::cout << "Outgoing client connection connected via SSL. Server certificate identity " <<
find_CN(subject) << std::endl;
}
- void on_sendable(proton::event &e) {
+ void on_sendable(proton::sender &s) override {
proton::message m;
m.body("Hello World!");
- e.sender().send(m);
- e.sender().close();
+ s.send(m);
+ s.close();
}
- void on_delivery_accept(proton::event &e) {
+ void on_delivery_accept(proton::delivery &d) override {
// All done.
- e.connection().close();
+ d.connection().close();
}
};
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl.cpp.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl.cpp.html.in?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl.cpp.html.in (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl.cpp.html.in Thu Apr 14 18:05:59 2016
@@ -1,15 +1,17 @@
<h1>ssl.cpp</h1>
<div class="highlight"><pre><span></span><span class="cp">#include</span> <span class="cpf">"proton/acceptor.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/connection_options.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/connection.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/container.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/event.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/handler.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/connection_options.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/transport.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/ssl.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/transport.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><iostream></span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"fake_cpp11.hpp"</span><span class="cp"></span>
+
<span class="k">using</span> <span class="n">proton</span><span class="o">::</span><span class="n">connection_options</span><span class="p">;</span>
<span class="k">using</span> <span class="n">proton</span><span class="o">::</span><span class="n">ssl_client_options</span><span class="p">;</span>
<span class="k">using</span> <span class="n">proton</span><span class="o">::</span><span class="n">ssl_server_options</span><span class="p">;</span>
@@ -26,14 +28,14 @@
<span class="k">struct</span> <span class="nl">server_handler</span> <span class="p">:</span> <span class="k">public</span> <span class="n">proton</span><span class="o">::</span><span class="n">handler</span> <span class="p">{</span>
<span class="n">proton</span><span class="o">::</span><span class="n">acceptor</span> <span class="n">acceptor</span><span class="p">;</span>
- <span class="kt">void</span> <span class="nf">on_connection_open</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="nf">on_connection_open</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">connection</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"Inbound server connection connected via SSL. Protocol: "</span> <span class="o"><<</span>
- <span class="n">e</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">transport</span><span class="p">().</span><span class="n">ssl</span><span class="p">().</span><span class="n">protocol</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">transport</span><span class="p">().</span><span class="n">ssl</span><span class="p">().</span><span class="n">protocol</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="n">acceptor</span><span class="p">.</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="nf">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">().</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
+ <span class="kt">void</span> <span class="nf">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">delivery</span> <span class="o">&</span><span class="n">d</span><span class="p">,</span> <span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="o">&</span><span class="n">m</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="n">m</span><span class="p">.</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="p">}</span>
<span class="p">};</span>
@@ -46,13 +48,13 @@
<span class="k">public</span><span class="o">:</span>
<span class="n">hello_world_direct</span><span class="p">(</span><span class="k">const</span> <span class="n">proton</span><span class="o">::</span><span class="n">url</span><span class="o">&</span> <span class="n">u</span><span class="p">)</span> <span class="o">:</span> <span class="n">url</span><span class="p">(</span><span class="n">u</span><span class="p">)</span> <span class="p">{}</span>
- <span class="kt">void</span> <span class="n">on_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_container_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="c1">// Configure listener. Details vary by platform.</span>
<span class="n">ssl_certificate</span> <span class="n">server_cert</span> <span class="o">=</span> <span class="n">platform_certificate</span><span class="p">(</span><span class="s">"tserver"</span><span class="p">,</span> <span class="s">"tserverpw"</span><span class="p">);</span>
<span class="n">ssl_server_options</span> <span class="nf">ssl_srv</span><span class="p">(</span><span class="n">server_cert</span><span class="p">);</span>
<span class="n">connection_options</span> <span class="n">server_opts</span><span class="p">;</span>
<span class="n">server_opts</span><span class="p">.</span><span class="n">ssl_server_options</span><span class="p">(</span><span class="n">ssl_srv</span><span class="p">).</span><span class="n">handler</span><span class="p">(</span><span class="o">&</span><span class="n">s_handler</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">server_connection_options</span><span class="p">(</span><span class="n">server_opts</span><span class="p">);</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">server_connection_options</span><span class="p">(</span><span class="n">server_opts</span><span class="p">);</span>
<span class="c1">// Configure client with a Certificate Authority database populated with the server's self signed certificate.</span>
<span class="c1">// Since the test certifcate's credentials are unlikely to match this host's name, downgrade the verification</span>
@@ -60,28 +62,28 @@
<span class="n">connection_options</span> <span class="n">client_opts</span><span class="p">;</span>
<span class="n">ssl_client_options</span> <span class="nf">ssl_cli</span><span class="p">(</span><span class="n">platform_CA</span><span class="p">(</span><span class="s">"tserver"</span><span class="p">),</span> <span class="n">proton</span><span class="o">::</span><span class="n">ssl</span><span class="o">::</span><span class="n">VERIFY_PEER</span><span class="p">);</span>
<span class="n">client_opts</span><span class="p">.</span><span class="n">ssl_client_options</span><span class="p">(</span><span class="n">ssl_cli</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">client_connection_options</span><span class="p">(</span><span class="n">client_opts</span><span class="p">);</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">client_connection_options</span><span class="p">(</span><span class="n">client_opts</span><span class="p">);</span>
- <span class="n">s_handler</span><span class="p">.</span><span class="n">acceptor</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">listen</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">open_sender</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
+ <span class="n">s_handler</span><span class="p">.</span><span class="n">acceptor</span> <span class="o">=</span> <span class="n">c</span><span class="p">.</span><span class="n">listen</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">open_sender</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_connection_open</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">subject</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">transport</span><span class="p">().</span><span class="n">ssl</span><span class="p">().</span><span class="n">remote_subject</span><span class="p">();</span>
+ <span class="kt">void</span> <span class="n">on_connection_open</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">connection</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">subject</span> <span class="o">=</span> <span class="n">c</span><span class="p">.</span><span class="n">transport</span><span class="p">().</span><span class="n">ssl</span><span class="p">().</span><span class="n">remote_subject</span><span class="p">();</span>
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"Outgoing client connection connected via SSL. Server certificate identity "</span> <span class="o"><<</span>
<span class="n">find_CN</span><span class="p">(</span><span class="n">subject</span><span class="p">)</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_sendable</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_sendable</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">sender</span> <span class="o">&</span><span class="n">s</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="n">m</span><span class="p">;</span>
<span class="n">m</span><span class="p">.</span><span class="n">body</span><span class="p">(</span><span class="s">"Hello World!"</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">sender</span><span class="p">().</span><span class="n">send</span><span class="p">(</span><span class="n">m</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">sender</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
+ <span class="n">s</span><span class="p">.</span><span class="n">send</span><span class="p">(</span><span class="n">m</span><span class="p">);</span>
+ <span class="n">s</span><span class="p">.</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_delivery_accept</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_delivery_accept</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">delivery</span> <span class="o">&</span><span class="n">d</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="c1">// All done.</span>
- <span class="n">e</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
+ <span class="n">d</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
<span class="p">};</span>
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl_client_cert.cpp
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl_client_cert.cpp?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl_client_cert.cpp (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl_client_cert.cpp Thu Apr 14 18:05:59 2016
@@ -20,16 +20,18 @@
*/
#include "proton/acceptor.hpp"
+#include "proton/connection.hpp"
+#include "proton/connection_options.hpp"
#include "proton/container.hpp"
-#include "proton/event.hpp"
#include "proton/handler.hpp"
-#include "proton/connection_options.hpp"
-#include "proton/transport.hpp"
-#include "proton/ssl.hpp"
#include "proton/sasl.hpp"
+#include "proton/ssl.hpp"
+#include "proton/transport.hpp"
#include <iostream>
+#include "fake_cpp11.hpp"
+
using proton::connection_options;
using proton::ssl_client_options;
using proton::ssl_server_options;
@@ -47,22 +49,22 @@ std::string find_CN(const std::string &)
struct server_handler : public proton::handler {
proton::acceptor inbound_listener;
- void on_connection_open(proton::event &e) {
+ void on_connection_open(proton::connection &c) override {
std::cout << "Inbound server connection connected via SSL. Protocol: " <<
- e.connection().transport().ssl().protocol() << std::endl;
- if (e.connection().transport().sasl().outcome() == sasl::OK) {
- std::string subject = e.connection().transport().ssl().remote_subject();
+ c.transport().ssl().protocol() << std::endl;
+ if (c.transport().sasl().outcome() == sasl::OK) {
+ std::string subject = c.transport().ssl().remote_subject();
std::cout << "Inbound client certificate identity " << find_CN(subject) << std::endl;
}
else {
std::cout << "Inbound client authentication failed" <<std::endl;
- e.connection().close();
+ c.close();
}
inbound_listener.close();
}
- void on_message(proton::event &e) {
- std::cout << e.message().body() << std::endl;
+ void on_message(proton::delivery &d, proton::message &m) override {
+ std::cout << m.body() << std::endl;
}
};
@@ -75,7 +77,7 @@ class hello_world_direct : public proton
public:
hello_world_direct(const proton::url& u) : url(u) {}
- void on_start(proton::event &e) {
+ void on_container_start(proton::container &c) override {
// Configure listener. Details vary by platform.
ssl_certificate server_cert = platform_certificate("tserver", "tserverpw");
std::string client_CA = platform_CA("tclient");
@@ -84,7 +86,7 @@ class hello_world_direct : public proton
connection_options server_opts;
server_opts.ssl_server_options(srv_ssl).handler(&s_handler);
server_opts.sasl_allowed_mechs("EXTERNAL");
- e.container().server_connection_options(server_opts);
+ c.server_connection_options(server_opts);
// Configure client.
ssl_certificate client_cert = platform_certificate("tclient", "tclientpw");
@@ -94,28 +96,28 @@ class hello_world_direct : public proton
ssl_client_options ssl_cli(client_cert, server_CA, proton::ssl::VERIFY_PEER);
connection_options client_opts;
client_opts.ssl_client_options(ssl_cli).sasl_allowed_mechs("EXTERNAL");
- e.container().client_connection_options(client_opts);
+ c.client_connection_options(client_opts);
- s_handler.inbound_listener = e.container().listen(url);
- e.container().open_sender(url);
+ s_handler.inbound_listener = c.listen(url);
+ c.open_sender(url);
}
- void on_connection_open(proton::event &e) {
- std::string subject = e.connection().transport().ssl().remote_subject();
+ void on_connection_open(proton::connection &c) override {
+ std::string subject = c.transport().ssl().remote_subject();
std::cout << "Outgoing client connection connected via SSL. Server certificate identity " <<
find_CN(subject) << std::endl;
}
- void on_sendable(proton::event &e) {
+ void on_sendable(proton::sender &s) override {
proton::message m;
m.body("Hello World!");
- e.sender().send(m);
- e.sender().close();
+ s.send(m);
+ s.close();
}
- void on_delivery_accept(proton::event &e) {
+ void on_delivery_accept(proton::delivery &d) override {
// All done.
- e.connection().close();
+ d.connection().close();
}
};
Modified: qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl_client_cert.cpp.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl_client_cert.cpp.html.in?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl_client_cert.cpp.html.in (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/cpp/examples/ssl_client_cert.cpp.html.in Thu Apr 14 18:05:59 2016
@@ -1,16 +1,18 @@
<h1>ssl_client_cert.cpp</h1>
<div class="highlight"><pre><span></span><span class="cp">#include</span> <span class="cpf">"proton/acceptor.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/connection.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/connection_options.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/container.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/event.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/handler.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/connection_options.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/transport.hpp"</span><span class="cp"></span>
-<span class="cp">#include</span> <span class="cpf">"proton/ssl.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf">"proton/sasl.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/ssl.hpp"</span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"proton/transport.hpp"</span><span class="cp"></span>
<span class="cp">#include</span> <span class="cpf"><iostream></span><span class="cp"></span>
+<span class="cp">#include</span> <span class="cpf">"fake_cpp11.hpp"</span><span class="cp"></span>
+
<span class="k">using</span> <span class="n">proton</span><span class="o">::</span><span class="n">connection_options</span><span class="p">;</span>
<span class="k">using</span> <span class="n">proton</span><span class="o">::</span><span class="n">ssl_client_options</span><span class="p">;</span>
<span class="k">using</span> <span class="n">proton</span><span class="o">::</span><span class="n">ssl_server_options</span><span class="p">;</span>
@@ -28,22 +30,22 @@
<span class="k">struct</span> <span class="nl">server_handler</span> <span class="p">:</span> <span class="k">public</span> <span class="n">proton</span><span class="o">::</span><span class="n">handler</span> <span class="p">{</span>
<span class="n">proton</span><span class="o">::</span><span class="n">acceptor</span> <span class="n">inbound_listener</span><span class="p">;</span>
- <span class="kt">void</span> <span class="nf">on_connection_open</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="nf">on_connection_open</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">connection</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"Inbound server connection connected via SSL. Protocol: "</span> <span class="o"><<</span>
- <span class="n">e</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">transport</span><span class="p">().</span><span class="n">ssl</span><span class="p">().</span><span class="n">protocol</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
- <span class="k">if</span> <span class="p">(</span><span class="n">e</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">transport</span><span class="p">().</span><span class="n">sasl</span><span class="p">().</span><span class="n">outcome</span><span class="p">()</span> <span class="o">==</span> <span class="n">sasl</span><span class="o">::</span><span class="n">OK</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">subject</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">transport</span><span class="p">().</span><span class="n">ssl</span><span class="p">().</span><span class="n">remote_subject</span><span class="p">();</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">transport</span><span class="p">().</span><span class="n">ssl</span><span class="p">().</span><span class="n">protocol</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
+ <span class="k">if</span> <span class="p">(</span><span class="n">c</span><span class="p">.</span><span class="n">transport</span><span class="p">().</span><span class="n">sasl</span><span class="p">().</span><span class="n">outcome</span><span class="p">()</span> <span class="o">==</span> <span class="n">sasl</span><span class="o">::</span><span class="n">OK</span><span class="p">)</span> <span class="p">{</span>
+ <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">subject</span> <span class="o">=</span> <span class="n">c</span><span class="p">.</span><span class="n">transport</span><span class="p">().</span><span class="n">ssl</span><span class="p">().</span><span class="n">remote_subject</span><span class="p">();</span>
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"Inbound client certificate identity "</span> <span class="o"><<</span> <span class="n">find_CN</span><span class="p">(</span><span class="n">subject</span><span class="p">)</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="p">}</span>
<span class="k">else</span> <span class="p">{</span>
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"Inbound client authentication failed"</span> <span class="o"><<</span><span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
- <span class="n">e</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
<span class="n">inbound_listener</span><span class="p">.</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="nf">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="n">e</span><span class="p">.</span><span class="n">message</span><span class="p">().</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
+ <span class="kt">void</span> <span class="nf">on_message</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">delivery</span> <span class="o">&</span><span class="n">d</span><span class="p">,</span> <span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="o">&</span><span class="n">m</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="n">m</span><span class="p">.</span><span class="n">body</span><span class="p">()</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="p">}</span>
<span class="p">};</span>
@@ -56,7 +58,7 @@
<span class="k">public</span><span class="o">:</span>
<span class="n">hello_world_direct</span><span class="p">(</span><span class="k">const</span> <span class="n">proton</span><span class="o">::</span><span class="n">url</span><span class="o">&</span> <span class="n">u</span><span class="p">)</span> <span class="o">:</span> <span class="n">url</span><span class="p">(</span><span class="n">u</span><span class="p">)</span> <span class="p">{}</span>
- <span class="kt">void</span> <span class="n">on_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_container_start</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">container</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="c1">// Configure listener. Details vary by platform.</span>
<span class="n">ssl_certificate</span> <span class="n">server_cert</span> <span class="o">=</span> <span class="n">platform_certificate</span><span class="p">(</span><span class="s">"tserver"</span><span class="p">,</span> <span class="s">"tserverpw"</span><span class="p">);</span>
<span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">client_CA</span> <span class="o">=</span> <span class="n">platform_CA</span><span class="p">(</span><span class="s">"tclient"</span><span class="p">);</span>
@@ -65,7 +67,7 @@
<span class="n">connection_options</span> <span class="n">server_opts</span><span class="p">;</span>
<span class="n">server_opts</span><span class="p">.</span><span class="n">ssl_server_options</span><span class="p">(</span><span class="n">srv_ssl</span><span class="p">).</span><span class="n">handler</span><span class="p">(</span><span class="o">&</span><span class="n">s_handler</span><span class="p">);</span>
<span class="n">server_opts</span><span class="p">.</span><span class="n">sasl_allowed_mechs</span><span class="p">(</span><span class="s">"EXTERNAL"</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">server_connection_options</span><span class="p">(</span><span class="n">server_opts</span><span class="p">);</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">server_connection_options</span><span class="p">(</span><span class="n">server_opts</span><span class="p">);</span>
<span class="c1">// Configure client.</span>
<span class="n">ssl_certificate</span> <span class="n">client_cert</span> <span class="o">=</span> <span class="n">platform_certificate</span><span class="p">(</span><span class="s">"tclient"</span><span class="p">,</span> <span class="s">"tclientpw"</span><span class="p">);</span>
@@ -75,28 +77,28 @@
<span class="n">ssl_client_options</span> <span class="nf">ssl_cli</span><span class="p">(</span><span class="n">client_cert</span><span class="p">,</span> <span class="n">server_CA</span><span class="p">,</span> <span class="n">proton</span><span class="o">::</span><span class="n">ssl</span><span class="o">::</span><span class="n">VERIFY_PEER</span><span class="p">);</span>
<span class="n">connection_options</span> <span class="n">client_opts</span><span class="p">;</span>
<span class="n">client_opts</span><span class="p">.</span><span class="n">ssl_client_options</span><span class="p">(</span><span class="n">ssl_cli</span><span class="p">).</span><span class="n">sasl_allowed_mechs</span><span class="p">(</span><span class="s">"EXTERNAL"</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">client_connection_options</span><span class="p">(</span><span class="n">client_opts</span><span class="p">);</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">client_connection_options</span><span class="p">(</span><span class="n">client_opts</span><span class="p">);</span>
- <span class="n">s_handler</span><span class="p">.</span><span class="n">inbound_listener</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">listen</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">container</span><span class="p">().</span><span class="n">open_sender</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
+ <span class="n">s_handler</span><span class="p">.</span><span class="n">inbound_listener</span> <span class="o">=</span> <span class="n">c</span><span class="p">.</span><span class="n">listen</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
+ <span class="n">c</span><span class="p">.</span><span class="n">open_sender</span><span class="p">(</span><span class="n">url</span><span class="p">);</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_connection_open</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">subject</span> <span class="o">=</span> <span class="n">e</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">transport</span><span class="p">().</span><span class="n">ssl</span><span class="p">().</span><span class="n">remote_subject</span><span class="p">();</span>
+ <span class="kt">void</span> <span class="n">on_connection_open</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">connection</span> <span class="o">&</span><span class="n">c</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
+ <span class="n">std</span><span class="o">::</span><span class="n">string</span> <span class="n">subject</span> <span class="o">=</span> <span class="n">c</span><span class="p">.</span><span class="n">transport</span><span class="p">().</span><span class="n">ssl</span><span class="p">().</span><span class="n">remote_subject</span><span class="p">();</span>
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o"><<</span> <span class="s">"Outgoing client connection connected via SSL. Server certificate identity "</span> <span class="o"><<</span>
<span class="n">find_CN</span><span class="p">(</span><span class="n">subject</span><span class="p">)</span> <span class="o"><<</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_sendable</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_sendable</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">sender</span> <span class="o">&</span><span class="n">s</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="n">proton</span><span class="o">::</span><span class="n">message</span> <span class="n">m</span><span class="p">;</span>
<span class="n">m</span><span class="p">.</span><span class="n">body</span><span class="p">(</span><span class="s">"Hello World!"</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">sender</span><span class="p">().</span><span class="n">send</span><span class="p">(</span><span class="n">m</span><span class="p">);</span>
- <span class="n">e</span><span class="p">.</span><span class="n">sender</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
+ <span class="n">s</span><span class="p">.</span><span class="n">send</span><span class="p">(</span><span class="n">m</span><span class="p">);</span>
+ <span class="n">s</span><span class="p">.</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
- <span class="kt">void</span> <span class="n">on_delivery_accept</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">event</span> <span class="o">&</span><span class="n">e</span><span class="p">)</span> <span class="p">{</span>
+ <span class="kt">void</span> <span class="n">on_delivery_accept</span><span class="p">(</span><span class="n">proton</span><span class="o">::</span><span class="n">delivery</span> <span class="o">&</span><span class="n">d</span><span class="p">)</span> <span class="k">override</span> <span class="p">{</span>
<span class="c1">// All done.</span>
- <span class="n">e</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
+ <span class="n">d</span><span class="p">.</span><span class="n">connection</span><span class="p">().</span><span class="n">close</span><span class="p">();</span>
<span class="p">}</span>
<span class="p">};</span>
Modified: qpid/site/input/releases/qpid-proton-master/proton/java/api/deprecated-list.html
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/java/api/deprecated-list.html?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/java/api/deprecated-list.html (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/java/api/deprecated-list.html Thu Apr 14 18:05:59 2016
@@ -87,16 +87,21 @@
</tr>
<tbody>
<tr class="altColor">
+<td class="colOne"><a href="org/apache/qpid/proton/reactor/Reactor.html#connection-org.apache.qpid.proton.engine.Handler-">org.apache.qpid.proton.reactor.Reactor.connection(Handler)</a>
+<div class="block"><span class="deprecationComment">Use <a href="org/apache/qpid/proton/reactor/Reactor.html#connectionToHost-java.lang.String-int-org.apache.qpid.proton.engine.Handler-"><code>Reactor.connectionToHost(String, int, Handler)</code></a> instead.</span></div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/qpid/proton/engine/Transport.html#input-byte:A-int-int-">org.apache.qpid.proton.engine.Transport.input(byte[], int, int)</a>
<div class="block"><span class="deprecationComment">use <a href="org/apache/qpid/proton/engine/Transport.html#getInputBuffer--"><code>Transport.getInputBuffer()</code></a> and <a href="org/apache/qpid/proton/engine/Transport.html#processInput--"><code>Transport.processInput()</code></a> instead.</span></div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="org/apache/qpid/proton/engine/Transport.html#output-byte:A-int-int-">org.apache.qpid.proton.engine.Transport.output(byte[], int, int)</a>
<div class="block"><span class="deprecationComment">use <a href="org/apache/qpid/proton/engine/Transport.html#getOutputBuffer--"><code>Transport.getOutputBuffer()</code></a> and <a href="org/apache/qpid/proton/engine/Transport.html#outputConsumed--"><code>Transport.outputConsumed()</code></a> instead</span></div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="org/apache/qpid/proton/engine/Link.html#setRemoteSenderSettleMode-org.apache.qpid.proton.amqp.transport.SenderSettleMode-">org.apache.qpid.proton.engine.Link.setRemoteSenderSettleMode(SenderSettleMode)</a></td>
</tr>
</tbody>
Modified: qpid/site/input/releases/qpid-proton-master/proton/java/api/index-all.html
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/java/api/index-all.html?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/java/api/index-all.html (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/java/api/index-all.html Thu Apr 14 18:05:59 2016
@@ -514,7 +514,9 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/reactor/Reactor.html#connection-org.apache.qpid.proton.engine.Handler-">connection(Handler)</a></span> - Method in interface org.apache.qpid.proton.reactor.<a href="org/apache/qpid/proton/reactor/Reactor.html" title="interface in org.apache.qpid.proton.reactor">Reactor</a></dt>
<dd>
-<div class="block">Creates a new out-bound connection.</div>
+<div class="block"><span class="deprecatedLabel">Deprecated.</span>
+<div class="block"><span class="deprecationComment">Use <a href="org/apache/qpid/proton/reactor/Reactor.html#connectionToHost-java.lang.String-int-org.apache.qpid.proton.engine.Handler-"><code>Reactor.connectionToHost(String, int, Handler)</code></a> instead.</span></div>
+</div>
</dd>
<dt><a href="org/apache/qpid/proton/engine/Connection.Factory.html" title="class in org.apache.qpid.proton.engine"><span class="typeNameLink">Connection.Factory</span></a> - Class in <a href="org/apache/qpid/proton/engine/package-summary.html">org.apache.qpid.proton.engine</a></dt>
<dd> </dd>
@@ -531,6 +533,12 @@
Client code outside this module should use <a href="org/apache/qpid/proton/engine/Connection.Factory.html#create--"><code>Connection.Factory.create()</code></a> instead.</span></div>
</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/reactor/impl/ReactorImpl.html#connectionToHost-java.lang.String-int-org.apache.qpid.proton.engine.Handler-">connectionToHost(String, int, Handler)</a></span> - Method in class org.apache.qpid.proton.reactor.impl.<a href="org/apache/qpid/proton/reactor/impl/ReactorImpl.html" title="class in org.apache.qpid.proton.reactor.impl">ReactorImpl</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/reactor/Reactor.html#connectionToHost-java.lang.String-int-org.apache.qpid.proton.engine.Handler-">connectionToHost(String, int, Handler)</a></span> - Method in interface org.apache.qpid.proton.reactor.<a href="org/apache/qpid/proton/reactor/Reactor.html" title="interface in org.apache.qpid.proton.reactor">Reactor</a></dt>
+<dd>
+<div class="block">Creates a new out-bound connection to the given host and port.</div>
+</dd>
<dt><a href="org/apache/qpid/proton/driver/Connector.html" title="interface in org.apache.qpid.proton.driver"><span class="typeNameLink">Connector</span></a><<a href="org/apache/qpid/proton/driver/Connector.html" title="type parameter in Connector">C</a>> - Interface in <a href="org/apache/qpid/proton/driver/package-summary.html">org.apache.qpid.proton.driver</a></dt>
<dd>
<div class="block">Intermediates between a proton engine <a href="org/apache/qpid/proton/engine/Connection.html" title="interface in org.apache.qpid.proton.engine"><code>Connection</code></a> and the I/O
@@ -1582,6 +1590,12 @@
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/engine/Session.html#getConnection--">getConnection()</a></span> - Method in interface org.apache.qpid.proton.engine.<a href="org/apache/qpid/proton/engine/Session.html" title="interface in org.apache.qpid.proton.engine">Session</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/reactor/impl/ReactorImpl.html#getConnectionAddress-org.apache.qpid.proton.engine.Connection-">getConnectionAddress(Connection)</a></span> - Method in class org.apache.qpid.proton.reactor.impl.<a href="org/apache/qpid/proton/reactor/impl/ReactorImpl.html" title="class in org.apache.qpid.proton.reactor.impl">ReactorImpl</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/reactor/Reactor.html#getConnectionAddress-org.apache.qpid.proton.engine.Connection-">getConnectionAddress(Connection)</a></span> - Method in interface org.apache.qpid.proton.reactor.<a href="org/apache/qpid/proton/reactor/Reactor.html" title="interface in org.apache.qpid.proton.reactor">Reactor</a></dt>
+<dd>
+<div class="block">Get the address used by the connection</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/engine/impl/ConnectionImpl.html#getConnectionImpl--">getConnectionImpl()</a></span> - Method in class org.apache.qpid.proton.engine.impl.<a href="org/apache/qpid/proton/engine/impl/ConnectionImpl.html" title="class in org.apache.qpid.proton.engine.impl">ConnectionImpl</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/engine/impl/EndpointImpl.html#getConnectionImpl--">getConnectionImpl()</a></span> - Method in class org.apache.qpid.proton.engine.impl.<a href="org/apache/qpid/proton/engine/impl/EndpointImpl.html" title="class in org.apache.qpid.proton.engine.impl">EndpointImpl</a></dt>
@@ -5342,6 +5356,12 @@
<dd>
<div class="block">Assign the AMQP Connection associated with the connector.</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/reactor/impl/ReactorImpl.html#setConnectionHost-org.apache.qpid.proton.engine.Connection-java.lang.String-int-">setConnectionHost(Connection, String, int)</a></span> - Method in class org.apache.qpid.proton.reactor.impl.<a href="org/apache/qpid/proton/reactor/impl/ReactorImpl.html" title="class in org.apache.qpid.proton.reactor.impl">ReactorImpl</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/reactor/Reactor.html#setConnectionHost-org.apache.qpid.proton.engine.Connection-java.lang.String-int-">setConnectionHost(Connection, String, int)</a></span> - Method in interface org.apache.qpid.proton.reactor.<a href="org/apache/qpid/proton/reactor/Reactor.html" title="interface in org.apache.qpid.proton.reactor">Reactor</a></dt>
+<dd>
+<div class="block">Set the host address used by the connection</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/engine/Connection.html#setContainer-java.lang.String-">setContainer(String)</a></span> - Method in interface org.apache.qpid.proton.engine.<a href="org/apache/qpid/proton/engine/Connection.html" title="interface in org.apache.qpid.proton.engine">Connection</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/engine/impl/ConnectionImpl.html#setContainer-java.lang.String-">setContainer(String)</a></span> - Method in class org.apache.qpid.proton.engine.impl.<a href="org/apache/qpid/proton/engine/impl/ConnectionImpl.html" title="class in org.apache.qpid.proton.engine.impl">ConnectionImpl</a></dt>
@@ -5567,7 +5587,10 @@
<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/amqp/transport/Open.html#setHostname-java.lang.String-">setHostname(String)</a></span> - Method in class org.apache.qpid.proton.amqp.transport.<a href="org/apache/qpid/proton/amqp/transport/Open.html" title="class in org.apache.qpid.proton.amqp.transport">Open</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/engine/Connection.html#setHostname-java.lang.String-">setHostname(String)</a></span> - Method in interface org.apache.qpid.proton.engine.<a href="org/apache/qpid/proton/engine/Connection.html" title="interface in org.apache.qpid.proton.engine">Connection</a></dt>
-<dd> </dd>
+<dd>
+<div class="block">Set the name of the host (either fully qualified or relative) to which
+ this connection is connecting to.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/engine/impl/ConnectionImpl.html#setHostname-java.lang.String-">setHostname(String)</a></span> - Method in class org.apache.qpid.proton.engine.impl.<a href="org/apache/qpid/proton/engine/impl/ConnectionImpl.html" title="class in org.apache.qpid.proton.engine.impl">ConnectionImpl</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/qpid/proton/amqp/transport/Open.html#setIdleTimeOut-org.apache.qpid.proton.amqp.UnsignedInteger-">setIdleTimeOut(UnsignedInteger)</a></span> - Method in class org.apache.qpid.proton.amqp.transport.<a href="org/apache/qpid/proton/amqp/transport/Open.html" title="class in org.apache.qpid.proton.amqp.transport">Open</a></dt>
Modified: qpid/site/input/releases/qpid-proton-master/proton/java/api/org/apache/qpid/proton/engine/Connection.html
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/java/api/org/apache/qpid/proton/engine/Connection.html?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/java/api/org/apache/qpid/proton/engine/Connection.html (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/java/api/org/apache/qpid/proton/engine/Connection.html Thu Apr 14 18:05:59 2016
@@ -245,7 +245,10 @@ extends <a href="../../../../../org/apac
</tr>
<tr id="i18" class="altColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/qpid/proton/engine/Connection.html#setHostname-java.lang.String-">setHostname</a></span>(java.lang.String hostname)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/qpid/proton/engine/Connection.html#setHostname-java.lang.String-">setHostname</a></span>(java.lang.String hostname)</code>
+<div class="block">Set the name of the host (either fully qualified or relative) to which
+ this connection is connecting to.</div>
+</td>
</tr>
<tr id="i19" class="rowColor">
<td class="colFirst"><code>void</code></td>
@@ -385,6 +388,17 @@ extends <a href="../../../../../org/apac
<li class="blockList">
<h4>setHostname</h4>
<pre>void setHostname(java.lang.String hostname)</pre>
+<div class="block">Set the name of the host (either fully qualified or relative) to which
+ this connection is connecting to. This information may be used by the
+ remote peer to determine the correct back-end service to connect the
+ client to. This value will be sent in the Open performative.
+
+ <b>Note that it is illegal to set the hostname to a numeric IP
+ address or include a port number.</b></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>hostname</code> - the RFC1035 compliant host name.</dd>
+</dl>
</li>
</ul>
<a name="getHostname--">
Modified: qpid/site/input/releases/qpid-proton-master/proton/java/api/org/apache/qpid/proton/engine/impl/ConnectionImpl.html
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-proton-master/proton/java/api/org/apache/qpid/proton/engine/impl/ConnectionImpl.html?rev=1739147&r1=1739146&r2=1739147&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-proton-master/proton/java/api/org/apache/qpid/proton/engine/impl/ConnectionImpl.html (original)
+++ qpid/site/input/releases/qpid-proton-master/proton/java/api/org/apache/qpid/proton/engine/impl/ConnectionImpl.html Thu Apr 14 18:05:59 2016
@@ -310,7 +310,10 @@ implements <a href="../../../../../../or
</tr>
<tr id="i25" class="rowColor">
<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/qpid/proton/engine/impl/ConnectionImpl.html#setHostname-java.lang.String-">setHostname</a></span>(java.lang.String hostname)</code> </td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/qpid/proton/engine/impl/ConnectionImpl.html#setHostname-java.lang.String-">setHostname</a></span>(java.lang.String hostname)</code>
+<div class="block">Set the name of the host (either fully qualified or relative) to which
+ this connection is connecting to.</div>
+</td>
</tr>
<tr id="i26" class="altColor">
<td class="colFirst"><code>void</code></td>
@@ -603,9 +606,19 @@ public ConnectionImpl()</pre>
<li class="blockList">
<h4>setHostname</h4>
<pre>public void setHostname(java.lang.String hostname)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../../org/apache/qpid/proton/engine/Connection.html#setHostname-java.lang.String-">Connection</a></code></span></div>
+<div class="block">Set the name of the host (either fully qualified or relative) to which
+ this connection is connecting to. This information may be used by the
+ remote peer to determine the correct back-end service to connect the
+ client to. This value will be sent in the Open performative.
+
+ <b>Note that it is illegal to set the hostname to a numeric IP
+ address or include a port number.</b></div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
<dd><code><a href="../../../../../../org/apache/qpid/proton/engine/Connection.html#setHostname-java.lang.String-">setHostname</a></code> in interface <code><a href="../../../../../../org/apache/qpid/proton/engine/Connection.html" title="interface in org.apache.qpid.proton.engine">Connection</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>hostname</code> - the RFC1035 compliant host name.</dd>
</dl>
</li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org