You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by ap...@apache.org on 2010/07/10 20:10:40 UTC
svn commit: r962899 - in /velocity/sandbox/maven-reorg/tools/trunk:
velocity-tools-generic/
velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/
velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/
velocity-tools-ge...
Author: apetrelli
Date: Sat Jul 10 18:10:39 2010
New Revision: 962899
URL: http://svn.apache.org/viewvc?rev=962899&view=rev
Log:
VELOCITYSB-5
Moved and adapted code in velocity-tools-xml module.
Added:
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/java/org/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/java/org/apache/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
- copied unchanged from r962811, velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/resources/org/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/resources/org/apache/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/resources/org/apache/velocity/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/resources/org/apache/velocity/tools/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/resources/org/apache/velocity/tools/xml/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/resources/org/apache/velocity/tools/xml/tools.xml (with props)
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/test/java/org/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/test/java/org/apache/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/test/java/org/apache/velocity/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/test/java/org/apache/velocity/tools/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/test/java/org/apache/velocity/tools/generic/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/test/java/org/apache/velocity/tools/generic/XmlToolTests.java
- copied unchanged from r962811, velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/XmlToolTests.java
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/test/resources/file.xml
- copied unchanged from r962811, velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/resources/file.xml
Removed:
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/XmlTool.java
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/XmlToolTests.java
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/resources/file.xml
Modified:
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/pom.xml
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/tools.xml
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/pom.xml
Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/pom.xml?rev=962899&r1=962898&r2=962899&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/pom.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/pom.xml Sat Jul 10 18:10:39 2010
@@ -27,11 +27,6 @@
<version>1.8.1</version>
</dependency>
<dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java?rev=962899&r1=962898&r2=962899&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/config/ConfigurationUtils.java Sat Jul 10 18:10:39 2010
@@ -42,6 +42,8 @@ public class ConfigurationUtils
{
public static final String GENERIC_DEFAULTS_PATH =
"/org/apache/velocity/tools/generic/tools.xml";
+ public static final String XML_DEFAULTS_PATH =
+ "/org/apache/velocity/tools/xml/tools.xml";
public static final String VIEW_DEFAULTS_PATH =
"/org/apache/velocity/tools/view/tools.xml";
public static final String STRUTS_DEFAULTS_PATH =
@@ -78,7 +80,8 @@ public class ConfigurationUtils
new XmlFactoryConfiguration("ConfigurationUtils.getDefaultTools()");
config.read(GENERIC_DEFAULTS_PATH);
- // view tools and struts tools may not be available
+ // xml tools, view tools and struts tools may not be available
+ config.read(XML_DEFAULTS_PATH, false);
config.read(VIEW_DEFAULTS_PATH, false);
config.read(STRUTS_DEFAULTS_PATH, false);
@@ -141,7 +144,7 @@ public class ConfigurationUtils
}
/**
- * Returns a {@link FactoryConfiguration} including all
+ * Returns a {@link FactoryConfiguration} including all
* {@link #getDefaultTools()} as well as any tools that can be
* automatically loaded from "tools.xml" or "tools.properties" found
* at the root of the classpath or in the current directory.
Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/tools.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/tools.xml?rev=962899&r1=962898&r2=962899&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/tools.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/tools.xml Sat Jul 10 18:10:39 2010
@@ -16,10 +16,10 @@
"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.
+ under the License.
-->
-<tools>
+<tools>
<data type="number" key="TOOLS_VERSION" value="2.0"/>
<data type="boolean" key="GENERIC_TOOLS_AVAILABLE" value="true"/>
<toolbox scope="application">
@@ -34,14 +34,13 @@
<tool class="org.apache.velocity.tools.generic.NumberTool"/>
<tool class="org.apache.velocity.tools.generic.ResourceTool"/>
<tool class="org.apache.velocity.tools.generic.SortTool"/>
- <tool class="org.apache.velocity.tools.generic.XmlTool"/>
</toolbox>
<toolbox scope="request">
<tool class="org.apache.velocity.tools.generic.ContextTool"/>
<tool class="org.apache.velocity.tools.generic.LinkTool"/>
<tool class="org.apache.velocity.tools.generic.LoopTool"/>
<tool class="org.apache.velocity.tools.generic.RenderTool"/>
- <!--
+ <!--
This is not useful in its default form.
But, if it were, it'd be request-scoped.
<tool class="org.apache.velocity.tools.generic.ValueParser"/>
Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/pom.xml?rev=962899&r1=962898&r2=962899&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/pom.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/pom.xml Sat Jul 10 18:10:39 2010
@@ -10,4 +10,22 @@
<version>2.1.0-SNAPSHOT</version>
<name>Apache Velocity Tools - XML tools</name>
<description>Tools for XML manipulation in Velocity templates.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-generic</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
Added: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/resources/org/apache/velocity/tools/xml/tools.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/resources/org/apache/velocity/tools/xml/tools.xml?rev=962899&view=auto
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/resources/org/apache/velocity/tools/xml/tools.xml (added)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/resources/org/apache/velocity/tools/xml/tools.xml Sat Jul 10 18:10:39 2010
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+ 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.
+-->
+
+<tools>
+ <data type="number" key="TOOLS_VERSION" value="2.0"/>
+ <data type="boolean" key="GENERIC_TOOLS_AVAILABLE" value="true"/>
+ <toolbox scope="application">
+ <tool class="org.apache.velocity.tools.generic.XmlTool"/>
+ </toolbox>
+</tools>
Propchange: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/resources/org/apache/velocity/tools/xml/tools.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-xml/src/main/resources/org/apache/velocity/tools/xml/tools.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL