Commit Graph

924 Commits

Author SHA1 Message Date
JCgH4164838Gh792C124B5 ecba2406d5 WW-5057 Showcase cleanup for 2.6 branch:
- Added missing elements to the UI Velocity example (for consistency with
  JSP example).
- Fix some spelling typos in labels/tooltips (both JSP and Velocity UI
  examples).
- Fixed some html/css issues with results pages for JSP and Velocity UI
  examples (consistency).
- Made JSP UI example s:form use POST method to avoid warning in console
  when opening page.
- Enhanced ViewSourceAction to allow View Sources "configuration" tab to
  work when running Showcase as an "exploded" WARfile.
- Added escapeHtmlBody="false" to multiple tags in .ftl Showcase files
  (fix broken display elements - submit and anchor mostly).
- Added missing favouriteCities getter/setter to MoreSelectsAction action.
- Upgrade htmlunit from 2.27 to 2.37.0
- Upgrade maven failsafe plugin from 2.22.1 to 2.22.2
2020-02-01 17:39:54 -05:00
Lukasz Lenart 5c55e69b4f WW-5049 Moves Velocity support into a dedicated plugin 2019-12-29 09:07:00 +01:00
Lukasz Lenart 03da857d9f Fixes Showcase app Tiles example 2019-12-17 20:31:28 +01:00
Lukasz Lenart 6504e674b0 Adds a link to Struts Examples pages 2019-11-25 09:37:40 +01:00
JCgH4164838Gh792C124B5 9592355960 Proposed fix for WW-5022 (escape html tag body control flag)
- Added escapeHtmlBody parameter to s:a and s:submit tags.
- No other tags appear to require this feature (but can be added to any
component).
- Added new unit tests for escapeHtmlBody (and usesBody for component).
- Fixed broken s:a tags in ShowCase app.
2019-10-14 17:52:16 -04:00
JCgH4164838Gh792C124B5 d3eb1fc595 Fix for default (un-configured) allowStaticFieldAccess state, Showcase Application in 2.6.x (#334)
* Fix for default un-configured allowStaticFieldAccess state:
1) Ensure OgnlValueStackFactory returns true for allowStaticFieldAccess when not configured (consistency - same as OgnlUtil does).
2) Add test to OgnlValueStackTest for the no allowStaticXXX flags present.

Minor config fixes for the Showcase Application in 2.6.x:
1) File upload examples.  Multiple file upload missing result page (list and array), added missing JSP.  Added missing input results in configuration.
2) File upload examples.  Fixed NPE for multiple file upload (array version) when no files selected.
3) Add manual test for public constant access via expression (to If tag JSP).

* Added missed logic elements from PR#320 (identified by Y. Zamani):
1) Added ognlAllowStaticFieldAccess field and getter/setter to ConstantConfig.
2) Added allowStaticFieldAccess (set to true) to default.properties.

* Follow-up commit:
- Fixed wrong package reference in testNullMethod(), as well as in new tets.
- Added additional tests to cover the full set of static access flag combinations.

* Follow-up commit:
- Fixed createValueStack() not setting allowStaticFieldAccess parameter.
- Removed 3 unused import statement.
- Refactored OgnlValueStackFactory creation logic into two utility methods: getValueStackFactory(), reloadValueStackFactory()
- Added one additional test with a raw OgnlValueStackFactory generated OgnlValueStack (staticMethodAccess false, staticFieldAccess true).
  Test confirms same result as with a default OgnlValueStackFactory.
