velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nbu...@apache.org
Subject svn commit: r601978 [1/2] - in /velocity/tools/trunk: ./ xdocs/ xdocs/css/ xdocs/documentation/ xdocs/generic/ xdocs/struts/ xdocs/view/
Date Fri, 07 Dec 2007 03:54:36 GMT
Author: nbubna
Date: Thu Dec  6 19:54:32 2007
New Revision: 601978

URL: http://svn.apache.org/viewvc?rev=601978&view=rev
Log:
Major overhaul of our xdoc structure to:
- match the look of our docs better to the Maven generated ones
- drop xdocs for individual tools (too hard to keep updated) in favor of javadoc
- stop using folders to simplify menu building and href management in docs
- a variety of other small improvements

Added:
    velocity/tools/trunk/xdocs/config.java.xml   (with props)
    velocity/tools/trunk/xdocs/config.project.xml   (with props)
    velocity/tools/trunk/xdocs/config.properties.xml   (with props)
    velocity/tools/trunk/xdocs/config.xml   (with props)
    velocity/tools/trunk/xdocs/config.xml.xml   (with props)
    velocity/tools/trunk/xdocs/creatingtools.xml   (with props)
    velocity/tools/trunk/xdocs/css/
    velocity/tools/trunk/xdocs/css/maven-base.css   (with props)
    velocity/tools/trunk/xdocs/css/maven-theme.css   (with props)
    velocity/tools/trunk/xdocs/css/style.css   (with props)
    velocity/tools/trunk/xdocs/docs.config.properties.xml
      - copied unchanged from r601787, velocity/tools/trunk/xdocs/documentation/config.properties.xml
    velocity/tools/trunk/xdocs/docs.config.xml
      - copied unchanged from r601787, velocity/tools/trunk/xdocs/documentation/config.xml
    velocity/tools/trunk/xdocs/docs.config.xml.xml
      - copied unchanged from r601787, velocity/tools/trunk/xdocs/documentation/config.xml.xml
    velocity/tools/trunk/xdocs/docs.project.xml
      - copied unchanged from r601787, velocity/tools/trunk/xdocs/documentation/menu.xml
    velocity/tools/trunk/xdocs/frameworks.xml   (with props)
    velocity/tools/trunk/xdocs/generic.index.xml
      - copied, changed from r601787, velocity/tools/trunk/xdocs/generic/index.xml
    velocity/tools/trunk/xdocs/generic.project.xml
      - copied, changed from r601787, velocity/tools/trunk/xdocs/generic/menu.xml
    velocity/tools/trunk/xdocs/project.xml   (with props)
    velocity/tools/trunk/xdocs/standalone.xml   (with props)
    velocity/tools/trunk/xdocs/struts.index.xml
      - copied, changed from r601787, velocity/tools/trunk/xdocs/struts/index.xml
    velocity/tools/trunk/xdocs/struts.project.xml
      - copied, changed from r601787, velocity/tools/trunk/xdocs/struts/menu.xml
    velocity/tools/trunk/xdocs/struts.userguide.xml
      - copied, changed from r601787, velocity/tools/trunk/xdocs/struts/userguide.xml
    velocity/tools/trunk/xdocs/view.index.xml
      - copied, changed from r601787, velocity/tools/trunk/xdocs/view/index.xml
    velocity/tools/trunk/xdocs/view.layoutservlet.xml
      - copied, changed from r601787, velocity/tools/trunk/xdocs/view/layoutservlet.xml
    velocity/tools/trunk/xdocs/view.project.xml   (with props)
Removed:
    velocity/tools/trunk/xdocs/documentation/config.java.xml
    velocity/tools/trunk/xdocs/documentation/config.properties.xml
    velocity/tools/trunk/xdocs/documentation/config.xml
    velocity/tools/trunk/xdocs/documentation/config.xml.xml
    velocity/tools/trunk/xdocs/documentation/creatingtools.xml
    velocity/tools/trunk/xdocs/documentation/frameworks.xml
    velocity/tools/trunk/xdocs/documentation/index.xml
    velocity/tools/trunk/xdocs/documentation/menu.xml
    velocity/tools/trunk/xdocs/documentation/standalone.xml
    velocity/tools/trunk/xdocs/generic/DateTool.xml
    velocity/tools/trunk/xdocs/generic/EscapeTool.xml
    velocity/tools/trunk/xdocs/generic/MathTool.xml
    velocity/tools/trunk/xdocs/generic/RenderTool.xml
    velocity/tools/trunk/xdocs/generic/index.xml
    velocity/tools/trunk/xdocs/generic/menu.xml
    velocity/tools/trunk/xdocs/menu.xml
    velocity/tools/trunk/xdocs/quotes.txt
    velocity/tools/trunk/xdocs/struts/ActionMessagesTool.xml
    velocity/tools/trunk/xdocs/struts/ErrorsTool.xml
    velocity/tools/trunk/xdocs/struts/FormTool.xml
    velocity/tools/trunk/xdocs/struts/MessageTool.xml
    velocity/tools/trunk/xdocs/struts/SecureLinkTool.xml
    velocity/tools/trunk/xdocs/struts/StrutsLinkTool.xml
    velocity/tools/trunk/xdocs/struts/StrutsTools.xml
    velocity/tools/trunk/xdocs/struts/TilesTool.xml
    velocity/tools/trunk/xdocs/struts/ValidatorTool.xml
    velocity/tools/trunk/xdocs/struts/index.xml
    velocity/tools/trunk/xdocs/struts/menu.xml
    velocity/tools/trunk/xdocs/struts/userguide.xml
    velocity/tools/trunk/xdocs/toolbox.props
    velocity/tools/trunk/xdocs/view/CookieTool.xml
    velocity/tools/trunk/xdocs/view/ImportTool.xml
    velocity/tools/trunk/xdocs/view/LinkTool.xml
    velocity/tools/trunk/xdocs/view/ParameterParser.xml
    velocity/tools/trunk/xdocs/view/ViewRenderTool.xml
    velocity/tools/trunk/xdocs/view/index.xml
    velocity/tools/trunk/xdocs/view/layoutservlet.xml
    velocity/tools/trunk/xdocs/view/menu.xml
Modified:
    velocity/tools/trunk/build.xml
    velocity/tools/trunk/xdocs/changes.xml
    velocity/tools/trunk/xdocs/generic.xml
    velocity/tools/trunk/xdocs/index.xml
    velocity/tools/trunk/xdocs/site.dvsl
    velocity/tools/trunk/xdocs/struts.xml
    velocity/tools/trunk/xdocs/view.xml

Modified: velocity/tools/trunk/build.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/build.xml?rev=601978&r1=601977&r2=601978&view=diff
==============================================================================
--- velocity/tools/trunk/build.xml (original)
+++ velocity/tools/trunk/build.xml Thu Dec  6 19:54:32 2007
@@ -336,15 +336,20 @@
 
     <dvsl basedir="${docs.src}"
           destdir="${docs.dir}/"
-          toolboxfile="${docs.src}/toolbox.props"
           extension=".html"
-          style="${docs.src}/site.dvsl"
-          excludes="**/*menu.xml"
-          includes="**/*.xml" />
+          style="${docs.src}/site.dvsl">
+        <exclude name="**/*project.xml"/>
+        <include name="**/*.xml"/>
+    </dvsl>
 
     <copy todir="${docs.dir}/images">
       <fileset dir="${docs.src}/images">
         <include name="*.png" />
+      </fileset>
+    </copy>
+    <copy todir="${docs.dir}/css">
+      <fileset dir="${docs.src}/css">
+        <include name="*.css" />
       </fileset>
     </copy>
   </target>

Modified: velocity/tools/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/changes.xml?rev=601978&r1=601977&r2=601978&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/changes.xml (original)
+++ velocity/tools/trunk/xdocs/changes.xml Thu Dec  6 19:54:32 2007
@@ -22,8 +22,7 @@
 <document>
   <properties>
     <title>VelocityTools Changes</title>
-    <author email="nbubna@apache.org">Nathan Bubna</author>
-    <projectfile>xdocs/menu.xml</projectfile>
+    <projectfile>xdocs/project.xml</projectfile>
   </properties>
 <body>
   <section name="VelocityTools Changes">

