struts git commit: WW-4711 Disables searching stack by default

[lukaszlenart]

Repository: struts
Updated Branches:
  refs/heads/master a5817fecb -> a5092a24f


WW-4711 Disables searching stack by default


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a5092a24
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a5092a24
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a5092a24

Branch: refs/heads/master
Commit: a5092a24f20d541f4401e66bc1dca79fa86ce020
Parents: a5817fe
Author: Lukasz Lenart 
Authored: Sat Nov 12 09:41:05 2016 +0100
Committer: Lukasz Lenart 
Committed: Sat Nov 12 09:41:05 2016 +0100

--
 core/src/main/java/org/apache/struts2/util/TextProviderHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/a5092a24/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
--
diff --git a/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java 
b/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
index c6e9679..e66268d 100644
--- a/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
+++ b/core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
@@ -49,7 +49,7 @@ public class TextProviderHelper {
  * @return the message if found, otherwise the defaultMessage
  */
 public static String getText(String key, String defaultMessage, 
List args, ValueStack stack) {
-return getText(key, defaultMessage, args, stack, true);
+return getText(key, defaultMessage, args, stack, false);
 }
 
 /**

[2/2] struts git commit: Fixes typos

[lukaszlenart]

Fixes typos


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e1e2ea84
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e1e2ea84
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e1e2ea84

Branch: refs/heads/master
Commit: e1e2ea84a70cf9e56ceb1c8b95fcc3c442c836f8
Parents: 986b43f
Author: Lukasz Lenart 
Authored: Sat Nov 12 17:39:58 2016 +0100
Committer: Lukasz Lenart 
Committed: Sat Nov 12 17:39:58 2016 +0100

--
 .../java/org/apache/struts2/views/jsp/URLTagTest.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/e1e2ea84/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
--
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java 
b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
index 37d4979..339377d 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
@@ -688,7 +688,7 @@ public class URLTagTest extends AbstractUITagTest {
 
 ParamTag param1 = new ParamTag();
 param1.setPageContext(pageContext);
-param1.setName("paraWithSetValue");
+param1.setName("paramWithSetValue");
 param1.setValue("");
 param1.setSuppressEmptyParameters(false);
 param1.doStartTag();
@@ -696,7 +696,7 @@ public class URLTagTest extends AbstractUITagTest {
 
 ParamTag param2 = new ParamTag();
 param2.setPageContext(pageContext);
-param2.setName("paraWithSetBody");
+param2.setName("paramWithSetBody");
 param2.setBodyContent(new MockBodyContent() {
 @Override
 public String getString() {
@@ -709,7 +709,7 @@ public class URLTagTest extends AbstractUITagTest {
 
 ParamTag param3 = new ParamTag();
 param3.setPageContext(pageContext);
-param3.setName("paraWithSetValueSurpressed");
+param3.setName("paramWithSetValueSuppressed");
 param3.setValue("");
 param3.setSuppressEmptyParameters(true);
 param3.doStartTag();
@@ -717,7 +717,7 @@ public class URLTagTest extends AbstractUITagTest {
 
 ParamTag param4 = new ParamTag();
 param4.setPageContext(pageContext);
-param4.setName("paraWithSetBodySurpressed");
+param4.setName("paramWithSetBodySuppressed");
 param4.setBodyContent(new MockBodyContent() {
 @Override
 public String getString() {
@@ -730,7 +730,7 @@ public class URLTagTest extends AbstractUITagTest {
 
 tag.doEndTag();
 
-assertEquals("/company.action?paraWithSetValue=¶WithSetBody=", 
writer.toString());
+assertEquals("/company.action?paramWithSetValue=¶mWithSetBody=", 
writer.toString());
 }
 
 protected void setUp() throws Exception {

[1/2] struts git commit: WW-4701 Drop parameter if not defined

[lukaszlenart]

Repository: struts
Updated Branches:
  refs/heads/master a5092a24f -> e1e2ea84a


WW-4701 Drop parameter if not defined


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/986b43f3
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/986b43f3
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/986b43f3

Branch: refs/heads/master
Commit: 986b43f3147c73611fdb3956fdbd4fe01a06e550
Parents: a5092a2
Author: Lukasz Lenart 
Authored: Sat Nov 12 17:39:43 2016 +0100
Committer: Lukasz Lenart 
Committed: Sat Nov 12 17:39:43 2016 +0100

--
 core/src/main/java/org/apache/struts2/components/Param.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/986b43f3/core/src/main/java/org/apache/struts2/components/Param.java
--
diff --git a/core/src/main/java/org/apache/struts2/components/Param.java 
b/core/src/main/java/org/apache/struts2/components/Param.java
index acdbd26..9976d22 100644
--- a/core/src/main/java/org/apache/struts2/components/Param.java
+++ b/core/src/main/java/org/apache/struts2/components/Param.java
@@ -138,6 +138,8 @@ public class Param extends Component {
 if (suppressEmptyParameters) {
 if (value != null && 
StringUtils.isNotBlank(value.toString())) {
 component.addParameter(name, value);
+} else {
+component.addParameter(name, null);
 }
 } else if (value == null || 
StringUtils.isBlank(value.toString())) {
 component.addParameter(name, "");
@@ -151,6 +153,8 @@ public class Param extends Component {
 } else {
 if (!(suppressEmptyParameters && StringUtils.isBlank(body))) {
 component.addParameter(findString(name), body);
+} else {
+component.addParameter(findString(name), null);
 }
 }
 }