You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by he...@apache.org on 2007/01/28 22:21:44 UTC

svn commit: r500887 - /velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/

Author: henning
Date: Sun Jan 28 13:21:43 2007
New Revision: 500887

URL: http://svn.apache.org/viewvc?view=rev&rev=500887
Log:
Update all jakarta links to point to the velocity site, reformat some
docs, remove outdated information, update links.


Modified:
    velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/anakia.xml
    velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/build.xml
    velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/committers.xml
    velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/developer-guide.xml
    velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/getting-started.xml
    velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/index.xml
    velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/jar-dependencies.xml
    velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/overview.xml
    velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/texen.xml
    velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/user-guide.xml
    velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/vtl-reference-guide.xml
    velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/webapps.xml

Modified: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/anakia.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/anakia.xml?view=diff&rev=500887&r1=500886&r2=500887
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/anakia.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/anakia.xml Sun Jan 28 13:21:43 2007
@@ -22,7 +22,7 @@
 
  <properties>
   <title>Anakia</title>
-  <author email="jon@latchkey.com">Jon S. Stevens</author>
+  <author email="dev@velocity.apache.org">Velocity Documentation Team</author>
  </properties>
 
 <body>
@@ -31,7 +31,7 @@
 <p>
     Essentially an XML transformation tool, Anakia uses <a
     href="http://www.jdom.org">JDOM</a> and <a
-    href="http://jakarta.apache.org/velocity">Velocity</a> to transform
+    href="http://velocity.apache.org/">Velocity</a> to transform
     XML documents into the format of your choice. It provides an alternative to
     using Ant's &lt;style&gt; task and
     <a href="http://xml.apache.org/xalan/">XSL</a> to process XML
@@ -91,7 +91,7 @@
     XSL's &quot;extra&quot; functionality.
 </p>
 <p>
-    The example in the jakarta-velocity/examples/anakia directory
+    The example in the <code>examples/anakia</code> directory
     provides a good introduction to Anakia. You should find it quite
     simple to use.
 </p>
@@ -114,19 +114,19 @@
 
 <section name="Installation/Example" href="Installation/Example">
 <p>
-    Before reviewing the jakarta-velocity/examples/anakia directory,
-    you must <a href="../install.html">build Velocity</a>.
+    Before reviewing the <example>examples/anakia</example directory,
+    you must <a href="build.html">build Velocity</a>.
 </p>
 <p>
     After building Velocity, <code>cd</code> into the
-    jakarta-velocity/examples/anakia/build directory and run 'ant'.
+    <code>examples/anakia/build</code> directory and run 'ant'.
 </p>
 <p>
     Output from running ant, in this case HTML files, is placed
-    into the jakarta-velocity/examples/anakia/docs/ directory.
+    into the <code>examples/anakia/docs/</code> directory.
 </p>
 <p>
-    The jakarta-velocity/examples/anakia/xdocs/ directory has all of the
+    The <code>examples/anakia/xdocs/</code> directory has all of the
     .xml source code. The xdocs/stylesheets directory contains the .vsl
     file, in which most of the magic happens. Understanding <a
     href="user-guide.html">Velocity Template Language</a> and
@@ -223,7 +223,7 @@
             web site documentation, you will understand the purpose of
             this file. <strong>It is an optional task argument.</strong>
             If you look at the Anakia example in the
-            jakarta-velocity/examples/anakia directory, you can see the
+            <code>examples/anakia</code> directory, you can see the
             project.xml file being used in the .vsl file. </td>
         </tr>
         <tr>

Modified: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/build.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/build.xml?view=diff&rev=500887&r1=500886&r2=500887
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/build.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/build.xml Sun Jan 28 13:21:43 2007
@@ -22,7 +22,7 @@
 
  <properties>
   <title>Building Velocity from Source</title>
-  <author email="jvanzyl@zenplex.com">Velocity Documentation Team</author>
+  <author email="dev@velocity.apache.org">Velocity Documentation Team</author>
  </properties>
 
 <body>
@@ -40,27 +40,31 @@
 can be obtained from <a
 href="http://www.apache.org/dev/version-control.html">Subversion</a> or
 from the <a
-href="http://svn.apache.org/snapshots/jakarta-velocity/">nightly
-snapshots</a>.  However, you will need to install Ant, an excellent
-Java-based build tool.  Ant is also a Jakarta project, and can be
-found <a href="http://jakarta.apache.org/ant/">here</a>.
+href="http://vc.apache.org/snapshots/velocity/">nightly
+snapshots</a>.  However, you will need to install Ant to build the Velocity sources.</p>
+
+
+<p>Ant is also an Apache project, and can be
+found <a href="http://ant.apache.org/">here</a>. To build Apache Velocity, you need at least Version 1.6 of Apache Ant.
 </p>
 
 <p>
-The directory tree of the distribution looks like :
+The directory tree of the distribution looks like:
 </p>
 
 <source><![CDATA[
-jakarta-velocity
-  /build        - contains build scripts
-  /bin          - where the built jars / classes will go
-  /src          - source for Velocity, Anakia, and Texen
-  /docs         - documentation in HTML form
-  /docs/api     - Javadocs for Velocity source
-  /examples     - example/demonstration code
-  /convert      - tools to help convert WebMacro templates
-  /test         - test programs and templates
-  /xdocs        - source for our documentation
+build/      This is where the build scripts live.
+convert/    The WebMacro to Apache Velocity conversion program.
+docs/       Velocity Documentation in HTML format.
+docs/api/   Velocity Javadocs.
+examples/   Examples how to use Velocity.
+lib/        Dependencies for building and using Velocity.
+lib/test/   Dependencies needed for the various unit tests.
+src/        This is where all of the source code is located.
+test/       Contains test files needed for the unit tests.
+xdocs/      Here are the .xml files for building the .html files
+            related to the website and documentation. The files
+            located in docs/ have been built from these sources.
 ]]></source>
 
 </section>
@@ -68,16 +72,10 @@
 <section name="Required Tools">
 
 <p>
-To make building Velocity easy and consistant, we require a Jakarta project
-called <a href="http://jakarta.apache.org/ant/">Ant</a> version 1.6 or
+To make building Velocity easy and consistent, we require an Apache project
+called <a href="http://ant.apache.org/">Ant</a> version 1.6 or
 higher to perform the build process. We assume that you have followed
