velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r961796 - in /velocity/sandbox/maven-reorg/tools/trunk: ./ src/main/java/org/apache/velocity/tools/view/ src/main/java/org/apache/velocity/tools/view/context/ src/main/java/org/apache/velocity/tools/view/i18n/ src/main/java/org/apache/veloc...
Date Thu, 08 Jul 2010 15:18:18 GMT
Author: apetrelli
Date: Thu Jul  8 15:18:15 2010
New Revision: 961796

URL: http://svn.apache.org/viewvc?rev=961796&view=rev
Log:
VELOCITYSB-5
Fixed dependency on Velocity, that is 1.6 (Thanks Claude!)
Moved code to velocity-tools-view module.
Moved tests to velocity-tools-view and velocity-tools-generic.

Added:
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/test/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/test/whitebox/
      - copied from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/test/java/org/apache/velocity/tools/test/whitebox/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/tools.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/test/java/tools.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/resources/resources2.properties
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/test/java/resources2.properties
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/resources/resources_en.properties
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/test/java/resources_en.properties
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/resources/resources_fr.properties
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/test/java/resources_fr.properties
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/resources/toolbox.test.xml
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/test/conf/toolbox.test.xml
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/resources/tools.properties
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/test/java/tools.properties
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/resources/tools.test.properties
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/test/conf/tools.test.properties
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/resources/tools.test.xml
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/test/conf/tools.test.xml
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/resources/tools.xml
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/test/java/tools.xml
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/resources/whiteboxtest-toolbox.xml
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/test/conf/whiteboxtest-toolbox.xml
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/AbstractSearchTool.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/AbstractSearchTool.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/BrowserTool.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/BrowserTool.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/CookieTool.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/CookieTool.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/DataInfo.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/DataInfo.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportSupport.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ImportSupport.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ImportTool.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ImportTool.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/IncludeTool.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/IncludeTool.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/JeeConfig.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/JeeConfig.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/JeeContextConfig.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/JeeContextConfig.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/JeeFilterConfig.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/JeeFilterConfig.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/JeeServletConfig.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/JeeServletConfig.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/LinkTool.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/LinkTool.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/PagerTool.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/PagerTool.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ServletLogChute.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ServletLogChute.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ServletUtils.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ServletUtils.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ToolInfo.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ToolInfo.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ToolboxManager.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ToolboxManager.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityView.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityView.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewFilter.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewFilter.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewContext.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewContext.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewContextTool.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewContextTool.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolContext.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewToolContext.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolInfo.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewToolInfo.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java.velocity-1.x
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java.velocity-1.x
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java.velocity-2.x
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java.velocity-2.x
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/context/
      - copied from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/context/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/i18n/
      - copied from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/i18n/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/package.html
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/package.html
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/servlet/
      - copied from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/tools/
      - copied from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/tools/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/tools.xml
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/tools.xml
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/velocity.properties
      - copied unchanged from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/velocity.properties
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/test/java/org/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/test/java/org/apache/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/
      - copied from r961747, velocity/sandbox/maven-reorg/tools/trunk/src/test/java/org/apache/velocity/tools/test/
Removed:
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/AbstractSearchTool.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/BrowserTool.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/CookieTool.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/DataInfo.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ImportSupport.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ImportTool.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/IncludeTool.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/JeeConfig.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/JeeContextConfig.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/JeeFilterConfig.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/JeeServletConfig.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/LinkTool.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/PagerTool.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ServletLogChute.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ServletUtils.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ToolInfo.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ToolboxManager.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ToolboxRuleSet.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/UiDependencyTool.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityLayoutServlet.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityView.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewFilter.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityViewServlet.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewContext.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewContextTool.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewToolContext.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewToolInfo.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/WebappResourceLoader.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java.velocity-1.x
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/WebappUberspector.java.velocity-2.x
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/XMLToolboxManager.java
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/context/
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/i18n/
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/package.html
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/tools/
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/tools.xml
    velocity/sandbox/maven-reorg/tools/trunk/src/main/java/org/apache/velocity/tools/view/velocity.properties
    velocity/sandbox/maven-reorg/tools/trunk/src/test/java/org/apache/velocity/tools/test/
    velocity/sandbox/maven-reorg/tools/trunk/src/test/java/resources2.properties
    velocity/sandbox/maven-reorg/tools/trunk/src/test/java/resources_en.properties
    velocity/sandbox/maven-reorg/tools/trunk/src/test/java/resources_fr.properties
    velocity/sandbox/maven-reorg/tools/trunk/src/test/java/tools.java
    velocity/sandbox/maven-reorg/tools/trunk/src/test/java/tools.properties
    velocity/sandbox/maven-reorg/tools/trunk/src/test/java/tools.xml
    velocity/sandbox/maven-reorg/tools/trunk/test/conf/toolbox.test.xml
    velocity/sandbox/maven-reorg/tools/trunk/test/conf/tools.test.properties
    velocity/sandbox/maven-reorg/tools/trunk/test/conf/tools.test.xml
    velocity/sandbox/maven-reorg/tools/trunk/test/conf/whiteboxtest-toolbox.xml
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/whitebox/
Modified:
    velocity/sandbox/maven-reorg/tools/trunk/pom.xml
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/pom.xml
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/test/whitebox/ConfigTests.java
    velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
    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=961796&r1=961795&r2=961796&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/pom.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/pom.xml Thu Jul  8 15:18:15 2010