Added: velocity/tools/trunk/xdocs/config.java.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/config.java.xml?rev=601978&view=auto
==============================================================================
--- velocity/tools/trunk/xdocs/config.java.xml (added)
+++ velocity/tools/trunk/xdocs/config.java.xml Thu Dec  6 19:54:32 2007
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+
+<!--
+ 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.
+-->
+
+<document>
+
+    <properties>
+        <title>VelocityTools Project</title>
+        <projectfile>xdocs/project.xml</projectfile>
+        <subprojectfile>xdocs/config.project.xml</subprojectfile>
+    </properties>
+
+    <body>
+
+    <section name="Configuration using Java">
+        <p>
+            Of course, it is possible to configure things purely via Java, 
+            though this too is much easier than it was in VelocityTools 1.x. 
+            Here again, is an example that is equivalent to those above:
+        </p>
+
+        <sourcecode>
+EasyFactoryConfiguration config = new EasyFactoryConfiguration();
+config.toolbox("request").property("xhtml", true)
+.tool("toytool", ToyTool.class).restrictTo("index.vm")
+.tool("custom", CustomTool.class).property("randomProperty", "whatever");
+config.toolbox("session").property("create-session", true)
+.tool("map", HashMap.class);
+config.toolbox("application")
+.tool(DateTool.class);
+config.number("version", 1.1);
+config.data("date", "Mon Sep 17 10:08:03 PDT 2007")
+.target(Date.class)
+.converter(DateLocaleConverter.class);
+config.bool("isSimple", true);
+config.string("foo", "this is foo.");
+config.string("bar", "this is bar.");
+config.data("dataKeys", "list", "version,date,isSimple,foo,bar,dataKeys,switches");
+config.data("switches", "list.boolean", "true,false,false,true");
+        </sourcecode>
+
+        <p>
+            This example uses the EasyFactoryConfiguration API for brevity, 
+            but you can also directly use the FactoryConfiguration/
+            ToolboxConfiguration/ToolConfiguration/Data API, as you would 
+            probably do if you were to construct your configuration via an 
+            dependency injection framework (such as Spring).
+        </p>
+    </section>
+
+    </body>
+
+</document>

Propchange: velocity/tools/trunk/xdocs/config.java.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/tools/trunk/xdocs/config.java.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: velocity/tools/trunk/xdocs/config.project.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/config.project.xml?rev=601978&view=auto
==============================================================================
--- velocity/tools/trunk/xdocs/config.project.xml (added)
+++ velocity/tools/trunk/xdocs/config.project.xml Thu Dec  6 19:54:32 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<!--
+ 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.
+-->
+
+<project name="Configuration" href="config.html">
+  <breadcrumb href="config.html">Configuration</breadcrumb>
+</project>

Propchange: velocity/tools/trunk/xdocs/config.project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/tools/trunk/xdocs/config.project.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: velocity/tools/trunk/xdocs/config.properties.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/config.properties.xml?rev=601978&view=auto
==============================================================================
--- velocity/tools/trunk/xdocs/config.properties.xml (added)
+++ velocity/tools/trunk/xdocs/config.properties.xml Thu Dec  6 19:54:32 2007
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+
+<!--
+ 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.
+-->
+
+<document>
+
+    <properties>
+        <title>VelocityTools Project</title>
+        <projectfile>xdocs/project.xml</projectfile>
+        <subprojectfile>xdocs/config.project.xml</subprojectfile>
+    </properties>
+
+    <body>
+
+    <section name="Configuration using Properties">
+        <p>
+            You can also configure VelocityTools2 via a properties file.  
+            Here's the same configuration as the <a href="configxml.html">XML 
+            example</a> done using the properties format:
+        </p>
+
+        <sourcecode>
+tools.toolbox = request,session,application
+
+tools.request.property.xhtml = true
+tools.request.toytool = ToyTool
+tools.request.toytool.restrictTo = index.vm
+tools.request.custom = org.mine.CustomTool
+tools.request.custom.randomProperty = whatever
+
+tools.session.property.create-session = true
+tools.session.property.create-session.type = boolean
+tools.session.map = java.util.HashMap
+
+tools.application.date = org.apache.velocity.tools.generic.DateTool
+
+tools.data.version = 1.1
+tools.data.version.type = number
+tools.data.date = Mon Sep 17 10:08:03 PDT 2007
+tools.data.date.class = java.util.Date
+tools.data.date.converter = org.apache.commons.beanutils.locale.converters.DateLocaleConverter
+tools.data.isSimple = true
+tools.data.type = boolean
+tools.data.foo = this is foo.
+tools.data.bar = this is bar.
+tools.data.dataKeys = version,date,isSimple.foo,bar,dataKeys,switches
+tools.data.dataKeys.type = list
+tools.data.switches = true,false,false,true
+tools.data.switches.type = list.boolean
+        </sourcecode>
+
+    </section>
+
+    </body>
+
+</document>

Propchange: velocity/tools/trunk/xdocs/config.properties.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/tools/trunk/xdocs/config.properties.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: velocity/tools/trunk/xdocs/config.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/config.xml?rev=601978&view=auto
==============================================================================
--- velocity/tools/trunk/xdocs/config.xml (added)
+++ velocity/tools/trunk/xdocs/config.xml Thu Dec  6 19:54:32 2007
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+
+<!--
+ 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.
+-->
+
+<document>
+
+    <properties>
+        <title>VelocityTools Project</title>
+        <projectfile>xdocs/project.xml</projectfile>
+        <subprojectfile>xdocs/config.project.xml</subprojectfile>
+    </properties>
+
+    <body>
+
+
+    <section name="Configuration Overview">
+        <p>
+            The VelocityTools2 support infrastructure exists to 
+            provide all your templates a common set of tools 
+            and data.  This is inspired by the 
+            <a href="http://turbine.apache.org/turbine/turbine-2.2.0/pullmodel.html">
+            Pull MVC</a> model, which deviates from the strict MVC 
+            purist  approach out for the sake of convenience and 
+            clarity.  The goal here is to provide template authors 
+            a common interface of data and functions across all 
+            templates (we call this a "toolbox"), whether they 
+            need all of those functions and data or not.  This 
+            saves the template author from having to remember what 
+            keys were used where and makes it easy to drop a new 
+            template (i.e. View) into an app without having to 
+            modify the controller (which would typically involve 
+            creating a new action class).  The degree to which this 
+            Pull MVC pattern violates MVC principles can (and 
+            should) vary widely depending on your needs and goals.
+        </p>
+
+        <p>
+            The default VelocityTools2 configuration does not 
+            include any "gross MVC offenders", as such things 
+            would be hard to generalize usefully.  The default 
+            configuration primarily includes tools for 
+            manipulating values made available in the template's 
+            context by a controller and a few for accessing static 
+            resources.
+        </p>
+
+        <p>
+            However, it is likely that you will want to add your own data and 
+            tools to your VelocityTools2 configuration or at least want to 
+            change the default settings of the standard tools.  To that end, 
+            configuration of your applications "toolbox(es)" can be done via 
+            XML, Java or properties.  Different configurations can also be 
+            easily combined together.
+        </p>
+
+        <p>
+            There a few basic concepts to the configuration that 
+            it is useful to know.  First, what you are creating 
+            a configuration for is a ToolboxFactory.  This factory 
+            produces your toolbox(es) as needed by 
+            <a href="view.html">VelocityView</a> or your own 
+            application. A factory can have any number of 
+            toolboxes, all distinguished by their scope property. 
+            There are three special scopes automatically recognized 
+            by VelocityTools2:  "request", "application", and 
+            "session".  The "session" scope is only relevant within 
+            a <a href="view.html">VelocityView</a> app, but the 
+            other two may be useful anywhere.
+        </p>
+
+        <p>
+            When the "application" toolbox is requested, the 
+            ToolboxFactory will also include any "data" configured 
+            for it.  These are unchanging, static values that are 
+            meant to be available to all templates in your 
+            application. You can configure any number of data for 
+            your application and the configuration supports both 
+            automatic and explicit type conversion (via 
+            Commons-BeanUtils converters) for these values (since 
+            XML and properties formats only allow string inputs).                    
+        </p>
+        <p>
+            Other things to know are that each toolbox can have 
+            any number of tools within it, and that "properties" 
+            may be added for any and all tools, toolboxes, and the 
+            factory itself.  A "property" added to one of these 
+            also has all of the same type conversion support as 
+            the "data" values do.  Properties set on a toolbox are 
+            made available to all tools within that toolbox and 
+            properties set for the factory itself are made 
+            available to all tools in your application.                        
+        </p>
+
+        <p>
+            Now on to the formats for specifying these things...
+        </p>
+
+        <ul>
+            <li><a href="config.xml.html">XML</a></li>
+            <li><a href="config.properties.html">Properties</a></li>
+            <li><a href="config.java.html">Java</a></li>
+        </ul>
+
+    </section>
+
+    </body>
+
+</document>

