Revision: b51bfdca269e
Branch: default
Author: lucio.benfante <
lucio.b...@gmail.com>
Date: Fri Sep 21 05:29:45 2012
Log: Fixed URL generation.
http://code.google.com/p/parancoe/source/detail?r=b51bfdca269e
Modified:
/parancoe-web/src/main/java/org/parancoe/web/tag/MarkPositionTag.java
/parancoe-web/src/main/java/org/parancoe/web/test/TagTest.java
=======================================
--- /parancoe-web/src/main/java/org/parancoe/web/tag/MarkPositionTag.java
Fri Sep 21 05:11:03 2012
+++ /parancoe-web/src/main/java/org/parancoe/web/tag/MarkPositionTag.java
Fri Sep 21 05:29:45 2012
@@ -76,7 +76,7 @@
url = uri;
}
if (!StringUtils.isBlank(queryString)) {
- url = uri + "?" + queryString;
+ url = url + "?" + queryString;
}
if (useFullUri) {
String port = "";
=======================================
--- /parancoe-web/src/main/java/org/parancoe/web/test/TagTest.java Thu Sep
20 10:12:43 2012
+++ /parancoe-web/src/main/java/org/parancoe/web/test/TagTest.java Fri Sep
21 05:29:45 2012
@@ -78,8 +78,8 @@
req.setSession(httpSession);
req.setMethod("GET");
req.setContextPath("/testctx");
- req.setRequestURI("/test/request/uri");
-
req.setAttribute(WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE, "/test/forward/request/uri");
+ req.setRequestURI("/testctx/test/request/uri");
+
req.setAttribute(WebUtils.FORWARD_REQUEST_URI_ATTRIBUTE, "/testctx/test/forward/request/uri");
req.setQueryString("p1=v1&p2=v2&p3=v3");
res = new MockHttpServletResponse();
pc = new MockPageContext(((WebApplicationContext)
this.getApplicationContext()).