velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
Subject svn commit: r501574 - in /velocity/engine/trunk: ./ build/ convert/ examples/ examples/anakia/build/ examples/app_example1/ examples/app_example2/ examples/context_example/ examples/event_example/ examples/logger_example/ examples/xmlapp_example/ exper...
Date Tue, 30 Jan 2007 21:32:31 GMT
Author: henning
Date: Tue Jan 30 13:32:26 2007
New Revision: 501574

URL: http://svn.apache.org/viewvc?view=rev&rev=501574
Log:
Merge 1.5 Release branch back to trunk.


Added:
    velocity/engine/trunk/experimental/veltag/xdocs/
      - copied from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/experimental/veltag/xdocs/
    velocity/engine/trunk/experimental/veltag/xdocs/veltag.xml
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/experimental/veltag/xdocs/veltag.xml
    velocity/engine/trunk/pom.xml
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/pom.xml
    velocity/engine/trunk/src/changes/
      - copied from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/src/changes/
    velocity/engine/trunk/src/changes/changes.xml
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/src/changes/changes.xml
    velocity/engine/trunk/src/site/
      - copied from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/src/site/
    velocity/engine/trunk/src/site/resources/
      - copied from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/src/site/resources/
    velocity/engine/trunk/src/site/resources/images/
      - copied from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/src/site/resources/images/
    velocity/engine/trunk/src/site/resources/images/velocity-logo.png
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/src/site/resources/images/velocity-logo.png
    velocity/engine/trunk/src/site/site.xml
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/src/site/site.xml
    velocity/engine/trunk/xdocs/docs/build.xml
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/build.xml
    velocity/engine/trunk/xdocs/docs/committers.xml
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/committers.xml
    velocity/engine/trunk/xdocs/docs/getting-started.xml
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/getting-started.xml
    velocity/engine/trunk/xdocs/docs/index.xml
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/index.xml
    velocity/engine/trunk/xdocs/docs/jar-dependencies.xml
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/jar-dependencies.xml
    velocity/engine/trunk/xdocs/docs/overview.xml
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/overview.xml
    velocity/engine/trunk/xdocs/docs/translations/
      - copied from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/translations/
    velocity/engine/trunk/xdocs/docs/translations/user-guide_es.xml
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/translations/user-guide_es.xml
    velocity/engine/trunk/xdocs/docs/translations/user-guide_fi.xml
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/translations/user-guide_fi.xml
    velocity/engine/trunk/xdocs/docs/translations/user-guide_fr.xml
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/translations/user-guide_fr.xml
    velocity/engine/trunk/xdocs/docs/webapps.xml
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/docs/webapps.xml
    velocity/engine/trunk/xdocs/images/pbv90x30.png
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/images/pbv90x30.png
    velocity/engine/trunk/xdocs/images/velocity-logo.png
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/images/velocity-logo.png
    velocity/engine/trunk/xdocs/images/velocity_project_wide.png
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/images/velocity_project_wide.png
    velocity/engine/trunk/xdocs/images/velocity_project_wide.xcf
      - copied unchanged from r501568, velocity/engine/branches/Velocity_1.5_BRANCH/xdocs/images/velocity_project_wide.xcf
Removed:
    velocity/engine/trunk/.cvsignore
    velocity/engine/trunk/build/.cvsignore
    velocity/engine/trunk/build/jakarta.scm
    velocity/engine/trunk/build/test.sh
    velocity/engine/trunk/convert/.cvsignore
    velocity/engine/trunk/examples/anakia/build/.cvsignore
    velocity/engine/trunk/maven.xml
    velocity/engine/trunk/project.properties
    velocity/engine/trunk/project.xml
    velocity/engine/trunk/test/anakia/.cvsignore
    velocity/engine/trunk/test/configuration/.cvsignore
    velocity/engine/trunk/test/cpload/.cvsignore
    velocity/engine/trunk/test/multi/.cvsignore
    velocity/engine/trunk/test/multiloader/.cvsignore
    velocity/engine/trunk/test/templates/.cvsignore
    velocity/engine/trunk/test/texen-classpath/.cvsignore
    velocity/engine/trunk/test/texen/.cvsignore
    velocity/engine/trunk/xdocs/.htaccess
    velocity/engine/trunk/xdocs/anakia.xml
    velocity/engine/trunk/xdocs/build.xml
    velocity/engine/trunk/xdocs/changes.xml
    velocity/engine/trunk/xdocs/changes14.xml
    velocity/engine/trunk/xdocs/committers.xml
    velocity/engine/trunk/xdocs/developer-guide.xml
    velocity/engine/trunk/xdocs/docs/license.xml
    velocity/engine/trunk/xdocs/docs/veltag.xml
    velocity/engine/trunk/xdocs/getting-started.xml
    velocity/engine/trunk/xdocs/images/jakarta.png
    velocity/engine/trunk/xdocs/images/newlogo.png
    velocity/engine/trunk/xdocs/index.xml
    velocity/engine/trunk/xdocs/jar-dependencies.xml
    velocity/engine/trunk/xdocs/license.xml
    velocity/engine/trunk/xdocs/overview.xml
    velocity/engine/trunk/xdocs/readme.txt
    velocity/engine/trunk/xdocs/stylesheets/maven-velocity.css
    velocity/engine/trunk/xdocs/stylesheets/project-website.xml
    velocity/engine/trunk/xdocs/stylesheets/wiki.vsl
    velocity/engine/trunk/xdocs/texen.xml
    velocity/engine/trunk/xdocs/translations/
    velocity/engine/trunk/xdocs/user-guide.xml
    velocity/engine/trunk/xdocs/veltag.xml
    velocity/engine/trunk/xdocs/vtl-reference-guide.xml
    velocity/engine/trunk/xdocs/webapps.xml
