velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r961898 - in /velocity/sandbox/maven-reorg/tools/trunk: ./ src/main/ src/site/ src/site/resources/ src/site/resources/images/ src/site/xdoc/ src/site/xdoc/images/ velocity-tools-view/ xdocs/
Date Thu, 08 Jul 2010 19:35:01 GMT
Author: apetrelli
Date: Thu Jul  8 19:35:00 2010
New Revision: 961898

URL: http://svn.apache.org/viewvc?rev=961898&view=rev
Log:
VELOCITYSB-5
Moved site files in a standard way.

Added:
    velocity/sandbox/maven-reorg/tools/trunk/src/site/
    velocity/sandbox/maven-reorg/tools/trunk/src/site/resources/
    velocity/sandbox/maven-reorg/tools/trunk/src/site/resources/images/
      - copied from r961801, velocity/sandbox/maven-reorg/tools/trunk/xdocs/images/
    velocity/sandbox/maven-reorg/tools/trunk/src/site/site.xml   (with props)
    velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/
      - copied from r961801, velocity/sandbox/maven-reorg/tools/trunk/xdocs/
    velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config-xml.xml
      - copied unchanged from r961801, velocity/sandbox/maven-reorg/tools/trunk/xdocs/config.xml.xml
Removed:
    velocity/sandbox/maven-reorg/tools/trunk/src/main/
    velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.xml.xml
    velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/images/
    velocity/sandbox/maven-reorg/tools/trunk/xdocs/
Modified:
    velocity/sandbox/maven-reorg/tools/trunk/pom.xml
    velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.java.xml
    velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.properties.xml
    velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.xml
    velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/dependencies.xml
    velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/index.xml
    velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/project.xml
    velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/upgrading.xml
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/pom.xml

Modified: velocity/sandbox/maven-reorg/tools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/pom.xml?rev=961898&r1=961897&r2=961898&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/pom.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/pom.xml Thu Jul  8 19:35:00 2010
@@ -1,33 +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 xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<artifactId>velocity-master</artifactId>
-		<groupId>org.apache.velocity</groupId>
-		<version>1-SNAPSHOT</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
+<!-- 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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>velocity-master</artifactId>
+        <groupId>org.apache.velocity</groupId>
+        <version>1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.velocity</groupId>
     <artifactId>velocity-tools-parent</artifactId>
@@ -45,112 +36,134 @@
     <inceptionYear>2002</inceptionYear>
 
     <build>
-      <defaultGoal>install</defaultGoal>
-      <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <source>1.5</source>
-              <target>1.5</target>
-            </configuration>
-          </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <configuration>
-            <inputEncoding>UTF-8</inputEncoding>
-            <outputEncoding>UTF-8</outputEncoding>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <includes>
-              <include>**/Test*.java</include>
-              <include>**/*Test.java</include>
-              <include>**/*TestCase.java</include>
-              <include>**/*Tests.java</include>
-            </includes>
-          </configuration>
-        </plugin>
-      </plugins>
+        <defaultGoal>install</defaultGoal>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <inputEncoding>UTF-8</inputEncoding>
+                    <outputEncoding>UTF-8</outputEncoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/Test*.java</include>
+                        <include>**/*Test.java</include>
+                        <include>**/*TestCase.java</include>
+                        <include>**/*Tests.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <distributionManagement>
-      <site>
-        <id>velocity.apache.org</id>
-        <url>scpexe://people.apache.org/www/velocity.apache.org/tools/releases/velocity-tools-2.0/</url>
-      </site>
+        <site>
+            <id>velocity.apache.org</id>
+            <url>scpexe://people.apache.org/www/velocity.apache.org/tools/releases/velocity-tools-2.0/</url>
+        </site>
     </distributionManagement>
 
     <reporting>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-project-info-reports-plugin</artifactId>
