[jboss-cvs] JBossAS SVN: r103544 - projects/docs/community/5/Installation_And_Getting_Started_Guide/en-US.

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

Author: misty at redhat.com
Date: 2010-04-05 20:31:12 -0400 (Mon, 05 Apr 2010)
New Revision: 103544

Modified:
   projects/docs/community/5/Installation_And_Getting_Started_Guide/en-US/Installation_And_Getting_Started_Guide.xml
   projects/docs/community/5/Installation_And_Getting_Started_Guide/en-US/Sample_JSF_EJB3_Application.xml
Log:
Add info on upgrading from 4.x to 5.x, as per JIRA JBAS-6292, and fix a trivial error in SAMPLE_JSF_EJB3_Application.xml which prevented a clean Maven build


Modified: projects/docs/community/5/Installation_And_Getting_Started_Guide/en-US/Installation_And_Getting_Started_Guide.xml
===================================================================
--- projects/docs/community/5/Installation_And_Getting_Started_Guide/en-US/Installation_And_Getting_Started_Guide.xml	2010-04-06 00:01:43 UTC (rev 103543)
+++ projects/docs/community/5/Installation_And_Getting_Started_Guide/en-US/Installation_And_Getting_Started_Guide.xml	2010-04-06 00:31:12 UTC (rev 103544)
@@ -49,7 +49,8 @@
 	<xi:include href="Installation_With_Binary_Download.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="Installation_With_Source_Download.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="Setting_JBOSS_HOME.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-		
+	<xi:include href="Upgrading_from_4.2.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
 	<xi:include href="Uninstall_JBoss.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="Test_Your_Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 	<xi:include href="The_JBoss_Server_A_Quick_Tour.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />

Modified: projects/docs/community/5/Installation_And_Getting_Started_Guide/en-US/Sample_JSF_EJB3_Application.xml
===================================================================
--- projects/docs/community/5/Installation_And_Getting_Started_Guide/en-US/Sample_JSF_EJB3_Application.xml	2010-04-06 00:01:43 UTC (rev 103543)
+++ projects/docs/community/5/Installation_And_Getting_Started_Guide/en-US/Sample_JSF_EJB3_Application.xml	2010-04-06 00:31:12 UTC (rev 103544)
@@ -298,7 +298,7 @@
 			<para>Let's look at building the example application and then explore the configuration files in detail.
 			</para>
 			<para>
-			  <remark>In <xref linkend="About_the_Example_Applications"/>, we looked at the directory structure of the <literal>jsfejb3</literal> sample application. </remark>First, check out the example code at <ulink url=https://anonsvn.jboss.org/repos/jbossas/projects/docs/enterprise/5.0/Examples/gettingstarted-examples/jsfejb3/" />.  At the command line, go to the <literal>jsfejb3</literal> directory. There you will see a <literal>build.xml</literal> file. This is our Ant build script for compiling and packaging the archives. To build the application, you need to first of all edit the <literal>build.xml</literal> file and edit the value of <literal>jboss-dist</literal> to reflect the location where the JBoss Application Server is installed. Once you have done this, just type the command <literal>ant</literal> and your output should look like this:
+			  <remark>In <xref linkend="About_the_Example_Applications"/>, we looked at the directory structure of the <literal>jsfejb3</literal> sample application. </remark>First, check out the example code at <ulink url="https://anonsvn.jboss.org/repos/jbossas/projects/docs/enterprise/5.0/Examples/gettingstarted-examples/jsfejb3/" />.  At the command line, go to the <literal>jsfejb3</literal> directory. There you will see a <literal>build.xml</literal> file. This is our Ant build script for compiling and packaging the archives. To build the application, you need to first of all edit the <literal>build.xml</literal> file and edit the value of <literal>jboss-dist</literal> to reflect the location where the JBoss Application Server is installed. Once you have done this, just type the command <literal>ant</literal> and your output should look like this:
 			</para>
 <screen>[user at localhost jsfejb3]$ ant
 Buildfile: build.xml