date:20150319

svn commit: r8332 - /dev/struts/2.3.22/

2015-03-19 Thread lukaszlenart

Author: lukaszlenart
Date: Thu Mar 19 08:20:22 2015
New Revision: 8332

Log:
Updates test release 2.3.22

Added:
dev/struts/2.3.22/
dev/struts/2.3.22/struts-2.3.22-all.zip   (with props)
dev/struts/2.3.22/struts-2.3.22-all.zip.asc   (with props)
dev/struts/2.3.22/struts-2.3.22-all.zip.md5
dev/struts/2.3.22/struts-2.3.22-all.zip.sha1
dev/struts/2.3.22/struts-2.3.22-apps.zip   (with props)
dev/struts/2.3.22/struts-2.3.22-apps.zip.asc   (with props)
dev/struts/2.3.22/struts-2.3.22-apps.zip.md5
dev/struts/2.3.22/struts-2.3.22-apps.zip.sha1
dev/struts/2.3.22/struts-2.3.22-docs.zip   (with props)
dev/struts/2.3.22/struts-2.3.22-docs.zip.asc   (with props)
dev/struts/2.3.22/struts-2.3.22-docs.zip.md5
dev/struts/2.3.22/struts-2.3.22-docs.zip.sha1
dev/struts/2.3.22/struts-2.3.22-lib.zip   (with props)
dev/struts/2.3.22/struts-2.3.22-lib.zip.asc   (with props)
dev/struts/2.3.22/struts-2.3.22-lib.zip.md5
dev/struts/2.3.22/struts-2.3.22-lib.zip.sha1
dev/struts/2.3.22/struts-2.3.22-src.zip   (with props)
dev/struts/2.3.22/struts-2.3.22-src.zip.asc   (with props)
dev/struts/2.3.22/struts-2.3.22-src.zip.md5
dev/struts/2.3.22/struts-2.3.22-src.zip.sha1

Added: dev/struts/2.3.22/struts-2.3.22-all.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.3.22/struts-2.3.22-all.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.3.22/struts-2.3.22-all.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.3.22/struts-2.3.22-all.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.3.22/struts-2.3.22-all.zip.md5
==
--- dev/struts/2.3.22/struts-2.3.22-all.zip.md5 (added)
+++ dev/struts/2.3.22/struts-2.3.22-all.zip.md5 Thu Mar 19 08:20:22 2015
@@ -0,0 +1 @@
+3466f2000e891129211eebdd89655bd0
\ No newline at end of file

Added: dev/struts/2.3.22/struts-2.3.22-all.zip.sha1
==
--- dev/struts/2.3.22/struts-2.3.22-all.zip.sha1 (added)
+++ dev/struts/2.3.22/struts-2.3.22-all.zip.sha1 Thu Mar 19 08:20:22 2015
@@ -0,0 +1 @@
+609bb7a64d4c6b9c4e3cff995af1d8510c62c898
\ No newline at end of file

Added: dev/struts/2.3.22/struts-2.3.22-apps.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.3.22/struts-2.3.22-apps.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.3.22/struts-2.3.22-apps.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.3.22/struts-2.3.22-apps.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.3.22/struts-2.3.22-apps.zip.md5
==
--- dev/struts/2.3.22/struts-2.3.22-apps.zip.md5 (added)
+++ dev/struts/2.3.22/struts-2.3.22-apps.zip.md5 Thu Mar 19 08:20:22 2015
@@ -0,0 +1 @@
+4398dbf228911b4ea81edc48945fada5
\ No newline at end of file

Added: dev/struts/2.3.22/struts-2.3.22-apps.zip.sha1
==
--- dev/struts/2.3.22/struts-2.3.22-apps.zip.sha1 (added)
+++ dev/struts/2.3.22/struts-2.3.22-apps.zip.sha1 Thu Mar 19 08:20:22 2015
@@ -0,0 +1 @@
+2f96c0d7e7fb59aef151dab2a92eecccab8bfe90
\ No newline at end of file

Added: dev/struts/2.3.22/struts-2.3.22-docs.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.3.22/struts-2.3.22-docs.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.3.22/struts-2.3.22-docs.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.3.22/struts-2.3.22-docs.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.3.22/struts-2.3.22-docs.zip.md5
==
--- dev/struts/2.3.22/struts-2.3.22-docs.zip.md5 (added)
+++ dev/struts/2.3.22/struts-2.3.22-docs.zip.md5 Thu Mar 19 08:20:22 2015
@@ -0,0 +1 @@
+efca4bf760b2fe0320dd5d4a7b6e9a26
\ No newline at end of file

Added: dev/struts/

[07/28] struts git commit: WW-4448 Replaces spaces with encoded value

2015-03-19 Thread lukaszlenart

WW-4448 Replaces spaces with encoded value


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

Branch: refs/heads/master
Commit: acef492390863e73f97714f082b214046b46c9c2
Parents: d9973fe
Author: Lukasz Lenart 
Authored: Wed Jan 21 09:07:07 2015 +0100
Committer: Lukasz Lenart 
Committed: Wed Jan 21 09:07:07 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/struts/blob/acef4923/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java 
b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
index 60f5584..786deef 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
@@ -276,7 +276,7 @@ public class ServletRedirectResult extends 
StrutsResultSupport implements Reflec
 if (url.contains("?")) {
 rawUrl = url.substring(0, url.indexOf("?"));
 }