-Ant's installation instructions and have it properly installed.  It's not
-difficult, and I think that you will find it an excellent addition to
-your programmer's toolbox.  
-</p>
-
-<p>Note that there is an experimental <a href="maven.apache.org">Maven</a> 
-build included with the distribution, but Ant remains the recommended method.
+Ant's installation instructions and have it properly installed.
 </p>
 
 <p>
@@ -96,9 +94,12 @@
 
 <section name="Jar Dependencies">
 
-<p>Velocity requires various third party jar files for compiling and for running.  Not all 
-jar files are required in all cases.  When building, all dependencies will be downloaded
-automatically unless the <code>skip.jar.loading</code> property is set.  
+<p>Velocity requires various third party jar files for compiling and
+for running.  Not all jar files are required in all cases.  When
+building, all dependencies will be downloaded automatically. You can
+control the download with the <code>skip.jar.loading</code> and
+<code>force.jar.loading</code> properties in the
+<code>build.properties</code> file.
 </p>
 
 <table>
@@ -135,7 +136,7 @@
   <td>Only for Anakia</td>  
 </tr>
 <tr>
-  <td><code>log4j.1.2.8.jar</code></td>
+  <td><code>log4j.1.2.12.jar</code></td>
   <td>Possible means of logging</td>
   <td>No</td>  
 </tr>
@@ -159,12 +160,17 @@
   <td>For running unit tests</td>
   <td>No</td>
 </tr>
+<tr>
+  <td><code>hsqldb-1.7.1.jar</code></td>
+  <td>For running database related unit tests</td>
+  <td>No</td>
+</tr>
 </table>
 
 
 <p>
-Note that you can always create a jar with all required run-time dependencies by running the 
-task <code>jar-dep</code>.
+Note that you can always create a jar with all required run-time dependencies by executing the 
+<code>jar-dep</code> task.
 </p>
 
 </section>
@@ -175,8 +181,8 @@
 In each case below, it is assumed that you were successful in getting
 the distribution from Subversion or as a nightly build, and with the latter,
 were successful in unpacking.  Also, it is assumed that you are starting
-in the 'jakarta-velocity' directory, the root of the distribution tree.
-All directory references will be relative to 'jakarta-velocity'.
+in the 'velocity' directory, the root of the distribution tree.
+All directory references will be relative to 'velocity'.
 </p>
 
 <p>
@@ -201,7 +207,7 @@
 <p>
 Note that to build any of the specific build targets simply add
 the target name to the command line.  For example, to build the Javadoc
-API documentation :
+API documentation:
 </p>
 
 <source><![CDATA[
@@ -230,6 +236,9 @@
     <b><code>clean</code></b> deletes all generated classes, jars, documentation, and other files.
    </li>
   <li>
+    <b><code>real-clean</code></b> like <code>clean</code> but also deletes all downloaded jars.
+   </li>
+  <li>
     <b><code>docs</code></b> builds these docs in the <code>docs</code> directory
     using Velocity's <a href="anakia.html">Anakia</a> XML transformation tool.
     Allows you to use
@@ -275,7 +284,7 @@
 <p>
 If the problems persist, do not hesitate to ask the Velocity community
 via our mail lists. They can be found <a
-href="http://jakarta.apache.org/site/mail.html">here</a>. 
+href="http://velocity.apache.org/contact.html">here</a>. 
 </p>
 
 </section>
@@ -290,44 +299,26 @@
 
 <p>
 To run the test suite, simply use the build target
-<b>test</b> when you build :
+<b>test</b> when you build:
 </p>
 <source><![CDATA[
 ant test
 ]]></source>
 
 <p>
-If all is well, you should see output similar to :
+If all is well, you should see output similar to:
 </p>
 
 <source><![CDATA[
-junittest:
-    [junit] Running org.apache.velocity.util.TestSimplePool
-    [junit] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.025 sec
-
 test:
-
-test-template:
-     [echo] Running Template tests...
-     [java] Adding TemplateTestCase : arithmetic
-     ...
-     ...
-     ...
-     [java] Adding TemplateTestCase : foreach-introspect
-     [java] Adding TemplateTestCase : settest
-     [java] .......................................
-     [java] Time: 1.999
-
-     [java] OK (39 tests)
-
-
-test-velocityapp:
-     [echo] Running app.Velocity tests...
-     [java] .
-     [java] Time: 0.004
-
-     [java] OK (1 tests)
-
+    [mkdir] Created dir: ..../bin/test-reports
+    [junit] Running org.apache.velocity.io.UnicodeInputStreamTestCase
+    [junit] Tests run: 8, Failures: 0, Errors: 0, Time elapsed: 0.011 sec
+    [junit] Running org.apache.velocity.test.AbsoluteFileResourceLoaderTestCase
+    [junit] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.015 sec
+    [junit] Running org.apache.velocity.test.ArithmeticTestCase
+    [junit] Tests run: 7, Failures: 0, Errors: 0, Time elapsed: 0.006 sec
+    [junit] Running org.apache.velocity.test.BuiltInEventHandlerTestCase
 
 ...
 

Modified: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/committers.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/committers.xml?view=diff&rev=500887&r1=500886&r2=500887
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/committers.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/committers.xml Sun Jan 28 13:21:43 2007
@@ -22,7 +22,7 @@
 
  <properties>
   <title>Velocity Committers</title>
-  <author email="wglass@apache.org">Velocity Documentation Team</author>
+  <author email="dev@velocity.apache.org">Velocity Documentation Team</author>
  </properties>
 
 <body>

Modified: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/developer-guide.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/developer-guide.xml?view=diff&rev=500887&r1=500886&r2=500887
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/developer-guide.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/developer-guide.xml Sun Jan 28 13:21:43 2007
@@ -22,7 +22,7 @@
 
  <properties>
   <title>Developer's Guide</title>
-  <author email="geirm@apache.org">Velocity Documentation Team</author>
+  <author email="dev@velocity.apache.org">Velocity Documentation Team</author>
  </properties>
 
 <body>
@@ -143,10 +143,10 @@
 Velocity is often used for building web applications
 In order to use Velocity in a web app you'll need a servlet or servlet-based
 framework. The easiest way to get started is with
-<a href="http://jakarta.apache.org/velocity/tools/view/">VelocityViewServlet</a> in the
-<a href="http://jakarta.apache.org/velocity/tools/">Velocity Tools</a>
+<a href="http://velocity.apache.org/tools/devel/view/">VelocityViewServlet</a> in the
+<a href="http://velocity.apache.org/tools/devel/">Velocity Tools</a>
 subproject.  You can also use any of a number of
-<a href="http://wiki.apache.org/jakarta-velocity/PoweredByVelocity">third party frameworks</a>
+<a href="http://wiki.apache.org/velocity/PoweredByVelocity">third party frameworks</a>
 or build your own servlet using the techniques described in this document.
 </p>
 
@@ -162,15 +162,15 @@
 
 <p>
     You can download the latest release version of
-    <a href="http://jakarta.apache.org/site/downloads/downloads_velocity.cgi">Velocity</a>
-    or <a href="http://jakarta.apache.org/site/downloads/downloads_velocity.cgi">Velocity Tools</a>
-    from the main Jakarta download site.  For Velocity itself, source is included with the binary download.
+    <a href="http://velocity.apache.org/download.cgi#engine">Velocity</a>
+    or <a href="http://velocity.apache.org/download.cgi#tools">Velocity Tools</a>
+    from the main Apache Velocity download site.  For Velocity itself, source is included with the binary download.
 </p>
 
 <p>
     If you want to download the latest source, you can do so via the Subversion (svn)
     source control system, or download a complete
-    <a href="http://svn.apache.org/snapshots/jakarta-velocity/">nightly snapshot.</a>
+    <a href="http://svn.apache.org/snapshots/velocity/">nightly snapshot.</a>
 </p>
 
 <p>
@@ -196,12 +196,16 @@
 
 <ul>
 <li>
-  <a href="http://jakarta.apache.org/commons/">
+  <a href="http://jakarta.apache.org/commons/collections">
   <b>Jakarta Commons Collections</b></a> - required.
 </li>
 <li>
-  <a href="http://jakarta.apache.org/avalon/logkit/index.html">
-  <b>Jakarta Avalon Logkit</b></a> - optional, but very common.
+  <a href="http://jakarta.apache.org/commons/lang">
+  <b>Jakarta Commons Lang</b></a> - required.
+</li>
+<li>
+  <a href="http://excalibur.apache.org/logger.html">
+  <b>Excalibur (ex-Avalon) Logkit</b></a> - optional, but very common.
   Needed if using the default file-based logging in Velocity.
 </li>
 <li>
@@ -219,76 +223,71 @@
 <p>
 There are quite a few resources and examples available to the programmer, and we
 recommend that you look at our examples, documentation and even the source code.
-Some great sources are :
+Some great sources are:
 </p>
 
 <ul>
   <li>
-     The user and developer community : join us via the
-     <a href="http://jakarta.apache.org/getinvolved/mail.html">mail-lists</a>.
-  </li>
-  <li>
-     Mail-list archives : <a href="http://www.mail-archive.com">
-    http://www.mail-archive.com</a> is a good one.  Type 'velocity' into the search
-    box to see both our -user and -dev archives.
+     The user and developer community: join us via the
+     <a href="http://velocity.apache.org/contact.html">mail-lists</a>. Mail list archives are available from that page, too.
   </li>
   <li>
     Wiki:
-    <a href="http://wiki.apache.org/jakarta-velocity/">http://wiki.apache.org/jakarta-velocity/</a>
+    <a href="http://wiki.apache.org/velocity/">http://wiki.apache.org/velocity/</a>
     The Velocity wiki contains articles, sample code, and other community-written content.
   </li>
   <li>
     Frequently Asked Questions (FAQ):
-    <a href="http://wiki.apache.org/jakarta-velocity/VelocityFAQ">http://wiki.apache.org/jakarta-velocity/VelocityFAQ</a>
+    <a href="http://wiki.apache.org/velocity/VelocityFAQ">http://wiki.apache.org/velocity/VelocityFAQ</a>
     please visit this page to read the latest FAQ and to contribute your own answers.
   </li>
   <li>
-    source code : <code>src/java/...</code> : all the source code to the
+    source code: <code>src/java/...</code>: all the source code to the
     Velocity project
   </li>
   <li>
-    application example 1 : <code>examples/app_example1</code> : a simple
+    application example 1: <code>examples/app_example1</code>: a simple
     example showing how to use Velocity in an application program.
   </li>
   <li>
-    application example 2 : <code>examples/app_example2</code> : a simple
+    application example 2: <code>examples/app_example2</code>: a simple
     example showing how to use Velocity in an application program using the
     Velocity application utility class.
   </li>
   <li>
-    logger example : <code>examples/logger_example</code> : a simple example
+    logger example: <code>examples/logger_example</code>: a simple example
     showing how to create a custom logging class and register it with
     Velocity to receive all log messages.
   </li>
   <li>
-    XML example : <code>examples/xmlapp_example</code> : a simple example
+    XML example: <code>examples/xmlapp_example</code>: a simple example
     showing how to use JDOM to read and access XML document data from
     within a Velocity template.  It also includes a demonstration of
     a recursive Velocimacro that walks the document tree.
   </li>
  <li>
-    event example : <code>examples/event_example</code> : An example that
+    event example: <code>examples/event_example</code>: An example that
     demonstrates the use of the event handling API.
   </li>
   <li>
-    Anakia application : <code>examples/anakia</code> : example application
+    Anakia application: <code>examples/anakia</code>: example application
     showing how to use Velocity for creating stylesheet renderings of xml data
   </li>
   <li>
-    documentation : <code>docs</code> : all the generated documentation for the
+    documentation: <code>docs</code>: all the generated documentation for the
     Velocity project in html
   </li>
   <li>
-    API documentation : <code>docs/api</code> : the generated Javadoc
+    API documentation: <code>docs/api</code>: the generated Javadoc
     documentation for the Velocity project
   </li>
   <li>
-    templates : <code>test/templates</code> : a large collection of template
+    templates: <code>test/templates</code>: a large collection of template
     examples in our testbed directory, these are a great source of useage
     examples of VTL, the Velocity Template Language
   </li>
   <li>
-    context example : <code>examples/context_example</code> : two examples
+    context example: <code>examples/context_example</code>: two examples
     showing how the Velocity context can be extended. For advanced users.
   </li>
 </ul>
@@ -306,7 +305,7 @@
 
 <p>
 When using Velocity in an application program or in a servlet
-(or anywhere, actually), you will generally do the following :
+(or anywhere, actually), you will generally do the following:
 </p>
 
 <ol>
@@ -352,7 +351,7 @@
 }
 catch( ParseErrorException pee )
 {
-  // syntax error : problem parsing the template
+  // syntax error: problem parsing the template
 }
 catch( MethodInvocationException mie )
 {
@@ -401,7 +400,7 @@
    as each web application can have its own instance of Velocity, allowing
    that web application's servlet to share resources like templates, a logger, etc.
    The singleton is accessable via the <code>org.apache.velocity.app.Velocity</code>
-   class, and and example of use :
+   class, and and example of use:
 </p>
 <source><![CDATA[
 
@@ -441,7 +440,7 @@
    directories, loggers, etc in the same application.  To use separate
    instances, use the <code>org.apache.velocity.app.VelocityEngine</code>
    class.  An example, which parallels the above singleton example, looks
-   like :
+   like:
 </p>
 
 <source><![CDATA[
@@ -584,14 +583,14 @@
 for the loop.
 </li>
 
-<li> <code>java.util.Iterator</code> USE WITH CAUTION : This is currently
+<li> <code>java.util.Iterator</code> USE WITH CAUTION: This is currently
 supported only provisionally - the issue of concern is the
 'non-resettablity' of the Iterator.  If a 'naked' Iterator is placed into
 the context, and used in more than one #foreach(), subsequent #foreach()
 blocks after the first will fail, as the Iterator doesn't reset.
 </li>
 
-<li> <code>java.util.Enumeration</code> USE WITH CAUTION : Like
+<li> <code>java.util.Enumeration</code> USE WITH CAUTION: Like
 <code>java.util.Iterator</code>, this is currently
 supported only provisionally - the issue of concern is the
 'non-resettablity' of the Enumeration.  If a 'naked' Enumeration
@@ -661,7 +660,7 @@
 'contiguous' context to the template.
 </p>
 <p>
-This is best illustrated by an example :
+This is best illustrated by an example:
 </p>
 <source><![CDATA[
 VelocityContext context1 = new VelocityContext();
@@ -727,7 +726,7 @@
 
 <p>
  There are two common situations where the Java code must deal with objects
- created at runtime in the template :
+ created at runtime in the template:
 </p>
 
 <p>
@@ -813,7 +812,7 @@
 for each template it visits, and as template caching is off, it appears
 to the VelocityContext that it is visiting a new template each time.
 Hence it gathers more introspection information and grows. It is highly
-recommended that you do one or more of the following :
+recommended that you do one or more of the following:
 </p>
 
 <ul>
@@ -854,7 +853,7 @@
 
 <section name="Using Velocity" href="UsingVelocity">
 
-<p>If you are using <a href="http://jakarta.apache.org/velocity/tools/view/">VelocityViewServlet</a>
+<p>If you are using <a href="http://velocity.apache.org/tools/devel/view/">VelocityViewServlet</a>
 or other web frameworks, you may never call Velocity directly.  However, if you use
 Velocity for non-web purposes, or create your own web framework you will need
 to directly call the Velocity Engine similar to
@@ -885,7 +884,7 @@
 </p>
 
 <p>
-The five configuration methods are :
+The five configuration methods are:
 </p>
 
 <ul>
@@ -937,7 +936,7 @@
 </p>
 
 <p>
-The most common approaches to initializing Velocity will be something like :
+The most common approaches to initializing Velocity will be something like:
 </p>
 
 <ol>
@@ -959,7 +958,7 @@
 Once the runtime is initialized, you can do with it what you wish.. This mostly
 revolves around rendering templates into an output stream, and the Velocity
 utility class allows you to do this easily.  Currently, here are the methods
-and a brief description of what they do :
+and a brief description of what they do:
 </p>
 
 <ul>
@@ -1052,7 +1051,7 @@
 When we run this program, and have the template <code> testtemplate.vm</code>
 in the same directory as our program (because we used the default
 configuration properties, and the defaul place to load templates
-from is the current directory...), our output should be :
+from is the current directory...), our output should be:
 </p>
 
 <source><![CDATA[
@@ -1157,7 +1156,7 @@
 </p>
 <p>
 If we wanted to use a different directory than the current directory to
-load our template from, we could do something like this :
+load our template from, we could do something like this:
 </p>
 
 <source><![CDATA[
@@ -1237,7 +1236,7 @@
 <p>
 The Application Attribute API is very simple.  From the application layer, there
 is a method of the <code>VelocityEngine</code> and the <code>Velocity</code>
-classes :
+classes:
 </p>
 
 <source>
@@ -1891,7 +1890,7 @@
 </p>
 
 <p>
-In general, you have the following logging options :
+In general, you have the following logging options:
 </p>
 
 <ul>
@@ -2147,7 +2146,7 @@
 <ul>
 <li>
   <b>FileResourceLoader :</b> This loader gets resources from the filesystem. Its
-  configuration properties include :
+  configuration properties include:
   <ul>
     <li>
       <code>file.resource.loader.path</code> = &lt;path to root of templates&gt;
@@ -2163,7 +2162,7 @@
   'current directory'.  In the case of using Velocity with servlets, this can be a problem
   as you don't want to have to keep your templates in the directory from which you start
   your servlet engine.  See the documentation for your servlet or web framework (for example
-  <a href="http://jakarta.apache.org/velocity/tools/view/">VelocityViewServlet</a>) for more
+  <a href="http://velocity.apache.org/tools/devel/view/">VelocityViewServlet</a>) for more
   info on how to configure the location of the Velocity templates.
 </li>
 <li>
@@ -2191,7 +2190,7 @@
 </li>
 <li>
   <b>URLResourceLoader :</b> This loader gets resources from a URL connection. Its
-  configuration properties include :
+  configuration properties include:
   <ul>
     <li>
       <code>url.resource.loader.root</code> = &lt;root URL path of templates&gt;
@@ -2240,7 +2239,7 @@
 <p>
 That entry declares that we will have a resource loader known as 'file'.
 The next thing to do is to set the important properties.  The most critical
-is to declare the class to use as the loader :
+is to declare the class to use as the loader:
 </p>
 
 <source><![CDATA[
@@ -2278,10 +2277,10 @@
 </p>
 
 <p>
-<b>Do-nothing Default Configuration : </b> As the name says, there is nothing
+<b>Do-nothing Default Configuration: </b> As the name says, there is nothing
 you have to do or configure to get the default configuration.  This configuration
 uses the FileResourceLoader with the current directory as the default resource
-path, and caching is off.  As a properties set, this is expressed as :
+path, and caching is off.  As a properties set, this is expressed as:
 </p>
 
 <source><![CDATA[
@@ -2295,10 +2294,10 @@
 ]]></source>
 
 <p>
-<b>Multiple Template Path Configuration : </b> This configuration
+<b>Multiple Template Path Configuration: </b> This configuration
 uses the FileResourceLoader with several directories as 'nodes' on the
 template search path. We also want to use caching, and have the templates
-checked for changes in 10 second intervals.  As a properties set, this is expressed as :
+checked for changes in 10 second intervals.  As a properties set, this is expressed as:
 </p>
 
 <source><![CDATA[
@@ -2389,7 +2388,7 @@
 A description of the requirements of a resource manager is out of scope for
 this document.  Implementors are encouraged to review the default implementation.
 To configure Velocity to load the replacement implementation, use the
-configuration key :
+configuration key:
 </p>
 
 <source><![CDATA[
@@ -2408,7 +2407,7 @@
 resource manager is out of scope for
 this document.  Implementors are encouraged to review the default implementation.
 To configure Velocity to load the replacement implementation, use the
-configuration key :
+configuration key:
 </p>
 
 <source><![CDATA[
@@ -2443,11 +2442,11 @@
 <p>
 Velocity allows you to specify the character encoding of your
 template resources on a template by template basis.  The normal resource
-API's have been extended to take the encoding as an argument :
+API's have been extended to take the encoding as an argument:
 </p>
 
 <p>
-<code>org.apache.velocity.app.Velocity</code> : <br/>
+<code>org.apache.velocity.app.Velocity</code>: <br/>
 <blockquote>
   <i><code>public static Template getTemplate(String name, String encoding)</code></i>
   <br/>
@@ -2486,7 +2485,7 @@
 <a href="http://www.jdom.org/">JDOM</a> to process your XML into a data structure with
 convenient Java access.  Then, you produce templates that access data directly
 out of the XML document - directly though the JDOM tree.  For example, start
-with an XML document such as :
+with an XML document such as:
 </p>
 
 <source><![CDATA[
@@ -2528,7 +2527,7 @@
 <p>
 (See the Anakia source for details on how to do this, or the Anakia
 example in the <code>examples</code> directory in the distribution.)
-Now, make a regular Velocity template :
+Now, make a regular Velocity template:
 </p>
 
 <source><![CDATA[
@@ -2563,7 +2562,7 @@
 <p>
 One issue that arises with XML and Velocity is how to deal with XML
 entities. One technique is to combine the use of Velocimacros
-when you need to render an entity into the output stream :
+when you need to render an entity into the output stream:
 </p>
 
 <source><![CDATA[
@@ -2594,7 +2593,7 @@
 ]]></source>
 
 <p>
-Put it into the context as "xenc". Then you can use it as :
+Put it into the context as "xenc". Then you can use it as:
 </p>
 
 <source><![CDATA[
@@ -2614,7 +2613,7 @@
 encoding to any string returned. Be careful to avoid rendering the
 output of method calls directly, as they could return objects or strings
 (which might need encoding). Place them first into the context with a
-#set() directive and the use that, for example :
+#set() directive and the use that, for example:
 </p>
 
 <source><![CDATA[
@@ -2639,7 +2638,7 @@
 </p>
 <p>
 Please submit all detailed, thoughtful and constructive feedback through our
-<a href="http://jakarta.apache.org/getinvolved/mail.html">mail lists</a>.
+<a href="http://velocity.apache.org/contact.html">mailing lists</a>.
 </p>
 </section>
 

Modified: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/getting-started.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/getting-started.xml?view=diff&rev=500887&r1=500886&r2=500887
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/getting-started.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/getting-started.xml Sun Jan 28 13:21:43 2007
@@ -22,7 +22,7 @@
 
  <properties>
   <title>Velocity Getting Started</title>
-  <author email="jvanzyl@zenplex.com">Velocity Documentation Team</author>
+  <author email="dev@velocity.apache.org">Velocity Documentation Team</author>
  </properties>
 
 <body>
@@ -65,15 +65,15 @@
 <section name="Downloading Velocity" href="DownloadingVelocity">
     <p>
         You can download the latest release version of
-        <a href="http://jakarta.apache.org/site/downloads/downloads_velocity.cgi">Velocity</a>
-        or <a href="http://jakarta.apache.org/site/downloads/downloads_velocity.cgi">Velocity Tools</a>
-        from the main Jakarta download site.  For Velocity itself, source is included with the binary download.
+        <a href="http://velocity.apache.org/download.cgi#engine">Velocity</a>
+        or <a href="http://velocity.apache.org/download.cgi#tools">Velocity Tools</a>
+        from the main Apache Velocity download site.  For Velocity itself, source is included with the binary download.
     </p>
 
     <p>
         If you want to download the latest source, you can do so via the Subversion (svn)
         source control system, or download a complete
-        <a href="http://svn.apache.org/snapshots/jakarta-velocity/">nightly snapshot.</a>
+        <a href="http://vc.apache.org/snapshots/velocity/">nightly snapshot.</a>
     </p>
 
     <p>
@@ -86,8 +86,8 @@
 <section name="API Documentation" href="APIDocumentation">
 
 <p>
-Our API documentation is available <a href="api/index.html">online</a>,
-as part of the distribution package, and of course, you can generate it
+Our API documentation is available <a href="http://velocity.apache.org/engine/devel/apidocs/">online</a>,
+<a href="api/index.html">as part of the distribution package</a>, and of course, you can generate it
 yourself from the included source code.
 </p>
 <p>
@@ -101,13 +101,13 @@
 ]]></source>
 
 <p>
-The docs will be found in the <code>/docs/apidocs/</code> directory.
+The docs will be found in the <code>/bin/apidocs/</code> directory.
 </p>
 
 <p>
-<b>Note:</b> Velocity uses the <a href="http://jakarta.apache.org/ant/">Jakarta Ant</a>
+<b>Note:</b> Velocity uses the <a href="http://ant.apache.org/">Apache Ant</a>
 build tool for all code and documentation generation, so you will need to have it
-installed.  We strongly endorse this wonderful tool for any Java developer.
+installed. Velocity requires at least Apache Ant 1.6.
    </p>
 
 </section>

Modified: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/index.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/index.xml?view=diff&rev=500887&r1=500886&r2=500887
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/index.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/index.xml Sun Jan 28 13:21:43 2007
@@ -22,7 +22,7 @@
 
   <properties>
     <title>Velocity</title>
-    <author email="jvanzyl@zenplex.com">Velocity Documentation Team</author>
+    <author email="dev@velocity.apache.org">Velocity Documentation Team</author>
   </properties>
 
   <body>
@@ -53,100 +53,23 @@
 
     </section>
 
-    <!-- note - just include 1-2 news item here, archive rest on Wiki -->
-
-    <section name="Recent News" href="recentnews">
-
-    <p><strong>The Velocity SVN Repository moved!</strong> 
-    <br/>(December 1st, 2006)
-    </p>
-    
-    <p>
-    As part of our move to top-level status, we moved the Subversion repository. It is
-    now available from <a href="http://svn.apache.org/repos/asf/velocity/">http://svn.apache.org/repos/asf/velocity/</a>. 
-    Please update your references. If you have already checked out the source code, you can use the <pre>svn switch</pre>
-    command to update your local copy.
-    </p>
-    
-    <p><strong>Velocity 1.5 Beta 2 Released</strong> 
-    <br/>(November 24, 2006)
-    </p>
-    
-    <p>
-    The Velocity developers are pleased to announce the second beta release of
-    Velocity 1.5.
-    You may download it 
-    <a href="http://www.apache.org/dist/jakarta/velocity/beta/velocity-1.5-beta2/">here</a>.    
-    </p>
-    
-    <p>
-    This beta version is one of the final steps before the long-awaited version 1.5.  Since Beta 1
-    we have added a new InvalidReferenceEventHandler (to catch invalid references), the 
-    SecureUberspector (to prevent introspection on "dangerous objects"), and a StringResourceLoader.  
-    We've also fixed some critical bugs, including a subtle synchronization problem causing
-    page generation to fail under heavy loads.
-    </p>
-    
-    <p>
-    Some of the other new features since Velocity 1.4 include:
-    </p>
-    
-    <ul>
-    <li>floating point number arithmetic</li>
-    <li>new event handlers for altering #include/#parse behavior</li>
-    <li>literal map syntax</li>
-    </ul>
-    
-    <p>A complete list of changes is available at our 
-    <a href="https://issues.apache.org/jira/browse/VELOCITY?report=com.atlassian.jira.plugin.system.project:roadmap-panel">issue tracker</a>.
-    You may also want to check out the draft <a href="http://wiki.apache.org/jakarta-velocity/Velocity15ReleaseNotes">release notes</a> on the Wiki.
-    Please report any additional bugs in the issue tracker, especially those that need to be fixed before our 
-    final release.  (use 1.5 beta 2 as the version).  
-    </p>
-
-    <p><strong>Velocity Approved as Top Level Project</strong> 
-    <br/>(October 26, 2006)
-    </p>
-    
-    <p>
-    The Board of the Apache Software Foundation has passed a resolution to upgrade
-    Jakarta Velocity into an Apache Top Level Project (TLP), to be renamed Apache Velocity.  
-    We are excited of the new prominence of the Velocity project.  
-    </p>
-
-    <p>Please stay tuned for our new website at 
-    <a href="http://velocity.apache.org/">http://velocity.apache.org/</a>.  In the meantime,
-    note that our new mailing lists are 
-    <a href="mailto:user@velocity.apache.org">user@velocity.apache.org</a> (subscribe at 
-    <a href="mailto:user-subscribe@velocity.apache.org">user-subscribe@velocity.apache.org</a>)
-    for general questions, and
-    <a href="mailto:dev@velocity.apache.org">dev@velocity.apache.org</a>
-    (subscribe at 
-    <a href="mailto:dev-subscribe@velocity.apache.org">dev-subscribe@velocity.apache.org</a>) for 
-    development-related activity.
-    </p>    
-    
-    </section>
-        
-
-
     <section name="Where do I get releases?" href="WheredoIgetreleases?">
 
-      <p> The current stable release version is version 1.4. </p>
+      <p> The current stable release version is version 1.5. </p>
 
       <p> The release distribution is available as a combined source/binary distribution in
         <code>tar.gz</code> and
         <code>zip</code> formats, and can be downloaded through the
         <a
-          href="http://jakarta.apache.org/site/downloads/downloads_velocity.cgi">
+          href="http://velocity.apache.org/download.cgi">
           Apache Mirror system</a>. </p>
 
       <p> The Velocity jars are also available through the
-        <a href="http://www.ibiblio.org/maven/velocity/">central Maven
+        <a href="http://repo1.maven.org/maven2/org/apache/velocity/">central Maven
           repository</a>. </p>
 
       <p> Older releases are archived at the
-        <a href="http://archive.apache.org/dist/jakarta/velocity/"> Jakarta
+        <a href="http://archive.apache.org/dist/velocity/engine/"> Apache
           Velocity archives</a>. </p>
 
     </section>
@@ -155,14 +78,18 @@
       href="WheredoIgetnightlysnapshots?">
 
       <p> Nightly snapshots of the Velocity subversion source code tree can be found
-        <a href="http://svn.apache.org/snapshots/jakarta-velocity/"> here</a>. </p>
+        on our <a href="http://vc.apache.org/snapshots/velocity/">nightly snapshot site</a>. </p>
 
-      <p> These are meant to provide easy access to the actual project source control tree. As
+      <p><b>Caveat!</b> These snapshots are generated automatically from the project source code repository. As
         this is our live development workspace, there are no guarantees as to what you will
         find there, although we do our best to maintain a buildable source tree. If you are
         looking for the stable supported release, please use the current release of
         Velocity. </p>
 
+     <p><b>Please be aware that these snapshots are no official
+     releases of Apache Velocity software. They are provided for
+     developer convenience only!</b></p>
+
       <p> If you are willing to risk getting dirty, we invite you to try the nightly snapshot to
         see the current state of affairs. (and help out!)
         <a href="http://www.apache.org/dev/version-control.html">Public Subversion
@@ -179,24 +106,22 @@
 
       <ul>
         <li> Report bugs, ask questions, and help new users on the
-          <a href="http://jakarta.apache.org/site/mail2.html#Velocity"> Velocity
+          <a href="http://velocity.apache.org/contact.html"> Velocity
             mailing lists</a>. </li>
 
         <li> There's a list of issues waiting to be addressed in
-          <a href="https://issues.apache.org/jira/browse/VELOCITY"> JIRA</a>. </li>
+          <a href="https://issues.apache.org/jira/browse/VELOCITY">our bug tracker</a>. </li>
 
         <li>
-          <a href="http://wiki.apache.org/jakarta-velocity/FrontPage"> Our Wiki</a>
+          <a href="http://wiki.apache.org/velocity/FrontPage"> Our Wiki</a>
           has a large collection of community written content. Add your own article or
           contribute to the FAQ! </li>
-        <li> Read-only access to the Subversion
-          <strong>jakarta-velocity</strong> repository is available both
+        <li> Read-only access to the Subversion repository is available both
           <a href="http://svn.apache.org/repos/asf/velocity/engine/trunk/">
             online</a> and with a
           <a href="http://www.apache.org/dev/version-control.html"> Subversion
             client</a>. </li>
       </ul>
-
     </section>
   </body>
 </document>

Modified: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/jar-dependencies.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/jar-dependencies.xml?view=diff&rev=500887&r1=500886&r2=500887
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/jar-dependencies.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/jar-dependencies.xml Sun Jan 28 13:21:43 2007
@@ -21,7 +21,7 @@
 <document>
   <properties>
     <title>Velocity dependencies</title>
-    <author email="hps@intermeta.de">Henning P. Schmiedehausen</author>
+    <author email="dev@velocity.apache.org">Velocity Documentation Team</author>
   </properties>
 
   <body>

Modified: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/overview.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/overview.xml?view=diff&rev=500887&r1=500886&r2=500887
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/overview.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/overview.xml Sun Jan 28 13:21:43 2007
@@ -22,7 +22,7 @@
 
  <properties>
   <title>Velocity Overview</title>
-  <author email="wglass@apache.org">Velocity Documentation Team</author>
+  <author email="dev@velocity.apache.org">Velocity Documentation Team</author>
  </properties>
 
  <body>
@@ -36,15 +36,15 @@
  </p>
     <ul>
         <li>Web applications.  Web designers create HTML pages with placeholders for dynamic information.
-           The page is processed with <a href="http://jakarta.apache.org/velocity/tools/view/">VelocityViewServlet</a> or any of a
-           number of <a href="http://wiki.apache.org/jakarta-velocity/PoweredByVelocity">frameworks</a> which support Velocity.
+           The page is processed with <a href="http://velocity.apache.org//tools/devel/view/">VelocityViewServlet</a> or any of a
+           number of <a href="http://wiki.apache.org/velocity/PoweredByVelocity">frameworks</a> which support Velocity.
            This approach to web application development
            is called Model-View-Controller or MVC and is intended to be a direct replacement
            for applications developed with Java Server Pages (JSPs) or PHP.
         </li>
 
         <li>Source code generation.  Velocity can be used to generate Java source code, SQL, or PostScript
-            based on templates.  The <a href="http://wiki.apache.org/jakarta-velocity/PoweredByVelocity">PoweredByVelocity</a>
+            based on templates.  The <a href="http://wiki.apache.org/velocity/PoweredByVelocity">PoweredByVelocity</a>
             page lists a number of open source
             and commercial development software packages which use Velocity in this manner.
         </li>
@@ -123,7 +123,7 @@
         </li>
         <li>Finally, for the truly adept, the grammar for Velocity is processed in a parser
             generated by
-            <a href="http://www.metamata.com/javacc/">JavaCC</a> (Java Compiler
+            <a href="https://javacc.dev.java.net/">JavaCC</a> (Java Compiler
             Compiler) using the JJTree extension to create an Abstract Syntax Tree.
             By changing the JavaCC specification file and recompiling, the Velocity syntax
             itself can be changed.

Modified: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/texen.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/texen.xml?view=diff&rev=500887&r1=500886&r2=500887
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/texen.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/texen.xml Sun Jan 28 13:21:43 2007
@@ -22,7 +22,7 @@
 
  <properties>
   <title>Texen</title>
-  <author email="jvanzyl@zenplex.com">Velocity Documentation Team</author>
+  <author email="dev@velocity.apache.org">Velocity Documentation Team</author>
  </properties>
 
 <body>
@@ -32,7 +32,7 @@
 <p>
     Texen is a general purpose text generating utility. It is capable of
     producing almost any sort of text output. Driven by Ant, essentially
-    an <a href="http://jakarta.apache.org/ant/">Ant</a> Task, Texen uses
+    an <a href="http://ant.apache.org/">Ant</a> Task, Texen uses
     a control template, an optional set of worker templates, and control
     context to govern the generated output. Although TexenTask can be
     used directly, it is usually subclassed to initialize your control
@@ -40,14 +40,12 @@
 </p>
 
 <p>
-    Texen was created to deal with the source generating requirements of
-    the Turbine web application framework. The <a
-    href="http://jakarta.apache.org/turbine/torque.html">Torque</a> utility
-    in <a href="http://jakarta.apache.org/turbine/">Turbine</a>, which is a
-    subclass of the TexenTask, is responsible for generating the SQL,
-    and the Object-Relational mapping sources for a Turbine project.
-    This is only one example; you can use Texen to generate almost any
-    sort of text output!
+    Texen was created to deal with the source generating requirements
+    of the Turbine web application framework. The <a
+    href="http://db.apache.org/torque/">Torque</a> uses a subclass of
+    the TexenTask to generate SQL and the Object-Relational mapping
+    sources for its O/R layer.  This is only one example; you can
+    use Texen to generate almost any sort of text output!
 </p>
 
 </section>
@@ -160,7 +158,7 @@
 <p>
     See the Torque utility in Turbine for a full working example of
     Texen. A standalone version of Torque is available <a
-    href="http://jakarta.apache.org/builds/jakarta-turbine/release/">here</a>.
+    href="http://db.apache.org/torque/">here</a>.
 </p>
 
     <table border="0">

Modified: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/user-guide.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/user-guide.xml?view=diff&rev=500887&r1=500886&r2=500887
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/user-guide.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/user-guide.xml Sun Jan 28 13:21:43 2007
@@ -22,8 +22,7 @@
 
  <properties>
   <title>Velocity User Guide</title>
-  <author email="jvanzyl@zenplex.com">Velocity Documentation Team</author>
-  <author email="jcastura@kw.igs.net">John Castura</author>
+  <author email="dev@velocity.apache.org">Velocity Documentation Team</author>
  </properties>
 
 <body>
@@ -2358,7 +2357,7 @@
     If you encounter any mistakes in this manual or have
     other feedback related to the Velocity User Guide, please
     email the
-    <a href="mailto:velocity-user@jakarta.apache.org">Velocity user list</a>.
+    <a href="mailto:dev@velocity.apache.org">Velocity developers list</a>.
     Thanks!
   </p>
 

Modified: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/vtl-reference-guide.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/vtl-reference-guide.xml?view=diff&rev=500887&r1=500886&r2=500887
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/vtl-reference-guide.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/vtl-reference-guide.xml Sun Jan 28 13:21:43 2007
@@ -22,8 +22,7 @@
 
  <properties>
   <title>VTL Reference</title>
-  <author email="jvanzyl@zenplex.com">Velocity Documentation Team</author>
-  <author email="jcastura@apache.org">John Castura</author>
+  <author email="dev@velocity.apache.org">Velocity Documentation Team</author>
  </properties>
 
 <body>

Modified: velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/webapps.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/webapps.xml?view=diff&rev=500887&r1=500886&r2=500887
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/webapps.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/webapps.xml Sun Jan 28 13:21:43 2007
@@ -22,7 +22,7 @@
 
  <properties>
   <title>Getting Started with a Web Application</title>
-  <author email="wglass@forio.com">Velocity Documentation Team</author>
+  <author email="dev@velocity.apache.org">Velocity Documentation Team</author>
  </properties>
 
 <body>
@@ -66,29 +66,29 @@
 
 <ol>
 <li>  <strong>Velocity Tools / VelocityViewServlet</strong> -
-The easiest way to get started is to download the companion <a href="http://jakarta.apache.org/velocity/tools/">Velocity Tools</a>
+The easiest way to get started is to download the companion <a href="http://velocity.apache.org/tools/devel/">Velocity Tools</a>
 subproject and use the
-<a href="http://jakarta.apache.org/velocity/tools/view/">VelocityViewServlet</a>.  This servlet is easy to configure
+<a href="http://velocity.apache.org/tools/devel/view/">VelocityViewServlet</a>.  This servlet is easy to configure
 and install.  You create a directory of templates on your web server, edit an XML file that lists various "Tools" to
 place in the context and you are off.  More details can be found in the tutorial below.
 </li>
 
 <li>  <strong>Velocity Tools / VelocityStruts</strong> -
 You may be familiar with the popular <a href="http://struts.apache.org/">Struts</a> framework, originally designed to provide much needed
-application functionality to JSP.  With the <a href="http://jakarta.apache.org/velocity/tools/struts/">VelocityStruts</a>
+application functionality to JSP.  With the <a href="http://velocity.apache.org/tools/devel/struts/">VelocityStruts</a>
 module of Velocity Tools you can substitute Velocity for JSP as the page template language.  This allows you
 to take advantage of the large base of Struts infrastructure while designing pages using Velocity.
 </li>
 
 <li><strong>Third party frameworks</strong> - There are a number of third party frameworks listed on the
-<a href="http://wiki.apache.org/jakarta-velocity/PoweredByVelocity">PoweredByVelocity</a>
+<a href="http://wiki.apache.org/velocity/PoweredByVelocity">PoweredByVelocity</a>
 wiki page.  Of these, <a href="http://www.springframework.org/">Spring</a> is probably the most sophisticated and well known.
 <a href="http://jakarta.apache.org/turbine/">Jakarta Turbine</a> has many features and can also be very useful.
 It was built with Velocity as the primary page language, which is not surprising since many of the original Velocity
 developers were involved in creating it.
-A simpler alternative is the <a href="http://mav.sourceforge.net/">Maverick</a> framework
-which provides a simple Controller architecture that integrates nicely with
-Velocity but has no bells or whistles.
+Simpler alternative are the <a href="http://click.sourceforge.net/">Click</a> or <a href="http://mav.sourceforge.net/">Maverick</a> frameworks,
+which provide a simple Controller architecture that integrates nicely with
+Velocity.
 </li>
 
 <li><strong>Build your own</strong> - A final alternative is to build your own framework.  Create a dispatcher servlet,
@@ -198,7 +198,7 @@
 care must be taken to make certain that the web application is secure.  Most standard web security principles apply to a
 web application built with Velocity.  A few specific issues (such as system configuration, more on cross-site scripting,
 and method introspection) are written up in this article on
-<a href="http://wiki.apache.org/jakarta-velocity/BuildingSecureWebApplications">Building Secure Applications with Velocity</a>.
+<a href="http://wiki.apache.org/velocity/BuildingSecureWebApplications">Building Secure Applications with Velocity</a>.
 In particular, you may want to prevent template designers from including &quot;dangerous&quot; reflection-related methods
 by specifying the <code>SecureUberspector</code> to get/set properties and execute method calls.
 </p>
@@ -240,12 +240,12 @@
 
 <p>
 For more information, consult the
-<a href="http://jakarta.apache.org/velocity/tools/">Velocity Tools</a> documentation.
+<a href="http://velocity.apache.org/tools/devel/">Velocity Tools</a> documentation.
 </p>
 
 <ol>
 <li>Download the Velocity Tools project source (you need the source for the examples)
-from <a href="http://jakarta.apache.org/site/downloads/downloads_velocity.cgi">download page</a>.
+from the <a href="http://velocity.apache.org/download.cgi#tools">download page</a>.
 </li>
 
 <li> Build the Velocity Tools jar and the "simple" example by typing:
@@ -354,8 +354,8 @@
 
 </li>
 <li>Experiment with adding new Velocity pages.  Note that you can access any velocity page just by changing the URL.  Try changing the
-entries in toolbox.xml or creating your own tools.  Consult the <a href="http://jakarta.apache.org/velocity/tools/">Velocity Tools</a>
-documentation and the <a href="http://wiki.apache.org/jakarta-velocity/">Wiki</a> for more info on the wide variety of tools available.
+entries in toolbox.xml or creating your own tools.  Consult the <a href="http://velocity.apache.org/tools/devel/">Velocity Tools</a>
+documentation and the <a href="http://wiki.apache.org/velocity/">Wiki</a> for more info on the wide variety of tools available.
 </li>
 </ol>