You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by bu...@apache.org on 2012/11/01 11:56:39 UTC
svn commit: r836865 - in /websites/staging/mina/trunk/content: ./ vysper/
Author: buildbot
Date: Thu Nov 1 10:56:38 2012
New Revision: 836865
Log:
Staging update by buildbot for mina
Modified:
websites/staging/mina/trunk/content/ (props changed)
websites/staging/mina/trunk/content/vysper/extension_roadmap.html
websites/staging/mina/trunk/content/vysper/mailing_lists.html
websites/staging/mina/trunk/content/vysper/server_standalone.html
websites/staging/mina/trunk/content/vysper/server_to_server_comm.html
websites/staging/mina/trunk/content/vysper/service_discovery.html
websites/staging/mina/trunk/content/vysper/socks5.html
websites/staging/mina/trunk/content/vysper/sources.html
websites/staging/mina/trunk/content/vysper/standards_supported.html
websites/staging/mina/trunk/content/vysper/test_client.html
websites/staging/mina/trunk/content/vysper/user_mgmt.html
websites/staging/mina/trunk/content/vysper/websocket_endpoint.html
Propchange: websites/staging/mina/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Nov 1 10:56:38 2012
@@ -1 +1 @@
-1404538
+1404539
Modified: websites/staging/mina/trunk/content/vysper/extension_roadmap.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper/extension_roadmap.html (original)
+++ websites/staging/mina/trunk/content/vysper/extension_roadmap.html Thu Nov 1 10:56:38 2012
@@ -109,80 +109,98 @@
<p>If there is anything you want to implement, regardless if it is on this lists or not, please don't hesitate to contact us.
This is not set in stone! It's just there to give some perspective</p>
<h2 id="completed">Completed</h2>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0004.html" class="external-link" rel="nofollow">XEP-0004</A> </TD>
-<TD class="confluenceTd"> Data Forms </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0030.html" class="external-link" rel="nofollow">XEP-0030</A> </TD>
-<TD class="confluenceTd"> <A href="service_discovery.html" title="Service Discovery">Service Discovery</A> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0048.html" class="external-link" rel="nofollow">XEP-0048</A> </TD>
-<TD class="confluenceTd"> Bookmarks </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0049.html" class="external-link" rel="nofollow">XEP-0049</A> </TD>
-<TD class="confluenceTd"> Private XML Storage </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0054.html" class="external-link" rel="nofollow">XEP-0054</A> </TD>
-<TD class="confluenceTd"> vcard-temp </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0090.html" class="external-link" rel="nofollow">XEP-0090</A> </TD>
-<TD class="confluenceTd"> Entity Time (deprecated, see XEP-0202) </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0092.html" class="external-link" rel="nofollow">XEP-0092</A> </TD>
-<TD class="confluenceTd"> Software Version </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0199.html" class="external-link" rel="nofollow">XEP-0199</A> </TD>
-<TD class="confluenceTd"> XMPP Ping </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0202.html" class="external-link" rel="nofollow">XEP-0202</A> </TD>
-<TD class="confluenceTd"> Entity Time </TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0004.html">XEP-0004</a></td>
+<td>Data Forms</td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0030.html">XEP-0030</a></td>
+<td><a href="service_discovery.html">Service Discovery</a></td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0048.html">XEP-0048</a></td>
+<td>Bookmarks</td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0049.html">XEP-0049</a></td>
+<td>Private XML Storage</td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0054.html">XEP-0054</a></td>
+<td>vcard-temp</td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0090.html">XEP-0090</a></td>
+<td>Entity Time (deprecated, see XEP-0202)</td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0092.html">XEP-0092</a></td>
+<td>Software Version</td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0199.html">XEP-0199</a></td>
+<td>XMPP Ping</td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0202.html">XEP-0202</a></td>
+<td>Entity Time</td>
+</tr>
+</tbody>
+</table>
<h2 id="in-development">In development</h2>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TD class="confluenceTd"> <A href="http://ietf.org/rfc/rfc3920.txt" class="external-link" rel="nofollow">RFC3920</A> </TD>
-<TD class="confluenceTd"> in progress, some features missing </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://ietf.org/rfc/rfc3921.txt" class="external-link" rel="nofollow">RFC3921</A> </TD>
-<TD class="confluenceTd"> in progress, major features missing </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0060.html" class="external-link" rel="nofollow">XEP-0060</A> </TD>
-<TD class="confluenceTd"> Publish-Subscribe, fully compliant but not full featured </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0045.html" class="external-link" rel="nofollow">XEP-0045</A></TD>
-<TD class="confluenceTd">Multi-user chat</TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="http://ietf.org/rfc/rfc3920.txt">RFC3920</a></td>
+<td>in progress, some features missing</td>
+</tr>
+<tr>
+<td><a href="http://ietf.org/rfc/rfc3921.txt">RFC3921</a></td>
+<td>in progress, major features missing</td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0060.html">XEP-0060</a></td>
+<td>Publish-Subscribe, fully compliant but not full featured</td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0045.html">XEP-0045</a></td>
+<td>Multi-user chat</td>
+</tr>
+</tbody>
+</table>
<h2 id="upcoming">Upcoming</h2>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0009.html" class="external-link" rel="nofollow">XEP-0009</A> </TD>
-<TD class="confluenceTd"> RPC </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0077.html" class="external-link" rel="nofollow">XEP-0077</A> </TD>
-<TD class="confluenceTd"> In-band Registration </TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0009.html">XEP-0009</a></td>
+<td>RPC</td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0077.html">XEP-0077</a></td>
+<td>In-band Registration</td>
+</tr>
+</tbody>
+</table>
</div><!-- rightColumn -->
<div id="endContent"></div>
Modified: websites/staging/mina/trunk/content/vysper/mailing_lists.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper/mailing_lists.html (original)
+++ websites/staging/mina/trunk/content/vysper/mailing_lists.html Thu Nov 1 10:56:38 2012
@@ -107,69 +107,87 @@
<p>General information about the Vysper mailing lists can be found here.</p>
<h2 id="for-users">For Users</h2>
<p>Please use this list for any questions regarding how to use Vysper.</p>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Subscribe </TH>
-<TD class="confluenceTd"> <A href="mailto:users-subscribe@mina.apache.org" class="external-link" rel="nofollow">users-subscribe@mina.apache.org</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Unsubscribe </TH>
-<TD class="confluenceTd"> <A href="mailto:users-unsubscribe@mina.apache.org" class="external-link" rel="nofollow">users-unsubscribe@mina.apache.org</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Post </TH>
-<TD class="confluenceTd"> <A href="mailto:users@mina.apache.org" class="external-link" rel="nofollow">users@mina.apache.org</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Archive </TH>
-<TD class="confluenceTd"> <A href="http://www.mail-archive.com/users@mina.apache.org/" class="external-link" rel="nofollow">http://www.mail-archive.com/users@mina.apache.org/</A> </TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Subscribe</td>
+<td><a href="mailto:users-subscribe@mina.apache.org">users-subscribe@mina.apache.org</a></td>
+</tr>
+<tr>
+<td>Unsubscribe</td>
+<td><a href="mailto:users-unsubscribe@mina.apache.org">users-unsubscribe@mina.apache.org</a></td>
+</tr>
+<tr>
+<td>Post</td>
+<td><a href="mailto:users@mina.apache.org">users@mina.apache.org</a></td>
+</tr>
+<tr>
+<td>Archive</td>
+<td><a href="http://www.mail-archive.com/users@mina.apache.org/">http://www.mail-archive.com/users@mina.apache.org/</a></td>
+</tr>
+</tbody>
+</table>
<h2 id="for-developers">For Developers</h2>
<p>We use the MINA developers list for asking technical questions, discussing feature suggestions or general questions regarding the project.</p>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Subscribe </TH>
-<TD class="confluenceTd"> <A href="mailto:dev-subscribe@mina.apache.org" class="external-link" rel="nofollow">dev-subscribe@mina.apache.org</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Unsubscribe </TH>
-<TD class="confluenceTd"> <A href="mailto:dev-unsubscribe@mina.apache.org" class="external-link" rel="nofollow">dev-unsubscribe@mina.apache.org</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Post </TH>
-<TD class="confluenceTd"> <A href="mailto:dev@mina.apache.org" class="external-link" rel="nofollow">dev@mina.apache.org</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Archive </TH>
-<TD class="confluenceTd"> <A href="http://www.mail-archive.com/dev@mina.apache.org/" class="external-link" rel="nofollow">http://www.mail-archive.com/dev@mina.apache.org/</A> </TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Subscribe</td>
+<td><a href="mailto:dev-subscribe@mina.apache.org">dev-subscribe@mina.apache.org</a></td>
+</tr>
+<tr>
+<td>Unsubscribe</td>
+<td><a href="mailto:dev-unsubscribe@mina.apache.org">dev-unsubscribe@mina.apache.org</a></td>
+</tr>
+<tr>
+<td>Post</td>
+<td><a href="mailto:dev@mina.apache.org">dev@mina.apache.org</a></td>
+</tr>
+<tr>
+<td>Archive</td>
+<td><a href="http://www.mail-archive.com/dev@mina.apache.org/">http://www.mail-archive.com/dev@mina.apache.org/</a></td>
+</tr>
+</tbody>
+</table>
<h2 id="subversion-commits">Subversion commits</h2>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Subscribe </TH>
-<TD class="confluenceTd"> <A href="mailto:commits-subscribe@mina.apache.org" class="external-link" rel="nofollow">commits-subscribe@mina.apache.org</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Unsubscribe </TH>
-<TD class="confluenceTd"> <A href="mailto:commits-unsubscribe@mina.apache.org" class="external-link" rel="nofollow">commits-unsubscribe@mina.apache.org</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Post </TH>
-<TD class="confluenceTd"> <A href="mailto:commits@mina.apache.org" class="external-link" rel="nofollow">commits@mina.apache.org</A> </TD>
-</TR>
-<TR>
-<TH class="confluenceTh"> Archive </TH>
-<TD class="confluenceTd"> <A href="http://www.mail-archive.com/commits@mina.apache.org/" class="external-link" rel="nofollow">http://www.mail-archive.com/commits@mina.apache.org/</A> </TD>
-</TR>
-</TBODY></TABLE>
-</DIV> </p>
+<table>
+<thead>
+<tr>
+<th></th>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Subscribe</td>
+<td><a href="mailto:commits-subscribe@mina.apache.org">commits-subscribe@mina.apache.org</a></td>
+</tr>
+<tr>
+<td>Unsubscribe</td>
+<td><a href="mailto:commits-unsubscribe@mina.apache.org">commits-unsubscribe@mina.apache.org</a></td>
+</tr>
+<tr>
+<td>Post</td>
+<td><a href="mailto:commits@mina.apache.org">commits@mina.apache.org</a></td>
+</tr>
+<tr>
+<td>Archive</td>
+<td><a href="http://www.mail-archive.com/commits@mina.apache.org/">http://www.mail-archive.com/commits@mina.apache.org/</a></td>
+</tr>
+</tbody>
+</table>
</div><!-- rightColumn -->
<div id="endContent"></div>
Modified: websites/staging/mina/trunk/content/vysper/server_standalone.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper/server_standalone.html (original)
+++ websites/staging/mina/trunk/content/vysper/server_standalone.html Thu Nov 1 10:56:38 2012
@@ -105,21 +105,19 @@
<h1 id="run-main-class">run main class</h1>
<p>if you like to invoke the server from an IDE or the commandline, use the Java class</p>
-<p><DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
-<PRE>org.apache.vysper.spring.ServerMain
-</PRE>
-</DIV></DIV></p>
+<div class="codehilite"><pre><span class="n">org</span><span class="o">.</span><span class="na">apache</span><span class="o">.</span><span class="na">vysper</span><span class="o">.</span><span class="na">spring</span><span class="o">.</span><span class="na">ServerMain</span>
+</pre></div>
+
+
<p>for example by typing</p>
-<p><DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
-<PRE>java org.apache.vysper.spring.ServerMain
-</PRE>
-</DIV></DIV></p>
+<div class="codehilite"><pre><span class="n">java</span> <span class="n">org</span><span class="o">.</span><span class="na">apache</span><span class="o">.</span><span class="na">vysper</span><span class="o">.</span><span class="na">spring</span><span class="o">.</span><span class="na">ServerMain</span>
+</pre></div>
+
+
<p>be sure to include all jars in lib/ in your classpath plus the spring-config.xml.</p>
<p>It is also possible to load modules on the command line:</p>
-<p><DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
-<PRE>java org.apache.vysper.spring.ServerMain -Dvysper.add.module=module1,module2...
-</PRE>
-</DIV></DIV></p>
+<div class="codehilite"><pre><span class="n">java</span> <span class="n">org</span><span class="o">.</span><span class="na">apache</span><span class="o">.</span><span class="na">vysper</span><span class="o">.</span><span class="na">spring</span><span class="o">.</span><span class="na">ServerMain</span> <span class="o">-</span><span class="n">Dvysper</span><span class="o">.</span><span class="na">add</span><span class="o">.</span><span class="na">module</span><span class="o">=</span><span class="n">module1</span><span class="o">,</span><span class="n">module2</span><span class="o">...</span>
+</pre></div>
</div><!-- rightColumn -->
<div id="endContent"></div>
Modified: websites/staging/mina/trunk/content/vysper/server_to_server_comm.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper/server_to_server_comm.html (original)
+++ websites/staging/mina/trunk/content/vysper/server_to_server_comm.html Thu Nov 1 10:56:38 2012
@@ -111,32 +111,32 @@
<p>To set up server-to-server functionality in Vysper, two configurations are needed:</p>
<h2 id="allow-server-to-server-federation">Allow server-to-server federation</h2>
<p>Server-to-server federation is by default disabled in Vysper. To enable sending stanzas to other servers, federations must be enabled:</p>
-<div class="codehilite"><pre><span class="n">XMPPServer</span> <span class="n">server</span> <span class="o">=</span> <span class="k">new</span> <span class="n">XMPPServer</span><span class="p">(</span><span class="s">"vysper.org"</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">XMPPServer</span> <span class="n">server</span> <span class="o">=</span> <span class="k">new</span> <span class="n">XMPPServer</span><span class="o">(</span><span class="s">"vysper.org"</span><span class="o">);</span>
-<span class="sr">//</span> <span class="n">other</span> <span class="n">initialization</span>
-<span class="n">server</span><span class="o">.</span><span class="n">start</span><span class="p">();</span>
+<span class="c1">// other initialization</span>
+<span class="n">server</span><span class="o">.</span><span class="na">start</span><span class="o">();</span>
-<span class="sr">//</span> <span class="n">must</span> <span class="n">be</span> <span class="n">done</span> <span class="n">after</span> <span class="n">the</span> <span class="n">server</span> <span class="n">has</span> <span class="n">been</span> <span class="n">started</span>
-<span class="n">server</span><span class="o">.</span><span class="n">getServerRuntimeContext</span><span class="p">()</span><span class="o">.</span><span class="n">getServerFeatures</span><span class="p">()</span><span class="o">.</span><span class="n">setRelayingToFederationServers</span><span class="p">(</span><span class="n">true</span><span class="p">);</span>
+<span class="c1">// must be done after the server has been started</span>
+<span class="n">server</span><span class="o">.</span><span class="na">getServerRuntimeContext</span><span class="o">().</span><span class="na">getServerFeatures</span><span class="o">().</span><span class="na">setRelayingToFederationServers</span><span class="o">(</span><span class="kc">true</span><span class="o">);</span>
</pre></div>
<h2 id="server-to-server-endpoint">Server-to-server endpoint</h2>
<p>Next, an endpoint for incoming S2S connections must be added:</p>
-<div class="codehilite"><pre><span class="n">XMPPServer</span> <span class="n">server</span> <span class="o">=</span> <span class="k">new</span> <span class="n">XMPPServer</span><span class="p">(</span><span class="s">"vysper.org"</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">XMPPServer</span> <span class="n">server</span> <span class="o">=</span> <span class="k">new</span> <span class="n">XMPPServer</span><span class="o">(</span><span class="s">"vysper.org"</span><span class="o">);</span>
-<span class="n">server</span><span class="o">.</span><span class="n">addEndpoint</span><span class="p">(</span><span class="k">new</span> <span class="n">S2SEndpoint</span><span class="p">());</span>
+<span class="n">server</span><span class="o">.</span><span class="na">addEndpoint</span><span class="o">(</span><span class="k">new</span> <span class="n">S2SEndpoint</span><span class="o">());</span>
-<span class="sr">//</span> <span class="n">other</span> <span class="n">initialization</span>
-<span class="n">server</span><span class="o">.</span><span class="n">start</span><span class="p">();</span>
+<span class="c1">// other initialization</span>
+<span class="n">server</span><span class="o">.</span><span class="na">start</span><span class="o">();</span>
-<span class="sr">//</span> <span class="n">must</span> <span class="n">be</span> <span class="n">done</span> <span class="n">after</span> <span class="n">the</span> <span class="n">server</span> <span class="n">has</span> <span class="n">been</span> <span class="n">started</span>
-<span class="n">server</span><span class="o">.</span><span class="n">getServerRuntimeContext</span><span class="p">()</span><span class="o">.</span><span class="n">getServerFeatures</span><span class="p">()</span><span class="o">.</span><span class="n">setRelayingToFederationServers</span><span class="p">(</span><span class="n">true</span><span class="p">);</span>
+<span class="c1">// must be done after the server has been started</span>
+<span class="n">server</span><span class="o">.</span><span class="na">getServerRuntimeContext</span><span class="o">().</span><span class="na">getServerFeatures</span><span class="o">().</span><span class="na">setRelayingToFederationServers</span><span class="o">(</span><span class="kc">true</span><span class="o">);</span>
</pre></div>
<p>Thatâs all that needs to be done. If SSL/TLS should be enabled between servers (will be negotiated during the S2S connection handshake), a keystore and keystore password must be configured:</p>
-<div class="codehilite"><pre><span class="n">server</span><span class="o">.</span><span class="n">setTLSCertificateInfo</span><span class="p">(</span><span class="k">new</span> <span class="n">File</span><span class="p">(</span><span class="s">"keystore.jks"</span><span class="p">),</span> <span class="s">"sekrit"</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">server</span><span class="o">.</span><span class="na">setTLSCertificateInfo</span><span class="o">(</span><span class="k">new</span> <span class="n">File</span><span class="o">(</span><span class="s">"keystore.jks"</span><span class="o">),</span> <span class="s">"sekrit"</span><span class="o">);</span>
</pre></div>
</div><!-- rightColumn -->
Modified: websites/staging/mina/trunk/content/vysper/service_discovery.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper/service_discovery.html (original)
+++ websites/staging/mina/trunk/content/vysper/service_discovery.html Thu Nov 1 10:56:38 2012
@@ -116,23 +116,21 @@ The server replies with a IQ response co
<p>Via DefaultDiscoAwareModule overrides, modules can register listeners for disco requests. If applicable, they simply add their part to the response. So, the disco-aware module has full control over the stuff it exposes.</p>
<h2 id="the-most-simple-form-of-disco-is-to-advertise-a-feature-clients-knowing-about-that-feature-can-then-use-it-for-example-by-adding-special-payload-to-stanzas-by-interacting-with-the-module-through-dedicated-stanzas-or-by-using-more-disco">The most simple form of disco is to advertise a feature. Clients knowing about that feature can then use it, for example by adding special payload to stanzas, by interacting with the module through dedicated stanzas or by using more disco.</h2>
<p>This is how a feature is advertised in the XEP-0092 implementation:</p>
-<p><DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
-<PRE>public class SoftwareVersionModule extends DefaultDiscoAwareModule implements ServerInfoRequestListener {
- @Override
- protected void addServerInfoRequestListeners(List<ServerInfoRequestListener> serverInfoRequestListeners) {
- serverInfoRequestListeners.add(this);
- } </p>
-<div class="codehilite"><pre><span class="n">public</span> <span class="n">List</span><span class="o">&</span><span class="ow">lt</span><span class="p">;</span><span class="n">InfoElement</span><span class="o">&</span><span class="ow">gt</span><span class="p">;</span> <span class="n">getServerInfosFor</span><span class="p">(</span><span class="n">InfoRequest</span> <span class="n">request</span><span class="p">)</span> <span class="p">{</span>
- <span class="n">List</span><span class="o">&</span><span class="ow">lt</span><span class="p">;</span><span class="n">InfoElement</span><span class="o">&</span><span class="ow">gt</span><span class="p">;</span> <span class="n">infoElements</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&</span><span class="ow">lt</span><span class="p">;</span><span class="n">InfoElement</span><span class="o">&</span><span class="ow">gt</span><span class="p">;();</span>
- <span class="n">infoElements</span><span class="o">.</span><span class="n">add</span><span class="p">(</span><span class="k">new</span> <span class="n">Feature</span><span class="p">(</span><span class="n">NamespaceURIs</span><span class="o">.</span><span class="n">JABBER_IQ_VERSION</span><span class="p">));</span>
- <span class="k">return</span> <span class="n">infoElements</span><span class="p">;</span>
-<span class="p">}</span>
+<div class="codehilite"><pre><span class="kd">public</span> <span class="kd">class</span> <span class="nc">SoftwareVersionModule</span> <span class="kd">extends</span> <span class="n">DefaultDiscoAwareModule</span> <span class="kd">implements</span> <span class="n">ServerInfoRequestListener</span> <span class="o">{</span>
+ <span class="nd">@Override</span>
+ <span class="kd">protected</span> <span class="kt">void</span> <span class="nf">addServerInfoRequestListeners</span><span class="o">(</span><span class="n">List</span><span class="o">&</span><span class="n">lt</span><span class="o">;</span><span class="n">ServerInfoRequestListener</span><span class="o">&</span><span class="n">gt</span><span class="o">;</span> <span class="n">serverInfoRequestListeners</span><span class="o">)</span> <span class="o">{</span>
+ <span class="n">serverInfoRequestListeners</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">this</span><span class="o">);</span>
+ <span class="o">}</span>
+
+ <span class="kd">public</span> <span class="n">List</span><span class="o">&</span><span class="n">lt</span><span class="o">;</span><span class="n">InfoElement</span><span class="o">&</span><span class="n">gt</span><span class="o">;</span> <span class="n">getServerInfosFor</span><span class="o">(</span><span class="n">InfoRequest</span> <span class="n">request</span><span class="o">)</span> <span class="o">{</span>
+ <span class="n">List</span><span class="o">&</span><span class="n">lt</span><span class="o">;</span><span class="n">InfoElement</span><span class="o">&</span><span class="n">gt</span><span class="o">;</span> <span class="n">infoElements</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&</span><span class="n">lt</span><span class="o">;</span><span class="n">InfoElement</span><span class="o">&</span><span class="n">gt</span><span class="o">;();</span>
+ <span class="n">infoElements</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">Feature</span><span class="o">(</span><span class="n">NamespaceURIs</span><span class="o">.</span><span class="na">JABBER_IQ_VERSION</span><span class="o">));</span>
+ <span class="k">return</span> <span class="n">infoElements</span><span class="o">;</span>
+ <span class="o">}</span>
+<span class="o">}</span>
</pre></div>
-<p>}
-</PRE>
-</DIV></DIV></p>
<p>At init time, the listener is registered, which is the module class itself ("this").
On every disco request occuring on server level, disco calls the listener via getServerInfosFor(), and the module advertises its support for XEP-0092. Please note that in an advanced scenario, we can make the module's behavior depending on the properties of the InfoRequest parameter.</p>
<h2 id="item-and-info-discovery">Item and Info discovery</h2>
Modified: websites/staging/mina/trunk/content/vysper/socks5.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper/socks5.html (original)
+++ websites/staging/mina/trunk/content/vysper/socks5.html Thu Nov 1 10:56:38 2012
@@ -109,25 +109,25 @@
</DIV></p>
<p>The Vysper SOCKS5 Bytestream module implements mediated connections from XEP-0065 SOCKS5 Bytestream. Direct connections requires no support from the server and thus works without this module. For mediated connections, this module will supply a SOCKS5 proxy that transfers data between the requestor and target clients. The module also provides all the required service discovery support used to negotiate the address of the SOCKS5 proxy.</p>
<p>The example below shows how to add the module using the API:</p>
-<div class="codehilite"><pre><span class="n">XMPPServer</span> <span class="n">server</span> <span class="o">=</span> <span class="k">new</span> <span class="n">XMPPServer</span><span class="p">(</span><span class="o">&</span><span class="n">ldquo</span><span class="p">;</span><span class="n">vysper</span><span class="o">.</span><span class="n">org</span><span class="o">&</span><span class="n">rdquo</span><span class="p">;);</span>
-<span class="n">server</span><span class="o">.</span><span class="n">addEndpoint</span><span class="p">(</span><span class="k">new</span> <span class="n">TCPEndpoint</span><span class="p">());</span>
+<div class="codehilite"><pre><span class="n">XMPPServer</span> <span class="n">server</span> <span class="o">=</span> <span class="k">new</span> <span class="n">XMPPServer</span><span class="o">(&</span><span class="n">ldquo</span><span class="o">;</span><span class="n">vysper</span><span class="o">.</span><span class="na">org</span><span class="o">&</span><span class="n">rdquo</span><span class="o">;);</span>
+<span class="n">server</span><span class="o">.</span><span class="na">addEndpoint</span><span class="o">(</span><span class="k">new</span> <span class="n">TCPEndpoint</span><span class="o">());</span>
-<span class="sr">//</span> <span class="n">other</span> <span class="n">initialization</span>
-<span class="n">server</span><span class="o">.</span><span class="n">addModule</span><span class="p">(</span><span class="k">new</span> <span class="n">Socks5Module</span><span class="p">());</span>
+<span class="c1">// other initialization</span>
+<span class="n">server</span><span class="o">.</span><span class="na">addModule</span><span class="o">(</span><span class="k">new</span> <span class="n">Socks5Module</span><span class="o">());</span>
-<span class="n">server</span><span class="o">.</span><span class="n">start</span><span class="p">();</span>
+<span class="n">server</span><span class="o">.</span><span class="na">start</span><span class="o">();</span>
</pre></div>
<p>This will enable the SOCKS5 component on socks.vysper.org and start a proxy on port 5777. Make sure socks.vysper.org resolves to the server running Vysper.</p>
<p>To configure the subdomain name, provide the subdomain in the constructor:</p>
-<div class="codehilite"><pre><span class="n">server</span><span class="o">.</span><span class="n">addModule</span><span class="p">(</span><span class="k">new</span> <span class="n">Socks5Module</span><span class="p">(</span><span class="s">"proxy"</span><span class="p">));</span>
+<div class="codehilite"><pre><span class="n">server</span><span class="o">.</span><span class="na">addModule</span><span class="o">(</span><span class="k">new</span> <span class="n">Socks5Module</span><span class="o">(</span><span class="s">"proxy"</span><span class="o">));</span>
</pre></div>
<p>In this case, the SOCKS5 component would be available on proxy.vysper.org.</p>
<p>It is also possible to supply a socket address on which the proxy will be listening. This can be used to configure the port for the proxy, or the local address to bind the proxy to. For example:</p>
-<div class="codehilite"><pre><span class="n">server</span><span class="o">.</span><span class="n">addModule</span><span class="p">(</span><span class="k">new</span> <span class="n">Socks5Module</span><span class="p">(</span><span class="s">"proxy"</span><span class="p">,</span> <span class="k">new</span> <span class="n">InetSocketAddress</span><span class="p">(</span><span class="s">"foo.vysper.org"</span><span class="p">,</span> <span class="mi">18100</span><span class="p">)));</span>
+<div class="codehilite"><pre><span class="n">server</span><span class="o">.</span><span class="na">addModule</span><span class="o">(</span><span class="k">new</span> <span class="n">Socks5Module</span><span class="o">(</span><span class="s">"proxy"</span><span class="o">,</span> <span class="k">new</span> <span class="n">InetSocketAddress</span><span class="o">(</span><span class="s">"foo.vysper.org"</span><span class="o">,</span> <span class="mi">18100</span><span class="o">)));</span>
</pre></div>
Modified: websites/staging/mina/trunk/content/vysper/sources.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper/sources.html (original)
+++ websites/staging/mina/trunk/content/vysper/sources.html Thu Nov 1 10:56:38 2012
@@ -109,55 +109,55 @@
<p>The following is a link to the <a href="http://svn.apache.org/viewvc/mina/vysper">online source repository</a>.</p>
<h2 id="anonymous-access">Anonymous access</h2>
<p>The source can be checked out anonymously from SVN with this command:</p>
-<p><DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
-<PRE>$ svn checkout http://svn.apache.org/repos/asf/mina/vysper/trunk vysper
-</PRE>
-</DIV></DIV></p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">checkout</span> <span class="n">http:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/mina/</span><span class="n">vysper</span><span class="o">/</span><span class="n">trunk</span> <span class="n">vysper</span>
+</pre></div>
+
+
<h2 id="developer-access">Developer access</h2>
<p>Everyone can access the Subversion repository via HTTPS, but Committers must checkout the Subversion repository via HTTPS.</p>
-<p><DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
-<PRE>$ svn checkout https://svn.apache.org/repos/asf/mina/vysper/trunk vysper
-</PRE>
-</DIV></DIV></p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">checkout</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/mina/</span><span class="n">vysper</span><span class="o">/</span><span class="n">trunk</span> <span class="n">vysper</span>
+</pre></div>
+
+
<p>To commit changes to the repository, execute the following command to commit your changes (svn will prompt you for your password)</p>
-<p><DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
-<PRE>$ svn commit --username your-username -m "A message"
-</PRE>
-</DIV></DIV></p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">commit</span> <span class="o">--</span><span class="n">username</span> <span class="n">your</span><span class="o">-</span><span class="n">username</span> <span class="o">-</span><span class="n">m</span> <span class="o">&</span><span class="n">quot</span><span class="p">;</span><span class="n">A</span> <span class="n">message</span><span class="o">&</span><span class="n">quot</span><span class="p">;</span>
+</pre></div>
+
+
<h2 id="access-from-behind-a-firewall">Access from behind a firewall</h2>
<p>For those users who are stuck behind a corporate firewall which is blocking http access to the Subversion repository, you can try to access it via the developer connection:</p>
-<p><DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
-<PRE>$ svn checkout https://svn.apache.org/repos/asf/mina/vysper/trunk vysper
-</PRE>
-</DIV></DIV></p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">checkout</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/mina/</span><span class="n">vysper</span><span class="o">/</span><span class="n">trunk</span> <span class="n">vysper</span>
+</pre></div>
+
+
<h2 id="access-through-a-proxy">Access through a proxy</h2>
<p>The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The files location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%\Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)</p>
<p>There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client and run any command; this will cause the configuration directory and template files to be created.</p>
<p>Example : Edit the 'servers' file and add something like :</p>
-<p><DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
-<PRE>[global]
-http-proxy-host = your.proxy.name
-http-proxy-port = 3128
-</PRE>
-</DIV></DIV></p>
+<div class="codehilite"><pre><span class="k">[global]</span>
+<span class="na">http-proxy-host</span> <span class="o">=</span> <span class="s">your.proxy.name</span>
+<span class="na">http-proxy-port</span> <span class="o">=</span> <span class="s">3128</span>
+</pre></div>
+
+
<h2 id="building">Building</h2>
<p>We use Maven for managing our dependencies and packaging. Please use Maven 2.2.1 or later.
To install all of Vysper (core, modules etc) you can try this after the checkout:</p>
-<p><DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
-<PRE>mvn clean install
-</PRE>
-</DIV></DIV></p>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">clean</span> <span class="n">install</span>
+</pre></div>
+
+
<p>You can also build a complete, runnable Vysper server:</p>
-<p><DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
-<PRE>cd dist
-mvn clean package
-</PRE>
-</DIV></DIV></p>
+<div class="codehilite"><pre><span class="n">cd</span> <span class="n">dist</span>
+<span class="n">mvn</span> <span class="n">clean</span> <span class="nb">package</span>
+</pre></div>
+
+
<p>On successful build, you will find a functional binary package at</p>
-<p><DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
-<PRE>target/vysper-1.0.0-SNAPSHOT-bin.{zip|tar.gz}
-</PRE>
-</DIV></DIV></p>
+<div class="codehilite"><pre><span class="n">target</span><span class="o">/</span><span class="n">vysper</span><span class="o">-</span><span class="mf">1.0.0</span><span class="o">-</span><span class="n">SNAPSHOT</span><span class="o">-</span><span class="n">bin</span><span class="o">.</span><span class="p">{</span><span class="n">zip</span><span class="o">|</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="p">}</span>
+</pre></div>
+
+
<p>Unpackaging a bin-package reveals a bin/ directory, containing run-scripts for Windows and Unix/MacOS.
Executing this script will boot a working Vysper XMPP server.</p>
Modified: websites/staging/mina/trunk/content/vysper/standards_supported.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper/standards_supported.html (original)
+++ websites/staging/mina/trunk/content/vysper/standards_supported.html Thu Nov 1 10:56:38 2012
@@ -104,125 +104,127 @@
<h1 id="standards-supported">Standards Supported</h1>
-<p><DIV class="table-wrap">
-<TABLE class="confluenceTable"><TBODY>
-<TR>
-<TH class="confluenceTh"> Specification </TH>
-<TH class="confluenceTh"> Status </TH>
-<TH class="confluenceTh"> Comment </TH>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://www.ietf.org/rfc/rfc3920.txt" class="external-link" rel="nofollow">RFC 3920 XMPP Core</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://www.ietf.org/rfc/rfc3921.txt" class="external-link" rel="nofollow">RFC 3921 XMPP Instant Messaging and Presence</A> </TD>
-<TD class="confluenceTd"> 80% </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0004.html" class="external-link" rel="nofollow">XEP-0004 Data Forms</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0030.html" class="external-link" rel="nofollow">XEP-0030 Service Discovery</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0045.html" class="external-link" rel="nofollow">XEP-0045 Multi-User Chat</A> </TD>
-<TD class="confluenceTd"> 80% </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0029.html" class="external-link" rel="nofollow">XEP-0049 Private XML Storage</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0050.html" class="external-link" rel="nofollow">XEP-0050 Ad-Hoc Commands</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0054.html" class="external-link" rel="nofollow">XEP-0054 vcard-temp</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0060.html" class="external-link" rel="nofollow">XEP-0060 Publish-Subscribe</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0065.html" class="external-link" rel="nofollow">XEP-0065 SOCKS5 Bytestreams</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> The optional UDP support not implemented </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0077.html" class="external-link" rel="nofollow">XEP-0077 In-band registration</A> </TD>
-<TD class="confluenceTd"> 80% </TD>
-<TD class="confluenceTd"> Canceling existing registration not supported </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0082.html" class="external-link" rel="nofollow">XEP-0082 XMPP Date and Time Profiles</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0092.html" class="external-link" rel="nofollow">XEP-0092 Software Version</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0124.html" class="external-link" rel="nofollow">XEP-0124 Bidirectional-streams Over Synchronous HTTP (BOSH)</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0133.html" class="external-link" rel="nofollow">XEP-0133 Service Administration</A> </TD>
-<TD class="confluenceTd"> 40% </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0185.html" class="external-link" rel="nofollow">XEP-0185 Dialback Key Generation and Validation</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0199.html" class="external-link" rel="nofollow">XEP-0199 XMPP Ping</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0202.html" class="external-link" rel="nofollow">XEP-0202 Entity Time</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0206.html" class="external-link" rel="nofollow">XEP-0206 XMPP Over BOSH</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0220.html" class="external-link" rel="nofollow">XEP-0220 Server Dialback</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://xmpp.org/extensions/xep-0220.html" class="external-link" rel="nofollow">XEP-0220 Server Dialback</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-<TR>
-<TD class="confluenceTd"> <A href="http://tools.ietf.org/html/draft-moffitt-xmpp-over-websocket-00" class="external-link" rel="nofollow">An XMPP Sub-protocol for WebSocket</A> </TD>
-<TD class="confluenceTd"> Complete </TD>
-<TD class="confluenceTd"> </TD>
-</TR>
-</TBODY></TABLE>
-</DIV></p>
+<table>
+<thead>
+<tr>
+<th>Specification</th>
+<th>Status</th>
+<th>Comment</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="http://www.ietf.org/rfc/rfc3920.txt">RFC 3920 XMPP Core</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://www.ietf.org/rfc/rfc3921.txt">RFC 3921 XMPP Instant Messaging and Presence</a></td>
+<td>80%</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0004.html">XEP-0004 Data Forms</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0030.html">XEP-0030 Service Discovery</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0045.html">XEP-0045 Multi-User Chat</a></td>
+<td>80%</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0029.html">XEP-0049 Private XML Storage</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0050.html">XEP-0050 Ad-Hoc Commands</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0054.html">XEP-0054 vcard-temp</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0060.html">XEP-0060 Publish-Subscribe</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0065.html">XEP-0065 SOCKS5 Bytestreams</a></td>
+<td>Complete</td>
+<td>The optional UDP support not implemented</td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0077.html">XEP-0077 In-band registration</a></td>
+<td>80%</td>
+<td>Canceling existing registration not supported</td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0082.html">XEP-0082 XMPP Date and Time Profiles</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0092.html">XEP-0092 Software Version</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0124.html">XEP-0124 Bidirectional-streams Over Synchronous HTTP (BOSH)</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0133.html">XEP-0133 Service Administration</a></td>
+<td>40%</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0185.html">XEP-0185 Dialback Key Generation and Validation</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0199.html">XEP-0199 XMPP Ping</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0202.html">XEP-0202 Entity Time</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0206.html">XEP-0206 XMPP Over BOSH</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0220.html">XEP-0220 Server Dialback</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://xmpp.org/extensions/xep-0220.html">XEP-0220 Server Dialback</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+<tr>
+<td><a href="http://tools.ietf.org/html/draft-moffitt-xmpp-over-websocket-00">An XMPP Sub-protocol for WebSocket</a></td>
+<td>Complete</td>
+<td> </td>
+</tr>
+</tbody>
+</table>
</div><!-- rightColumn -->
<div id="endContent"></div>
Modified: websites/staging/mina/trunk/content/vysper/test_client.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper/test_client.html (original)
+++ websites/staging/mina/trunk/content/vysper/test_client.html Thu Nov 1 10:56:38 2012
@@ -114,10 +114,8 @@ It takes two parameters:</p>
This relates to the default users corrently configured in the default spring configuration file.</p>
<p>The client logs into the server with the 'from' user login and starts to send messages to the 'to' user.</p>
<p>The client is invoked similar to the server like this:</p>
-<p><DIV class="preformatted panel" style="border-width: 1px;"><DIV class="preformattedContent panelContent">
-<PRE>java org.apache.vysper.smack.BasicClient user1 user2
-</PRE>
-</DIV></DIV></p>
+<div class="codehilite"><pre><span class="n">java</span> <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">vysper</span><span class="o">.</span><span class="n">smack</span><span class="o">.</span><span class="n">BasicClient</span> <span class="n">user1</span> <span class="n">user2</span>
+</pre></div>
</div><!-- rightColumn -->
<div id="endContent"></div>
Modified: websites/staging/mina/trunk/content/vysper/user_mgmt.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper/user_mgmt.html (original)
+++ websites/staging/mina/trunk/content/vysper/user_mgmt.html Thu Nov 1 10:56:38 2012
@@ -107,65 +107,53 @@
<p>Apache Vysper comes with very basic user management support out of the box. But, frequently you would rather want to integrate Vysper with your already existing authentication solution. To enable this, Vysper comes with a simple API to implement your own authentication and user management.</p>
<h2 id="authentication">Authentication</h2>
<p>UserAuthentication is the interface which will get called when a client authenticates itself using SASL. Vysper currently ships with two implementations, one in-memory and one based on JCR. To write your own, simple create a class which implements UserAuthentication. In the example below, we implement an authentication provider backed by an LDAP directory.</p>
-<p><DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
-<PRE class="code-java">
-<SPAN class="code-keyword">public</SPAN> class MyLdapAuthentication <SPAN class="code-keyword">implements</SPAN> UserAuthentication {
- @Override
- <SPAN class="code-keyword">public</SPAN> <SPAN class="code-object">boolean</SPAN> verifyCredentials(Entity jid, <SPAN class="code-object">String</SPAN> passwordCleartext, <SPAN class="code-object">Object</SPAN> credentials) {
- Hashtable<<SPAN class="code-object">String</SPAN>, <SPAN class="code-object">String</SPAN>> env = <SPAN class="code-keyword">new</SPAN> Hashtable<<SPAN class="code-object">String</SPAN>, <SPAN class="code-object">String</SPAN>>();
- env.put(Context.INITIAL_CONTEXT_FACTORY, <SPAN class="code-quote">"com.sun.jndi.ldap.LdapCtxFactory"</SPAN>);
- env.put(Context.PROVIDER_URL, <SPAN class="code-quote">"ldap:<SPAN class="code-comment">//localhost:389/"</SPAN>);
-</SPAN>
- env.put(Context.SECURITY_AUTHENTICATION, <SPAN class="code-quote">"simple"</SPAN>);</p>
-<div class="codehilite"><pre> // extract the user name from the entity, e.g. from foo@example.com, foo will be used
- env.put(Context.SECURITY_PRINCIPAL, <span class="nt"><SPAN</span> <span class="na">class=</span><span class="s">"code-object"</span><span class="nt">></span>String<span class="nt"></SPAN></span>.format(<span class="nt"><SPAN</span> <span class="na">class=</span><span class="s">"code-quote"</span><span class="nt">></span><span class="ni">&quot;</span>cn=%s, ou=Users, o=Acme<span class="ni">&quot;</span><span class="nt"></SPAN></span>, jid.getNode()));
- env.put(Context.SECURITY_CREDENTIALS, passwordCleartext);
-
- try {
- // connect and authenticate with the directory
- new InitialDirContext(env);
- return true;
- } <span class="nt"><SPAN</span> <span class="na">class=</span><span class="s">"code-keyword"</span><span class="nt">></span>catch<span class="nt"></SPAN></span> (NamingException e) {
- <span class="nt"><SPAN</span> <span class="na">class=</span><span class="s">"code-keyword"</span><span class="nt">></span>return<span class="nt"></SPAN></span> <span class="nt"><SPAN</span> <span class="na">class=</span><span class="s">"code-keyword"</span><span class="nt">></span>false<span class="nt"></SPAN></span>;
- }
-}
+<div class="codehilite"><pre><span class="kd">public</span> <span class="kd">class</span> <span class="nc">MyLdapAuthentication</span> <span class="kd">implements</span> <span class="n">UserAuthentication</span> <span class="o">{</span>
+ <span class="nd">@Override</span>
+ <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">verifyCredentials</span><span class="o">(</span><span class="n">Entity</span> <span class="n">jid</span><span class="o">,</span> <span class="n">String</span> <span class="n">passwordCleartext</span><span class="o">,</span> <span class="n">Object</span> <span class="n">credentials</span><span class="o">)</span> <span class="o">{</span>
+ <span class="n">Hashtable</span><span class="o"><</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">></span> <span class="n">env</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Hashtable</span><span class="o"><</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">>();</span>
+ <span class="n">env</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="n">Context</span><span class="o">.</span><span class="na">INITIAL_CONTEXT_FACTORY</span><span class="o">,</span> <span class="s">"com.sun.jndi.ldap.LdapCtxFactory"</span><span class="o">);</span>
+ <span class="n">env</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="n">Context</span><span class="o">.</span><span class="na">PROVIDER_URL</span><span class="o">,</span> <span class="s">"ldap://localhost:389/"</span><span class="o">);</span>
+
+ <span class="n">env</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="n">Context</span><span class="o">.</span><span class="na">SECURITY_AUTHENTICATION</span><span class="o">,</span> <span class="s">"simple"</span><span class="o">);</span>
+
+ <span class="c1">// extract the user name from the entity, e.g. from foo@example.com, foo will be used</span>
+ <span class="n">env</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="n">Context</span><span class="o">.</span><span class="na">SECURITY_PRINCIPAL</span><span class="o">,</span> <span class="n">String</span><span class="o">.</span><span class="na">format</span><span class="o">(</span><span class="s">"cn=%s, ou=Users, o=Acme"</span><span class="o">,</span> <span class="n">jid</span><span class="o">.</span><span class="na">getNode</span><span class="o">()));</span>
+ <span class="n">env</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="n">Context</span><span class="o">.</span><span class="na">SECURITY_CREDENTIALS</span><span class="o">,</span> <span class="n">passwordCleartext</span><span class="o">);</span>
+
+ <span class="k">try</span> <span class="o">{</span>
+ <span class="c1">// connect and authenticate with the directory</span>
+ <span class="k">new</span> <span class="nf">InitialDirContext</span><span class="o">(</span><span class="n">env</span><span class="o">);</span>
+ <span class="k">return</span> <span class="kc">true</span><span class="o">;</span>
+ <span class="o">}</span> <span class="k">catch</span> <span class="o">(</span><span class="n">NamingException</span> <span class="n">e</span><span class="o">)</span> <span class="o">{</span>
+ <span class="k">return</span> <span class="kc">false</span><span class="o">;</span>
+ <span class="o">}</span>
+ <span class="o">}</span>
+<span class="o">}</span>
</pre></div>
-<p>}
-</PRE>
-</DIV></DIV></p>
<p>Next, you need to hook the authentication provider into the Vysper XMPP server:</p>
-<p><DIV class="code panel" style="border-width: 1px;"><DIV class="codeContent panelContent">
-<PRE class="code-java">
- <SPAN class="code-keyword">public</SPAN> <SPAN class="code-keyword">static</SPAN> void main(<SPAN class="code-object">String</SPAN>[] args) <SPAN class="code-keyword">throws</SPAN> Exception {
- OpenStorageProviderRegistry providerRegistry = <SPAN class="code-keyword">new</SPAN> OpenStorageProviderRegistry();</p>
-<div class="codehilite"><pre> <span class="o"><</span><span class="n">SPAN</span> <span class="n">class</span><span class="o">=</span><span class="s">"code-comment"</span><span class="o">></span><span class="sr">//</span> <span class="n">add</span> <span class="n">your</span> <span class="n">custom</span> <span class="n">authentication</span> <span class="n">provider</span>
-</pre></div>
-
+<div class="codehilite"><pre><span class="kd">public</span> <span class="kd">static</span> <span class="kt">void</span> <span class="nf">main</span><span class="o">(</span><span class="n">String</span><span class="o">[]</span> <span class="n">args</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">Exception</span> <span class="o">{</span>
+ <span class="n">OpenStorageProviderRegistry</span> <span class="n">providerRegistry</span> <span class="o">=</span> <span class="k">new</span> <span class="n">OpenStorageProviderRegistry</span><span class="o">();</span>
-<p></SPAN> providerRegistry.add(<SPAN class="code-keyword">new</SPAN> MyLdapAuthentication());</p>
-<div class="codehilite"><pre> <span class="o"><</span><span class="n">SPAN</span> <span class="n">class</span><span class="o">=</span><span class="s">"code-comment"</span><span class="o">></span><span class="sr">//</span> <span class="n">a</span> <span class="n">roster</span> <span class="n">manager</span> <span class="n">is</span> <span class="n">also</span> <span class="n">required</span>
-</pre></div>
+ <span class="c1">// add your custom authentication provider</span>
+ <span class="n">providerRegistry</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">MyLdapAuthentication</span><span class="o">());</span>
+ <span class="c1">// a roster manager is also required</span>
+ <span class="n">providerRegistry</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="k">new</span> <span class="n">MemoryRosterManager</span><span class="o">());</span>
-<p></SPAN> providerRegistry.add(<SPAN class="code-keyword">new</SPAN> MemoryRosterManager());</p>
-<div class="codehilite"><pre> XMPPServer server = <span class="nt"><SPAN</span> <span class="na">class=</span><span class="s">"code-keyword"</span><span class="nt">></span>new<span class="nt"></SPAN></span> XMPPServer(<span class="nt"><SPAN</span> <span class="na">class=</span><span class="s">"code-quote"</span><span class="nt">></span><span class="ni">&quot;</span>acme.com<span class="ni">&quot;</span><span class="nt"></SPAN></span>);
+ <span class="n">XMPPServer</span> <span class="n">server</span> <span class="o">=</span> <span class="k">new</span> <span class="n">XMPPServer</span><span class="o">(</span><span class="s">"acme.com"</span><span class="o">);</span>
- <span class="nt"><SPAN</span> <span class="na">class=</span><span class="s">"code-comment"</span><span class="nt">></span>// other initialization
-</pre></div>
+ <span class="c1">// other initialization</span>
+ <span class="c1">// ...</span>
+ <span class="n">server</span><span class="o">.</span><span class="na">setStorageProviderRegistry</span><span class="o">(</span><span class="n">providerRegistry</span><span class="o">);</span>
-<p></SPAN> <SPAN class="code-comment">// ...
-</SPAN>
- server.setStorageProviderRegistry(providerRegistry);</p>
-<div class="codehilite"><pre> <span class="n">server</span><span class="o">.</span><span class="n">start</span><span class="p">();</span>
-<span class="p">}</span>
+ <span class="n">server</span><span class="o">.</span><span class="na">start</span><span class="o">();</span>
+<span class="o">}</span>
</pre></div>
-<p></PRE>
-</DIV></DIV></p>
<p>In this example, we use the OpenStorageProviderRegistry to provide the different storage providers. Only two are required, UserAuthentication and RosterManager.</p>
<p>That's all that's needed to implement a custom authentication provider.</p>
<h2 id="user-management_1">User management</h2>
Modified: websites/staging/mina/trunk/content/vysper/websocket_endpoint.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper/websocket_endpoint.html (original)
+++ websites/staging/mina/trunk/content/vysper/websocket_endpoint.html Thu Nov 1 10:56:38 2012
@@ -109,22 +109,22 @@
</DIV></p>
<p>While websockets are still being specified, a draft specification for XMPP over websockets has been published at <a href="http://tools.ietf.org/html/draft-moffitt-xmpp-over-websocket-00">http://tools.ietf.org/html/draft-moffitt-xmpp-over-websocket-00</a>. Websockets enables web browsers to establish duplex communications with servers with very little overhead.</p>
<p>Vysper provides a websocket endpoint. The easiest way to use the endpoint is to simply add it as a regular endpoint:</p>
-<div class="codehilite"><pre><span class="n">XMPPServer</span> <span class="n">server</span> <span class="o">=</span> <span class="k">new</span> <span class="n">XMPPServer</span><span class="p">(</span><span class="s">"vysper.org"</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">XMPPServer</span> <span class="n">server</span> <span class="o">=</span> <span class="k">new</span> <span class="n">XMPPServer</span><span class="o">(</span><span class="s">"vysper.org"</span><span class="o">);</span>
-<span class="n">server</span><span class="o">.</span><span class="n">addEndpoint</span><span class="p">(</span><span class="k">new</span> <span class="n">TCPEndpoint</span><span class="p">());</span>
+<span class="n">server</span><span class="o">.</span><span class="na">addEndpoint</span><span class="o">(</span><span class="k">new</span> <span class="n">TCPEndpoint</span><span class="o">());</span>
-<span class="n">server</span><span class="o">.</span><span class="n">addEndpoint</span><span class="p">(</span><span class="k">new</span> <span class="n">WebSocketEndpoint</span><span class="p">());</span>
+<span class="n">server</span><span class="o">.</span><span class="na">addEndpoint</span><span class="o">(</span><span class="k">new</span> <span class="n">WebSocketEndpoint</span><span class="o">());</span>
-<span class="n">server</span><span class="o">.</span><span class="n">start</span><span class="p">();</span>
+<span class="n">server</span><span class="o">.</span><span class="na">start</span><span class="o">();</span>
</pre></div>
<p>Thatâs it. The default configuration will start a web server on port 8080 and supply websockets on <a href="http://vysper.org:8080/">http://vysper.org:8080/</a>.</p>
<p>The port and context path can be configured:</p>
-<div class="codehilite"><pre><span class="n">WebSocketEndpoint</span> <span class="n">wsEndpoint</span> <span class="o">=</span> <span class="k">new</span> <span class="n">WebSocketEndpoint</span><span class="p">();</span>
-<span class="n">wsEndpoint</span><span class="o">.</span><span class="n">setContextPath</span><span class="p">(</span><span class="s">"/xmpp"</span><span class="p">);</span>
-<span class="n">wsEndpoint</span><span class="o">.</span><span class="n">setPort</span><span class="p">(</span><span class="mi">9000</span><span class="p">);</span>
-<span class="n">server</span><span class="o">.</span><span class="n">addEndpoint</span><span class="p">(</span><span class="n">wsEndpoint</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">WebSocketEndpoint</span> <span class="n">wsEndpoint</span> <span class="o">=</span> <span class="k">new</span> <span class="n">WebSocketEndpoint</span><span class="o">();</span>
+<span class="n">wsEndpoint</span><span class="o">.</span><span class="na">setContextPath</span><span class="o">(</span><span class="s">"/xmpp"</span><span class="o">);</span>
+<span class="n">wsEndpoint</span><span class="o">.</span><span class="na">setPort</span><span class="o">(</span><span class="mi">9000</span><span class="o">);</span>
+<span class="n">server</span><span class="o">.</span><span class="na">addEndpoint</span><span class="o">(</span><span class="n">wsEndpoint</span><span class="o">);</span>
</pre></div>
@@ -132,10 +132,10 @@
<p>Commonly, thereâs a need to use websockets within the context of a web application. For that purpose, there is a servlet available that can be configured in web.xml inside your regular application.</p>
<p>Vysper currently supports this for Jetty and Apache Tomcat 7.0.27 or later.</p>
<p>For Jetty, add the following to your web.xml:</p>
-<div class="codehilite"><pre><span class="n">WebSocketEndpoint</span> <span class="n">wsEndpoint</span> <span class="o">=</span> <span class="k">new</span> <span class="n">WebSocketEndpoint</span><span class="p">();</span>
-<span class="n">wsEndpoint</span><span class="o">.</span><span class="n">setSSLEnabled</span><span class="p">(</span><span class="n">true</span><span class="p">);</span>
-<span class="n">wsEndpoint</span><span class="o">.</span><span class="n">setSSLCertificateKeystore</span><span class="p">(</span><span class="s">"keystore.jks"</span><span class="p">,</span> <span class="s">"sekrit"</span><span class="p">);</span>
-<span class="n">server</span><span class="o">.</span><span class="n">addEndpoint</span><span class="p">(</span><span class="n">wsEndpoint</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="n">WebSocketEndpoint</span> <span class="n">wsEndpoint</span> <span class="o">=</span> <span class="k">new</span> <span class="n">WebSocketEndpoint</span><span class="o">();</span>
+<span class="n">wsEndpoint</span><span class="o">.</span><span class="na">setSSLEnabled</span><span class="o">(</span><span class="kc">true</span><span class="o">);</span>
+<span class="n">wsEndpoint</span><span class="o">.</span><span class="na">setSSLCertificateKeystore</span><span class="o">(</span><span class="s">"keystore.jks"</span><span class="o">,</span> <span class="s">"sekrit"</span><span class="o">);</span>
+<span class="n">server</span><span class="o">.</span><span class="na">addEndpoint</span><span class="o">(</span><span class="n">wsEndpoint</span><span class="o">);</span>
</pre></div>