Modified:
    velocity/engine/trunk/CONTRIBUTORS
    velocity/engine/trunk/NOTICE
    velocity/engine/trunk/README.txt
    velocity/engine/trunk/build/build.properties
    velocity/engine/trunk/build/build.xml
    velocity/engine/trunk/examples/README.txt
    velocity/engine/trunk/examples/app_example1/README.txt
    velocity/engine/trunk/examples/app_example2/README.txt
    velocity/engine/trunk/examples/context_example/README.txt
    velocity/engine/trunk/examples/event_example/README.txt
    velocity/engine/trunk/examples/logger_example/README.txt
    velocity/engine/trunk/examples/xmlapp_example/README.txt
    velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaTask.java
    velocity/engine/trunk/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java
    velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity285TestCase.java
    velocity/engine/trunk/xdocs/docs/anakia.xml
    velocity/engine/trunk/xdocs/docs/developer-guide.xml
    velocity/engine/trunk/xdocs/docs/texen.xml
    velocity/engine/trunk/xdocs/docs/user-guide.xml
    velocity/engine/trunk/xdocs/docs/vtl-reference-guide.xml
    velocity/engine/trunk/xdocs/site.css
    velocity/engine/trunk/xdocs/stylesheets/project.xml
    velocity/engine/trunk/xdocs/stylesheets/site.vsl

Modified: velocity/engine/trunk/CONTRIBUTORS
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/CONTRIBUTORS?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/CONTRIBUTORS (original)
+++ velocity/engine/trunk/CONTRIBUTORS Tue Jan 30 13:32:26 2007
@@ -1,33 +1,36 @@
 This project is an effort by many people. If you feel that your name
 should be in here and has been omitted in error, please open an issue
-with the Velocity Issue tracker at issues.apache.org/jira/browse/VELOCITY
+with the Apache Velocity Issue tracker located at
+
+https://issues.apache.org/jira/browse/VELOCITY
 
 Aki Nieminen
 Alexey Pachenko
 Anil K. Vijendran
 Attila Szegedi
 Bob McWhirter
-Christoph Reck	
+Christoph Reck
+Claude Brisson
 Daniel Rall
 Dave Bryson
-David Kinnvall	
+David Kinnvall
 Eelco Hillenius
 Fedor Karpelevitch
 Gal Shachor
 Geir Magnusson Jr.
 Henning P. Schmiedehausen
 Jason van Zyl
-Jeff Bowden	
+Jeff Bowden
 Jon S. Stevens
 Jose Alberto Fernandez
-Kasper Nielsen	
+Kasper Nielsen
 Kent Johnson
 Kyle F. Downey
 Leon Messerschmidt
 Llewellyn Falco
 Matt Raible
 Matthijs Lambooy
-Nathan Bubna	
+Nathan Bubna
 Paulo Gaspar
 Peter Romianowski
 Robert Burrell Donkin

Modified: velocity/engine/trunk/NOTICE
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/NOTICE?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/NOTICE (original)
+++ velocity/engine/trunk/NOTICE Tue Jan 30 13:32:26 2007
@@ -1,6 +1,6 @@
 Apache Velocity
 
-Copyright (C) 2000-2006 The Apache Software Foundation
+Copyright (C) 2000-2007 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: velocity/engine/trunk/README.txt
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/README.txt?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/README.txt (original)
+++ velocity/engine/trunk/README.txt Tue Jan 30 13:32:26 2007
@@ -1,103 +1,117 @@
---------
-Velocity
---------
-
-Welcome to Velocity. Velocity is a general purpose template engine
-written in Java. For more information about Velocity, please look at the
-HTML documentation in the docs/ directory, as well as the Velocity
-web site
+---------------
+Apache Velocity
+---------------
+
+Welcome to Apache Velocity! Apache Velocity is a general purpose
+template engine written in Java. For more information about Velocity,
+please look at the HTML documentation in the docs/ directory, as well
+as the Velocity web site.
 
   http://velocity.apache.org/index.html
 
-Here is a description of what each of the top level directories
-contains. Please consult the documentation in each of the lower level
+The following top level directories are in the Velocity distribution
+archive. Please consult the documentation in each of the lower level
 directories for information that is specific to their contents.
 
-bin/        This is a temporary build directory.
 build/      This is where the build scripts live.
