ate 2005/04/03 16:57:40
Modified: xdocs database.xml getting-started.xml
site/xdocs getting-started.xml database.xml
Log:
Updates for M2 release
Revision Changes Path
1.2 +9 -17 jakarta-jetspeed-2/xdocs/database.xml
Index: database.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/xdocs/database.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- database.xml 10 Jul 2004 11:21:07 -0000 1.1
+++ database.xml 3 Apr 2005 23:57:40 -0000 1.2
@@ -38,7 +38,7 @@
<source test=""><![CDATA[
# -------------------------------------------------------------------------
-# configure MySQL Test DB
+# configure MySQL Test DB (only needed when running unit tests)
# -------------------------------------------------------------------------
org.apache.jetspeed.test.database.default.name=mysql
org.apache.jetspeed.test.database.url = jdbc:mysql://j2-server/j2test
@@ -57,9 +57,9 @@
]]></source>
<p>
-In the example above, you will need to have a MySQL server running on a host
named 'j2-server'.
-Also, you will need 2 databases, one called 'j2test' for running the unit
tests,
-and a second called 'j2' for the production database.
+In the example above, you will need to have a MySQL server running on a host
named 'j2-server'
+with a database called 'j2' for production.<br/>
+If you are going to run the unit tests you will also need an additional test
database called 'j2test'.<br/>
A user named 'jetspeed2' should be granted access to both the 'j2' and
'j2test' databases.
</p>
@@ -79,7 +79,7 @@
<source test=""><![CDATA[
# -------------------------------------------------------------------------
-# configure Oracle Test DB
+# configure Oracle Test DB (only needed when running unit tests)
# -------------------------------------------------------------------------
# org.apache.jetspeed.test.database.default.name=oracle
# org.apache.jetspeed.test.database.ojb.platform=oracle9i
@@ -102,8 +102,8 @@
<p>
In the example above, you will need to have a Oracle server running on a
host named 'j2-server'
and have an Oracle database SID named 'j2db' installed on that server.
-Also, you will need 2 database users (schemas), one called 'j2test' for
running the unit tests,
-and a second called 'j2' for the production database.
+Also, you will need a database user (schema) called 'j2' for production
usage.<br/>
+If you are going to run the unit tests you will need an additional user
called 'j2test'.
</p>
<subsection name ='Known Issues'>
@@ -116,7 +116,7 @@
maven db.scripts.gen
maven dropdrops
-maven db.create.test
+maven db.create.test (only when running unit tests)
maven db.create.production
]]></source>
@@ -161,15 +161,7 @@
</tr>
<tr>
<td>
-Tomcat 4
-</td>
-<td>
-copy driver(s) to ${TOMCAT_HOME}/shared/lib
-</td>
-</tr>
-<tr>
-<td>
-Tomcat 5
+Tomcat 5 and 5.5
</td>
<td>
copy driver(s) to ${TOMCAT_HOME}/shared/lib
1.6 +10 -24 jakarta-jetspeed-2/xdocs/getting-started.xml
Index: getting-started.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/xdocs/getting-started.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- getting-started.xml 31 Jan 2005 10:55:42 -0000 1.5
+++ getting-started.xml 3 Apr 2005 23:57:40 -0000 1.6
@@ -34,9 +34,9 @@
<li><a href="http://maven.apache.org/start/download.html";>Maven 1.0</a> or
higher</li>
<li>Java 1.4.2_02 or higher</li>
<li>Servlet 2.3:<br/>
- Tomcat 4.1.x<br/>
- <b>or</b> <br/>
- Tomcat 5.0.28 or higher</li>
+ Tomcat 5.0.30 (or higher)<br/>
+ <b>or</b> <br/>
+ Tomcat 5.5.8 (or higher)</li>
</ul>
</section>
<section name='1. Get Maven Ready'>
@@ -62,8 +62,8 @@
</tr>
<tr>
<td>org.apache.jetspeed.catalina.version.major</td>
- <td>4</td>
- <td>Are you using Tomcat 4.1.x or 5.x?</td>
+ <td>5</td>
+ <td>Are you using Tomcat 5.0.x (use: 5) or 5.5.x? (use: 5.5)</td>
</tr>
<tr>
<td>org.apache.jetspeed.server.shared</td>
@@ -89,17 +89,14 @@
</tr>
</table>
<p>
-<i>If you are using Tomcat 5, make sure to use version 5.0.28 or higher,
otherwise you won't be able to login because
-of an issue with its JAASRealm implementation</i>.
-</p>
-<p>
To develop or deploy Jetspeed with another database (not the default HSQL),
see the property configuration in the
<a href='database.html'>Database Configuration documentation</a>.
</p>
</section>
<section name="3. Tomcat Configuration">
<p>
-Jetspeed 2 now uses the Tomcat manager application for hotdeployment of
portlet application war files.
+Jetspeed 2 now can use the Tomcat manager application for managing portlet
applications through
+its new Portlet Application Lifecycle Manager Portlet.
To be able to do so it needs a configured Tomcat user with the predefined
'manager' role in
the ${CATALINA_HOME}/conf/tomcat-users.xml.
</p>
@@ -122,31 +119,20 @@
</section>
<section name='4. Building Jetspeed 2'>
<p>
-If you are using the default Hypersonic database, this procedure requires
two terminal sessions.
-If you are using another database, skip the immediate section below on
Terminal Session #1.
-</p>
-<source test=""><![CDATA[
-# Terminal Session #1: Start the Hypersonic database
-cd ${jetspeed-2-home}
-maven start.test.server
-]]></source>
-<p>
-Terminal session #2, build the portal and all components and unit test
Jetspeed-2:
+Build the portal and all components for Jetspeed-2:
</p>
<source test=""><![CDATA[
-# Terminal Session #2: Build and Unit Test
cd ${jetspeed-2-home}
maven allClean allBuild
]]></source>
</section>
<section name="5. Deploying Jetspeed into Tomcat">
<p>
-We only cover deploying to Tomcat 4 and Tomcat 5.
+We only cover deploying to Tomcat 5 or Tomcat 5.5.
Step #1 below is optional if you are NOT using the default Hypersonic
database.
</p>
<ul>
-<li>1. If you are using the Hypersonic SQL database, make sure you have
terminated the test HSQLserver.
- Then in the same terminal, start the production Hypersonic database
by typing
+<li>1. If you are using the Hypersonic SQL database, start the production
Hypersonic database by typing
<br/><br/><b>maven start.production.server</b><br/><br/>
</li>
<li>2. (in seperate window/terminal session) <br/><br/><b>cd
${jetspeed-2-home}</b><br/><br/>
1.12 +20 -34 jakarta-jetspeed-2/site/xdocs/getting-started.xml
Index: getting-started.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/site/xdocs/getting-started.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- getting-started.xml 14 Oct 2004 19:29:01 -0000 1.11
+++ getting-started.xml 3 Apr 2005 23:57:40 -0000 1.12
@@ -34,9 +34,9 @@
<li><a href="http://maven.apache.org/start/download.html";>Maven 1.0</a> or
higher</li>
<li>Java 1.4.2_02 or higher</li>
<li>Servlet 2.3:<br/>
- Tomcat 4.1.x<br/>
- <b>or</b> <br/>
- Tomcat 5.0.28 or higher</li>
+ Tomcat 5.0.30 (or higher)<br/>
+ <b>or</b> <br/>
+ Tomcat 5.5.8 (or higher)</li>
</ul>
</section>
<section name='1. Get Maven Ready'>
@@ -52,9 +52,9 @@
</tr>
<tr>
<td>org.apache.jetspeed.project.home</td>
- <td>${JETSPEED2_HOME}/</td>
- <td>The root of your jetspeed2 installation, for example
/home/apache/jakarta-jetspeed-2</td>
- </tr>
+ <td>/home/apache/jakarta-jetspeed-2/</td>
+ <td>The root of your Jetspeed-2 source installation (see example on
left).</td>
+ </tr>
<tr>
<td>org.apache.jetspeed.server.home</td>
<td>${CATALINA_HOME}/</td>
@@ -62,8 +62,8 @@
</tr>
<tr>
<td>org.apache.jetspeed.catalina.version.major</td>
- <td>4</td>
- <td>Are you using Tomcat 4.1.x or 5.x?</td>
+ <td>5</td>
+ <td>Are you using Tomcat 5.0.x (use: 5) or 5.5.x? (use: 5.5)</td>
</tr>
<tr>
<td>org.apache.jetspeed.server.shared</td>
@@ -89,29 +89,26 @@
</tr>
</table>
<p>
-<i>If you are using Tomcat 5, make sure to use version 5.0.28 or higher,
otherwise you won't be able to login because
-of an issue with its JAASRealm implementation</i>.
-</p>
-<p>
To develop or deploy Jetspeed with another database (not the default HSQL),
see the property configuration in the
<a href='database.html'>Database Configuration documentation</a>.
</p>
</section>
<section name="3. Tomcat Configuration">
<p>
-Jetspeed 2 now uses the Tomcat manager application for hotdeployment of
portlet application war files.
+Jetspeed 2 now can use the Tomcat manager application for managing portlet
applications through
+its new Portlet Application Lifecycle Manager Portlet.
To be able to do so it needs a configured Tomcat user with the predefined
'manager' role in
the ${CATALINA_HOME}/conf/tomcat-users.xml.
</p>
<p>
A minimal example tomcat-users.xml could look like:
- <pre>
- <?xml version='1.0' encoding='utf-8'?>
- <tomcat-users>
- <role rolename="manager"/>
- <user username="j2deployer" password="j2deployer"
roles="manager"/>
- </tomcat-users>
- </pre>
+ <source><![CDATA[
+ <?xml version='1.0' encoding='utf-8'?>
+ <tomcat-users>
+ <role rolename="manager"/>
+ <user username="j2deployer" password="j2deployer" roles="manager"/>
+ </tomcat-users>]]>
+ </source>
Make sure to use a more appropriate username and password. <br/>
With the above example the required autodeployment properties should be set
as:
<pre>
@@ -122,31 +119,20 @@
</section>
<section name='4. Building Jetspeed 2'>
<p>
-If you are using the default Hypersonic database, this procedure requires
two terminal sessions.
-If you are using another database, skip the immediate section below on
Terminal Session #1.
-</p>
-<source test=""><![CDATA[
-# Terminal Session #1: Start the Hypersonic database
-cd ${jetspeed-2-home}
-maven start.test.server
-]]></source>
-<p>
-Terminal session #2, build the portal and all components and unit test
Jetspeed-2:
+Build the portal and all components for Jetspeed-2:
</p>
<source test=""><![CDATA[
-# Terminal Session #2: Build and Unit Test
cd ${jetspeed-2-home}
maven allClean allBuild
]]></source>
</section>
<section name="5. Deploying Jetspeed into Tomcat">
<p>
-We only cover deploying to Tomcat 4 and Tomcat 5.
+We only cover deploying to Tomcat 5 or Tomcat 5.5.
Step #1 below is optional if you are NOT using the default Hypersonic
database.
</p>
<ul>
-<li>1. If you are using the Hypersonic SQL database, make sure you have
terminated the test HSQLserver.
- Then in the same terminal, start the production Hypersonic database
by typing
+<li>1. If you are using the Hypersonic SQL database, start the production
Hypersonic database by typing
<br/><br/><b>maven start.production.server</b><br/><br/>
</li>
<li>2. (in seperate window/terminal session) <br/><br/><b>cd
${jetspeed-2-home}</b><br/><br/>
1.4 +9 -17 jakarta-jetspeed-2/site/xdocs/database.xml
Index: database.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/site/xdocs/database.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- database.xml 7 May 2004 18:05:57 -0000 1.3
+++ database.xml 3 Apr 2005 23:57:40 -0000 1.4
@@ -38,7 +38,7 @@
<source test=""><![CDATA[
# -------------------------------------------------------------------------
-# configure MySQL Test DB
+# configure MySQL Test DB (only needed when running unit tests)
# -------------------------------------------------------------------------
org.apache.jetspeed.test.database.default.name=mysql
org.apache.jetspeed.test.database.url = jdbc:mysql://j2-server/j2test
@@ -57,9 +57,9 @@
]]></source>
<p>
-In the example above, you will need to have a MySQL server running on a host
named 'j2-server'.
-Also, you will need 2 databases, one called 'j2test' for running the unit
tests,
-and a second called 'j2' for the production database.
+In the example above, you will need to have a MySQL server running on a host
named 'j2-server'
+with a database called 'j2' for production.<br/>
+If you are going to run the unit tests you will also need an additional test
database called 'j2test'.<br/>
A user named 'jetspeed2' should be granted access to both the 'j2' and
'j2test' databases.
</p>
@@ -79,7 +79,7 @@
<source test=""><![CDATA[
# -------------------------------------------------------------------------
-# configure Oracle Test DB
+# configure Oracle Test DB (only needed when running unit tests)
# -------------------------------------------------------------------------
# org.apache.jetspeed.test.database.default.name=oracle
# org.apache.jetspeed.test.database.ojb.platform=oracle9i
@@ -102,8 +102,8 @@
<p>
In the example above, you will need to have a Oracle server running on a
host named 'j2-server'
and have an Oracle database SID named 'j2db' installed on that server.
-Also, you will need 2 database users (schemas), one called 'j2test' for
running the unit tests,
-and a second called 'j2' for the production database.
+Also, you will need a database user (schema) called 'j2' for production
usage.<br/>
+If you are going to run the unit tests you will need an additional user
called 'j2test'.
</p>
<subsection name ='Known Issues'>
@@ -116,7 +116,7 @@
maven db.scripts.gen
maven dropdrops
-maven db.create.test
+maven db.create.test (only when running unit tests)
maven db.create.production
]]></source>
@@ -161,15 +161,7 @@
</tr>
<tr>
<td>
-Tomcat 4
-</td>
-<td>
-copy driver(s) to ${TOMCAT_HOME}/shared/lib
-</td>
-</tr>
-<tr>
-<td>
-Tomcat 5
+Tomcat 5 and 5.5
</td>
<td>
copy driver(s) to ${TOMCAT_HOME}/shared/lib
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
