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/15 14:42:14 UTC
svn commit: r1409772 - in /mina/site/trunk/content: extpaths.txt mina-project/conferences.mdtext mina-project/developper-guide.mdtext

Author: elecharny
Date: Thu Nov 15 13:42:13 2012
New Revision: 1409772

URL: http://svn.apache.org/viewvc?rev=1409772&view=rev
Log:
Updated some pages

Modified:
    mina/site/trunk/content/extpaths.txt
    mina/site/trunk/content/mina-project/conferences.mdtext
    mina/site/trunk/content/mina-project/developper-guide.mdtext

Modified: mina/site/trunk/content/extpaths.txt
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/extpaths.txt?rev=1409772&r1=1409771&r2=1409772&view=diff
==============================================================================
--- mina/site/trunk/content/extpaths.txt (original)
+++ mina/site/trunk/content/extpaths.txt Thu Nov 15 13:42:13 2012
@@ -1,2 +1,2 @@
-mina/javadocs
+mina-project/javadocs
 

Modified: mina/site/trunk/content/mina-project/conferences.mdtext
URL: http://svn.apache.org/viewvc/mina/site/trunk/content/mina-project/conferences.mdtext?rev=1409772&r1=1409771&r2=1409772&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/conferences.mdtext (original)
+++ mina/site/trunk/content/mina-project/conferences.mdtext Thu Nov 15 13:42:13 2012
@@ -19,13 +19,13 @@ Notice:    Licensed to the Apache Softwa
 # Presentation Materials
 These presentation materials will help you understand the overall architecture and core constructs of MINA.
 
-* [MINA in real life](./staticresources/pdfs/Mina_in_real_life_ASEU-2009.pdf) (ApacheCon EU 2009) by Emmanuel L&eacute;charny
-* [Rapid Network Application Development with Apache MINA](./staticresources/pdfs/JavaOne2008.pdf) (JavaOne 2008) by Trustin Lee
-* [Apache MINA - The High Performance Protocol Construction Toolkit](./staticresources/pdfs/ACUS2007.pdf) (ApacheCon US 2007) by Peter Royal
-* [Introduction to MINA (ApacheCon Asia 2006)](./staticresources/pdfs/ACAsia2006.pdf) by Trustin Lee
+* [MINA in real life](../staticresources/pdfs/Mina_in_real_life_ASEU-2009.pdf) (ApacheCon EU 2009) by Emmanuel L&eacute;charny
+* [Rapid Network Application Development with Apache MINA](../staticresources/pdfs/JavaOne2008.pdf) (JavaOne 2008) by Trustin Lee
+* [Apache MINA - The High Performance Protocol Construction Toolkit](../staticresources/pdfs/ACUS2007.pdf) (ApacheCon US 2007) by Peter Royal
+* [Introduction to MINA (ApacheCon Asia 2006)](../staticresources/pdfs/ACAsia2006.pdf) by Trustin Lee
 
 # Other Presentation Materials
 
-* [Building TCP/IP Servers with Apache MINA](./staticresources/pdfs/ACEU2007.pdf) (ApacheCon EU 2007) by Peter Royal
-* [Building TCP/IP Servers with Apache MINA](./staticresources/pdfs/ACEU2006.pdf) (ApacheCon EU 2006) by Peter Royal
-* [Introduction to MINA](./staticresources/pdfs/ACUS2005.pdf) (ApacheCon US 2005) by Trustin Lee [Demo movie](./staticresources/pdfs/ACUS2005.swf)
+* [Building TCP/IP Servers with Apache MINA](../staticresources/pdfs/ACEU2007.pdf) (ApacheCon EU 2007) by Peter Royal
+* [Building TCP/IP Servers with Apache MINA](../staticresources/pdfs/ACEU2006.pdf) (ApacheCon EU 2006) by Peter Royal
+* [Introduction to MINA](../staticresources/pdfs/ACUS2005.pdf) (ApacheCon US 2005) by Trustin Lee [Demo movie](../staticresources/pdfs/ACUS2005.swf)

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=1409772&r1=1409771&r2=1409772&view=diff
==============================================================================
--- mina/site/trunk/content/mina-project/developper-guide.mdtext (original)
+++ mina/site/trunk/content/mina-project/developper-guide.mdtext Thu Nov 15 13:42:13 2012
@@ -26,9 +26,9 @@ Notice:    Licensed to the Apache Softwa
 
 # Checking out the code
 