-contrib/    The home for source code which is not officially maintained.
-convert/    The WebMacro to Velocity conversion program.
-docs/       This is where the documentation lives.
-examples/   This is where the examples live.
-src/        This is where all of the source code to Velocity lives.
-test/       This is where all of the tests live.
-whiteboard/ The place for developer experimentation (unmaintained).
-xdocs/      This is the .xml files for building the .html files
-            related to the website and documentation.
+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.
+
+Caveat! This is the directory structure of the distribution
+archive. If you checked out the source from the Apache Subversion
+Repository, the directory layout is slightly different.
+
             
 REQUIREMENTS
 ------------
 
-Velocity will run with any version of Java greater than 1.3.
-Building Velocity requires Java version 1.4 (or greater) and 
-ant 1.6.
+Apache Velocity will run with any version of Java greater than 1.3.
+
+Building from source requires Java version 1.4 (or greater) and ant
+1.6 or greater.
 
 
 INCLUDED PRE-BUILT JARS
 -----------------------
-If you are using an offical Velocity release distribution, 
-you will find two pre-built Velocity jars in the top level 
-directory.
 
-PLEASE NOTE : Starting with the 1.2 release, we include two jars 
- with the distribution.
+If you are using an offical Apache Velocity release distribution, you
+will find two pre-built jars in the top level directory.
 
-1) velocity-<version>.jar : The Velocity jar that does not include
-any external dependencies needed by Velocity, such as the 
-jakarta-commons-collection classes, Jakarta Avalon Logkit, or 
-Jakarta ORO. We do this to allow you to use whatever version of
-collections, logkit, etc that you wish w/o fear of collision.
-These jars are included in the distribution, in
-the build/lib directory, or at the respective project sites.
-
-2) velocity-dep-<version>.jar : This is a Velocity jar that includes
-all dependencies that were included with previous distribution
-jars.  It is intended as a convenience to allow you to drop
-this 1.3 distribution in place of existing 1.1 or 1.2-dep
- distributions.
-
-Please see the developers guide for more information.
-
-BUILDING VELOCITY
------------------
-
-In order to use the latest version of Velocity, you may want to build it. 
-
-Building Velocity is easy.  All components necessary to build Velocity are
-included, except for the Java 2 SDK and the fabulous Ant build tool.
-You can find details on how to build Velocity online at:
+1) velocity-<version>.jar: 
+    This jar does not include any external dependencies needed by
+    Velocity, such as the commons-collection classes, the Avalon
+    Logkit, or Apache Jakarta ORO. We do this to allow you to use
+    whatever version of collections, logkit, etc that you wish w/o
+    fear of collision.  These jars are included in the distribution,
+    in the build/lib directory, or at the respective project sites.
+
+2) velocity-dep-<version>.jar:
+    This jar includes all dependencies that were present in previous
+    distribution jars.  It is intended as a convenience to allow you
+    to drop this distribution in place of existing 1.1 or 1.2-dep
+    distributions.
+
+Please see the WHY_TWO_JARS.txt file for more information.
+
+
+BUILDING APACHE VELOCITY
+------------------------
+
+In order to use the latest version of Apache Velocity, you may want to
+build it.
+
+Building is easy.  All components necessary to build are included or
+get downloaded from the internet during the build, except for the Java
+2 SDK and the Ant build tool.  You can find details on how to build
+Velocity online at:
 
-http://velocity.apache.org/engine/devel/build.htm
+http://velocity.apache.org/engine/devel/build.html
 
 Note that you must use Ant version 1.6 or later.
 
-To build Velocity's jar, change directory into the build/ directory and 
-simply type :
+*IMPORTANT* As the Apache Velocity build process wants to download a
+ number of jars from the internet, you must be online when you are
+ building for the first time.
+
+To build Velocity's jar, change directory into the build/ directory
+and enter:
 
 ant jar
 
-This will create a bin/ directory containing the Velocity .jar file. Be
-sure to update your classpath to include Velocity's .jar file, or when using a 
-modern servlet container, put it in the WEB-INF/lib directory.
+This will create a bin/ directory containing the Velocity .jar
+file. Be sure to update your classpath to include Velocity's .jar
+file, or when using a modern servlet container, put it in the
+WEB-INF/lib directory.
 
-If you wish to build a Velocity jar that contains all dependencies, we have
-provided an optional build target for our convenience :
+If you wish to build a jar that contains all dependencies, we have
+provided an optional build target for your convenience:
 
 ant jar-dep
 
-This will build a complete Velocity jar with dependencies included, and it can
-be found in the /bin directory as
+This will build a complete Velocity jar with dependencies included,
+and it can be found in the /bin directory as
 
 velocity-dep-<version>.jar
 
+
 TRYING THE EXAMPLES
 -------------------
 
-After building Velocity, you can also buld the examples that are included
-with the Velocity distribution.  These examples show how to use Velocity
-in your Java applications.  There also are examples of
+After building Velocity, you can also buld the examples that are
+included with the Velocity distribution.  These examples show how to
+use Velocity in your Java applications.  There also are examples of
 how to use Anakia, a XML transformation engine.
 
-For more information, please see the README.txt in the examples/ directory.
+For more information, please see the README.txt in the examples/
+directory.
 