Propchange: velocity/tools/trunk/xdocs/config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/tools/trunk/xdocs/config.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: velocity/tools/trunk/xdocs/config.xml.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/config.xml.xml?rev=601978&view=auto
==============================================================================
--- velocity/tools/trunk/xdocs/config.xml.xml (added)
+++ velocity/tools/trunk/xdocs/config.xml.xml Thu Dec  6 19:54:32 2007
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+
+<!--
+ 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.
+-->
+
+<document>
+
+    <properties>
+        <title>VelocityTools Project</title>
+        <projectfile>xdocs/project.xml</projectfile>
+        <subprojectfile>xdocs/config.project.xml</subprojectfile>
+    </properties>
+
+    <body>
+
+    <section name="Configuration using XML">
+        <p>
+            Providing an xml format configuration file is still the standard, 
+            but unlike VelocityTools 1.x, it is no longer necessary at all, 
+            thanks to the introduction of default configurations.  The default 
+            configurations for <a href="VelocityTools2/GenericTools">
+            GenericTools</a>, <a href="VelocityTools2/VelocityView">
+            VelocityView</a> and <a href="VelocityTools2/VelocityStruts">
+            VelocityStruts</a> are all defined via XML.
+        </p>
+
+        <p>
+            Here's a somewhat thorough example:
+        </p>
+        
+        <sourcecode>
+&lt;tools&gt;
+    &lt;toolbox scope="request" xhtml="true"&gt;
+        &lt;tool key="toytool" class="ToyTool" restrictTo="index.vm"/&gt;
+        &lt;tool key="custom" class="org.mine.CustomTool" randomProperty="whatever"/&gt;
+    &lt;/toolbox&gt;
+
+    &lt;toolbox scope="session"&gt;
+        &lt;property name="create-session" value="true" type="boolean"/&gt;
+        &lt;tool key="map" class="java.util.HashMap"/&gt;
+    &lt;/toolbox&gt;
+
+    &lt;toolbox scope="application"&gt;
+        &lt;tool class="org.apache.velocity.tools.generic.DateTool"/&gt;
+    &lt;/toolbox&gt;
+
+    &lt;data type="number" key="version" value="1.1"/&gt;
+    &lt;data key="date" value="Mon Sep 17 10:08:03 PDT 2007" class="java.util.Date" 
+             converter="org.apache.commons.beanutils.locale.converters.DateLocaleConverter"/&gt;
+    &lt;data type="boolean" key="isSimple" value="true"/&gt;
+    &lt;data key="foo" value="this is foo."/&gt;
+    &lt;data key="bar"&gt;this is bar.&lt;/data&gt;
+    &lt;data type="list" key="dataKeys" value="version,date,isSimple,foo,bar,dataKeys,switches"/&gt;
+    &lt;data type="list.boolean" key="switches" value="true,false,false,true"/&gt;
+&lt;/tools&gt;
+        </sourcecode>
+        
+        <p>
+            For those upgrading from VelocityTools 1.x, you will notice that 
+            the format has changed rather drastically.  Not to worry, the old 
+            format is still supported, though it has been deprecated and does 
+            not offer as many features as the new one.  We strongly recommend 
+            you upgrade to the new format.
+        </p>
+
+    </section>
+
+    </body>
+
+</document>

Propchange: velocity/tools/trunk/xdocs/config.xml.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/tools/trunk/xdocs/config.xml.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: velocity/tools/trunk/xdocs/creatingtools.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/creatingtools.xml?rev=601978&view=auto
==============================================================================
--- velocity/tools/trunk/xdocs/creatingtools.xml (added)
+++ velocity/tools/trunk/xdocs/creatingtools.xml Thu Dec  6 19:54:32 2007
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+
+<!--
+ 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.
+-->
+
+<document>
+
+    <properties>
+        <title>VelocityTools Project</title>
+        <projectfile>xdocs/project.xml</projectfile>
+    </properties>
+
+    <body>
+
+    <section name="Creating your own tools">
+        <p> TODO: Create page </p> 
+    </section>
+
+    </body>
+
+</document>

Propchange: velocity/tools/trunk/xdocs/creatingtools.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/tools/trunk/xdocs/creatingtools.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: velocity/tools/trunk/xdocs/css/maven-base.css
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/css/maven-base.css?rev=601978&view=auto
==============================================================================
--- velocity/tools/trunk/xdocs/css/maven-base.css (added)
+++ velocity/tools/trunk/xdocs/css/maven-base.css Thu Dec  6 19:54:32 2007
@@ -0,0 +1,158 @@
+/*
+ * 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.    
+ */
+
+body {
+  margin: 0px;
+  padding: 0px;
+}
+img {
+  border:none;
+}
+table {
+  padding:0px;
+  width: 100%;
+  margin-left: -2px;
+  margin-right: -2px;
+}
+acronym {
+  cursor: help;
+  border-bottom: 1px dotted #feb;
+}
+table.bodyTable th, table.bodyTable td {
+  padding: 2px 4px 2px 4px;
+  vertical-align: top;
+}
+div.clear{
+  clear:both;
+  visibility: hidden;
+}
+div.clear hr{
+  display: none;
+}
+#bannerLeft, #bannerRight {
+  font-size: xx-large;
+  font-weight: bold;
+}
+#bannerLeft img, #bannerRight img {
+  margin: 0px;
+}
+.xleft, #bannerLeft img {
+  float:left;
+  text-shadow: #7CFC00;
+}
+.xright, #bannerRight img {
+  float:right;
+  text-shadow: #7CFC00;
+}
+#banner {
+  padding: 0px;
+}
+#banner img {
+  border: none;
+}
+#breadcrumbs {
+  padding: 3px 10px 3px 10px;
+}
+#leftColumn {
+ width: 170px;
+ float:left;
+ overflow: auto;
+}
+#bodyColumn {
+  margin-right: 1.5em;
+  margin-left: 197px;
+}
+#legend {
+  padding: 8px 0 8px 0;
+}
+#navcolumn {
+  padding: 8px 4px 0 8px;
+}
+#navcolumn h5 {
+  margin: 0;
+  padding: 0;
+  font-size: small;
+}
+#navcolumn ul {
+  margin: 0;
+  padding: 0;
+  font-size: small;
+}
+#navcolumn li {
+  list-style-type: none;
+  background-image: none;
+  background-repeat: no-repeat;
+  background-position: 0 0.4em;
+  padding-left: 16px;
+  list-style-position: outside;
+  line-height: 1.2em;
+  font-size: smaller;
+}
+#poweredBy {
+  text-align: center;
+}
+#navcolumn img {
+  margin-top: 10px;
+  margin-bottom: 3px;
+}
+#poweredBy img {
+  display:block;
+  margin: 20px 0 20px 17px;
+}
+#search img {
+    margin: 0px;
+    display: block;
+}
+#search #q, #search #btnG {
+    border: 1px solid #999;
+    margin-bottom:10px;
+}
+#search form {
+    margin: 0px;
+}
+#lastPublished {
+  font-size: x-small;
+}
+.navSection {
+  margin-bottom: 2px;
+  padding: 8px;
+}
+.navSectionHead {
+  font-weight: bold;
+  font-size: x-small;
+}
+.section {
+  padding: 4px;
+}
+#footer {
+  padding: 3px 10px 3px 10px;
+  font-size: x-small;
+}
+#breadcrumbs {
+  font-size: x-small;
+  margin: 0pt;
+}
+.source {
+  padding: 12px;
+  margin: 1em 7px 1em 7px;
+}
+.source pre {
+  margin: 0px;
+  padding: 0px;
+}

Propchange: velocity/tools/trunk/xdocs/css/maven-base.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/tools/trunk/xdocs/css/maven-base.css
------------------------------------------------------------------------------
    svn:mime-type = text/css

Added: velocity/tools/trunk/xdocs/css/maven-theme.css
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/css/maven-theme.css?rev=601978&view=auto
==============================================================================
--- velocity/tools/trunk/xdocs/css/maven-theme.css (added)
+++ velocity/tools/trunk/xdocs/css/maven-theme.css Thu Dec  6 19:54:32 2007
@@ -0,0 +1,184 @@
+/*
+ * 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.    
+ */
+
+body {
+  background-color: white;
+  padding: 0px 0px 10px 0px;
+  font-family: "Times New Roman", Times, serif;
+  font-size: 12pt;
+}
+code, pre {
+  font-family: "Courier New", Courier, monospace;
+  font-size: 10pt;
+  line-height: normal;
+}
+a {
+  text-decoration: none;
+}
+a:link, a:visited,  a:active, a:hover {
+    color: #525D76;
+}
+#breadcrumbs a:link, #breadcrumbs a:visited, #breadcrumbs a:active, #breadcrumbs a:hover {
+    color: white;
+    text-decoration: none;
+}
+h1,h2 {
+  padding: 4px 4px 4px 6px;
+  border: none;
+  background-color: #525D76;
+  color: white;
+  font-size: 14pt;
+  font-weight: normal;
+}
+h3 {
+  padding: 4px 4px 4px 6px;
+  border: solid 1px #525D76;
+  background-color: white;
+  color: #525D76;
+  font-size: 12pt;
+  font-weight: bold;
+}
+h4 {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #bbb;
+  color: #900;
+  background-color: white;
+  font-weight: normal;
+  font-size: large;
+}
+h5 {
+  padding: 4px 4px 4px 6px;
+  color: #900;
+  font-size: medium;
+}
+p, table, ul, dl, div, span {
+  line-height: 1.3em;
+}
+tt {
+  font-family: Courier New, Courier, monospace;
+}
+#breadcrumbs {
+  font-family: Arial, Verdana, Helvetica, sans-serif;
+  border: none;
+  background-color: #525D76;
+  color: white;
+}
+#leftColumn {
+  border: 1px solid #999;
+  font-family: Arial, Verdana, Helvetica, sans-serif;
+  margin: 10px 0 0 5px;
+  background-color: white;
+}
+#leftColumn a {
+  text-decoration: none;
+}
+#leftColumn li {
+  font-family: Arial, Verdana, Helvetica, sans-serif;
+}
+
+img.poweredBy {
+  display:block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+a.poweredBy {
+  padding: 0px;
+  margin: 0px;
+}
+
+#navcolumn {
+  padding: 8px 4px 10px 8px;
+}
+#navcolumn h5 {
+  padding: 8px 4px 4px 6px;
+  font-size: small;
+  border-bottom: 1px solid #aaaaaa;
+  color: #525D76;
+}
+
+table.bodyTable th {
+  background-color: #039acc;
+  color: #000000;
+  vertical-align: top;
+  text-align:left;
+  border:1px white solid;
+  padding: 2px; 
+}
+
+table.bodyTable tr.a {
+  background-color: #a0ddf0;
+  color: #000000;
+  vertical-align: top;
+  text-align:left;
+  border:1px white solid;
+  padding: 2px; 
+}
+
+table.bodyTable tr.b {
+  background-color: #88c5d8;
+  color: #000000;
+  vertical-align: top;
+  text-align:left;
+  border:1px white solid;
+  padding: 2px; 
+}
+
+table.bodyTable th, table.bodyTable td {
+  font-size: 10pt;
+}
+
+.source {
+  border: 1px solid #999;
+  background-color: #f8fff8;
+}
+
+dt.question {
+  color: #900;
+  background-color: #eee;
+}
+
+dl {
+  padding: 4px 4px 4px 6px;
+  border: 1px solid #aaa;
+  background-color: white;
+}
+dt {
+  color: #900;
+}
+#organizationLogo img, #projectLogo img, #projectLogo span{
+  margin: 8px;
+}
+#banner {
+  border-bottom: 1px solid white;
+}
+
+#bannerRight p {
+  float: right;
+  font-family: Arial, Verdana, Helvetica, sans-serif;
+  color: #525D76;
+  padding: 4px;
+  border: solid black 1px;
+  margin: 4px 4px;
+  background-color: #f8fff8;
+}
+
+#bannerLeft img, #bannerRight img {
+  padding: 4px 4px;
+}

