Modified: velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/LinkToolTests.java URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/LinkToolTests.java?rev=1700798&r1=1700797&r2=1700798&view=diff ============================================================================== --- velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/LinkToolTests.java (original) +++ velocity/tools/trunk/velocity-tools-view/src/test/java/org/apache/velocity/tools/test/blackbox/LinkToolTests.java Wed Sep 2 12:57:21 2015 @@ -23,7 +23,9 @@ import java.lang.reflect.Proxy; import java.lang.reflect.InvocationHandler; import java.util.HashMap; import java.util.Map; -import org.apache.velocity.tools.view.tools.LinkTool; +import org.apache.velocity.tools.generic.ValueParser; +import org.apache.velocity.tools.view.LinkTool; +import org.apache.velocity.tools.view.ViewContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -38,6 +40,12 @@ import org.junit.Test; */ public class LinkToolTests { + + static class ConfigValues extends ValueParser + { + ConfigValues() { setReadOnly(false); } + } + private LinkTool newLinkTool(InvocationHandler handler) { Object proxy @@ -50,8 +58,10 @@ public class LinkToolTests HttpServletResponse response = (HttpServletResponse)proxy; LinkTool link = new LinkTool(); - link.setRequest(request); - link.setResponse(response); + ValueParser properties = new ConfigValues(); + properties.put(ViewContext.REQUEST, request); + properties.put(ViewContext.RESPONSE, response); + link.configure(properties); return link; } @@ -72,10 +82,10 @@ public class LinkToolTests LinkTool link = newLinkTool("a", "b"); Assert.assertEquals("/test", link.getContextPath()); - String url = link.setRelative("/target") - .addQueryData("foo", "bar") - .addQueryData("bar", "baz") - .addAllParameters() + String url = ((LinkTool)(link.relative("/target") + .append("foo", "bar") + .append("bar", "baz"))) + .addRequestParams() .toString(); Assert.assertEquals("/test/target?foo=bar&bar=baz&a=b", url); @@ -85,10 +95,10 @@ public class LinkToolTests { LinkTool link = newLinkTool("a", new String[] { "a", "b", "c" }); - String url = link.setRelative("/target") - .addQueryData("foo", "bar") - .addQueryData("bar", "baz") - .addAllParameters() + String url = ((LinkTool)(link.relative("/target") + .append("foo", "bar") + .append("bar", "baz"))) + .addRequestParams() .toString(); Assert.assertEquals("/test/target?foo=bar&bar=baz&a=a&a=b&a=c", url); @@ -101,11 +111,10 @@ public class LinkToolTests params.put("b", "c"); LinkTool link = newLinkTool(params); - String url = link.setRelative("/target") - .addQueryData("foo", "bar") - .addQueryData("bar", "baz") - .addIgnore("b") - .addAllParameters() + String url = ((LinkTool)(link.relative("/target") + .append("foo", "bar") + .append("bar", "baz"))) + .addRequestParamsExcept("b") .toString(); Assert.assertEquals("/test/target?foo=bar&bar=baz&a=b", url); @@ -115,10 +124,10 @@ public class LinkToolTests { LinkTool link = newLinkTool("a", "b"); - String url = link.setRelative("/target") - .addAllParameters() - .addQueryData("foo", "bar") - .addQueryData("bar", "baz") + String url = ((LinkTool)(link.relative("/target"))) + .addRequestParams() + .append("foo", "bar") + .append("bar", "baz") .toString(); Assert.assertEquals("/test/target?a=b&foo=bar&bar=baz", url); @@ -127,11 +136,10 @@ public class LinkToolTests public @Test void testAddAdditionalValue() { LinkTool link = newLinkTool("a", "b"); - link.setAutoIgnoreParameters(false); - String url = link.setRelative("/target") - .addQueryData("a", "c") - .addAllParameters() + String url = ((LinkTool)(link.relative("/target") + .append("a", "c"))) + .addRequestParams() .toString(); Assert.assertEquals("/test/target?a=c&a=b", url); @@ -140,11 +148,10 @@ public class LinkToolTests public @Test void testAddAdditionalValueAfter() { LinkTool link = newLinkTool("a", "b"); - link.setAutoIgnoreParameters(false); - String url = link.setRelative("/target") - .addAllParameters() - .addQueryData("a", "c") + String url = ((LinkTool)(link.relative("/target"))) + .addRequestParams() + .append("a", "c") .toString(); Assert.assertEquals("/test/target?a=b&a=c", url); @@ -154,8 +161,8 @@ public class LinkToolTests { LinkTool link = newLinkTool("a", "b"); - String url = link.setRelative("/target") - .addQueryData("a", "c") + String url = link.relative("/target") + .append("a", "c") .toString(); Assert.assertEquals("/test/target?a=c", url); @@ -165,9 +172,9 @@ public class LinkToolTests { LinkTool link = newLinkTool("a", new String[] { "a", "b", "c" }); - String url = link.setRelative("/target") - .addQueryData("a", "d") - .addAllParameters() + String url = ((LinkTool)(link.relative("/target") + .append("a", "d"))) + .addMissingRequestParams("a") .toString(); Assert.assertEquals("/test/target?a=d", url); @@ -177,9 +184,9 @@ public class LinkToolTests { LinkTool link = newLinkTool("a", new String[] { "a", "b", "c" }); - String url = link.setRelative("/target") - .addAllParameters() - .addQueryData("a", "d") + String url = ((LinkTool)(link.relative("/target"))) + .addRequestParams() + .append("a", "d") .toString(); Assert.assertEquals("/test/target?a=a&a=b&a=c&a=d", url); @@ -189,13 +196,13 @@ public class LinkToolTests { LinkTool link = newLinkTool("a", new String[] { "a", "b", "c" }); - LinkTool forward = link.setRelative("/foo") - .addQueryData("bar", "baz"); + LinkTool forward = (LinkTool)link.relative("/foo") + .append("bar", "baz"); Assert.assertEquals("/test/foo?bar=baz&a=a&a=b&a=c", - forward.addAllParameters().toString()); + forward.addRequestParams().toString()); Assert.assertEquals("/test/foo?bar=baz&a=a&a=b&a=c", - forward.addAllParameters().toString()); + forward.addRequestParams().toString()); } }
Modified: velocity/tools/trunk/velocity-tools-xml/pom.xml URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-xml/pom.xml?rev=1700798&r1=1700797&r2=1700798&view=diff ============================================================================== --- velocity/tools/trunk/velocity-tools-xml/pom.xml (original) +++ velocity/tools/trunk/velocity-tools-xml/pom.xml Wed Sep 2 12:57:21 2015 @@ -3,18 +3,18 @@ <parent> <artifactId>velocity-tools-parent</artifactId> <groupId>org.apache.velocity</groupId> - <version>2.1.0-SNAPSHOT</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.apache.velocity</groupId> <artifactId>velocity-tools-xml</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>3.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> + <version>3.0-SNAPSHOT</version> </dependency> <dependency> <groupId>dom4j</groupId> @@ -28,4 +28,4 @@ <scope>test</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: velocity/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java URL: http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java?rev=1700798&r1=1700797&r2=1700798&view=diff ============================================================================== --- velocity/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java (original) +++ velocity/tools/trunk/velocity-tools-xml/src/main/java/org/apache/velocity/tools/generic/XmlTool.java Wed Sep 2 12:57:21 2015 @@ -27,6 +27,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; + import org.dom4j.Attribute; import org.dom4j.Node; import org.dom4j.Element; @@ -34,7 +35,8 @@ import org.dom4j.Document; import org.dom4j.DocumentHelper; import org.dom4j.io.XMLWriter; import org.dom4j.io.SAXReader; -import org.apache.velocity.runtime.log.Log; +import org.slf4j.Logger; + import org.apache.velocity.tools.ConversionUtils; import org.apache.velocity.tools.ToolContext; import org.apache.velocity.tools.config.DefaultKey; @@ -78,7 +80,7 @@ public class XmlTool extends SafeConfig { public static final String FILE_KEY = "file"; - protected Log LOG; + protected Logger LOG; private List<Node> nodes; @@ -103,7 +105,7 @@ public class XmlTool extends SafeConfig */ protected void configure(ValueParser parser) { - this.LOG = (Log)parser.getValue(ToolContext.LOG_KEY); + this.LOG = (Logger)parser.getValue(ToolContext.LOG_KEY); String file = parser.getString(FILE_KEY); if (file != null)