--The Velocity Team
+- The Apache Velocity Team

Modified: velocity/engine/trunk/build/build.properties
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/build/build.properties?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/build/build.properties (original)
+++ velocity/engine/trunk/build/build.properties Tue Jan 30 13:32:26 2007
@@ -22,7 +22,7 @@
 # Global defaults
 name=       Velocity
 project=    velocity
-version=    1.5-dev
+version=    1.5
 final.name= ${project}-${version}
 
 # compile switches
@@ -59,7 +59,6 @@
 test.dir=      ${velocity.dir}/test
 example.dir=   ${velocity.dir}/examples
 xdocs.dir=     ${velocity.dir}/xdocs
-docs.dir=      ${velocity.dir}/docs
 
 # @TODO Move parser build out of the tree.
 build.parser=    ${src.java.dir}/org/apache/velocity/runtime/parser

Modified: velocity/engine/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/build/build.xml?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/build/build.xml (original)
+++ velocity/engine/trunk/build/build.xml Tue Jan 30 13:32:26 2007
@@ -489,8 +489,8 @@
     <echo>
       **************************************************************
       ** Building the examples :
-      **   examples/appexample1 : application example
-      **   examples/appexample2 : application example
+      **   examples/app_example1 : application example
+      **   examples/app_example2 : application example
       **   examples/context_example : example context implementations
       **   examples/logger_example : how to make an external logger
       **   examples/xmlapp_example : how to access XML data in a template
@@ -542,11 +542,17 @@
              doctitle="${name} ${version} API"
              encoding="UTF-8"
              docencoding="UTF-8"
-             bottom="Copyright &#169; 2000-${build.year} Apache Software Foundation. All Rights Reserved."
+             bottom="Copyright &#169; 2000-${build.year} &lt;a href=&quot;http://www.apache.org/&quot;&gt;Apache Software Foundation&lt;/a&gt;. All Rights Reserved."
              classpathref="velocity.build.classpath">
 
       <link href="${javadocs.ref.jsdk}"/>
-
+      <link href="http://www.jdom.org/docs/apidocs"/>
+      <link href="http://logging.apache.org/log4j/docs/api"/>
+      <link href="http://excalibur.apache.org/apidocs"/>
+      <link href="http://tomcat.apache.org/tomcat-4.1-doc/servletapi"/>
+      <link href="http://jakarta.apache.org/oro/api"/>
+      <link href="http://jakarta.apache.org/commons/lang/api-release"/>
+      <link href="http://jakarta.apache.org/commons/collections/api-release"/>
     </javadoc>
   </target>
 
@@ -621,7 +627,7 @@
     </copy>
 
     <!-- Add freshly built Java docs -->
-    <copy todir="${dist.dir}/docs/docs/api">
+    <copy todir="${dist.dir}/docs/api">
       <fileset dir="${build.javadoc}">
         <include name="**"/>
       </fileset>
@@ -651,16 +657,15 @@
       </fileset>
     </copy>
 
-    <copy file="${velocity.dir}/LICENSE"
-          tofile="${dist.dir}/LICENSE" />
-
-    <copy file="${velocity.dir}/NOTICE"
-          tofile="${dist.dir}/NOTICE" />
-
-    <copy
-      file="${velocity.dir}/README.txt"
-      tofile="${dist.dir}/README.txt"
-    />
+    <copy todir="${dist.dir}">
+      <fileset dir="${velocity.dir}">
+        <include name="LICENSE" />
+        <include name="NOTICE" />
+        <include name="README.txt" />
+        <include name="CONTRIBUTORS" />
+        <include name="WHY_TWO_JARS.txt" />
+      </fileset>
+    </copy>
 
     <copy
       file="${build.dir}/${final.name}.jar"
@@ -773,10 +778,9 @@
   #######################################################
     </echo>
 
-    <anakia basedir="${xdocs.dir}" destdir="${build.docs}"
+    <anakia basedir="${xdocs.dir}/docs" destdir="${build.docs}"
          extension=".html" style="site.vsl"
-         projectFile="stylesheets/${docs.project}"
-         excludes="**/stylesheets/** empty.xml"
+         projectFile="../stylesheets/${docs.project}"
          includes="**/*.xml"
          lastModifiedCheck="true"
          templatePath="${xdocs.dir}/stylesheets">

Modified: velocity/engine/trunk/examples/README.txt
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/examples/README.txt?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/examples/README.txt (original)
+++ velocity/engine/trunk/examples/README.txt Tue Jan 30 13:32:26 2007
@@ -4,22 +4,24 @@
 
 As always, the if you have any questions :
 
-1) Make sure you followed any directions :)  (did you build everything?)
+1) Make sure you followed any directions :-) (did you build
+   everything?)
+
 2) Review documentation included in this package, or online at
-      http://jakarta.apache.org/velocity/index.html
-3) Ask on the velocity-user list.  This is a great source of support information.
-   To join, read http://jakarta.apache.org/site/mail.html and then follow the 
-   link at the bottom to join the lists.
+   http://velocity.apache.org/
+
+3) Ask on the velocity-user list.  This is a great source of support
+   information.  To join, read http://velocity.apache.org/contact.html
+   and then follow the links to join the lists.
 