Propchange: velocity/tools/trunk/xdocs/css/maven-theme.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/tools/trunk/xdocs/css/maven-theme.css
------------------------------------------------------------------------------
    svn:mime-type = text/css

Added: velocity/tools/trunk/xdocs/css/style.css
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/css/style.css?rev=601978&view=auto
==============================================================================
--- velocity/tools/trunk/xdocs/css/style.css (added)
+++ velocity/tools/trunk/xdocs/css/style.css Thu Dec  6 19:54:32 2007
@@ -0,0 +1,10 @@
+th {
+    background-color: #039acc;
+    color: #000000;
+    text-align: left;
+}
+
+td {
+    background-color: #a0ddf0;
+    color: #000000;
+}
\ No newline at end of file

Propchange: velocity/tools/trunk/xdocs/css/style.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/tools/trunk/xdocs/css/style.css
------------------------------------------------------------------------------
    svn:mime-type = text/css

Added: velocity/tools/trunk/xdocs/frameworks.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/frameworks.xml?rev=601978&view=auto
==============================================================================
--- velocity/tools/trunk/xdocs/frameworks.xml (added)
+++ velocity/tools/trunk/xdocs/frameworks.xml Thu Dec  6 19:54:32 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+
+<!--
+ 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.
+-->
+
+<document>
+
+    <properties>
+        <title>VelocityTools Project</title>
+        <projectfile>xdocs/project.xml</projectfile>
+    </properties>
+
+    <body>
+    <section name="Intergrating with Web Frameworks">
+        <p> TODO: Create page </p> 
+    </section>
+
+    </body>
+
+</document>

Propchange: velocity/tools/trunk/xdocs/frameworks.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/tools/trunk/xdocs/frameworks.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: velocity/tools/trunk/xdocs/generic.index.xml (from r601787, velocity/tools/trunk/xdocs/generic/index.xml)
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/generic.index.xml?p2=velocity/tools/trunk/xdocs/generic.index.xml&p1=velocity/tools/trunk/xdocs/generic/index.xml&r1=601787&r2=601978&rev=601978&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/generic/index.xml (original)
+++ velocity/tools/trunk/xdocs/generic.index.xml Thu Dec  6 19:54:32 2007
@@ -23,8 +23,8 @@
 
     <properties>
         <title>GenericTools</title>
-        <author email="sidler@apache.org">Gabriel Sidler</author>
-        <projectfile>xdocs/generic/menu.xml</projectfile>
+        <projectfile>xdocs/project.xml</projectfile>
+        <subprojectfile>xdocs/generic.project.xml</subprojectfile>
     </properties>
 
     <body>
@@ -40,13 +40,13 @@
         <p>
           <strong>Tools:</strong>
           <dl>
-            <dt><a href="../javadoc/org/apache/velocity/tools/generic/DateTool.html"><strong>DateTool</strong></a></dt>
+            <dt><a href="javadoc/org/apache/velocity/tools/generic/DateTool.html"><strong>DateTool</strong></a></dt>
             <dd>A tool for manipulating and formatting dates.</dd>
 
             <dt><a href="MathTool.html"><strong>MathTool</strong></a></dt>
             <dd>A tool for performing floating point math.</dd>
 
-            <dt><a href="../javadoc/org/apache/velocity/tools/generic/NumberTool.html"><strong>NumberTool</strong></a></dt>
+            <dt><a href="javadoc/org/apache/velocity/tools/generic/NumberTool.html"><strong>NumberTool</strong></a></dt>
             <dd>A tool for formatting numbers.</dd>
 
             <dt><a href="RenderTool.html"><strong>RenderTool</strong></a></dt>
@@ -56,27 +56,27 @@
             <dt><a href="EscapeTool.html"><strong>EscapeTool</strong></a></dt>
             <dd>A tool to help with common escaping needs in Velocity templates.</dd>
 
-            <dt><a href="../javadoc/org/apache/velocity/tools/generic/ResourceTool.html"><strong>ResourceTool</strong></a></dt>
+            <dt><a href="javadoc/org/apache/velocity/tools/generic/ResourceTool.html"><strong>ResourceTool</strong></a></dt>
             <dd>A tool to simplify access to ResourceBundles for internationalization or other dynamic content needs.</dd>
 
-            <dt><a href="../javadoc/org/apache/velocity/tools/generic/Alternator.html"><strong>Alternator</strong></a>
-            and <a href="../javadoc/org/apache/velocity/tools/generic/AlternatorTool.html"><strong>AlternatorTool</strong></a></dt>
+            <dt><a href="javadoc/org/apache/velocity/tools/generic/Alternator.html"><strong>Alternator</strong></a>
+            and <a href="javadoc/org/apache/velocity/tools/generic/AlternatorTool.html"><strong>AlternatorTool</strong></a></dt>
             <dd>Utility class for easily alternating over values in a list and tool for easy creation of Alternators in templates.</dd>
 
-            <dt><a href="../javadoc/org/apache/velocity/tools/generic/ValueParser.html"><strong>ValueParser</strong></a></dt>
+            <dt><a href="javadoc/org/apache/velocity/tools/generic/ValueParser.html"><strong>ValueParser</strong></a></dt>
             <dd>A tool to retrieve and parse String values pulled from a map. This provides
             the basis for the <a href="../view/ParameterParser.html">ParameterParser</a> in
             <a href="../view/index.html">VelocityView</a>.</dd>
 
-            <dt><a href="../javadoc/org/apache/velocity/tools/generic/ListTool.html"><strong>ListTool</strong></a></dt>
+            <dt><a href="javadoc/org/apache/velocity/tools/generic/ListTool.html"><strong>ListTool</strong></a></dt>
             <dd>A tool to help when working with arrays or Lists. This tool transparently handles both the same way.</dd>
 
-            <dt><a href="../javadoc/org/apache/velocity/tools/generic/SortTool.html"><strong>SortTool</strong></a></dt>
+            <dt><a href="javadoc/org/apache/velocity/tools/generic/SortTool.html"><strong>SortTool</strong></a></dt>
             <dd>A tool that allows a user to sort a collection (or array, iterator, etc)
             on any arbitary set of properties exposed by the objects contained within
             the collection.</dd>
 
-            <dt><a href="../javadoc/org/apache/velocity/tools/generic/IteratorTool.html"><strong>IteratorTool</strong></a></dt>
+            <dt><a href="javadoc/org/apache/velocity/tools/generic/IteratorTool.html"><strong>IteratorTool</strong></a></dt>
             <dd>A convenience tool to use with #foreach loops. It wraps a list
             to let the designer specify a condition to terminate the loop,
             and reuse the same list in different loops.</dd>
@@ -84,11 +84,11 @@
           <br clear="all"/>
           <strong>Utilities:</strong>
           <dl>
-            <dt><a href="../javadoc/org/apache/velocity/tools/generic/log/CommonsLogLogSystem.html"><strong>CommonsLogLogSystem</strong></a></dt>
+            <dt><a href="javadoc/org/apache/velocity/tools/generic/log/CommonsLogLogSystem.html"><strong>CommonsLogLogSystem</strong></a></dt>
             <dd>An implementation of Velocity's LogSystem interface that redirects
             log output to a Commons-Logging Log instance.</dd>
 
-            <dt><a href="../javadoc/org/apache/velocity/tools/generic/log/LogSystemCommonsLog.html"><strong>LogSystemCommonsLog</strong></a></dt>
+            <dt><a href="javadoc/org/apache/velocity/tools/generic/log/LogSystemCommonsLog.html"><strong>LogSystemCommonsLog</strong></a></dt>
             <dd>An implementation of Commons-Logging's Log interface that redirects
             log output to Velocity's LogSystem.</dd>
           </dl>

