[jboss-cvs] JBoss Messaging SVN: r2898 - in trunk: docs/userguide/en/modules and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2007-07-16 10:19:04 -0400 (Mon, 16 Jul 2007)
New Revision: 2898

Modified:
   trunk/build-messaging.xml
   trunk/docs/userguide/en/modules/installation.xml
Log:
Updated docs


Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2007-07-16 13:58:28 UTC (rev 2897)
+++ trunk/build-messaging.xml	2007-07-16 14:19:04 UTC (rev 2898)
@@ -436,7 +436,7 @@
       </copy>
    </target>
 
-   <target name="release-bundle" depends="artifacts, release-structure, examples, userdoc, bundle-source, bundle-test-results, javadoc">
+   <target name="release-bundle" depends="artifacts, release-structure, examples, userdoc, bundle-source, javadoc">
 
       <copy todir="${release.output}" file="${build.lib}/jboss-${module.name}.sar"/>
       <copy todir="${release.output}" file="${build.lib}/jboss-${module.name}.jar"/>

Modified: trunk/docs/userguide/en/modules/installation.xml
===================================================================
--- trunk/docs/userguide/en/modules/installation.xml	2007-07-16 13:58:28 UTC (rev 2897)
+++ trunk/docs/userguide/en/modules/installation.xml	2007-07-16 14:19:04 UTC (rev 2898)
@@ -12,8 +12,6 @@
   Messaging, you need to perform the installation procedure described
   below.</para>
 
-  <para>JBoss Messaging requires Java 5 or later</para>
-
   <para>
      <note>
        A JBossMQ and a JBoss Messaging instance cannot coexist, at least not unless special precautions are taken.
@@ -35,12 +33,14 @@
     You should avoid using JBoss Messaging on any version of JBoss AS prior to JBoss 4.2.0.GA,
     such as 4.0.5.GA and 4.0.4.GA.
     </note>
+    <note>JBoss Messaging is built against the JBoss AS 4.2 libraries which are built using Java 5. Therefore JBoss Messaging
+    only runs with Java 5 or later.</note>
  </para>
 
   <section id="install">
     <title>Installing JBoss Messaging on JBoss AS 4.2</title>
     
-    <para>In this section we present five different methods of installing JBoss Messaging in JBoss AS 4.2
+    <para>In this section we present two different methods of installing JBoss Messaging in JBoss AS 4.2
     </para>
     
     <itemizedlist>
@@ -54,11 +54,6 @@
        <xref linkend="install.manual">manual install</xref>.
        </listitem>  
        
-       <listitem><warning>Not recommended!</warning>If you to install in JBoss 4.0.x and are willing to cope
-        with any jar incompatibilities that may arise then you will need to perform a
-       <xref linkend="install.jboss40x">install in JBoss 4.0.x</xref>.
-       </listitem>      
-       
     </itemizedlist>
      
     <section id="install.automated">
@@ -77,10 +72,19 @@
       <listitem>
          <para>Set up the <literal>JBOSS_HOME</literal> environment variable to
          point to the JBoss 4.2 installation you want to use JBoss Messaging
-         with. Run the installation script, available in the
+         with.</para>      
+<para>
+ Run the installation script, available in the
          <filename>util</filename> directory of the release bundle as follows:</para>
 
+         <para>If you want to create a simple non clustered installion based on the default configuration:</para>
+
          <programlisting>
+         cd util
+         ant -f release-admin.aml
+         </programlisting>
+         <para>If you want to create a clustered installation based on the all configuration or change the configuration name:</para> 
+         <programlisting>
  cd util
  ant -f release-admin.xml -Dmessaging.config.source=all -Dmessaging.config.name=messaging-node0
          </programlisting>
@@ -89,6 +93,7 @@
       name you want to give the configuration. If you will have several cluster nodes on the same machine, e.g.
       for development purposes then a good convention is to name them <literal>messaging-node0, messaging-node1</literal>
       to match <literal>messaging-node&lt;ServerPeerID&gt;</literal></para>
+         <para>The messaging.config.source variable determines which JBoss AS configuration (e.g. default or all) to base the installation on</para>
 
          <para>The installation script will create a
          <filename>$JBOSS_HOME/server/messaging-node0</filename> configuration. (If you have chosen <literal>messaging-node0</literal>)</para>
@@ -96,7 +101,7 @@
       </listitem>
 
       
-      <para>For the rest of the procedure we assume JBOSS_CONFIG refers to your new messaging configuration (e.g. messaging-node0)
+      <para>For the rest of the procedure we assume JBOSS_CONFIG refers to your new messaging configuration (e.g. messaging-node0 or messaging)
       </para>
       
       <para>You don't actually have to create an environment variable <literal>JBOSS_CONFIG</literal>, this is just