WICKET-4391 backported from Wicket 6 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/de53fd01 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/de53fd01 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/de53fd01
Branch: refs/heads/wicket-1.5.x Commit: de53fd01408333e2d2df8496adfb18c24ed6ce0e Parents: d6b64de Author: svenmeier <[email protected]> Authored: Tue Feb 7 13:10:58 2012 +0100 Committer: svenmeier <[email protected]> Committed: Tue Feb 7 13:10:58 2012 +0100 ---------------------------------------------------------------------- .../XsltOutputTransformerContainer.java | 12 +-------- .../protocol/http/mock/MockHttpServletRequest.java | 16 ++++++++++++- .../wicket/markup/outputTransformer/Page_1.java | 17 ++++++-------- 3 files changed, 23 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/de53fd01/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java b/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java index d09c100..4d1724b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java @@ -19,7 +19,6 @@ package org.apache.wicket.markup.transformer; import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; import org.apache.wicket.markup.MarkupResourceStream; -import org.apache.wicket.markup.MarkupType; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -29,9 +28,8 @@ import org.apache.wicket.model.Model; * with an associated markup and must have a filename equal to the component's id. * <p> * The containers tag will be the root element of the xml data applied for transformation to ensure - * the xml data are well formed (single root element). In addition the attribute - * <code>xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd</code> is added - * to the root element to allow the XSL processor to handle the wicket namespace. + * the xml data are well formed (single root element). In addition the attribute <code>xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.3-strict.dtd</code> + * is added to the root element to allow the XSL processor to handle the wicket namespace. * <p> * Similar to this container, a <code>IBehavior</code> is available which does the same, but does * not require an additional Container. @@ -105,12 +103,6 @@ public class XsltOutputTransformerContainer extends AbstractOutputTransformerCon } @Override - public MarkupType getMarkupType() - { - return new MarkupType("xsl", null); - } - - @Override public CharSequence transform(final Component component, final CharSequence output) throws Exception { http://git-wip-us.apache.org/repos/asf/wicket/blob/de53fd01/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java index ad847ea..77e3ff9 100755 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockHttpServletRequest.java @@ -57,6 +57,7 @@ import org.apache.wicket.request.UrlEncoder; import org.apache.wicket.util.file.File; import org.apache.wicket.util.io.IOUtils; import org.apache.wicket.util.string.StringValue; +import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.upload.FileUploadBase; import org.apache.wicket.util.value.ValueMap; import org.slf4j.Logger; @@ -1691,8 +1692,19 @@ public class MockHttpServletRequest implements HttpServletRequest */ public Url getUrl() { - String urlString = getRequestURI() + '?' + getQueryString(); - Url url = Url.parse(urlString, getCharset()); + final String urlString; + final String queryString = getQueryString(); + + if (Strings.isEmpty(queryString)) + { + urlString = getRequestURI(); + } + else + { + urlString = getRequestURI() + '?' + queryString; + } + + final Url url = Url.parse(urlString, getCharset()); url.setProtocol(scheme); url.setHost(serverName); url.setPort(serverPort); http://git-wip-us.apache.org/repos/asf/wicket/blob/de53fd01/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java index 6921520..057e16f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/Page_1.java @@ -67,6 +67,13 @@ public class Page_1 extends WebPage panel.setRenderBodyOnly(true); panelContainer.add(panel); + MarkupContainer xsltContainer = new XsltOutputTransformerContainer("test4"); + add(xsltContainer); + Border border2 = new SimpleBorder("myBorder2"); + border2.setRenderBodyOnly(false); + border2.add(new AttributeModifier("testAttr", "myValue")); + xsltContainer.add(border2); + MarkupContainer borderContainer = new AbstractOutputTransformerContainer("test3") { private static final long serialVersionUID = 1L; @@ -78,23 +85,13 @@ public class Page_1 extends WebPage return output.toString().toUpperCase(); } }; - add(borderContainer); Border border = new SimpleBorder("myBorder"); borderContainer.add(border); - MarkupContainer xsltContainer = new XsltOutputTransformerContainer("test4"); - add(xsltContainer); - - Border border2 = new SimpleBorder("myBorder2"); - border2.setRenderBodyOnly(false); - border2.add(new AttributeModifier("testAttr", "myValue")); - xsltContainer.add(border2); - MarkupContainer xsltContainer2 = new XsltOutputTransformerContainer("test5", null, "org/apache/wicket/markup/outputTransformer/anyName.xsl"); add(xsltContainer2); - Border border3 = new SimpleBorder("myBorder3"); border3.setRenderBodyOnly(false); border3.add(new AttributeModifier("testAttr", "myValue"));