Copied: velocity/tools/trunk/xdocs/generic.project.xml (from r601787, velocity/tools/trunk/xdocs/generic/menu.xml)
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/generic.project.xml?p2=velocity/tools/trunk/xdocs/generic.project.xml&p1=velocity/tools/trunk/xdocs/generic/menu.xml&r1=601787&r2=601978&rev=601978&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/generic/menu.xml (original)
+++ velocity/tools/trunk/xdocs/generic.project.xml Thu Dec  6 19:54:32 2007
@@ -19,42 +19,30 @@
  under the License.
 -->
 
-<project href="index.html">
+<project name="GenericTools" href="index.html"
+    logo="/images/velocitygenerictools.png">
 
-  <title>Velocity</title>
-  <logo href="../images/velocitygenerictools.png">&lt; Velocity Tools - Library &gt;</logo>
-
-  <body>
-
-    <uplink name="Velocity Tools"      href="../" alt="top"/>
-
-    <menu name="Generic Tools">
-        <item name="Overview"         href="index.html"/>
-        <item name="Download"         href="../index.html#Download"/>
-        <item name="Contributions"    href="index.html#Contributions"/>
-        <item name="Javadoc"          href="../javadoc/index.html"/>
-    </menu>
-
-    <menu name="Tool Documentation">
-      <item name="DateTool"       href="../javadoc/org/apache/velocity/tools/generic/DateTool.html"/>
-      <item name="MathTool"       href="MathTool.html"/>
-      <item name="NumberTool"     href="../javadoc/org/apache/velocity/tools/generic/NumberTool.html"/>
-      <item name="RenderTool"     href="RenderTool.html"/>
-      <item name="EscapeTool"     href="EscapeTool.html"/>
-      <item name="ResourceTool"   href="../javadoc/org/apache/velocity/tools/generic/ResourceTool.html"/> />
-      <item name="Alternator"     href="../javadoc/org/apache/velocity/tools/generic/Alternator.html"/> />
-      <item name="AlternatorTool" href="../javadoc/org/apache/velocity/tools/generic/AlternatorTool.html"/> />
-      <item name="ValueParser"    href="../javadoc/org/apache/velocity/tools/generic/ValueParser.html"/>
-      <item name="ListTool"       href="../javadoc/org/apache/velocity/tools/generic/ListTool.html"/>
-      <item name="SortTool"       href="../javadoc/org/apache/velocity/tools/generic/SortTool.html"/>
-      <item name="IteratorTool"   href="../javadoc/org/apache/velocity/tools/generic/IteratorTool.html"/> />
-    </menu>
-
-    <menu name="Other Subprojects">
-      <item name="VelocityView"   href="../view/"/>
-      <item name="VelocityStruts" href="../struts/"/>
-    </menu>
-
-    <printerversion/>
-  </body>
+  <breadcrumb href="generic.index.html">GenericTools</breadcrumb>
+  <menu>
+    <group name="GenericTools">
+        <item name="Overview"         href="generic.index.html"/>
+        <subGroup name="Tools" href="javadoc/org/apache/velocity/tools/generic/package-summary.html">
+          <item name="AlternatorTool"       href="javadoc/org/apache/velocity/tools/generic/AlternatorTool.html"/> />
+          <item name="ClassTool"            href="javadoc/org/apache/velocity/tools/generic/ClassTool.html"/>
+          <item name="ComparisonDateTool"   href="javadoc/org/apache/velocity/tools/generic/ComparisonDateTool.html"/>
+          <item name="ConversionTool"       href="javadoc/org/apache/velocity/tools/generic/ConversionTool.html"/>
+          <item name="DateTool"             href="javadoc/org/apache/velocity/tools/generic/DateTool.html"/>
+          <item name="EscapeTool"           href="javadoc/org/apache/velocity/tools/generic/EscapeTool.html"/>
+          <item name="FieldTool"            href="javadoc/org/apache/velocity/tools/generic/FieldTool.html"/>
+          <item name="ListTool"             href="javadoc/org/apache/velocity/tools/generic/ListTool.html"/>
+          <item name="LoopTool"             href="javadoc/org/apache/velocity/tools/generic/LoopTool.html"/> />
+          <item name="MathTool"             href="javadoc/org/apache/velocity/tools/generic/MathTool.html"/>
+          <item name="NumberTool"           href="javadoc/org/apache/velocity/tools/generic/NumberTool.html"/>
+          <item name="RenderTool"           href="javadoc/org/apache/velocity/tools/generic/RenderTool.html"/>
+          <item name="ResourceTool"         href="javadoc/org/apache/velocity/tools/generic/ResourceTool.html"/> />
+          <item name="SortTool"             href="javadoc/org/apache/velocity/tools/generic/SortTool.html"/>
+          <item name="ValueParser"          href="javadoc/org/apache/velocity/tools/generic/ValueParser.html"/>
+        </subGroup>
+    </group>
+  </menu>
 </project>

Modified: velocity/tools/trunk/xdocs/generic.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/generic.xml?rev=601978&r1=601977&r2=601978&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/generic.xml (original)
+++ velocity/tools/trunk/xdocs/generic.xml Thu Dec  6 19:54:32 2007
@@ -22,9 +22,9 @@
 <document>
 
     <properties>
-        <title>VelocityTools Project</title>
-        <author email="nbubna@apache.org">Nathan Bubna</author>
-        <projectfile>xdocs/menu.xml</projectfile>
+        <title>GenericTools</title>
+        <projectfile>xdocs/project.xml</projectfile>
+        <subprojectfile>xdocs/generic.project.xml</subprojectfile>
     </properties>
 
     <body>
@@ -71,30 +71,30 @@
 
         <subsection name="Runtime Requirements">
             <ul>
-                <li>commons-beanutils - core infrastructure, <a href="../javadoc/org/apache/velocity/tools/generic/MathTool.html"> MathTool</a>, <a href="../javadoc/org/apache/velocity/tools/generic/SortTool.html">SortTool</a></li>
+                <li>commons-beanutils - core infrastructure, <a href="javadoc/org/apache/velocity/tools/generic/MathTool.html"> MathTool</a>, <a href="javadoc/org/apache/velocity/tools/generic/SortTool.html">SortTool</a></li>
                 <li>commons-digester - xml configuration</li>
-                <li>commons-lang - <a href="../javadoc/org/apache/velocity/tools/generic/EscapeTool.html">EscapeTool</a></li>
-                <li>velocity - <a href="../javadoc/org/apache/velocity/tools/generic/ClassTool.html">ClassTool</a>, <a href="../javadoc/org/apache/velocity/tools/generic/IteratorTool.html"> IteratorTool</a>, <a href="../javadoc/org/apache/velocity/tools/generic/RenderTool.html">RenderTool</a></li>
+                <li>commons-lang - <a href="javadoc/org/apache/velocity/tools/generic/EscapeTool.html">EscapeTool</a></li>
+                <li>velocity - <a href="javadoc/org/apache/velocity/tools/generic/ClassTool.html">ClassTool</a>, <a href="javadoc/org/apache/velocity/tools/generic/IteratorTool.html"> IteratorTool</a>, <a href="javadoc/org/apache/velocity/tools/generic/RenderTool.html">RenderTool</a></li>
             </ul>
         </subsection>
     </section>
     <section name="Tools">
         <ul>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/Alternator.html">Alternator</a> &amp; <a href="../javadoc/org/apache/velocity/tools/generic/AlternatorTool.html">AlternatorTool</a> - For easily alternating over values in a list or array.</li>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/ClassTool.html">ClassTool</a> - For simplifying reflective lookup of information about Classes and their fields, methods and constructors.</li>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/ConversionTool.html">ConversionTool</a> - For converting String values to richer object types.</li>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/DateTool.html">DateTool</a> &amp; <a href="../javadoc/org/apache/velocity/tools/generic/ComparisonDateTool.html">ComparisonDateTool</a> - For manipulating, formatting, and comparing dates.</li>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/DisplayTool.html">DisplayTool</a> - For controlling display of references (e.g. truncating values, "pretty printing" lists, and displaying alternates when a reference is null).</li>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/EscapeTool.html">EscapeTool</a> - For common escaping needs in Velocity templates (e.g. escaping html, xml, javascript etc.)</li>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/FieldTool.html">FieldTool</a> - For (easy) access to static fields in a class, such as string constants.</li>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/IteratorTool.html">IteratorTool</a> - Wraps lists to let the designer specify a condition to terminate the loop, and reuse the same list in different loops.</li>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/ListTool.html">ListTool</a> - For working with arrays and lists, treats both transparently the same.</li>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/MathTool.html">MathTool</a> - For performing math functions.</li>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/NumberTool.html">NumberTool</a> - For formatting and converting numbers.</li>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/RenderTool.html">RenderTool</a> - To evaluate and render arbitrary strings of VTL, including recursive rendering.</li>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/ResourceTool.html">ResourceTool</a> - For simplified access to ResourceBundles for internationalization or other dynamic content needs.</li>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/SortTool.html">SortTool</a> - Used to sort collections (or arrays, iterators, etc) on any arbitary set of properties exposed by the objects contained within the collection.</li>