-          <reportSets>
-            <reportSet>
-              <reports>
-                <report>dependencies</report>
-                <report>issue-tracking</report>
-                <report>license</report>
-                <report>summary</report>
-                <report>scm</report>
-              </reports>
-            </reportSet>
-          </reportSets>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-changes-plugin</artifactId>
-          <reportSets>
-            <reportSet>
-              <reports>
-                <report>changes-report</report>
-                <report>jira-report</report>
-              </reports>
-            </reportSet>
-          </reportSets>
-          <configuration>
-            <!-- no FixFor yet. -->
-            <filter>sorter/field=issuekey&amp;sorter/order=ASC</filter>
-            <maxEntries>100</maxEntries>
-            <teamlist>http://velocity.apache.org/who-we-are.html</teamlist>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>taglist-maven-plugin</artifactId>
-          <configuration>
-            <tag>TODO</tag>
-            <tag>FIXME</tag>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jxr-plugin</artifactId>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <configuration>
-            <links>
-              <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-              <link>http://jakarta.apache.org/commons/lang/api-release</link>
-              <link>http://jakarta.apache.org/commons/logging/api-release</link>
-              <link>http://jakarta.apache.org/commons/collections/api-release</link>
-              <link>http://logging.apache.org/log4j/docs/api</link>
-              <link>http://velocity.apache.org/engine/releases/velocity-1.5/apidocs</link>
-            </links>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-changelog-plugin</artifactId>
-        </plugin>
-      </plugins>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>dependencies</report>
+                            <report>issue-tracking</report>
+                            <report>license</report>
+                            <report>summary</report>
+                            <report>scm</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-changes-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>changes-report</report>
+                            <report>jira-report</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+                <configuration>
+                    <!-- no FixFor yet. -->
+                    <filter>sorter/field=issuekey&amp;sorter/order=ASC</filter>
+                    <maxEntries>100</maxEntries>
+                    <teamlist>http://velocity.apache.org/who-we-are.html</teamlist>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>taglist-maven-plugin</artifactId>
+                <configuration>
+                    <tag>TODO</tag>
+                    <tag>FIXME</tag>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <excludePackageNames>org.apache.velocity.example</excludePackageNames>
+                    <links>
+                        <link>http://java.sun.com/j2se/1.5.0/docs/api/
+                        </link>
+                        <link>http://jakarta.apache.org/oro/api</link>
+                        <link>http://commons.apache.org/lang/api-release/
+                        </link>
+                        <link>http://commons.apache.org/collections/api-release/
+                        </link>
+                        <link>http://logging.apache.org/log4j/1.2/apidocs/
+                        </link>
+                        <link>http://excalibur.apache.org/apidocs</link>
+                        <link>http://tomcat.apache.org/tomcat-4.1-doc/servletapi/
+                        </link>
+                    </links>
+                </configuration>
+                <reportSets>
+                    <reportSet>
+                        <id>non-aggregate</id>
+                        <reports>
+                            <report>javadoc</report>
+                        </reports>
+                    </reportSet>
+                    <reportSet>
+                        <id>aggregated</id>
+                        <reports>
+                            <report>aggregate</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-changelog-plugin</artifactId>
+            </plugin>
+        </plugins>
     </reporting>
 
     <issueManagement>
@@ -163,171 +176,11 @@
         <tag>HEAD</tag>
         <url>http://svn.apache.org/repos/asf/velocity/tools/trunk</url>
     </scm>
