Commit Graph

  • 3df363e7a7 Merge branch 'easymock_update' of git@github.com:victorsosa/struts.git into easymock_update victorsosa 2016-03-03 17:57:27 -04:00
  • a0a70581f9 Merge branch 'easymock_update' of git@github.com:victorsosa/struts.git into easymock_update victorsosa 2016-03-03 17:49:06 -04:00
  • 88b37cdb40 Merge branch 'easymock_update' of git@github.com:victorsosa/struts.git into easymock_update victorsosa 2016-03-03 17:49:06 -04:00
  • d8e4cb8b48 Merge branch 'master' into easymock_update victorsosa 2016-03-03 14:38:13 -04:00
  • a5d7163939 Merge pull request #9 from victorsosa/easymock_update victor sosa 2016-03-03 14:41:11 -04:00
  • eddd8e0547 Merge branch 'master' into easymock_update victorsosa 2016-03-03 14:38:13 -04:00
  • 5bcdd3d9f3 WW-4464 Adds null checking Lukasz Lenart 2016-03-03 19:30:00 +01:00
  • da8b13a87e Merge pull request #8 from apache/master victor sosa 2016-03-03 14:16:11 -04:00
  • ffa6d5cb5b WW-4610 Ports fix from master branch Lukasz Lenart 2016-03-03 18:02:38 +01:00
  • f9fb3549cd WW-4610 Adds proper context initialisation when file upload is used Lukasz Lenart 2016-03-03 17:56:05 +01:00
  • 65e2a864a2 WW-4607 Allows defined custom type for text field Lukasz Lenart 2016-03-03 17:40:24 +01:00
  • e5d693a8df WW-3940 Upgrades Velocity tools Lukasz Lenart 2016-03-03 17:38:37 +01:00
  • 0c92e2a1f3 fix for WW-4610 ServletActionContext.getRequest() doesn't return the MultiPartRequestWrapper (or StrutsRequestWrapper) when using StrutsPrepareFilter victorsosa 2016-03-03 10:06:57 -04:00
  • f34283b26e Merge pull request #7 from apache/master victor sosa 2016-02-27 11:20:39 -04:00
  • 4ea8883ff9 WW-4410 Adds dedicated interface to allow inject ServletContext Lukasz Lenart 2016-02-25 21:29:25 +01:00
  • 9860ef829a WW-4410 Adds dedicated interface to allow inject ServletContext Lukasz Lenart 2016-02-25 21:29:25 +01:00
  • 5d98650921 Drops wrong arg passed to logger Lukasz Lenart 2016-02-25 20:29:38 +01:00
  • d028886cd1 Drops wrong arg passed to logger Lukasz Lenart 2016-02-25 20:29:38 +01:00
  • e2c6b42b82 WW-4595 Resolves regression issue but keeping support for custom text provider Lukasz Lenart 2016-02-25 20:12:23 +01:00
  • 1b4868df3e WW-4595 Resolves regression issue but keeping support for custom text provider Lukasz Lenart 2016-02-25 20:12:23 +01:00
  • 41227fab82 WW-4563 Reverts checking if value is excluded and uses Internal Security Mechanism Lukasz Lenart 2016-02-25 18:30:26 +01:00
  • 0d494106f6 WW-4560 Reverts checking if value is excluded and uses Internal Security Mechanism Lukasz Lenart 2016-02-25 18:16:32 +01:00
  • 5cfe05075b WW-4563 Reverts checking if value is excluded and uses Internal Security Mechanism Lukasz Lenart 2016-02-25 18:30:26 +01:00
  • 5efc595011 WW-4560 Reverts checking if value is excluded and uses Internal Security Mechanism Lukasz Lenart 2016-02-25 18:16:32 +01:00
  • b638260d92 escaped @ characters in javadoc code sample to avoid javadoc warnings cnenning 2016-02-25 09:31:40 +01:00
  • 46cd6a1276 fix spelling error in comments nkjackzhang 2016-02-22 10:13:37 +08:00
  • 8b8135af79 Merge branch 'ww-4558' of github.com:victorsosa/struts into ww-4558 victorsosa 2016-02-15 10:37:26 -04:00
  • 2fada1ec05 Merge branch 'ww-4558' of github.com:victorsosa/struts into ww-4558 victorsosa 2016-02-15 10:34:15 -04:00
  • bab451c6d8 Merge branch 'ww-4558' of github.com:victorsosa/struts into ww-4558 victorsosa 2016-02-15 10:34:15 -04:00
  • 0d49050381 fix patch WW-4558 victorsosa 2016-02-15 08:28:01 -04:00
  • fab687a07e fix patch WW-4558 victorsosa 2016-02-15 08:28:01 -04:00
  • 9c7b833668 WW-4600 Ports solution with PreResultListener from WW-4605 Lukasz Lenart 2016-02-11 08:21:59 +01:00
  • d397abcfc1 html5 attributes again gregh3269 2016-02-10 11:12:10 +00:00
  • 40f7b39c3f Allow html5 attributes gregh3269 2016-02-10 08:53:32 +00:00
  • 24085bdc5a Adds some logginf to allowed methods Lukasz Lenart 2016-02-05 09:36:21 +01:00
  • c53c6d8c8e WW-4596 Uses unmodifiable set to avoid changing allowed methods Lukasz Lenart 2016-02-05 09:02:52 +01:00
  • a2c5bc835e Merge pull request #6 from apache/master victor sosa 2016-02-04 13:12:22 -04:00
  • 0cc5fcaaa3 WW-4596 Fixes bug with overriding global-allowed-methods Lukasz Lenart 2016-02-04 11:00:04 +01:00
  • 857195c1b1 WW-4605 Refactors MessageStoreInterceptor to use listener Lukasz Lenart 2016-02-04 08:20:02 +01:00
  • 41cf08c772 Updates tests to reflect invocation change logic Lukasz Lenart 2016-02-04 08:06:08 +01:00
  • f755e01c18 Updates test to cover usage of new listener Lukasz Lenart 2016-02-04 08:05:46 +01:00
  • 8071052f86 Uses the new listener Lukasz Lenart 2016-02-04 08:05:21 +01:00
  • 0754027a5a Adds test based on MessageStoreInterceptor Lukasz Lenart 2016-02-04 08:05:00 +01:00
  • a9b2c3cb4d Defines listener to store messages Lukasz Lenart 2016-02-04 08:04:44 +01:00
  • 6bb526d8ec Creates result before executing it to allow listeners to operate on it Lukasz Lenart 2016-02-03 21:01:48 +01:00
  • 87979d2821 WW-4606 made @TilesDefinition work with tiles 2 cnenning 2016-02-03 14:18:54 +01:00
  • 8a9e01727c removed outcommented line cnenning 2016-02-01 09:45:34 +01:00
  • 5b2b244a66 added missing license header cnenning 2016-02-01 09:37:25 +01:00
  • 473403ca17 formatted annotations more nicely cnenning 2016-02-01 09:36:23 +01:00
  • 1bbcd4bf70 renamed test class to stick to naming convention cnenning 2016-01-25 14:36:07 +01:00
  • 469b25f8e1 WW-4606 fixed javadoc cnenning 2016-01-25 13:50:45 +01:00
  • 27260685e1 updated javadoc cnenning 2016-01-25 13:39:47 +01:00
  • bd5e64e598 added tests for StrutsTilesAnnotationProcessor cnenning 2016-01-25 11:23:10 +01:00
  • 9a8f36dee2 WW-4606 added @TilesDefinition sample to showcase app cnenning 2016-01-22 15:27:50 +01:00
  • a6345e79c9 WW-4606 cherry-picked @TilesDefinition and related classes cnenning 2016-01-22 15:27:09 +01:00
  • 6d2a57355e Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts cnenning 2016-02-03 10:51:53 +01:00
  • 15688132ef WW-4594 Merges #85 which adds annotations to configure tiles cnenning 2016-02-03 10:51:15 +01:00
  • 954a29efce WW-4596 Adds support to defined allowed methods with * Lukasz Lenart 2016-02-03 10:38:13 +01:00
  • 23a0c9eb64 WW-4596 Fixes SMI with ActionConfigMatcher Lukasz Lenart 2016-02-03 09:48:30 +01:00
  • d8b6602e6f WW-4600 Adds additional check if session was invalidated Lukasz Lenart 2016-02-03 09:28:21 +01:00
  • 85373951b7 WW-4600 Adds additional check if session was invalidated Lukasz Lenart 2016-02-03 09:28:21 +01:00
  • 94691e0afd Every 2nd build on jenkins with jdk8 fails while generating javadoc for tiles-plugin. It fails at file serialized-form.html because it misses class org.apache.tiles.context.TilesRequestContextWrapper. That class was present in tiles 2 but is not present in tiles 3 anymore. To avoid failing builds due to this failOnError is set to false. cnenning 2016-02-01 11:33:20 +01:00
  • f5ef1438aa removed outcommented line cnenning 2016-02-01 09:45:34 +01:00
  • 8651545aaa turned comments into LOG.trace() cnenning 2016-02-01 09:44:22 +01:00
  • 92302703f2 added missing license header cnenning 2016-02-01 09:37:25 +01:00
  • edf7c099e3 formatted annotations more nicely cnenning 2016-02-01 09:36:23 +01:00
  • 46bd92fe20 Merge pull request #5 from apache/master victor sosa 2016-01-29 17:54:27 -04:00
  • cceb891667 turned @AllowedMethods into String[] cnenning 2016-01-29 15:53:18 +01:00
  • c44566bd24 fixed jenkins by resolving compiler error in test class (did not appear locally) and adjusting asserts to older version of spring mock objects cnenning 2016-01-29 15:12:17 +01:00
  • 2a6acabe5d updated comments cnenning 2016-01-28 10:58:44 +01:00
  • 377c6cdda0 increased visibilty of methods and constants for better extensibility cnenning 2016-01-14 09:33:50 +01:00
  • 6438396ef8 made methods non static and private, javadoc updates cnenning 2016-01-12 14:14:09 +01:00
  • 69bc2947c1 WW-4599: backport JSONActionRedirectResult to struts 2.3 cnenning 2016-01-11 14:36:32 +01:00
  • d0baa7060d updated comments cnenning 2016-01-28 10:58:44 +01:00
  • 20e9d13b17 WW-4593: Easymock upgrade to 3.4 victorsosa 2016-01-26 09:28:44 -04:00
  • 778eec3b94 Merge pull request #4 from apache/master victor sosa 2016-01-26 08:38:50 -04:00
  • 6fb870d389 WW-4587 Adds logic to cache missing bundles Lukasz Lenart 2016-01-26 10:59:47 +01:00
  • 5b25645523 WW-4575 Adds missing constants translation Lukasz Lenart 2016-01-26 10:00:21 +01:00
  • e9d92f5000 WW-4575 Uses startWith instead of pattern matching to improve overall performance Lukasz Lenart 2016-01-26 09:33:48 +01:00
  • 15c79e1398 WW-4587 Adds logic to cache missing bundles Lukasz Lenart 2016-01-26 10:59:47 +01:00
  • dd36946573 WW-4575 Adds missing constants translation Lukasz Lenart 2016-01-26 10:00:21 +01:00
  • 18bdc141ea WW-4575 Uses startWith instead of pattern matching to improve overall performance Lukasz Lenart 2016-01-26 09:33:48 +01:00
  • 9ca6eb9813 renamed test class to stick to naming convention cnenning 2016-01-25 14:36:07 +01:00
  • b1588ddc84 fixed line endings cnenning 2016-01-25 13:50:45 +01:00
  • a53deac7ce updated javadoc cnenning 2016-01-25 13:39:47 +01:00
  • d76357fd82 added tests for StrutsTilesAnnotationProcessor cnenning 2016-01-25 11:23:10 +01:00
  • e50c37c5ba added sample for tiles annotations cnenning 2016-01-22 15:27:50 +01:00
  • 9ac326aa24 Added tiles annotations, see WW-4594. cnenning 2016-01-22 15:27:09 +01:00
  • d9f4054b13 fixed tiles showcase by setting dtd to 3.0 cnenning 2016-01-22 14:59:48 +01:00
  • e05f9f0180 Merge pull request #3 from apache/master victor sosa 2016-01-21 08:00:54 -04:00
  • 249d2f8d83 [maven-release-plugin] prepare for next development iteration Lukasz Lenart 2016-01-21 09:26:18 +01:00
  • 9a63e6504b [maven-release-plugin] prepare release STRUTS_2_5_BETA3 STRUTS_2_5_BETA3 Lukasz Lenart 2016-01-21 09:25:54 +01:00
  • 0835c33adf Cleans up after migrating to Tiles 3 and dropped struts2-tiles3-plugin Lukasz Lenart 2016-01-21 09:20:05 +01:00
  • 11561cb299 Merge branch 'WW-4590' Lukasz Lenart 2016-01-21 08:45:07 +01:00
  • 09d1954b0c Update .gitignore victor sosa 2016-01-20 21:09:37 -04:00
  • 8232d931d9 Merge branch 'ww-3940' of git@github.com:victorsosa/struts.git into ww-3940 Victor Sosa 2016-01-20 19:42:03 -04:00
  • f4d5305b19 ww-3940 change Victor Sosa 2016-01-20 18:54:22 -04:00
  • 9fa2ec610e Merge branch 'ww-3940' of github.com:victorsosa/struts into ww-3940 Victor Sosa 2016-01-20 18:54:22 -04:00
  • 8d6c3b6b8b Merge branch 'ww-3940' of git@github.com:victorsosa/struts.git into ww-3940 Victor Sosa 2016-01-20 17:43:43 -04:00
  • 8b426cf9bf Merge branch 'ww-3940' of git@github.com:victorsosa/struts.git into ww-3940 Victor Sosa 2016-01-20 17:43:43 -04:00