-            <li><a href="../javadoc/org/apache/velocity/tools/generic/ValueParser.html">ValueParser</a> - Used to retrieve and parse (aka convert) String values pulled from a map.</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/Alternator.html">Alternator</a> &amp; <a href="javadoc/org/apache/velocity/tools/generic/AlternatorTool.html">AlternatorTool</a> - For easily alternating over values in a list or array.</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/ClassTool.html">ClassTool</a> - For simplifying reflective lookup of information about Classes and their fields, methods and constructors.</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/ConversionTool.html">ConversionTool</a> - For converting String values to richer object types.</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/DateTool.html">DateTool</a> &amp; <a href="javadoc/org/apache/velocity/tools/generic/ComparisonDateTool.html">ComparisonDateTool</a> - For manipulating, formatting, and comparing dates.</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/DisplayTool.html">DisplayTool</a> - For controlling display of references (e.g. truncating values, "pretty printing" lists, and displaying alternates when a reference is null).</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/EscapeTool.html">EscapeTool</a> - For common escaping needs in Velocity templates (e.g. escaping html, xml, javascript etc.)</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/FieldTool.html">FieldTool</a> - For (easy) access to static fields in a class, such as string constants.</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/IteratorTool.html">IteratorTool</a> - Wraps lists to let the designer specify a condition to terminate the loop, and reuse the same list in different loops.</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/ListTool.html">ListTool</a> - For working with arrays and lists, treats both transparently the same.</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/MathTool.html">MathTool</a> - For performing math functions.</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/NumberTool.html">NumberTool</a> - For formatting and converting numbers.</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/RenderTool.html">RenderTool</a> - To evaluate and render arbitrary strings of VTL, including recursive rendering.</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/ResourceTool.html">ResourceTool</a> - For simplified access to ResourceBundles for internationalization or other dynamic content needs.</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/SortTool.html">SortTool</a> - Used to sort collections (or arrays, iterators, etc) on any arbitary set of properties exposed by the objects contained within the collection.</li>
+            <li><a href="javadoc/org/apache/velocity/tools/generic/ValueParser.html">ValueParser</a> - Used to retrieve and parse (aka convert) String values pulled from a map.</li>
         </ul>
     </section>
 

Modified: velocity/tools/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/index.xml?rev=601978&r1=601977&r2=601978&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/index.xml (original)
+++ velocity/tools/trunk/xdocs/index.xml Thu Dec  6 19:54:32 2007
@@ -22,9 +22,8 @@
 <document>
 
     <properties>
-        <title>VelocityTools 2.0</title>
-        <projectfile>xdocs/menu.xml</projectfile>
-        <author email="nbubna@apache.org">Nathan Bubna</author>
+        <title>Overview</title>
+        <projectfile>xdocs/project.xml</projectfile>
     </properties>
 
     <body>

Added: velocity/tools/trunk/xdocs/project.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/project.xml?rev=601978&view=auto
==============================================================================
--- velocity/tools/trunk/xdocs/project.xml (added)
+++ velocity/tools/trunk/xdocs/project.xml Thu Dec  6 19:54:32 2007
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+
+<!--
+ 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.
+-->
+
+<project name="VelocityTools" href="index.html"
+    logo="images/velocitytools.png">
+
+    <style href="css/style.css"/>
+    <style href="css/maven-theme.css"/>
+    <style href="css/maven-base.css"/>
+    <breadcrumb href="http://velocity.apache.org">Velocity</breadcrumb>
+    <breadcrumb href="index.html">VelocityTools</breadcrumb>
+    <sibling href="http://velocity.apache.org/engine/devel/">Engine</sibling>
+    <sibling href="http://velocity.apache.org/tools/devel/">Tools</sibling>
+    <sibling href="http://velocity.apache.org/anakia/devel/">Anakia</sibling>
+    <sibling href="http://velocity.apache.org/texen/devel/">Texen</sibling>
+    <sibling href="http://velocity.apache.org/docbook/">Docbook</sibling>
+    <sibling href="http://velocity.apache.org/dvsl/devel/">DVSL</sibling>
+
+    <menu>
+        <group name="VelocityTools">
+            <item name="Overview"   href="index.html"/>
+            <item name="Download"   href="http://velocity.apache.org/download.cgi#Tools"/>
+            <item name="Javadoc"    href="javadoc/index.html"/>
+            <item name="FAQ"        href="http://wiki.apache.org/velocity/VelocityFAQ"/>
+            <item name="Wiki"       href="http://wiki.apache.org/velocity/VelocityTools"/>
+        </group>
+
+        <group name="Subprojects">
+            <item name="GenericTools"   href="generic.html"/>
+            <item name="VelocityView"   href="view.html"/>
+            <item name="VelocityStruts" href="struts.html"/>
+        </group>
+
+        <group name="Docs">
+            <subGroup name="Configuration" href="config.html">
+                <item name="Using XML"          href="config.xml.html"/>
+                <item name="Using Properties"   href="config.properties.html"/>
+                <item name="Using Java"         href="config.java.html"/>
+            </subGroup>
+            <item name="Standalone Use"            href="standalone.html"/>
+            <item name="Web Framework Integration" href="frameworks.html"/>
+            <item name="Creating Tools"            href="creatingtools.html"/>
+        </group>
+
+        <group name="Development">
+            <item name="ChangeLog"      href="changes.html"/>
+            <item name="Contributions"  href="index.html#Contributions"/>
+            <item name="Source Code"    href="index.html#Subversion%20Repository"/>
+            <item name="Report Issue"   href="http://issues.apache.org/jira/browse/VELTOOLS"/>
+        </group>
+    </menu>
+</project>

Propchange: velocity/tools/trunk/xdocs/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/tools/trunk/xdocs/project.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: velocity/tools/trunk/xdocs/site.dvsl
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/site.dvsl?rev=601978&r1=601977&r2=601978&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/site.dvsl (original)
+++ velocity/tools/trunk/xdocs/site.dvsl Thu Dec  6 19:54:32 2007
@@ -52,114 +52,138 @@
 ##     </dvsl>
 ##
 
-
-#set( $body-bg = '#ffffff' )
-#set( $body-fg = '#000000' )
-#set( $body-link = '#525D76' )
-#set( $banner-bg = '#525D76')
-#set( $banner-fg = '#ffffff')
-#set( $sub-banner-bg = '#828DA6')
-#set( $sub-banner-fg = '#ffffff')
-#set( $table-th-bg = '#039acc')
-#set( $table-td-bg = '#a0ddf0')
-#set( $source-color = '#023264')
-
 #match( "document" )
-
+    ## alias the current node
     #set( $document = $node )
+    ## get path to the project file
     #if ($context.toolbox.basedir)
       #set( $projectfile = "$context.toolbox.basedir/$node.properties.projectfile" )
     #else
       #set( $projectfile = $node.properties.projectfile )
     #end    
+    ## get actual project node
     #set( $project = $node.selectSingleNode("document('$projectfile')/project" ) )
+    ## check for a subproject file
+    #if( $node.properties.subprojectfile )
+      #set( $subprojectfile = $node.properties.subprojectfile )
+      #set( $subproject = $node.selectSingleNode("document('$subprojectfile')/project") )
+      #set( $subtitle = $subproject.attribute('name') )
+    #end
+    #set( $pagetitle = $document.properties.title )
+    ## build up crumbs
+    #set( $crumbs = $project.selectNodes('breadcrumb') )
+    #set( $subcrumbs = $subproject.selectNodes('breadcrumb') )
+    #if( $subcrumbs && !$subcrumbs.empty )
+      #set( $foo = $crumbs.addAll($subcrumbs) )
+    #end
 
     <html>
     <head>
-      <title>$project.title - $node.properties.title</title>
-
+      <title>$project.attribute('name')#if( $subtitle ) - $subtitle#end#if( $pagetitle ) - $pagetitle#end</title>
        #foreach( $n in $node.properties.selectNodes("author") )
         <meta name="author" value="$n"/>
         #if( $n.attribute('email') )
             <meta name="email" value="$n.attribute('email')" />
         #end
        #end
-        
-    
+      <style type="text/css" media="all">
+       #foreach( $style in $project.selectNodes('style') )
+        @import url("$style.attribute('href')");
+       #end
+       #foreach( $style in $subproject.selectNodes('style') )
+        @import url("$style.attribute('href')");
+       #end
+       #foreach( $style in $document.properties.selectNodes('style') )
+        @import url("$style.attribute('href')");
+       #end
+      </style>        
     </head>
 
-    <body bgcolor="$body-bg" text="$body-fg" link="$body-link"
-          alink="$body-link" vlink="$body-link">
-
-    <table border="0" width="100%" cellspacing="4">
+    <body class="composite">
 
-      ## PAGE HEADER
-      <tr><td colspan="2">
-
-        ## VELOCITY LOGO
-        <a href="http://velocity.apache.org/">
+      ## PAGE HEADER (LOGOS)
+      <div id="banner">
+        <a href="http://velocity.apache.org/" id="bannerLeft">
           <img src="http://velocity.apache.org/images/velocity_project_wide.png"
              align="left" alt="The Velocity Project" border="0"/>
         </a>
-
-        #if( $project.logo )
-
-          #set( $alt = $project.logo )
-          #set( $home = $project.attribute("href") )
-          #set( $src = $project.logo.attribute( "href" ) )
-
+        #if( $subproject.attribute('logo') )
+          #set( $logo = $subproject.attribute('logo') )
+          #set( $name = $subproject.attribute('name') )
+          #set( $home = $subproject.attribute('href') )
+        #else
+          #set( $logo = $project.attribute('logo') )
+          #set( $name = $project.attribute('name') )
+          #set( $home = $project.attribute('href') )
+        #end
+        #if( $logo )
           ## PROJECT LOGO
