Commit Graph

  • 1de94b2092 WW-5041 Upgrade to OGNL 3.1.26 and adapt to its new features Yasser Zamani 2019-10-01 14:57:46 +03:30
  • 070f16c156 Merge pull request #370 from JCgH4164838Gh792C124B5/local_26x_CPickPR367 Lukasz Lenart 2019-10-01 08:37:29 +02:00
  • 544c3532a0 Merge pull request #369 from JCgH4164838Gh792C124B5/local_26x_CPickPR366 Lukasz Lenart 2019-10-01 08:37:07 +02:00
  • ad864ac998 Merge pull request #368 from JCgH4164838Gh792C124B5/local_26x_CPickPR354 Lukasz Lenart 2019-10-01 08:36:46 +02:00
  • 0987143e5d Merge pull request #367 from JCgH4164838Gh792C124B5/local_25x_SendRedirectEnh Lukasz Lenart 2019-09-23 08:54:14 +02:00
  • 1a93a300bb Merge pull request #366 from JCgH4164838Gh792C124B5/local_25x_SendErrorEnh Lukasz Lenart 2019-09-23 08:54:02 +02:00
  • 40d23ac315 Merge pull request #354 from JCgH4164838Gh792C124B5/localS2_25x_B10 Lukasz Lenart 2019-04-29 07:42:13 +02:00
  • 706bb560e4 Merge pull request #367 from JCgH4164838Gh792C124B5/local_25x_SendRedirectEnh Lukasz Lenart 2019-09-23 08:54:14 +02:00
  • 12d4feaf8f Merge pull request #366 from JCgH4164838Gh792C124B5/local_25x_SendErrorEnh Lukasz Lenart 2019-09-23 08:54:02 +02:00
  • d88a8382d4 Changed the styling of log outputs (as suggested by A. Mashchenko and L. Lenart). Added comment to explain why the log output avoids a stacktrace (due to exceptions being re-thrown). Updated existing ServletRedirectResultTest to supply tests that exercise the new code paths and demonstrate expected logging. JCgH4164838Gh792C124B5 2019-09-22 21:45:44 -04:00
  • 73809eae54 Changed the styling of log outputs (as suggested by A. Mashchenko). Changed the log outputs to output full stacktraces (as suggested by A. Mashchenko and L. Lenart). Updated existing DefaultStaticContentLoaderTest and created a new DefaultDispatcherErrorHandlerTest to supply tests that exercise the new code paths and demonstrate expected logging. JCgH4164838Gh792C124B5 2019-09-21 23:29:24 -04:00
  • 5b4b554d11 Minor improvement proposed for ServletRedirectResult sendRedirect() JCgH4164838Gh792C124B5 2019-09-17 22:22:41 -04:00
  • fcbd29b7f9 Changed the log outputs in this PR to utilize log4j2 {} notation (as per suggestion by A. Mashchenko and L. Lenart) Changed the log outputs in this PR from info level to warn level (as per suggestion by L. Lenart). Note: The info level was originally chosen to make it easier to filter out in the very unlikely case of log flood. JCgH4164838Gh792C124B5 2019-09-17 21:10:34 -04:00
  • 220896a0cf Improved logging for DefaultDispatcherErrorHandler and DefaultStaticContentLoader. JCgH4164838Gh792C124B5 2019-09-15 20:48:15 -04:00
  • 632f19eab3 WW-5038 Upgrades jackson-databind to version 2.9.9.3 plus upgrades jackson-core to 2.9.9 Lukasz Lenart 2019-09-06 12:45:12 +04:30
  • 50a145152d Fix typo in MultiselectInterceptor javadoc Sebastian Haas 2019-08-29 14:10:06 +04:30
  • 9453e05559 WW-5033 - Update to latest versions for some Struts 2.5.x dependencies: (#362) JCgH4164838Gh792C124B5 2019-09-07 14:33:34 +04:30
  • 6d453ca70d Proposed WW-5035 enhancement: - Provide cache clearing methods for OgnlUtil (expression cache, BeanInfo cache). - Provide methods to check the cache sizes (entry number for expression cache, BeanInfo cache). - Provide static method to clear the OgnlRuntime cache (convenience method). JCgH4164838Gh792C124B5 2019-06-15 20:10:58 +04:30
  • f7b191f782 WW-5033 - Update to latest versions for some Struts 2.5.x dependencies: (#362) JCgH4164838Gh792C124B5 2019-09-07 06:03:34 -04:00
  • 4ae1a6a26d Merge pull request #361 from JCgH4164838Gh792C124B5/localS2_25x_OgnlCachecontrol Yasser Zamani 2019-09-07 14:32:03 +04:30
  • 83da0b6a30 Merge pull request #365 from apache/WW-5038-upgrade-jackson-databind Yasser Zamani 2019-09-07 11:14:59 +04:30
  • 8187006c31 WW-5038 Upgrades jackson-databind to version 2.9.9.3 plus upgrades jackson-core to 2.9.9 Lukasz Lenart 2019-09-06 10:15:12 +02:00
  • c77178c835 Marks 2.3.37 as still supported Lukasz Lenart 2019-09-06 09:58:04 +02:00
  • a84769fb8a Defines Security Policy as recommended by Github Lukasz Lenart 2019-09-06 09:56:26 +02:00
  • 79e598f360 WW-5037 Upgrades commons-beanutils to version 1.9.4 Lukasz Lenart 2019-09-02 12:18:23 +02:00
  • f840c7123e WW-5037 Upgrades commons-beanutils to version 1.9.4 Lukasz Lenart 2019-09-02 12:18:23 +02:00
  • 2ca0562901 Merge pull request #364 from apache/docker-build Lukasz Lenart 2019-09-02 09:02:58 +02:00
  • 8f96dca4dc Sticks to trusty distro to check if that will solve build on JDK8 Lukasz Lenart 2019-08-30 09:49:16 +02:00
  • b524d26b57 Defines a simple Docker build Lukasz Lenart 2019-08-27 08:55:51 +02:00
  • 0c19fbf623 Merge pull request #363 from sehaas/fix_typo_MultiselectInterceptor Lukasz Lenart 2019-08-29 12:23:04 +02:00
  • dca0dd224f Fix typo in MultiselectInterceptor javadoc Sebastian Haas 2019-08-29 11:40:06 +02:00
  • 9216e8e22c Proposed WW-5035 enhancement: - Provide cache clearing methods for OgnlUtil (expression cache, BeanInfo cache). - Provide methods to check the cache sizes (entry number for expression cache, BeanInfo cache). - Provide static method to clear the OgnlRuntime cache (convenience method). JCgH4164838Gh792C124B5 2019-06-15 11:40:58 -04:00
  • 570f8c3e67 fix compilation error of WW-4999 cherry picks Yasser Zamani 2019-06-03 12:28:57 +04:30
  • 704e41c6e8 test false for logMissingProperties (WW-4999) Yasser Zamani 2019-06-02 17:22:28 +04:30
  • eca9c34645 decouple logMissingProperties from devMode (WW-4999) Yasser Zamani 2019-06-01 12:52:22 +04:30
  • a16cd4fca6 test not throw exception on top missing property (WW-4999) Yasser Zamani 2019-06-01 09:37:19 +04:30
  • 382124cfd2 not log user exceptions as missing properties (WW-4999) Yasser Zamani 2019-05-31 17:57:25 +04:30
  • b657a272d1 fix logMissingProperties (WW-4999) Yasser Zamani 2019-05-30 16:36:54 +04:30
  • 651eac2c57 Merge pull request #358 from yasserzamani/WW-4999 Lukasz Lenart 2019-06-03 08:25:32 +02:00
  • b8ce02b159 Merge pull request #360 from JCgH4164838Gh792C124B5/localS2_26x_TextProviderFix Lukasz Lenart 2019-06-03 07:40:22 +02:00
  • a50af87644 test false for logMissingProperties (WW-4999) Yasser Zamani 2019-06-02 17:22:28 +04:30
  • 5c30e0d5c6 [WW-5034] Forward port Minor enhancement/fix to AbstractLocalizedTextProvider: - Forward port of equivalent change from 2.5.x. - Made "constant" RELOADED static to save an initialization every time. - Made ineffective clearBundle(final String bundleName) method a "no-op" with a debug log indicating the same. Marked method as deprecated. - Introduced protected clearBundle(final String bundleName, Locale locale) method for use by descendants, with debug log output when called. - Introduced protected clearMissingBundlesCache() method for use by descendants, with debug log when called. JCgH4164838Gh792C124B5 2019-06-01 14:58:18 -04:00
  • 9e01fbd2dd decouple logMissingProperties from devMode (WW-4999) Yasser Zamani 2019-06-01 12:52:22 +04:30
  • d4dd3386cc test not throw exception on top missing property (WW-4999) Yasser Zamani 2019-06-01 09:37:19 +04:30
  • 0999fba8c4 not log user exceptions as missing properties (WW-4999) Yasser Zamani 2019-05-31 17:57:25 +04:30
  • daf9bd1b3d Merge pull request #359 from sepe81/update-mvnw Lukasz Lenart 2019-05-31 07:34:14 +02:00
  • fb45a0b1b6 Update maven-wrapper to 0.5.5 and maven to 3.6.1 Sebastian Peters 2019-05-30 21:26:04 +02:00
  • 3ac6835c5c fix logMissingProperties (WW-4999) Yasser Zamani 2019-05-30 16:36:54 +04:30
  • b0dd7c1c0d include ref in path as WW-5011 workaround (#353) Yasser Zamani 2019-05-28 09:53:27 +04:30
  • a63beef1f8 Merge pull request #355 from JCgH4164838Gh792C124B5/localS2_25x_TextProviderFix Lukasz Lenart 2019-05-27 09:45:50 +02:00
  • e74e5539dd Merge pull request #356 from JCgH4164838Gh792C124B5/local_25x_LibUpd3 Aleksandr Mashchenko 2019-05-26 20:16:49 +03:00
  • 2226fcc168 Update Three Struts 2.5.x dependencies to latest versions: - Jackson 2.9.8 -> 2.9.9 - Log4j2 2.11.1 -> 2.11.2 - OGNL 3.1.22 -> 3.1.23 Struts 2.5.21-SNAPSHOT builds successfully with these versions. JCgH4164838Gh792C124B5 2019-05-25 17:09:33 -04:00
  • 865b8a20df Update PR with unit test: - Add a unit test to include test coverage and confirm no failures in the new methods. JCgH4164838Gh792C124B5 2019-05-11 16:28:34 -04:00
  • 3c6956116e Minor enhancement/fix to AbstractLocalizedTextProvider: - Made "constant" RELOADED static to save an initialization every time. - Updated clearBundle(final String bundleName) method comment as it seemed inaccurate, added debug log output when called. - Introduced protected clearBundle(final String bundleName, Locale locale) method for use by descendants, with debug log output when called. - Introduced protected clearMissingBundlesCache() method for use by descendants, with debug log when called. JCgH4164838Gh792C124B5 2019-05-11 13:09:34 -04:00
  • bb9ce7582b Merge pull request #354 from JCgH4164838Gh792C124B5/localS2_25x_B10 Lukasz Lenart 2019-04-29 07:42:13 +02:00
  • 11d373f8b4 Minor consistency update correction for WW-5029 fix to the 2.5.x branch: - Correct missing verification in buildAllowedMethods()/loadGlobalAllowedMethods() that the nodes are of type Node.TEXT_NODE (as buildResults() does). - Made two class fields final, as suggested by IDE. JCgH4164838Gh792C124B5 2019-04-27 12:35:40 -04:00
  • b7d64f3a01 allow white-space around ";" character in multipart request RegEx Yasser Zamani 2019-04-23 12:09:58 +04:30
  • b23bfd42d2 Merge pull request #350 from yasserzamani/WW-4958 Lukasz Lenart 2019-04-23 08:25:40 +02:00
  • 33137a4919 Merge pull request #352 from yasserzamani/WW-5011 Lukasz Lenart 2019-04-23 08:22:59 +02:00
  • f94b681050 fix multipart request RegEx Yasser Zamani 2019-04-23 09:32:43 +04:30
  • 517c2d690b use Tiles already provided URLApplicationResource Yasser Zamani 2019-04-20 12:28:07 +04:30
  • 47a8a21da2 Proposed fix for WW-5029 for the 2.5.x branch (#347) JCgH4164838Gh792C124B5 2019-04-20 09:54:36 +04:30
  • fb38a919c9 Proposed fix for WW-5029 for the 2.5.x branch (#347) JCgH4164838Gh792C124B5 2019-04-20 01:24:36 -04:00
  • f0776aeac6 (Amended commit based on feedback) Proposed fix for WW-5028 for the 2.5.x branch: - Disable printing stacktrace on exceptions by the Dispatcher by default. - Printing stacktrace on exception is only enabled with devMode set to true, as suggested by L. Lenart. - Now prints stacktrace on exception using LOG, as suggested by A. Mashchenko and the the JIRA reporter. Log level set to debug as recommended by Y. Zamani. - Added two additional unit tests for Dispatcher devMode and handleException states. JCgH4164838Gh792C124B5 2019-04-13 21:50:00 +04:30
  • e25c826167 Merge pull request #349 from JCgH4164838Gh792C124B5/localS2_25x_B9 Yasser Zamani 2019-04-20 08:58:07 +04:30
  • 4815744eaf (Amended commit based on feedback) Proposed fix for WW-5028 for the 2.5.x branch: - Disable printing stacktrace on exceptions by the Dispatcher by default. - Printing stacktrace on exception is only enabled with devMode set to true, as suggested by L. Lenart. - Now prints stacktrace on exception using LOG, as suggested by A. Mashchenko and the the JIRA reporter. Log level set to debug as recommended by Y. Zamani. - Added two additional unit tests for Dispatcher devMode and handleException states. JCgH4164838Gh792C124B5 2019-04-13 13:20:00 -04:00
  • d71ff77f82 Merge pull request #351 from sepe81/enhance-gitignore Lukasz Lenart 2019-04-16 10:47:20 +02:00
  • 84e8eecee7 Add common .gitignore patterns from gitignore.io Sebastian Peters 2019-04-15 21:07:02 +02:00
  • f5a7776854 Merge pull request #344 from lukaszlenart/WW-4958 Yasser Zamani 2019-04-14 14:06:35 +04:30
  • 91c6a6f88f Merge pull request #346 from JCgH4164838Gh792C124B5/localS2_26x_B4 Lukasz Lenart 2019-04-01 09:26:07 +02:00
  • f251d1c737 Merge pull request #345 from JCgH4164838Gh792C124B5/localS2_26x_B3 Lukasz Lenart 2019-04-01 08:27:17 +02:00
  • 3e11e1db47 Forward port fix for WW-5024 to 2.6: - NOTE: If the PR is accepted please credit Robert Hollencamp (Github @rhollencamp) for this change as he found the issue, proposed a solution for 2.6 (master), and opened the JIRA. - Updated HttpParameters, ActionMappingParametersInterceptor to prevent multi-level Parameter wrapping from occuring. - Updated HttpParameters create(), build() and buildNoNestedWrapping() to replace redundant type operators with <> based on IDE hint. - Made HttpParameters parameters member final based on IDE hint. - Added a new ActionMappingParametersInterceptorTest to verify the fix. JCgH4164838Gh792C124B5 2019-03-31 23:44:40 -04:00
  • bb7cf092bc Forward-port fix for WW-5026 to 2.6. - Equivalent to PR#342 for 2.5.x, fixes double-submit error 500 failure with - Fixes error 500 processing failures for double-submit results with TokenSessionStoreInterceptor processing - Fix to InvocationSessionStore, new unit test confirming fix in InvocationSessionStoreTest - Minor whitespace fix to TokenSessionStoreInterceptor JCgH4164838Gh792C124B5 2019-03-31 22:47:16 -04:00
  • f45d2752bb WW-4958 Uses less restrictive Regex to check if it's a multipart request Lukasz Lenart 2019-03-30 09:17:01 +01:00
  • 0262574095 Proposed fix for WW-5024 in the 2.5.x branch: (#343) JCgH4164838Gh792C124B5 2019-03-29 02:20:56 -04:00
  • 6797dd8914 Merge pull request #338 from sepe81/maven-wrapper-3.6.0 Aleksandr Mashchenko 2019-03-26 22:56:25 +02:00
  • 30cb56a414 Merge pull request #342 from JCgH4164838Gh792C124B5/localS2_25x_B5 Aleksandr Mashchenko 2019-03-26 22:55:42 +02:00
  • 63dc85fd7a Updated commit with changes suggested by reviewers: - Replace TokenSessionStoreInterceptor inline comment previously added with method comment blocks (better locatioh for explanation) - Eliminate duplicate savedActionContext.setValueStack call in InvocationSessionStore (typo) - Improve InvocationSessionStore.loadInvocation() by reording assignment statements to allow single-line assignments JCgH4164838Gh792C124B5 2019-03-25 23:36:07 -04:00
  • 5b0ec3400d Fix issue introduced with earlier WW-4873 fix: - Fixes error 500 processing failures for double-submit results with TokenSessionStoreInterceptor processing - Fix to InvocationSessionStore, new unit test confirming fix in InvocationSessionStoreTest - Minor whitespace fix to TokenSessionStoreInterceptor JCgH4164838Gh792C124B5 2019-03-25 01:00:10 -04:00
  • d460d71498 Merge pull request #341 from JCgH4164838Gh792C124B5/localS2_25x_Testfix Yasser Zamani 2019-03-18 09:55:17 +03:30
  • 53f64cdecf Backport applicable OgnlValueStackTest test fix and unit test additions from 2.6: - This backport resulted from a review inspired/suggested by Y. Zamani in discussions for PR#334. - Backports fix of error in testNullMethod(). - Backports applicable static access tests (static method access only), cleanup of unused imports. - As with 2.6, it uses Y. Zamani's improved/enhanced reload mechanism. JCgH4164838Gh792C124B5 2019-03-16 17:50:18 -04:00
  • e82c5a207f Upgrade SLF4J to 1.7.26 (WW-5023) (#337) JCgH4164838Gh792C124B5 2019-03-11 03:48:09 -04:00
  • d3eb1fc595 Fix for default (un-configured) allowStaticFieldAccess state, Showcase Application in 2.6.x (#334) JCgH4164838Gh792C124B5 2019-03-11 02:05:48 -04:00
  • 1ef598ec2f Update maven-wrapper to 0.5.3 and maven to 3.6.0 Sebastian Peters 2019-02-27 23:11:04 +01:00
  • aff4d46835 Merge pull request #336 from JCgH4164838Gh792C124B5/local_25x_LibUpd2 Lukasz Lenart 2019-02-25 08:40:42 +01:00
  • ce4f192676 add properties support to XWorkTestCase.loadButAdd Yasser Zamani 2019-02-24 17:53:45 +03:30
  • a15c12a051 add properties support to XWorkTestCase.loadButAdd Yasser Zamani 2019-02-24 17:53:45 +03:30
  • e62155c460 Upgrade SLF4J to 1.7.26 (WW-5023) JCgH4164838Gh792C124B5 2019-02-21 12:25:23 -05:00
  • 3ee47f19c3 Merge pull request #335 from JCgH4164838Gh792C124B5/localS2_26x_Appfix2 Lukasz Lenart 2019-02-14 07:21:10 +01:00
  • 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). JCgH4164838Gh792C124B5 2019-02-14 01:03:44 -05:00
  • 9a14323a6a Merge pull request #332 from yasserzamani/delete_sitegraph Lukasz Lenart 2019-02-12 09:34:17 +01:00
  • f7f4fbd47f Merge pull request #333 from JCgH4164838Gh792C124B5/localS2_25x_Appfix Lukasz Lenart 2019-02-12 09:33:18 +01:00
  • 2d81439553 Minor config fixes for the Showcase Application in 2.5.x: 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). 4) File upload examples. Multiple file upload missing result page (list and array), added missing JSP. Added missing input results in configuration. 5) Add manual test for public constant access via expression (to If tag JSP). Similar to PR#255 for 2.6.x. JCgH4164838Gh792C124B5 2019-02-11 19:26:43 -05:00
  • 28c9411015 delete deprecated sitegraph plugin Yasser Zamani 2019-02-11 16:53:20 +03:30
  • 7afe35cb96 Adds a Jenkinsfile to allow build this branch as well Lukasz Lenart 2019-02-11 09:32:49 +01:00
  • 9466b615ab Improve SecurityMemberAccess (#323) Aleksandr Mashchenko 2019-02-10 21:47:27 +02:00
  • 2908d746ce Minor code optimization in jasper reports result Johannes Geppert 2019-02-10 16:15:38 +01:00
  • 9088405b0f Fix compile issue of jasper plugin with latest jasper version Johannes Geppert 2019-02-09 15:35:12 +01:00
  • bbe46e92f0 Fix compile issue of post order test example with latest http client version Johannes Geppert 2019-02-09 15:32:02 +01:00
  • 95866c347e Use latest available hibernate-validator version for bean validation test scope Johannes Geppert 2019-02-09 15:08:06 +01:00