-
-    <!-- <dependencies>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.7.0</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
-            <version>1.8</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-chain</groupId>
-            <artifactId>commons-chain</artifactId>
-            <version>1.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.portlet</groupId>
-                    <artifactId>portlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>myfaces</groupId>
-                    <artifactId>myfaces-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.2</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>avalon-framework</groupId>
-                    <artifactId>avalon-framework</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>logkit</groupId>
-                    <artifactId>logkit</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>commons-validator</groupId>
-            <artifactId>commons-validator</artifactId>
-            <version>1.3.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>1.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>oro</groupId>
-            <artifactId>oro</artifactId>
-            <version>2.0.8</version>
-        </dependency>
-        <dependency>
-            <groupId>sslext</groupId>
-            <artifactId>sslext</artifactId>
-            <version>1.2-0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>struts</groupId>
-                    <artifactId>struts</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts-core</artifactId>
-            <version>1.3.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts-taglib</artifactId>
-            <version>1.3.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts-tiles</artifactId>
-            <version>1.3.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-            <version>1.6.2</version>
-        </dependency>
-        <dependency>
-            <groupId>httpunit</groupId>
-            <artifactId>httpunit</artifactId>
-            <version>1.6.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-embedded</artifactId>
-            <version>6.0.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>nekohtml</groupId>
-            <artifactId>nekohtml</artifactId>
-            <version>0.9.5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>rhino</groupId>
-            <artifactId>js</artifactId>
-            <version>1.6R5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>2.8.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
-            <version>2.6.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.1</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies> -->
     <modules>
-    	<module>velocity-tools-generic</module>
-    	<module>velocity-tools-view</module>
-    	<module>velocity-tools-view-jsp</module>
-    	<module>velocity-tools-struts</module>
+        <module>velocity-tools-generic</module>
+        <module>velocity-tools-view</module>
+        <module>velocity-tools-view-jsp</module>
+        <module>velocity-tools-struts</module>
     </modules>
 
 </project>

Added: velocity/sandbox/maven-reorg/tools/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/src/site/site.xml?rev=961898&view=auto
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/src/site/site.xml (added)
+++ velocity/sandbox/maven-reorg/tools/trunk/src/site/site.xml Thu Jul  8 19:35:00 2010
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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="Apache Velocity Tools">
+    <publishDate position="bottom" format="yyyy-MM-dd HH:mm:ss" />
+    <bannerLeft>
+        <name>Apache Velocity Project</name>
+        <src>/images/velocity_project_wide.png</src>
+        <href>http://velocity.apache.org/</href>
+    </bannerLeft>
+
+    <bannerRight>
+        <name>Apache Velocity</name>
+        <src>/images/velocitytools.png</src>
+    </bannerRight>
+
+    <skin>
+        <groupId>org.apache.velocity.site</groupId>
+        <artifactId>velocity-site-skin</artifactId>
+        <version>1.2.3</version>
+    </skin>
+
+    <body>
+        <breadcrumbs>
+            <item name="Apache" href="http://www.apache.org/" />
+            <item name="Velocity" href="http://velocity.apache.org/" />
+            <item name="Velocity Tools" />
+        </breadcrumbs>
+
+        <links>
+            <item name="Engine" href="http://velocity.apache.org/engine/devel/" />
+            <item name="Tools" href="http://velocity.apache.org/tools/devel/" />
+            <item name="Anakia" href="http://velocity.apache.org/anakia/devel/" />
+            <item name="Texen" href="http://velocity.apache.org/texen/devel/" />
+            <item name="DocBook" href="http://velocity.apache.org/docbook/" />
+            <item name="DVSL" href="http://velocity.apache.org/dvsl/devel/" />
+        </links>
+
+        <menu 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"/>
+        </menu>
+
+        <menu name="Subprojects">
+            <item name="GenericTools"   href="generic.html"/>
+            <item name="VelocityView"   href="view.html"/>
+            <item name="VelocityStruts" href="struts.html"/>
+        </menu>
+
+        <menu name="Docs">
+            <item name="Upgrading to 2.0"          href="upgrading.html"/>
+            <item 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"/>
+            </item>
+            <item name="Standalone Use"            href="standalone.html"/>
+            <item name="Web Framework Integration" href="frameworks.html"/>
+            <item name="Creating Tools"            href="creatingtools.html"/>
+            <item name="Tools Usage Summary" href="summary.html"/>
+            <item name="Glossary"                  href="http://velocity.apache.org/engine/devel/glossary.html"/>
+        </menu>
+
+        <menu name="Development">
+            <item name="ChangeLog"      href="changes.html"/>
+            <item name="Participating"  href="index.html#Helping_Out"/>
+            <item name="Dependencies"   href="dependencies.html"/>
+            <item name="Source Code"    href="index.html#Subversion_Repository"/>
+            <item name="Report Issue"   href="http://issues.apache.org/jira/browse/VELTOOLS"/>
+        </menu>
+
+        <menu ref="modules" />
+        <menu ref="reports" />
+
+    </body>
+</project>

