date:20160303

[3/3] struts git commit: WW-4607 Allows defined custom type for text field

2016-03-03 Thread lukaszlenart

WW-4607 Allows defined custom type for text field


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

Branch: refs/heads/master
Commit: 65e2a864a2bf6dc7e1f967558b85fc4cef679785
Parents: e5d693a d397abc
Author: Lukasz Lenart 
Authored: Thu Mar 3 17:40:24 2016 +0100
Committer: Lukasz Lenart 
Committed: Thu Mar 3 17:40:24 2016 +0100

--
 .../org/apache/struts2/views/java/simple/TextFieldHandler.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[2/3] struts git commit: html5 attributes again

2016-03-03 Thread lukaszlenart

html5 attributes again

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

Branch: refs/heads/master
Commit: d397abcfc130056039e5e9744135ce3b736704ff
Parents: 40f7b39
Author: gregh3269 
Authored: Wed Feb 10 11:12:10 2016 +
Committer: gregh3269 
Committed: Wed Feb 10 11:12:10 2016 +

--
 .../org/apache/struts2/views/java/simple/TextFieldHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/d397abcf/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
--
diff --git 
a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
 
b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
index d79e4d3..29921f1 100644
--- 
a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
+++ 
b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
@@ -32,7 +32,7 @@ public class TextFieldHandler extends AbstractTagHandler 
implements TagGenerator
 Map params = context.getParameters();
 Attributes attr = new Attributes();
 Object type = params.get("type");
-attr.add("type", type == null ? "text" : (String) type)
+attr.add("type", type == null ? "text" : type.toString())
 .addDefaultToEmpty("name", params.get("name"))
 .addIfExists("size", params.get("size"))
 .addIfExists("maxlength", params.get("maxlength"))

[1/3] struts git commit: Allow html5 attributes

2016-03-03 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/master e5d693a8d -> 65e2a864a


Allow html5 attributes

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

Branch: refs/heads/master
Commit: 40f7b39c3f1f99de1806a5afb84166090f00d4ce
Parents: 24085bd
Author: gregh3269 
Authored: Wed Feb 10 08:53:32 2016 +
Committer: gregh3269 
Committed: Wed Feb 10 08:53:32 2016 +

--
 .../org/apache/struts2/views/java/simple/TextFieldHandler.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/40f7b39c/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
--
diff --git 
a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
 