-These examples are very easy to build, but there is a prerequisite for building
-any Velocity software, a Java based build tool called 'Ant'.  It can be found at
 
-   http://jakarta.apache.org/ant/
+These examples are very easy to build, but there is a prerequisite for
+building any Velocity software, installing Apache ant, which can be
+downloaded from
 
-It's really a great tool.  Once ant is installed and working (it's easy, don't
-worry...), you can build the example suite via :
+   http://ant.apache.org/
 
-Change to the /build directory in the Velocity distribution and then type :
+Change to the /build directory in the Velocity distribution and then type:
 
   ant examples
 

Modified: velocity/engine/trunk/examples/app_example1/README.txt
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/examples/app_example1/README.txt?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/examples/app_example1/README.txt (original)
+++ velocity/engine/trunk/examples/app_example1/README.txt Tue Jan 30 13:32:26 2007
@@ -1,16 +1,23 @@
 Welcome to Velocity!
 
+This directory contains a few examples to help get you started.
+
 As always, the if you have any questions :
 
-1) Make sure you followed any directions :)  (did you build everything?)
+1) Make sure you followed any directions :-) (did you build
+   everything?)
+
 2) Review documentation included in this package, or online at
-      http://jakarta.apache.org/velocity
-3) Ask on the velocity-user list.  This is a great source of support information.
-   To join, read http://jakarta.apache.org/site/mail.html and then follow the 
-   link at the bottom to join the lists.
+   http://velocity.apache.org/
+
+3) Ask on the velocity-user list.  This is a great source of support
+   information.  To join, read http://velocity.apache.org/contact.html
+   and then follow the links to join the lists.
+
 
 app_example1 
 ------------
+
 This simple example shows how to use the Velocity Template Engine
 in a standalone program.  To build this example, see the instructions
 in the examples/README.txt file.

Modified: velocity/engine/trunk/examples/app_example2/README.txt
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/examples/app_example2/README.txt?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/examples/app_example2/README.txt (original)
+++ velocity/engine/trunk/examples/app_example2/README.txt Tue Jan 30 13:32:26 2007
@@ -1,17 +1,23 @@
 Welcome to Velocity!
 
+This directory contains a few examples to help get you started.
+
 As always, the if you have any questions :
 
-1) Make sure you followed any directions :)  (did you build everything?)
+1) Make sure you followed any directions :-) (did you build
+   everything?)
+
 2) Review documentation included in this package, or online at
-      http://jakarta.apache.org/velocity
-3) Ask on the velocity-user list.  This is a great source of support information.
-   To join, read http://jakarta.apache.org/site/mail.html and then follow the 
-   link at the bottom to join the lists.
+   http://velocity.apache.org/
+
+3) Ask on the velocity-user list.  This is a great source of support
+   information.  To join, read http://velocity.apache.org/contact.html
+   and then follow the links to join the lists.
 
 
 app_example2 
 ------------
+
 Another simple example showing how to use Velocity in a standalone
 program.  This examples uses the org.apache.velocity.util.Velocity application utility
 class, which provides a few convenient methods for application programmers. 

Modified: velocity/engine/trunk/examples/context_example/README.txt
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/examples/context_example/README.txt?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/examples/context_example/README.txt (original)
+++ velocity/engine/trunk/examples/context_example/README.txt Tue Jan 30 13:32:26 2007
@@ -1,17 +1,23 @@
 Welcome to Velocity!
 
+This directory contains a few examples to help get you started.
+
 As always, the if you have any questions :
 
-1) Make sure you followed any directions :)  (did you build everything?)
+1) Make sure you followed any directions :-) (did you build
+   everything?)
+
 2) Review documentation included in this package, or online at
-      http://jakarta.apache.org/velocity
-3) Ask on the velocity-user list.  This is a great source of support information.
-   To join, read http://jakarta.apache.org/site/mail.html and then follow the 
-   link at the bottom to join the lists.
+   http://velocity.apache.org/
+
+3) Ask on the velocity-user list.  This is a great source of support
+   information.  To join, read http://velocity.apache.org/contact.html
+   and then follow the links to join the lists.
 
 
 context_example
---------------
+---------------
+
 This is a demonstration of 2 different context implementations :
  - a context implementation that uses a database as the storage.
    Use the DBContextTest program to test.  See the DBContextTest.java file for the 

Modified: velocity/engine/trunk/examples/event_example/README.txt
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/examples/event_example/README.txt?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/examples/event_example/README.txt (original)
+++ velocity/engine/trunk/examples/event_example/README.txt Tue Jan 30 13:32:26 2007
@@ -10,7 +10,8 @@
    link at the bottom to join the lists.
 
 event_example
-------------
+-------------
+
 This simple example demonstrates the event handling features of 
 the Velocity Template Engine.
 

Modified: velocity/engine/trunk/examples/logger_example/README.txt
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/examples/logger_example/README.txt?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/examples/logger_example/README.txt (original)
+++ velocity/engine/trunk/examples/logger_example/README.txt Tue Jan 30 13:32:26 2007
@@ -1,16 +1,23 @@
 Welcome to Velocity!
 