Propchange: velocity/sandbox/maven-reorg/tools/trunk/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: velocity/sandbox/maven-reorg/tools/trunk/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.java.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.java.xml?rev=961898&r1=961801&r2=961898&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.java.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.java.xml Thu Jul  8 19:35:00
2010
@@ -31,12 +31,12 @@
 
     <section name="Configuration using Java">
         <p>
-            As of VelocityTools 2, its no longer merely possible to configure 
+            As of VelocityTools 2, its no longer merely possible to configure
             things purely via Java, it is now much easier to do and can be done
-            in several different ways. 
+            in several different ways.
             Here again, is an example that is equivalent to those demonstrated
             in the <a href="config.properties.html">properties</a> and
-            <a href="config.xml.html">xml</a> configurations:
+            <a href="config-xml.html">xml</a> configurations:
         </p>
 
         <sourcecode>
@@ -60,10 +60,10 @@ config.data("switches", "list.boolean", 
         </sourcecode>
 
         <p>
-            This example uses the 
+            This example uses the
             <a href="javadoc/org/apache/velocity/tools/config/EasyFactoryConfiguration.html">EasyFactoryConfiguration</a>
-            API for brevity, 
-            but you can also directly use the 
+            API for brevity,
+            but you can also directly use the
             <a href="javadoc/org/apache/velocity/tools/config/FactoryConfiguration.html">FactoryConfiguration</a>/
             <a href="javadoc/org/apache/velocity/tools/config/ToolboxConfiguration.html">ToolboxConfiguration</a>/
             <a href="javadoc/org/apache/velocity/tools/config/ToolConfiguration.html">ToolConfiguration</a>/

Modified: velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.properties.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.properties.xml?rev=961898&r1=961801&r2=961898&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.properties.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.properties.xml Thu Jul 
8 19:35:00 2010
@@ -31,9 +31,9 @@
 
     <section name="Configuration using Properties">
         <p>
-            VelocityTools 2 can be configured using a properties file.  
-            Here's the same configuration as the 
-            <a href="config.xml.html">XML</a> and
+            VelocityTools 2 can be configured using a properties file.
+            Here's the same configuration as the
+            <a href="config-xml.html">XML</a> and
             <a href="config.java.html">Java</a> examples
             in the properties format:
         </p>

Modified: velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.xml?rev=961898&r1=961801&r2=961898&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/config.xml Thu Jul  8 19:35:00
2010
@@ -32,57 +32,57 @@
 
     <section name="Configuration Overview">
         <p>
-            The VelocityTools support infrastructure exists to 
-            provide all your templates a common set of tools 
-            and data.  This is inspired by the 
+            The VelocityTools 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 
+            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 VelocityTools 2 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 
+            The default VelocityTools 2 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 VelocityTools 2 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 
+            However, it is likely that you will want to add your own data and
+            tools to your VelocityTools 2 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 
+            There a few basic concepts to the configuration that
+            it is useful to know.  First, what you are creating
+            a configuration for is a
             <a href="javadoc/org/apache/velocity/tools/ToolboxFactory.html">ToolboxFactory</a>.
-            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 VelocityTools 2:  "request", "application", and 
-            "session".  The "session" scope is only relevant within 
-            a <a href="view.html">VelocityView</a> app, but the 
+            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 VelocityTools 2:  "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. Placing a
             tool within "request" scope means that a new instance
             will be created for every context.  Placing a tool
@@ -102,28 +102,28 @@
         </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 
+            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
             <a href="http://commons.apache.org/beanutils/commons-beanutils-1.7.0/docs/api/org/apache/commons/beanutils/Converter.html">converters</a>
-            ) for these values (since 
-            XML and properties formats only allow string inputs).                    
+            ) 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.                        
+            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>
@@ -131,7 +131,7 @@
         </p>
 
         <ul>
