[struts] branch master updated (9053c84 -> 5003e09)

[lu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.


    from 9053c84  Merge pull request #394 from apache/WW-5047-new-velocity
     new ec3532f  Proposed implementation to address WW-5030. Introduce new junit-portlet plugin. - Utilizes a copy of org.springframework.mock.web.portlet package from   Spring 4.3.x, refactored to org.apache.struts2.mock.web.portlet.  Also   copies one interface from org.apache.struts2.mock.web.portlet.  The   package-info.java files identify the package renaming. - Provides test cases for the mock objects. - Modifies the portlet plugin to use the junit-portlet plugin as a   dependency. [...]
     new 000f728  Fix for test running on JDK 9+.  If using Spring 4.x mock objects the MockServletContext has a dependency on javax.activation that causes a java.lang.NoClassDefFoundError. - Test updated to allow the single call that triggers this in JDK9+ to continue as long as the class not found is FileTypeMap (expected).
     new c9ac74d  Correction for previous commit message.  There was a typo which should have   read: "copies one interface from   org.springframework.mock.web.portlet.multipart" (not   "org.apache.struts2.mock.web.portlet" which was incorrect).
     new 5003e09  Merge pull request #398 from JCgH4164838Gh792C124B5/WW-5030_Proposed_Change

The 5840 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 plugins/junit/pom.xml                              |   15 +-
 .../org/apache/struts2/StrutsPortletTestCase.java  |   26 +-
 plugins/pom.xml                                    |    1 +
 plugins/{testng => portlet-mocks}/pom.xml          |   24 +-
 .../mock/web/portlet/MockActionRequest.java        |   86 ++
 .../mock/web/portlet/MockActionResponse.java       |  132 ++
 .../struts2/mock/web/portlet/MockBaseURL.java      |  161 ++
 .../struts2/mock/web/portlet/MockCacheControl.java |   78 +
 .../mock/web/portlet/MockClientDataRequest.java    |  135 ++
 .../apache/struts2/mock/web/portlet/MockEvent.java |   91 ++
 .../struts2/mock/web/portlet/MockEventRequest.java |   90 ++
 .../mock/web/portlet/MockEventResponse.java        |   35 +
 .../struts2/mock/web/portlet/MockMimeResponse.java |  259 ++++
 .../web/portlet/MockMultipartActionRequest.java    |  101 ++
 .../mock/web/portlet/MockPortalContext.java        |  106 ++
 .../mock/web/portlet/MockPortletConfig.java        |  194 +++
 .../mock/web/portlet/MockPortletContext.java       |  285 ++++
 .../mock/web/portlet/MockPortletPreferences.java   |  123 ++
 .../mock/web/portlet/MockPortletRequest.java       |  565 +++++++
 .../web/portlet/MockPortletRequestDispatcher.java  |   87 ++
 .../mock/web/portlet/MockPortletResponse.java      |  202 +++
 .../mock/web/portlet/MockPortletSession.java       |  249 +++
 .../struts2/mock/web/portlet/MockPortletURL.java   |  121 ++
 .../mock/web/portlet/MockRenderRequest.java        |   94 ++
 .../mock/web/portlet/MockRenderResponse.java       |   90 ++
 .../mock/web/portlet/MockResourceRequest.java      |  132 ++
 .../mock/web/portlet/MockResourceResponse.java     |   41 +
 .../struts2/mock/web/portlet/MockResourceURL.java  |   73 +
 .../mock/web/portlet/MockStateAwareResponse.java   |  165 ++
 .../web/portlet/ServletWrappingPortletContext.java |  161 ++
 .../portlet/multipart/MultipartActionRequest.java  |   41 +
 .../mock/web/portlet/multipart/package-info.java   |   38 +
 .../struts2/mock/web/portlet/package-info.java     |   35 +
 plugins/{tiles => portlet-mocks}/src/site/site.xml |    0
 .../StrutsSpringPortletMockObjectsTest.java        | 1597 ++++++++++++++++++++
 .../src/test/resources/applicationContext.xml      |   72 +-
 plugins/portlet/pom.xml                            |    5 +-
 .../apache/struts2/portlet/PortletRequestMap.java  |   10 +-
 .../struts2/StrutsTestCasePortletTests.java}       |   32 +-
 .../struts2/components/PortletUrlRendererTest.java |   10 +-
 .../struts2/portlet/PortletRequestMapTest.java     |    2 +-
 .../struts2/portlet/PortletSessionMapTest.java     |    2 +-
 .../portlet/dispatcher/Jsr168DispatcherTest.java   |    4 +-
 .../portlet/dispatcher/Jsr286DispatcherTest.java   |    4 +-
 .../interceptor/PortletStateInterceptorTest.java   |    4 +-
 pom.xml                                            |    5 +
 46 files changed, 5697 insertions(+), 86 deletions(-)
 rename plugins/{portlet => junit}/src/main/java/org/apache/struts2/StrutsPortletTestCase.java (79%)
 copy plugins/{testng => portlet-mocks}/pom.xml (82%)
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockActionRequest.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockActionResponse.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockBaseURL.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockCacheControl.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockClientDataRequest.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockEvent.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockEventRequest.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockEventResponse.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockMimeResponse.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockMultipartActionRequest.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortalContext.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletConfig.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletContext.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletPreferences.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletRequest.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletRequestDispatcher.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletResponse.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletSession.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockPortletURL.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockRenderRequest.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockRenderResponse.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockResourceRequest.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockResourceResponse.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockResourceURL.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/MockStateAwareResponse.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/ServletWrappingPortletContext.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/multipart/MultipartActionRequest.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/multipart/package-info.java
 create mode 100644 plugins/portlet-mocks/src/main/java/org/apache/struts2/mock/web/portlet/package-info.java
 copy plugins/{tiles => portlet-mocks}/src/site/site.xml (100%)
 create mode 100644 plugins/portlet-mocks/src/test/java/org/apache/struts2/StrutsSpringPortletMockObjectsTest.java
 copy plugins/{junit => portlet-mocks}/src/test/resources/applicationContext.xml (87%)
 copy plugins/{junit/src/main/java/org/apache/struts2/StrutsTestCase.java => portlet/src/test/java/org/apache/struts2/StrutsTestCasePortletTests.java} (88%)