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 2013/08/29 12:15:48 UTC
svn commit: r876590 [5/5] - in /websites/staging/mina/trunk/content: ./
asyncweb-project/ ftpserver-project/ mina-project/ mina-project/userguide/
mina-project/userguide/ch1-getting-started/
mina-project/userguide/ch10-executor-filter/ mina-project/use...
Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch8-iobuffer/ch8-iobuffer.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch8-iobuffer/ch8-iobuffer.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch8-iobuffer/ch8-iobuffer.html Thu Aug 29 10:15:45 2013
@@ -101,6 +101,7 @@
<li><a href="http://people.apache.org/~vgritsenko/stats/projects/mina.html" class="external-link" rel="nofollow">Statistics</a></li>
</ul>
+
<h5>Community</h5>
<ul>
<li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
@@ -109,6 +110,7 @@
<li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
</ul>
+
<h5>About Apache</h5>
<ul>
<li><a href="http://www.apache.org" class="external-link" rel="nofollow">Apache main site</a></li>
@@ -117,6 +119,7 @@
<li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
</ul>
+
<h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
<ul>
<li>No event</li>
@@ -159,15 +162,14 @@
<li>It doesn't provide useful getters and putters such as fill, get/putString, and get/putAsciiInt() .</li>
<li>It is difficult to write variable-length data due to its fixed capacity</li>
</ul>
-<p><DIV class="note" markdown="1">
- This will change in MINA 3. The main reason why MINA has its own wrapper on top of nio ByteBuffer is to have extensible buffers. This was a very bad decision. Buffers are just buffers : a temporary place to store temporary data, before it is used. Many other solutions exist, like defining a wrapper which relies on a list of NIO ByteBuffers, instead of copying the existing buffer to a bigger one just because we want to extend the buffer capacity.</p>
-<div class="codehilite"><pre><span class="nt"><P></span>It might also be more comfortable to use an InputStream instead of a byte buffer all along the filters, as it does not imply anything about the nature of the stored data : it can be a byte array, strings, messages...<span class="nt"></P></span>
+<DIV class="note" markdown="1">
+ This will change in MINA 3. The main reason why MINA has its own wrapper on top of nio ByteBuffer is to have extensible buffers. This was a very bad decision. Buffers are just buffers : a temporary place to store temporary data, before it is used. Many other solutions exist, like defining a wrapper which relies on a list of NIO ByteBuffers, instead of copying the existing buffer to a bigger one just because we want to extend the buffer capacity.
-<span class="nt"><P></span>Last, not least, the current implementation defeat one of the target : zero-copy strategy (ie, once we have read the data from the socket, we want to avoid a copy being done later). As we use extensible byte buffers, we will most certainly copy those data if we have to manage big messages. Assuming that the MINA ByteBuffer is just a wrapper on top of NIO ByteBuffer, this can be a real problem when using direct buffers.<span class="nt"></P></span>
-</pre></div>
+ <P>It might also be more comfortable to use an InputStream instead of a byte buffer all along the filters, as it does not imply anything about the nature of the stored data : it can be a byte array, strings, messages...</P>
+ <P>Last, not least, the current implementation defeat one of the target : zero-copy strategy (ie, once we have read the data from the socket, we want to avoid a copy being done later). As we use extensible byte buffers, we will most certainly copy those data if we have to manage big messages. Assuming that the MINA ByteBuffer is just a wrapper on top of NIO ByteBuffer, this can be a real problem when using direct buffers.</P>
+</DIV>
-<p></DIV></p>
<h2 id="iobuffer-operations">IoBuffer Operations</h2>
<h3 id="allocating-a-new-buffer">Allocating a new Buffer</h3>
<p>IoBuffer is an abstract class, hence can't be instantiated directly. To allocate IoBuffer, we need to use one of the two allocate() methods.</p>
@@ -206,9 +208,10 @@
<p>The underlying ByteBuffer is reallocated by IoBuffer behind the scene if the encoded data is larger than 8 bytes in the example above. Its capacity will double, and its limit will increase to the last position the string is written. This behavior is very similar to the way StringBuffer class works.</p>
-<p><DIV class="note" markdown="1">
+<DIV class="note" markdown="1">
This mechanism is very likely to be removed from MINA 3.0, as it's not really the best way to handle increased buffer size. It should be replaced by something like a InputStream hiding a list or an array of fixed sized ByteBuffers.
-</DIV></p>
+</DIV>
+
<h2 id="creating-auto-shrinking-buffer">Creating Auto Shrinking Buffer</h2>
<p>There are situations which calls for releasing additionally allocated bytes from the buffer, to preserve memory. IoBuffer provides autoShrink property to address the need. If autoShrink is turned on, IoBuffer halves the capacity of the buffer when compact() is invoked and only 1/4 or less of the current capacity is being used. To manually shrink the buffer, use shrink() method.</p>
<p>Lets see this in action :</p>
@@ -241,9 +244,10 @@
<li>After incrementing capacity to 32, the capacity becomes 32</li>
<li>Call to shrink(), reduces the capacity to 16, thereby eliminating extra storage</li>
</ul>
-<p><DIV class="note" markdown="1">
+<DIV class="note" markdown="1">
Again, this mechanism should be a default one, without needing to explicitely tells the buffer that it can shrink.
-</DIV></p>
+</DIV>
+
<h2 id="buffer-allocation">Buffer Allocation</h2>
<p>IoBufferAllocater is responsible for allocating and managing buffers. To have precise control on the buffer allocation policy, implement the IoBufferAllocater interface.</p>
<p>MINA ships with following implementations of IoBufferAllocater</p>
@@ -251,9 +255,10 @@
<li><strong>SimpleBufferAllocator (default)</strong> - Create a new buffer every time</li>
<li><strong>CachedBufferAllocator</strong> - caches the buffer which are likely to be reused during expansion</li>
</ul>
-<p><DIV class="note" markdown="1">
+<DIV class="note" markdown="1">
With the new available JVM, using cached IoBuffer is very unlikely to improve performances.
-</DIV></p>
+</DIV>
+
<p>You can implement you own implementation of IoBufferAllocator and call setAllocator() on IoBuffer to use the same.</p>
Modified: websites/staging/mina/trunk/content/mina-project/userguide/ch9-codec-filter/ch9-codec-filter.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/ch9-codec-filter/ch9-codec-filter.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/ch9-codec-filter/ch9-codec-filter.html Thu Aug 29 10:15:45 2013
@@ -101,6 +101,7 @@
<li><a href="http://people.apache.org/~vgritsenko/stats/projects/mina.html" class="external-link" rel="nofollow">Statistics</a></li>
</ul>
+
<h5>Community</h5>
<ul>
<li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
@@ -109,6 +110,7 @@
<li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
</ul>
+
<h5>About Apache</h5>
<ul>
<li><a href="http://www.apache.org" class="external-link" rel="nofollow">Apache main site</a></li>
@@ -117,6 +119,7 @@
<li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
</ul>
+
<h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
<ul>
<li>No event</li>
Modified: websites/staging/mina/trunk/content/mina-project/userguide/user-guide-toc.html
==============================================================================
--- websites/staging/mina/trunk/content/mina-project/userguide/user-guide-toc.html (original)
+++ websites/staging/mina/trunk/content/mina-project/userguide/user-guide-toc.html Thu Aug 29 10:15:45 2013
@@ -101,6 +101,7 @@
<li><a href="http://people.apache.org/~vgritsenko/stats/projects/mina.html" class="external-link" rel="nofollow">Statistics</a></li>
</ul>
+
<h5>Community</h5>
<ul>
<li><a href="http://www.apache.org/foundation/contributing.html" class="external-link" rel="nofollow">Contributing</a></li>
@@ -109,6 +110,7 @@
<li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
</ul>
+
<h5>About Apache</h5>
<ul>
<li><a href="http://www.apache.org" class="external-link" rel="nofollow">Apache main site</a></li>
@@ -117,6 +119,7 @@
<li><a href="http://www.apache.org/foundation/thanks.html" class="external-link" rel="nofollow">Thanks</a></li>
</ul>
+
<h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
<ul>
<li>No event</li>
Modified: websites/staging/mina/trunk/content/privacy-policy.html
==============================================================================
--- websites/staging/mina/trunk/content/privacy-policy.html (original)
+++ websites/staging/mina/trunk/content/privacy-policy.html Thu Aug 29 10:15:45 2013
@@ -78,7 +78,7 @@
<ul>
<li><a href="./downloads-mina.html">Mina 2.0.7</a></li>
<li><a href="./downloads-ftpserver.html">FtpServer 1.0.6</a></li>
- <li><a href="./downloads-sshd.html">SSHD 0.8.0</a></li>
+ <li><a href="./downloads-sshd.html">SSHD 0.9.0</a></li>
<li><a href="./downloads-vysper.html">Vysper 0.7</a></li>
</ul>
<h5>Projects</h5>
@@ -90,6 +90,7 @@
<li><a href="./vysper-project/index.html">Vysper</a></li>
</ul>
+
<h5>Community</h5>
<ul>
<li><a href="./contributors.html" class="external-link" rel="nofollow">Team</a></li>
@@ -101,6 +102,7 @@
<li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
</ul>
+
<h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
</div>
Modified: websites/staging/mina/trunk/content/special-thanks.html
==============================================================================
--- websites/staging/mina/trunk/content/special-thanks.html (original)
+++ websites/staging/mina/trunk/content/special-thanks.html Thu Aug 29 10:15:45 2013
@@ -78,7 +78,7 @@
<ul>
<li><a href="./downloads-mina.html">Mina 2.0.7</a></li>
<li><a href="./downloads-ftpserver.html">FtpServer 1.0.6</a></li>
- <li><a href="./downloads-sshd.html">SSHD 0.8.0</a></li>
+ <li><a href="./downloads-sshd.html">SSHD 0.9.0</a></li>
<li><a href="./downloads-vysper.html">Vysper 0.7</a></li>
</ul>
<h5>Projects</h5>
@@ -90,6 +90,7 @@
<li><a href="./vysper-project/index.html">Vysper</a></li>
</ul>
+
<h5>Community</h5>
<ul>
<li><a href="./contributors.html" class="external-link" rel="nofollow">Team</a></li>
@@ -101,6 +102,7 @@
<li><a href="http://www.apache.org/security/" class="external-link" rel="nofollow">Security</a></li>
</ul>
+
<h3><a name="Navigation-Upcoming"></a>Upcoming</h3>
</div>
Modified: websites/staging/mina/trunk/content/sshd-project/download_0.2.0.html
==============================================================================
--- websites/staging/mina/trunk/content/sshd-project/download_0.2.0.html (original)
+++ websites/staging/mina/trunk/content/sshd-project/download_0.2.0.html Thu Aug 29 10:15:45 2013
@@ -132,8 +132,7 @@ Please report any feedback to <a href="m
<li><a href="http://issues.apache.org/jira/browse/SSHD-35">SSHD-35</a> - EOF to stdin from ssh client isn't propagated to the command</li>
<li><a href="http://issues.apache.org/jira/browse/SSHD-37">SSHD-37</a> - When the terminal is created, the LINES and COLUMNS attributes are not set correctly</li>
<li><a href="http://issues.apache.org/jira/browse/SSHD-38">SSHD-38</a> - Typo that causes performance degradation with DEBUG-level logging enabled</li>
-<li><a href="http://issues.apache.org/jira/browse/SSHD-39">SSHD-39</a> - ScpCommand cannot handle recursive copy <br />
-</li>
+<li><a href="http://issues.apache.org/jira/browse/SSHD-39">SSHD-39</a> - ScpCommand cannot handle recursive copy </li>
</ul>
</li>
<li>Improvement<ul>
Modified: websites/staging/mina/trunk/content/sshd-project/download_0.3.0.html
==============================================================================
--- websites/staging/mina/trunk/content/sshd-project/download_0.3.0.html (original)
+++ websites/staging/mina/trunk/content/sshd-project/download_0.3.0.html Thu Aug 29 10:15:45 2013
@@ -136,8 +136,7 @@ Please report any feedback to <a href="m
<li><a href="http://issues.apache.org/jira/browse/SSHD-49">SSHD-49</a> - When a large amout of text is written to a Putty client it causes the client to hang.</li>
<li><a href="http://issues.apache.org/jira/browse/SSHD-53">SSHD-53</a> - Make sure PublickeyAuthenticator and PasswordAuthenticator interfaces are consistent</li>
<li><a href="http://issues.apache.org/jira/browse/SSHD-57">SSHD-57</a> - SCPCommand erroneously assumes file lenghts fit in integers.</li>
-<li><a href="http://issues.apache.org/jira/browse/SSHD-59">SSHD-59</a> - Possible stack overflow when closing a client channel <br />
-</li>
+<li><a href="http://issues.apache.org/jira/browse/SSHD-59">SSHD-59</a> - Possible stack overflow when closing a client channel </li>
</ul>
</li>
<li>Improvement<ul>
Modified: websites/staging/mina/trunk/content/sshd-project/download_0.4.0.html
==============================================================================
--- websites/staging/mina/trunk/content/sshd-project/download_0.4.0.html (original)
+++ websites/staging/mina/trunk/content/sshd-project/download_0.4.0.html Thu Aug 29 10:15:45 2013
@@ -138,8 +138,7 @@ Please report any feedback to <a href="m
<li><a href="https://issues.apache.org/jira/browse/SSHD-77">SSHD-77</a> - Accept SSH-2 names from Putty</li>
<li><a href="https://issues.apache.org/jira/browse/SSHD-78">SSHD-78</a> - PEMGeneratorHostKeyProvider doesn't close PEMWriter</li>
<li><a href="https://issues.apache.org/jira/browse/SSHD-79">SSHD-79</a> - ChannelPipedInputStream returns improper negative values for some bytes.</li>
-<li><a href="https://issues.apache.org/jira/browse/SSHD-80">SSHD-80</a> - Exchange hash calculation problem <br />
-</li>
+<li><a href="https://issues.apache.org/jira/browse/SSHD-80">SSHD-80</a> - Exchange hash calculation problem </li>
</ul>
</li>
<li>Improvement<ul>
Modified: websites/staging/mina/trunk/content/sshd-project/download_0.5.0.html
==============================================================================
--- websites/staging/mina/trunk/content/sshd-project/download_0.5.0.html (original)
+++ websites/staging/mina/trunk/content/sshd-project/download_0.5.0.html Thu Aug 29 10:15:45 2013
@@ -131,8 +131,7 @@ Please report any feedback to <a href="m
<ul>
<li>Bug<ul>
<li><a href="https://issues.apache.org/jira/browse/SSHD-93">SSHD-93</a> - Detect SSH_MSG_DISCONNECT</li>
-<li><a href="https://issues.apache.org/jira/browse/SSHD-94">SSHD-94</a> - Properly handle SFTP version communication <br />
-</li>
+<li><a href="https://issues.apache.org/jira/browse/SSHD-94">SSHD-94</a> - Properly handle SFTP version communication </li>
</ul>
</li>
<li>Improvement<ul>
Modified: websites/staging/mina/trunk/content/sshd-project/download_0.6.0.html
==============================================================================
--- websites/staging/mina/trunk/content/sshd-project/download_0.6.0.html (original)
+++ websites/staging/mina/trunk/content/sshd-project/download_0.6.0.html Thu Aug 29 10:15:45 2013
@@ -142,8 +142,7 @@ Please report any feedback to <a href="m
<li><a href="https://issues.apache.org/jira/browse/SSHD-115">SSHD-115</a> - Missing return handling SFTP SSH_FXP_OPEN cannot create error</li>
<li><a href="https://issues.apache.org/jira/browse/SSHD-116">SSHD-116</a> - Shouldn't throw an exception when receiving an unsupported SFTP message</li>
<li><a href="https://issues.apache.org/jira/browse/SSHD-122">SSHD-122</a> - SSH_MSG_CHANNEL_EOF SSH_MSG_CHANNEL_REQUEST("exit-status") after SSH_MSG_CHANNEL_CLOSE</li>
-<li><a href="https://issues.apache.org/jira/browse/SSHD-133">SSHD-133</a> - E command not handled for single file upload <br />
-</li>
+<li><a href="https://issues.apache.org/jira/browse/SSHD-133">SSHD-133</a> - E command not handled for single file upload </li>
</ul>
</li>
<li>Improvement<ul>
Modified: websites/staging/mina/trunk/content/sshd-project/load_ssh_editor.html
==============================================================================
--- websites/staging/mina/trunk/content/sshd-project/load_ssh_editor.html (original)
+++ websites/staging/mina/trunk/content/sshd-project/load_ssh_editor.html Thu Aug 29 10:15:45 2013
@@ -108,12 +108,12 @@
<h1 id="loading-sshd-in-eclipse-or-idea">Loading SSHD in Eclipse or IDEA</h1>
<p>If you want to debug or develop on SSHD, chances are you want to load it in your IDE. Most IDE now have some maven support (either natively or through plugins), but if you don't have those plugins installed, you can create the required project files using one of the following command:</p>
-<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">eclipse:eclipse</span>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">eclipse</span><span class="p">:</span><span class="n">eclipse</span>
</pre></div>
<p>or </p>
-<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">idea:idea</span>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">idea</span><span class="p">:</span><span class="n">idea</span>
</pre></div>
Modified: websites/staging/mina/trunk/content/sshd-project/tips.html
==============================================================================
--- websites/staging/mina/trunk/content/sshd-project/tips.html (original)
+++ websites/staging/mina/trunk/content/sshd-project/tips.html Thu Aug 29 10:15:45 2013
@@ -118,7 +118,7 @@
<p>This way, you can use the following:</p>
-<div class="codehilite"><pre><span class="n">ssh</span> <span class="o">-</span><span class="n">p</span> <span class="mi">8202</span> <span class="n">localhost</span> <span class="n">ls</span> <span class="o">-</span><span class="n">l</span>
+<div class="codehilite"><pre><span class="n">ssh</span> <span class="o">-</span><span class="n">p</span> 8202 <span class="n">localhost</span> <span class="n">ls</span> <span class="o">-</span><span class="n">l</span>
</pre></div>
</div><!-- rightColumn -->
Modified: websites/staging/mina/trunk/content/validating-release.html
==============================================================================
--- websites/staging/mina/trunk/content/validating-release.html (original)
+++ websites/staging/mina/trunk/content/validating-release.html Thu Aug 29 10:15:45 2013
@@ -78,7 +78,7 @@
<ul>
<li><a href="./downloads-mina.html">Mina 2.0.7</a></li>
<li><a href="./downloads-ftpserver.html">FtpServer 1.0.6</a></li>
- <li><a href="./downloads-sshd.html">SSHD 0.8.0</a></li>
+ <li><a href="./downloads-sshd.html">SSHD 0.9.0</a></li>
<li><a href="./downloads-vysper.html">Vysper 0.7</a></li>
</ul>
<h5>Projects</h5>
Modified: websites/staging/mina/trunk/content/vysper-project/download_0.5.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper-project/download_0.5.html (original)
+++ websites/staging/mina/trunk/content/vysper-project/download_0.5.html Thu Aug 29 10:15:45 2013
@@ -140,20 +140,20 @@
<li>Download the asc signature file for the relevant distribution</li>
<li>
<p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">pgpk</span> <span class="o">-</span><span class="n">a</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">pgpv</span> <span class="n">vysper</span><span class="o">-</span><span class="sr"><version></span><span class="o">-</span><span class="n">bin</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">pgpk</span> <span class="o">-</span><span class="n">a</span> <span class="n">KEYS</span>
+$ <span class="n">pgpv</span> <span class="n">vysper</span><span class="o">-<</span><span class="n">version</span><span class="o">>-</span><span class="n">bin</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
</pre></div>
<p>or</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">pgp</span> <span class="o">-</span><span class="n">ka</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">pgp</span> <span class="n">vysper</span><span class="o">-</span><span class="sr"><version></span><span class="o">-</span><span class="n">bin</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">pgp</span> <span class="o">-</span><span class="n">ka</span> <span class="n">KEYS</span>
+$ <span class="n">pgp</span> <span class="n">vysper</span><span class="o">-<</span><span class="n">version</span><span class="o">>-</span><span class="n">bin</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
</pre></div>
<p>or</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">gpg</span> <span class="o">--</span><span class="nb">import</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">gpg</span> <span class="o">--</span><span class="n">verify</span> <span class="n">vysper</span><span class="o">-</span><span class="sr"><version></span><span class="o">-</span><span class="n">bin</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">gpg</span> <span class="o">--</span><span class="n">import</span> <span class="n">KEYS</span>
+$ <span class="n">gpg</span> <span class="o">--</span><span class="n">verify</span> <span class="n">vysper</span><span class="o">-<</span><span class="n">version</span><span class="o">>-</span><span class="n">bin</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
</pre></div>
@@ -199,7 +199,7 @@
</tr>
</tbody>
</table>
-<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</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="sr">/tags/</span><span class="mf">0.5</span>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">mina</span><span class="o">/</span><span class="n">vysper</span><span class="o">/</span><span class="n">tags</span><span class="o">/</span>0<span class="p">.</span>5
</pre></div>
</div><!-- rightColumn -->
Modified: websites/staging/mina/trunk/content/vysper-project/download_0.6.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper-project/download_0.6.html (original)
+++ websites/staging/mina/trunk/content/vysper-project/download_0.6.html Thu Aug 29 10:15:45 2013
@@ -145,20 +145,20 @@
<li>Download the asc signature file for the relevant distribution</li>
<li>
<p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">pgpk</span> <span class="o">-</span><span class="n">a</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">pgpv</span> <span class="n">vysper</span><span class="o">-</span><span class="sr"><version></span><span class="o">-</span><span class="n">bin</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">pgpk</span> <span class="o">-</span><span class="n">a</span> <span class="n">KEYS</span>
+$ <span class="n">pgpv</span> <span class="n">vysper</span><span class="o">-<</span><span class="n">version</span><span class="o">>-</span><span class="n">bin</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
</pre></div>
<p>or</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">pgp</span> <span class="o">-</span><span class="n">ka</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">pgp</span> <span class="n">vysper</span><span class="o">-</span><span class="sr"><version></span><span class="o">-</span><span class="n">bin</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">pgp</span> <span class="o">-</span><span class="n">ka</span> <span class="n">KEYS</span>
+$ <span class="n">pgp</span> <span class="n">vysper</span><span class="o">-<</span><span class="n">version</span><span class="o">>-</span><span class="n">bin</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
</pre></div>
<p>or</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">gpg</span> <span class="o">--</span><span class="nb">import</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">gpg</span> <span class="o">--</span><span class="n">verify</span> <span class="n">vysper</span><span class="o">-</span><span class="sr"><version></span><span class="o">-</span><span class="n">bin</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">gpg</span> <span class="o">--</span><span class="n">import</span> <span class="n">KEYS</span>
+$ <span class="n">gpg</span> <span class="o">--</span><span class="n">verify</span> <span class="n">vysper</span><span class="o">-<</span><span class="n">version</span><span class="o">>-</span><span class="n">bin</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
</pre></div>
@@ -205,7 +205,7 @@
</tbody>
</table>
<h2 id="svn-tag-checkout">SVN Tag Checkout</h2>
-<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</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="sr">/tags/</span><span class="mf">0.6</span><span class="sr"></SPAN></span>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">mina</span><span class="o">/</span><span class="n">vysper</span><span class="o">/</span><span class="n">tags</span><span class="o">/</span>0<span class="p">.</span>6<span class="o"></</span><span class="n">SPAN</span><span class="o">></span>
</pre></div>
</div><!-- rightColumn -->
Modified: websites/staging/mina/trunk/content/vysper-project/download_0.7.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper-project/download_0.7.html (original)
+++ websites/staging/mina/trunk/content/vysper-project/download_0.7.html Thu Aug 29 10:15:45 2013
@@ -136,20 +136,20 @@
<li>Download the asc signature file for the relevant distribution</li>
<li>
<p>Verify the signatures using the following commands, depending on your use of PGP or GPG:</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">pgpk</span> <span class="o">-</span><span class="n">a</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">pgpv</span> <span class="n">vysper</span><span class="o">-</span><span class="sr"><version></span><span class="o">-</span><span class="n">bin</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">pgpk</span> <span class="o">-</span><span class="n">a</span> <span class="n">KEYS</span>
+$ <span class="n">pgpv</span> <span class="n">vysper</span><span class="o">-<</span><span class="n">version</span><span class="o">>-</span><span class="n">bin</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
</pre></div>
<p>or</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">pgp</span> <span class="o">-</span><span class="n">ka</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">pgp</span> <span class="n">vysper</span><span class="o">-</span><span class="sr"><version></span><span class="o">-</span><span class="n">bin</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">pgp</span> <span class="o">-</span><span class="n">ka</span> <span class="n">KEYS</span>
+$ <span class="n">pgp</span> <span class="n">vysper</span><span class="o">-<</span><span class="n">version</span><span class="o">>-</span><span class="n">bin</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
</pre></div>
<p>or</p>
-<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">gpg</span> <span class="o">--</span><span class="nb">import</span> <span class="n">KEYS</span>
-<span class="nv">$</span> <span class="nv">gpg</span> <span class="o">--</span><span class="n">verify</span> <span class="n">vysper</span><span class="o">-</span><span class="sr"><version></span><span class="o">-</span><span class="n">bin</span><span class="o">.</span><span class="n">tar</span><span class="o">.</span><span class="n">gz</span><span class="o">.</span><span class="n">asc</span>
+<div class="codehilite"><pre>$ <span class="n">gpg</span> <span class="o">--</span><span class="n">import</span> <span class="n">KEYS</span>
+$ <span class="n">gpg</span> <span class="o">--</span><span class="n">verify</span> <span class="n">vysper</span><span class="o">-<</span><span class="n">version</span><span class="o">>-</span><span class="n">bin</span><span class="p">.</span><span class="n">tar</span><span class="p">.</span><span class="n">gz</span><span class="p">.</span><span class="n">asc</span>
</pre></div>
Modified: websites/staging/mina/trunk/content/vysper-project/server_to_server_comm.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper-project/server_to_server_comm.html (original)
+++ websites/staging/mina/trunk/content/vysper-project/server_to_server_comm.html Thu Aug 29 10:15:45 2013
@@ -104,9 +104,10 @@
<h1 id="server-to-server">Server-to-server</h1>
-<p><DIV class="info" markdown="1">
+<DIV class="info" markdown="1">
Available since version 0.7.
-</DIV></p>
+</DIV>
+
<p>XMPP servers like Apache Vysper work in federated networks much like SMTP servers. Users connect to their own server, and when communicating with users on a different domain, the two servers will connect to each other and exchange XMPP stanzas. Server-to-server (S2S) connections differ from client-to-server (C2) connections in that stanzas for multiple users might be sent over the same connection. S2S connections are similar to C2S connections from the point that one of the servers serves as an initiator, like a client. To exchanges stanzas in both directions between servers, two connections are established.</p>
<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>
Modified: websites/staging/mina/trunk/content/vysper-project/socks5.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper-project/socks5.html (original)
+++ websites/staging/mina/trunk/content/vysper-project/socks5.html Thu Aug 29 10:15:45 2013
@@ -104,9 +104,10 @@
<h1 id="socks5-bytestream-module">SOCKS5 bytestream module</h1>
-<p><DIV class="info" markdown="1">
+<DIV class="info" markdown="1">
Available since version 0.7.
-</DIV></p>
+</DIV>
+
<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="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>
Modified: websites/staging/mina/trunk/content/vysper-project/test_client.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper-project/test_client.html (original)
+++ websites/staging/mina/trunk/content/vysper-project/test_client.html Thu Aug 29 10:15:45 2013
@@ -114,7 +114,7 @@ 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>
-<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>
+<div class="codehilite"><pre><span class="n">java</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">vysper</span><span class="p">.</span><span class="n">smack</span><span class="p">.</span><span class="n">BasicClient</span> <span class="n">user1</span> <span class="n">user2</span>
</pre></div>
</div><!-- rightColumn -->
Modified: websites/staging/mina/trunk/content/vysper-project/websocket_endpoint.html
==============================================================================
--- websites/staging/mina/trunk/content/vysper-project/websocket_endpoint.html (original)
+++ websites/staging/mina/trunk/content/vysper-project/websocket_endpoint.html Thu Aug 29 10:15:45 2013
@@ -104,9 +104,10 @@
<h1 id="websocket-endpoint">Websocket endpoint</h1>
-<p><DIV class="info" markdown="1">
+<DIV class="info" markdown="1">
Available since version 0.7.
-</DIV></p>
+</DIV>
+
<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="o">(</span><span class="s">"vysper.org"</span><span class="o">);</span>