-URI uri = URI.create(rawUrl);
+URI uri = URI.create(rawUrl.replaceAll(" ", "%20"));
 if (uri.isAbsolute()) {
 URL validUrl = uri.toURL();
 if (LOG.isDebugEnabled()) {

[27/28] struts git commit: Sets proper released version

2015-03-19 Thread lukaszlenart

Sets proper released version


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

Branch: refs/heads/master
Commit: 1a842d73446fb3b0f3000617f071940ec2488078
Parents: aeed126
Author: Lukasz Lenart 
Authored: Thu Mar 19 09:35:29 2015 +0100
Committer: Lukasz Lenart 
Committed: Thu Mar 19 09:35:29 2015 +0100

--
 apps/jboss-blank/pom.xml| 2 +-
 apps/mailreader/pom.xml | 2 +-
 apps/pom.xml| 2 +-
 apps/portlet/pom.xml| 2 +-
 apps/rest-showcase/pom.xml  | 4 ++--
 apps/showcase/pom.xml   | 2 +-
 archetypes/pom.xml  | 2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  | 2 +-
 archetypes/struts2-archetype-blank/pom.xml  | 2 +-
 archetypes/struts2-archetype-convention/pom.xml | 2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  | 2 +-
 archetypes/struts2-archetype-plugin/pom.xml | 2 +-
 archetypes/struts2-archetype-portlet/pom.xml| 2 +-
 archetypes/struts2-archetype-starter/pom.xml| 2 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 4 ++--
 bundles/admin/pom.xml   | 2 +-
 bundles/demo/pom.xml| 2 +-
 bundles/pom.xml | 2 +-
 core/pom.xml| 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/codebehind/pom.xml  | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/pom.xml  | 2 +-
 plugins/dojo/pom.xml| 2 +-
 plugins/dwr/pom.xml | 2 +-
 plugins/embeddedjsp/pom.xml | 2 +-
 plugins/gxp/pom.xml | 2 +-
 plugins/jasperreports/pom.xml   | 2 +-
 plugins/java8-support/pom.xml   | 2 +-
 plugins/javatemplates/pom.xml   | 2 +-
 plugins/jfreechart/pom.xml  | 2 +-
 plugins/jsf/pom.xml | 2 +-
 plugins/json/pom.xml| 2 +-
 plugins/junit/pom.xml   | 2 +-
 plugins/osgi/pom.xml| 2 +-
 plugins/oval/pom.xml| 2 +-
 plugins/pell-multipart/pom.xml  | 2 +-
 plugins/plexus/pom.xml  | 2 +-
 plugins/pom.xml | 2 +-
 plugins/portlet-tiles/pom.xml   | 2 +-
 plugins/portlet/pom.xml | 2 +-
 plugins/rest/pom.xml| 2 +-
 plugins/sitegraph/pom.xml   | 2 +-
 plugins/sitemesh/pom.xml| 2 +-
 plugins/spring/pom.xml  | 2 +-
 plugins/struts1/pom.xml | 2 +-
 plugins/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 plugins/tiles3/pom.xml  | 2 +-
 pom.xml | 2 +-
 xwork-core/pom.xml  | 2 +-
 52 files changed, 54 insertions(+), 54 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/apps/jboss-blank/pom.xml
--
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 4f9a353..13d5cc2 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.23-SNAPSHOT
+2.3.22
 
 
 struts2-jboss-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/apps/mailreader/pom.xml
--
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 6081fae..47f0a0e 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.struts
   struts2-apps
-  2.3.23-SNAPSHOT
+  2.3.22
 
 
 struts2-mailreader

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842d73/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index d0e67ca..9b40d01 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-parent
-2.3.23-SNAPSHOT
+2.3.21
 
 struts2-apps
 pom

http://git-wip-us.apache.org/repos/asf/struts/blob/1a842

[02/28] struts git commit: WW-4447 Reverts some changes introduced by WW-4297 Resetting 'label' attribute can block user if they would like to develop their own hidden.ftl template

2015-03-19 Thread lukaszlenart

WW-4447 Reverts some changes introduced by WW-4297
Resetting 'label' attribute can block user if they would like to
develop their own hidden.ftl template


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

Branch: refs/heads/master
Commit: 243378937969e5cafc2bd98ce799a995e431
Parents: 0b49c2c
Author: Lukasz Lenart 
Authored: Wed Jan 14 16:15:17 2015 +0100
Committer: Lukasz Lenart 
Committed: Wed Jan 14 16:15:17 2015 +0100

--
 core/src/main/java/org/apache/struts2/components/Hidden.java | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/24337893/core/src/main/java/org/apache/struts2/components/Hidden.java
--
diff --git a/core/src/main/java/org/apache/struts2/components/Hidden.java 
b/core/src/main/java/org/apache/struts2/components/Hidden.java
index 36b03d1..b513340 100644
--- a/core/src/main/java/org/apache/struts2/components/Hidden.java
+++ b/core/src/main/java/org/apache/struts2/components/Hidden.java
@@ -66,10 +66,4 @@ public class Hidden extends UIBean {
 return TEMPLATE;
 }
 
-@Override
-public void evaluateParams() {
-super.evaluateParams();
-label = null;
-addParameter("label", null);
-}
 }

[10/28] struts git commit: WW-4446 Adds wrapper around Dispatcher in tests to avoid overwhelming warnings

2015-03-19 Thread lukaszlenart

WW-4446 Adds wrapper around Dispatcher in tests to avoid overwhelming
 warnings


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

Branch: refs/heads/master
Commit: 46b28e0b6365531bb25dac4a427258e70a2c24a9
Parents: 5e74fcd
Author: Lukasz Lenart 
Authored: Mon Feb 2 10:04:40 2015 +0100
Committer: Lukasz Lenart 
Committed: Mon Feb 2 10:04:40 2015 +0100

--
 .../struts2/util/StrutsTestCaseHelper.java  | 30 ++-
 .../freemarker/FreemarkerResultMockedTest.java  | 84 +---
 2 files changed, 50 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/46b28e0b/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java 
b/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
index b19e43e..546c74d 100644
--- a/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
+++ b/core/src/main/java/org/apache/struts2/util/StrutsTestCaseHelper.java
@@ -31,8 +31,11 @@ import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.util.LocalizedTextUtil;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.ValueStackFactory;
+import org.apache.struts2.dispatcher.DispatcherErrorHandler;
 
 import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * Generic test setup methods to be used with any unit testing framework. 
@@ -51,7 +54,7 @@ public class StrutsTestCaseHelper {
 if (params == null) {
 params = new HashMap();
 }
-Dispatcher du = new Dispatcher(ctx, params);
+Dispatcher du = new DispatcherWrapper(ctx, params);
 du.init();
 Dispatcher.setInstance(du);
 
@@ -68,4 +71,29 @@ public class StrutsTestCaseHelper {
 Dispatcher.setInstance(null);
 ActionContext.setContext(null);
 }
+
+private static class DispatcherWrapper extends Dispatcher {
+
+public DispatcherWrapper(ServletContext ctx, Map 
params) {
+super(ctx, params);
+super.setDispatcherErrorHandler(new MockErrorHandler());
+}
+
+@Override
+public void setDispatcherErrorHandler(DispatcherErrorHandler 
errorHandler) {
+// ignore
+}
+}
+
+private static class MockErrorHandler implements DispatcherErrorHandler {
+public void init(ServletContext ctx) {
+// ignore
+}
+
+public void handleError(HttpServletRequest request, 
HttpServletResponse response, int code, Exception e) {
+System.out.println("Dispatcher#sendError: " + code);
+e.printStackTrace(System.out);
+}
+}
+
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/46b28e0b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java
--
diff --git 
a/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java
 
b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java
index 9a9584a..3c19077 100644
--- 
a/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java
+++ 
b/core/src/test/java/org/apache/struts2/views/freemarker/FreemarkerResultMockedTest.java
@@ -6,6 +6,7 @@ import com.opensymphony.xwork2.util.ClassLoaderUtil;
 import com.opensymphony.xwork2.util.ValueStack;
 import com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory;
 import freemarker.template.Configuration;
+import freemarker.template.TemplateException;
 import freemarker.template.TemplateExceptionHandler;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.StrutsInternalTestCase;
@@ -34,26 +35,17 @@ public class FreemarkerResultMockedTest extends 
StrutsInternalTestCase {
 PrintWriter writer;
 StringWriter stringWriter;
 ServletContext servletContext;
-FreemarkerManager mgr;
 MockHttpServletRequest request;
 
-public void testActionThatThrowsExceptionTag() throws Exception {
-//get fm config to use it in mock servlet context
-FreemarkerManager freemarkerManager = 
container.getInstance(FreemarkerManager.class);
-Configuration freemarkerConfig = 
freemarkerManager.getConfiguration(ServletActionContext.getServletContext());
-
freemarkerConfig.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
+Configuration freemarkerConfig

[01/28] struts git commit: Starting new development cycle

2015-03-19 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/develop 4f0f7d138 -> 3e23f2191
  refs/heads/master 438d2ce24 -> 8cb1feb41


Starting new development cycle


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

Branch: refs/heads/master
Commit: 0b49c2c2c95835d8c673191a9db7c081784255fb
Parents: 9bca437 f4b4ffb
Author: Lukasz Lenart 
Authored: Wed Dec 31 18:13:55 2014 +0100
Committer: Lukasz Lenart 
Committed: Wed Dec 31 18:13:55 2014 +0100

--
 apps/blank/pom.xml  | 2 +-
 apps/jboss-blank/pom.xml| 2 +-
 apps/mailreader/pom.xml | 2 +-
 apps/pom.xml| 2 +-
 apps/portlet/pom.xml| 2 +-
 apps/rest-showcase/pom.xml  | 4 ++--
 apps/showcase/pom.xml   | 2 +-
 archetypes/pom.xml  | 2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  | 2 +-
 archetypes/struts2-archetype-blank/pom.xml  | 2 +-
 archetypes/struts2-archetype-convention/pom.xml | 2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  | 2 +-
 archetypes/struts2-archetype-plugin/pom.xml | 2 +-
 archetypes/struts2-archetype-portlet/pom.xml| 2 +-
 archetypes/struts2-archetype-starter/pom.xml| 2 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 4 ++--
 bundles/admin/pom.xml   | 2 +-
 bundles/demo/pom.xml| 2 +-
 bundles/pom.xml | 2 +-
 core/pom.xml| 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/codebehind/pom.xml  | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/pom.xml  | 2 +-
 plugins/dojo/pom.xml| 2 +-
 plugins/dwr/pom.xml | 2 +-
 plugins/embeddedjsp/pom.xml | 2 +-
 plugins/gxp/pom.xml | 2 +-
 plugins/jasperreports/pom.xml   | 2 +-
 plugins/java8-support/pom.xml   | 5 ++---
 plugins/javatemplates/pom.xml   | 2 +-
 plugins/jfreechart/pom.xml  | 2 +-
 plugins/jsf/pom.xml | 2 +-
 plugins/json/pom.xml| 2 +-
 plugins/junit/pom.xml   | 2 +-
 plugins/osgi/pom.xml| 2 +-
 plugins/oval/pom.xml| 2 +-
 plugins/pell-multipart/pom.xml  | 2 +-
 plugins/plexus/pom.xml  | 2 +-
 plugins/pom.xml | 2 +-
 plugins/portlet-tiles/pom.xml   | 2 +-
 plugins/portlet/pom.xml | 2 +-
 plugins/rest/pom.xml| 2 +-
 plugins/sitegraph/pom.xml   | 2 +-
 plugins/sitemesh/pom.xml| 2 +-
 plugins/spring/pom.xml  | 2 +-
 plugins/struts1/pom.xml | 2 +-
 plugins/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 plugins/tiles3/pom.xml  | 2 +-
 pom.xml | 7 +++
 xwork-core/pom.xml  | 2 +-
 53 files changed, 58 insertions(+), 60 deletions(-)
--

[20/28] struts git commit: WW-4457 Uses dedicated type to match content type of uploaded files

2015-03-19 Thread lukaszlenart

WW-4457 Uses dedicated type to match content type of uploaded files


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

Branch: refs/heads/master
Commit: 54c64234844488d178e4ac1579ab8194a36b8b4a
Parents: 5665dd5
Author: Lukasz Lenart 
Authored: Fri Mar 6 22:34:35 2015 +0100
Committer: Lukasz Lenart 
Committed: Fri Mar 6 22:34:35 2015 +0100

--
 .../org/apache/struts2/StrutsConstants.java |  2 ++
 .../config/DefaultBeanSelectionProvider.java|  8 
 .../interceptor/FileUploadInterceptor.java  |  6 +++---
 .../apache/struts2/util/ContentTypeMatcher.java | 16 
 .../struts2/util/DefaultContentTypeMatcher.java | 20 
 core/src/main/resources/struts-default.xml  |  2 ++
 6 files changed, 51 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/54c64234/core/src/main/java/org/apache/struts2/StrutsConstants.java
--
diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java 
b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index 03287d6..4671eb1 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -299,4 +299,6 @@ public final class StrutsConstants {
 public static final String STRUTS_ADDITIONAL_EXCLUDED_PATTERNS = 
"struts.additional.excludedPatterns";
 public static final String STRUTS_ADDITIONAL_ACCEPTED_PATTERNS = 
"struts.additional.acceptedPatterns";
 
+public static final String STRUTS_CONTENT_TYPE_MATCHER = 
"struts.contentTypeMatcher";
+
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/54c64234/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
 
b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
index f972979..3a6deb2 100644
--- 
a/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
+++ 
b/core/src/main/java/org/apache/struts2/config/DefaultBeanSelectionProvider.java
@@ -67,6 +67,7 @@ import org.apache.struts2.dispatcher.DispatcherErrorHandler;
 import org.apache.struts2.dispatcher.StaticContentLoader;
 import org.apache.struts2.dispatcher.mapper.ActionMapper;
 import org.apache.struts2.dispatcher.multipart.MultiPartRequest;
+import org.apache.struts2.util.ContentTypeMatcher;
 import org.apache.struts2.views.freemarker.FreemarkerManager;
 import org.apache.struts2.views.util.UrlHelper;
 import org.apache.struts2.views.velocity.VelocityManager;
@@ -327,6 +328,12 @@ import java.util.StringTokenizer;
  * request
  * Used across different interceptors to check if given string matches 
one of the accepted patterns
  *   
+ *   
+ * org.apache.struts2.util.ContentTypeMatcher
+ * struts.contentTypeMatcher
+ * singleton
+ * Matches content type of uploaded files (since 2.3.22)
+ *   
  * 
  *
  * 
@@ -391,6 +398,7 @@ public class DefaultBeanSelectionProvider extends 
AbstractBeanSelectionProvider
 alias(ReflectionProvider.class, 
StrutsConstants.STRUTS_REFLECTIONPROVIDER, builder, props);
 alias(ReflectionContextFactory.class, 
StrutsConstants.STRUTS_REFLECTIONCONTEXTFACTORY, builder, props);
 alias(PatternMatcher.class, StrutsConstants.STRUTS_PATTERNMATCHER, 
builder, props);
+alias(ContentTypeMatcher.class, 
StrutsConstants.STRUTS_CONTENT_TYPE_MATCHER, builder, props);
 alias(StaticContentLoader.class, 
StrutsConstants.STRUTS_STATIC_CONTENT_LOADER, builder, props);
 alias(UnknownHandlerManager.class, 
StrutsConstants.STRUTS_UNKNOWN_HANDLER_MANAGER, builder, props);
 alias(UrlHelper.class, StrutsConstants.STRUTS_URL_HELPER, builder, 
props);

http://git-wip-us.apache.org/repos/asf/struts/blob/54c64234/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java 
b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
index 0ce91bc..78970a0 100644
--- 
a/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
+++ 
b/core/src/main/java/org/apache/struts2/interceptor/FileUploadInterceptor.java
@@ -31,12 +31,12 @@ import com.opensymphony.xwork2.ValidationAware;
 import com.opensymphony.xwork2.inject.Container;
 import com.opensymphony.xwork2.inject.Inj

[25/28] struts git commit: [maven-release-plugin] prepare for next development iteration

2015-03-19 Thread lukaszlenart

[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/develop
Commit: 3e23f2191ec2a9c16a5b77bf6a1c1c1dd589ddd4
Parents: 22573f8
Author: Lukasz Lenart 
Authored: Thu Mar 19 07:11:27 2015 +0100
Committer: Lukasz Lenart 
Committed: Thu Mar 19 07:11:27 2015 +0100

--
 apps/blank/pom.xml  | 2 +-
 apps/jboss-blank/pom.xml| 2 +-
 apps/mailreader/pom.xml | 2 +-
 apps/pom.xml| 2 +-
 apps/portlet/pom.xml| 2 +-
 apps/rest-showcase/pom.xml  | 4 ++--
 apps/showcase/pom.xml   | 2 +-
 archetypes/pom.xml  | 2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  | 2 +-
 archetypes/struts2-archetype-blank/pom.xml  | 2 +-
 archetypes/struts2-archetype-convention/pom.xml | 2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  | 2 +-
 archetypes/struts2-archetype-plugin/pom.xml | 2 +-
 archetypes/struts2-archetype-portlet/pom.xml| 2 +-
 archetypes/struts2-archetype-starter/pom.xml| 2 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 8 ++--
 bundles/admin/pom.xml   | 2 +-
 bundles/demo/pom.xml| 2 +-
 bundles/pom.xml | 2 +-
 core/pom.xml| 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/codebehind/pom.xml  | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/pom.xml  | 2 +-
 plugins/dojo/pom.xml| 2 +-
 plugins/dwr/pom.xml | 2 +-
 plugins/embeddedjsp/pom.xml | 2 +-
 plugins/gxp/pom.xml | 2 +-
 plugins/jasperreports/pom.xml   | 2 +-
 plugins/java8-support/pom.xml   | 2 +-
 plugins/javatemplates/pom.xml   | 2 +-
 plugins/jfreechart/pom.xml  | 2 +-
 plugins/jsf/pom.xml | 2 +-
 plugins/json/pom.xml| 2 +-
 plugins/junit/pom.xml   | 2 +-
 plugins/osgi/pom.xml| 2 +-
 plugins/oval/pom.xml| 2 +-
 plugins/pell-multipart/pom.xml  | 2 +-
 plugins/plexus/pom.xml  | 2 +-
 plugins/pom.xml | 2 +-
 plugins/portlet-tiles/pom.xml   | 2 +-
 plugins/portlet/pom.xml | 2 +-
 plugins/rest/pom.xml| 2 +-
 plugins/sitegraph/pom.xml   | 2 +-
 plugins/sitemesh/pom.xml| 2 +-
 plugins/spring/pom.xml  | 2 +-
 plugins/struts1/pom.xml | 2 +-
 plugins/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 plugins/tiles3/pom.xml  | 2 +-
 pom.xml | 4 ++--
 xwork-core/pom.xml  | 2 +-
 53 files changed, 56 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/blank/pom.xml
--
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 48df955..4c6c6f6 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.22
+2.3.23-SNAPSHOT
 
 
 struts2-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/jboss-blank/pom.xml
--
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 13d5cc2..4f9a353 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.22
+2.3.23-SNAPSHOT
 
 
 struts2-jboss-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/mailreader/pom.xml
--
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 47f0a0e..6081fae 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.struts
   struts2-apps
-  2

[21/28] struts git commit: Adds additional use case to check access to values of int type

2015-03-19 Thread lukaszlenart

Adds additional use case to check access to values of int type


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

Branch: refs/heads/master
Commit: 4f0f7d13849d65445bb9f86c19b6eb217019123f
Parents: 54c6423
Author: Lukasz Lenart 
Authored: Sat Mar 7 07:39:44 2015 +0100
Committer: Lukasz Lenart 
Committed: Sat Mar 7 07:39:44 2015 +0100

--
 .../xwork2/ognl/SecurityMemberAccessTest.java   | 23 
 1 file changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/4f0f7d13/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
--
diff --git 
a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
 
b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
index 53f4246..5db20fc 100644
--- 
a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
+++ 
b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
@@ -285,12 +285,28 @@ public class SecurityMemberAccessTest extends TestCase {
 assertTrue("Invalid test! Access to static method of excluded class is 
blocked!", actual);
 }
 
+public void testAccessPrimitiveInt() throws Exception {
+// given
+SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+String propertyName = "intField";
+Member member = FooBar.class.getMethod("get" + 
propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1));
+
+// when
+boolean accessible = sma.isAccessible(context, target, member, 
propertyName);
+
+// then
+assertTrue(accessible);
+}
+
 }
 
 class FooBar implements FooBarInterface {
 
 private String stringField;
 
+private int intField;
+
 public String getStringField() {
 return stringField;
 }
@@ -312,6 +328,13 @@ class FooBar implements FooBarInterface {
 return 1;
 }
 
+public int getIntField() {
+return intField;
+}
+
+public void setIntField(int intField) {
+this.intField = intField;
+}
 }
 
 interface FooInterface {

[14/28] struts git commit: made bufferSize optional, see WW-4466

2015-03-19 Thread lukaszlenart

made bufferSize optional, see WW-4466


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

Branch: refs/heads/master
Commit: fbe7d5138e7f4e67552f766c80cc033050660777
Parents: 76ea79f
Author: cnenning 
Authored: Mon Feb 16 14:24:55 2015 +0100
Committer: cnenning 
Committed: Mon Feb 16 14:24:55 2015 +0100

--
 .../dispatcher/multipart/JakartaStreamMultiPartRequest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/fbe7d513/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
index fa3dd2f..eae0039 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
@@ -97,7 +97,7 @@ public class JakartaStreamMultiPartRequest implements 
MultiPartRequest {
  *
  * @param bufferSize
  */
-@Inject(StrutsConstants.STRUTS_MULTIPART_BUFFERSIZE)
+@Inject(value = StrutsConstants.STRUTS_MULTIPART_BUFFERSIZE, required = 
false)
 public void setBufferSize(String bufferSize) {
 this.bufferSize = Integer.parseInt(bufferSize);
 }

[18/28] struts git commit: WW-4467 disableRequestAttributeValueStackLookup applied to MultiPartRequestWrapper

2015-03-19 Thread lukaszlenart

WW-4467 disableRequestAttributeValueStackLookup applied
to MultiPartRequestWrapper


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

Branch: refs/heads/master
Commit: a1d277fac53e8567dae28842599b8ab92872a92b
Parents: 4ad0232
Author: Lukasz Lenart 
Authored: Fri Mar 6 21:20:08 2015 +0100
Committer: Lukasz Lenart 
Committed: Fri Mar 6 21:20:08 2015 +0100

--
 .../java/org/apache/struts2/dispatcher/Dispatcher.java   |  2 +-
 .../dispatcher/multipart/MultiPartRequestWrapper.java| 11 +--
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/a1d277fa/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
--
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java 
b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index c18d055..3a4e305 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -835,7 +835,7 @@ public class Dispatcher {
 if (content_type != null && 
content_type.contains("multipart/form-data")) {
 MultiPartRequest mpr = getMultiPartRequest();
 LocaleProvider provider = 
getContainer().getInstance(LocaleProvider.class);
-request = new MultiPartRequestWrapper(mpr, request, getSaveDir(), 
provider);
+request = new MultiPartRequestWrapper(mpr, request, getSaveDir(), 
provider, disableRequestAttributeValueStackLookup);
 } else {
 request = new StrutsRequestWrapper(request, 
disableRequestAttributeValueStackLookup);
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/a1d277fa/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
index 0bff59d..ddc4275 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
@@ -21,6 +21,7 @@
 
 package org.apache.struts2.dispatcher.multipart;
 
+import com.opensymphony.xwork2.DefaultLocaleProvider;
 import com.opensymphony.xwork2.LocaleProvider;
 import com.opensymphony.xwork2.util.LocalizedTextUtil;
 import com.opensymphony.xwork2.util.logging.Logger;
@@ -71,8 +72,10 @@ public class MultiPartRequestWrapper extends 
StrutsRequestWrapper {
  * @param saveDir Target directory for any files that we save
  * @param provider
  */
-public MultiPartRequestWrapper(MultiPartRequest multiPartRequest, 
HttpServletRequest request, String saveDir, LocaleProvider provider) {
-super(request);
+public MultiPartRequestWrapper(MultiPartRequest multiPartRequest, 
HttpServletRequest request,
+   String saveDir, LocaleProvider provider,
+   boolean 
disableRequestAttributeValueStackLookup) {
+super(request, disableRequestAttributeValueStackLookup);
 errors = new ArrayList();
 multi = multiPartRequest;
 defaultLocale = provider.getLocale();
@@ -90,6 +93,10 @@ public class MultiPartRequestWrapper extends 
StrutsRequestWrapper {
 } 
 }
 
+public MultiPartRequestWrapper(MultiPartRequest multiPartRequest, 
HttpServletRequest request, String saveDir, LocaleProvider provider) {
+this(multiPartRequest, request, saveDir, provider, false);
+}
+
 protected void setLocale(HttpServletRequest request) {
 if (defaultLocale == null) {
 defaultLocale = request.getLocale();

[28/28] struts git commit: Sets proper released version

2015-03-19 Thread lukaszlenart

Sets proper released version


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

Branch: refs/heads/master
Commit: 8cb1feb418abe592d48d576a5b9d46d808048ded
Parents: 1a842d7
Author: Lukasz Lenart 
Authored: Thu Mar 19 09:36:52 2015 +0100
Committer: Lukasz Lenart 
Committed: Thu Mar 19 09:36:52 2015 +0100

--
 apps/blank/pom.xml | 2 +-
 apps/pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/8cb1feb4/apps/blank/pom.xml
--
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index d0daec5..48df955 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.21
+2.3.22
 
 
 struts2-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/8cb1feb4/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index 9b40d01..749f9b1 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-parent
-2.3.21
+2.3.22
 
 struts2-apps
 pom

[03/28] struts git commit: change findBaseAccessor method

2015-03-19 Thread lukaszlenart

change findBaseAccessor method

in hibernate4.3.7,because javassist3.18.1's class name generate rule is 
'_$$_jvst'+...

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

Branch: refs/heads/master
Commit: b8882758036a1abe86c5405889410c55da958a80
Parents: 2433789
Author: aronshen 
Authored: Tue Jan 20 11:54:10 2015 +0800
Committer: aronshen 
Committed: Tue Jan 20 11:54:10 2015 +0800

--
 .../main/java/org/apache/struts2/json/JSONWriter.java  | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/b8882758/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java
--
diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java 
b/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java
index fd9b844..dc53967 100644
--- a/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java
+++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java
@@ -305,7 +305,18 @@ public class JSONWriter {
 } catch (Exception ex) {
 LOG.debug(ex.getMessage(), ex);
 }
-} else {
+
+//in hibernate4.3.7,because javassist3.18.1's class name generate rule 
is '_$$_jvst'+...
+} else if(clazz.getName().contains("$$_jvst")){
+try {
+baseAccessor = Class.forName(
+clazz.getName().substring(0, 
clazz.getName().indexOf("_$$")))
+.getMethod(accessor.getName(), 
accessor.getParameterTypes());
+} catch (Exception ex) {
+LOG.debug(ex.getMessage(), ex);
+}
+}
+else {
 return accessor;
 }
 return baseAccessor;

[12/28] struts git commit: Handle default (unnamed) package security check

2015-03-19 Thread lukaszlenart

Handle default (unnamed) package security check


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

Branch: refs/heads/master
Commit: 76ea79f38a5e9efbebdf9e7a966795e2deb5bc9f
Parents: 312a271
Author: Aleksandr Mashchenko 
Authored: Wed Feb 4 22:57:55 2015 +0200
Committer: Aleksandr Mashchenko 
Committed: Wed Feb 4 22:57:55 2015 +0200

--
 .../xwork2/ognl/SecurityMemberAccess.java   |  8 +-
 .../xwork2/ognl/SecurityMemberAccessTest.java   | 30 
 2 files changed, 37 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/76ea79f3/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
--
diff --git 
a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
 
b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index 7888245..7697368 100644
--- 
a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ 
b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -128,8 +128,14 @@ public class SecurityMemberAccess extends 
DefaultMemberAccess {
 }
 
 protected boolean isPackageExcluded(Package targetPackage, Package 
memberPackage) {
+if (LOG.isWarnEnabled() && (targetPackage == null || memberPackage == 
null)) {
+LOG.warn("The use of the default (unnamed) package is 
discouraged!");
+}
+
+final String targetPackageName = targetPackage == null ? "" : 
targetPackage.getName();
+final String memberPackageName = memberPackage == null ? "" : 
memberPackage.getName();
 for (Pattern pattern : excludedPackageNamePatterns) {
-if (pattern.matcher(targetPackage.getName()).matches() || 
pattern.matcher(memberPackage.getName()).matches()) {
+if (pattern.matcher(targetPackageName).matches() || 
pattern.matcher(memberPackageName).matches()) {
 return true;
 }
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/76ea79f3/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
--
diff --git 
a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
 
b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
index 69dceca..53f4246 100644
--- 
a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
+++ 
b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
@@ -190,6 +190,36 @@ public class SecurityMemberAccessTest extends TestCase {
 // then
 assertFalse("stringField is accessible!", actual);
 }
+
+public void testDefaultPackageExclusion() throws Exception {
+// given
+SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+Set excluded = new HashSet();
+excluded.add(Pattern.compile("^" + 
FooBar.class.getPackage().getName().replaceAll("\\.", ".") + ".*"));
+sma.setExcludedPackageNamePatterns(excluded);
+
+// when
+boolean actual = sma.isPackageExcluded(null, null);
+
+// then
+assertFalse("default package is excluded!", actual);
+}
+
+public void testDefaultPackageExclusion2() throws Exception {
+// given
+SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
+Set excluded = new HashSet();
+excluded.add(Pattern.compile("^$"));
+sma.setExcludedPackageNamePatterns(excluded);
+
+// when
+boolean actual = sma.isPackageExcluded(null, null);
+
+// then
+assertTrue("default package isn't excluded!", actual);
+}
 
 public void testAccessEnum() throws Exception {
 // given

[16/28] struts git commit: WW-4427 adds complete fix

2015-03-19 Thread lukaszlenart

WW-4427 adds complete fix


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

Branch: refs/heads/master
Commit: 66248a80e3b238092bf547cc196ad2f7b0225b76
Parents: c5867e2 e0d7239
Author: Lukasz Lenart 
Authored: Tue Feb 17 07:49:15 2015 +0100
Committer: Lukasz Lenart 
Committed: Tue Feb 17 07:49:15 2015 +0100

--
 .../com/opensymphony/xwork2/ognl/OgnlValueStack.java  |  6 --
 .../opensymphony/xwork2/ognl/OgnlValueStackTest.java  | 14 ++
 2 files changed, 14 insertions(+), 6 deletions(-)
--

[24/28] struts git commit: [maven-release-plugin] prepare for next development iteration

2015-03-19 Thread lukaszlenart

[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/master
Commit: 3e23f2191ec2a9c16a5b77bf6a1c1c1dd589ddd4
Parents: 22573f8
Author: Lukasz Lenart 
Authored: Thu Mar 19 07:11:27 2015 +0100
Committer: Lukasz Lenart 
Committed: Thu Mar 19 07:11:27 2015 +0100

--
 apps/blank/pom.xml  | 2 +-
 apps/jboss-blank/pom.xml| 2 +-
 apps/mailreader/pom.xml | 2 +-
 apps/pom.xml| 2 +-
 apps/portlet/pom.xml| 2 +-
 apps/rest-showcase/pom.xml  | 4 ++--
 apps/showcase/pom.xml   | 2 +-
 archetypes/pom.xml  | 2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  | 2 +-
 archetypes/struts2-archetype-blank/pom.xml  | 2 +-
 archetypes/struts2-archetype-convention/pom.xml | 2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  | 2 +-
 archetypes/struts2-archetype-plugin/pom.xml | 2 +-
 archetypes/struts2-archetype-portlet/pom.xml| 2 +-
 archetypes/struts2-archetype-starter/pom.xml| 2 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 8 ++--
 bundles/admin/pom.xml   | 2 +-
 bundles/demo/pom.xml| 2 +-
 bundles/pom.xml | 2 +-
 core/pom.xml| 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/codebehind/pom.xml  | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/pom.xml  | 2 +-
 plugins/dojo/pom.xml| 2 +-
 plugins/dwr/pom.xml | 2 +-
 plugins/embeddedjsp/pom.xml | 2 +-
 plugins/gxp/pom.xml | 2 +-
 plugins/jasperreports/pom.xml   | 2 +-
 plugins/java8-support/pom.xml   | 2 +-
 plugins/javatemplates/pom.xml   | 2 +-
 plugins/jfreechart/pom.xml  | 2 +-
 plugins/jsf/pom.xml | 2 +-
 plugins/json/pom.xml| 2 +-
 plugins/junit/pom.xml   | 2 +-
 plugins/osgi/pom.xml| 2 +-
 plugins/oval/pom.xml| 2 +-
 plugins/pell-multipart/pom.xml  | 2 +-
 plugins/plexus/pom.xml  | 2 +-
 plugins/pom.xml | 2 +-
 plugins/portlet-tiles/pom.xml   | 2 +-
 plugins/portlet/pom.xml | 2 +-
 plugins/rest/pom.xml| 2 +-
 plugins/sitegraph/pom.xml   | 2 +-
 plugins/sitemesh/pom.xml| 2 +-
 plugins/spring/pom.xml  | 2 +-
 plugins/struts1/pom.xml | 2 +-
 plugins/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 plugins/tiles3/pom.xml  | 2 +-
 pom.xml | 4 ++--
 xwork-core/pom.xml  | 2 +-
 53 files changed, 56 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/blank/pom.xml
--
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 48df955..4c6c6f6 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.22
+2.3.23-SNAPSHOT
 
 
 struts2-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/jboss-blank/pom.xml
--
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 13d5cc2..4f9a353 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.22
+2.3.23-SNAPSHOT
 
 
 struts2-jboss-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/3e23f219/apps/mailreader/pom.xml
--
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 47f0a0e..6081fae 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.struts
   struts2-apps
-  2.

[05/28] struts git commit: WW-4448 Strips params and replaces spaces

2015-03-19 Thread lukaszlenart

WW-4448 Strips params and replaces spaces


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

Branch: refs/heads/master
Commit: 0f44e11cd1f3cff51ed4a2a10dec593d8822ade2
Parents: e3428c5
Author: Lukasz Lenart 
Authored: Wed Jan 21 08:46:49 2015 +0100
Committer: Lukasz Lenart 
Committed: Wed Jan 21 08:46:49 2015 +0100

--
 .../dispatcher/ServletRedirectResult.java   |  6 +++-
 .../dispatcher/ServletRedirectResultTest.java   | 30 
 2 files changed, 35 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/0f44e11c/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java 
b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
index b6cd282..60f5584 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java
@@ -272,7 +272,11 @@ public class ServletRedirectResult extends 
StrutsResultSupport implements Reflec
  */
 protected boolean isPathUrl(String url) {
 try {
-URI uri = URI.create(url);
+String rawUrl = url;
+if (url.contains("?")) {
+rawUrl = url.substring(0, url.indexOf("?"));
+}
+URI uri = URI.create(rawUrl);
 if (uri.isAbsolute()) {
 URL validUrl = uri.toURL();
 if (LOG.isDebugEnabled()) {

http://git-wip-us.apache.org/repos/asf/struts/blob/0f44e11c/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
--
diff --git 
a/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
 
b/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
index 56cfe9d..ab40dfc 100644
--- 
a/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
+++ 
b/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java
@@ -100,6 +100,36 @@ public class ServletRedirectResultTest extends 
StrutsInternalTestCase implements
 }
 }
 
+public void testFullUrlRedirectWithSpaces() {
+view.setLocation("http://localhost/bar/foo some.pdf");
+responseMock.expectAndReturn("encodeRedirectURL", 
C.args(C.eq("http://localhost/bar/foo some.pdf")), "http://localhost/bar/foo 
some.pdf");
+responseMock.expect("sendRedirect", 
C.args(C.eq("http://localhost/bar/foo some.pdf")));
+
+try {
+view.execute(ai);
+requestMock.verify();
+responseMock.verify();
+} catch (Exception e) {
+e.printStackTrace();
+fail();
+}
+}
+
+public void testFullUrlRedirectWithParams() {
+view.setLocation("http://localhost/bar/foo.action?param=1¶m 2=3");
+responseMock.expectAndReturn("encodeRedirectURL", 
C.args(C.eq("http://localhost/bar/foo.action?param=1¶m 2=3")), 
"http://localhost/bar/foo.action?param=1¶m 2=3");
+responseMock.expect("sendRedirect", 
C.args(C.eq("http://localhost/bar/foo.action?param=1¶m 2=3")));
+
+try {
+view.execute(ai);
+requestMock.verify();
+responseMock.verify();
+} catch (Exception e) {
+e.printStackTrace();
+fail();
+}
+}
+
 public void testAbsoluteRedirect303() {
 view.setLocation("/bar/foo.jsp");
 view.setStatusCode(303);

[08/28] struts git commit: WW-4453 Reports missing value

2015-03-19 Thread lukaszlenart

WW-4453 Reports missing value


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

Branch: refs/heads/master
Commit: cd0d8de67aacc531dbf2d5a9840b55ff46bcc817
Parents: acef492
Author: Lukasz Lenart 
Authored: Tue Jan 27 09:00:00 2015 +0100
Committer: Lukasz Lenart 
Committed: Tue Jan 27 09:00:00 2015 +0100

--
 .../main/java/org/apache/struts2/components/Component.java   | 8 +++-
 core/src/main/java/org/apache/struts2/components/Date.java   | 8 
 2 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/cd0d8de6/core/src/main/java/org/apache/struts2/components/Component.java
--
diff --git a/core/src/main/java/org/apache/struts2/components/Component.java 
b/core/src/main/java/org/apache/struts2/components/Component.java
index 7ed0d56..15cc698 100644
--- a/core/src/main/java/org/apache/struts2/components/Component.java
+++ b/core/src/main/java/org/apache/struts2/components/Component.java
@@ -69,6 +69,7 @@ public class Component {
  */
 protected static ConcurrentMap, Collection> 
standardAttributesMap = new ConcurrentHashMap, Collection>();
 
+protected boolean devMode = false;
 protected ValueStack stack;
 protected Map parameters;
 protected ActionMapper actionMapper;
@@ -97,7 +98,12 @@ public class Component {
 
 return name.substring(dot + 1).toLowerCase();
 }
-
+
+@Inject(value = StrutsConstants.STRUTS_DEVMODE, required = false)
+public void setDevMode(String devMode) {
+this.devMode = Boolean.parseBoolean(devMode);
+}
+
 @Inject
 public void setActionMapper(ActionMapper mapper) {
 this.actionMapper = mapper;

http://git-wip-us.apache.org/repos/asf/struts/blob/cd0d8de6/core/src/main/java/org/apache/struts2/components/Date.java
--
diff --git a/core/src/main/java/org/apache/struts2/components/Date.java 
b/core/src/main/java/org/apache/struts2/components/Date.java
index 887a5ec..0bb1207 100644
--- a/core/src/main/java/org/apache/struts2/components/Date.java
+++ b/core/src/main/java/org/apache/struts2/components/Date.java
@@ -285,6 +285,14 @@ public class Date extends ContextBean {
 date = (java.util.Date) dateObject;
 } else if(dateObject instanceof Calendar){
 date = ((Calendar) dateObject).getTime();
+} else {
+if (devMode) {
+LOG.error("Expression [#0] passed to  tag which 
was evaluated to [#1](#2) isn't instance of java.util.Date nor 
java.util.Calendar!",
+name, dateObject, (dateObject != null ? 
dateObject.getClass() : "null"));
+} else {
+LOG.debug("Expression [#0] passed to  tag which 
was evaluated to [#1](#2) isn't instance of java.util.Date nor 
java.util.Calendar!",
+name, dateObject, (dateObject != null ? 
dateObject.getClass() : "null"));
+}
 }
 } catch (Exception e) {
 LOG.error("Could not convert object with key '#0' to a 
java.util.Date instance", name);

[19/28] struts git commit: WW-4468 Switched to buildError on file limit excided

2015-03-19 Thread lukaszlenart

WW-4468 Switched to buildError on file limit excided


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

Branch: refs/heads/master
Commit: 5665dd52b5a6b430d74d6c9f1ca7b85ee2709007
Parents: a1d277f
Author: Lukasz Lenart 
Authored: Fri Mar 6 21:40:10 2015 +0100
Committer: Lukasz Lenart 
Committed: Fri Mar 6 21:40:10 2015 +0100

--
 .../dispatcher/multipart/JakartaStreamMultiPartRequest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/5665dd52/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
index eae0039..6fbd2c3 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
@@ -357,7 +357,7 @@ public class JakartaStreamMultiPartRequest implements 
MultiPartRequest {
 private void addFileSkippedError(String fileName, HttpServletRequest 
request) {
 String exceptionMessage = "Skipped file " + fileName + "; request size 
limit exceeded.";
 FileSizeLimitExceededException exception = new 
FileUploadBase.FileSizeLimitExceededException(exceptionMessage, 
getRequestSize(request), maxSize);
-String message = buildMessage(exception, new Object[]{fileName, 
getRequestSize(request), maxSize});
+String message = buildErrorMessage(exception, new Object[]{fileName, 
getRequestSize(request), maxSize});
 if (!errors.contains(message))
 errors.add(message);
 }

[11/28] struts git commit: WW-4452 Solves problem with using -1 as headerKey

2015-03-19 Thread lukaszlenart

WW-4452 Solves problem with using -1 as headerKey


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

Branch: refs/heads/master
Commit: 312a2717cf2f7094e42a83f7f05cb493c3d393c8
Parents: 46b28e0
Author: Lukasz Lenart 
Authored: Mon Feb 2 21:22:42 2015 +0100
Committer: Lukasz Lenart 
Committed: Mon Feb 2 21:22:42 2015 +0100

--
 .../resources/org/apache/struts2/static/inputtransferselect.js | 2 +-
 .../resources/org/apache/struts2/static/optiontransferselect.js| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/312a2717/core/src/main/resources/org/apache/struts2/static/inputtransferselect.js
--
diff --git 
a/core/src/main/resources/org/apache/struts2/static/inputtransferselect.js 
b/core/src/main/resources/org/apache/struts2/static/inputtransferselect.js
index c983d69..bda929e 100644
--- a/core/src/main/resources/org/apache/struts2/static/inputtransferselect.js
+++ b/core/src/main/resources/org/apache/struts2/static/inputtransferselect.js
@@ -63,7 +63,7 @@ function compile(ptn) {
if (ptn == '' || !window.RegExp) {
 return function(val) { return val == ptn; }
 } else {
-var reg = new RegExp(ptn);
+var reg = new RegExp("^" + ptn + "$");
 return function (val) {
 if (val == '') { // ignore empty option added by template
return true;

http://git-wip-us.apache.org/repos/asf/struts/blob/312a2717/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
--
diff --git 
a/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js 
b/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
index 85a2e28..105addf 100644
--- a/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
+++ b/core/src/main/resources/org/apache/struts2/static/optiontransferselect.js
@@ -44,7 +44,7 @@ function compile(ptn) {
if (ptn == '' || !window.RegExp) {
 return function(val) { return val == ptn; }
 } else {
-var reg = new RegExp("\\b" + ptn);
+var reg = new RegExp("^" + ptn + "$");
 return function (val) { 
 if (val == '') { // ignore empty option added by template 
return true;

[22/28] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_22

2015-03-19 Thread lukaszlenart

[maven-release-plugin] prepare release STRUTS_2_3_22


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

Branch: refs/heads/master
Commit: 22573f8de8b33ead0fee88eb67817985464218bb
Parents: 4f0f7d1
Author: Lukasz Lenart 
Authored: Thu Mar 19 07:11:15 2015 +0100
Committer: Lukasz Lenart 
Committed: Thu Mar 19 07:11:15 2015 +0100

--
 apps/blank/pom.xml  | 2 +-
 apps/jboss-blank/pom.xml| 2 +-
 apps/mailreader/pom.xml | 2 +-
 apps/pom.xml| 2 +-
 apps/portlet/pom.xml| 2 +-
 apps/rest-showcase/pom.xml  | 4 ++--
 apps/showcase/pom.xml   | 2 +-
 archetypes/pom.xml  | 2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  | 2 +-
 archetypes/struts2-archetype-blank/pom.xml  | 2 +-
 archetypes/struts2-archetype-convention/pom.xml | 2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  | 2 +-
 archetypes/struts2-archetype-plugin/pom.xml | 2 +-
 archetypes/struts2-archetype-portlet/pom.xml| 2 +-
 archetypes/struts2-archetype-starter/pom.xml| 2 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 8 ++--
 bundles/admin/pom.xml   | 2 +-
 bundles/demo/pom.xml| 2 +-
 bundles/pom.xml | 2 +-
 core/pom.xml| 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/codebehind/pom.xml  | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/pom.xml  | 2 +-
 plugins/dojo/pom.xml| 2 +-
 plugins/dwr/pom.xml | 2 +-
 plugins/embeddedjsp/pom.xml | 2 +-
 plugins/gxp/pom.xml | 2 +-
 plugins/jasperreports/pom.xml   | 2 +-
 plugins/java8-support/pom.xml   | 2 +-
 plugins/javatemplates/pom.xml   | 2 +-
 plugins/jfreechart/pom.xml  | 2 +-
 plugins/jsf/pom.xml | 2 +-
 plugins/json/pom.xml| 2 +-
 plugins/junit/pom.xml   | 2 +-
 plugins/osgi/pom.xml| 2 +-
 plugins/oval/pom.xml| 2 +-
 plugins/pell-multipart/pom.xml  | 2 +-
 plugins/plexus/pom.xml  | 2 +-
 plugins/pom.xml | 2 +-
 plugins/portlet-tiles/pom.xml   | 2 +-
 plugins/portlet/pom.xml | 2 +-
 plugins/rest/pom.xml| 2 +-
 plugins/sitegraph/pom.xml   | 2 +-
 plugins/sitemesh/pom.xml| 2 +-
 plugins/spring/pom.xml  | 2 +-
 plugins/struts1/pom.xml | 2 +-
 plugins/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 plugins/tiles3/pom.xml  | 2 +-
 pom.xml | 4 ++--
 xwork-core/pom.xml  | 2 +-
 53 files changed, 60 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/blank/pom.xml
--
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index a8d1cf8..48df955 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.22-SNAPSHOT
+2.3.22
 
 
 struts2-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/jboss-blank/pom.xml
--
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index e3da1b5..13d5cc2 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.22-SNAPSHOT
+2.3.22
 
 
 struts2-jboss-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/mailreader/pom.xml
--
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index e239bdb..47f0a0e 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.struts
   struts2-apps
-  2.3.22-SNAP

[06/28] struts git commit: WW-4449 Extends JSONWriter to support Javassist 3.18.1 and Hibernate 4.3.7

2015-03-19 Thread lukaszlenart

WW-4449 Extends JSONWriter to support Javassist 3.18.1 and Hibernate 4.3.7


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

Branch: refs/heads/master
Commit: d9973fee06eb07fee35226b5b9037c4ce3614aed
Parents: 0f44e11 b888275
Author: Lukasz Lenart 
Authored: Wed Jan 21 08:54:09 2015 +0100
Committer: Lukasz Lenart 
Committed: Wed Jan 21 08:54:09 2015 +0100

--
 .../main/java/org/apache/struts2/json/JSONWriter.java  | 13 -
 1 file changed, 12 insertions(+), 1 deletion(-)
--

[15/28] struts git commit: WW-4465 Ignores statusCode parameter when building redirect url

2015-03-19 Thread lukaszlenart

WW-4465 Ignores statusCode parameter when building redirect url


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

Branch: refs/heads/master
Commit: c5867e2ea2c72864730c77167b9827e49c0cd38f
Parents: fbe7d51
Author: Lukasz Lenart 
Authored: Tue Feb 17 07:38:13 2015 +0100
Committer: Lukasz Lenart 
Committed: Tue Feb 17 07:38:13 2015 +0100

--
 .../dispatcher/ServletActionRedirectResult.java| 13 -
 .../dispatcher/ServletActionRedirectResultTest.java|  3 ++-
 2 files changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/c5867e2e/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
 
b/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
index b41c06e..5e0f835 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
@@ -210,7 +210,18 @@ public class ServletActionRedirectResult extends 
ServletRedirectResult implement
 }
 
 protected List getProhibitedResultParams() {
-return Arrays.asList(DEFAULT_PARAM, "namespace", "method", "encode", 
"parse", "location", "prependServletContext", "suppressEmptyParameters", 
"anchor");
+return Arrays.asList(
+DEFAULT_PARAM,
+"namespace",
+"method",
+"encode",
+"parse",
+"location",
+"prependServletContext",
+"suppressEmptyParameters",
+"anchor",
+"statusCode"
+);
 }
 
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/c5867e2e/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
--
diff --git 
a/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
 
b/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
index a679919..168ea04 100644
--- 
a/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
+++ 
b/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java
@@ -58,7 +58,8 @@ public class ServletActionRedirectResultTest extends 
StrutsInternalTestCase {
 .addParam("location", "someLocation")
 .addParam("prependServletContext", "true")
 .addParam("method", "someMethod")
-.addParam("param1", "${#value1}")
+   .addParam("statusCode", "333")
+   .addParam("param1", "${#value1}")
 .addParam("param2", "${#value2}")
 .addParam("param3", "${#value3}")
 .addParam("anchor", "${#fragment}")

[09/28] struts git commit: WW-4454 Adds dedicated hidden.ftl template to avoid problems with layout

2015-03-19 Thread lukaszlenart

WW-4454 Adds dedicated hidden.ftl template to avoid problems with layout


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

Branch: refs/heads/master
Commit: 5e74fcd946b932725fe5f4640d1092bf6ea6d2f9
Parents: cd0d8de
Author: Lukasz Lenart 
Authored: Sun Feb 1 15:53:38 2015 +0100
Committer: Lukasz Lenart 
Committed: Sun Feb 1 15:53:38 2015 +0100

--
 .../resources/template/css_xhtml/hidden.ftl | 23 
 1 file changed, 23 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/5e74fcd9/core/src/main/resources/template/css_xhtml/hidden.ftl
--
diff --git a/core/src/main/resources/template/css_xhtml/hidden.ftl 
b/core/src/main/resources/template/css_xhtml/hidden.ftl
new file mode 100644
index 000..640aa48
--- /dev/null
+++ b/core/src/main/resources/template/css_xhtml/hidden.ftl
@@ -0,0 +1,23 @@
+<#--
+/*
+ * $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.
+ */
+-->
+<#include "/${parameters.templateDir}/simple/hidden.ftl" />

[13/28] struts git commit: WW-4427 - Converters are no longer applied to values coming from the context on error path

2015-03-19 Thread lukaszlenart

WW-4427 - Converters are no longer applied to values coming from the context on 
error path


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

Branch: refs/heads/master
Commit: e0d72397c24542a8b83a371a36590570ccd8fd74
Parents: 76ea79f
Author: Przemek Bruski 
Authored: Sun Feb 15 10:40:13 2015 +0100
Committer: Przemek Bruski 
Committed: Sun Feb 15 10:40:13 2015 +0100

--
 .../com/opensymphony/xwork2/ognl/OgnlValueStack.java  |  6 --
 .../opensymphony/xwork2/ognl/OgnlValueStackTest.java  | 14 ++
 2 files changed, 14 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/e0d72397/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
--
diff --git 
a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java 
b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
index 7fa70f7..1b09ef6 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
@@ -312,9 +312,11 @@ public class OgnlValueStack implements Serializable, 
ValueStack, ClearableValueS
 setupExceptionOnFailure(throwExceptionOnFailure);
 return tryFindValueWhenExpressionIsNotNull(expr, asType);
 } catch (OgnlException e) {
-return handleOgnlException(expr, throwExceptionOnFailure, e);
+final Object value = handleOgnlException(expr, 
throwExceptionOnFailure, e);
+return converter.convertValue(getContext(), value, asType);
 } catch (Exception e) {
-return handleOtherException(expr, throwExceptionOnFailure, e);
+final Object value = handleOtherException(expr, 
throwExceptionOnFailure, e);
+return converter.convertValue(getContext(), value, asType);
 } finally {
 ReflectionContextState.clear(context);
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/e0d72397/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
--
diff --git 
a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java 
b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
index 8c7c3ae..612435d 100644
--- 
a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
+++ 
b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
@@ -94,9 +94,12 @@ public class OgnlValueStackTest extends XWorkTestCase {
 }
 
 public void testValuesFromContextAreConverted() {
-final OgnlValueStack vs = createValueStack();
+testValuesFromContextAreConverted("dogName");
+testValuesFromContextAreConverted("dog.name");
+}
 
-final String propertyName = "dogName";
+private void testValuesFromContextAreConverted(String propertyName) {
+final OgnlValueStack vs = createValueStack();
 final String propertyValue = "Rover";
 vs.getContext().put(propertyName, new String[]{propertyValue});
 
@@ -104,9 +107,12 @@ public class OgnlValueStackTest extends XWorkTestCase {
 }
 
 public void testNullValueFromContextGetsConverted() {
-final OgnlValueStack vs = createValueStack();
+testNullValueFromContextGetsConverted("dogName");
+testNullValueFromContextGetsConverted("dog.name");
+}
 
-final String propertyName = "dogName";
+private void testNullValueFromContextGetsConverted(String propertyName) {
+final OgnlValueStack vs = createValueStack();
 final String propertyValue = null;
 vs.getContext().put(propertyName, propertyValue);

[17/28] struts git commit: WW-4473 Adds support for title attribute in SubmitHandler

2015-03-19 Thread lukaszlenart

WW-4473 Adds support for title attribute in SubmitHandler


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

Branch: refs/heads/master
Commit: 4ad023207fa61e2bac96a8d88ea2bacd8da6a81b
Parents: 66248a8
Author: Lukasz Lenart 
Authored: Fri Mar 6 21:07:17 2015 +0100
Committer: Lukasz Lenart 
Committed: Fri Mar 6 21:07:17 2015 +0100

--
 .../java/org/apache/struts2/views/java/simple/SubmitHandler.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/4ad02320/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java
--
diff --git 
a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java
 
b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java
index d7a6d7b..0f66153 100644
--- 
a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java
+++ 
b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/SubmitHandler.java
@@ -53,7 +53,9 @@ public class SubmitHandler extends AbstractTagHandler 
implements TagGenerator {
 .addIfExists("alt", params.get("label"))
 .addIfExists("id", params.get("id"))
 .addIfExists("class", params.get("cssClass"))
-.addIfExists("style", params.get("cssStyle"));
+.addIfExists("style", params.get("cssStyle"))
+.addIfExists("title", params.get("title"));
+
 start("input", attrs);
 } else {
 attrs.addIfExists("name", params.get("name"))

[04/28] struts git commit: Extracts string into constant

2015-03-19 Thread lukaszlenart

Extracts string into constant


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

Branch: refs/heads/master
Commit: e3428c5fe54b9e2b95f5ac1db0e8814118ac7b3c
Parents: 2433789
Author: Lukasz Lenart 
Authored: Wed Jan 21 08:15:41 2015 +0100
Committer: Lukasz Lenart 
Committed: Wed Jan 21 08:15:41 2015 +0100

--
 .../org/apache/struts2/dispatcher/StrutsResultSupport.java| 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/e3428c5f/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java 
b/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
index 269ed87..bbcffa3 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java
@@ -110,6 +110,9 @@ public abstract class StrutsResultSupport implements 
Result, StrutsStatics {
 /** The default parameter */
 public static final String DEFAULT_PARAM = "location";
 
+/** use UTF-8 as this is the recommended encoding by W3C to avoid 
incompatibilities. */
+public static final String DEFAULT_URL_ENCODING = "UTF-8";
+
 private boolean parse;
 private boolean encode;
 private String location;
@@ -240,9 +243,7 @@ public abstract class StrutsResultSupport implements 
Result, StrutsStatics {
 if (encode) {
 if (parsedValue != null) {
 try {
-// use UTF-8 as this is the recommended encoding by 
W3C to
-// avoid incompatibilities.
-return URLEncoder.encode(parsedValue, "UTF-8");
+return URLEncoder.encode(parsedValue, 
DEFAULT_URL_ENCODING);
 }
 catch(UnsupportedEncodingException e) {
 if (LOG.isWarnEnabled()) {

[26/28] struts git commit: Merge branch 'release/2.3.22'

2015-03-19 Thread lukaszlenart

Merge branch 'release/2.3.22'

Conflicts:
apps/blank/pom.xml
apps/jboss-blank/pom.xml
apps/mailreader/pom.xml
apps/pom.xml
apps/portlet/pom.xml
apps/rest-showcase/pom.xml
apps/showcase/pom.xml
archetypes/pom.xml
archetypes/struts2-archetype-angularjs/pom.xml
archetypes/struts2-archetype-blank/pom.xml
archetypes/struts2-archetype-convention/pom.xml
archetypes/struts2-archetype-dbportlet/pom.xml
archetypes/struts2-archetype-plugin/pom.xml
archetypes/struts2-archetype-portlet/pom.xml
archetypes/struts2-archetype-starter/pom.xml
assembly/pom.xml
bom/pom.xml
bundles/admin/pom.xml
bundles/demo/pom.xml
bundles/pom.xml
core/pom.xml
plugins/cdi/pom.xml
plugins/codebehind/pom.xml
plugins/config-browser/pom.xml
plugins/convention/pom.xml
plugins/dojo/pom.xml
plugins/dwr/pom.xml
plugins/embeddedjsp/pom.xml
plugins/gxp/pom.xml
plugins/jasperreports/pom.xml
plugins/java8-support/pom.xml
plugins/javatemplates/pom.xml
plugins/jfreechart/pom.xml
plugins/jsf/pom.xml
plugins/json/pom.xml
plugins/junit/pom.xml
plugins/osgi/pom.xml
plugins/oval/pom.xml
plugins/pell-multipart/pom.xml
plugins/plexus/pom.xml
plugins/pom.xml
plugins/portlet-tiles/pom.xml
plugins/portlet/pom.xml
plugins/rest/pom.xml
plugins/sitegraph/pom.xml
plugins/sitemesh/pom.xml
plugins/spring/pom.xml
plugins/struts1/pom.xml
plugins/testng/pom.xml
plugins/tiles/pom.xml
plugins/tiles3/pom.xml
pom.xml
xwork-core/pom.xml


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

Branch: refs/heads/master
Commit: aeed126a3eb353367855eb7de24d1f8880a31634
Parents: 438d2ce 3e23f21
Author: Lukasz Lenart 
Authored: Thu Mar 19 09:33:17 2015 +0100
Committer: Lukasz Lenart 
Committed: Thu Mar 19 09:33:17 2015 +0100

--
 apps/jboss-blank/pom.xml|  2 +-
 apps/mailreader/pom.xml |  2 +-
 apps/pom.xml|  2 +-
 apps/portlet/pom.xml|  2 +-
 apps/rest-showcase/pom.xml  |  4 +-
 apps/showcase/pom.xml   |  2 +-
 archetypes/pom.xml  |  2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  |  2 +-
 archetypes/struts2-archetype-blank/pom.xml  |  2 +-
 archetypes/struts2-archetype-convention/pom.xml |  2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  |  2 +-
 archetypes/struts2-archetype-plugin/pom.xml |  2 +-
 archetypes/struts2-archetype-portlet/pom.xml|  2 +-
 archetypes/struts2-archetype-starter/pom.xml|  2 +-
 assembly/pom.xml|  2 +-
 bom/pom.xml |  4 +-
 bundles/admin/pom.xml   |  2 +-
 bundles/demo/pom.xml|  2 +-
 bundles/pom.xml |  2 +-
 core/pom.xml|  2 +-
 .../org/apache/struts2/StrutsConstants.java |  2 +
 .../apache/struts2/components/Component.java|  8 +-
 .../org/apache/struts2/components/Date.java |  8 ++
 .../org/apache/struts2/components/Hidden.java   |  6 --
 .../config/DefaultBeanSelectionProvider.java|  8 ++
 .../apache/struts2/dispatcher/Dispatcher.java   |  2 +-
 .../dispatcher/ServletActionRedirectResult.java | 13 ++-
 .../dispatcher/ServletRedirectResult.java   |  6 +-
 .../struts2/dispatcher/StrutsResultSupport.java |  7 +-
 .../JakartaStreamMultiPartRequest.java  |  4 +-
 .../multipart/MultiPartRequestWrapper.java  | 11 ++-
 .../interceptor/FileUploadInterceptor.java  |  6 +-
 .../apache/struts2/util/ContentTypeMatcher.java | 16 
 .../struts2/util/DefaultContentTypeMatcher.java | 20 +
 .../struts2/util/StrutsTestCaseHelper.java  | 30 ++-
 .../struts2/static/inputtransferselect.js   |  2 +-
 .../struts2/static/optiontransferselect.js  |  2 +-
 core/src/main/resources/struts-default.xml  |  2 +
 .../resources/template/css_xhtml/hidden.ftl | 23 ++
 .../ServletActionRedirectResultTest.java|  3 +-
 .../dispatcher/ServletRedirectResultTest.java   | 30 +++
 .../freemarker/FreemarkerResultMockedTest.java  | 84 +---
 plugins/cdi/pom.xml |  2 +-
 plugins/codebehind/pom.xml  |  2 +-
 plugins/config-browser/pom.xml  |  2 +-
 plugins/conventio

[23/28] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_22

2015-03-19 Thread lukaszlenart

[maven-release-plugin] prepare release STRUTS_2_3_22


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

Branch: refs/heads/develop
Commit: 22573f8de8b33ead0fee88eb67817985464218bb
Parents: 4f0f7d1
Author: Lukasz Lenart 
Authored: Thu Mar 19 07:11:15 2015 +0100
Committer: Lukasz Lenart 
Committed: Thu Mar 19 07:11:15 2015 +0100

--
 apps/blank/pom.xml  | 2 +-
 apps/jboss-blank/pom.xml| 2 +-
 apps/mailreader/pom.xml | 2 +-
 apps/pom.xml| 2 +-
 apps/portlet/pom.xml| 2 +-
 apps/rest-showcase/pom.xml  | 4 ++--
 apps/showcase/pom.xml   | 2 +-
 archetypes/pom.xml  | 2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  | 2 +-
 archetypes/struts2-archetype-blank/pom.xml  | 2 +-
 archetypes/struts2-archetype-convention/pom.xml | 2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  | 2 +-
 archetypes/struts2-archetype-plugin/pom.xml | 2 +-
 archetypes/struts2-archetype-portlet/pom.xml| 2 +-
 archetypes/struts2-archetype-starter/pom.xml| 2 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 8 ++--
 bundles/admin/pom.xml   | 2 +-
 bundles/demo/pom.xml| 2 +-
 bundles/pom.xml | 2 +-
 core/pom.xml| 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/codebehind/pom.xml  | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/pom.xml  | 2 +-
 plugins/dojo/pom.xml| 2 +-
 plugins/dwr/pom.xml | 2 +-
 plugins/embeddedjsp/pom.xml | 2 +-
 plugins/gxp/pom.xml | 2 +-
 plugins/jasperreports/pom.xml   | 2 +-
 plugins/java8-support/pom.xml   | 2 +-
 plugins/javatemplates/pom.xml   | 2 +-
 plugins/jfreechart/pom.xml  | 2 +-
 plugins/jsf/pom.xml | 2 +-
 plugins/json/pom.xml| 2 +-
 plugins/junit/pom.xml   | 2 +-
 plugins/osgi/pom.xml| 2 +-
 plugins/oval/pom.xml| 2 +-
 plugins/pell-multipart/pom.xml  | 2 +-
 plugins/plexus/pom.xml  | 2 +-
 plugins/pom.xml | 2 +-
 plugins/portlet-tiles/pom.xml   | 2 +-
 plugins/portlet/pom.xml | 2 +-
 plugins/rest/pom.xml| 2 +-
 plugins/sitegraph/pom.xml   | 2 +-
 plugins/sitemesh/pom.xml| 2 +-
 plugins/spring/pom.xml  | 2 +-
 plugins/struts1/pom.xml | 2 +-
 plugins/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 plugins/tiles3/pom.xml  | 2 +-
 pom.xml | 4 ++--
 xwork-core/pom.xml  | 2 +-
 53 files changed, 60 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/blank/pom.xml
--
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index a8d1cf8..48df955 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.22-SNAPSHOT
+2.3.22
 
 
 struts2-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/jboss-blank/pom.xml
--
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index e3da1b5..13d5cc2 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.22-SNAPSHOT
+2.3.22
 
 
 struts2-jboss-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/22573f8d/apps/mailreader/pom.xml
--
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index e239bdb..47f0a0e 100644
--- a/apps/mailreader/pom.xml
+++ b/apps/mailreader/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache.struts
   struts2-apps
-  2.3.22-SNA

svn commit: r8332 - /dev/struts/2.3.22/

[07/28] struts git commit: WW-4448 Replaces spaces with encoded value

[27/28] struts git commit: Sets proper released version

[02/28] struts git commit: WW-4447 Reverts some changes introduced by WW-4297 Resetting 'label' attribute can block user if they would like to develop their own hidden.ftl template

[10/28] struts git commit: WW-4446 Adds wrapper around Dispatcher in tests to avoid overwhelming warnings

[01/28] struts git commit: Starting new development cycle

[20/28] struts git commit: WW-4457 Uses dedicated type to match content type of uploaded files

[25/28] struts git commit: [maven-release-plugin] prepare for next development iteration

[21/28] struts git commit: Adds additional use case to check access to values of int type

[14/28] struts git commit: made bufferSize optional, see WW-4466

[18/28] struts git commit: WW-4467 disableRequestAttributeValueStackLookup applied to MultiPartRequestWrapper

[28/28] struts git commit: Sets proper released version

[03/28] struts git commit: change findBaseAccessor method

[12/28] struts git commit: Handle default (unnamed) package security check

[16/28] struts git commit: WW-4427 adds complete fix

[24/28] struts git commit: [maven-release-plugin] prepare for next development iteration

[05/28] struts git commit: WW-4448 Strips params and replaces spaces

[08/28] struts git commit: WW-4453 Reports missing value

[19/28] struts git commit: WW-4468 Switched to buildError on file limit excided

[11/28] struts git commit: WW-4452 Solves problem with using -1 as headerKey

[22/28] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_22

[06/28] struts git commit: WW-4449 Extends JSONWriter to support Javassist 3.18.1 and Hibernate 4.3.7

[15/28] struts git commit: WW-4465 Ignores statusCode parameter when building redirect url

[09/28] struts git commit: WW-4454 Adds dedicated hidden.ftl template to avoid problems with layout

[13/28] struts git commit: WW-4427 - Converters are no longer applied to values coming from the context on error path

[17/28] struts git commit: WW-4473 Adds support for title attribute in SubmitHandler

[04/28] struts git commit: Extracts string into constant

[26/28] struts git commit: Merge branch 'release/2.3.22'

[23/28] struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_22

29 matches

Site Navigation

Mail list logo

Footer information