svn commit: r1174924 - in /portals/site/jetspeed/jetspeed-2.2: jetspeed-guide-build/src/site/xdoc/jetspeed-archetype.xml jetspeed-guide-build/src/site/xdoc/maven-2-build.xml src/site/xdoc/getting-started-installer.xml

Author: woonsan
Date: Fri Sep 23 17:58:04 2011
New Revision: 1174924

URL: http://svn.apache.org/viewvc?rev=1174924&view=rev
Log:
APA-45: Adding more hands-on command example for max perm size options

Modified:
    portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/jetspeed-archetype.xml
    portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/maven-2-build.xml
    portals/site/jetspeed/jetspeed-2.2/src/site/xdoc/getting-started-installer.xml

Modified: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/jetspeed-archetype.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/jetspeed-archetype.xml?rev=1174924&r1=1174923&r2=1174924&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/jetspeed-archetype.xml (original)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/jetspeed-archetype.xml Fri Sep 23 17:58:04 2011
@@ -248,9 +248,13 @@ $ mvn org.apache.maven.plugins:maven-arc
             </div>
         </p>
         <p>
-            Start your Tomcat:
-            <div class="source"><pre>$ $TOMCAT_HOME/bin/catalina.sh run</pre>
-            </div>
+            Start your Tomcat:<br/>
+            Note that the setting of CATALINA_OPTS is optional in the following examples. (See <a href="#Note_on_Permanent_Generation_Size_of_Your_JVM">Note on Permanent Generation Size of Your JVM</a> for detail.)
+            <div class="source"><pre>
+$ cd $TOMCAT_HOME/bin
+$ export CATALINA_OPTS="-Xmx256m -XX:MaxPermSize=128m"
+$ ./catalina.sh run
+            </pre></div>
         </p>
         <p>
             Use your custom portal:

Modified: portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/maven-2-build.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/maven-2-build.xml?rev=1174924&r1=1174923&r2=1174924&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/maven-2-build.xml (original)
+++ portals/site/jetspeed/jetspeed-2.2/jetspeed-guide-build/src/site/xdoc/maven-2-build.xml Fri Sep 23 17:58:04 2011
@@ -259,8 +259,13 @@
                     <source>$mvn jetspeed:mvn -Dtarget=demo</source>
                 </p>
                 <p>
-                    Thereafter start Tomcat (in a separate console):
-                    <source><TOMCAT HOME>/bin/catalina.sh run</source>
+                    Thereafter start Tomcat (in a separate console):<br/>
+            Note that the setting of CATALINA_OPTS is optional in the following examples. (See <a href="#Note_on_Permanent_Generation_Size_of_Your_JVM">Note on Permanent Generation Size of Your JVM</a> for detail.)
+            <div class="source"><pre>
+$ cd $TOMCAT_HOME/bin
+$ export CATALINA_OPTS="-Xmx256m -XX:MaxPermSize=128m"
+$ ./catalina.sh run
+            </pre></div>
                     And after waiting a few seconds until Tomcat server <em>completed</em> starting up, the Jetspeed Demo Portal can be accessed through:
                     <source><a class="externalLink" href="http://localhost:8080/jetspeed">http://localhost:8080/jetspeed</a></source>
                 </p>

Modified: portals/site/jetspeed/jetspeed-2.2/src/site/xdoc/getting-started-installer.xml
URL: http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.2/src/site/xdoc/getting-started-installer.xml?rev=1174924&r1=1174923&r2=1174924&view=diff
==============================================================================
--- portals/site/jetspeed/jetspeed-2.2/src/site/xdoc/getting-started-installer.xml (original)
+++ portals/site/jetspeed/jetspeed-2.2/src/site/xdoc/getting-started-installer.xml Fri Sep 23 17:58:04 2011
@@ -117,18 +117,21 @@ java -jar jetspeed-installer-2.2.1.jar t
  <subsection name="Starting Jetspeed-2">
  <p>
  Once you have completed a successful install, you are ready to start the Jetspeed Portal.
- On linux, here is an example where you have installed to the default location:
+ On linux, here is an example where you have installed to the default location:<br/>
+ Note that the setting of CATALINA_OPTS is optional in the following examples. (See <a href="#Note_on_Permanent_Generation_Size_of_Your_JVM">Note on Permanent Generation Size of Your JVM</a> for detail.)
  </p>
  <source>
-cd ~/jetspeed-2.2.1/bin
-./startup.sh
+$ cd ~/jetspeed-2.2.1/bin
+$ export CATALINA_OPTS="-Xmx256m -XX:MaxPermSize=128m"
+$ ./startup.sh
  </source>
  <p>
  On windows, here is an example where you have installed to the default location:
  </p>
    <source>
-   cd C:\Apache\Jetspeed-2.2.1\bin
-   startup.bat
+> cd C:\Apache\Jetspeed-2.2.1\bin
+> set CATALINA_OPTS="-Xmx256m -XX:MaxPermSize=128m"
+> startup.bat
    </source>
    <p>
  The very first invocation of the portal requires anywhere from 10 seconds to 30 seconds for initial