@@ -164,7 +164,7 @@
         <url>http://svn.apache.org/repos/asf/velocity/tools/trunk</url>
     </scm>
 
-    <dependencies>
+    <!-- <dependencies>
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
@@ -322,7 +322,7 @@
             <scope>test</scope>
         </dependency>
 
-    </dependencies>
+    </dependencies> -->
     <modules>
     	<module>velocity-tools-generic</module>
     	<module>velocity-tools-view</module>

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=961796&r1=961795&r2=961796&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 Thu Jul  8 15:18:15
2010
@@ -13,8 +13,29 @@
   <dependencies>
   	<dependency>
   		<groupId>org.apache.velocity</groupId>
-  		<artifactId>velocity-engine-core</artifactId>
-  		<version>2.0.0-SNAPSHOT</version>
+  		<artifactId>velocity</artifactId>
+  		<version>1.6</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>commons-beanutils</groupId>
+  		<artifactId>commons-beanutils</artifactId>
+  		<version>1.8.3</version>
+  	</dependency>
+  	<dependency>
+  		<groupId>commons-digester</groupId>
+  		<artifactId>commons-digester</artifactId>
+  		<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>
+  		<scope>test</scope>
   	</dependency>
   </dependencies>
 </project>
\ No newline at end of file

Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java?rev=961796&r1=961795&r2=961796&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java
(original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java
Thu Jul  8 15:18:15 2010
@@ -19,14 +19,20 @@ package org.apache.velocity.tools.generi
  * under the License.
  */
 
-import org.junit.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.net.URI;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import org.apache.velocity.runtime.log.Log;
-import org.apache.velocity.tools.generic.ValueParser;
+
+import org.junit.Test;
 
 /**
  * <p>Tests for generic version of LinkTool</p>
@@ -248,7 +254,7 @@ public class LinkToolTests {
         LinkTool link = newInstance();
         assertNull(link.getPort());
         link = newInstance(LinkTool.PORT_KEY, 42);
-        assertEquals(42, link.getPort());
+        assertEquals(new Integer(42), link.getPort());
     }
 
     public @Test void methodPort_Object() throws Exception
@@ -256,15 +262,15 @@ public class LinkToolTests {
         LinkTool link = newInstance();
         assertNull(link.port(null).getPort());
         assertNull(link.port(":asd").getPort());
-        assertEquals(1, link.port(1).getPort());
-        assertEquals(42, link.port("42").getPort());
+        assertEquals(new Integer(1), link.port(1).getPort());
+        assertEquals(new Integer(42), link.port("42").getPort());
     }
 
     public @Test void methodSetPort_Object() throws Exception
     {
         LinkTool link = newInstance();
         link.setPort(42);
-        assertEquals(42, link.getPort());
+        assertEquals(new Integer(42), link.getPort());
     }
 
     public @Test void methodGetPath() throws Exception

Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java?rev=961796&r1=961795&r2=961796&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java
(original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java
Thu Jul  8 15:18:15 2010
@@ -323,40 +323,40 @@ public class LoopToolTests {
     {
         LoopTool loop = new LoopTool();
         Iterator i = loop.watch(ARRAY);
-        assertEquals(0, loop.getCount());
+        assertEquals(new Integer(0), loop.getCount());
         assertNull(loop.getIndex());
         i.next();
-        assertEquals(1, loop.getCount());
-        assertEquals(0, loop.getIndex());
+        assertEquals(new Integer(1), loop.getCount());
+        assertEquals(new Integer(0), loop.getIndex());
         i.next();
-        assertEquals(2, loop.getCount());
-        assertEquals(1, loop.getIndex());
+        assertEquals(new Integer(2), loop.getCount());
+        assertEquals(new Integer(1), loop.getIndex());
         i.next();
-        assertEquals(3, loop.getCount());
-        assertEquals(2, loop.getIndex());
+        assertEquals(new Integer(3), loop.getCount());
+        assertEquals(new Integer(2), loop.getIndex());
         loop.pop();
         // test that skipped iterations are still included
         i = loop.watch(ARRAY);
         loop.skip(2);
-        assertEquals(2, loop.getCount());
-        assertEquals(1, loop.getIndex());
+        assertEquals(new Integer(2), loop.getCount());
+        assertEquals(new Integer(1), loop.getIndex());
     }
 
     public @Test void methodGetCountOrGetIndex_String() throws Exception
     {
         LoopTool loop = new LoopTool();
         Iterator i = loop.watch(ARRAY, "i");
-        assertEquals(0, loop.getCount("i"));
+        assertEquals(new Integer(0), loop.getCount("i"));
         assertNull(loop.getIndex("i"));
         i.next();
-        assertEquals(1, loop.getCount("i"));
-        assertEquals(0, loop.getIndex("i"));
+        assertEquals(new Integer(1), loop.getCount("i"));
+        assertEquals(new Integer(0), loop.getIndex("i"));
         Iterator j = loop.watch(ARRAY, "j");
         loop.skip(2);
-        assertEquals(2, loop.getCount("j"));
-        assertEquals(1, loop.getIndex("j"));
-        assertEquals(1, loop.getCount("i"));
-        assertEquals(0, loop.getIndex("i"));
+        assertEquals(new Integer(2), loop.getCount("j"));
+        assertEquals(new Integer(1), loop.getIndex("j"));
+        assertEquals(new Integer(1), loop.getCount("i"));
+        assertEquals(new Integer(0), loop.getIndex("i"));
         // check short syntax too
         assertEquals(2, loop.get("count_j"));
         assertEquals(1, loop.get("index_j"));

Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/test/whitebox/ConfigTests.java
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/test/whitebox/ConfigTests.java?rev=961796&r1=961747&r2=961796&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/test/whitebox/ConfigTests.java
(original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/test/whitebox/ConfigTests.java
Thu Jul  8 15:18:15 2010
@@ -44,9 +44,9 @@ import org.apache.velocity.tools.generic
  */
 public class ConfigTests {
 
-    private static final String XML_PATH = "@test.conf.dir@/tools.test.xml";
-    private static final String OLD_XML_PATH = "@test.conf.dir@/toolbox.test.xml";
-    private static final String PROPS_PATH = "@test.conf.dir@/tools.test.properties";
+    private static final String XML_PATH = "tools.test.xml";
+    private static final String OLD_XML_PATH = "toolbox.test.xml";
+    private static final String PROPS_PATH = "tools.test.properties";
 
     protected FactoryConfiguration getBaseConfig()
     {

Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java?rev=961796&r1=961747&r2=961796&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
(original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
Thu Jul  8 15:18:15 2010
@@ -19,18 +19,21 @@ package org.apache.velocity.tools.test.w
  * under the License.
  */
 
-import java.util.Locale;
-import java.util.List;
-import java.util.Map;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.List;
+import java.util.Locale;
 
-import org.junit.*;
-import static org.junit.Assert.*;
-
-import org.apache.velocity.tools.generic.Alternator;
-import org.apache.velocity.tools.generic.AlternatorTool;
+import org.apache.velocity.tools.ToolContext;
+import org.apache.velocity.tools.ToolManager;
 import org.apache.velocity.tools.generic.ComparisonDateTool;
 import org.apache.velocity.tools.generic.DateTool;
 import org.apache.velocity.tools.generic.EscapeTool;
@@ -38,8 +41,8 @@ import org.apache.velocity.tools.generic
 import org.apache.velocity.tools.generic.MathTool;
 import org.apache.velocity.tools.generic.NumberTool;
 import org.apache.velocity.tools.generic.ResourceTool;
-import org.apache.velocity.tools.ToolManager;
-import org.apache.velocity.tools.ToolContext;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 /**
  * <p>Generic tools whitebox tests.</p>
@@ -52,7 +55,7 @@ import org.apache.velocity.tools.ToolCon
 
 public class GenericToolsTests {
 
-    private static final String TOOLBOX_PATH = "@test.conf.dir@/whiteboxtest-toolbox.xml";
+    private static final String TOOLBOX_PATH = "whiteboxtest-toolbox.xml";
 
     private static ToolContext toolbox = null;
 
@@ -78,9 +81,9 @@ public class GenericToolsTests {
         assertEquals(disp,dateTool.format(date));
         assertEquals(disp2,dateTool.format("yyyy/MM/dd",date));
         /* test parsing */
-        assertEquals(2007,dateTool.getYear(disp));
-        assertEquals(0,dateTool.getMonth(disp));
-        assertEquals(2,dateTool.getDay(disp));
+        assertEquals(new Integer(2007),dateTool.getYear(disp));
+        assertEquals(new Integer(0),dateTool.getMonth(disp));
+        assertEquals(new Integer(2),dateTool.getDay(disp));
     }
 
     public @Test void testEscapeTool() {
@@ -147,24 +150,24 @@ public class GenericToolsTests {
         assertNotNull(mathTool);
         assertEquals(1,mathTool.abs(-1));
         assertEquals(2,mathTool.add(1,1));
-        assertEquals(3,mathTool.ceil(2.5));
+        assertEquals(new Integer(3),mathTool.ceil(2.5));
         assertEquals(4,mathTool.div(8,2));
-        assertEquals(5,mathTool.floor(5.1));
+        assertEquals(new Integer(5),mathTool.floor(5.1));
         assertEquals(6,mathTool.getAverage(new long[] {5,6,7}));
         /* getTotal() watches the type of its first argument, so assertEquals needs a long
*/
         assertEquals((long)7,mathTool.getTotal(new long[] {2,2,3}));
-        assertEquals(8,mathTool.idiv(130,16));
+        assertEquals(new Integer(8),mathTool.idiv(130,16));
         assertEquals(9,mathTool.max(9,-10));
         assertEquals(10,mathTool.min(10,20));
-        assertEquals(11,mathTool.mod(37,13));
+        assertEquals(new Integer(11),mathTool.mod(37,13));
         assertEquals(12,mathTool.mul(3,4));
-        assertEquals(13,mathTool.round(12.8));
-        assertEquals(14.2,mathTool.roundTo(1,14.18));
-        assertEquals(-5.0,mathTool.roundTo(2,-4.999));
+        assertEquals(new Integer(13),mathTool.round(12.8));
+        assertEquals(new Double(14.2),mathTool.roundTo(1,14.18));
+        assertEquals(new Double(-5.0),mathTool.roundTo(2,-4.999));
         assertEquals(15,mathTool.sub(30,15));
         assertEquals(16,mathTool.pow(4,2));
-        assertEquals(17,mathTool.toInteger("17"));
-        assertEquals(18.1,mathTool.toDouble("18.1"));
+        assertEquals(new Integer(17),mathTool.toInteger("17"));
+        assertEquals(new Double(18.1),mathTool.toDouble("18.1"));
     }
 
     public @Test void testNumberTool() {

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=961796&r1=961795&r2=961796&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 15:18:15
2010
@@ -1,13 +1,65 @@
-<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/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>velocity-tools-parent</artifactId>
-    <groupId>org.apache.velocity</groupId>
-    <version>2.1.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apache.velocity</groupId>
-  <artifactId>velocity-tools-view</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
-  <name>Apache Velocity Tools - View tolls</name>
-  <description>Tools to be used in a servlet context.</description>
-</project>
\ No newline at end of file
+<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/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>velocity-tools-parent</artifactId>
+		<groupId>org.apache.velocity</groupId>
+		<version>2.1.0-SNAPSHOT</version>
+	</parent>
+	<groupId>org.apache.velocity</groupId>
+	<artifactId>velocity-tools-view</artifactId>
+	<version>2.1.0-SNAPSHOT</version>
+	<name>Apache Velocity Tools - View tolls</name>
+	<description>Tools to be used in a servlet context.</description>
+	<build>
+		<plugins>
+			<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>
+					<excludes>
+						<!-- To be moved into a separate project -->
+						<exclude>**/ViewToolsTests.java</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.velocity</groupId>
+			<artifactId>velocity-tools-generic</artifactId>
+			<version>2.1.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.3</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty</artifactId>
+			<version>6.0.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.8.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>httpunit</groupId>
+			<artifactId>httpunit</artifactId>
+			<version>1.6</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>



Mime
View raw message