-          <a href="$home">
-            <img src="$src" align="right" alt="$alt" border="0"/>
-          </a>
+          <span id="bannerRight">
+            <a href="$home">
+              <img src="$logo" align="right" alt="$name" border="0"/>
+            </a>
+          </span>
         #end
-
-      </td></tr>
-
-      ## HEADER SEPARATOR
-      <tr>
-        <td colspan="2">
-          <hr noshade="" size="1"/>
-        </td>
-      </tr>
-
-      <tr>
-
-        ## LEFT SIDE NAVIGATION
-        #if ($context.toolbox.PrinterFriendlyVersion.equals("yes"))            
-        <td>&nbsp;</td>
-        #else
-        <td width="20%" valign="top">
-            $context.applyTemplates( $project, "body/toplink" )
-            $context.applyTemplates( $project, "body/uplink" )
-            $context.applyTemplates( $project, "body/menu" )
-            $context.applyTemplates( $project, "body/printerversion" )
-        </td>
+        <div class="clear">
+          <hr/>
+        </div>
+      </div>
+
+      ## BREADCRUMB LINKS
+      <div id="breadcrumbs">
+        <div class="xleft">
+          #foreach( $crumb in $crumbs )
+            <a href="$crumb.attribute('href')" class="crumb">$crumb</a> &gt;
+          #end
+          $!pagetitle
+        </div>
+        <div class="xright">
+          #foreach( $sibling in $project.selectNodes('sibling') )
+            #if( $velocityCount > 1 )|#end
+            <a href="$sibling.attribute('href')" class="sibling">$sibling</a>
+          #end
+        </div>
+        <div class="clear">
+          <hr/>
+        </div>
+      </div>
+
+
+        <!-- LEFT SIDE NAVIGATION -->
+        #if( !$context.toolbox.PrinterFriendlyVersion.equals("yes") )            
+        <div id="leftColumn">
+          <div id="navcolumn">
+            $context.applyTemplates( $project, "menu/group" )
+            #if( $subproject )
+                $context.applyTemplates( $subproject, "menu/group" )
+            #end
+            <a class="poweredBy" href="http://velocity.apache.org/" title="Apache Velocity" >
+              <img class="poweredBy" alt="Apache Velocity" src="http://velocity.apache.org/images/pbv90x30.png"/>
+            </a>
+          </div>
+        </div>
         #end
 
         <!-- RIGHT SIDE MAIN BODY -->
-        <td colspan="1" valign="top" align="left">
-          $context.applyTemplates("body/section")
-        </td>
-
-      </tr>
-
-      <!-- FOOTER SEPARATOR --> 
-      <tr>
-        <td colspan="2">
-          <hr noshade="" size="1"/>
-        </td>
-      </tr>
-
-      <!-- PAGE FOOTER -->
-      <tr><td colspan="2">
-        <div align="center"><font color="$body-link" size="-1"><em>
-        Copyright &#169; 1999-2003, Apache Software Foundation
-        </em></font></div>
-      </td></tr>
-
-    </table>
-    </body>
+        <div id="bodyColumn">
+          <div id="contentBox">
+            $context.applyTemplates("body/section")
+          </div>
+        </div>
+        <div class="clear">
+          <hr/>
+        </div>
+
+        <!-- PAGE FOOTER -->
+        <div id="footer">
+          <div class="xright">
+            Copyright &#169; 1999-2007, Apache Software Foundation
+          </div>
+        </div>
+        <div class="clear">
+          <hr/>
+        </div>
+      </body>
     </html>
 #end
 
@@ -167,14 +191,12 @@
 #*
  *   Process a menu for the navigation bar
  *#
-#match( "menu" )
-<p>
+#match( "group" )
 #if ($attrib.href)
-    <a href="$attrib.href"><strong>$attrib.name</strong></a>
+    <h5><a href="$attrib.href">$attrib.name</a></h5>
 #else
-    <strong>$attrib.name</strong>
+    <h5>$attrib.name</h5>
 #end    
-</p>
 <ul>
     $context.applyTemplates()
 </ul>
@@ -184,11 +206,11 @@
 #*
  *   Process a submenu for the navigation bar
  *#
-#match( "submenu" )
+#match( "subGroup" )
 #if ($attrib.href)
-    <li><a href="$attrib.href">$attrib.name</a>
+    <li class="none"><a href="$attrib.href">$attrib.name</a>
 #else
-    <li>$attrib.name
+    <li class="none">$attrib.name
 #end    
     <ul>
         $context.applyTemplates("item")
@@ -202,28 +224,20 @@
  *#
 #match( "item" )
 #if ($attrib.href)
-    <li><a href="$attrib.href">$attrib.name</a></li>
+    <li class="none"><a href="$attrib.href">$attrib.name</a></li>
 #else
-    <li>$attrib.name</li>
+    <li class="none">$attrib.name</li>
 #end
 #end
 
 
 #*
- *   Process a link to one layer above in the navigation hierarchy
- *#
-#match( "uplink" )
-    <p><strong><a href="$attrib.href">$attrib.name</a></strong></p>
-#end
-
-
-#*
  *   Insert a link to a printerfriendly version of the document
  *#
 #match( "printerversion" )
 <p>
 #if ($context.toolbox.LinkToPrinterFriendlyVersion.equals("yes"))
-<strong><a href="$context.getAppValue('infilename').substring(0, $context.getAppValue('infilename').lastIndexOf("."))-printer.html">Printer-friendly Version</a></strong>
+<a href="$context.getAppValue('infilename').substring(0, $context.getAppValue('infilename').lastIndexOf("."))-printer.html">Printer-friendly Version</a>
 #end    
 </p>
 #end
@@ -233,22 +247,10 @@
  *  process a documentation section
  *#
 #match( "section" )
-<table border="0" cellspacing="4" cellpadding="2" width="100%">
-  <tr>
-    <td colspan="2" bgcolor="$banner-bg">
-      <font color="$banner-fg" face="arial,helvetica.sanserif">
-      <a name="$attrib.name">
-      <strong>$attrib.name</strong></a></font>
-    </td>
-  </tr>
-  <tr>
-    <td nowrap="true" width="3%"></td>
-    <td>
-      $context.applyTemplates("*")
-      <br />
-    </td>
-  </tr>
-</table>
+<a name="$attrib.name"></a>##
+<div class="section"><h2>$attrib.name</h2>
+  $context.applyTemplates("*")
+</div>
 #end
 
 
@@ -256,23 +258,10 @@
  *  process a documentation subsection
  *#
 #match( "subsection" )
-<br />
-<table border="0" cellspacing="0" cellpadding="2" width="100%">
-  <tr>
-    <td colspan="2" bgcolor="$sub-banner-bg">
-      <font color="$sub-banner-fg" face="arial,helvetica.sanserif">
-      <a name="$attrib.name">
-      <strong>$attrib.name</strong></a></font>
-    </td>
-  </tr>
-  <tr>
-    <td nowrap="true" width="3%"></td>
-    <td>
-      $context.applyTemplates("*")
-      <br />
-    </td>
-  </tr>
-</table>
+<a name="$attrib.name"></a>##
+<div class="subsection"><h3>$attrib.name</h3>
+    $context.applyTemplates("*")
+</div>
 #end
 
 
@@ -390,7 +379,6 @@
 #end
 
 
-
 #*
  *  process a 'methods' block. Generates a list of methods.
  *#
@@ -402,9 +390,9 @@
     #foreach ($s in $document.body.selectNodes("section") )
       #if ($s.method)
         <tr>
-          <td bgcolor="EEEEEE" nowrap>
+          <tdnowrap>
             <a href="#$s.method.attrib("name")">$s.method.attrib("name")</a></td>
-          <td bgcolor="EEEEEE">
+          <td>
             $node.copy($s.method.abstract.children())
           </td>
         </tr>
@@ -420,11 +408,9 @@
  *  process a 'sourcecode' block.
  *#
 #match( "sourcecode" )
-<table width="100%" cellpadding="1" cellspacing="0" border="0"><tr><td bgcolor="#000000">
-  <table width="100%" cellpadding="5" cellspacing="0" border="0"><tr><td bgcolor="#FFFFFF">
-    <pre>$node.copy()</pre>
-  </td></tr></table>
-</td></tr></table>
+<div class="source">
+  <pre>$node.copy()</pre>
+</div>
 #end
 
 
@@ -432,48 +418,11 @@
  *  process a 'source' block.
  *#
 #match( "source" )
-    <div align="left">
-      <table cellspacing="4" cellpadding="0" border="0">
-        <tr>
-          <td bgcolor="$source-color" width="1" height="1">
-            <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-          <td bgcolor="$source-color" height="1">
-            <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-          <td bgcolor="$source-color" width="1" height="1">
-            <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-        </tr>
-        <tr>
-          <td bgcolor="$source-color" width="1">
-            <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-          <td bgcolor="#ffffff" height="1">
-          <pre>
-            $node.copy()
-          </pre></td>
-          <td bgcolor="$source-color" width="1">
-            <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-        </tr>
-        <tr>
-          <td bgcolor="$source-color" width="1" height="1">
-            <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-          <td bgcolor="$source-color" height="1">
-            <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-          <td bgcolor="$source-color" width="1" height="1">
-            <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
-          </td>
-        </tr>
-      </table>
-    </div>
+<div class="source">
+  <pre>$node.copy()</pre>
+</div>
 #end
 