2019-03-11 09:35:48 +03:30
JCgH4164838Gh792C124B5 a2ba5a0e62 Fix 2.6 Showcase bean-validator Java 11 failures.
The 2.6 Showcase application is throwing JAXB-classloading-related failures when deployed to a container running Java 11.
The stacktrace indicates the issues relate to the bean-validator and Hibernate-Validator (but no issues with Java 8).
Proposed fix:
1) Upgrade Showcase from 5.1.3.Final to 5.4.3.Final (most recent available).
2) Upgrade bean-validator from 5.4.1-Final to 5.4.3.Final (to match versions).
2019-02-14 01:03:44 -05:00
Johannes Geppert bbe46e92f0 Fix compile issue of post order test example with latest http client version 2019-02-09 15:32:02 +01:00
Johannes Geppert 75d252554b Solve some dependency convergence issues reported by maven enforce plugin
https://issues.apache.org/jira/browse/WW-5018
2019-02-09 15:04:22 +01:00
Aleksandr Mashchenko 094b6c5e3b Merge pull request #289 from lukaszlenart/WW-4972
[WW-4972] Switches incompatible_improvements to VERSION_2_3_28
2019-01-06 22:16:27 +02:00
Yasser Zamani 46e14a80cc downgrade htmlunit to 2.24 to keep java 7 compatibility
References:
http://htmlunit.sourceforge.net/changes-report.html#a2.25
2019-01-02 16:24:01 +03:30
Yasser Zamani fa90e01ba5 introduce integration tests with minimum needed changes (#301)
* introduce integration tests with minimum needed changes

* report coverage for integration tests as well

References:
https://stackoverflow.com/a/41364462
http://www.mojohaus.org/cobertura-maven-plugin/usage.html#reports

* switch to JaCoCo as test coverage library

Cobertura latest release is old, 2015, has issues with java and an old weird issue with integration tests [1].

[1] https://github.com/cobertura/cobertura/issues/230

* Use HtmlUnit instead of JWebUnit
2018-12-31 19:21:49 +03:30
Lukasz Lenart 3d20e80950 WW-4972 Uses built-in auto escaping instead of escaping each parameter 2018-12-23 17:44:12 +01:00
Yasser Zamani 7dcdfbe1d7 upgrade to DWR 3 with a showcase
See also WW-4069
2018-12-03 16:23:55 +03:30
JCgH4164838Gh792C124B5 0e410639f3 Upgrade DWR from 1.x to 2.x
- intended to resolve Jenkins build failure with old DWR version.

pom.xml changes:
- entry change in struts2-parent pom.xml
  - upgrade 1.1.1 (uk.ltd.getahead) -> 2.0.11-RELEASE (org.directwebremoting)
- entry change in struts2-dwr-plugin pom.xml
- entry change in struts2-showcase pom.xml
2018-11-25 22:32:22 -05:00
JCgH4164838Gh792C124B5 53d7d04246 Update Struts 2.6.0 build with some newer (compatible) library versions.
- Add missing multiple-success.jsp for Showcase application.
- Enhance main pom.xml maven-surefire-plugin configuration to avoid some test-ng related duplication failures:  "Cannot find JUnit method class junit.framework.TestSuite$1.warning".
- Remove unnecessary plugins/embeddedjsp/pom.xml (struts2-embeddedjsp-plugin) maven-surefire-plugin version override (noted with preceding change).
- Update Struts 2.6.0 build to use some newer (compatible) library versions.
  Change the main pom.xml library versions for the following:
  - spring.platformVersion 4.3.13.RELEASE -> 4.3.20.RELEASE
  - oval 1.31 -> 1.90  (Note: required unit test fix for OValValidationInterceptorTest.java AND code fix for OvalValidationInterceptor.java)
                       (Additional Note: 1.70 was the most recent that functioned without a fix to OvalValidationInterceptor)
  - jackson 2.9.6 -> 2.9.7
  - fluido-skin.version 1.6 -> 1.7
  - slf4j (slf4j-api, slf4j-simple) 1.7.12 -> 1.7.25
  - xstream 1.4.10 -> 1.4.11.1
  - jetty 6.1.9 -> 6.1.26 (last in 6.1.x line)
  - xerces 2.10.0 - > 2.12.0
  - org.owasp 3.1.1 -> 3.3.4
  - versions-maven-plugin 2.5 -> 2.7
  - doxia-core 1.7 -> 1.8
  - doxia-module-markdown 1.3 -> 1.7
  - org.apache.felix.main 4.0.3 -> 4.6.1  (Note: most recent 4.x)
  - easymock 3.4 -> 3.5.1
  - javax.el 3.0 -> 3.0.1-b10
  - jasper 6.0.18 -> 6.0.53  (Note: most recent 6.0.x)
  - juli 6.0.18 -> 6.0.53    (Note: most recent 6.0.x)
  - commons-logging 1.1.3 -> 1.2
  - commons-collections4 4.1 -> 4.2
  - commons-io 2.5 -> 2.6
  - commons-lang3 3.6 -> 3.8.1
  - commons-text 1.2 -> 1.3  (Note: most recent compatible with Java 7)
  - commons-validator 1.5.1 -> 1.6
  - mockito 1.9.5 -> 1.10.19            (Note: most recent 1.x)
  - cdi-api 1.0-SP1 -> 1.0-SP4          (Note: most recent 1.0.x)
  - weld-core 1.0.1-Final -> 1.0.1-SP4  (Note: most recent 1.0.x)
  - cglib 2.2 -> 2.2.2                  (Note: most recent 2.2.x)
  Note for cglib-nodep:  Build succeeded with cglib-nodep 2.2.2 and 3.2.5.  Although
    cglib 3.2.5 matches ASM 5.2, jmock-cglib 1.2.0 identifies cglib-nodep 2.1_3 as its
    requirement (on the JMock http://jmock.org/download.html download page) so it should
    probably remain as long as JMock 1.2.0 is used.
2018-11-12 19:58:15 -05:00
Yasser Zamani 6f56e14de9 Merge pull request #252 from lukaszlenart/with-no-setters
WW-4963 Implement new Aware interfaces
2018-10-22 12:42:48 +03:30
JCgH4164838Gh792C124B5 50d57e118e Minor config fixes for the Showcase Application:
1) Token examples. Examples 2 and 3 previously resulted in 403's upon submit (config issue).
2) Token examples. Example 4 resulted in error 500 when selected from the menu (FTL param type issue).
3) Validation examples.  Examples quizBasic, quizClient and quizClientCss resulted in 404's when selected from menu (config issue).
2018-10-08 18:53:30 -04:00
Lukasz Lenart b608549933 WW-4963 Implements new ServletContextAware interface and fixes actions
that uses withServletContext instead of setServletContext
2018-09-25 10:02:58 +02:00
Lukasz Lenart 1f5d29ac68 Uses proper headers in web.xml 2018-03-20 15:42:07 +01:00
Lukasz Lenart c41a0167dd Merge pull request #179 from yasserzamani/WW-4874
WW-4874 Introduces Async plugin (adds support for async methods)
2018-03-20 14:59:12 +01:00
Lukasz Lenart 7f3c09c98e Merge pull request #208 from aleksandr-m/feature/lang_to_text
WW-4915 Replace deprecated commons-lang3 classes
2018-03-16 14:30:40 +01:00
Lukasz Lenart e2c2ea876e [maven-release-plugin] prepare for next development iteration 2018-03-02 13:00:17 +01:00
Lukasz Lenart 1fec084542 [maven-release-plugin] prepare release STRUTS_2_5_16 2018-03-02 12:59:53 +01:00
Lukasz Lenart 6c5b79c204 Adds explanation how to use the commented configuration 2018-02-27 11:13:39 +01:00
Lukasz Lenart ce1ac9d381 Adds example how to use the handler 2018-02-20 06:50:06 +01:00
Lukasz Lenart def4adacd6 [maven-release-plugin] prepare for next development iteration 2018-02-09 09:36:39 +01:00
Lukasz Lenart 2c0facc3aa [maven-release-plugin] prepare release STRUTS_2_5_15 2018-02-09 09:36:18 +01:00
Aleksandr Mashchenko 478945a0bd WW-4915 Replace deprecated commons-lang3 classes (add commons-text dependency, replace StringEscapeUtils) 2018-02-05 21:15:17 +02:00
Yasser Zamani 97012c78a9 Merge pull request #189 from lukaszlenart/upgrade-spring
WW-4899: upgrade Spring
2018-01-30 10:47:04 +03:30
Hedju Hor 17b598433d WW-4891 PrepareOperations overrideDevMode for explicitly switch on for this action only 2018-01-18 23:10:25 +01:00
Hedju Hor 02b61b2c05 WW-4891 Debug tag should not display anything when not in dev mode 2018-01-14 15:54:41 +01:00
Lukasz Lenart 67bdf68419 Normalises name of property with Spring version 2018-01-06 10:13:59 +01:00
Yasser Zamani dc645bec4d Merge branch 'master' into WW-4874 2017-12-26 17:18:50 +03:30
Yasser Zamani aee171c3b8 add showcase for async plugin 2017-12-26 17:10:52 +03:30
Lukasz Lenart 9b9bd212ed [maven-release-plugin] prepare for next development iteration 2017-11-29 08:35:58 +01:00
Lukasz Lenart 0856157e27 [maven-release-plugin] prepare release STRUTS_2_5_14_1 2017-11-29 08:35:37 +01:00
Lukasz Lenart d36ec579fc [maven-release-plugin] prepare for next development iteration 2017-11-14 07:43:35 +01:00
Lukasz Lenart 04db841358 [maven-release-plugin] prepare release STRUTS_2_5_14 2017-11-14 07:43:14 +01:00
Lukasz Lenart 8b95838c58 Adds proper XML header 2017-10-22 12:29:13 +02:00
Lukasz Lenart de6adde37e Uses <target/> instead of <tasks/> to avoid warnings 2017-10-22 09:51:04 +02:00
Lukasz Lenart 88a29b3faa Fixes encoding 2017-10-22 08:49:28 +02:00
Lukasz Lenart 1323c225ab Fixes encoding 2017-10-22 08:48:34 +02:00
Lukasz Lenart a03373022d Adds missing header with license 2017-10-21 18:40:42 +02:00
Lukasz Lenart e7c65fb0b4 Adds missing header with license 2017-10-21 17:47:51 +02:00
Lukasz Lenart fd8e3bc912 Adds missing header with license 2017-10-21 11:51:44 +02:00
Lukasz Lenart ce335f19c4 Adds missing header with license 2017-10-21 11:36:24 +02:00
Lukasz Lenart 73359c480b Adds missing header with license 2017-10-21 11:24:48 +02:00
Lukasz Lenart e678792430 Adds missing header with license 2017-10-21 11:01:31 +02:00
Lukasz Lenart 726a0391e4 Simplifies sipping modules 2017-10-20 09:05:01 +02:00