You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2012/11/22 12:02:33 UTC

svn commit: r1412498 - in /mina/site/trunk: content/ content/ftpserver-project/ content/mina-project/ content/mina-project/userguide/ch17-spring-integration/ content/mina-project/userguide/ch2-basics/ content/mina-project/userguide/ch3-service/ content...

Author: elecharny
Date: Thu Nov 22 11:02:28 2012
New Revision: 1412498

URL: http://svn.apache.org/viewvc?rev=1412498&view=rev
Log:
Fixed many broken links
Added the mina-project/apidocs to replace the mina-project/javadocs in extpaths.txt
Added some images

Added:
    mina/site/trunk/content/ftpserver-project/sources.mdtext
      - copied unchanged from r1410874, mina/site/trunk/content/ftpserver-project/source.mdtext
    mina/site/trunk/content/staticresources/images/mina/selector-processor.graphml
    mina/site/trunk/content/staticresources/images/mina/selector-processor.png   (with props)
Removed:
    mina/site/trunk/content/ftpserver-project/source.mdtext
Modified:
    mina/site/trunk/content/extpaths.txt
    mina/site/trunk/content/ftpserver-project/configuration_listeners.mdtext
    mina/site/trunk/content/mina-project/codec-repo.mdtext
    mina/site/trunk/content/mina-project/developper-guide.mdtext
    mina/site/trunk/content/mina-project/documentation.mdtext
    mina/site/trunk/content/mina-project/related-projects.mdtext
    mina/site/trunk/content/mina-project/userguide/ch17-spring-integration/ch17-spring-integration.mdtext
    mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-client.mdtext
    mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-server.mdtext
    mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-udp-client.mdtext
    mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-udp-server.mdtext
    mina/site/trunk/content/mina-project/userguide/ch2-basics/server-architecture.mdtext
    mina/site/trunk/content/mina-project/userguide/ch3-service/acceptor.mdtext
    mina/site/trunk/content/mina-project/userguide/ch3-service/connector.mdtext
    mina/site/trunk/content/mina-project/userguide/ch3-service/io-service-details.mdtext
    mina/site/trunk/content/mina-project/userguide/ch3-service/io-service.mdtext
    mina/site/trunk/content/mina-project/userguide/ch5-filters/ch5-filters.mdtext
    mina/site/trunk/content/mina-project/userguide/ch6-transports/apr-transport.mdtext
    mina/site/trunk/content/mina-project/userguide/ch7-handler/ch7-handler.mdtext
    mina/site/trunk/content/mina-project/userguide/ch8-iobuffer/ch8-iobuffer.mdtext
    mina/site/trunk/content/mina-project/userguide/ch9-codec-filter/ch9-codec-filter.mdtext
    mina/site/trunk/content/sshd-project/download_0.1.0.mdtext
    mina/site/trunk/content/vysper-project/extending_server.mdtext
    mina/site/trunk/content/vysper-project/getting_involved.mdtext
    mina/site/trunk/templates/mina-project/navigation.html

Modified: mina/site/trunk/content/extpaths.txt
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/extpaths.txt?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/extpaths.txt (original)
+++ mina/site/trunk/content/extpaths.txt Thu Nov 22 11:02:28 2012
@@ -1,4 +1,5 @@
 mina-project/javadocs
+mina-project/apidocs
 mina-project/xref
 mina-project/xref-test
 

Modified: mina/site/trunk/content/ftpserver-project/configuration_listeners.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/ftpserver-project/configuration_listeners.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/ftpserver-project/configuration_listeners.mdtext (original)
+++ mina/site/trunk/content/ftpserver-project/configuration_listeners.mdtext Thu Nov 22 11:02:28 2012
@@ -117,7 +117,7 @@ This element provides configuration for 
 
 | Attribute | Description | Required | Default value |
 |---|---|---|---|
-| class="confluenceTd"> ports| The ports on which the server is allowed to accept passive data connections, see [Configure passive ports](configure-passive-ports.html) for details| No| Any available port |
+| class="confluenceTd"> ports| The ports on which the server is allowed to accept passive data connections, see [Configure passive ports](configure_passive_ports.html) for details| No| Any available port |
 | address| The address on which the server will listen to passive data connections| No| The same address as the control socket for the session |
 | external-address| The address the server will claim to be listening on in the PASV reply. Useful when the server is behind a NAT firewall and the client sees a different address than the server is using| No|   |
 

