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 13:03:50 UTC
svn commit: r962808 - in /velocity/sandbox/maven-reorg/tools/trunk:
examples/showcase/ examples/showcase/WEB-INF/ examples/showcase/layout/
velocity-tools-examples/velocity-tools-examples-showcase/
velocity-tools-examples/velocity-tools-examples-showca...
Author: apetrelli
Date: Sat Jul 10 11:03:47 2010
New Revision: 962808
URL: http://svn.apache.org/viewvc?rev=962808&view=rev
Log:
VELOCITYSB-5
Moved ViewToolsTest as IT test of velocity-tools-examples-showcase.
Added:
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/java/LayoutLinkTool.java
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/WEB-INF/src/LayoutLinkTool.java
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/java/MySearchTool.java
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/WEB-INF/src/MySearchTool.java
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/resources/file.xml
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/WEB-INF/src/file.xml
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/resources/otherStuff.properties
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/WEB-INF/src/otherStuff.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/resources/resources.properties
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/WEB-INF/src/resources.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/resources/resources_de.properties
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/WEB-INF/src/resources_de.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/resources/resources_fr.properties
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/WEB-INF/src/resources_fr.properties
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/Error.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/Error.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/VM_global_library.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/VM_global_library.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/
- copied from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/WEB-INF/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/alternator.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/alternator.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/browser.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/browser.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/class.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/class.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/context.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/context.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/convert.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/convert.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/cookies.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/cookies.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/date.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/date.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/demo.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/demo.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/display.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/display.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/esc.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/esc.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/field.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/field.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/footer.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/footer.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/fullDemo.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/fullDemo.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/header.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/header.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/import.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/import.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/include.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/include.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/index.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/index.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/layout/
- copied from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/layout/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/layoutmenu.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/layoutmenu.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/link.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/link.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/lists.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/lists.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/loop.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/loop.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/math.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/math.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/mill.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/mill.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/number.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/number.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/pager.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/pager.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/params.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/params.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/render.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/render.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/search.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/search.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/sorter.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/sorter.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/template.txt
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/template.txt
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/text.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/text.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/toolmenu.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/toolmenu.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/xml.vm
- copied unchanged from r962474, velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/xml.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java
- copied, changed from r962474, velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/ViewToolsTests.java
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/META-INF/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/META-INF/MANIFEST.MF
Removed:
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/Error.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/VM_global_library.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/WEB-INF/
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/alternator.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/browser.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/class.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/context.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/convert.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/cookies.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/date.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/demo.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/display.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/esc.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/field.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/footer.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/fullDemo.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/header.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/import.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/include.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/index.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/layout/
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/layoutmenu.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/link.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/lists.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/loop.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/math.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/mill.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/number.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/pager.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/params.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/render.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/search.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/sorter.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/template.txt
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/text.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/toolmenu.vm
velocity/sandbox/maven-reorg/tools/trunk/examples/showcase/xml.vm
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/src/
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/JettyLogger.java
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/ViewToolsTests.java
Modified:
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml
velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/pom.xml
Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml?rev=962808&r1=962807&r2=962808&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml Sat Jul 10 11:03:47 2010
@@ -1,14 +1,88 @@
-<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-examples</artifactId>
+<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-examples</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <version>2.1.0-SNAPSHOT</version>
+ </parent>
<groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-examples-showcase</artifactId>
<version>2.1.0-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools-examples-showcase</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- <packaging>war</packaging>
- <name>Apache Velocity Tools Examples - Showcase</name>
- <description>Showcase of features in Velocity Tools.</description>
+ <packaging>war</packaging>
+ <name>Apache Velocity Tools Examples - Showcase</name>
+ <description>Showcase of features in Velocity Tools.</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <wait>false</wait>
+ </configuration>
+ <id>start-server</id>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ </execution>
+ <execution>
+ <id>stop-server</id>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ <phase>post-integration-test</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <finalName>velocity-tools-examples-showcase</finalName>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-view</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</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>
\ No newline at end of file
Modified: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml?rev=962808&r1=962474&r2=962808&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/main/webapp/WEB-INF/web.xml Sat Jul 10 11:03:47 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
Copied: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java (from r962474, velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/ViewToolsTests.java)
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java?p2=velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java&p1=velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/ViewToolsTests.java&r1=962474&r2=962808&rev=962808&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/ViewToolsTests.java (original)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-examples/velocity-tools-examples-showcase/src/test/java/org/apache/velocity/examples/showcase/ViewToolsIT.java Sat Jul 10 11:03:47 2010
@@ -1,4 +1,4 @@
-package org.apache.velocity.tools.test.blackbox;
+package org.apache.velocity.examples.showcase;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,22 +19,25 @@ package org.apache.velocity.tools.test.b
* under the License.
*/
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import java.io.PrintWriter;
-import java.io.IOException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-import org.junit.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
-import static org.junit.Assert.*;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import com.meterware.httpunit.GetMethodWebRequest;
import com.meterware.httpunit.HTMLElement;
-import com.meterware.httpunit.WebResponse;
import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.GetMethodWebRequest;
import com.meterware.httpunit.WebForm;
-import com.meterware.httpunit.HttpUnitOptions;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
/**
@@ -46,9 +49,9 @@ import com.meterware.httpunit.HttpUnitOp
*/
-public class ViewToolsTests {
+public class ViewToolsIT {
- private static final String ROOT_URL = "http://localhost:@test.webcontainer.port@/";
+ private static final String ROOT_URL = "http://localhost:8080/velocity-tools-examples-showcase/";
public static @BeforeClass void initViewToolsTests() throws Exception {
}
@@ -217,22 +220,22 @@ public class ViewToolsTests {
/* check path(bar) and path */
resp = submitWithParam(resp,"path","path","bar");
- checkText(resp,"path","http://localhost:8081/bar");
- checkText(resp,"altpath","/link.vm");
+ checkText(resp,"path","http://localhost:8080/bar");
+ checkText(resp,"altpath","/velocity-tools-examples-showcase/link.vm");
/* check relative(foo) */
resp = submitWithParam(resp,"relative","relative","foo");
- checkText(resp,"relative","/foo");
+ checkText(resp,"relative","/velocity-tools-examples-showcase/foo");
/* check absolute(bar) */
resp = submitWithParam(resp,"absolute","absolute","bar");
checkText(resp,"absolute",ROOT_URL + "bar");
/* check contextURL */
- checkText(resp,"contextURL",ROOT_URL);
+ checkText(resp,"contextURL",ROOT_URL.substring(0, ROOT_URL.length() - 1));
/* check contextPath */
- checkText(resp,"contextPath","");
+ checkText(resp,"contextPath","/velocity-tools-examples-showcase");
/* check requestPath */
checkText(resp,"requestPath","/link.vm");
Added: velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/META-INF/MANIFEST.MF?rev=962808&view=auto
==============================================================================
--- velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/META-INF/MANIFEST.MF (added)
+++ velocity/sandbox/maven-reorg/tools/trunk/velocity-tools-generic/src/main/java/META-INF/MANIFEST.MF Sat Jul 10 11:03:47 2010
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
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=962808&r1=962807&r2=962808&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 Sat Jul 10 11:03:47 2010
@@ -23,10 +23,6 @@
<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>
@@ -44,22 +40,10 @@
<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>