b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
index ba5a689..d79e4d3 100644
--- 
a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
+++ 
b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/TextFieldHandler.java
@@ -31,8 +31,8 @@ public class TextFieldHandler extends AbstractTagHandler 
implements TagGenerator
 public void generate() throws IOException {
 Map params = context.getParameters();
 Attributes attr = new Attributes();
-
-attr.add("type", "text")
+Object type = params.get("type");
+attr.add("type", type == null ? "text" : (String) type)
 .addDefaultToEmpty("name", params.get("name"))
 .addIfExists("size", params.get("size"))
 .addIfExists("maxlength", params.get("maxlength"))

[5/9] struts git commit: Merge branch 'ww-3940' of github.com:victorsosa/struts into ww-3940

2016-03-03 Thread lukaszlenart

Merge branch 'ww-3940' of github.com:victorsosa/struts into ww-3940


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

Branch: refs/heads/master
Commit: 9fa2ec610e9fe362f3fa582824c011154185b8ea
Parents: 8d6c3b6 8b426cf
Author: Victor Sosa 
Authored: Wed Jan 20 18:54:22 2016 -0400
Committer: Victor Sosa 
Committed: Wed Jan 20 18:54:22 2016 -0400

--

--

[7/9] struts git commit: Merge branch 'ww-3940' of g...@github.com:victorsosa/struts.git into ww-3940

2016-03-03 Thread lukaszlenart

Merge branch 'ww-3940' of g...@github.com:victorsosa/struts.git into ww-3940

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

Branch: refs/heads/master
Commit: 8232d931d925aeae4e849f087c879e99c135686f
Parents: f4d5305 9fa2ec6
Author: Victor Sosa 
Authored: Wed Jan 20 19:42:03 2016 -0400
Committer: Victor Sosa 
Committed: Wed Jan 20 19:42:03 2016 -0400

--

--

[9/9] struts git commit: WW-3940 Upgrades Velocity tools

2016-03-03 Thread lukaszlenart

WW-3940 Upgrades Velocity tools


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

Branch: refs/heads/master
Commit: e5d693a8dfad577fde7066334e89ab9efefcbc2a
Parents: 4ea8883 09d1954
Author: Lukasz Lenart 
Authored: Thu Mar 3 17:38:37 2016 +0100
Committer: Lukasz Lenart 
Committed: Thu Mar 3 17:38:37 2016 +0100

--
 apps/portlet/pom.xml|  2 +-
 .../struts2/portlet/test/BasePortletTest.java   |  6 ++-
 .../portlet/test/Struts2PortletTest.java|  2 +
 .../template/VelocityTemplateEngine.java|  2 +-
 .../struts2/result/VelocityResultTest.java  |  4 +-
 .../sitemesh/VelocityDecoratorServlet.java  | 53 +---
 pom.xml |  4 +-
 7 files changed, 46 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/e5d693a8/pom.xml
--

[1/9] struts git commit: WW-3940 Upgrade to Velocity Tools 2.0

2016-03-03 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/master 4ea8883ff -> e5d693a8d


WW-3940 Upgrade to Velocity Tools 2.0

JWebUnit upgrade to 3.3 too

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

Branch: refs/heads/master
Commit: aa24c1b6aad358e1b9dee05800597f2860b2faae
Parents: c167d6c
Author: Victor Sosa 
Authored: Wed Jan 20 17:32:12 2016 -0400
Committer: Victor Sosa 
Committed: Wed Jan 20 17:32:12 2016 -0400

--
 apps/portlet/pom.xml   | 2 +-
 .../java/org/apache/struts2/portlet/test/BasePortletTest.java  | 6 --
 .../org/apache/struts2/portlet/test/Struts2PortletTest.java| 2 ++
 .../struts2/components/template/VelocityTemplateEngine.java| 2 +-
 pom.xml| 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/aa24c1b6/apps/portlet/pom.xml
--
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index cbaf4a8..388b9c4 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -155,7 +155,7 @@
 
 net.sourceforge.jwebunit
 jwebunit-htmlunit-plugin
-1.4.1
+3.3
 test
 
 

http://git-wip-us.apache.org/repos/asf/struts/blob/aa24c1b6/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java
--
diff --git 
a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java
 
b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java
index 13f172f..4f63080 100644
--- 
a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java
+++ 
b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java
@@ -1,14 +1,16 @@
 package org.apache.struts2.portlet.test;
 
-import net.sourceforge.jwebunit.junit.WebTestCase;
+import static net.sourceforge.jwebunit.junit.JWebUnit.*;
 import org.apache.pluto.core.PortletServlet;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.servlet.ServletHolder;
 import org.mortbay.jetty.webapp.WebAppContext;
 
+import junit.framework.TestCase;
+
 import java.io.File;
 
-public abstract class BasePortletTest extends WebTestCase {
+public abstract class BasePortletTest extends TestCase {

protected Server server;


http://git-wip-us.apache.org/repos/asf/struts/blob/aa24c1b6/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java
--
diff --git 
a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java
 
b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java
index 99583de..8daadf9 100644
--- 
a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java
+++ 
b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java
@@ -1,5 +1,7 @@
 package org.apache.struts2.portlet.test;
 
+import static net.sourceforge.jwebunit.junit.JWebUnit.*;
+
 public class Struts2PortletTest extends BasePortletTest {

private final static String PORTLET_NAME = "StrutsPortlet";

http://git-wip-us.apache.org/repos/asf/struts/blob/aa24c1b6/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
 
b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
index 6e1db53..70b6073 100644
--- 
a/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
+++ 
b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
@@ -74,7 +74,7 @@ public class VelocityTemplateEngine extends 
BaseTemplateEngine {
 // try to load, and if it works, stop at the first one
 template = velocityEngine.getTemplate(templateName);
 break;
-} catch (IOException e) {
+} catch (Exception e) {
 if (exception == null) {
 exception = e;
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/aa24c1b6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 08c94b4..1d8e279 100644
--- a/pom.xml
+++ b/pom.xml
@@ -515,

[4/9] struts git commit: Merge branch 'ww-3940' of g...@github.com:victorsosa/struts.git into ww-3940

2016-03-03 Thread lukaszlenart

Merge branch 'ww-3940' of g...@github.com:victorsosa/struts.git into
ww-3940

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

Branch: refs/heads/master
Commit: 8d6c3b6b8bb5cfe48ea6496ba9f65ced5815f863
Parents: 8391071 aa24c1b
Author: Victor Sosa 
Authored: Wed Jan 20 17:43:43 2016 -0400
Committer: Victor Sosa 
Committed: Wed Jan 20 18:51:49 2016 -0400

--
 .gitignore  |  1 +
 .../sitemesh/VelocityDecoratorServlet.java  | 53 +---
 2 files changed, 35 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/8d6c3b6b/.gitignore
--
diff --cc .gitignore
index bcebcd9,bcebcd9..2aa4207
--- a/.gitignore
+++ b/.gitignore
@@@ -69,3 -69,3 +69,4 @@@ bundles/targe
  plugins/target
  target
  plugins/testng/test-output
++/bin/

http://git-wip-us.apache.org/repos/asf/struts/blob/8d6c3b6b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
--
diff --cc 
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
index bcbfb72,bcbfb72..e832b2f
--- 
a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
+++ 
b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
@@@ -28,6 -28,6 +28,9 @@@ package org.apache.struts2.sitemesh
  import com.opensymphony.module.sitemesh.*;
  import com.opensymphony.module.sitemesh.util.OutputConverter;
  import com.opensymphony.xwork2.ActionContext;
++
++import org.apache.logging.log4j.LogManager;
++import org.apache.logging.log4j.Logger;
  import org.apache.struts2.ServletActionContext;
  import org.apache.struts2.StrutsStatics;
  import org.apache.struts2.dispatcher.Dispatcher;
@@@ -36,12 -36,12 +39,15 @@@ import org.apache.struts2.views.velocit
  import org.apache.velocity.Template;
  import org.apache.velocity.context.Context;
  import org.apache.velocity.runtime.RuntimeConstants;
--import org.apache.velocity.tools.view.servlet.VelocityViewServlet;
++import org.apache.velocity.tools.view.VelocityView;
++import org.apache.velocity.tools.view.VelocityViewServlet;
  
  import javax.servlet.ServletConfig;
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
++
++import java.io.IOException;
  import java.io.StringWriter;
  
  /**
@@@ -53,6 -53,6 +59,10 @@@
   */
  public class VelocityDecoratorServlet extends VelocityViewServlet {
  
++private static final Logger LOG = 
LogManager.getLogger(VelocityDecoratorServlet.class);
++
++private static final long serialVersionUID = -6731485159371716918L;
++
  protected VelocityManager velocityManager;
  protected String defaultContentType;
  
@@@ -78,17 -78,17 +88,18 @@@
  velocityManager.init(config.getServletContext());
  
  // do whatever we have to do to init Velocity
--setVelocityEngine(velocityManager.getVelocityEngine());
--toolboxManager = velocityManager.getToolboxManager();
++
getVelocityView().setVelocityEngine(velocityManager.getVelocityEngine());
++//getVelocityView().getToolboxFactory(). toolboxManager = 
velocityManager.getToolboxManager();
  
++
  // we can get these now that velocity is initialized
--defaultContentType = getVelocityProperty(CONTENT_TYPE, 
DEFAULT_CONTENT_TYPE);
++defaultContentType = 
getVelocityProperty(VelocityView.CONTENT_TYPE_KEY, 
VelocityView.DEFAULT_CONTENT_TYPE);
  
--String encoding = 
getVelocityProperty(RuntimeConstants.OUTPUT_ENCODING, DEFAULT_OUTPUT_ENCODING);
++String encoding = 
getVelocityProperty(RuntimeConstants.OUTPUT_ENCODING, 
VelocityView.DEFAULT_OUTPUT_ENCODING);
  
  // For non Latin-1 encodings, ensure that the charset is
  // included in the Content-Type header.
--if (!DEFAULT_OUTPUT_ENCODING.equalsIgnoreCase(encoding)) {
++if (!VelocityView.DEFAULT_OUTPUT_ENCODING.equalsIgnoreCase(encoding)) 
{
  int index = defaultContentType.lastIndexOf("charset");
  if (index < 0) {
  // the charset specifier is not yet present in header.
@@@ -96,14 -96,14 +107,14 @@@
  defaultContentType += "; charset=" + encoding;
  } else {
  // The user may have configuration issues.
--getVelocityEngine().warn("VelocityViewServlet: Charset was 
already " + "specified in the Content-Type p

[8/9] struts git commit: Update .gitignore

2016-03-03 Thread lukaszlenart

Update .gitignore

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

Branch: refs/heads/master
Commit: 09d1954b0c6781a3c40cd3ce2bf8df2bdef7b98d
Parents: 8232d93
Author: victor sosa 
Authored: Wed Jan 20 21:09:37 2016 -0400
Committer: victor sosa 
Committed: Wed Jan 20 21:09:37 2016 -0400

--
 .gitignore | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/09d1954b/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 2aa4207..bcebcd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,4 +69,3 @@ bundles/target
 plugins/target
 target
 plugins/testng/test-output
-/bin/

[6/9] struts git commit: ww-3940 change

2016-03-03 Thread lukaszlenart

ww-3940 change


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

Branch: refs/heads/master
Commit: f4d5305b19d186c7780b3f8e0976816a15f7ec7e
Parents: 8d6c3b6 8b426cf
Author: Victor Sosa 
Authored: Wed Jan 20 18:54:22 2016 -0400
Committer: Victor Sosa 
Committed: Wed Jan 20 19:41:48 2016 -0400

--
 .../java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/f4d5305b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
--
diff --cc 
plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
index e832b2f,bcbfb72..4b1b088
--- 
a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
+++ 
b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
@@@ -88,14 -78,13 +88,14 @@@ public class VelocityDecoratorServlet e
  velocityManager.init(config.getServletContext());
  
  // do whatever we have to do to init Velocity
 -setVelocityEngine(velocityManager.getVelocityEngine());
 -toolboxManager = velocityManager.getToolboxManager();
 +
getVelocityView().setVelocityEngine(velocityManager.getVelocityEngine());
- //getVelocityView().getToolboxFactory(). toolboxManager = 
velocityManager.getToolboxManager();
++// toolboxManager = velocityManager.getToolboxManager();
  
 +
  // we can get these now that velocity is initialized
 -defaultContentType = getVelocityProperty(CONTENT_TYPE, 
DEFAULT_CONTENT_TYPE);
 +defaultContentType = 
getVelocityProperty(VelocityView.CONTENT_TYPE_KEY, 
VelocityView.DEFAULT_CONTENT_TYPE);
  
 -String encoding = 
getVelocityProperty(RuntimeConstants.OUTPUT_ENCODING, DEFAULT_OUTPUT_ENCODING);
 +String encoding = 
getVelocityProperty(RuntimeConstants.OUTPUT_ENCODING, 
VelocityView.DEFAULT_OUTPUT_ENCODING);
  
  // For non Latin-1 encodings, ensure that the charset is
  // included in the Content-Type header.

[3/9] struts git commit: Merge branch 'ww-3940' of g...@github.com:victorsosa/struts.git into ww-3940

2016-03-03 Thread lukaszlenart

Merge branch 'ww-3940' of g...@github.com:victorsosa/struts.git into
ww-3940

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

Branch: refs/heads/master
Commit: 8b426cf9bf06304ba80ed8281be8bf4b8969ebef
Parents: 8391071 aa24c1b
Author: Victor Sosa 
Authored: Wed Jan 20 17:43:43 2016 -0400
Committer: Victor Sosa 
Committed: Wed Jan 20 17:43:59 2016 -0400

--
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/8b426cf9/.gitignore
--
diff --cc .gitignore
index bcebcd9,bcebcd9..2aa4207
--- a/.gitignore
+++ b/.gitignore
@@@ -69,3 -69,3 +69,4 @@@ bundles/targe
  plugins/target
  target
  plugins/testng/test-output
++/bin/

[2/9] struts git commit: WW-3940 Upgrade to Velocity Tools 2.0

2016-03-03 Thread lukaszlenart

WW-3940 Upgrade to Velocity Tools 2.0

JWebUnit upgrade to 3.3 too

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

Branch: refs/heads/master
Commit: 83910714e874aebea10806d6a4c65bdd51d65d2d
Parents: c167d6c
Author: Victor Sosa 
Authored: Wed Jan 20 17:32:12 2016 -0400
Committer: Victor Sosa 
Committed: Wed Jan 20 17:42:54 2016 -0400

--
 apps/portlet/pom.xml   | 2 +-
 .../java/org/apache/struts2/portlet/test/BasePortletTest.java  | 6 --
 .../org/apache/struts2/portlet/test/Struts2PortletTest.java| 2 ++
 .../struts2/components/template/VelocityTemplateEngine.java| 2 +-
 .../java/org/apache/struts2/result/VelocityResultTest.java | 4 ++--
 pom.xml| 4 ++--
 6 files changed, 12 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/83910714/apps/portlet/pom.xml
--
diff --git a/apps/portlet/pom.xml b/apps/portlet/pom.xml
index cbaf4a8..388b9c4 100644
--- a/apps/portlet/pom.xml
+++ b/apps/portlet/pom.xml
@@ -155,7 +155,7 @@
 
 net.sourceforge.jwebunit
 jwebunit-htmlunit-plugin
-1.4.1
+3.3
 test
 
 

http://git-wip-us.apache.org/repos/asf/struts/blob/83910714/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java
--
diff --git 
a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java
 
b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java
index 13f172f..4f63080 100644
--- 
a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java
+++ 
b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/BasePortletTest.java
@@ -1,14 +1,16 @@
 package org.apache.struts2.portlet.test;
 
-import net.sourceforge.jwebunit.junit.WebTestCase;
+import static net.sourceforge.jwebunit.junit.JWebUnit.*;
 import org.apache.pluto.core.PortletServlet;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.servlet.ServletHolder;
 import org.mortbay.jetty.webapp.WebAppContext;
 
+import junit.framework.TestCase;
+
 import java.io.File;
 
-public abstract class BasePortletTest extends WebTestCase {
+public abstract class BasePortletTest extends TestCase {

protected Server server;


http://git-wip-us.apache.org/repos/asf/struts/blob/83910714/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java
--
diff --git 
a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java
 
b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java
index 99583de..8daadf9 100644
--- 
a/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java
+++ 
b/apps/portlet/src/test/java/org/apache/struts2/portlet/test/Struts2PortletTest.java
@@ -1,5 +1,7 @@
 package org.apache.struts2.portlet.test;
 
+import static net.sourceforge.jwebunit.junit.JWebUnit.*;
+
 public class Struts2PortletTest extends BasePortletTest {

private final static String PORTLET_NAME = "StrutsPortlet";

http://git-wip-us.apache.org/repos/asf/struts/blob/83910714/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
 
b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
index 6e1db53..70b6073 100644
--- 
a/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
+++ 
b/core/src/main/java/org/apache/struts2/components/template/VelocityTemplateEngine.java
@@ -74,7 +74,7 @@ public class VelocityTemplateEngine extends 
BaseTemplateEngine {
 // try to load, and if it works, stop at the first one
 template = velocityEngine.getTemplate(templateName);
 break;
-} catch (IOException e) {
+} catch (Exception e) {
 if (exception == null) {
 exception = e;
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/83910714/core/src/test/java/org/apache/struts2/result/VelocityResultTest.java
--
diff --git 
a/core/src/test/java/org/apache/s

[1/7] struts git commit: Merge pull request #3 from apache/master

2016-03-03 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/master 65e2a864a -> f9fb3549c


Merge pull request #3 from apache/master

update pull

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

Branch: refs/heads/master
Commit: e05f9f01804bc64ace15bfc573ef483da583e5a7
Parents: c167d6c 249d2f8
Author: victor sosa 
Authored: Thu Jan 21 08:00:54 2016 -0400
Committer: victor sosa 
Committed: Thu Jan 21 08:00:54 2016 -0400

--
 .gitignore  |  1 -
 assembly/pom.xml|  5 --
 assembly/src/main/assembly/all.xml  |  4 --
 assembly/src/main/assembly/docs.xml |  4 --
 bom/pom.xml |  5 --
 .../providers/XmlConfigurationProvider.java | 17 +++--
 .../multipart/JakartaMultiPartRequest.java  | 12 +++-
 .../XmlConfigurationProviderResultsTest.java| 54 +++
 .../providers/xwork-test-result-names.xml   | 48 ++
 .../convention/DefaultResultMapBuilder.java | 20 +++---
 .../struts2/convention/annotation/Result.java   |  2 +-
 .../convention/DefaultResultMapBuilderTest.java | 58 
 .../PackageBasedActionConfigBuilderTest.java|  4 +-
 .../result/ActionLevelResultsNamesAction.java   | 47 +
 .../rest/DefaultContentTypeHandlerManager.java  | 69 +---
 .../apache/struts2/rest/RestActionMapper.java   |  3 +-
 .../DefaultContentTypeHandlerManagerTest.java   | 42 
 .../struts2/rest/RestActionMapperTest.java  | 39 +++
 pom.xml |  5 --
 19 files changed, 389 insertions(+), 50 deletions(-)
--

[5/7] struts git commit: Merge pull request #7 from apache/master

2016-03-03 Thread lukaszlenart

Merge pull request #7 from apache/master

update pull

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

Branch: refs/heads/master
Commit: f34283b26eea874d2f76ad0cadf95c33b2d2aeae
Parents: a2c5bc8 4ea8883
Author: victor sosa 
Authored: Sat Feb 27 11:20:39 2016 -0400
Committer: victor sosa 
Committed: Sat Feb 27 11:20:39 2016 -0400

--
 ...ervletContextAwareConfigurationProvider.java | 32 
 .../xwork2/config/entities/ActionConfig.java|  1 +
 .../xwork2/config/entities/AllowedMethods.java  | 27 +
 .../xwork2/config/entities/PackageConfig.java   |  2 +-
 .../providers/XmlConfigurationProvider.java | 14 -
 .../interceptor/DefaultWorkflowInterceptor.java |  4 +--
 .../interceptor/ParametersInterceptor.java  | 29 +-
 .../validator/DelegatingValidatorContext.java   |  7 -
 .../org/apache/struts2/components/UIBean.java   |  4 +--
 .../apache/struts2/dispatcher/Dispatcher.java   |  3 ++
 .../struts2/interceptor/CookieInterceptor.java  | 12 +---
 .../config/entities/ActionConfigTest.java   |  4 +--
 .../validator/VisitorFieldValidatorTest.java|  2 +-
 .../interceptor/CookieInterceptorTest.java  | 27 -
 .../com/opensymphony/xwork2/TestBean.properties |  2 +-
 .../tiles/annotation/TilesDefinition.java   |  8 ++---
 .../VisitorValidatorTestAction.properties   |  1 +
 17 files changed, 91 insertions(+), 88 deletions(-)
--

[2/7] struts git commit: Merge pull request #4 from apache/master

2016-03-03 Thread lukaszlenart

Merge pull request #4 from apache/master

update pull

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

Branch: refs/heads/master
Commit: 778eec3b94f283290f186c8caffd10f03576fa27
Parents: e05f9f0 6fb870d
Author: victor sosa 
Authored: Tue Jan 26 08:38:50 2016 -0400
Committer: victor sosa 
Committed: Tue Jan 26 08:38:50 2016 -0400

--
 .../com/opensymphony/xwork2/XWorkConstants.java |  1 +
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java  | 15 +--
 .../xwork2/ognl/OgnlValueStack.java |  1 +
 .../xwork2/ognl/SecurityMemberAccess.java   | 16 +++-
 .../xwork2/util/LocalizedTextUtil.java  | 26 +---
 .../org/apache/struts2/StrutsConstants.java |  1 +
 .../config/DefaultBeanSelectionProvider.java|  1 +
 core/src/main/resources/struts-default.xml  | 20 ++-
 .../xwork2/ognl/SecurityMemberAccessTest.java   | 20 ++-
 9 files changed, 75 insertions(+), 26 deletions(-)
--

[6/7] struts git commit: fix for WW-4610 ServletActionContext.getRequest() doesn't return the MultiPartRequestWrapper (or StrutsRequestWrapper) when using StrutsPrepareFilter

2016-03-03 Thread lukaszlenart

fix for WW-4610 ServletActionContext.getRequest() doesn't return the
MultiPartRequestWrapper (or StrutsRequestWrapper) when using
StrutsPrepareFilter

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

Branch: refs/heads/master
Commit: 0c92e2a1f361b6675ed8ac2c7bc3ffe06603f01a
Parents: f34283b
Author: victorsosa 
Authored: Thu Mar 3 10:06:57 2016 -0400
Committer: victorsosa 
Committed: Thu Mar 3 10:06:57 2016 -0400

--
 .../main/java/org/apache/struts2/dispatcher/PrepareOperations.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/0c92e2a1/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java 
b/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java
index 547997b..efa4ea7 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/PrepareOperations.java
@@ -26,6 +26,7 @@ import com.opensymphony.xwork2.util.ValueStackFactory;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.struts2.RequestUtils;
+import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.StrutsException;
 import org.apache.struts2.dispatcher.mapper.ActionMapper;
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
@@ -145,6 +146,7 @@ public class PrepareOperations {
 // Wrap request first, just in case it is multipart/form-data
 // parameters might not be accessible through before encoding 
(ww-1278)
 request = dispatcher.wrapRequest(request);
+ServletActionContext.setRequest(request);
 } catch (IOException e) {
 throw new ServletException("Could not wrap servlet request with 
MultipartRequestWrapper!", e);
 }

[3/7] struts git commit: Merge pull request #5 from apache/master

2016-03-03 Thread lukaszlenart

Merge pull request #5 from apache/master

update pull

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

Branch: refs/heads/master
Commit: 46bd92fe202041c76704b96d11a0b8f8e83d56de
Parents: 778eec3 cceb891
Author: victor sosa 
Authored: Fri Jan 29 17:54:27 2016 -0400
Committer: victor sosa 
Committed: Fri Jan 29 17:54:27 2016 -0400

--
 .../src/main/webapp/WEB-INF/validation/ajaxFormSubmit.jsp | 7 +++
 .../struts2/convention/PackageBasedActionConfigBuilder.java   | 6 +-
 .../apache/struts2/convention/annotation/AllowedMethods.java  | 2 +-
 .../convention/actions/allowedmethods/package-info.java   | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)
--

[7/7] struts git commit: WW-4610 Adds proper context initialisation when file upload is used

2016-03-03 Thread lukaszlenart

WW-4610 Adds proper context initialisation when file upload is used


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

Branch: refs/heads/master
Commit: f9fb3549cda744bd82b114bc9fd265dc3717c460
Parents: 65e2a86 0c92e2a
Author: Lukasz Lenart 
Authored: Thu Mar 3 17:56:05 2016 +0100
Committer: Lukasz Lenart 
Committed: Thu Mar 3 17:56:05 2016 +0100

--
 .../main/java/org/apache/struts2/dispatcher/PrepareOperations.java | 2 ++
 1 file changed, 2 insertions(+)
--

[4/7] struts git commit: Merge pull request #6 from apache/master

2016-03-03 Thread lukaszlenart

Merge pull request #6 from apache/master

pull update

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

Branch: refs/heads/master
Commit: a2c5bc835ec06483af6175fc0abf67714fb28711
Parents: 46bd92f 0cc5fca
Author: victor sosa 
Authored: Thu Feb 4 13:12:22 2016 -0400
Committer: victor sosa 
Committed: Thu Feb 4 13:12:22 2016 -0400

--
 .../showcase/tiles/TilesAnnotationsAction.java  |  40 +++
 apps/showcase/src/main/webapp/WEB-INF/tiles.xml |  10 +-
 .../src/main/webapp/WEB-INF/tiles/body.jsp  |   3 +
 .../webapp/WEB-INF/tiles/layout-annotations.jsp |  14 ++
 .../xwork2/DefaultActionInvocation.java |   7 +-
 .../xwork2/config/entities/AllowedMethods.java  |   3 +
 .../xwork2/config/impl/ActionConfigMatcher.java |   1 +
 .../providers/XmlConfigurationProvider.java |   1 -
 .../interceptor/MessageStoreInterceptor.java|  58 +
 .../MessageStorePreResultListener.java  |  95 +++
 .../xwork2/DefaultActionInvocationTest.java |   3 +
 .../config/entities/AllowedMethodsTest.java |  15 ++
 .../config/impl/ActionConfigMatcherTest.java|  16 +-
 ...ConfigurationProviderAllowedMethodsTest.java |  38 ++-
 .../MessageStoreInterceptorTest.java| 184 +++---
 .../MessageStorePreResultListenerTest.java  | 252 +++
 .../apache/struts2/views/jsp/ActionTagTest.java |   3 +-
 .../providers/xwork-test-allowed-methods.xml|   6 +-
 .../tiles/StrutsTilesAnnotationProcessor.java   | 177 +
 .../tiles/annotation/TilesAddAttribute.java |  30 +++
 .../tiles/annotation/TilesAddListAttribute.java |  28 +++
 .../tiles/annotation/TilesDefinition.java   |  66 +
 .../tiles/annotation/TilesDefinitions.java  |  36 +++
 .../tiles/annotation/TilesPutAttribute.java |  32 +++
 .../tiles/annotation/TilesPutListAttribute.java |  32 +++
 .../apache/struts2/views/tiles/TilesResult.java |  69 -
 .../StrutsTilesAnnotationProcessorTest.java | 147 +++
 .../TilesTestActionMultipleAnnotations.java |  12 +
 .../tiles/TilesTestActionSingleAnnotation.java  |  49 
 ...TilesTestActionSingleAnnotationAllEmpty.java |  28 +++
 pom.xml |   3 +
 31 files changed, 1233 insertions(+), 225 deletions(-)
--

struts git commit: WW-4610 Ports fix from master branch

2016-03-03 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/support-2-3 9860ef829 -> ffa6d5cb5


WW-4610 Ports fix from master branch


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

Branch: refs/heads/support-2-3
Commit: ffa6d5cb5b889cce502b1e2e08950c447c53d88e
Parents: 9860ef8
Author: Lukasz Lenart 
Authored: Thu Mar 3 18:02:38 2016 +0100
Committer: Lukasz Lenart 
Committed: Thu Mar 3 18:02:38 2016 +0100

--
 .../java/org/apache/struts2/dispatcher/ng/PrepareOperations.java   | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/ffa6d5cb/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java 
b/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
index ccf21c7..ebc8925 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
@@ -26,6 +26,7 @@ import com.opensymphony.xwork2.util.ValueStackFactory;
 import com.opensymphony.xwork2.util.logging.Logger;
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import org.apache.struts2.RequestUtils;
+import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.StrutsException;
 import org.apache.struts2.dispatcher.Dispatcher;
 import org.apache.struts2.dispatcher.mapper.ActionMapper;
@@ -135,6 +136,7 @@ public class PrepareOperations {
 // Wrap request first, just in case it is multipart/form-data
 // parameters might not be accessible through before encoding 
(ww-1278)
 request = dispatcher.wrapRequest(request);
+ServletActionContext.setRequest(request);
 } catch (IOException e) {
 throw new ServletException("Could not wrap servlet request with 
MultipartRequestWrapper!", e);
 }

[2/2] struts git commit: WW-4464 Adds null checking

2016-03-03 Thread lukaszlenart

WW-4464 Adds null checking


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

Branch: refs/heads/master
Commit: 5bcdd3d9f394c2692aaf9ebbef391fc01b561a80
Parents: f9fb354 f2f5338
Author: Lukasz Lenart 
Authored: Thu Mar 3 19:30:00 2016 +0100
Committer: Lukasz Lenart 
Committed: Thu Mar 3 19:30:00 2016 +0100

--
 .../java/com/opensymphony/xwork2/util/LocalizedTextUtil.java| 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/5bcdd3d9/core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
--

[1/2] struts git commit: Improve LocalizedTextUtil.getMessage() defend NPE

2016-03-03 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/master f9fb3549c -> 5bcdd3d9f


Improve LocalizedTextUtil.getMessage() defend NPE

Defend NPE if not ValueStack presented, for example non-struts request like 
static util method or backend thread.

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

Branch: refs/heads/master
Commit: f2f5338ded3c2256c878a9d7cb3a62c1b07ce2e7
Parents: 4cd9a74
Author: zhouyanming 
Authored: Mon Sep 14 08:50:43 2015 +0800
Committer: zhouyanming 
Committed: Mon Sep 14 08:50:43 2015 +0800

--
 .../java/com/opensymphony/xwork2/util/LocalizedTextUtil.java| 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/f2f5338d/core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java 
b/core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
index fa5a178..2277bec 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
@@ -736,9 +736,12 @@ public class LocalizedTextUtil {
 if (bundle == null) {
 return null;
 }
+if (valueStack != null) 
 reloadBundles(valueStack.getContext());
 try {
-String message = 
TextParseUtil.translateVariables(bundle.getString(key), valueStack);
+   String message = bundle.getString(key);
+   if (valueStack != null) 
+   message = 
TextParseUtil.translateVariables(bundle.getString(key), valueStack);
 MessageFormat mf = buildMessageFormat(message, locale);
 return formatWithNullDetection(mf, args);
 } catch (MissingResourceException e) {

[01/10] struts git commit: WW-4593 Easymock upgrade to 3.4

2016-03-03 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/master 5bcdd3d9f -> 754c8a247


WW-4593 Easymock upgrade to 3.4

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

Branch: refs/heads/master
Commit: 900167daeb9c92f4a61003c03494338cde034507
Parents: c167d6c
Author: Victor Sosa 
Authored: Wed Jan 20 16:14:35 2016 -0400
Committer: Victor Sosa 
Committed: Wed Jan 20 16:14:35 2016 -0400

--
 .../xwork2/config/providers/XmlHelperTest.java  | 226 +--
 .../ParameterRemoverInterceptorTest.java|  15 +-
 .../PrefixMethodInvocationUtilTest.java | 136 ++-
 .../interceptor/PrepareInterceptorTest.java |  75 +++---
 .../org/apache/struts2/RequestUtilsTest.java|  49 ++--
 .../interceptor/CookieInterceptorTest.java  |  94 
 .../ServletConfigInterceptorTest.java   |  58 ++---
 .../struts2/views/jsp/IncludeTagTest.java   |  49 ++--
 .../struts2/views/util/ResourceUtilTest.java|  17 +-
 pom.xml |   9 +-
 10 files changed, 367 insertions(+), 361 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/900167da/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
--
diff --git 
a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
 
b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
index 9e0f1a3..73f8e51 100644
--- 
a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
+++ 
b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
@@ -1,7 +1,8 @@
 package com.opensymphony.xwork2.config.providers;
 
 import com.opensymphony.xwork2.XWorkTestCase;
-import org.easymock.MockControl;
+import org.easymock.IMocksControl;
+import static org.easymock.EasyMock.*;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -18,26 +19,26 @@ public class XmlHelperTest extends XWorkTestCase {
 
 public void testGetContent1() throws Exception {
 // set up Node
-MockControl nodeControl = MockControl.createControl(Node.class);
-Node mockNode = (Node) nodeControl.getMock();
+IMocksControl nodeControl = createControl();
+Node mockNode = (Node) nodeControl.createMock(Node.class);
 
-nodeControl.expectAndDefaultReturn(mockNode.getNodeValue(), "testing 
testing 123");
-nodeControl.expectAndDefaultReturn(mockNode.getNodeType(), 
Node.TEXT_NODE);
+expect(mockNode.getNodeValue()).andStubReturn("testing testing 123");
+expect(mockNode.getNodeType()).andStubReturn(Node.TEXT_NODE);
 
 
 // set up NodeList
-MockControl nodeListControl = 
MockControl.createControl(NodeList.class);
-NodeList mockNodeList = (NodeList) nodeListControl.getMock();
+IMocksControl nodeListControl = createControl();
+NodeList mockNodeList = (NodeList) 
nodeListControl.createMock(NodeList.class);
 
-nodeListControl.expectAndDefaultReturn(mockNodeList.getLength(), 1);
-nodeListControl.expectAndDefaultReturn(mockNodeList.item(0), mockNode);
+expect(mockNodeList.getLength()).andStubReturn(1);
+expect(mockNodeList.item(0)).andStubReturn(mockNode);
 
 
 // set up Element
-MockControl elementControl = MockControl.createControl(Element.class);
-Element mockElement = (Element) elementControl.getMock();
+IMocksControl elementControl = createControl();
+Element mockElement = (Element) 
elementControl.createMock(Element.class);
 
-elementControl.expectAndDefaultReturn(mockElement.getChildNodes(), 
mockNodeList);
+expect(mockElement.getChildNodes()).andStubReturn(mockNodeList);
 
 nodeControl.replay();
 nodeListControl.replay();
@@ -45,77 +46,71 @@ public class XmlHelperTest extends XWorkTestCase {
 
 String result = XmlHelper.getContent(mockElement);
 
+assertEquals(result, "testing testing 123");
+
 nodeControl.verify();
 nodeListControl.verify();
 elementControl.verify();
-
-assertEquals(result, "testing testing 123");
 }
 
 
 public void testGetContent2() throws Exception {
 // set up Node
-MockControl nodeControl1 = MockControl.createControl(Node.class);
-Node mockNode1 = (Node) nodeControl1.getMock();
+IMocksControl nodeControl1 = createControl();
+Node mockNode1 = (Node) nodeControl1.createMock(Node.class);
 
-nodeControl1.expectAndDefaultReturn(mockNode1.getNodeValue(),

[03/10] struts git commit: Merge branch 'easymock_update' of g...@github.com:victorsosa/struts.git into easymock_update

2016-03-03 Thread lukaszlenart

Merge branch 'easymock_update' of g...@github.com:victorsosa/struts.git into 
easymock_update

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

Branch: refs/heads/master
Commit: 35aacc7a6353b64f68c7a5f3590f5eaacfef553f
Parents: 20e13f1 900167d
Author: Victor Sosa 
Authored: Wed Jan 20 16:28:56 2016 -0400
Committer: Victor Sosa 
Committed: Wed Jan 20 16:28:56 2016 -0400

--

--

[09/10] struts git commit: Merge branch 'easymock_update' of g...@github.com:victorsosa/struts.git into easymock_update

2016-03-03 Thread lukaszlenart

Merge branch 'easymock_update' of g...@github.com:victorsosa/struts.git into 
easymock_update

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

Branch: refs/heads/master
Commit: 3df363e7a76ae34354e77b5170128ba899d02b62
Parents: a0a7058 88b37cd
Author: victorsosa 
Authored: Thu Mar 3 17:57:27 2016 -0400
Committer: victorsosa 
Committed: Thu Mar 3 17:57:27 2016 -0400

--

--

[08/10] struts git commit: Merge branch 'easymock_update' of g...@github.com:victorsosa/struts.git into easymock_update

2016-03-03 Thread lukaszlenart

Merge branch 'easymock_update' of g...@github.com:victorsosa/struts.git
into easymock_update

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

Branch: refs/heads/master
Commit: a0a70581f91db9bd4c7cd5104f400dc83d479c54
Parents: d8e4cb8 eddd8e0
Author: victorsosa 
Authored: Thu Mar 3 17:49:06 2016 -0400
Committer: victorsosa 
Committed: Thu Mar 3 17:56:44 2016 -0400

--
 .../interceptor/CookieInterceptorTest.java  | 25 
 1 file changed, 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/a0a70581/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
--
diff --cc 
core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
index f4b41ee,211a9bd..6542f81
--- 
a/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
+++ 
b/core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java
@@@ -392,15 -384,15 +384,6 @@@ public class CookieInterceptorTest exte
  assertFalse(excludedName.get(pollution4));
  assertFalse(excludedName.get(pollution5));
  assertFalse(excludedName.get(pollution6));
--
--assertFalse(excludedValue.get(pollution1));
--assertFalse(excludedValue.get(pollution2));
--assertFalse(excludedValue.get(pollution3));
--assertFalse(excludedValue.get(pollution4));
--assertFalse(excludedValue.get(pollution5));
--assertFalse(excludedValue.get(pollution6));
--
--
  }
  
  public void testCookiesWithStrutsInternalsAccess() throws Exception {

[02/10] struts git commit: WW-4593 Easymock upgrade to 3.4

2016-03-03 Thread lukaszlenart

WW-4593 Easymock upgrade to 3.4


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

Branch: refs/heads/master
Commit: 20e13f1625f5fd5be6e1f83ac3b63788bd8553f7
Parents: c167d6c
Author: Victor Sosa 
Authored: Wed Jan 20 16:14:35 2016 -0400
Committer: Victor Sosa 
Committed: Wed Jan 20 16:28:36 2016 -0400

--
 .../xwork2/config/providers/XmlHelperTest.java  | 226 +--
 .../ParameterRemoverInterceptorTest.java|  15 +-
 .../PrefixMethodInvocationUtilTest.java | 136 ++-
 .../interceptor/PrepareInterceptorTest.java |  75 +++---
 .../org/apache/struts2/RequestUtilsTest.java|  49 ++--
 .../interceptor/CookieInterceptorTest.java  |  94 
 .../ServletConfigInterceptorTest.java   |  58 ++---
 .../struts2/views/jsp/IncludeTagTest.java   |  49 ++--
 .../struts2/views/util/ResourceUtilTest.java|  17 +-
 plugins/convention/pom.xml  |   5 -
 .../ConventionUnknownHandlerTest.java   |   6 +-
 plugins/javatemplates/pom.xml   |   6 +-
 .../struts2/views/java/simple/AbstractTest.java |  36 +--
 pom.xml |   9 +-
 14 files changed, 388 insertions(+), 393 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/20e13f16/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
--
diff --git 
a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
 
b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
index 9e0f1a3..73f8e51 100644
--- 
a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
+++ 
b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
@@ -1,7 +1,8 @@
 package com.opensymphony.xwork2.config.providers;
 
 import com.opensymphony.xwork2.XWorkTestCase;
-import org.easymock.MockControl;
+import org.easymock.IMocksControl;
+import static org.easymock.EasyMock.*;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -18,26 +19,26 @@ public class XmlHelperTest extends XWorkTestCase {
 
 public void testGetContent1() throws Exception {
 // set up Node
-MockControl nodeControl = MockControl.createControl(Node.class);
-Node mockNode = (Node) nodeControl.getMock();
+IMocksControl nodeControl = createControl();
+Node mockNode = (Node) nodeControl.createMock(Node.class);
 
-nodeControl.expectAndDefaultReturn(mockNode.getNodeValue(), "testing 
testing 123");
-nodeControl.expectAndDefaultReturn(mockNode.getNodeType(), 
Node.TEXT_NODE);
+expect(mockNode.getNodeValue()).andStubReturn("testing testing 123");
+expect(mockNode.getNodeType()).andStubReturn(Node.TEXT_NODE);
 
 
 // set up NodeList
-MockControl nodeListControl = 
MockControl.createControl(NodeList.class);
-NodeList mockNodeList = (NodeList) nodeListControl.getMock();
+IMocksControl nodeListControl = createControl();
+NodeList mockNodeList = (NodeList) 
nodeListControl.createMock(NodeList.class);
 
-nodeListControl.expectAndDefaultReturn(mockNodeList.getLength(), 1);
-nodeListControl.expectAndDefaultReturn(mockNodeList.item(0), mockNode);
+expect(mockNodeList.getLength()).andStubReturn(1);
+expect(mockNodeList.item(0)).andStubReturn(mockNode);
 
 
 // set up Element
-MockControl elementControl = MockControl.createControl(Element.class);
-Element mockElement = (Element) elementControl.getMock();
+IMocksControl elementControl = createControl();
+Element mockElement = (Element) 
elementControl.createMock(Element.class);
 
-elementControl.expectAndDefaultReturn(mockElement.getChildNodes(), 
mockNodeList);
+expect(mockElement.getChildNodes()).andStubReturn(mockNodeList);
 
 nodeControl.replay();
 nodeListControl.replay();
@@ -45,77 +46,71 @@ public class XmlHelperTest extends XWorkTestCase {
 
 String result = XmlHelper.getContent(mockElement);
 
+assertEquals(result, "testing testing 123");
+
 nodeControl.verify();
 nodeListControl.verify();
 elementControl.verify();
-
-assertEquals(result, "testing testing 123");
 }
 
 
 public void testGetContent2() throws Exception {
 // set up Node
-MockControl nodeControl1 = MockControl.createControl(Node.class);
-Node mockNode1 = (Node) nodeControl1.getMock();
+IMocksControl nodeControl1 = createCo

[06/10] struts git commit: Merge branch 'master' into easymock_update

2016-03-03 Thread lukaszlenart

Merge branch 'master' into easymock_update

# Conflicts:
#   
core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java


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

Branch: refs/heads/master
Commit: d8e4cb8b48a935273ee9e4726dca643d4c57a34d
Parents: 20e9d13 f34283b
Author: victorsosa 
Authored: Thu Mar 3 14:38:13 2016 -0400
Committer: victorsosa 
Committed: Thu Mar 3 17:43:17 2016 -0400

--
 .gitignore  |   1 -
 .../showcase/tiles/TilesAnnotationsAction.java  |  40 +++
 apps/showcase/src/main/webapp/WEB-INF/tiles.xml |  10 +-
 .../src/main/webapp/WEB-INF/tiles/body.jsp  |   3 +
 .../webapp/WEB-INF/tiles/layout-annotations.jsp |  14 ++
 .../WEB-INF/validation/ajaxFormSubmit.jsp   |   7 +-
 assembly/pom.xml|   5 -
 assembly/src/main/assembly/all.xml  |   4 -
 assembly/src/main/assembly/docs.xml |   4 -
 bom/pom.xml |   5 -
 .../xwork2/DefaultActionInvocation.java |   7 +-
 .../com/opensymphony/xwork2/XWorkConstants.java |   1 +
 ...ervletContextAwareConfigurationProvider.java |  32 +++
 .../xwork2/config/entities/ActionConfig.java|   1 +
 .../xwork2/config/entities/AllowedMethods.java  |  30 +++
 .../xwork2/config/entities/PackageConfig.java   |   2 +-
 .../xwork2/config/impl/ActionConfigMatcher.java |   1 +
 .../providers/XmlConfigurationProvider.java |  32 +--
 .../interceptor/DefaultWorkflowInterceptor.java |   4 +-
 .../interceptor/ParametersInterceptor.java  |  29 +--
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java  |  15 +-
 .../xwork2/ognl/OgnlValueStack.java |   1 +
 .../xwork2/ognl/SecurityMemberAccess.java   |  16 +-
 .../xwork2/util/LocalizedTextUtil.java  |  26 +-
 .../validator/DelegatingValidatorContext.java   |   7 +-
 .../org/apache/struts2/StrutsConstants.java |   1 +
 .../org/apache/struts2/components/UIBean.java   |   4 +-
 .../config/DefaultBeanSelectionProvider.java|   1 +
 .../apache/struts2/dispatcher/Dispatcher.java   |   3 +
 .../multipart/JakartaMultiPartRequest.java  |  12 +-
 .../struts2/interceptor/CookieInterceptor.java  |  12 +-
 .../interceptor/MessageStoreInterceptor.java|  58 +
 .../MessageStorePreResultListener.java  |  95 +++
 core/src/main/resources/struts-default.xml  |  20 +-
 .../xwork2/DefaultActionInvocationTest.java |   3 +
 .../config/entities/ActionConfigTest.java   |   4 +-
 .../config/entities/AllowedMethodsTest.java |  15 ++
 .../config/impl/ActionConfigMatcherTest.java|  16 +-
 ...ConfigurationProviderAllowedMethodsTest.java |  38 ++-
 .../XmlConfigurationProviderResultsTest.java|  54 
 .../xwork2/ognl/SecurityMemberAccessTest.java   |  20 +-
 .../validator/VisitorFieldValidatorTest.java|   2 +-
 .../interceptor/CookieInterceptorTest.java  |   4 -
 .../MessageStoreInterceptorTest.java| 184 +++---
 .../MessageStorePreResultListenerTest.java  | 252 +++
 .../apache/struts2/views/jsp/ActionTagTest.java |   3 +-
 .../com/opensymphony/xwork2/TestBean.properties |   2 +-
 .../providers/xwork-test-allowed-methods.xml|   6 +-
 .../providers/xwork-test-result-names.xml   |  48 
 .../convention/DefaultResultMapBuilder.java |  20 +-
 .../PackageBasedActionConfigBuilder.java|   6 +-
 .../convention/annotation/AllowedMethods.java   |   2 +-
 .../struts2/convention/annotation/Result.java   |   2 +-
 .../convention/DefaultResultMapBuilderTest.java |  58 +
 .../PackageBasedActionConfigBuilderTest.java|   4 +-
 .../actions/allowedmethods/package-info.java|   2 +-
 .../result/ActionLevelResultsNamesAction.java   |  47 
 .../rest/DefaultContentTypeHandlerManager.java  |  69 -
 .../apache/struts2/rest/RestActionMapper.java   |   3 +-
 .../DefaultContentTypeHandlerManagerTest.java   |  42 
 .../struts2/rest/RestActionMapperTest.java  |  39 +++
 .../tiles/StrutsTilesAnnotationProcessor.java   | 177 +
 .../tiles/annotation/TilesAddAttribute.java |  30 +++
 .../tiles/annotation/TilesAddListAttribute.java |  28 +++
 .../tiles/annotation/TilesDefinition.java   |  66 +
 .../tiles/annotation/TilesDefinitions.java  |  36 +++
 .../tiles/annotation/TilesPutAttribute.java |  32 +++
 .../tiles/annotation/TilesPutListAttribute.java |  32 +++
 .../apache/struts2/views/tiles/TilesResult.java |  69 -
 .../StrutsTilesAnnotationProcessorTest.java | 147 +++
 .../TilesTestActionMultipleAnnotations.java |  12 +
 .../tiles/TilesTestActionSingleAnnotation.java  |  49 
 ...TilesTestActionSingleAnnotationAllEmpty.

[10/10] struts git commit: WW-4593 Upgrades easy-mock

2016-03-03 Thread lukaszlenart

WW-4593 Upgrades easy-mock


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

Branch: refs/heads/master
Commit: 754c8a247a5a773762cf6b93e7669f8541a4df7b
Parents: 5bcdd3d 3df363e
Author: Lukasz Lenart 
Authored: Fri Mar 4 07:09:53 2016 +0100
Committer: Lukasz Lenart 
Committed: Fri Mar 4 07:09:53 2016 +0100

--
 .../xwork2/config/providers/XmlHelperTest.java  | 234 +++
 .../ParameterRemoverInterceptorTest.java|  24 +-
 .../PrefixMethodInvocationUtilTest.java | 135 +--
 .../interceptor/PrepareInterceptorTest.java |  83 +++
 .../org/apache/struts2/RequestUtilsTest.java|  66 +++---
 .../interceptor/CookieInterceptorTest.java  |  97 
 .../ServletConfigInterceptorTest.java   |  78 +++
 .../struts2/views/jsp/IncludeTagTest.java   |  50 ++--
 .../struts2/views/util/ResourceUtilTest.java|  24 +-
 plugins/convention/pom.xml  |   5 -
 .../ConventionUnknownHandlerTest.java   |   6 +-
 plugins/javatemplates/pom.xml   |   6 +-
 .../struts2/views/java/simple/AbstractTest.java |  36 +--
 pom.xml |   9 +-
 14 files changed, 361 insertions(+), 492 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/754c8a24/pom.xml
--

[07/10] struts git commit: Merge branch 'easymock_update' of g...@github.com:victorsosa/struts.git into easymock_update

2016-03-03 Thread lukaszlenart

Merge branch 'easymock_update' of g...@github.com:victorsosa/struts.git into 
easymock_update

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

Branch: refs/heads/master
Commit: 88b37cdb40996881e7a0f0f00a6f64fbf3f3638a
Parents: d8e4cb8 eddd8e0
Author: victorsosa 
Authored: Thu Mar 3 17:49:06 2016 -0400
Committer: victorsosa 
Committed: Thu Mar 3 17:49:06 2016 -0400

--

--

[05/10] struts git commit: Merge branch 'master' into easymock_update

2016-03-03 Thread lukaszlenart

Merge branch 'master' into easymock_update

# Conflicts:
#   
core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java


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

Branch: refs/heads/master
Commit: eddd8e054771d9330ec142215f75591ecb3e3964
Parents: 20e9d13 f34283b
Author: victorsosa 
Authored: Thu Mar 3 14:38:13 2016 -0400
Committer: victorsosa 
Committed: Thu Mar 3 14:38:13 2016 -0400

--
 .gitignore  |   1 -
 .../showcase/tiles/TilesAnnotationsAction.java  |  40 +++
 apps/showcase/src/main/webapp/WEB-INF/tiles.xml |  10 +-
 .../src/main/webapp/WEB-INF/tiles/body.jsp  |   3 +
 .../webapp/WEB-INF/tiles/layout-annotations.jsp |  14 ++
 .../WEB-INF/validation/ajaxFormSubmit.jsp   |   7 +-
 assembly/pom.xml|   5 -
 assembly/src/main/assembly/all.xml  |   4 -
 assembly/src/main/assembly/docs.xml |   4 -
 bom/pom.xml |   5 -
 .../xwork2/DefaultActionInvocation.java |   7 +-
 .../com/opensymphony/xwork2/XWorkConstants.java |   1 +
 ...ervletContextAwareConfigurationProvider.java |  32 +++
 .../xwork2/config/entities/ActionConfig.java|   1 +
 .../xwork2/config/entities/AllowedMethods.java  |  30 +++
 .../xwork2/config/entities/PackageConfig.java   |   2 +-
 .../xwork2/config/impl/ActionConfigMatcher.java |   1 +
 .../providers/XmlConfigurationProvider.java |  32 +--
 .../interceptor/DefaultWorkflowInterceptor.java |   4 +-
 .../interceptor/ParametersInterceptor.java  |  29 +--
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java  |  15 +-
 .../xwork2/ognl/OgnlValueStack.java |   1 +
 .../xwork2/ognl/SecurityMemberAccess.java   |  16 +-
 .../xwork2/util/LocalizedTextUtil.java  |  26 +-
 .../validator/DelegatingValidatorContext.java   |   7 +-
 .../org/apache/struts2/StrutsConstants.java |   1 +
 .../org/apache/struts2/components/UIBean.java   |   4 +-
 .../config/DefaultBeanSelectionProvider.java|   1 +
 .../apache/struts2/dispatcher/Dispatcher.java   |   3 +
 .../multipart/JakartaMultiPartRequest.java  |  12 +-
 .../struts2/interceptor/CookieInterceptor.java  |  12 +-
 .../interceptor/MessageStoreInterceptor.java|  58 +
 .../MessageStorePreResultListener.java  |  95 +++
 core/src/main/resources/struts-default.xml  |  20 +-
 .../xwork2/DefaultActionInvocationTest.java |   3 +
 .../config/entities/ActionConfigTest.java   |   4 +-
 .../config/entities/AllowedMethodsTest.java |  15 ++
 .../config/impl/ActionConfigMatcherTest.java|  16 +-
 ...ConfigurationProviderAllowedMethodsTest.java |  38 ++-
 .../XmlConfigurationProviderResultsTest.java|  54 
 .../xwork2/ognl/SecurityMemberAccessTest.java   |  20 +-
 .../validator/VisitorFieldValidatorTest.java|   2 +-
 .../interceptor/CookieInterceptorTest.java  |  20 --
 .../MessageStoreInterceptorTest.java| 184 +++---
 .../MessageStorePreResultListenerTest.java  | 252 +++
 .../apache/struts2/views/jsp/ActionTagTest.java |   3 +-
 .../com/opensymphony/xwork2/TestBean.properties |   2 +-
 .../providers/xwork-test-allowed-methods.xml|   6 +-
 .../providers/xwork-test-result-names.xml   |  48 
 .../convention/DefaultResultMapBuilder.java |  20 +-
 .../PackageBasedActionConfigBuilder.java|   6 +-
 .../convention/annotation/AllowedMethods.java   |   2 +-
 .../struts2/convention/annotation/Result.java   |   2 +-
 .../convention/DefaultResultMapBuilderTest.java |  58 +
 .../PackageBasedActionConfigBuilderTest.java|   4 +-
 .../actions/allowedmethods/package-info.java|   2 +-
 .../result/ActionLevelResultsNamesAction.java   |  47 
 .../rest/DefaultContentTypeHandlerManager.java  |  69 -
 .../apache/struts2/rest/RestActionMapper.java   |   3 +-
 .../DefaultContentTypeHandlerManagerTest.java   |  42 
 .../struts2/rest/RestActionMapperTest.java  |  39 +++
 .../tiles/StrutsTilesAnnotationProcessor.java   | 177 +
 .../tiles/annotation/TilesAddAttribute.java |  30 +++
 .../tiles/annotation/TilesAddListAttribute.java |  28 +++
 .../tiles/annotation/TilesDefinition.java   |  66 +
 .../tiles/annotation/TilesDefinitions.java  |  36 +++
 .../tiles/annotation/TilesPutAttribute.java |  32 +++
 .../tiles/annotation/TilesPutListAttribute.java |  32 +++
 .../apache/struts2/views/tiles/TilesResult.java |  69 -
 .../StrutsTilesAnnotationProcessorTest.java | 147 +++
 .../TilesTestActionMultipleAnnotations.java |  12 +
 .../tiles/TilesTestActionSingleAnnotation.java  |  49 
 ...TilesTestActionSingleAnnotationAllEmpty

[04/10] struts git commit: WW-4593: Easymock upgrade to 3.4

2016-03-03 Thread lukaszlenart

WW-4593: Easymock upgrade to 3.4 

Task-Url: https://issues.apache.org/jira/browse/WW-4593

Simplify code on new easymock version

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

Branch: refs/heads/master
Commit: 20e9d13b179a54a88fe60026e2578e501c87bd2e
Parents: 35aacc7
Author: victorsosa 
Authored: Tue Jan 26 09:28:44 2016 -0400
Committer: victorsosa 
Committed: Tue Jan 26 09:28:44 2016 -0400

--
 .../xwork2/config/providers/XmlHelperTest.java  | 112 +--
 .../ParameterRemoverInterceptorTest.java|  17 ++-
 .../PrefixMethodInvocationUtilTest.java |  67 ---
 .../interceptor/PrepareInterceptorTest.java |  34 ++
 .../org/apache/struts2/RequestUtilsTest.java|  25 ++---
 .../interceptor/CookieInterceptorTest.java  |  51 -
 .../ServletConfigInterceptorTest.java   |  50 -
 .../struts2/views/jsp/IncludeTagTest.java   |  21 ++--
 .../struts2/views/util/ResourceUtilTest.java|  15 +--
 9 files changed, 134 insertions(+), 258 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/20e9d13b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
--
diff --git 
a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
 
b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
index 73f8e51..6a4ef52 100644
--- 
a/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
+++ 
b/core/src/test/java/com/opensymphony/xwork2/config/providers/XmlHelperTest.java
@@ -1,7 +1,6 @@
 package com.opensymphony.xwork2.config.providers;
 
 import com.opensymphony.xwork2.XWorkTestCase;
-import org.easymock.IMocksControl;
 import static org.easymock.EasyMock.*;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -19,83 +18,69 @@ public class XmlHelperTest extends XWorkTestCase {
 
 public void testGetContent1() throws Exception {
 // set up Node
-IMocksControl nodeControl = createControl();
-Node mockNode = (Node) nodeControl.createMock(Node.class);
+Node mockNode = (Node) createMock(Node.class);
 
 expect(mockNode.getNodeValue()).andStubReturn("testing testing 123");
 expect(mockNode.getNodeType()).andStubReturn(Node.TEXT_NODE);
 
 
 // set up NodeList
-IMocksControl nodeListControl = createControl();
-NodeList mockNodeList = (NodeList) 
nodeListControl.createMock(NodeList.class);
+NodeList mockNodeList = (NodeList) createMock(NodeList.class);
 
 expect(mockNodeList.getLength()).andStubReturn(1);
 expect(mockNodeList.item(0)).andStubReturn(mockNode);
 
 
 // set up Element
-IMocksControl elementControl = createControl();
-Element mockElement = (Element) 
elementControl.createMock(Element.class);
+Element mockElement = (Element) createMock(Element.class);
 
 expect(mockElement.getChildNodes()).andStubReturn(mockNodeList);
 
-nodeControl.replay();
-nodeListControl.replay();
-elementControl.replay();
+replay(mockNode, mockNodeList, mockElement);
 
 String result = XmlHelper.getContent(mockElement);
 
 assertEquals(result, "testing testing 123");
 
-nodeControl.verify();
-nodeListControl.verify();
-elementControl.verify();
+verify(mockNode, mockNodeList, mockElement);
 }
 
 
 public void testGetContent2() throws Exception {
 // set up Node
-IMocksControl nodeControl1 = createControl();
-Node mockNode1 = (Node) nodeControl1.createMock(Node.class);
+Node mockNode1 = (Node) createMock(Node.class);
 
 expect(mockNode1.getNodeValue()).andStubReturn("testing testing 123");
 expect(mockNode1.getNodeType()).andStubReturn(Node.TEXT_NODE);
 
-IMocksControl nodeControl2 = createControl();
-Node mockNode2 = (Node) nodeControl2.createMock(Node.class);
+Node mockNode2 = (Node) createMock(Node.class);
 
 expect(mockNode2.getNodeValue()).andStubReturn("comment 1");
 expect(mockNode2.getNodeType()).andStubReturn(Node.COMMENT_NODE);
 
-IMocksControl nodeControl3 = createControl();
-Node mockNode3 = (Node) nodeControl3.createMock(Node.class);
+Node mockNode3 = (Node) createMock(Node.class);
 
 expect(mockNode3.getNodeValue()).andStubReturn(" tmjee ");
 expect(mockNode3.getNodeType()).andStubReturn(Node.TEXT_NODE);
 
-IMocksControl nodeControl4 = createControl();
-Node mockNode4 = (Nod

struts-examples git commit: Defines new example how to use wildcards and regex

2016-03-03 Thread lukaszlenart

Repository: struts-examples
Updated Branches:
  refs/heads/master 47b472a92 -> 544e0730a


Defines new example how to use wildcards and regex


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

Branch: refs/heads/master
Commit: 544e0730a3661fcb87280178e83809f88560a4e5
Parents: 47b472a
Author: Lukasz Lenart 
Authored: Fri Mar 4 07:32:27 2016 +0100
Committer: Lukasz Lenart 
Committed: Fri Mar 4 07:32:27 2016 +0100

--
 pom.xml |  1 +
 wildcard-regex/pom.xml  | 66 
 .../main/java/org/apache/struts/form/Start.java | 31 +
 .../main/java/org/apache/struts/store/Save.java | 41 
 wildcard-regex/src/main/resources/form.xml  | 19 ++
 wildcard-regex/src/main/resources/log4j2.xml| 16 +
 wildcard-regex/src/main/resources/store.xml | 19 ++
 wildcard-regex/src/main/resources/struts.xml| 27 
 .../src/main/webapp/WEB-INF/form/Start.jsp  | 16 +
 .../src/main/webapp/WEB-INF/store/Store.jsp | 13 
 wildcard-regex/src/main/webapp/WEB-INF/web.xml  | 23 +++
 wildcard-regex/src/main/webapp/index.html   | 10 +++
 12 files changed, 282 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/544e0730/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 61eb7a5..553a596 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,7 @@
 wildcard-method-selection
 message-store
 type-conversion
+wildcard-regex
   
 
 

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/544e0730/wildcard-regex/pom.xml
--
diff --git a/wildcard-regex/pom.xml b/wildcard-regex/pom.xml
new file mode 100644
index 000..0609ff9
--- /dev/null
+++ b/wildcard-regex/pom.xml
@@ -0,0 +1,66 @@
+
+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";>
+  4.0.0
+
+
+  org.apache.struts
+  wildcard-regex
+  war
+  1
+  Wildcard RegEx pattern matching
+
+  
+2.3.25-SNAPSHOT
+UTF-8
+  
+
+  
+
+
+  org.apache.struts
+  struts2-core
+  ${struts2.version}
+
+
+
+  javax.servlet
+  servlet-api
+  2.4
+  provided
+
+
+
+  javax.servlet
+  jsp-api
+  2.0
+  provided
+
+
+  
+
+  
+
+  
+org.mortbay.jetty
+jetty-maven-plugin
+8.1.16.v20140903
+
+  CTRL+C
+  8999
+  10
+  
${basedir}/src/main/webapp/
+  
+${basedir}/src/main/webapp/WEB-INF/web.xml
+  
+
+  
+
+  
+

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/544e0730/wildcard-regex/src/main/java/org/apache/struts/form/Start.java
--
diff --git a/wildcard-regex/src/main/java/org/apache/struts/form/Start.java 
b/wildcard-regex/src/main/java/org/apache/struts/form/Start.java
new file mode 100644
index 000..fb6b985
--- /dev/null
+++ b/wildcard-regex/src/main/java/org/apache/struts/form/Start.java
@@ -0,0 +1,31 @@
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.struts.form;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+public class Start extends ActionSupport {
+
+public String execute() throws Exception {
+return SUCCESS;
+}
+}

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/544e0730/wildcard-regex/src/main/java/org/apache/struts/store/Save.java
--
diff --git a/wildcard-regex/src/main/java/or

[1/2] struts-examples git commit: WW-4470 Adds simple demo how to use unknown handler

2016-03-03 Thread lukaszlenart

Repository: struts-examples
Updated Branches:
  refs/heads/master 544e0730a -> 8a9466c90


WW-4470 Adds simple demo how to use unknown handler


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

Branch: refs/heads/master
Commit: eed3bcdaab000f1301d3476256e90c6729c8b59b
Parents: 544e073
Author: Lukasz Lenart 
Authored: Fri Mar 4 08:06:17 2016 +0100
Committer: Lukasz Lenart 
Committed: Fri Mar 4 08:06:17 2016 +0100

--
 pom.xml |   1 +
 unknown-handler/pom.xml | 117 +++
 .../org/apache/strutsexamples/actions/Home.java |  11 ++
 .../apache/strutsexamples/actions/Index.java|  11 ++
 .../apache/strutsexamples/actions/Login.java|  51 
 .../strutsexamples/actions/admin/Users.java |  11 ++
 .../strutsexamples/web/TilesUnknownHandler.java |  83 +
 unknown-handler/src/main/resources/log4j2.xml   |  16 +++
 unknown-handler/src/main/resources/struts.xml   |  35 ++
 .../src/main/webapp/WEB-INF/tiles.xml   |  27 +
 .../main/webapp/WEB-INF/tiles/admin/users.jsp   |   7 ++
 .../src/main/webapp/WEB-INF/tiles/home.jsp  |   7 ++
 .../src/main/webapp/WEB-INF/tiles/layout.jsp|  59 ++
 .../src/main/webapp/WEB-INF/tiles/login.jsp |  10 ++
 unknown-handler/src/main/webapp/WEB-INF/web.xml |  27 +
 unknown-handler/src/main/webapp/index.html  |  10 ++
 16 files changed, 483 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/eed3bcda/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 553a596..940d175 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,7 @@
 message-store
 type-conversion
 wildcard-regex
+unknown-handler
   
 
 

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/eed3bcda/unknown-handler/pom.xml
--
diff --git a/unknown-handler/pom.xml b/unknown-handler/pom.xml
new file mode 100644
index 000..1bb65a3
--- /dev/null
+++ b/unknown-handler/pom.xml
@@ -0,0 +1,117 @@
+
+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";>
+  4.0.0
+
+  
+struts-examples
+org.apache.struts
+1.0.0
+  
+
+  org.apache.org
+  unknown-handler
+  1.0-SNAPSHOT
+  war
+  Unknown handler
+
+  
+2.3.24.1
+2.2
+UTF-8
+  
+
+  
+
+
+  org.apache.struts
+  struts2-core
+  ${struts2.version}
+
+
+
+  org.apache.struts
+  struts2-convention-plugin
+  ${struts2.version}
+
+
+
+  org.apache.struts
+  struts2-tiles-plugin
+  ${struts2.version}
+
+
+
+  org.apache.struts
+  struts2-config-browser-plugin
+  ${struts2.version}
+
+
+
+  org.apache.logging.log4j
+  log4j-api
+  ${log4j2.version}
+
+
+  org.apache.logging.log4j
+  log4j-core
+  ${log4j2.version}
+
+
+
+  junit
+  junit
+  4.5
+  test
+
+
+
+  javax.servlet
+  servlet-api
+  2.4
+  provided
+
+
+
+  javax.servlet
+  jsp-api
+  2.0
+  provided
+
+
+  
+
+  
+
+  
+maven-compiler-plugin
+3.3
+
+  UTF-8
+  1.5
+  1.5
+
+  
+  
+org.mortbay.jetty
+jetty-maven-plugin
+8.1.16.v20140903
+
+  CTRL+C
+  8999
+  
+
+  xwork.loggerFactory
+  
com.opensymphony.xwork2.util.logging.log4j2.Log4j2LoggerFactory
+
+  
+  10
+  
${basedir}/src/main/webapp/
+  
+${basedir}/src/main/webapp/WEB-INF/web.xml
+  
+
+  
+
+  
+

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/eed3bcda/unknown-handler/src/main/java/org/apache/strutsexamples/actions/Home.java
--
diff --git 
a/unknown-handler/src/main/java/org/apache/strutsexamples/actions/Home.java 
b/unknown-handler/src/main/java/org/apache/strutsexamples/actions/Home.java
new file mode 100644
index 000..c9e654d
--- /dev/null
+++ b/unknown-handler/src/main/java/org/apache/strutsexamples/actions/Home.java
@@ -0,0 +1,11 @@
+package org.apache.strutsexamples.actions;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+public class Home extends ActionSupport {
+
+

[2/2] struts-examples git commit: Adjusts code to Struts 2.5

2016-03-03 Thread lukaszlenart

Adjusts code to Struts 2.5


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

Branch: refs/heads/master
Commit: 8a9466c905dcd2e0a6522d766ed5d3de08b91b5b
Parents: eed3bcd
Author: Lukasz Lenart 
Authored: Fri Mar 4 08:22:41 2016 +0100
Committer: Lukasz Lenart 
Committed: Fri Mar 4 08:22:41 2016 +0100

--
 unknown-handler/pom.xml   | 2 --
 .../org/apache/strutsexamples/web/TilesUnknownHandler.java| 7 +--
 2 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/8a9466c9/unknown-handler/pom.xml
--
diff --git a/unknown-handler/pom.xml b/unknown-handler/pom.xml
index 1bb65a3..2bc9c4d 100644
--- a/unknown-handler/pom.xml
+++ b/unknown-handler/pom.xml
@@ -11,12 +11,10 @@
 
   org.apache.org
   unknown-handler
-  1.0-SNAPSHOT
   war
   Unknown handler
 
   
-2.3.24.1
 2.2
 UTF-8
   

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/8a9466c9/unknown-handler/src/main/java/org/apache/strutsexamples/web/TilesUnknownHandler.java
--
diff --git 
a/unknown-handler/src/main/java/org/apache/strutsexamples/web/TilesUnknownHandler.java
 
b/unknown-handler/src/main/java/org/apache/strutsexamples/web/TilesUnknownHandler.java
index 9e1b2b8..a8884b5 100644
--- 
a/unknown-handler/src/main/java/org/apache/strutsexamples/web/TilesUnknownHandler.java
+++ 
b/unknown-handler/src/main/java/org/apache/strutsexamples/web/TilesUnknownHandler.java
@@ -11,6 +11,8 @@ import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.views.tiles.TilesResult;
 import org.apache.tiles.TilesContainer;
 import org.apache.tiles.access.TilesAccess;
+import org.apache.tiles.request.servlet.ServletApplicationContext;
+import org.apache.tiles.request.servlet.ServletRequest;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -33,7 +35,8 @@ public class TilesUnknownHandler implements UnknownHandler {
 HttpServletRequest request = ServletActionContext.getRequest();
 HttpServletResponse response = ServletActionContext.getResponse();
 
-TilesContainer container = TilesAccess.getContainer(servletContext);
+ServletApplicationContext context = new 
ServletApplicationContext(servletContext);
+TilesContainer container = TilesAccess.getContainer(context);
 
 String namespace = 
ServletActionContext.getActionMapping().getNamespace();
 Set definitions = buildDefinitionNames(namespace, actionName, 
resultCode);
@@ -41,7 +44,7 @@ public class TilesUnknownHandler implements UnknownHandler {
 for (String definition : definitions) {
 LOG.debug("Looking for tiles definition: {}", definition);
 
-if (container.isValidDefinition(definition, request, response)) {
+if (container.isValidDefinition(definition, new 
ServletRequest(context, request, response))) {
 return new TilesResult(definition);
 }
 }

[3/3] struts git commit: WW-4607 Allows defined custom type for text field

[2/3] struts git commit: html5 attributes again

[1/3] struts git commit: Allow html5 attributes

[5/9] struts git commit: Merge branch 'ww-3940' of github.com:victorsosa/struts into ww-3940

[7/9] struts git commit: Merge branch 'ww-3940' of g...@github.com:victorsosa/struts.git into ww-3940

[9/9] struts git commit: WW-3940 Upgrades Velocity tools

[1/9] struts git commit: WW-3940 Upgrade to Velocity Tools 2.0

[4/9] struts git commit: Merge branch 'ww-3940' of g...@github.com:victorsosa/struts.git into ww-3940

[8/9] struts git commit: Update .gitignore

[6/9] struts git commit: ww-3940 change

[3/9] struts git commit: Merge branch 'ww-3940' of g...@github.com:victorsosa/struts.git into ww-3940

[2/9] struts git commit: WW-3940 Upgrade to Velocity Tools 2.0

[1/7] struts git commit: Merge pull request #3 from apache/master

[5/7] struts git commit: Merge pull request #7 from apache/master

[2/7] struts git commit: Merge pull request #4 from apache/master

[6/7] struts git commit: fix for WW-4610 ServletActionContext.getRequest() doesn't return the MultiPartRequestWrapper (or StrutsRequestWrapper) when using StrutsPrepareFilter

[3/7] struts git commit: Merge pull request #5 from apache/master

[7/7] struts git commit: WW-4610 Adds proper context initialisation when file upload is used

[4/7] struts git commit: Merge pull request #6 from apache/master

struts git commit: WW-4610 Ports fix from master branch

[2/2] struts git commit: WW-4464 Adds null checking

[1/2] struts git commit: Improve LocalizedTextUtil.getMessage() defend NPE

[01/10] struts git commit: WW-4593 Easymock upgrade to 3.4

[03/10] struts git commit: Merge branch 'easymock_update' of g...@github.com:victorsosa/struts.git into easymock_update

[09/10] struts git commit: Merge branch 'easymock_update' of g...@github.com:victorsosa/struts.git into easymock_update

[08/10] struts git commit: Merge branch 'easymock_update' of g...@github.com:victorsosa/struts.git into easymock_update

[02/10] struts git commit: WW-4593 Easymock upgrade to 3.4

[06/10] struts git commit: Merge branch 'master' into easymock_update

[10/10] struts git commit: WW-4593 Upgrades easy-mock

[07/10] struts git commit: Merge branch 'easymock_update' of g...@github.com:victorsosa/struts.git into easymock_update

[05/10] struts git commit: Merge branch 'master' into easymock_update

[04/10] struts git commit: WW-4593: Easymock upgrade to 3.4

struts-examples git commit: Defines new example how to use wildcards and regex

[1/2] struts-examples git commit: WW-4470 Adds simple demo how to use unknown handler

[2/2] struts-examples git commit: Adjusts code to Struts 2.5

35 matches

Site Navigation

Mail list logo

Footer information