-You need [Subversion](http://subversion.tigris.org) to check out the source code from our source code repository, and [Maven(http://maven.apache.org/) 2.2.1 to build the source code (Building with Maven 3.0 will also work).  The following example shows how to build [the current stable branch (2.0.7)](http://svn.apache.org/viewvc/mina/tags/2.0.4/).
+You need [Subversion](http://subversion.tigris.org) to check out the source code from our source code repository, and [Maven(http://maven.apache.org/) 2.2.1 to build the source code (Building with Maven 3.0 will also work).  The following example shows how to build [the current stable branch (2.0.7)](http://svn.apache.org/viewvc/mina/mina/tags/2.0.7/).
 
-    $ svn co https://svn.apache.org/repos/asf/mina/tags/2.0.7/ mina
+    $ svn co https://svn.apache.org/repos/asf/mina/mina/tags/2.0.7/ mina
     $ cd mina
     $ mvn -Pserial clean install             # Build packages (JARs) for the core API and other 
                                              # extensions and install them to the local Maven repository.
@@ -42,7 +42,7 @@ You can declare new variables in Eclipse
 
 There are also other branches that might interest you:
 
-* trunk: [Where big changes take place everyday](http://svn.apache.org/viewvc/mina/mina/trunk/) - `http://svn.apache.org/repos/asf/mina/minatrunk/`
+* trunk: [Where big changes take place everyday](http://svn.apache.org/viewvc/mina/mina/trunk/) - `http://svn.apache.org/repos/asf/mina/mina/trunk/`
 
 If you want to check out the source code of previous releases, you could try:
 
@@ -70,12 +70,12 @@ The headers revisions tags are removed.
 
 Just running `mvn -Pserial eclipse:eclipse` won't allow you to import MINA projects from more than one branches into one Eclipse workspace.  You have to rename all project names in the generated `.project` and `.classpath` files to do that.  Maven Eclipse plugin should provide an option that appends the version number to the project name, but [this issue](http://jira.codehaus.org/browse/MECLIPSE-189) is not being resolved yet.  Until this issue is resolved, please put the attached shell script files ((mvnroot) and (mvn-eclipse)) to your local path (e.g. `/usr/local/bin`) and run `mvn-eclipse`.
 
-    $ svn co https://svn.apache.org/repos/asf/mina/mina mina
-    $ cd mina/2.0.7
+    $ svn co https://svn.apache.org/repos/asf/mina mina
+    $ cd mina/tags/2.0.7
     $ mvn-eclipse
     $ cd ../2.0.5
     $ mvn-eclipse
-    $ cd ../trunk
+    $ cd ../../trunk
     $ mvn-eclipse
 
 Then `mvn eclipse:eclipse` command is executed internally, and the branch name will be appended to all sub-module project files generated by Maven Eclipse plugin.
@@ -357,7 +357,7 @@ You can officially close the vote now. T
 
 ### Step 3: Deploy Web Reports (JavaDoc and JXR)
 
-    $ svn co https://svn.apache.org/repos/asf/mina/tags/<version> mina
+    $ svn co https://svn.apache.org/repos/asf/mina/mina/tags/<version> mina
     $ cd mina
     $ mvn -Pserial clean compile site site:deploy
 
@@ -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/metadata/).
+Update [any related metadata file(s)](http://svn.apache.org/viewvc/mina/mina/metadata/).
 
 ### Step 9: Wait another 24 hours
 
@@ -390,9 +390,9 @@ When you create a new branch, you have t
     <version>1.1.0-SNAPSHOT</version>
     ...
     <scm>
-      <connection>scm:svn:http://svn.apache.org/repos/asf/mina/branches/1.1</connection>
-      <url>http://svn.apache.org/viewvc/directory/mina/branches/1.1</url>
-      <developerConnection>scm:svn:https://svn.apache.org/repos/asf/mina/branches/1.1</developerConnection>
+      <connection>scm:svn:http://svn.apache.org/repos/asf/mina/mina/branches/2.0</connection>
+      <url>http://svn.apache.org/viewvc/directory/mina/mina/branches/2.0</url>
+      <developerConnection>scm:svn:https://svn.apache.org/repos/asf/mina/mina/branches/2.0</developerConnection>
     </scm>
     ...
     <distributionManagement>
@@ -403,4 +403,4 @@ When you create a new branch, you have t
     </distributionManagement>
     ...
 
-Please note that the example above is for `branches/1.1`.  For example, you have to replace `branches/1.1` with `branches/3.0` if the version number of the new branch is 3.0.  In case of `trunk`, it's just `trunk` rather than `branches/<version>`.
+Please note that the example above is for `branches/2.0`.  For example, you have to replace `branches/2.0` with `branches/3.0` if the version number of the new branch is 3.0.  In case of `trunk`, it's just `trunk` rather than `branches/<version>`.