date:20160612

[1/3] struts git commit: Upgrades to latest OGNL version

2016-06-12 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/support-2-3 88b885339 -> 1c92a8b2c


Upgrades to latest OGNL version


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

Branch: refs/heads/support-2-3
Commit: 8d172b8e9bf0beb1ed08a915737646e432b75e00
Parents: 88b8853
Author: Lukasz Lenart 
Authored: Fri Jun 3 13:08:51 2016 +0200
Committer: Lukasz Lenart 
Committed: Fri Jun 3 13:08:51 2016 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/8d172b8e/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ba60e74..2ce9f24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
 
 ${project.version}
 
3.0.5.RELEASE
-3.0.14
+3.0.17
 3.3
 5.0.2
 2.2.2

[3/3] struts git commit: Reverts previous RegEx

2016-06-12 Thread lukaszlenart

Reverts previous RegEx


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

Branch: refs/heads/support-2-3
Commit: 1c92a8b2c910abdfaf97b95f4bf5ec2bfbeefeb7
Parents: b28b78c
Author: Lukasz Lenart 
Authored: Fri Jun 3 13:12:02 2016 +0200
Committer: Lukasz Lenart 
Committed: Fri Jun 3 13:12:02 2016 +0200

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


http://git-wip-us.apache.org/repos/asf/struts/blob/1c92a8b2/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
--
diff --git 
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
 
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
index 529e033..d696d13 100644
--- 
a/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
+++ 
b/core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
@@ -120,7 +120,7 @@ public class DefaultActionMapper implements ActionMapper {
 protected boolean allowSlashesInActionNames = false;
 protected boolean alwaysSelectFullNamespace = false;
 protected PrefixTrie prefixTrie = null;
-protected Pattern allowedActionNames = 
Pattern.compile("^[a-zA-Z0-9_!/\\-]*((.htm[l]?)|(.action))?$");
+protected Pattern allowedActionNames = 
Pattern.compile("[a-zA-Z0-9._!/\\-]*");
 private boolean allowActionPrefix = false;
 private boolean allowActionCrossNamespaceAccess = false;

[2/3] struts git commit: Introduces new callMethod() function to be used to execute actions

2016-06-12 Thread lukaszlenart

Introduces new callMethod() function to be used to execute actions


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

Branch: refs/heads/support-2-3
Commit: b28b78c062f0bf3c79793a25aab8c9b6c12bce6e
Parents: 8d172b8
Author: Lukasz Lenart 
Authored: Fri Jun 3 13:10:58 2016 +0200
Committer: Lukasz Lenart 
Committed: Fri Jun 3 13:10:58 2016 +0200

--
 .../xwork2/DefaultActionInvocation.java |  4 +-
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java  | 64 
 .../opensymphony/xwork2/ognl/OgnlUtilTest.java  | 15 +
 3 files changed, 81 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/b28b78c0/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
--
diff --git 
a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java 
b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
index fcf397e..d4c995c 100644
--- 
a/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+++ 
b/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
@@ -427,13 +427,13 @@ public class DefaultActionInvocation implements 
ActionInvocation {
 
 Object methodResult;
 try {
-methodResult = ognlUtil.getValue(methodName + "()", 
getStack().getContext(), action);
+methodResult = ognlUtil.callMethod(methodName + "()", 
getStack().getContext(), action);
 } catch (MethodFailedException e) {
 // if reason is missing method, try find version with "do" 
prefix
 if (e.getReason() instanceof NoSuchMethodException) {
 try {
 String altMethodName = "do" + methodName.substring(0, 
1).toUpperCase() + methodName.substring(1) + "()";
-methodResult = ognlUtil.getValue(altMethodName, 
getStack().getContext(), action);
+methodResult = ognlUtil.callMethod(altMethodName, 
getStack().getContext(), action);
 } catch (MethodFailedException e1) {
 // if still method doesn't exist, try checking 
UnknownHandlers
 if (e1.getReason() instanceof NoSuchMethodException) {

http://git-wip-us.apache.org/repos/asf/struts/blob/b28b78c0/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
--
diff --git 
a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java 
b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index 40d112b..42132ba 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -290,6 +290,9 @@ public class OgnlUtil {
 if (isEvalExpression(tree, context)) {
 throw new OgnlException("Eval expression/chained 
expressions cannot be used as parameter name");
 }
+if (isArithmeticExpression(tree, context)) {
+throw new OgnlException("Arithmetic expressions cannot be 
used as parameter name");
+}
 Ognl.setValue(tree, context, root, value);
 return null;
 }
@@ -309,6 +312,32 @@ public class OgnlUtil {
 return false;
 }
 
+private boolean isArithmeticExpression(Object tree, Map 
context) throws OgnlException {
+if (tree instanceof SimpleNode) {
+SimpleNode node = (SimpleNode) tree;
+OgnlContext ognlContext = null;
+
+if (context!=null && context instanceof OgnlContext) {
+ognlContext = (OgnlContext) context;
+}
+return node.isOperation(ognlContext);
+}
+return false;
+}
+
+private boolean isSimpleMethod(Object tree, Map context) 
throws OgnlException {
+if (tree instanceof SimpleNode) {
+SimpleNode node = (SimpleNode) tree;
+OgnlContext ognlContext = null;
+
+if (context!=null && context instanceof OgnlContext) {
+ognlContext = (OgnlContext) context;
+}
+return node.isSimpleMethod(ognlContext) && 
!node.isChain(ognlContext);
+}
+return false;
+}
+
 public Object getValue(final String name, final Map 
context, final Object root) throws OgnlException {
 return compileAndExecute(name, context, new OgnlTask() {
 public Object execute(Obje

[2/4] struts git commit: Drops unneeded method

2016-06-12 Thread lukaszlenart

Drops unneeded method

(cherry picked from commit 3f526d630aa56393233500c874293c29abec54ae)


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

Branch: refs/heads/master
Commit: ce294b48df537a751ead50d3139eaa5f42234be5
Parents: 04e5e9d
Author: Lukasz Lenart 
Authored: Sun Jun 12 13:02:03 2016 +0200
Committer: Lukasz Lenart 
Committed: Sun Jun 12 13:02:03 2016 +0200

--
 core/src/main/java/com/opensymphony/xwork2/ActionSupport.java   | 4 
 .../test/java/com/opensymphony/xwork2/ActionSupportTest.java| 5 ++---
 2 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/ce294b48/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
--
diff --git a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java 
b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
index 1506fad..62f24df 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -156,10 +156,6 @@ public class ActionSupport implements Action, 
Validateable, ValidationAware, Tex
 return INPUT;
 }
 
-public String doDefault() throws Exception {
-return SUCCESS;
-}
-
 /**
  * A default implementation that does nothing an returns "success".
  *

http://git-wip-us.apache.org/repos/asf/struts/blob/ce294b48/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
--
diff --git a/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java 
b/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
index 2482ca0..cbbd58b 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
@@ -64,7 +64,6 @@ public class ActionSupportTest extends XWorkTestCase {
 }
 
 assertEquals(Action.INPUT, as.input());
-assertEquals(Action.SUCCESS, as.doDefault());
 assertEquals(Action.SUCCESS, as.execute());
 try {
 as.clone();
@@ -157,7 +156,7 @@ public class ActionSupportTest extends XWorkTestCase {
 ActionContext.getContext().setLocale(new Locale("da"));
 MyActionSupport mas = new MyActionSupport();
 
-assertEquals("santa", mas.doDefault());
+assertEquals("santa", mas.execute());
 assertNotNull(mas.getTexts());
 
 assertEquals(false, mas.hasActionMessages());
@@ -331,7 +330,7 @@ public class ActionSupportTest extends XWorkTestCase {
 private Double val;
 
 @Override
-public String doDefault() throws Exception {
+public String execute() throws Exception {
 return "santa";
 }

[4/4] struts git commit: WW-4632 Uses proper DTD version

2016-06-12 Thread lukaszlenart

WW-4632 Uses proper DTD version


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

Branch: refs/heads/master
Commit: e60119436a00a3ac177439c8e17d9743dc16a480
Parents: 7da4ef3
Author: Lukasz Lenart 
Authored: Sun Jun 12 13:10:49 2016 +0200
Committer: Lukasz Lenart 
Committed: Sun Jun 12 13:10:49 2016 +0200

--
 apps/portlet/src/main/resources/struts-edit.xml  | 4 ++--
 apps/portlet/src/main/resources/struts-eventing.xml  | 4 ++--
 apps/portlet/src/main/resources/struts-help.xml  | 4 ++--
 apps/portlet/src/main/resources/struts-tiles.xml | 4 ++--
 apps/portlet/src/main/resources/struts-view.xml  | 4 ++--
 apps/portlet/src/main/resources/struts.xml   | 4 ++--
 apps/showcase/src/main/resources/struts-actionchaining.xml   | 4 ++--
 apps/showcase/src/main/resources/struts-conversion.xml   | 4 ++--
 apps/showcase/src/main/resources/struts-filedownload.xml | 4 ++--
 apps/showcase/src/main/resources/struts-fileupload.xml   | 4 ++--
 apps/showcase/src/main/resources/struts-freemarker.xml   | 4 ++--
 apps/showcase/src/main/resources/struts-hangman.xml  | 4 ++--
 apps/showcase/src/main/resources/struts-interactive.xml  | 4 ++--
 apps/showcase/src/main/resources/struts-model-driven.xml | 4 ++--
 apps/showcase/src/main/resources/struts-person.xml   | 4 ++--
 apps/showcase/src/main/resources/struts-tags-non-ui.xml  | 4 ++--
 apps/showcase/src/main/resources/struts-tags-ui.xml  | 4 ++--
 apps/showcase/src/main/resources/struts-tags.xml | 4 ++--
 apps/showcase/src/main/resources/struts-tiles.xml| 4 ++--
 apps/showcase/src/main/resources/struts-token.xml| 4 ++--
 apps/showcase/src/main/resources/struts-validation.xml   | 4 ++--
 apps/showcase/src/main/resources/struts-wait.xml | 4 ++--
 apps/showcase/src/main/resources/struts-xslt.xml | 4 ++--
 apps/showcase/src/main/resources/struts.xml  | 4 ++--
 .../resources/archetype-resources/src/main/resources/struts.xml  | 4 ++--
 .../resources/archetype-resources/src/main/resources/example.xml | 4 ++--
 .../resources/archetype-resources/src/main/resources/struts.xml  | 4 ++--
 .../resources/archetype-resources/src/main/resources/struts.xml  | 4 ++--
 .../resources/archetype-resources/src/main/resources/struts.xml  | 4 ++--
 .../archetype-resources/src/main/resources/struts-plugin.xml | 4 ++--
 .../resources/archetype-resources/src/main/resources/struts.xml  | 4 ++--
 .../resources/archetype-resources/src/main/resources/struts.xml  | 4 ++--
 core/src/test/resources/struts-object-factory-result-builder.xml | 4 ++--
 plugins/bean-validation/src/main/resources/struts-plugin.xml | 4 ++--
 plugins/cdi/src/main/resources/struts-plugin.xml | 4 ++--
 plugins/config-browser/src/main/resources/struts-plugin.xml  | 4 ++--
 plugins/convention/src/main/resources/struts-plugin.xml  | 4 ++--
 plugins/embeddedjsp/src/main/resources/struts-plugin.xml | 4 ++--
 plugins/gxp/src/main/resources/struts-plugin.xml | 4 ++--
 plugins/jasperreports/src/main/resources/struts-plugin.xml   | 4 ++--
 plugins/java8-support/src/main/resources/struts-plugin.xml   | 4 ++--
 plugins/javatemplates/src/main/resources/struts-plugin.xml   | 4 ++--
 plugins/jfreechart/src/main/resources/struts-plugin.xml  | 4 ++--
 plugins/json/src/main/resources/struts-plugin.xml| 4 ++--
 .../junit/src/test/resources/struts-convention-configuration.xml | 4 ++--
 plugins/osgi/src/main/resources/struts-plugin.xml| 4 ++--
 plugins/oval/src/main/resources/struts-plugin.xml| 4 ++--
 plugins/pell-multipart/src/main/resources/struts-plugin.xml  | 4 ++--
 plugins/plexus/src/main/resources/struts-plugin.xml  | 4 ++--
 plugins/portlet-tiles/src/main/resources/struts-plugin.xml   | 4 ++--
 plugins/portlet/src/main/resources/struts-plugin.xml | 4 ++--
 plugins/portlet/src/test/resources/struts.xml| 4 ++--
 plugins/sitemesh/src/main/resources/struts-plugin.xml| 4 ++--
 plugins/spring/src/main/resources/struts-plugin.xml  | 4 ++--
 plugins/tiles/src/main/resources/struts-plugin.xml   | 4 ++--
 55 files changed, 110 insertions(+), 110 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/e6011943/apps/portlet/src/main/resources/struts-edit.xml
-

[1/4] struts git commit: Upgrades OGNL to the latest version

2016-06-12 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/master e28e5f03a -> e60119436


Upgrades OGNL to the latest version


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

Branch: refs/heads/master
Commit: 04e5e9dde8bce770ca2780fcb18f18f311c0c7aa
Parents: e28e5f0
Author: Lukasz Lenart 
Authored: Sun Jun 12 12:54:15 2016 +0200
Committer: Lukasz Lenart 
Committed: Sun Jun 12 12:54:15 2016 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/04e5e9dd/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 323cf9e..3e4ebd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
 
 ${project.version}
 
4.1.6.RELEASE
-3.1.4
+3.1.8
 3.3
 5.0.2
 3.0.5

[3/4] struts git commit: Introduces new callMethod() function to be used to execute actions

2016-06-12 Thread lukaszlenart

Introduces new callMethod() function to be used to execute actions

(cherry picked from commit b28b78c062f0bf3c79793a25aab8c9b6c12bce6e)


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

Branch: refs/heads/master
Commit: 7da4ef39023bb5d86509d65565a04b533e8b4c55
Parents: ce294b4
Author: Lukasz Lenart 
Authored: Sun Jun 12 13:03:39 2016 +0200
Committer: Lukasz Lenart 
Committed: Sun Jun 12 13:03:39 2016 +0200

--
 .../xwork2/DefaultActionInvocation.java |  2 +-
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java  | 64 
 .../opensymphony/xwork2/ognl/OgnlUtilTest.java  | 15 +
 3 files changed, 80 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/7da4ef39/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java 
b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
index 167159c..639bf95 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
@@ -419,7 +419,7 @@ public class DefaultActionInvocation implements 
ActionInvocation {
 
 Object methodResult;
 try {
-methodResult = ognlUtil.getValue(methodName + "()", 
getStack().getContext(), action);
+methodResult = ognlUtil.callMethod(methodName + "()", 
getStack().getContext(), action);
 } catch (MethodFailedException e) {
 // if reason is missing method,  try checking UnknownHandlers
 if (e.getReason() instanceof NoSuchMethodException) {

http://git-wip-us.apache.org/repos/asf/struts/blob/7da4ef39/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
--
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java 
b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index 562b6fc..86e9c53 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -289,6 +289,9 @@ public class OgnlUtil {
 if (isEvalExpression(tree, context)) {
 throw new OgnlException("Eval expression/chained 
expressions cannot be used as parameter name");
 }
+if (isArithmeticExpression(tree, context)) {
+throw new OgnlException("Arithmetic expressions cannot be 
used as parameter name");
+}
 Ognl.setValue(tree, context, root, value);
 return null;
 }
@@ -308,6 +311,32 @@ public class OgnlUtil {
 return false;
 }
 
+private boolean isArithmeticExpression(Object tree, Map 
context) throws OgnlException {
+if (tree instanceof SimpleNode) {
+SimpleNode node = (SimpleNode) tree;
+OgnlContext ognlContext = null;
+
+if (context!=null && context instanceof OgnlContext) {
+ognlContext = (OgnlContext) context;
+}
+return node.isOperation(ognlContext);
+}
+return false;
+}
+
+private boolean isSimpleMethod(Object tree, Map context) 
throws OgnlException {
+if (tree instanceof SimpleNode) {
+SimpleNode node = (SimpleNode) tree;
+OgnlContext ognlContext = null;
+
+if (context!=null && context instanceof OgnlContext) {
+ognlContext = (OgnlContext) context;
+}
+return node.isSimpleMethod(ognlContext) && 
!node.isChain(ognlContext);
+}
+return false;
+}
+
 public Object getValue(final String name, final Map 
context, final Object root) throws OgnlException {
 return compileAndExecute(name, context, new OgnlTask() {
 public Object execute(Object tree) throws OgnlException {
@@ -316,6 +345,14 @@ public class OgnlUtil {
 });
 }
 
+public Object callMethod(final String name, final Map 
context, final Object root) throws OgnlException {
+return compileAndExecuteMethod(name, context, new OgnlTask() {
+public Object execute(Object tree) throws OgnlException {
+return Ognl.getValue(tree, context, root);
+}
+});
+}
+
 public Object getValue(final String name, final Map 
context, final Object root, final Class resultType) throws OgnlException {
 return compileA

struts-examples git commit: Fixes typo

2016-06-12 Thread lukaszlenart

Repository: struts-examples
Updated Branches:
  refs/heads/master 558c6b0f8 -> 77945afaf


Fixes typo


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

Branch: refs/heads/master
Commit: 77945afafe3185b63e650aa3798e954e4dd587a6
Parents: 558c6b0
Author: Lukasz Lenart 
Authored: Wed May 4 09:32:07 2016 +0200
Committer: Lukasz Lenart 
Committed: Sun Jun 12 15:30:12 2016 +0200

--
 type-conversion/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/77945afa/type-conversion/pom.xml
--
diff --git a/type-conversion/pom.xml b/type-conversion/pom.xml
index 45f9c93..8939ee2 100644
--- a/type-conversion/pom.xml
+++ b/type-conversion/pom.xml
@@ -11,7 +11,7 @@
 
   type-conversion
   war
-  Custom Type Convertion
+  Type Conversion
 
   
 UTF-8

struts-examples git commit: Uses var instead of id

2016-06-12 Thread lukaszlenart

Repository: struts-examples
Updated Branches:
  refs/heads/master 77945afaf -> 410e1dd80


Uses var instead of id


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

Branch: refs/heads/master
Commit: 410e1dd809e3d6c7ada8965e0788248bf9e502a4
Parents: 77945af
Author: Lukasz Lenart 
Authored: Sun Jun 12 15:35:58 2016 +0200
Committer: Lukasz Lenart 
Committed: Sun Jun 12 15:35:58 2016 +0200

--
 blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/410e1dd8/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
--
diff --git a/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp 
b/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
index 17b0963..a845c1e 100644
--- a/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
+++ b/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
@@ -11,13 +11,13 @@
 Languages
 
 
-
+
 en
 
 English
 
 
-
+
 es
 
 Espanol

[2/2] struts git commit: WW-4640 Adds more informative message when method is not allowed

2016-06-12 Thread lukaszlenart

WW-4640 Adds more informative message when method is not allowed


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

Branch: refs/heads/master
Commit: 1afb48aa765a96a9d183bb4ac249bfcc8f7daf3a
Parents: ca256a7
Author: Lukasz Lenart 
Authored: Sun Jun 12 15:41:28 2016 +0200
Committer: Lukasz Lenart 
Committed: Sun Jun 12 15:41:28 2016 +0200

--
 .../opensymphony/xwork2/DefaultActionProxy.java | 14 +---
 .../xwork2/xwork-messages.properties|  2 +-
 .../xwork2/DefaultActionProxyTest.java  | 24 
 3 files changed, 36 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/1afb48aa/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
--
diff --git a/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java 
b/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
index 72c6e9e..2d8bc38 100644
--- a/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
+++ b/core/src/main/java/com/opensymphony/xwork2/DefaultActionProxy.java
@@ -197,22 +197,30 @@ public class DefaultActionProxy implements ActionProxy, 
Serializable {
 if (config.isAllowedMethod(method)) {
 invocation.init(this);
 } else {
-throw new ConfigurationException("This method: " + method + " 
for action " + actionName + " is not allowed!");
+throw new 
ConfigurationException(prepareNotAllowedErrorMessage());
 }
 } finally {
 UtilTimerStack.pop(profileKey);
 }
 }
 
+protected String prepareNotAllowedErrorMessage() {
+return LocalizedTextUtil.findDefaultText(
+"struts.exception.method-not-allowed",
+Locale.getDefault(),
+new String[]{method, actionName}
+);
+}
+
 protected String getErrorMessage() {
 if ((namespace != null) && (namespace.trim().length() > 0)) {
 return LocalizedTextUtil.findDefaultText(
-XWorkMessages.MISSING_PACKAGE_ACTION_EXCEPTION,
+"xwork.exception.missing-package-action",
 Locale.getDefault(),
 new String[]{namespace, actionName});
 } else {
 return LocalizedTextUtil.findDefaultText(
-XWorkMessages.MISSING_ACTION_EXCEPTION,
+"xwork.exception.missing-action",
 Locale.getDefault(),
 new String[]{actionName});
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/1afb48aa/core/src/main/resources/com/opensymphony/xwork2/xwork-messages.properties
--
diff --git 
a/core/src/main/resources/com/opensymphony/xwork2/xwork-messages.properties 
b/core/src/main/resources/com/opensymphony/xwork2/xwork-messages.properties
index 6068879..94781f5 100644
--- a/core/src/main/resources/com/opensymphony/xwork2/xwork-messages.properties
+++ b/core/src/main/resources/com/opensymphony/xwork2/xwork-messages.properties
@@ -7,4 +7,4 @@ xwork.error.action.execution=Error during Action invocation
 xwork.exception.missing-action=There is no Action mapped for action name {0}.
 xwork.exception.missing-package-action=There is no Action mapped for namespace 
{0} and action name {1}.
 xwork.default.invalid.fieldvalue=Invalid field value for field "{0}".
-
+struts.exception.method-not-allowed=Method {0} for action {1} is not allowed!

http://git-wip-us.apache.org/repos/asf/struts/blob/1afb48aa/core/src/test/java/com/opensymphony/xwork2/DefaultActionProxyTest.java
--
diff --git 
a/core/src/test/java/com/opensymphony/xwork2/DefaultActionProxyTest.java 
b/core/src/test/java/com/opensymphony/xwork2/DefaultActionProxyTest.java
new file mode 100644
index 000..17d7c68
--- /dev/null
+++ b/core/src/test/java/com/opensymphony/xwork2/DefaultActionProxyTest.java
@@ -0,0 +1,24 @@
+package com.opensymphony.xwork2;
+
+import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
+import com.opensymphony.xwork2.mock.MockActionInvocation;
+import org.apache.struts2.StrutsInternalTestCase;
+import org.junit.Test;
+
+public class DefaultActionProxyTest extends StrutsInternalTestCase {
+
+@Test
+public void testThorwExceptionOnNotAllowedMethod() throws Exception {
+final String filename = 
"com/opensymphony/xwork2/config/providers/xwork-test-allowed-methods.xml";
+loadConfigurationProviders(new

[1/2] struts git commit: Inlines constants and drops class

2016-06-12 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/master e60119436 -> 1afb48aa7


Inlines constants and drops class


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

Branch: refs/heads/master
Commit: ca256a74e98861a70c446b309dbe8ca1669dbba6
Parents: e601194
Author: Lukasz Lenart 
Authored: Sun Jun 12 15:22:45 2016 +0200
Committer: Lukasz Lenart 
Committed: Sun Jun 12 15:22:45 2016 +0200

--
 .../com/opensymphony/xwork2/XWorkMessages.java  | 31 
 .../xwork2/conversion/impl/XWorkConverter.java  |  2 +-
 .../xwork2/util/LocalizedTextUtilTest.java  | 13 
 3 files changed, 6 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/ca256a74/core/src/main/java/com/opensymphony/xwork2/XWorkMessages.java
--
diff --git a/core/src/main/java/com/opensymphony/xwork2/XWorkMessages.java 
b/core/src/main/java/com/opensymphony/xwork2/XWorkMessages.java
deleted file mode 100644
index d187acc..000
--- a/core/src/main/java/com/opensymphony/xwork2/XWorkMessages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2002-2006,2009 The Apache Software Foundation.
- * 
- * Licensed 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 com.opensymphony.xwork2;
-
-
-/**
- * Contains constants for some default XWork messages.
- *
- * @author Jason Carreira
- */
-public interface XWorkMessages {
-
-public static final String ACTION_EXECUTION_ERROR = 
"xwork.error.action.execution";
-public static final String MISSING_ACTION_EXCEPTION   = 
"xwork.exception.missing-action";
-public static final String MISSING_PACKAGE_ACTION_EXCEPTION   = 
"xwork.exception.missing-package-action";
-public static final String DEFAULT_INVALID_FIELDVALUE = 
"xwork.default.invalid.fieldvalue";
-
-}

http://git-wip-us.apache.org/repos/asf/struts/blob/ca256a74/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
 
b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
index c946d70..9dfcd4d 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkConverter.java
@@ -194,7 +194,7 @@ public class XWorkConverter extends DefaultTypeConverter {
 }
 
 public static String getConversionErrorMessage(String propertyName, 
ValueStack stack) {
-String defaultMessage = 
LocalizedTextUtil.findDefaultText(XWorkMessages.DEFAULT_INVALID_FIELDVALUE,
+String defaultMessage = 
LocalizedTextUtil.findDefaultText("xwork.default.invalid.fieldvalue",
 ActionContext.getContext().getLocale(),
 new Object[]{
 propertyName

http://git-wip-us.apache.org/repos/asf/struts/blob/ca256a74/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java
--
diff --git 
a/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java 
b/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java
index 1205852..f09bc9b 100644
--- a/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/util/LocalizedTextUtilTest.java
@@ -20,10 +20,7 @@ import com.opensymphony.xwork2.*;
 import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider;
 import com.opensymphony.xwork2.test.ModelDrivenAction2;
 import com.opensymphony.xwork2.test.TestBean2;
-import org.apache.struts2.util.DateFormatter;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.swing.text.Style;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.Date;
@@ -134,17 +131,17 @@ public class LocalizedTextUtilTest extends XWorkTestCase {
 }
 
 public void testDefaultMessage() throws Exc

[08/20] struts git commit: Merge pull request #15 from apache/master

2016-06-12 Thread lukaszlenart

Merge pull request #15 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/b4facc8e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b4facc8e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b4facc8e

Branch: refs/heads/master
Commit: b4facc8e0674851be581dc74cc262f275734a180
Parents: ca74ac3 104bd92
Author: victor sosa 
Authored: Tue May 17 08:39:51 2016 -0400
Committer: victor sosa 
Committed: Tue May 17 08:39:51 2016 -0400

--
 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 +-
 .../xwork2/config/entities/ActionConfig.java| 11 ++--
 .../xwork2/config/entities/AllowedMethods.java  |  4 +-
 .../config/impl/DefaultConfiguration.java   | 10 
 .../providers/XmlConfigurationProvider.java |  6 ++-
 .../validator/validators/EmailValidator.java|  4 +-
 .../org/apache/struts2/StrutsConstants.java |  1 +
 .../dispatcher/mapper/DefaultActionMapper.java  | 10 +---
 .../MessageStorePreResultListener.java  |  3 +-
 .../main/resources/template/simple/submit.ftl   |  6 +--
 .../template/xhtml/controlheader-core.ftl   |  4 +-
 .../config/impl/ActionConfigMatcherTest.java|  3 ++
 .../xwork2/validator/EmailValidatorTest.java|  1 +
 .../mapper/DefaultActionMapperTest.java | 30 +--
 .../apache/struts2/views/jsp/ui/SubmitTest.java |  2 +-
 .../struts2/views/jsp/ui/TextfieldTest.java | 56 
 .../apache/struts2/views/jsp/ui/Submit-1.txt|  2 +-
 .../apache/struts2/views/jsp/ui/Submit-2.txt|  2 +-
 .../apache/struts2/views/jsp/ui/Submit-5.txt|  2 +-
 .../apache/struts2/views/jsp/ui/Submit-6.txt|  2 +-
 .../struts2/views/jsp/ui/Textfield-12.txt   | 11 
 .../struts2/views/jsp/ui/Textfield-13.txt   | 11 
 plugins/bean-validation/pom.xml |  2 +-
 plugins/cdi/pom.xml |  2 +-
 plugins/config-browser/pom.xml  |  2 +-
 plugins/convention/pom.xml  |  2 +-
 .../PackageBasedActionConfigBuilder.java|  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/json/pom.xml|  2 +-
 .../org/apache/struts2/json/JSONWriterTest.java | 37 +
 .../struts2/json/jsonwriter-write-bean-04.txt   | 16 ++
 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/testng/pom.xml  |  2 +-
 plugins/tiles/pom.xml   |  2 +-
 pom.xml |  4 +-
 69 files changed, 251 insertions(+), 81 deletions(-)
--

[18/20] struts git commit: fix test cases

2016-06-12 Thread lukaszlenart

fix test cases


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

Branch: refs/heads/master
Commit: 8fea9566a931d7d9d3a3c74234d6813db312475f
Parents: 2cd28b1 ffdacf1
Author: victorsosa 
Authored: Wed May 25 10:36:53 2016 -0400
Committer: victorsosa 
Committed: Wed May 25 10:36:53 2016 -0400

--
 apps/pom.xml|  2 +-
 apps/portlet/pom.xml|  2 +-
 .../src/main/webapp/WEB-INF/view/index.jsp  |  4 +-
 .../struts2/portlet/test/BasePortletTest.java   | 20 +--
 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 +-
 .../xwork2/config/entities/ActionConfig.java| 23 ++--
 .../xwork2/config/entities/AllowedMethods.java  | 41 +-
 .../xwork2/config/impl/ActionConfigMatcher.java |  1 +
 .../config/impl/DefaultConfiguration.java   | 10 
 .../providers/XmlConfigurationProvider.java |  7 ++-
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java  |  6 +--
 .../validator/validators/EmailValidator.java|  4 +-
 .../org/apache/struts2/StrutsConstants.java |  1 +
 .../dispatcher/mapper/DefaultActionMapper.java  | 14 ++---
 .../MessageStorePreResultListener.java  |  3 +-
 .../apache/struts2/views/xslt/XSLTResult.java   |  7 +--
 core/src/main/resources/struts-default.xml  |  2 +
 .../main/resources/template/simple/submit.ftl   |  6 +--
 .../template/xhtml/controlheader-core.ftl   |  4 +-
 .../config/entities/AllowedMethodsTest.java | 46 +---
 .../config/impl/ActionConfigMatcherTest.java|  3 ++
 .../opensymphony/xwork2/ognl/OgnlUtilTest.java  | 15 ++
 .../DefaultExcludedPatternsCheckerTest.java |  1 -
 .../xwork2/validator/EmailValidatorTest.java|  2 +
 .../mapper/DefaultActionMapperTest.java | 30 +--
 .../apache/struts2/views/jsp/ui/SubmitTest.java |  2 +-
 .../struts2/views/jsp/ui/TextfieldTest.java | 56 
 .../apache/struts2/views/jsp/ui/Submit-1.txt|  2 +-
 .../apache/struts2/views/jsp/ui/Submit-2.txt|  2 +-
 .../apache/struts2/views/jsp/ui/Submit-5.txt|  2 +-
 .../apache/struts2/views/jsp/ui/Submit-6.txt|  2 +-
 .../struts2/views/jsp/ui/Textfield-12.txt   | 11 
 .../struts2/views/jsp/ui/Textfield-13.txt   | 11 
 plugins/bean-validation/pom.xml |  2 +-
 plugins/cdi/pom.xml |  2 +-
 plugins/config-browser/pom.xml  |  2 +-
 plugins/convention/pom.xml  |  2 +-
 .../PackageBasedActionConfigBuilder.java|  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/json/pom.xml|  2 +-
 .../org/apache/struts2/json/JSONWriterTest.java | 37 +
 .../struts2/json/jsonwriter-write-bean-04.txt   | 16 ++
 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 +-
 .../apache/struts2/rest/RestActionMapper.java   |  2 +-
 plugins/sitegraph/pom.xml   |  2 +-
 plugins/sitemesh/pom.xml|  2 +-
 plugins/spring/pom.xml  |  2 +

[01/20] struts git commit: Merge pull request #8 from apache/master

2016-06-12 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/master 1afb48aa7 -> 08360cb91


Merge pull request #8 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/da8b13a8
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/da8b13a8
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/da8b13a8

Branch: refs/heads/master
Commit: da8b13a87ef0d6af54a8cabbc62d54fbca67f683
Parents: f34283b f9fb354
Author: victor sosa 
Authored: Thu Mar 3 14:16:11 2016 -0400
Committer: victor sosa 
Committed: Thu Mar 3 14:16:11 2016 -0400

--
 apps/portlet/pom.xml|  2 +-
 .../struts2/portlet/test/BasePortletTest.java   |  6 ++-
 .../portlet/test/Struts2PortletTest.java|  2 +
 .../template/VelocityTemplateEngine.java|  2 +-
 .../struts2/dispatcher/PrepareOperations.java   |  2 +
 .../struts2/result/VelocityResultTest.java  |  4 +-
 .../views/java/simple/TextFieldHandler.java |  4 +-
 .../sitemesh/VelocityDecoratorServlet.java  | 53 +---
 pom.xml |  4 +-
 9 files changed, 50 insertions(+), 29 deletions(-)
--

[11/20] struts git commit: WW-4634

2016-06-12 Thread lukaszlenart

WW-4634


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

Branch: refs/heads/master
Commit: d06c71d68e5c10990386e8904ca60927ed209250
Parents: 6b36010
Author: victorsosa 
Authored: Tue May 17 09:03:27 2016 -0400
Committer: victorsosa 
Committed: Tue May 17 09:03:27 2016 -0400

--
 core/src/main/resources/template/xhtml/controlheader.ftl | 2 +-
 core/src/main/resources/template/xhtml/styles.css| 8 
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/d06c71d6/core/src/main/resources/template/xhtml/controlheader.ftl
--
diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl 
b/core/src/main/resources/template/xhtml/controlheader.ftl
index eeebe9f..8b855b8 100644
--- a/core/src/main/resources/template/xhtml/controlheader.ftl
+++ b/core/src/main/resources/template/xhtml/controlheader.ftl
@@ -23,6 +23,6 @@
 <#include 
"/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" />
 
-class="tdAlign${parameters.align?html}"
+class="tdAlign-${parameters.align?html}"
 
 ><#t/>

http://git-wip-us.apache.org/repos/asf/struts/blob/d06c71d6/core/src/main/resources/template/xhtml/styles.css
--
diff --git a/core/src/main/resources/template/xhtml/styles.css 
b/core/src/main/resources/template/xhtml/styles.css
index 383578b..fe20517 100644
--- a/core/src/main/resources/template/xhtml/styles.css
+++ b/core/src/main/resources/template/xhtml/styles.css
@@ -36,7 +36,7 @@
 .tdErrorMessage {text-align:center; vertical-align:top;}
 .formButton {text-align:right;}
 
-.tdAligncenter{text-align:center;}
-.tdAlignright{text-align:right;}
-.tdAlignleft{text-align:left;}
-.tdAlignjustify{text-align:justify;}
+.tdAlign-center{text-align:center;}
+.tdAlign-right{text-align:right;}
+.tdAlign-left{text-align:left;}
+.tdAlign-justify{text-align:justify;}

[05/20] struts git commit: Merge pull request #13 from apache/master

2016-06-12 Thread lukaszlenart

Merge pull request #13 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/47cf4ff8
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/47cf4ff8
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/47cf4ff8

Branch: refs/heads/master
Commit: 47cf4ff84b07523cca2e1c5571742368c5cb5556
Parents: 379b752 cb5e197
Author: victor sosa 
Authored: Wed Apr 20 14:58:32 2016 -0400
Committer: victor sosa 
Committed: Wed Apr 20 14:58:32 2016 -0400

--
 .../src/main/webapp/WEB-INF/view/index.jsp  |  4 ++--
 .../struts2/portlet/test/BasePortletTest.java   | 20 ++---
 .../validator/validators/EmailValidator.java|  4 ++--
 .../DefaultExcludedPatternsCheckerTest.java |  1 -
 .../xwork2/validator/EmailValidatorTest.java|  1 +
 .../tiles/StrutsApplicationResource.java|  4 
 .../tiles/StrutsTilesContainerFactory.java  | 23 
 ...StrutsWildcardServletApplicationContext.java |  8 +--
 8 files changed, 46 insertions(+), 19 deletions(-)
--

[17/20] struts git commit: fix test

2016-06-12 Thread lukaszlenart

fix test


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

Branch: refs/heads/master
Commit: 2cd28b160ec72af7888951019762f1c069c65bf2
Parents: 30b74a3
Author: victorsosa 
Authored: Wed May 25 09:47:28 2016 -0400
Committer: victorsosa 
Committed: Wed May 25 09:47:28 2016 -0400

--
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt | 2 +-
 .../org/apache/struts2/views/jsp/ui/updownselecttag-1.txt| 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-10.txt   | 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-11.txt   | 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-2.txt| 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-3.txt| 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-4.txt| 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-5.txt| 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-6.txt| 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-7.txt| 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-8.txt| 4 ++--
 .../org/apache/struts2/views/jsp/ui/updownselecttag-9.txt| 4 ++--
 .../org/apache/struts2/views/jsp/ui/validationstyles-1.txt   | 2 +-
 .../org/apache/struts2/views/jsp/ui/validationstyles-2.txt   | 2 +-
 .../org/apache/struts2/views/jsp/ui/validationstyles-3.txt   | 2 +-
 20 files changed, 31 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/2cd28b16/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
--
diff --git 
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt 
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
index e64dc79..efb3596 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
@@ -3,7 +3,7 @@
 
  
 
-   
+   
 
 
 

http://git-wip-us.apache.org/repos/asf/struts/blob/2cd28b16/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
--
diff --git 
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt 
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
index 8cd2102..806a94e 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
@@ -3,7 +3,7 @@
 
  
 
-   
+   
 
 
 

http://git-wip-us.apache.org/repos/asf/struts/blob/2cd28b16/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
--
diff --git 
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt 
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
index ab2a1ee..710ad54 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt
@@ -3,7 +3,7 @@
 
  
 
-   
+   
 
 
 

http://git-wip-us.apache.org/repos/asf/struts/blob/2cd28b16/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
--
diff --git 
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt 
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
index afbd049..f512ff4 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt
@@ -3,7 +3,7 @@
 
  
 
-   
+   
 
 
 

http://git-wip-us.apache.org/repos/asf/struts/blob/2cd28b16/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt
--
diff --git 
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt 
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt
index a9b9244..01efdf1 100644
--- a/core/src/test/r

[19/20] struts git commit: fix test cases

2016-06-12 Thread lukaszlenart

fix test cases


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

Branch: refs/heads/master
Commit: e0b13a5b0b5e7820729cba570082fe698dacb7c7
Parents: 8fea956
Author: victorsosa 
Authored: Wed May 25 10:38:37 2016 -0400
Committer: victorsosa 
Committed: Wed May 25 10:38:37 2016 -0400

--
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-13.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/e0b13a5b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt
--
diff --git 
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt 
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt
index 9a3155d..956c891 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt
@@ -5,7 +5,7 @@
   *:
 
   
-  
+  
 
   
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/e0b13a5b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-13.txt
--
diff --git 
a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-13.txt 
b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-13.txt
index e5e6e92..373f0dc 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-13.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-13.txt
@@ -5,7 +5,7 @@
   mylabel:
 
   
-  
+  
 
   
 
\ No newline at end of file

[04/20] struts git commit: Merge pull request #11 from apache/master

2016-06-12 Thread lukaszlenart

Merge pull request #11 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/379b7529
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/379b7529
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/379b7529

Branch: refs/heads/master
Commit: 379b75292e6d084dc881e71f0a826c45934d9df8
Parents: 6bb1ec6 5e31097
Author: victor sosa 
Authored: Sun Mar 27 14:43:40 2016 -0400
Committer: victor sosa 
Committed: Sun Mar 27 14:43:40 2016 -0400

--
 .travis.yml |9 +
 README.md   |5 +
 .../org/demo/rest/example/IndexController.java  |   16 +
 apps/rest-showcase/src/main/webapp/index.jsp|2 -
 .../webapp/js/lib/angular/angular-animate.js|  915 ++--
 .../js/lib/angular/angular-animate.min.js   |  104 +-
 .../js/lib/angular/angular-animate.min.js.map   |4 +-
 .../main/webapp/js/lib/angular/angular-aria.js  |  171 +-
 .../webapp/js/lib/angular/angular-aria.min.js   |   19 +-
 .../js/lib/angular/angular-aria.min.js.map  |6 +-
 .../webapp/js/lib/angular/angular-cookies.js|   19 +-
 .../js/lib/angular/angular-cookies.min.js   |   10 +-
 .../js/lib/angular/angular-cookies.min.js.map   |4 +-
 .../webapp/js/lib/angular/angular-loader.js |   51 +-
 .../webapp/js/lib/angular/angular-loader.min.js |   10 +-
 .../js/lib/angular/angular-loader.min.js.map|4 +-
 .../js/lib/angular/angular-message-format.js|4 +-
 .../lib/angular/angular-message-format.min.js   |4 +-
 .../webapp/js/lib/angular/angular-messages.js   |   21 +-
 .../js/lib/angular/angular-messages.min.js  |   15 +-
 .../js/lib/angular/angular-messages.min.js.map  |6 +-
 .../main/webapp/js/lib/angular/angular-mocks.js |  478 +-
 .../webapp/js/lib/angular/angular-resource.js   |  167 +-
 .../js/lib/angular/angular-resource.min.js  |   20 +-
 .../js/lib/angular/angular-resource.min.js.map  |6 +-
 .../main/webapp/js/lib/angular/angular-route.js |   47 +-
 .../webapp/js/lib/angular/angular-route.min.js  |   22 +-
 .../js/lib/angular/angular-route.min.js.map |4 +-
 .../webapp/js/lib/angular/angular-sanitize.js   |  526 ++-
 .../js/lib/angular/angular-sanitize.min.js  |   23 +-
 .../js/lib/angular/angular-sanitize.min.js.map  |6 +-
 .../webapp/js/lib/angular/angular-scenario.js   | 4387 +++--
 .../main/webapp/js/lib/angular/angular-touch.js |  129 +-
 .../webapp/js/lib/angular/angular-touch.min.js  |   19 +-
 .../js/lib/angular/angular-touch.min.js.map |6 +-
 .../src/main/webapp/js/lib/angular/angular.js   | 4400 --
 .../main/webapp/js/lib/angular/angular.min.js   |  592 +--
 .../webapp/js/lib/angular/angular.min.js.map|6 +-
 .../src/main/webapp/js/lib/angular/errors.json  |2 +-
 .../js/lib/angular/i18n/angular-locale_af-na.js |   15 +
 .../js/lib/angular/i18n/angular-locale_af-za.js |   15 +
 .../js/lib/angular/i18n/angular-locale_af.js|   15 +
 .../lib/angular/i18n/angular-locale_agq-cm.js   |   15 +
 .../js/lib/angular/i18n/angular-locale_agq.js   |   15 +
 .../js/lib/angular/i18n/angular-locale_ak-gh.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ak.js|   15 +
 .../js/lib/angular/i18n/angular-locale_am-et.js |   15 +
 .../js/lib/angular/i18n/angular-locale_am.js|   15 +
 .../lib/angular/i18n/angular-locale_ar-001.js   |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-ae.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-bh.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-dj.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-dz.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-eg.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-eh.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-er.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-il.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-iq.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-jo.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-km.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-kw.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-lb.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-ly.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-ma.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-mr.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-om.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-ps.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-qa.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-sa.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-sd.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-so.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-ss.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-sy.js |   15 +
 .../js/lib/angular/i18n/angular-locale_ar-td.js |   15 +
 .../js/lib/angula

[12/20] struts git commit: WW-4634

2016-06-12 Thread lukaszlenart

WW-4634


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

Branch: refs/heads/master
Commit: 9e11b2c2b1962d3bcaa1c2744ecda56f42e21b77
Parents: d06c71d
Author: victorsosa 
Authored: Tue May 17 09:17:35 2016 -0400
Committer: victorsosa 
Committed: Tue May 17 09:17:35 2016 -0400

--
 core/src/main/resources/template/xhtml/controlheader.ftl | 2 +-
 core/src/main/resources/template/xhtml/styles.css| 8 
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/9e11b2c2/core/src/main/resources/template/xhtml/controlheader.ftl
--
diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl 
b/core/src/main/resources/template/xhtml/controlheader.ftl
index 8b855b8..ed8f63a 100644
--- a/core/src/main/resources/template/xhtml/controlheader.ftl
+++ b/core/src/main/resources/template/xhtml/controlheader.ftl
@@ -23,6 +23,6 @@
 <#include 
"/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" />
 
-class="tdAlign-${parameters.align?html}"
+class="align-${parameters.align?html}"
 
 ><#t/>

http://git-wip-us.apache.org/repos/asf/struts/blob/9e11b2c2/core/src/main/resources/template/xhtml/styles.css
--
diff --git a/core/src/main/resources/template/xhtml/styles.css 
b/core/src/main/resources/template/xhtml/styles.css
index fe20517..c292a69 100644
--- a/core/src/main/resources/template/xhtml/styles.css
+++ b/core/src/main/resources/template/xhtml/styles.css
@@ -36,7 +36,7 @@
 .tdErrorMessage {text-align:center; vertical-align:top;}
 .formButton {text-align:right;}
 
-.tdAlign-center{text-align:center;}
-.tdAlign-right{text-align:right;}
-.tdAlign-left{text-align:left;}
-.tdAlign-justify{text-align:justify;}
+.align-center{text-align:center;}
+.align-right{text-align:right;}
+.align-left{text-align:left;}
+.align-justify{text-align:justify;}

[14/20] struts git commit: Update styles.css

2016-06-12 Thread lukaszlenart

Update styles.css

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

Branch: refs/heads/master
Commit: c70f2409f2facb8d30cb19d3e9c12946cafc4c53
Parents: 175d0d4
Author: victor sosa 
Authored: Wed May 25 08:29:20 2016 -0400
Committer: victor sosa 
Committed: Wed May 25 08:29:20 2016 -0400

--
 core/src/main/resources/template/xhtml/styles.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/c70f2409/core/src/main/resources/template/xhtml/styles.css
--
diff --git a/core/src/main/resources/template/xhtml/styles.css 
b/core/src/main/resources/template/xhtml/styles.css
index fce6563..4cc1d35 100644
--- a/core/src/main/resources/template/xhtml/styles.css
+++ b/core/src/main/resources/template/xhtml/styles.css
@@ -34,8 +34,9 @@
 .tdCheckboxInput {text-align:left; vertical-align:top;}
 .tdCheckboxErrorMessage {text-align:left; vertical-align:top;}
 .tdErrorMessage {text-align:center; vertical-align:top;}
-.tdInput {text-align:left;}
 .formButton {text-align:right;}
+.tdInput {text-align:left;}
+
 
 .align-center{text-align:center;}
 .align-right{text-align:right;}

[13/20] struts git commit: Add a class .tdInput for future and use align attribute with class="align-${parameters.align?html}"

2016-06-12 Thread lukaszlenart

Add a class .tdInput for future and use align attribute with
class="align-${parameters.align?html}"

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

Branch: refs/heads/master
Commit: 175d0d42dbb063ad999fef96493ed3b75b9b2c58
Parents: 9e11b2c
Author: victorsosa 
Authored: Wed May 25 07:52:23 2016 -0400
Committer: victorsosa 
Committed: Wed May 25 07:52:23 2016 -0400

--
 core/src/main/resources/template/xhtml/controlheader.ftl | 6 --
 core/src/main/resources/template/xhtml/styles.css| 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/175d0d42/core/src/main/resources/template/xhtml/controlheader.ftl
--
diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl 
b/core/src/main/resources/template/xhtml/controlheader.ftl
index ed8f63a..c14779e 100644
--- a/core/src/main/resources/template/xhtml/controlheader.ftl
+++ b/core/src/main/resources/template/xhtml/controlheader.ftl
@@ -22,7 +22,9 @@
 -->
 <#include 
"/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" />
 
-class="align-${parameters.align?html}"
+<#if parameters.align?? >
+class="align-${parameters.align?html}" 
+ <#else >
+class="tdInput"
 
 ><#t/>

http://git-wip-us.apache.org/repos/asf/struts/blob/175d0d42/core/src/main/resources/template/xhtml/styles.css
--
diff --git a/core/src/main/resources/template/xhtml/styles.css 
b/core/src/main/resources/template/xhtml/styles.css
index c292a69..fce6563 100644
--- a/core/src/main/resources/template/xhtml/styles.css
+++ b/core/src/main/resources/template/xhtml/styles.css
@@ -34,6 +34,7 @@
 .tdCheckboxInput {text-align:left; vertical-align:top;}
 .tdCheckboxErrorMessage {text-align:left; vertical-align:top;}
 .tdErrorMessage {text-align:center; vertical-align:top;}
+.tdInput {text-align:left;}
 .formButton {text-align:right;}
 
 .align-center{text-align:center;}

[09/20] struts git commit: Merge branch 'master' of github.com:victorsosa/struts

2016-06-12 Thread lukaszlenart

Merge branch 'master' of github.com:victorsosa/struts


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

Branch: refs/heads/master
Commit: f9e4a5e676c2fde1603aa0809cb44c71d2e7a122
Parents: 6b36010 b4facc8
Author: victorsosa 
Authored: Tue May 17 08:50:50 2016 -0400
Committer: victorsosa 
Committed: Tue May 17 08:50:50 2016 -0400

--
 apps/pom.xml|  2 +-
 apps/portlet/pom.xml|  2 +-
 .../src/main/webapp/WEB-INF/view/index.jsp  |  4 +-
 .../struts2/portlet/test/BasePortletTest.java   | 20 +--
 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 +-
 .../xwork2/config/entities/ActionConfig.java| 23 ++--
 .../xwork2/config/entities/AllowedMethods.java  | 41 +-
 .../xwork2/config/impl/ActionConfigMatcher.java |  1 +
 .../config/impl/DefaultConfiguration.java   | 10 
 .../providers/XmlConfigurationProvider.java |  7 ++-
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java  |  6 +--
 .../validator/validators/EmailValidator.java|  4 +-
 .../org/apache/struts2/StrutsConstants.java |  1 +
 .../dispatcher/mapper/DefaultActionMapper.java  | 14 ++---
 .../MessageStorePreResultListener.java  |  3 +-
 .../apache/struts2/views/xslt/XSLTResult.java   |  7 +--
 core/src/main/resources/struts-default.xml  |  2 +
 .../main/resources/template/simple/submit.ftl   |  6 +--
 .../template/xhtml/controlheader-core.ftl   |  4 +-
 .../config/entities/AllowedMethodsTest.java | 46 +---
 .../config/impl/ActionConfigMatcherTest.java|  3 ++
 .../opensymphony/xwork2/ognl/OgnlUtilTest.java  | 15 ++
 .../DefaultExcludedPatternsCheckerTest.java |  1 -
 .../xwork2/validator/EmailValidatorTest.java|  2 +
 .../mapper/DefaultActionMapperTest.java | 30 +--
 .../apache/struts2/views/jsp/ui/SubmitTest.java |  2 +-
 .../struts2/views/jsp/ui/TextfieldTest.java | 56 
 .../apache/struts2/views/jsp/ui/Submit-1.txt|  2 +-
 .../apache/struts2/views/jsp/ui/Submit-2.txt|  2 +-
 .../apache/struts2/views/jsp/ui/Submit-5.txt|  2 +-
 .../apache/struts2/views/jsp/ui/Submit-6.txt|  2 +-
 .../struts2/views/jsp/ui/Textfield-12.txt   | 11 
 .../struts2/views/jsp/ui/Textfield-13.txt   | 11 
 plugins/bean-validation/pom.xml |  2 +-
 plugins/cdi/pom.xml |  2 +-
 plugins/config-browser/pom.xml  |  2 +-
 plugins/convention/pom.xml  |  2 +-
 .../PackageBasedActionConfigBuilder.java|  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/json/pom.xml|  2 +-
 .../org/apache/struts2/json/JSONWriterTest.java | 37 +
 .../struts2/json/jsonwriter-write-bean-04.txt   | 16 ++
 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 +-
 .../apache/struts2/rest/RestActionMapper.java   |  2 +-
 plugins/sitegraph/pom.xml   |  2 +-
 plugins/sitemesh/pom.xml|  2 +-
 plugins/spring/

[03/20] struts git commit: Merge pull request #10 from apache/master

2016-06-12 Thread lukaszlenart

Merge pull request #10 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/6bb1ec67
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6bb1ec67
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6bb1ec67

Branch: refs/heads/master
Commit: 6bb1ec67ad539d4bf6850f8314ef521e06b8295e
Parents: a5d7163 f7364a5
Author: victor sosa 
Authored: Fri Mar 4 18:07:16 2016 -0400
Committer: victor sosa 
Committed: Fri Mar 4 18:07:16 2016 -0400

--
 .../com/opensymphony/xwork2/util/LocalizedTextUtil.java | 5 -
 core/src/main/resources/template/simple/checkboxlist.ftl| 7 ---
 core/src/main/resources/template/simple/radiomap.ftl| 5 +++--
 .../apache/struts2/interceptor/CookieInterceptorTest.java   | 9 -
 pom.xml | 2 +-
 5 files changed, 12 insertions(+), 16 deletions(-)
--

[15/20] struts git commit: test fix

2016-06-12 Thread lukaszlenart

test fix

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

Branch: refs/heads/master
Commit: dce6d3e110cd37b4ecffc160b2e681d11886b46c
Parents: 175d0d4
Author: victorsosa 
Authored: Wed May 25 09:23:13 2016 -0400
Committer: victorsosa 
Committed: Wed May 25 09:23:13 2016 -0400

--
 .../resources/org/apache/struts2/views/jsp/ui/CheckboxList-1.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/CheckboxList-2.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/CheckboxList-3.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/CheckboxList-4.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Component-2.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Component-3.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/File-1.txt| 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Label-1.txt   | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Label-2.txt   | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Label-3.txt   | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Label-4.txt   | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Label-5.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-2.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-3.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-4.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-5.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-7.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Password-1.txt | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Radio-1.txt   | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Radio-2.txt   | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Radio-3.txt   | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Radio-4.txt   | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Radio-5.txt   | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Radio-6.txt   | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Radio-7.txt   | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Select-1.txt  | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Select-10.txt | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Select-11.txt | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Select-12.txt | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Select-13.txt | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Select-2.txt  | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Select-3.txt  | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Select-4.txt  | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Select-5.txt  | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Select-6.txt  | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Select-7.txt  | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Select-8.txt  | 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/Select-9.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textarea-1.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-4.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-5.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-6.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-7.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-8.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-9.txt| 2 +-
 .../org/apache/struts2/views/jsp/ui/inputtransferselect-1.txt| 4 ++--
 .../org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt   | 2 +-
 .../org/apache/struts2/views/jsp/ui/optiontransfersel

[07/20] struts git commit: WW-4634

2016-06-12 Thread lukaszlenart

WW-4634


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

Branch: refs/heads/master
Commit: 6b360108e57b8986c6409b26cba9b3cd4f16a603
Parents: 379b752
Author: victorsosa 
Authored: Tue May 17 08:37:13 2016 -0400
Committer: victorsosa 
Committed: Tue May 17 08:37:13 2016 -0400

--
 core/src/main/resources/template/xhtml/controlheader.ftl | 5 -
 core/src/main/resources/template/xhtml/styles.css| 5 +
 2 files changed, 9 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/6b360108/core/src/main/resources/template/xhtml/controlheader.ftl
--
diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl 
b/core/src/main/resources/template/xhtml/controlheader.ftl
index e1209cd..eeebe9f 100644
--- a/core/src/main/resources/template/xhtml/controlheader.ftl
+++ b/core/src/main/resources/template/xhtml/controlheader.ftl
@@ -21,5 +21,8 @@
  */
 -->
 <#include 
"/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" />
-
+class="tdAlign${parameters.align?html}"
+
 ><#t/>

http://git-wip-us.apache.org/repos/asf/struts/blob/6b360108/core/src/main/resources/template/xhtml/styles.css
--
diff --git a/core/src/main/resources/template/xhtml/styles.css 
b/core/src/main/resources/template/xhtml/styles.css
index 91d5171..383578b 100644
--- a/core/src/main/resources/template/xhtml/styles.css
+++ b/core/src/main/resources/template/xhtml/styles.css
@@ -35,3 +35,8 @@
 .tdCheckboxErrorMessage {text-align:left; vertical-align:top;}
 .tdErrorMessage {text-align:center; vertical-align:top;}
 .formButton {text-align:right;}
+
+.tdAligncenter{text-align:center;}
+.tdAlignright{text-align:right;}
+.tdAlignleft{text-align:left;}
+.tdAlignjustify{text-align:justify;}

[10/20] struts git commit: WW-4634

2016-06-12 Thread lukaszlenart

WW-4634


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

Branch: refs/heads/master
Commit: ffdacf1b60b8bf1df54af004a5fd84752eb522b4
Parents: f9e4a5e
Author: victorsosa 
Authored: Tue May 17 09:00:33 2016 -0400
Committer: victorsosa 
Committed: Tue May 17 09:00:33 2016 -0400

--
 core/src/main/resources/template/xhtml/controlheader.ftl | 2 +-
 core/src/main/resources/template/xhtml/styles.css| 8 
 2 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/ffdacf1b/core/src/main/resources/template/xhtml/controlheader.ftl
--
diff --git a/core/src/main/resources/template/xhtml/controlheader.ftl 
b/core/src/main/resources/template/xhtml/controlheader.ftl
index eeebe9f..8b855b8 100644
--- a/core/src/main/resources/template/xhtml/controlheader.ftl
+++ b/core/src/main/resources/template/xhtml/controlheader.ftl
@@ -23,6 +23,6 @@
 <#include 
"/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" />
 
-class="tdAlign${parameters.align?html}"
+class="tdAlign-${parameters.align?html}"
 
 ><#t/>

http://git-wip-us.apache.org/repos/asf/struts/blob/ffdacf1b/core/src/main/resources/template/xhtml/styles.css
--
diff --git a/core/src/main/resources/template/xhtml/styles.css 
b/core/src/main/resources/template/xhtml/styles.css
index 383578b..fe20517 100644
--- a/core/src/main/resources/template/xhtml/styles.css
+++ b/core/src/main/resources/template/xhtml/styles.css
@@ -36,7 +36,7 @@
 .tdErrorMessage {text-align:center; vertical-align:top;}
 .formButton {text-align:right;}
 
-.tdAligncenter{text-align:center;}
-.tdAlignright{text-align:right;}
-.tdAlignleft{text-align:left;}
-.tdAlignjustify{text-align:justify;}
+.tdAlign-center{text-align:center;}
+.tdAlign-right{text-align:right;}
+.tdAlign-left{text-align:left;}
+.tdAlign-justify{text-align:justify;}

[16/20] struts git commit: Merge branch 'WW-4634' of github.com:victorsosa/struts into WW-4634

2016-06-12 Thread lukaszlenart

Merge branch 'WW-4634' of github.com:victorsosa/struts into WW-4634


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

Branch: refs/heads/master
Commit: 30b74a3f01379f095f83431a26d6d232a7b7f061
Parents: dce6d3e c70f240
Author: victorsosa 
Authored: Wed May 25 09:23:39 2016 -0400
Committer: victorsosa 
Committed: Wed May 25 09:23:39 2016 -0400

--
 core/src/main/resources/template/xhtml/styles.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

[06/20] struts git commit: Merge pull request #14 from apache/master

2016-06-12 Thread lukaszlenart

Merge pull request #14 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/ca74ac36
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ca74ac36
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ca74ac36

Branch: refs/heads/master
Commit: ca74ac36fc7eb60e41eeaa8a539771169f900dd6
Parents: 47cf4ff f238cf4
Author: victor sosa 
Authored: Wed May 4 10:47:57 2016 -0400
Committer: victor sosa 
Committed: Wed May 4 10:47:57 2016 -0400

--
 .../xwork2/config/entities/ActionConfig.java| 16 +--
 .../xwork2/config/entities/AllowedMethods.java  | 37 +++-
 .../xwork2/config/impl/ActionConfigMatcher.java |  1 +
 .../providers/XmlConfigurationProvider.java |  1 +
 .../com/opensymphony/xwork2/ognl/OgnlUtil.java  |  6 +--
 .../dispatcher/mapper/DefaultActionMapper.java  |  4 +-
 .../apache/struts2/views/xslt/XSLTResult.java   |  7 +--
 core/src/main/resources/struts-default.xml  |  2 +
 .../config/entities/AllowedMethodsTest.java | 46 +---
 .../opensymphony/xwork2/ognl/OgnlUtilTest.java  | 15 +++
 .../apache/struts2/rest/RestActionMapper.java   |  2 +-
 pom.xml |  2 +-
 12 files changed, 105 insertions(+), 34 deletions(-)
--

[20/20] struts git commit: WW-4634 Fixes centre alignment in Velocity tags

2016-06-12 Thread lukaszlenart

WW-4634 Fixes centre alignment in Velocity tags


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

Branch: refs/heads/master
Commit: 08360cb91697a0dd434c43a345822563c9f5d88f
Parents: 1afb48a e0b13a5
Author: Lukasz Lenart 
Authored: Sun Jun 12 15:48:35 2016 +0200
Committer: Lukasz Lenart 
Committed: Sun Jun 12 15:48:35 2016 +0200

--
 core/src/main/resources/template/xhtml/controlheader.ftl  | 7 ++-
 core/src/main/resources/template/xhtml/styles.css | 7 +++
 .../org/apache/struts2/views/jsp/ui/CheckboxList-1.txt| 2 +-
 .../org/apache/struts2/views/jsp/ui/CheckboxList-2.txt| 2 +-
 .../org/apache/struts2/views/jsp/ui/CheckboxList-3.txt| 2 +-
 .../org/apache/struts2/views/jsp/ui/CheckboxList-4.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/ComboBox-1.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/ComboBox-2.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/ComboBox-3.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/ComboBox-4.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Component-2.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Component-3.txt | 2 +-
 .../org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt| 2 +-
 .../org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt| 2 +-
 .../org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt| 2 +-
 .../org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt| 2 +-
 .../test/resources/org/apache/struts2/views/jsp/ui/File-1.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-22.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-24.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-27.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Label-1.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Label-2.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Label-3.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Label-4.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Label-5.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-1.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-2.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-3.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-4.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-5.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-6.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/OptGroup-7.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Password-1.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Radio-1.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Radio-2.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Radio-3.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Radio-4.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Radio-5.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Radio-6.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Radio-7.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-1.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-10.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-11.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-12.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-13.txt   | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-2.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-3.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-4.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-5.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-6.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-7.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-8.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Select-9.txt| 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textarea-1.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-1.txt | 2 +-
 .../org/apache/struts2/views/jsp/ui/Textfield-12.txt  | 2 +-
 .../org/apache/struts2/views/jsp/ui/Textfield-13.txt  | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-2.txt | 2 +-
 .../resources/org/apache/struts2/views/jsp/ui/Textfield-3.txt | 2 +-
 .../resources/org/apache/struts

[02/20] struts git commit: Merge pull request #9 from victorsosa/easymock_update

2016-06-12 Thread lukaszlenart

Merge pull request #9 from victorsosa/easymock_update

Easymock update

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

Branch: refs/heads/master
Commit: a5d716393999110b3701563479a96e83136a8b97
Parents: da8b13a eddd8e0
Author: victor sosa 
Authored: Thu Mar 3 14:41:11 2016 -0400
Committer: victor sosa 
Committed: Thu Mar 3 14:41:11 2016 -0400

--
 .../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  | 106 +
 .../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, 370 insertions(+), 492 deletions(-)
--


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

[3/3] struts git commit: WW-4643 Fixes SMI when used with Action-less resutls

2016-06-12 Thread lukaszlenart

WW-4643 Fixes SMI when used with Action-less resutls


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

Branch: refs/heads/master
Commit: b866e0e88000d52d4d16753ee393f8a00be13058
Parents: 08360cb dd3b80f
Author: Lukasz Lenart 
Authored: Sun Jun 12 19:38:31 2016 +0200
Committer: Lukasz Lenart 
Committed: Sun Jun 12 19:38:31 2016 +0200

--
 .../opensymphony/xwork2/config/entities/PackageConfig.java| 7 +++
 .../apache/struts2/convention/ConventionUnknownHandler.java   | 7 +--
 2 files changed, 12 insertions(+), 2 deletions(-)
--

[1/3] struts git commit: add allowed methods to ActionBuilder

2016-06-12 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/master 08360cb91 -> b866e0e88


add allowed methods to ActionBuilder


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

Branch: refs/heads/master
Commit: 0d92fd0ee5d4c23aabe7bf3c2ef1b30ff3e5c00d
Parents: 095960b
Author: jumiller 
Authored: Thu Jun 9 15:39:23 2016 -0600
Committer: jumiller 
Committed: Thu Jun 9 15:39:23 2016 -0600

--
 .../apache/struts2/convention/ConventionUnknownHandler.java   | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/0d92fd0e/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
--
diff --git 
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
 
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
index b7c7acf..717bcc5 100644
--- 
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
+++ 
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
@@ -106,7 +106,7 @@ public class ConventionUnknownHandler implements 
UnknownHandler {
 
 this.redirectToSlash = Boolean.parseBoolean(redirectToSlash);
 
-allowedMethods = 
TextParseUtil.commaDelimitedStringToSet("execute,input,back,cancel,browse");
+allowedMethods = 
TextParseUtil.commaDelimitedStringToSet("execute,input,back,cancel,browse,index");
 }
 
 public ActionConfig handleUnknownAction(String namespace, String 
actionName)
@@ -219,7 +219,10 @@ public class ConventionUnknownHandler implements 
UnknownHandler {
 results.put(Action.SUCCESS, config);
 
 return new ActionConfig.Builder(defaultParentPackageName, "execute", 
ActionSupport.class.getName()).
-
addInterceptors(interceptors).addResultConfigs(results).build();
+addInterceptors(interceptors).
+addResultConfigs(results).
+addAllowedMethod(allowedMethods).
+build();
 }
 
 private Result scanResultsByExtension(String ns, String actionName, String 
pathPrefix,

[2/3] struts git commit: add GlobalAllowedMethods getter to PackageConfig and modified getActionConfig method in ConventionUnknownHandler to reference it

2016-06-12 Thread lukaszlenart

add GlobalAllowedMethods getter to PackageConfig and modified getActionConfig 
method in ConventionUnknownHandler to reference it


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

Branch: refs/heads/master
Commit: dd3b80f2be6feb72de808087edcf7914e9d5bb6b
Parents: 0d92fd0
Author: jumiller 
Authored: Fri Jun 10 07:59:27 2016 -0600
Committer: jumiller 
Committed: Fri Jun 10 07:59:27 2016 -0600

--
 .../opensymphony/xwork2/config/entities/PackageConfig.java| 7 +++
 .../apache/struts2/convention/ConventionUnknownHandler.java   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/dd3b80f2/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java 
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
index c0e9477..bb34018 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
@@ -346,6 +346,13 @@ public class PackageConfig extends Located implements 
Comparable, Serializable,
 return globalExceptionMappingConfigs;
 }
 
+/**
+ * gets the GlobalAllowedMethods local to this package
+ *
+ * @return a Set of method names allowed to be executed if strict method 
invocation is enabled
+ */
+public Set getGlobalAllowedMethods() { return 
globalAllowedMethods; }
+
 public boolean isStrictMethodInvocation() {
 return strictMethodInvocation;
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/dd3b80f2/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
--
diff --git 
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
 
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
index 717bcc5..ace9446 100644
--- 
a/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
+++ 
b/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
@@ -221,7 +221,7 @@ public class ConventionUnknownHandler implements 
UnknownHandler {
 return new ActionConfig.Builder(defaultParentPackageName, "execute", 
ActionSupport.class.getName()).
 addInterceptors(interceptors).
 addResultConfigs(results).
-addAllowedMethod(allowedMethods).
+addAllowedMethod(pkg.getGlobalAllowedMethods()).
 build();
 }

struts git commit: WW-4643 Makes set unmodifiable

2016-06-12 Thread lukaszlenart

Repository: struts
Updated Branches:
  refs/heads/master b866e0e88 -> 7621c2bc9


WW-4643 Makes set unmodifiable


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

Branch: refs/heads/master
Commit: 7621c2bc92e46341caa245544e09d9d2a604f51c
Parents: b866e0e
Author: Lukasz Lenart 
Authored: Sun Jun 12 19:40:27 2016 +0200
Committer: Lukasz Lenart 
Committed: Sun Jun 12 19:40:27 2016 +0200

--
 .../com/opensymphony/xwork2/config/entities/PackageConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/7621c2bc/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
--
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java 
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
index bb34018..95f6f66 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/config/entities/PackageConfig.java
@@ -351,7 +351,7 @@ public class PackageConfig extends Located implements 
Comparable, Serializable,
  *
  * @return a Set of method names allowed to be executed if strict method 
invocation is enabled
  */
-public Set getGlobalAllowedMethods() { return 
globalAllowedMethods; }
+public Set getGlobalAllowedMethods() { return 
Collections.unmodifiableSet(globalAllowedMethods); }
 
 public boolean isStrictMethodInvocation() {
 return strictMethodInvocation;

struts-examples git commit: Uses parent's version of Struts

2016-06-12 Thread lukaszlenart

Repository: struts-examples
Updated Branches:
  refs/heads/master 410e1dd80 -> 880889720


Uses parent's version of Struts


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

Branch: refs/heads/master
Commit: 880889720decb6ec53077471e4fa0a0e4e466a05
Parents: 410e1dd
Author: Lukasz Lenart 
Authored: Sun Jun 12 19:52:26 2016 +0200
Committer: Lukasz Lenart 
Committed: Sun Jun 12 19:52:26 2016 +0200

--
 wildcard-regex/pom.xml | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/88088972/wildcard-regex/pom.xml
--
diff --git a/wildcard-regex/pom.xml b/wildcard-regex/pom.xml
index 0609ff9..794fd21 100644
--- a/wildcard-regex/pom.xml
+++ b/wildcard-regex/pom.xml
@@ -2,13 +2,11 @@
 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
@@ -17,7 +15,6 @@
   Wildcard RegEx pattern matching
 
   
-2.3.25-SNAPSHOT
 UTF-8

[1/3] struts git commit: Upgrades to latest OGNL version

[3/3] struts git commit: Reverts previous RegEx

[2/3] struts git commit: Introduces new callMethod() function to be used to execute actions

[2/4] struts git commit: Drops unneeded method

[4/4] struts git commit: WW-4632 Uses proper DTD version

[1/4] struts git commit: Upgrades OGNL to the latest version

[3/4] struts git commit: Introduces new callMethod() function to be used to execute actions

struts-examples git commit: Fixes typo

struts-examples git commit: Uses var instead of id

[2/2] struts git commit: WW-4640 Adds more informative message when method is not allowed

[1/2] struts git commit: Inlines constants and drops class

[08/20] struts git commit: Merge pull request #15 from apache/master

[18/20] struts git commit: fix test cases

[01/20] struts git commit: Merge pull request #8 from apache/master

[11/20] struts git commit: WW-4634

[05/20] struts git commit: Merge pull request #13 from apache/master

[17/20] struts git commit: fix test

[19/20] struts git commit: fix test cases

[04/20] struts git commit: Merge pull request #11 from apache/master

[12/20] struts git commit: WW-4634

[14/20] struts git commit: Update styles.css

[13/20] struts git commit: Add a class .tdInput for future and use align attribute with class="align-${parameters.align?html}"

[09/20] struts git commit: Merge branch 'master' of github.com:victorsosa/struts

[03/20] struts git commit: Merge pull request #10 from apache/master

[15/20] struts git commit: test fix

[07/20] struts git commit: WW-4634

[10/20] struts git commit: WW-4634

[16/20] struts git commit: Merge branch 'WW-4634' of github.com:victorsosa/struts into WW-4634

[06/20] struts git commit: Merge pull request #14 from apache/master

[20/20] struts git commit: WW-4634 Fixes centre alignment in Velocity tags

[02/20] struts git commit: Merge pull request #9 from victorsosa/easymock_update

[3/3] struts git commit: WW-4643 Fixes SMI when used with Action-less resutls

[1/3] struts git commit: add allowed methods to ActionBuilder

[2/3] struts git commit: add GlobalAllowedMethods getter to PackageConfig and modified getActionConfig method in ConventionUnknownHandler to reference it

struts git commit: WW-4643 Makes set unmodifiable

struts-examples git commit: Uses parent's version of Struts

36 matches

Site Navigation

Mail list logo

Footer information