+This directory contains a few examples to help get you started.
+
 As always, the if you have any questions :
 
-1) Make sure you followed any directions :)  (did you build everything?)
+1) Make sure you followed any directions :-) (did you build
+   everything?)
+
 2) Review documentation included in this package, or online at
-      http://jakarta.apache.org/velocity
-3) Ask on the velocity-user list.  This is a great source of support information.
-   To join, read http://jakarta.apache.org/site/mail.html and then follow the 
-   link at the bottom to join the lists.
+   http://velocity.apache.org/
+
+3) Ask on the velocity-user list.  This is a great source of support
+   information.  To join, read http://velocity.apache.org/contact.html
+   and then follow the links to join the lists.
+
 
 logger_example
-------------
+--------------
+
 This 'toy' example shows how to use the Velocity logger interface
 to have any class function as a logging facility.  
 

Modified: velocity/engine/trunk/examples/xmlapp_example/README.txt
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/examples/xmlapp_example/README.txt?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/examples/xmlapp_example/README.txt (original)
+++ velocity/engine/trunk/examples/xmlapp_example/README.txt Tue Jan 30 13:32:26 2007
@@ -1,17 +1,23 @@
 Welcome to Velocity!
 
+This directory contains a few examples to help get you started.
+
 As always, the if you have any questions :
 
-1) Make sure you followed any directions :)  (did you build everything?)
+1) Make sure you followed any directions :-) (did you build
+   everything?)
+
 2) Review documentation included in this package, or online at
-      http://jakarta.apache.org/velocity
-3) Ask on the velocity-user list.  This is a great source of support information.
-   To join, read http://jakarta.apache.org/site/mail.html and then follow the 
-   link at the bottom to join the lists.
+   http://velocity.apache.org/
+
+3) Ask on the velocity-user list.  This is a great source of support
+   information.  To join, read http://velocity.apache.org/contact.html
+   and then follow the links to join the lists.
 
 
 xmlapp_example 
 --------------
+
 Another simple example showing how to use Velocity in a standalone
 program.  This example shows how to use Velocity to access XML data 
 directly from an XML input file within the template.  It also

Modified: velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaTask.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaTask.java?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaTask.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/anakia/AnakiaTask.java Tue Jan 30 13:32:26 2007
@@ -56,7 +56,7 @@
  * <p>
  * You can find more documentation about this class on the
  * Velocity
- * <a href="http://jakarta.apache.org/velocity/anakia.html">Website</a>.
+ * <a href="http://velocity.apache.org/engine/devel/docs/anakia.html">Website</a>.
  *
  * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
  * @author <a href="mailto:szegedia@freemail.hu">Attila Szegedi</a>

Modified: velocity/engine/trunk/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/io/UnicodeInputStreamTestCase.java Tue Jan 30 13:32:26 2007
@@ -1,5 +1,24 @@
 package org.apache.velocity.io;
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -12,12 +31,7 @@
 
 
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the
- * Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and limitations under the License.
+ * Test the UnicodeInputStream.
  *
  * @author  $author$
  * @version  $Revision$, $Date$

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/issues/VelTools66TestCase.java Tue Jan 30 13:32:26 2007
@@ -33,7 +33,7 @@
 import org.apache.velocity.util.introspection.Introspector;
 
 /**
- * Test Case for <a href="http://issues.apache.org/jira/browse/VELTOOLS-66">Velocity Tools Issue 66</a>.
+ * Test Case for <a href="https://issues.apache.org/jira/browse/VELTOOLS-66">Velocity Tools Issue 66</a>.
  */
 public class VelTools66TestCase
         extends BaseTestCase

Modified: velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity285TestCase.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity285TestCase.java?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity285TestCase.java (original)
+++ velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity285TestCase.java Tue Jan 30 13:32:26 2007
@@ -35,7 +35,7 @@
 import org.apache.velocity.test.BaseTestCase;
 
 /**
- * Test Case for <a href="http://issues.apache.org/jira/browse/VELOCITY-285">Velocity Issue 285</a>.
+ * Test Case for <a href="https://issues.apache.org/jira/browse/VELOCITY-285">Velocity Issue 285</a>.
  */
 public class Velocity285TestCase
         extends BaseTestCase

