2:01 a.m.
Author: mmcallis
Date: 2008-07-02 03:01:58 -0400 (Wed, 02 Jul 2008)
New Revision: 11254
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml
Log:
manually merging changes from 2.6 that are missing
in 2.7
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml
===================================================================
---
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml 2008-07-02
06:24:02 UTC (rev 11253)
+++
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml 2008-07-02
07:01:58 UTC (rev 11254)
@@ -20,12 +20,12 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">Extract the bundle:</emphasis>
extract the ZIP archive. It does not matter which directory is used. On <trademark
class="registered">Windows</trademark>, the recommended directory is
<filename>C:\jboss-<replaceable>version-number</replaceable></filename>.
+ <emphasis role="bold">Extract the bundle:</emphasis>
extract the ZIP archive. It does not matter which directory is used. On Windows, the
recommended directory is
<filename>C:\jboss-<replaceable>version-number</replaceable></filename>.
</para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">Start the server:</emphasis> change
into the <filename>JBOSS_PORTAL_INSTALLATION_DIRECTORY/bin/</filename>
directory. On <trademark class="registered">Windows</trademark>,
execute <command>run.bat</command>. On <trademark
class="registered">Linux</trademark>, run the <command>sh
run.sh</command> command. To specify a configuration to use, for example, the
default configuration, append the <command> -c default</command> option to the
<command>run.bat</command> or <command>sh run.sh</command>
commands.
+ <emphasis role="bold">Start the server:</emphasis> change
into the <filename>JBOSS_PORTAL_INSTALLATION_DIRECTORY/bin/</filename>
directory. On Windows, execute <command>run.bat</command>. On Linux, run the
<command>sh run.sh</command> command. To specify a configuration to use, for
example, the default configuration, append the <command> -c default</command>
option to the <command>run.bat</command> or <command>sh
run.sh</command> commands.
</para>
</listitem>
<listitem>
@@ -89,7 +89,7 @@
<sect3>
<title>Database Setup</title>
<para>
- A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an
embedded Hypersonic SQL database that JBoss Portal can use; however, this is only
recommended for developer use. The following databases are recommended for production use,
and have had test suites run against them: <trademark
class="registered">MySQL</trademark> 4 and 5, <trademark
class="registered">Microsoft</trademark> <trademark
class="registered">SQL Server</trademark>, PostgreSQL 8, <trademark
class="registered">Oracle</trademark> Database 9, and <trademark
class="registered">Oracle</trademark> Database 10. JBoss Portal can use
any database that is supported by Hibernate.
+ A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an
embedded Hypersonic SQL database that JBoss Portal can use; however, this is only
recommended for developer use. The following databases are recommended for production use,
and have had test suites run against them: MySQL 4 and 5, Microsoft SQL Server, PostgreSQL
8, and Oracle Database 9 and 10. JBoss Portal can use any database that is supported by
Hibernate.
</para>
<para>
To configure a database to use with JBoss Portal:
@@ -117,7 +117,7 @@
<sect3>
<title>Datasource Descriptors</title>
<para>
- The JBoss Portal binary download that was extracted in <xref
linkend="install_binarydownload"/>, contains pre-configured Datasource
descriptors for the more popular databases. Datasource descriptors are provided for the
<trademark class="registered">MySQL</trademark> 4 and 5, PostgreSQL,
<trademark class="registered">Microsoft</trademark> <trademark
class="registered">SQL Server</trademark>, and <trademark
class="registered">Oracle</trademark> databases, and can be found in
the <filename>setup</filename> subdirectory where the JBoss Portal binary was
extracted to:
+ The JBoss Portal binary download that was extracted in <xref
linkend="install_binarydownload"/>, contains pre-configured Datasource
descriptors for the more popular databases. Datasource descriptors are provided for the
MySQL 4 and 5, PostgreSQL, Microsoft SQL Server, and Oracle databases, and can be found in
the <filename>setup</filename> subdirectory where the JBoss Portal binary was
extracted to:
</para>
<mediaobject>
<imageobject>
@@ -161,7 +161,7 @@
</listitem>
<listitem>
<para>
- <emphasis role="bold">Start the server:</emphasis> change into
the <filename>$JBOSS_HOME/bin/</filename> directory. On <trademark
class="registered">Windows</trademark>, execute
<command>run.bat</command>. On <trademark
class="registered">Linux</trademark>, run the <command>sh
run.sh</command> command. To specify a configuration to use, for example, the
default configuration, append the <command> -c default</command> option to the
<command>run.bat</command> or <command>sh run.sh</command>
commands.
+ <emphasis role="bold">Start the server:</emphasis> change into
the <filename>$JBOSS_HOME/bin/</filename> directory. On Windows, execute
<command>run.bat</command>. On Linux, run the <command>sh
run.sh</command> command. To specify a configuration to use, for example, the
default configuration, append the <command> -c default</command> option to the
<command>run.bat</command> or <command>sh run.sh</command>
commands.
</para>
</listitem>
<listitem>
@@ -327,7 +327,7 @@
<para>
Replace <replaceable>proxy-hostname</replaceable> with the proxy
server's hostname, and <replaceable>proxy-port</replaceable> with the
correct proxy server port number.
</para>
- <para>To build and deploy JBoss Portal from the sources, change into the
<filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where
<filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> is the directory where the
JBoss Portal source code was downloaded to. Then, Windows, users need to run the
<command>build.bat deploy</command> command, and Linux users need to run the
<command>sh build.sh deploy</command> command.
+ <para>To build and deploy JBoss Portal from the sources, change into the
<filename>JBOSS_PORTAL_SOURCE_DIRECTORY/build/</filename> directory, where
<filename>JBOSS_PORTAL_SOURCE_DIRECTORY</filename> is the directory where the
JBoss Portal source code was downloaded to. Then, Windows users need to run the
<command>build.bat deploy</command> command, and Linux users need to run the
<command>sh build.sh deploy</command> command.
</para>
<para>
At the end of the build process, the <filename>jboss-portal.sar</filename>
file is copied into the
<filename>$JBOSS_HOME/server/default/deploy/</filename> directory:
@@ -348,7 +348,7 @@
</note>
</para>
<para>
- To build the clustered version on <trademark
class="registered">Linux</trademark> operating systems:
+ To build the clustered version on Linux operating systems:
</para>
<para>
<orderedlist>
@@ -378,7 +378,7 @@
</orderedlist>
</para>
<para>
- To build the clustered version on <trademark
class="registered">Windows</trademark>, repeat the previous steps,
replacing <command>sh build.sh</command> with
<command>build.bat</command>.
+ To build the clustered version on Windows, repeat the previous steps, replacing
<command>sh build.sh</command> with <command>build.bat</command>.
</para>
</sect2>
<sect2>