Modified: mina/site/trunk/content/mina-project/codec-repo.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/codec-repo.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/codec-repo.mdtext (original)
+++ mina/site/trunk/content/mina-project/codec-repo.mdtext Thu Nov 22 11:02:28 2012
@@ -45,5 +45,5 @@ The table below summarizes some of the k
 | SMTP | [MailsterSMTP](http://tedorg.free.fr/en/projects.php?section=smtp)</A> | SMTP Codecs |
 | AMQP | [Apache Qpid](http://cwiki.apache.org/qpid/)</A> | AMQP Codecs |
 | XMPP | <A href="" class="external-link" rel="nofollow">[Jive Software Openfire](http://www.jivesoftware.com/products/openfire/)| XMPP Codecs |
-	| XMPP | [Vysper](http://mina.apache.org/vysper)| XMPP/XML Codecs. Subproject of MINA. |
+	| XMPP | [Vysper](http://mina.apache.org/vysper-project)| XMPP/XML Codecs. Subproject of MINA. |
 | Google Protocol Buffers | Apache MINA | Codecs are still in [sandbox](http://svn.apache.org/repos/asf/mina/sandbox/protocol-buffers/)</A> |

Modified: mina/site/trunk/content/mina-project/developper-guide.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/developper-guide.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/developper-guide.mdtext (original)
+++ mina/site/trunk/content/mina-project/developper-guide.mdtext Thu Nov 22 11:02:28 2012
@@ -371,7 +371,7 @@ Update the links to new distributions in
 
 ### Step 8: Update related metadata file(s)
 
-Update [any related metadata file(s)](http://svn.apache.org/viewvc/mina/mina/metadata/).
+Update [any related metadata file(s)](http://svn.apache.org/viewvc/mina/metadata/).
 
 ### Step 9: Wait another 24 hours
 

Modified: mina/site/trunk/content/mina-project/documentation.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/documentation.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/documentation.mdtext (original)
+++ mina/site/trunk/content/mina-project/documentation.mdtext Thu Nov 22 11:02:28 2012
@@ -39,7 +39,7 @@ There are currently two branches in MINA
 
 |JavaDoc|Source Code|Description|
 |---|---|---|
-| [2.0](http://mina.apache.org/mina-project/javadocs/index.html) | [main](http://mina.apache.org/mina-project/xref/), [test](http://mina.apache.org/mina-project/xref-test/) | The officially recommended production-ready branch |
+| [2.0](http://mina.apache.org/mina-project/apidocs/index.html) | [main](http://mina.apache.org/mina-project/xref/), [test](http://mina.apache.org/mina-project/xref-test/) | The officially recommended production-ready branch |
 | 3.0 | [trunk](http://svn.apache.org/viewvc/mina/mina/trunk/)| The version we are currently working on |
 
 You might also want to read the [frequently asked questions](faq.html] and learn how to [contact us](../contact.html) before getting started.
@@ -69,7 +69,7 @@ You might also want to read the [frequen
 
 ## Examples
 
-You can browse all examples [here](http://mina.apache.org/report/trunk/xref/org/apache/mina/example/).
+You can browse all examples [here](http://mina.apache.org/mina-project/xref/org/apache/mina/example/).
 
 | Name | Feature it demonstrates | Side |
 |---|---|---|

Modified: mina/site/trunk/content/mina-project/related-projects.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/related-projects.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/related-projects.mdtext (original)
+++ mina/site/trunk/content/mina-project/related-projects.mdtext Thu Nov 22 11:02:28 2012
@@ -28,7 +28,7 @@ This page lists the projects which use A
 	The projects referred in this section 'Other network application frameworks' are <B>not</B> based on MINA but are their own network application frameworks.  These links are provided for users who want to compare MINA to other network application frameworks.
 </DIV>
 
-### [Grizzly](https://grizzly.dev.java.net/)
+### [Grizzly](https://grizzly.java.net/)
 
 Grizzly framework has been designed to help developers to take advantage of the Java™ NIO API. Originally developed under the GlassFish umbrella, the framework is now available as a standalone project. Grizzly goals is to help developers to build scalable and robust servers using NIO.
 
@@ -70,7 +70,7 @@ MailsterSMTP is designed to be a easy to
 
 ### [Jive Software Openfire](http://www.jivesoftware.com/products/openfire/)
 
-Jive Software Openfire implemented [XMPP (Extensible Messaging and Presence Protocol)](http://www.xmpp.org/) server on top of Apache MINA. After switching to Apache MINA, [they gained 11 times scalability boost](http://www.igniterealtime.org/blog/2006/12/19/scalability-turn-it-to-eleven/).
+Jive Software Openfire implemented [XMPP (Extensible Messaging and Presence Protocol)](http://www.xmpp.org/) server on top of Apache MINA. After switching to Apache MINA, [they gained 11 times scalability boost](http://community.igniterealtime.org/blogs/ignite/2006/12/19/scalability-turn-it-to-eleven/).
 
 ## Media Storage & Streaming
 

Modified: mina/site/trunk/content/mina-project/userguide/ch17-spring-integration/ch17-spring-integration.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch17-spring-integration/ch17-spring-integration.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch17-spring-integration/ch17-spring-integration.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch17-spring-integration/ch17-spring-integration.mdtext Thu Nov 22 11:02:28 2012
@@ -70,7 +70,7 @@ To integrate with Spring, we need to do 
 NOTE: The latest MINA releases doesn't have the package specific to Spring, like its earlier versions. The package is now named Integration Beans, to make the implementation work for all DI frameworks.
 
 Lets see the Spring xml file. Please see that I have removed generic part from xml and have put only the specific things needed to pull up the implementation.
-This example has been derived from [Chat example](http://svn.apache.org/viewvc/mina/branches/1.0/example/src/main/java/org/apache/mina/example/chat/) shipped with MINA release. Please refer the xml shipped with chat example.
+This example has been derived from [Chat example](http://svn.apache.org/viewvc/mina/mina/branches/2.0/example/src/main/java/org/apache/mina/example/chat/) shipped with MINA release. Please refer the xml shipped with chat example.
 
 Now lets pull things together
 

Modified: mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-client.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-client.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-client.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-client.mdtext Thu Nov 22 11:02:28 2012
@@ -26,7 +26,7 @@ Notice:    Licensed to the Apache Softwa
 
 We have seen the Client Architecture. Lets explore a sample Client implementation.
 
-We shall use [Sumup Client](http://mina.apache.org/report/trunk/xref/org/apache/mina/example/sumup/Client.html) as a reference implementation.
+We shall use [Sumup Client](http://mina.apache.org/mina-project/xref/org/apache/mina/example/sumup/Client.html) as a reference implementation.
 
 We will remove boiler plate code and concentrate on the important constructs. Below the code for the Client :
 
@@ -99,7 +99,7 @@ We add Filters to the Filter Chain for t
 	:::java
 	connector.setHandler(new ClientSessionHandler(values));
 
-Here we create an instance of [ClientSessionHandler](http://mina.apache.org/report/trunk/xref/org/apache/mina/example/sumup/ClientSessionHandler.html) and set it as a handler for the Connector.
+Here we create an instance of [ClientSessionHandler](http://mina.apache.org/mina-project/xref/org/apache/mina/example/sumup/ClientSessionHandler.html) and set it as a handler for the Connector.
 
 ## Bind to Server
 
@@ -119,5 +119,5 @@ Here we create an instance of [ClientSes
 		}
 	}
 
-Here is the most important stuff. We connect to remote Server. Since, connect is an async task, we use the [ConnectFuture](http://mina.apache.org/report/trunk/xref/org/apache/mina/core/future/ConnectFuture.html) class to know the when the connection is complete.
-Once the connection is complete, we get the associated [IoSession](http://mina.apache.org/report/trunk/xref/org/apache/mina/core/session/IoSession.html). To send any message to the Server, we shall have to write to the session. All responses/messages from server shall traverse the Filter chain and finally be handled in IoHandler.
+Here is the most important stuff. We connect to remote Server. Since, connect is an async task, we use the [ConnectFuture](http://mina.apache.org/mina-project/xref/org/apache/mina/core/future/ConnectFuture.html) class to know the when the connection is complete.
+Once the connection is complete, we get the associated [IoSession](http://mina.apache.org/mina-project/xref/org/apache/mina/core/session/IoSession.html). To send any message to the Server, we shall have to write to the session. All responses/messages from server shall traverse the Filter chain and finally be handled in IoHandler.

Modified: mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-server.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-server.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-server.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-tcp-server.mdtext Thu Nov 22 11:02:28 2012
@@ -36,7 +36,7 @@ This tutorial will walk you through the 
 
 For instance, slf4j-log4j12.jar and log4j-1.3.x.jar can not be used together, and will malfunction.
 
-We have tested this program on both Windows© 2000 professional and linux.  If you have any problems getting this program to work, please do not hesitate to [contact us]({{base}}contact.html) in order to talk to the MINA developers.  Also, this tutorial has tried to remain independent of development environments (IDE, editors..etc).  This tutorial will work with any environment that you are comfortable with.  Compilation commands and steps to execute the program have been removed for brevity.  If you need help learning how to either compile or execute java programs, please consult the [Java tutorial](http://java.sun.com/docs/books/tutorial/).
+We have tested this program on both Windows© 2000 professional and linux.  If you have any problems getting this program to work, please do not hesitate to [contact us](../../contact.html) in order to talk to the MINA developers.  Also, this tutorial has tried to remain independent of development environments (IDE, editors..etc).  This tutorial will work with any environment that you are comfortable with.  Compilation commands and steps to execute the program have been removed for brevity.  If you need help learning how to either compile or execute java programs, please consult the [Java tutorial](http://java.sun.com/docs/books/tutorial/).
 
 ## Writing the MINA time server 
 

Modified: mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-udp-client.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-udp-client.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-udp-client.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-udp-client.mdtext Thu Nov 22 11:02:28 2012
@@ -33,7 +33,7 @@ To implement the Client we need to do fo
 * Collect free memory
 * Send the Data to the Server
 
-We will begin by looking at the file [MemMonClient.java](http://mina.apache.org/report/trunk/xref/org/apache/mina/example/udp/client/MemMonClient.html), found in the org.apache.mina.example.udp.client java package. The first few lines of the code are simple and straightforward.
+We will begin by looking at the file [MemMonClient.java](http://mina.apache.org/mina-project/xref/org/apache/mina/example/udp/client/MemMonClient.html), found in the org.apache.mina.example.udp.client java package. The first few lines of the code are simple and straightforward.
 
 	:::java
     connector = new NioDatagramConnector();

Modified: mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-udp-server.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-udp-server.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-udp-server.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch2-basics/sample-udp-server.mdtext Thu Nov 22 11:02:28 2012
@@ -24,12 +24,12 @@ Notice:    Licensed to the Apache Softwa
 
 # Sample UDP Server
 
-We will begin by looking at the code found in the [org.apache.mina.example.udp](http://mina.apache.org/report/trunk/xref/org/apache/mina/example/udp/package-summary.html) package. To keep life simple, we shall concentrate on MINA related constructs only.
+We will begin by looking at the code found in the [org.apache.mina.example.udp](http://mina.apache.org/mina-project/xref/org/apache/mina/example/udp/package-summary.html) package. To keep life simple, we shall concentrate on MINA related constructs only.
 
 To construct the server, we shall have to do the following:
 
-1. Create a Datagram Socket to listen for incoming Client requests (See [MemoryMonitor.java](http://mina.apache.org/report/trunk/xref/org/apache/mina/example/udp/MemoryMonitor.html))
-2. Create an IoHandler to handle the MINA framework generated events (See [MemoryMonitorHandler.java](http://mina.apache.org/report/trunk/xref/org/apache/mina/example/udp/MemoryMonitorHandler.html))
+1. Create a Datagram Socket to listen for incoming Client requests (See [MemoryMonitor.java](http://mina.apache.org/mina-project/xref/org/apache/mina/example/udp/MemoryMonitor.html))
+2. Create an IoHandler to handle the MINA framework generated events (See [MemoryMonitorHandler.java](http://mina.apache.org/mina-project/xref/org/apache/mina/example/udp/MemoryMonitorHandler.html))
 
 Here is the first snippet that addresses Point# 1:
 

Modified: mina/site/trunk/content/mina-project/userguide/ch2-basics/server-architecture.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch2-basics/server-architecture.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch2-basics/server-architecture.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch2-basics/server-architecture.mdtext Thu Nov 22 11:02:28 2012
@@ -22,7 +22,7 @@ Notice:    Licensed to the Apache Softwa
 
 # Server Architecture
 
-We have exposed the **MINA** Application Architecture in the previous section. Let's now focus on the Server Architecture. Basically, a Server listens on a port for incoming requests, process them and send replies. It also creates and handles a session for each client (whenever we have a TCP or UDP based protocol), this will be explain more extensively in the [chapter 4](../ch4/ch4.html).
+We have exposed the **MINA** Application Architecture in the previous section. Let's now focus on the Server Architecture. Basically, a Server listens on a port for incoming requests, process them and send replies. It also creates and handles a session for each client (whenever we have a TCP or UDP based protocol), this will be explain more extensively in the [chapter 4](../ch4-session/ch4-session.html).
 
 ![](../../../staticresources/images/mina/Server_arch.png)
 

Modified: mina/site/trunk/content/mina-project/userguide/ch3-service/acceptor.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch3-service/acceptor.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch3-service/acceptor.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch3-service/acceptor.mdtext Thu Nov 22 11:02:28 2012
@@ -1,10 +1,10 @@
-Title: Chapter 8 - Acceptor
-NavUp: ../user-guide-toc.html
-NavUpText: User Guide
-NavPrev: ../ch7-handler/ch7-handler.html
-NavPrevText: Chapter 7 - Handler
-NavNext: ../ch9-connector/ch9-connector.html
-NavNextText: Chapter 9 - Connector
+Title: Acceptor
+NavUp: ../ch3-service.html
+NavUpText: Chapter 3 - Service
+NavPrev: io-service-details.html
+NavPrevText: IoService Details
+NavNext: connector.html
+NavNextText: Connector
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information
@@ -22,7 +22,7 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-# Chapter 8 - Acceptor
+# Acceptor
 
 In order to build a server, you need to select an implementation of the _IoAcceptor_ interface.
 

Modified: mina/site/trunk/content/mina-project/userguide/ch3-service/connector.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch3-service/connector.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch3-service/connector.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch3-service/connector.mdtext Thu Nov 22 11:02:28 2012
@@ -1,10 +1,10 @@
-Title: Chapter 9 - Connector
-NavUp: ../user-guide-toc.html
-NavUpText: User Guide
-NavPrev: ../ch8-acceptor/ch8-acceptor.html
-NavPrevText: Chapter 8 - Acceptor
-NavNext: ../ch10-iobuffer/ch10-iobuffer.html
-NavNextText: Chapter 10 - IoBuffer
+Title: Connector
+NavUp: ch3-service.html
+NavUpText: Chapter 3 - Service
+NavPrev: acceptor.html
+NavPrevText: cceptor
+NavNext: ../ch4-session/ch4-session.html
+NavNextText: Chapter 4 - Session
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information
@@ -22,7 +22,7 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-# Chapter 9 - Connector
+# Connector
 
 For client applications, you need to implement an implementation of the IoConnector interface.
 

Modified: mina/site/trunk/content/mina-project/userguide/ch3-service/io-service-details.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch3-service/io-service-details.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch3-service/io-service-details.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch3-service/io-service-details.mdtext Thu Nov 22 11:02:28 2012
@@ -1,8 +1,10 @@
-Title: IO Service
+Title: IoService Details
 NavUp: ch3-service.html
 NavUpText: Chapter 3 - Service
 NavPrev: io-service.html
 NavPrevText: IoService Introduction
+NavNext: acceptor.html
+NavNextText: Acceptor
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information

Modified: mina/site/trunk/content/mina-project/userguide/ch3-service/io-service.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch3-service/io-service.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch3-service/io-service.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch3-service/io-service.mdtext Thu Nov 22 11:02:28 2012
@@ -1,4 +1,4 @@
-Title: IO Service
+Title: IO Service Introduction
 NavUp: ch3-service.html
 NavUpText: Chapter 3 - Service
 NavNext: io-service-details.html
@@ -22,11 +22,11 @@ Notice:    Licensed to the Apache Softwa
 
 # IoService Introduction
 
-[IoService](http://mina.apache.org/report/trunk/xref/org/apache/mina/core/service/IoService.html) provides basic **I/O** Service and manages **I/O** Sessions within **MINA**. Its one of the most crucial part of **MINA** Architecture. The implementing classes of _IoService_ and child interface, are where most of the low level **I/O** operations are handled.
+[IoService](http://mina.apache.org/mina-project/xref/org/apache/mina/core/service/IoService.html) provides basic **I/O** Service and manages **I/O** Sessions within **MINA**. Its one of the most crucial part of **MINA** Architecture. The implementing classes of _IoService_ and child interface, are where most of the low level **I/O** operations are handled.
 
 # IoService Mind Map
 
-Let's try to see what are the responsibilities of the _IoService_ and it implementing class [AbstractIoService](http://mina.apache.org/report/trunk/xref/org/apache/mina/core/service/AbstractIoService.html). Let's take a slightly different approach of first using a [Mind Map](http://en.wikipedia.org/wiki/Mind_map) and then jump into the inner working. The Mind Map was created using [XMind](http://www.xmind.net/).
+Let's try to see what are the responsibilities of the _IoService_ and it implementing class [AbstractIoService](http://mina.apache.org/mina-project/xref/org/apache/mina/core/service/AbstractIoService.html). Let's take a slightly different approach of first using a [Mind Map](http://en.wikipedia.org/wiki/Mind_map) and then jump into the inner working. The Mind Map was created using [XMind](http://www.xmind.net/).
 
 ![](../../../staticresources/images/mina/IoService_mindmap.png)
 

Modified: mina/site/trunk/content/mina-project/userguide/ch5-filters/ch5-filters.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch5-filters/ch5-filters.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch5-filters/ch5-filters.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch5-filters/ch5-filters.mdtext Thu Nov 22 11:02:28 2012
@@ -42,26 +42,26 @@ We have many filters already written. Th
 
 | Filter | class | Description |
 |---|---|---|
-| Blacklist | [BlacklistFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/firewall/BlacklistFilter.html) | Blocks connections from blacklisted remote addresses<BR class="atl-forced-newline"> |
-| Buffered Write | [BufferedWriteFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/buffer/BufferedWriteFilter.html) | Buffers outgoing requests like the BufferedOutputStream does |
-| Compression | [CompressionFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/compression/CompressionFilter.html) | &nbsp; |
-| ConnectionThrottle | [ConnectionThrottleFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/firewall/ConnectionThrottleFilter.html) | &nbsp; |
-| ErrorGenerating | [ErrorGeneratingFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/errorgenerating/ErrorGeneratingFilter.html) | &nbsp; |
-| Executor | [ExecutorFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/executor/ExecutorFilter.html) | &nbsp; |
-| FileRegionWrite | [FileRegionWriteFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/stream/FileRegionWriteFilter.html) | &nbsp; |
-| KeepAlive | [KeepAliveFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/keepalive/KeepAliveFilter.html) | &nbsp; |
-| Logging | [LoggingFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/logging/LoggingFilter.html) | Logs event messages, like MessageReceived, MessageSent, SessionOpened, ... |
-| MDC Injection | [MdcInjectionFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/logging/MdcInjectionFilter.html) | Inject key IoSession properties into the MDC |
-| Noop | [NoopFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/util/NoopFilter.html) | A filter that does nothing. Useful for tests. |
-| Profiler | [ProfilerTimerFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/statistic/ProfilerTimerFilter.html) | Profile event messages, like MessageReceived, MessageSent, SessionOpened, ... |
-| ProtocolCodec | [ProtocolCodecFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/codec/ProtocolCodecFilter.html) | A filter in charge of encoding and decoding messages |
-| Proxy | [ProxyFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/proxy/filter/ProxyFilter.html) | &nbsp; |
-| Reference counting | [ReferenceCountingFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/util/ReferenceCountingFilter.html) | Keeps track of the number of usages of this filter |
-| RequestResponse | [RequestResponseFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/reqres/RequestResponseFilter.html) | &nbsp; |
-| SessionAttributeInitializing | [SessionAttributeInitializingFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/util/SessionAttributeInitializingFilter.html) | &nbsp; |
-| StreamWrite | [StreamWriteFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/stream/StreamWriteFilter.html) | &nbsp; |
-| SslFilter | [SslFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/ssl/SslFilter.html) | &nbsp; |
-| WriteRequest | [WriteRequestFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/util/WriteRequestFilter.html) | &nbsp; |
+| Blacklist | [BlacklistFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/firewall/BlacklistFilter.html) | Blocks connections from blacklisted remote addresses<BR class="atl-forced-newline"> |
+| Buffered Write | [BufferedWriteFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/buffer/BufferedWriteFilter.html) | Buffers outgoing requests like the BufferedOutputStream does |
+| Compression | [CompressionFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/compression/CompressionFilter.html) | &nbsp; |
+| ConnectionThrottle | [ConnectionThrottleFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/firewall/ConnectionThrottleFilter.html) | &nbsp; |
+| ErrorGenerating | [ErrorGeneratingFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/errorgenerating/ErrorGeneratingFilter.html) | &nbsp; |
+| Executor | [ExecutorFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/executor/ExecutorFilter.html) | &nbsp; |
+| FileRegionWrite | [FileRegionWriteFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/stream/FileRegionWriteFilter.html) | &nbsp; |
+| KeepAlive | [KeepAliveFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/keepalive/KeepAliveFilter.html) | &nbsp; |
+| Logging | [LoggingFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/logging/LoggingFilter.html) | Logs event messages, like MessageReceived, MessageSent, SessionOpened, ... |
+| MDC Injection | [MdcInjectionFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/logging/MdcInjectionFilter.html) | Inject key IoSession properties into the MDC |
+| Noop | [NoopFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/util/NoopFilter.html) | A filter that does nothing. Useful for tests. |
+| Profiler | [ProfilerTimerFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/statistic/ProfilerTimerFilter.html) | Profile event messages, like MessageReceived, MessageSent, SessionOpened, ... |
+| ProtocolCodec | [ProtocolCodecFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/codec/ProtocolCodecFilter.html) | A filter in charge of encoding and decoding messages |
+| Proxy | [ProxyFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/proxy/filter/ProxyFilter.html) | &nbsp; |
+| Reference counting | [ReferenceCountingFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/util/ReferenceCountingFilter.html) | Keeps track of the number of usages of this filter |
+| RequestResponse | [RequestResponseFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/reqres/RequestResponseFilter.html) | &nbsp; |
+| SessionAttributeInitializing | [SessionAttributeInitializingFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/util/SessionAttributeInitializingFilter.html) | &nbsp; |
+| StreamWrite | [StreamWriteFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/stream/StreamWriteFilter.html) | &nbsp; |
+| SslFilter | [SslFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/ssl/SslFilter.html) | &nbsp; |
+| WriteRequest | [WriteRequestFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/util/WriteRequestFilter.html) | &nbsp; |
 
 ## Overriding Events Selectively
 
@@ -126,7 +126,7 @@ What about String-to-ByteBuffer transfor
 		}
 	}
 
-If you are using MINA 2.0, it will be somewhat different from 1.0 and 1.1. Please refer to [CompressionFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/compression/CompressionFilter.html) and [RequestResponseFilter](http://mina.apache.org/report/trunk/xref/org/apache/mina/filter/reqres/RequestResponseFilter.html) meanwhile.
+If you are using MINA 2.0, it will be somewhat different from 1.0 and 1.1. Please refer to [CompressionFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/compression/CompressionFilter.html) and [RequestResponseFilter](http://mina.apache.org/mina-project/xref/org/apache/mina/filter/reqres/RequestResponseFilter.html) meanwhile.
 
 ## Be Careful When Filtering sessionCreated Event
 

Modified: mina/site/trunk/content/mina-project/userguide/ch6-transports/apr-transport.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch6-transports/apr-transport.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch6-transports/apr-transport.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch6-transports/apr-transport.mdtext Thu Nov 22 11:02:28 2012
@@ -37,7 +37,7 @@ Notice:    Licensed to the Apache Softwa
 
 ## Using APR Transport
 
-Refer [Time Server](http://mina.apache.org/report/trunk/xref/org/apache/mina/example/gettingstarted/timeserver/) example for complete source
+Refer [Time Server](http://mina.apache.org/mina-project/xref/org/apache/mina/example/gettingstarted/timeserver/) example for complete source
 
 Lets see how NIO based Time server implementation looks like
 

Modified: mina/site/trunk/content/mina-project/userguide/ch7-handler/ch7-handler.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch7-handler/ch7-handler.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch7-handler/ch7-handler.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch7-handler/ch7-handler.mdtext Thu Nov 22 11:02:28 2012
@@ -3,7 +3,7 @@ NavUp: ../user-guide-toc.html
 NavUpText: User Guide
 NavPrev: ../ch6-transports/ch6-transports.html
 NavPrevText: Chapter 6 - Transports
-NavNext: ../ch8-iobuffer/ch8-obuffer.html
+NavNext: ../ch8-iobuffer/ch8-iobuffer.html
 NavNextText: Chapter 8 - IoBuffer
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file

Modified: mina/site/trunk/content/mina-project/userguide/ch8-iobuffer/ch8-iobuffer.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch8-iobuffer/ch8-iobuffer.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch8-iobuffer/ch8-iobuffer.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch8-iobuffer/ch8-iobuffer.mdtext Thu Nov 22 11:02:28 2012
@@ -57,7 +57,7 @@ The allocate() method takes one or two a
 * __capacity__ - the capacity of the buffer
 * __direct__ - type of buffer. true to get direct buffer, false to get heap buffer
 
-The default buffer allocation is handled by [SimpleBufferAllocator](http://mina.apache.org/report/trunk/xref/org/apache/mina/core/buffer/SimpleBufferAllocator.html)
+The default buffer allocation is handled by [SimpleBufferAllocator](http://mina.apache.org/mina-project/xref/org/apache/mina/core/buffer/SimpleBufferAllocator.html)
 
 Alternatively, following form can also be used
 

Modified: mina/site/trunk/content/mina-project/userguide/ch9-codec-filter/ch9-codec-filter.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/userguide/ch9-codec-filter/ch9-codec-filter.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/userguide/ch9-codec-filter/ch9-codec-filter.mdtext (original)
+++ mina/site/trunk/content/mina-project/userguide/ch9-codec-filter/ch9-codec-filter.mdtext Thu Nov 22 11:02:28 2012
@@ -131,7 +131,7 @@ Remarks:
 * MINA will call the encode function for all messages in the IoSession's write queue. Since our client will only write ImageRequest objects, we can safely cast message to ImageRequest.
 * We allocate a new IoBuffer from the heap. It's best to avoid using direct buffers, since generally heap buffers perform better.
  see <http://issues.apache.org/jira/browse/DIRMINA-289>)
-* You do not have to release the buffer, MINA will do it for you, see <http://mina.apache.org/report/trunk/apidocs/org/apache/mina/common/IoBuffer.html>
+* You do not have to release the buffer, MINA will do it for you, see <http://mina.apache.org/mina-project/apidocs/org/apache/mina/common/IoBuffer.html>
 * In the dispose() method you should release all resources acquired during encoding for the specified session. If there is nothing to dispose you could let your encoder inherit from ProtocolEncoderAdapter.
 
 Now let's have a look at the decoder. The CumulativeProtocolDecoder is a great help for writing your own decoder: it will buffer all incoming data until your decoder decides it can do something with it.

Modified: mina/site/trunk/content/sshd-project/download_0.1.0.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/sshd-project/download_0.1.0.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/sshd-project/download_0.1.0.mdtext (original)
+++ mina/site/trunk/content/sshd-project/download_0.1.0.mdtext Thu Nov 22 11:02:28 2012
@@ -26,7 +26,7 @@ Apache Mina SSHD 0.1.0 contains a few en
 * Source distributions:
     * [Apache Mina SSHD 0.1.0 Sources (.tar.gz)](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.tar.gz) [PGP](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.tar.gz.asc) [SHA](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.tar.gz.sha1) [MD5](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.tar.gz.md5)
     * [Apache Mina SSHD 0.1.0 Sources (.zip)](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.zip) [PGP](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.zip.asc) [SHA](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.zip.sha1) [MD5](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.zip.md5)
-    * [Apache Mina SSHD 0.1.0 Sources (.bz2)](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.bz2) [PGP](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.bz2.asc) [SHA](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.bz2.sha1) [MD5](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.bz2.md5)
+    * [Apache Mina SSHD 0.1.0 Sources (.bz2)](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.tar.bz2) [PGP](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.tar.bz2.asc) [SHA](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.tar.bz2.sha1) [MD5](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-0.1.0-project.tar.bz2.md5)
 * Individual jars:
     * [Apache Mina SSHD Core 0.1.0 (.jar)](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-core-0.1.0.jar) [PGP](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-core-0.1.0.jar.asc) [SHA](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-core-0.1.0.jar.sha1) [MD5](http://archive.apache.org/dist/mina/sshd/0.1.0/sshd-core-0.1.0.jar.md5)
 

Added: mina/site/trunk/content/staticresources/images/mina/selector-processor.graphml
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/staticresources/images/mina/selector-processor.graphml?rev=1412498&view=auto
==============================================================================
--- mina/site/trunk/content/staticresources/images/mina/selector-processor.graphml (added)
+++ mina/site/trunk/content/staticresources/images/mina/selector-processor.graphml Thu Nov 22 11:02:28 2012
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
+  <!--Created by yFiles for Java 2.9-->
+  <key for="graphml" id="d0" yfiles.type="resources"/>
+  <key for="port" id="d1" yfiles.type="portgraphics"/>
+  <key for="port" id="d2" yfiles.type="portgeometry"/>
+  <key for="port" id="d3" yfiles.type="portuserdata"/>
+  <key attr.name="url" attr.type="string" for="node" id="d4"/>
+  <key attr.name="description" attr.type="string" for="node" id="d5"/>
+  <key for="node" id="d6" yfiles.type="nodegraphics"/>
+  <key attr.name="Description" attr.type="string" for="graph" id="d7"/>
+  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
+  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
+  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
+  <graph edgedefault="directed" id="G">
+    <data key="d7"/>
+    <node id="n0">
+      <data key="d5"/>
+      <data key="d6">
+        <y:GenericNode configuration="ShinyPlateNodeWithShadow">
+          <y:Geometry height="132.0" width="165.0" x="105.0" y="121.0"/>
+          <y:Fill color="#FFFF99" transparent="false"/>
+          <y:BorderStyle hasColor="false" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="internal" modelPosition="tr" textColor="#000000" visible="true" width="55.580078125" x="105.419921875" y="4.0">Acceptor</y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n1">
+      <data key="d5"/>
+      <data key="d6">
+        <y:GenericNode configuration="BevelNode2">
+          <y:Geometry height="30.0" width="90.0" x="120.5" y="152.0"/>
+          <y:Fill color="#FF9900" transparent="false"/>
+          <y:BorderStyle hasColor="false" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="50.21875" x="19.890625" y="5.93359375">Selector<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n2">
+      <data key="d5"/>
+      <data key="d6">
+        <y:GenericNode configuration="ShinyPlateNodeWithShadow">
+          <y:Geometry height="132.0" width="165.0" x="530.0" y="121.0"/>
+          <y:Fill color="#FFFF99" transparent="false"/>
+          <y:BorderStyle hasColor="false" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="internal" modelPosition="tr" textColor="#000000" visible="true" width="60.26171875" x="100.73828125" y="4.0">Processor</y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n3">
+      <data key="d5"/>
+      <data key="d6">
+        <y:GenericNode configuration="BevelNode2">
+          <y:Geometry height="30.0" width="90.0" x="545.5" y="152.0"/>
+          <y:Fill color="#FF9900" transparent="false"/>
+          <y:BorderStyle hasColor="false" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="50.21875" x="19.890625" y="5.93359375">Selector<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n4">
+      <data key="d5"/>
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="132.0" width="21.0" x="383.2294705803698" y="278.95340516932737"/>
+          <y:Fill color="#339966" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="free" modelPosition="anywhere" textColor="#000000" visible="true" width="97.15234375" x="-38.076171875" y="-22.1328125">Accepted queue</y:NodeLabel>
+          <y:Shape type="rectangle3d"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <node id="n5">
+      <data key="d5"/>
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="113.31849579719568" width="21.0" x="383.2294705803698" y="297.63490937213163"/>
+          <y:Fill color="#99CC00" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" modelName="custom" textColor="#000000" visible="true" width="4.0" x="8.5" y="54.65924789859781">
+            <y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="rectangle3d"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <node id="n6">
+      <data key="d5"/>
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="94.61473529018485" width="21.0" x="383.2294705803698" y="316.33866987914246"/>
+          <y:Fill color="#99CC00" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" modelName="custom" textColor="#000000" visible="true" width="4.0" x="8.5" y="45.30736764509243">
+            <y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="rectangle3d"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <node id="n7">
+      <data key="d5"/>
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="75.91097478317403" width="21.0" x="383.2294705803698" y="335.0424303861533"/>
+          <y:Fill color="#99CC00" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" modelName="custom" textColor="#000000" visible="true" width="4.0" x="8.5" y="35.955487391586985">
+            <y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="rectangle3d"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <node id="n8">
+      <data key="d5"/>
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="57.2072142761632" width="21.0" x="383.2294705803698" y="353.7461908931641"/>
+          <y:Fill color="#99CC00" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" modelName="custom" textColor="#000000" visible="true" width="4.0" x="8.5" y="26.6036071380816">
+            <y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="rectangle3d"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <node id="n9">
+      <data key="d5"/>
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="38.50345376915243" width="21.0" x="383.2294705803698" y="372.44995140017494"/>
+          <y:Fill color="#99CC00" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" modelName="custom" textColor="#000000" visible="true" width="4.0" x="8.5" y="17.251726884576215">
+            <y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="rectangle3d"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <node id="n10">
+      <data key="d5"/>
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="19.799693262141545" width="21.0" x="383.2294705803698" y="391.15371190718577"/>
+          <y:Fill color="#99CC00" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" modelName="custom" textColor="#000000" visible="true" width="4.0" x="8.5" y="7.899846631070773">
+            <y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="rectangle3d"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <node id="n11">
+      <data key="d5"/>
+      <data key="d6">
+        <y:GenericNode configuration="ShinyPlateNodeWithShadow">
+          <y:Geometry height="30.0" width="108.0" x="575.5" y="203.0"/>
+          <y:Fill color="#CCFFCC" transparent="false"/>
+          <y:BorderStyle hasColor="false" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="custom" textColor="#000000" visible="true" width="67.298828125" x="20.3505859375" y="5.93359375">processing<y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+        </y:GenericNode>
+      </data>
+    </node>
+    <node id="n12">
+      <data key="d5"/>
+      <data key="d6">
+        <y:ShapeNode>
+          <y:Geometry height="30.0" width="30.0" x="150.5" y="-20.0"/>
+          <y:Fill color="#FFCC99" transparent="false"/>
+          <y:BorderStyle color="#000000" type="line" width="1.0"/>
+          <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" hasText="false" height="4.0" modelName="custom" textColor="#000000" visible="true" width="4.0" x="13.0" y="13.0">
+            <y:LabelModel>
+              <y:SmartNodeLabelModel distance="4.0"/>
+            </y:LabelModel>
+            <y:ModelParameter>
+              <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+            </y:ModelParameter>
+          </y:NodeLabel>
+          <y:Shape type="ellipse"/>
+        </y:ShapeNode>
+      </data>
+    </node>
+    <edge id="e0" source="n1" target="n4">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="-10.49822177034332" ty="-57.95340516932737">
+            <y:Point x="165.5" y="287.0"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:EdgeLabel alignment="center" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="six_pos" modelPosition="tail" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="249.37890625" x="-20.38721783481509" y="107.029296875">(1) Add the new selectionKey in the queue</y:EdgeLabel>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e1" source="n1" target="n3">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:EdgeLabel alignment="center" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="six_pos" modelPosition="tail" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="205.64453125" x="64.67193603515625" y="2.0">(2) Wake up the processor selector</y:EdgeLabel>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e2" source="n11" target="n4">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="10.474091644935129" ty="-55.96959600743713">
+            <y:Point x="629.5" y="288.98380916189024"/>
+            <y:Point x="495.5" y="288.98380916189024"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="transparent_circle"/>
+          <y:EdgeLabel alignment="center" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="six_pos" modelPosition="tail" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="142.83203125" x="-138.416015625" y="57.975996661890235">(3) handle new sessions</y:EdgeLabel>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e3" source="n3" target="n11">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="white_delta"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e4" source="n12" target="n1">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:EdgeLabel alignment="center" distance="2.0" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" modelName="six_pos" modelPosition="tail" preferredPlacement="anywhere" ratio="0.5" textColor="#000000" visible="true" width="96.61328125" x="2.0" y="61.93359375">New connection</y:EdgeLabel>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+  </graph>
+  <data key="d0">
+    <y:Resources/>
+  </data>
+</graphml>

Added: mina/site/trunk/content/staticresources/images/mina/selector-processor.png
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/staticresources/images/mina/selector-processor.png?rev=1412498&view=auto
==============================================================================
Binary file - no diff available.

Propchange: mina/site/trunk/content/staticresources/images/mina/selector-processor.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: mina/site/trunk/content/vysper-project/extending_server.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/vysper-project/extending_server.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/vysper-project/extending_server.mdtext (original)
+++ mina/site/trunk/content/vysper-project/extending_server.mdtext Thu Nov 22 11:02:28 2012
@@ -29,7 +29,7 @@ Most XMPP extensions rely on Disco (Serv
 It's easy to integrate modules with Vysper's Disco extension.
 
 Most XMPP extensions rely on Disco ([Service Discovery, XEP-0030](http://xmpp.org/extensions/xep-0030.html)).
-It's easy to integrate modules with [Vysper's Disco extension](http://mina.apache.org/vysper/service-discovery.html).
+It's easy to integrate modules with [Vysper's Disco extension](http://mina.apache.org/vysper/service_discovery.html).
 
 ## Modules
 

Modified: mina/site/trunk/content/vysper-project/getting_involved.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/vysper-project/getting_involved.mdtext?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/content/vysper-project/getting_involved.mdtext (original)
+++ mina/site/trunk/content/vysper-project/getting_involved.mdtext Thu Nov 22 11:02:28 2012
@@ -19,7 +19,7 @@ Notice:    Licensed to the Apache Softwa
 
 # Getting Involved
 
-The Apache Vysper developers communicates using our [Mailing Lists](mailing_lists.html). If you have any questions, feedback or suggestions, you're very welcome to join the list and send an email. We are also happy to receive [bug reports and feature requests in our JIRA]({{base}}vysper/issue_tracking.html).
+The Apache Vysper developers communicates using our [Mailing Lists](mailing_lists.html). If you have any questions, feedback or suggestions, you're very welcome to join the list and send an email. We are also happy to receive [bug reports and feature requests in our JIRA](issue_tracking.html).
 
 ## Patches
 

Modified: mina/site/trunk/templates/mina-project/navigation.html
URL: http://svn.apache.org/viewvc/mina/site/trunk/templates/mina-project/navigation.html?rev=1412498&r1=1412497&r2=1412498&view=diff
==============================================================================
--- mina/site/trunk/templates/mina-project/navigation.html (original)
+++ mina/site/trunk/templates/mina-project/navigation.html Thu Nov 22 11:02:28 2012
@@ -20,7 +20,7 @@
       <li><a href="{{base}}mina-project/mailing-lists.html" class="external-link" rel="nofollow">Mailing lists &amp; IRC</a></li>
       <li><a href="{{base}}mina-project/issue-tracking.html" class="external-link" rel="nofollow">Issue tracking</a></li>
       <li><a href="{{base}}mina-project/sources.html" class="external-link" rel="nofollow">Sources</a></li>
-      <li><a href="{{base}}mina-project/javadocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
+      <li><a href="{{base}}mina-project/apidocs/index.html" class="external-link" rel="nofollow">API Javadoc</a></li>
       <li><a href="{{base}}mina-project/performances.html" class="external-link" rel="nofollow">Performances</a></li>
       <li><a href="{{base}}mina-project/testimonials.html" class="external-link" rel="nofollow">Testimonials</a></li>
       <li><a href="{{base}}mina-project/conferences.html" class="external-link" rel="nofollow">Conferences</a></li>