-            <li><a href="config.xml.html">XML</a></li>
+            <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>

Modified: velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/dependencies.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/dependencies.xml?rev=961898&r1=961801&r2=961898&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/dependencies.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/dependencies.xml Thu Jul  8 19:35:00
2010
@@ -67,7 +67,7 @@
               <td>Yes</td>
               <td>Yes</td>
               <td>Required for
-                <a href="config.xml.html">xml configuration</a>
+                <a href="config-xml.html">xml configuration</a>
               </td>
             </tr>
             <tr>
@@ -152,7 +152,7 @@
               <td>Yes</td>
               <td>Yes</td>
               <td>Required for
-                <a href="config.xml.html">xml configuration</a>
+                <a href="config-xml.html">xml configuration</a>
               </td>
             </tr>
             <tr>
@@ -261,7 +261,7 @@
               <td>Yes</td>
               <td>Yes</td>
               <td>Required for
-                <a href="config.xml.html">xml configuration</a>
+                <a href="config-xml.html">xml configuration</a>
               </td>
             </tr>
             <tr>

Modified: velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/index.xml?rev=961898&r1=961801&r2=961898&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/index.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/index.xml Thu Jul  8 19:35:00 2010
@@ -137,7 +137,7 @@
                 <a href="config.properties.html">properties file</a>, 
                 <a href="config.java.html">plain java</a>, or really 
                 whatever you want (though perhaps with a bit more work).  No 
-                <a href="config.xml.html">XML</a> required anymore; though,
+                <a href="config-xml.html">XML</a> required anymore; though,
                 if you do use it, it's now a lot better than it was.
             </li>
         </ul>
@@ -156,7 +156,7 @@
             of the new infrastructure without even updating their 
             configuration, though eventually even the old toolbox.xml format 
             may be retired.  Don't cry.  You'll like the 
-            <a href="config.xml.html">new one</a> better once 
+            <a href="config-xml.html">new one</a> better once 
             you get to know it!  It can do much more with much less typing.
         </p>
 

Modified: velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/project.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/project.xml?rev=961898&r1=961801&r2=961898&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/project.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/project.xml Thu Jul  8 19:35:00
2010
@@ -52,7 +52,7 @@
         <group name="Docs">
             <item name="Upgrading to 2.0"          href="upgrading.html"/>
             <subGroup name="Configuration" href="config.html">
-                <item name="Using XML"          href="config.xml.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>

Modified: velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/upgrading.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/upgrading.xml?rev=961898&r1=961801&r2=961898&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/upgrading.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/src/site/xdoc/upgrading.xml Thu Jul  8 19:35:00
2010
@@ -212,7 +212,7 @@
             <p>
             If you do need a configuration, you should update your configuration to
             one of the new formats.  Easiest would be to go from the old xml format
-            to <a href="config.xml.html">the new xml format</a>.
+            to <a href="config-xml.html">the new xml format</a>.
             Remember, you can just leave out standard tools that you don't do any
             configuration of, as your configuration will just be added to the
             default one (again, unless the default behavior is turned off).

Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/pom.xml?rev=961898&r1=961897&r2=961898&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/pom.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/pom.xml Thu Jul  8 19:35:00
2010
@@ -9,7 +9,7 @@
 	<groupId>org.apache.velocity</groupId>
 	<artifactId>velocity-tools-view</artifactId>
 	<version>2.1.0-SNAPSHOT</version>
-	<name>Apache Velocity Tools - View tolls</name>
+	<name>Apache Velocity Tools - View tools</name>
 	<description>Tools to be used in a servlet context.</description>
 	<build>
 		<plugins>



Mime
View raw message