You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/03/03 17:56:51 UTC

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

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


Merge pull request #3 from apache/master

update pull

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

Branch: refs/heads/master
Commit: e05f9f01804bc64ace15bfc573ef483da583e5a7
Parents: c167d6c 249d2f8
Author: victor sosa <vi...@users.noreply.github.com>
Authored: Thu Jan 21 08:00:54 2016 -0400
Committer: victor sosa <vi...@users.noreply.github.com>
Committed: Thu Jan 21 08:00:54 2016 -0400

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



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

Posted by lu...@apache.org.
WW-4610 Adds proper context initialisation when file upload is used


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

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

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



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

Posted by lu...@apache.org.
Merge pull request #7 from apache/master

update pull

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

Branch: refs/heads/master
Commit: f34283b26eea874d2f76ad0cadf95c33b2d2aeae
Parents: a2c5bc8 4ea8883
Author: victor sosa <vi...@users.noreply.github.com>
Authored: Sat Feb 27 11:20:39 2016 -0400
Committer: victor sosa <vi...@users.noreply.github.com>
Committed: Sat Feb 27 11:20:39 2016 -0400

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



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

Posted by lu...@apache.org.
fix for WW-4610 ServletActionContext.getRequest() doesn't return the
MultiPartRequestWrapper (or StrutsRequestWrapper) when using
StrutsPrepareFilter

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

Branch: refs/heads/master
Commit: 0c92e2a1f361b6675ed8ac2c7bc3ffe06603f01a
Parents: f34283b
Author: victorsosa <vi...@peopleware.do>
Authored: Thu Mar 3 10:06:57 2016 -0400
Committer: victorsosa <vi...@peopleware.do>
Committed: Thu Mar 3 10:06:57 2016 -0400

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


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


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

Posted by lu...@apache.org.
Merge pull request #6 from apache/master

pull update

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

Branch: refs/heads/master
Commit: a2c5bc835ec06483af6175fc0abf67714fb28711
Parents: 46bd92f 0cc5fca
Author: victor sosa <vi...@users.noreply.github.com>
Authored: Thu Feb 4 13:12:22 2016 -0400
Committer: victor sosa <vi...@users.noreply.github.com>
Committed: Thu Feb 4 13:12:22 2016 -0400

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



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

Posted by lu...@apache.org.
Merge pull request #4 from apache/master

update pull

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

Branch: refs/heads/master
Commit: 778eec3b94f283290f186c8caffd10f03576fa27
Parents: e05f9f0 6fb870d
Author: victor sosa <vi...@users.noreply.github.com>
Authored: Tue Jan 26 08:38:50 2016 -0400
Committer: victor sosa <vi...@users.noreply.github.com>
Committed: Tue Jan 26 08:38:50 2016 -0400

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



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

Posted by lu...@apache.org.
Merge pull request #5 from apache/master

update pull

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

Branch: refs/heads/master
Commit: 46bd92fe202041c76704b96d11a0b8f8e83d56de
Parents: 778eec3 cceb891
Author: victor sosa <vi...@users.noreply.github.com>
Authored: Fri Jan 29 17:54:27 2016 -0400
Committer: victor sosa <vi...@users.noreply.github.com>
Committed: Fri Jan 29 17:54:27 2016 -0400

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