Modified: velocity/engine/trunk/xdocs/docs/anakia.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/docs/anakia.xml?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/xdocs/docs/anakia.xml (original)
+++ velocity/engine/trunk/xdocs/docs/anakia.xml Tue Jan 30 13:32:26 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/trunk/xdocs/docs/developer-guide.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/docs/developer-guide.xml?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/xdocs/docs/developer-guide.xml (original)
+++ velocity/engine/trunk/xdocs/docs/developer-guide.xml Tue Jan 30 13:32:26 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/trunk/xdocs/docs/texen.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/docs/texen.xml?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/xdocs/docs/texen.xml (original)
+++ velocity/engine/trunk/xdocs/docs/texen.xml Tue Jan 30 13:32:26 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/trunk/xdocs/docs/user-guide.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/docs/user-guide.xml?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/xdocs/docs/user-guide.xml (original)
+++ velocity/engine/trunk/xdocs/docs/user-guide.xml Tue Jan 30 13:32:26 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/trunk/xdocs/docs/vtl-reference-guide.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/docs/vtl-reference-guide.xml?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/xdocs/docs/vtl-reference-guide.xml (original)
+++ velocity/engine/trunk/xdocs/docs/vtl-reference-guide.xml Tue Jan 30 13:32:26 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/trunk/xdocs/site.css
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/site.css?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/xdocs/site.css (original)
+++ velocity/engine/trunk/xdocs/site.css Tue Jan 30 13:32:26 2007
@@ -67,7 +67,7 @@
 }
 
 div#container {
-	width: 760px;
+	width: 95%;
 	margin: 10px;
 	margin-left: 0;
 	margin-right: auto;

Modified: velocity/engine/trunk/xdocs/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/stylesheets/project.xml?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/xdocs/stylesheets/project.xml (original)
+++ velocity/engine/trunk/xdocs/stylesheets/project.xml Tue Jan 30 13:32:26 2007
@@ -18,62 +18,63 @@
  under the License.    
 -->
 
-<project name="Velocity"
-          href="http://jakarta.apache.org/velocity/">
+<project name="Apache Velocity"
+          href="http://velocity.apache.org/">
 
-    <title>Velocity</title>
-    <logo   href="/images/newlogo.png">Velocity</logo>
+  <title>Velocity</title>
+  <logo href="/images/velocity-logo.png">Velocity</logo>
 
-    <body>
+  <body>
     <menu name="Velocity">
-        <item name="Home"                     href="/index.html"/>
+        <item name="General"                  href="/index.html"/>
         <item name="Overview"                 href="/overview.html"/>
         <item name="Getting Started"          href="/getting-started.html"/>
         <item name="Web Applications"         href="/webapps.html"/>
-        <item name="Download"                 href="http://jakarta.apache.org/site/downloads/downloads_velocity.cgi"/>
-        <item name="FAQ (Wiki)"               href="http://wiki.apache.org/jakarta-velocity/VelocityFAQ"/>
+        <item name="Download"                 href="http://velocity.apache.org/download.cgi" />
+        <item name="FAQ (Wiki)"               href="http://wiki.apache.org/velocity/VelocityFAQ"/>
     </menu>
+
     <menu name="Docs">
-        <item name="User Guide"             href="/docs/user-guide.html"/>
-        <item name="Developer Guide"        href="/docs/developer-guide.html"/>
-        <item name="VTL Reference"            href="/docs/vtl-reference-guide.html"/>
-        <item name="Anakia : XML->doc tool"   href="/docs/anakia.html"/>
-        <item name="Texen : text generation"  href="/docs/texen.html"/>
-        <item name="Veltag : JSP taglib"      href="/docs/veltag.html"/>
-        <item name="Javadoc"                  href="/docs/api/index.html"/>
-        <item name="Change Log"               href="/docs/changes.html"/>
-        <item name="License"                  href="/docs/license.html"/>
-    </menu>
-    <menu name="Sub Projects">
-        <item name="Velocity Tools"           href="http://jakarta.apache.org/velocity/tools/index.html"/>
-        <item name="DVSL : XML transformation"  href="http://jakarta.apache.org/velocity/dvsl/index.html"/>
-    </menu>
-    <menu name="Community">
-        <item name="Wiki"                     href="http://wiki.apache.org/jakarta-velocity/"/>
-        <item name="Recent News"              href="http://wiki.apache.org/jakarta-velocity/VelocityNews"/>
-        <item name="Powered By Velocity"      href="http://wiki.apache.org/jakarta-velocity/PoweredByVelocity"/>
-        <item name="IDE/Editor Plugins"       href="http://wiki.apache.org/jakarta-velocity/VelocityEditors"/>
-        <item name="Articles and Books"       href="http://wiki.apache.org/jakarta-velocity/PublishedArticlesAndBooks"/>
-        <item name="Get Involved"             href="http://wiki.apache.org/jakarta-velocity/GetInvolved"/>
-        <item name="Mailing Lists"            href="http://jakarta.apache.org/site/mail.html"/>
+        <item name="User Guide"               href="/user-guide.html"/>
+        <item name="Developer Guide"          href="/developer-guide.html"/>
+        <item name="VTL Reference"            href="/vtl-reference-guide.html"/>
+        <item name="Anakia: XML->doc tool"    href="/anakia.html"/>
+        <item name="Texen: text generation"   href="/texen.html"/>
     </menu>
+
     <menu name="Developers">
