Author: taylor
Date: Fri Jul 17 01:25:08 2015
New Revision: 1691475
URL: http://svn.apache.org/r1691475
Log:
JS2-1332: release preparation, tutorial documentation cleanup
Modified:
portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/01/configure-maven.xml
portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/before-you-start.xml
portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/index.xml
Modified:
portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/01/configure-maven.xml
URL:
http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/01/configure-maven.xml?rev=1691475&r1=1691474&r2=1691475&view=diff
==============================================================================
---
portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/01/configure-maven.xml
(original)
+++
portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/01/configure-maven.xml
Fri Jul 17 01:25:08 2015
@@ -45,14 +45,14 @@
Find the <i>org.apache.jetspeed.server.home</i> configuration
parameter and change
the path to where you installed Tomcat:
</p>
-
<source><![CDATA[<org.apache.jetspeed.server.home>/home/johndoe/j2tutorial/apache-tomcat-6.0.33/</org.apache.jetspeed.server.home>]]></source>
+
<source><![CDATA[<org.apache.jetspeed.server.home>/home/johndoe/jetexpress/apache-tomcat-7.0.63/</org.apache.jetspeed.server.home>]]></source>
<p>
Find the <i>org.apache.jetspeed.production.database.url</i>
configuration parameter.
It has a location inside the /tmp directory configured by default,
which might or might not
work for you, depending on your environment. Just to be sure, change
it to a location
you have write access to:
</p>
-
<source><![CDATA[<org.apache.jetspeed.production.database.url>jdbc:derby:/home/johndoe/j2tutorial/derby/productiondb;create=true</org.apache.jetspeed.production.database.url>]]></source>
+
<source><![CDATA[<org.apache.jetspeed.production.database.url>jdbc:derby:/home/johndoe/jetexpress/derby/productiondb;create=true</org.apache.jetspeed.production.database.url>]]></source>
<p>
<i>
Note: it is of course possible to use/configure a different
application server and database but
Modified:
portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/before-you-start.xml
URL:
http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/before-you-start.xml?rev=1691475&r1=1691474&r2=1691475&view=diff
==============================================================================
---
portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/before-you-start.xml
(original)
+++
portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/before-you-start.xml
Fri Jul 17 01:25:08 2015
@@ -43,7 +43,7 @@
management, and generally makes your life easier.
</p>
<p>
- You will need Maven version 2.0.9 or newer.
+ You will need Maven version 3.3.1 or newer.
</p>
</subsection>
<subsection name="Tomcat">
@@ -58,7 +58,7 @@
in this tutorial we use Tomcat.
</p>
<p>
- You will need Tomcat version 6.0.33 or newer.
+ You will need Tomcat version 7.0.59 or newer.
</p>
</subsection>
<subsection name="Derby">
Modified:
portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/index.xml?rev=1691475&r1=1691474&r2=1691475&view=diff
==============================================================================
---
portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/index.xml
(original)
+++
portals/site/jetspeed/jetspeed-2.3/jetspeed-tutorial/src/site/xdoc/index.xml
Fri Jul 17 01:25:08 2015
@@ -44,9 +44,9 @@
<subsection name='Prerequisites'>
The tutorial requires the following software installed on your system:
<ul>
- <li><a href="http://java.sun.com/javase/downloads/index.jsp";>Java
Development Kit</a> 1.5 or higher</li>
- <li><a href="http://tomcat.apache.org/";>Apache Tomcat</a> 6.0.33 or
higher</li>
- <li><a href="http://maven.apache.org/";>Maven</a> 2.2.1 or
higher</li>
+ <li><a href="http://java.sun.com/javase/downloads/index.jsp";>Java
Development Kit</a> 1.7 or higher</li>
+ <li><a href="http://tomcat.apache.org/";>Apache Tomcat</a> 7.0.59 or
higher</li>
+ <li><a href="http://maven.apache.org/";>Maven</a> 3.3.1 or higher</li>
<li>An internet connection so that Maven can download plugins and
dependencies</li>
<li>Jetspeed-2 tutorial resources <a
href="downloads/tutorial-resources.zip">download</a></li>
</ul>