-
-
 #match("table")
 <table>
 $context.applyTemplates("*")
@@ -487,21 +436,15 @@
 #end
 
 #match( "td" )
-
-<td bgcolor="$table-td-bg" colspan="$!attrib.colspan" rowspan="$!attrib.rowspan" valign="top" align="left">
-    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-       $node.copy( $node.children() )
-    </font>
+<td colspan="$!attrib.colspan" rowspan="$!attrib.rowspan">
+  $node.copy( $node.children() )
 </td>
 #end
 
 #match( "th" )
-
-<td bgcolor="$table-th-bg" colspan="$!attrib.colspan" rowspan="$!attrib.rowspan" valign="top" align="left">
-    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-       $node.copy( $node.children())
-    </font>
-</td>
+<th colspan="$!attrib.colspan" rowspan="$!attrib.rowspan">
+  $node.copy( $node.children() )
+</th>
 #end
 
 #match ( "vel" )

Added: velocity/tools/trunk/xdocs/standalone.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/standalone.xml?rev=601978&view=auto
==============================================================================
--- velocity/tools/trunk/xdocs/standalone.xml (added)
+++ velocity/tools/trunk/xdocs/standalone.xml Thu Dec  6 19:54:32 2007
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+
+<!--
+ 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.
+-->
+
+<document>
+
+    <properties>
+        <title>VelocityTools Project</title>
+        <projectfile>xdocs/project.xml</projectfile>
+    </properties>
+
+    <body>
+
+    <section name="Just Use Them!">
+        <p>
+            There's nothing particularly special about the tools in VelocityTools2.  No 
+            special interfaces, most don't ''need'' any configuration or API access, 
+            and those that do are now relatively easy to handle (compared to 
+            VelocityTools 1.x).  So, if you need a tool, just create an instance, do 
+            any configuration you want or need and go.  Nothing else to it.
+        </p>
+    </section>
+
+    <section name="ToolManager">
+        <p>
+            However, if you want to externalize your configuration or have your tools
+             created and configured for you on demand and you are not working in a 
+            servlet environment, then we have created a simple ToolManager that you 
+            can use.  It's relatively simple.  Just create a ToolManager (can be 
+            created with or without default tools available), configure it (if you 
+            want to), ask it to create a context for you, and use the context as you 
+            would any other.  Of course, there's more to it, but this should get you 
+            started:
+        </p>
+    
+        <sourcecode>
+ToolManager manager = new ToolManager();
+manager.configure("/path/to/my/configuration.xml");
+Context context = manager.createContext();
+myVelocityEngine.evaluate(context, myOutputWriter, "This is a $text.test", "Test template");
+        </sourcecode>
+    
+        <p>
+            Of course, if you are going to be working in a servlet environment and don't
+             want to create and configure tools yourself, then you should use a 
+            <a href="../view.html">VelocityView</a> instance.
+        </p>
+    </section>
+
+    </body>
+
+</document>

Propchange: velocity/tools/trunk/xdocs/standalone.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/tools/trunk/xdocs/standalone.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: velocity/tools/trunk/xdocs/struts.index.xml (from r601787, velocity/tools/trunk/xdocs/struts/index.xml)
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/struts.index.xml?p2=velocity/tools/trunk/xdocs/struts.index.xml&p1=velocity/tools/trunk/xdocs/struts/index.xml&r1=601787&r2=601978&rev=601978&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/struts/index.xml (original)
+++ velocity/tools/trunk/xdocs/struts.index.xml Thu Dec  6 19:54:32 2007
@@ -25,8 +25,8 @@
         <title>Overview</title>
         <author email="sidler@apache.org">Gabriel Sidler</author>
         <author email="tcolson@cisco.com">Tim Colson</author>
-        <author email="nbubna@apache.org">Nathan Bubna</author>
-        <projectfile>xdocs/struts/menu.xml</projectfile>
+        <projectfile>xdocs/project.xml</projectfile>
+        <subprojectfile>xdocs/struts.project.xml</subprojectfile>
     </properties>
 
     <body>

Copied: velocity/tools/trunk/xdocs/struts.project.xml (from r601787, velocity/tools/trunk/xdocs/struts/menu.xml)
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/struts.project.xml?p2=velocity/tools/trunk/xdocs/struts.project.xml&p1=velocity/tools/trunk/xdocs/struts/menu.xml&r1=601787&r2=601978&rev=601978&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/struts/menu.xml (original)
+++ velocity/tools/trunk/xdocs/struts.project.xml Thu Dec  6 19:54:32 2007
@@ -19,41 +19,27 @@
  under the License.
 -->
 
-<project href="index.html">
+<project name="VelocityStruts" href="index.html"
+    logo="/images/velocitystruts.png">
 
-  <title>VelocityStruts</title>
-  <logo href="../images/velocitystruts.png">&lt; Velocity Tools - Struts &gt;</logo>
-
-  <body>
-
-    <uplink name="Velocity Tools"       href="../" alt="top"/>
-
-    <menu name="VelocityStruts">
-        <item name="Overview"                href="index.html"/>
-        <item name="Benefits"                href="index.html#Benefits"/>
-        <item name="Download"                href="../index.html#Download"/>
-        <item name="User Guide"              href="userguide.html"/>
-        <item name="Installation"            href="userguide.html#Installation"/>
-        <item name="Examples"                href="../index.html#Example Applications"/>
-        <item name="Javadoc"                 href="../javadoc/index.html"/>
-    </menu>
-
-    <menu name="VelocityStruts Tools" href="StrutsTools.html">
-      <item name="ActionMessagesTool" href="ActionMessagesTool.html"/>
-      <item name="ErrorsTool"         href="ErrorsTool.html"/>
-      <item name="FormTool"           href="FormTool.html"/>
-      <item name="MessageTool"        href="MessageTool.html"/>
-      <item name="StrutsLinkTool"     href="StrutsLinkTool.html"/>
-      <item name="SecureLinkTool"     href="SecureLinkTool.html"/>
-      <item name="TilesTool"          href="TilesTool.html"/>
-      <item name="ValidatorTool"      href="ValidatorTool.html"/>
-    </menu>
-
-    <menu name="Other Subprojects">
-      <item name="GenericTools"   href="../generic/"/>
-      <item name="VelocityView"   href="../view/"/>
-    </menu>
-
-    <printerversion/>
-  </body>
+  <breadcrumb href="view.index.html">VelocityStruts</breadcrumb>
+  <menu>
+    <group name="VelocityStruts">
+        <item name="Overview"                href="struts.index.html"/>
+        <item name="Benefits"                href="struts.index.html#Benefits"/>
+        <item name="User Guide"              href="struts.userguide.html"/>
+        <item name="Installation"            href="struts.userguide.html#Installation"/>
+        <item name="Examples"                href="index.html#Example Applications"/>
+        <subGroup name="Tools" href="javadoc/org/apache/velocity/tools/struts/package-summary.html">
+          <item name="ActionMessagesTool" href="javadoc/org/apache/velocity/tools/struts/ActionMessagesTool.html"/>
+          <item name="ErrorsTool"         href="javadoc/org/apache/velocity/tools/struts/ErrorsTool.html"/>
+          <item name="FormTool"           href="javadoc/org/apache/velocity/tools/struts/FormTool.html"/>
+          <item name="MessageTool"        href="javadoc/org/apache/velocity/tools/struts/MessageTool.html"/>
+          <item name="StrutsLinkTool"     href="javadoc/org/apache/velocity/tools/struts/StrutsLinkTool.html"/>
+          <item name="SecureLinkTool"     href="javadoc/org/apache/velocity/tools/struts/SecureLinkTool.html"/>
+          <item name="TilesTool"          href="javadoc/org/apache/velocity/tools/struts/TilesTool.html"/>
+          <item name="ValidatorTool"      href="javadoc/org/apache/velocity/tools/struts/ValidatorTool.html"/>
+        </subGroup>
+    </group>
+  </menu>
 </project>

Copied: velocity/tools/trunk/xdocs/struts.userguide.xml (from r601787, velocity/tools/trunk/xdocs/struts/userguide.xml)
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/struts.userguide.xml?p2=velocity/tools/trunk/xdocs/struts.userguide.xml&p1=velocity/tools/trunk/xdocs/struts/userguide.xml&r1=601787&r2=601978&rev=601978&view=diff
==============================================================================
--- velocity/tools/trunk/xdocs/struts/userguide.xml (original)
+++ velocity/tools/trunk/xdocs/struts.userguide.xml Thu Dec  6 19:54:32 2007
@@ -24,7 +24,8 @@
     <properties>
         <title>User Guide</title>
         <author email="sidler@apache.org">Gabriel Sidler</author>
-        <projectfile>xdocs/struts/menu.xml</projectfile>
+        <projectfile>xdocs/project.xml</projectfile>
+        <subprojectfile>xdocs/struts.project.xml</subprojectfile>
     </properties>
 
     <body>



Mime
View raw message