-        <item name="Source Code Repository"   href="http://www.apache.org/dev/version-control.html"/>
-        <item name="Building from Source"     href="/build.html"/>
-        <item name="Nightly Snapshots"        href="http://svn.apache.org/snapshots/jakarta-velocity/"/>
-        <item name="Road Map"                 href="http://wiki.apache.org/jakarta-velocity/RoadMap"/>
+        <item name="License"                  href="/../LICENSE"/>
+        <item name="Javadoc"                  href="/api/index.html"/>
+        <item name="Changes in 1.5"           href="http://velocity.apache.org/engine/releases/velocity-1.5/changes-report.html"/>
+        <item name="Resolved Issues in 1.5"   href="http://velocity.apache.org/engine/releases/velocity-1.5/jira-report.html"/>
         <item name="Dependencies"             href="/jar-dependencies.html"/>
-        <item name="Coding Standards"         href="http://wiki.apache.org/jakarta-velocity/CodeStandards"/>
-        <item name="Documentation Guidelines" href="http://wiki.apache.org/jakarta-velocity/DocumentationGuidelines"/>
-        <item name="Issues"                   href="http://issues.apache.org/jira/browse/VELOCITY"/>
-        <item name="List of Committers"       href="/committers.html"/>
+        <item name="Source Code Repository"   href="http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/"/>
+        <item name="Building from Source"     href="/build.html"/>
     </menu>
+
+    <menu name="Community">
+        <item name="Wiki"                     href="http://wiki.apache.org/velocity/"/>
+        <item name="Recent News"              href="http://velocity.apache.org/news.html"/>
+        <item name="Powered By Velocity"      href="http://wiki.apache.org/velocity/PoweredByVelocity"/>
+        <item name="IDE/Editor Plugins"       href="http://wiki.apache.org/velocity/VelocityEditors"/>
+        <item name="Articles and Books"       href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks"/>
+        <item name="Get Involved"             href="http://wiki.apache.org/velocity/GetInvolved"/>
+        <item name="Mailing Lists"            href="http://velocity.apache.org/contact.html"/>
+    </menu>
+
+    <menu name="Velocity Development">
+        <item name="Road Map"                 href="http://wiki.apache.org/velocity/RoadMap"/>
+        <item name="Coding Standards"         href="http://wiki.apache.org/velocity/CodeStandards"/>
+        <item name="Documentation Guidelines" href="http://wiki.apache.org/velocity/DocumentationGuidelines"/>
+        <item name="Issues"                   href="https://issues.apache.org/jira/browse/VELOCITY"/>
+        <item name="Who we are"               href="http://velocity.apache.org/who-we-are.html"/>
+    </menu>
+
     <menu name="Translations">
         <item name="Site (Japanese)"          href="http://www.jajakarta.org/velocity/"/>
         <item name="User's Guide (Finnish)"   href="/translations/user-guide_fi.html"/>
         <item name="User's Guide (French)"    href="/translations/user-guide_fr.html"/>
         <item name="User's Guide (Spanish)"   href="/translations/user-guide_es.html"/>
     </menu>
-    </body>
+  </body>
 </project>
-

Modified: velocity/engine/trunk/xdocs/stylesheets/site.vsl
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/xdocs/stylesheets/site.vsl?view=diff&rev=501574&r1=501573&r2=501574
==============================================================================
--- velocity/engine/trunk/xdocs/stylesheets/site.vsl (original)
+++ velocity/engine/trunk/xdocs/stylesheets/site.vsl Tue Jan 30 13:32:26 2007
@@ -102,8 +102,8 @@
 #macro ( projectanchor $name $value )
 #if ($value.startsWith("http://"))
     <a href="$value">$name</a>
-#elseif ($value.startsWith("/site"))
-    <a href="http://jakarta.apache.org$value">$name</a>
+#elseif ($value.startsWith("https://"))
+    <a href="$value">$name</a>
 #else
     <a href="$relativePath$value">$name</a>
 #end
@@ -227,7 +227,7 @@
 #macro (getProjectImage)
 
 <div id="logo1">
-	<a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
+	<a href="http://velocity.apache.org"><img src="${relativePath}/images/velocity_project_wide.png" border="0"/></a>
 </div>
 
 
@@ -269,7 +269,7 @@
            #set ($metas = $root.getChildren("meta"))
 
             ##    Parse meta directives such as
-            ##    <meta name="keyword" content="jakarta, java"/>
+            ##    <meta name="keyword" content="apache, velocity, java"/>
             #foreach ($meta in $metas) #printMeta($meta) #end
 
             ##    Support for <base> tags.
@@ -280,10 +280,6 @@
 
             <title>$project.getChild("title").getText() - $root.getChild("properties").getChild("title").getText()</title>
 
-			## use an absolute CSS for when the URL is rewritten on the site
-			## from /velocity/anakia.html to /velocity/docs/anakia.html
-			<link rel="stylesheet" href="http://jakarta.apache.org/velocity/site.css" type="text/css">
-
 			## use a relative CSS for when the page is displayed locally (will overwrite
 			## previous CSS settings)
 			<link rel="stylesheet" href="${relativePath}/site.css" type="text/css">
@@ -311,7 +307,7 @@
 				</div>
 
 				<div id="footer">
-					Copyright &#169; 1999-2006, The Apache Software Foundation
+					Copyright &#169; 1999-2007, <a href="http://www.apache.org/">The Apache Software Foundation</a>.
 				</div>
 
 			</div>



Mime
View raw message