svn commit: rev 54980 - forrest/trunk/src/documentation/content/xdocs/docs

[cr...@apache.org]

Author: crossley
Date: Sun Oct 17 19:05:57 2004
New Revision: 54980

Modified:
   forrest/trunk/src/documentation/content/xdocs/docs/upgrading_06.xml
   forrest/trunk/src/documentation/content/xdocs/docs/your-project.xml
Log:
Enhance the instructions about incorporating Forrest into your project's
build system. Mention the need to copy xml-commons-resolver jar to $ANT_HOME/lib


Modified: forrest/trunk/src/documentation/content/xdocs/docs/upgrading_06.xml
==============================================================================
--- forrest/trunk/src/documentation/content/xdocs/docs/upgrading_06.xml	(original)
+++ forrest/trunk/src/documentation/content/xdocs/docs/upgrading_06.xml	Sun Oct 17 19:05:57 2004
@@ -177,12 +177,12 @@
     <section id="antproxy">
       <title>forrest.antproxy.xml is obsolete in favor of Ant's &lt;import&gt; task</title>
       <p>
-      Projects that use <code>forrest.antproxy.xml</code> via and Ant build
+      Projects that use <code>forrest.antproxy.xml</code> via an Ant build
       task to invoke Forrest, will receive
       an error message directing them to this document.
       Please see the <link href="site:your-project/invoking_from_ant">Invoking
       Forrest from Ant</link> documentation for instructions on how to use
-      the &lt;import&gt; task.
+      the &lt;import&gt; task to integrate Forrest with your build system.
       </p>
     </section>
 

Modified: forrest/trunk/src/documentation/content/xdocs/docs/your-project.xml
==============================================================================
--- forrest/trunk/src/documentation/content/xdocs/docs/your-project.xml	(original)
+++ forrest/trunk/src/documentation/content/xdocs/docs/your-project.xml	Sun Oct 17 19:05:57 2004
@@ -1057,12 +1057,19 @@
      </target>
 </project>
         ]]></source>
-      <p>(Note: That technique requires Ant 1.6+ otherwise the &lt;import&gt;
+      <p>Because you are using your own version
+      of Ant to do Forrest's work, you will need to provide the
+      supporting catalog entity resolver:
+      '<code>forrest/lib/xml-commons-resolver-1.1.jar $ANT_HOME/lib</code>'
+      </p>
+
+      <p>Note: The technique described above requires Ant 1.6+ otherwise
+        the &lt;import&gt;
         task will not be available for you to use. Forrest
         bundles the latest version of Ant, so you can invoke your project
-        like this: <code>forrest -f myproject.xml</code>.
-        This will not run forrest; it will just use Forrest's Ant to execute
-        your buildfile.)
+        like this: '<code>forrest -f myproject.xml</code>'.
+        This will not run the '<code>forrest</code>' command. It will just
+        use Forrest's Ant and resolver to execute your buildfile.
       </p>
       <p>
         Another option is to use the Forrest Antlet from the Krysalis Project's <link href="http://antworks.sourceforge.net/importer/">Antworks Importer</link>.