Commit Graph

151 Commits

Author SHA1 Message Date
cnenning c44566bd24 fixed jenkins by resolving compiler error in test class (did not appear locally) and adjusting asserts to older version of spring mock objects 2016-01-29 15:12:17 +01:00
cnenning 377c6cdda0 increased visibilty of methods and constants for better extensibility 2016-01-29 13:54:08 +01:00
cnenning 6438396ef8 made methods non static and private, javadoc updates 2016-01-29 13:53:48 +01:00
cnenning 69bc2947c1 WW-4599: backport JSONActionRedirectResult to struts 2.3 2016-01-29 13:53:31 +01:00
Lukasz Lenart 4f817dc7a9 Prepares for 2.3.x development cycle 2015-10-09 19:02:09 +02:00
Lukasz Lenart 7a9863169f [maven-release-plugin] prepare release STRUTS_2_3_24_1 2015-09-22 07:49:22 +02:00
Lukasz Lenart 0cefe507fb Sets SNAPSHOT version 2015-09-22 07:39:39 +02:00
Lukasz Lenart 925741ad1e [maven-release-plugin] prepare release STRUTS_2_3_24 2015-05-03 12:07:56 +02:00
Lukasz Lenart 75027a3cb8 Sets proper version 2015-04-07 11:27:40 +02:00
Lukasz Lenart 6d16144e31 Sets proper version 2015-04-07 11:26:30 +02:00
Lukasz Lenart a31af91199 [maven-release-plugin] prepare for next development iteration 2015-04-07 09:52:42 +02:00
Lukasz Lenart d469fffed9 [maven-release-plugin] prepare release STRUTS_2_3_23 2015-04-07 09:52:32 +02:00
Lukasz Lenart 3e23f2191e [maven-release-plugin] prepare for next development iteration 2015-03-19 07:11:27 +01:00
Lukasz Lenart 22573f8de8 [maven-release-plugin] prepare release STRUTS_2_3_22 2015-03-19 07:11:15 +01:00
aronshen b888275803 change findBaseAccessor method
in hibernate4.3.7,because javassist3.18.1's class name generate rule is '_$$_jvst'+...
2015-01-20 11:54:10 +08:00
Lukasz Lenart 22cbf40fc2 [maven-release-plugin] prepare for next development iteration 2014-12-31 14:53:22 +01:00
Lukasz Lenart a40e9a90bf [maven-release-plugin] prepare release STRUTS_2_3_21 2014-12-31 14:53:04 +01:00
Lukasz Lenart da4a22078a WW-4413 Improves JSON interceptor to handle JSON arrays 2014-12-29 11:29:08 +01:00
Lukasz Lenart 5f2898eadf Cleans up Maven generated website 2014-12-02 12:41:06 +01:00
Lukasz Lenart 5078537ff6 [maven-release-plugin] prepare for next development iteration 2014-11-21 19:30:20 +01:00
Lukasz Lenart 0320310406 [maven-release-plugin] prepare release STRUTS_2_3_20 2014-11-21 19:30:08 +01:00
Lukasz Lenart f7f4915bd3 [maven-release-plugin] prepare for next development iteration 2014-11-14 08:31:27 +01:00
Lukasz Lenart 0032390ee8 [maven-release-plugin] prepare release STRUTS_2_3_19 2014-11-14 08:31:12 +01:00
Lukasz Lenart 70af4b649a Prepares for next development cycle 2014-11-14 08:17:15 +01:00
Aleksandr Mashchenko 61cffe68fe improved interceptor that accepts and maps JSON array 2014-10-13 20:07:07 +03:00
Lukasz Lenart 120830f1ac WW-4301 Adds additional use-case to proof the problem exists 2014-08-07 08:43:42 +02:00
Lukasz Lenart 3575bebf01 Corrects version in poms 2014-04-28 08:52:37 +02:00
Lukasz Lenart 1be8ed61e4 Merge branch 'hotfix/2.3.16.2'
Conflicts:
	apps/blank/pom.xml
	apps/jboss-blank/pom.xml
	apps/mailreader/pom.xml
	apps/pom.xml
	apps/portlet/pom.xml
	apps/rest-showcase/pom.xml
	apps/showcase/pom.xml
	archetypes/pom.xml
	archetypes/struts2-archetype-angularjs/pom.xml
	archetypes/struts2-archetype-blank/pom.xml
	archetypes/struts2-archetype-convention/pom.xml
	archetypes/struts2-archetype-dbportlet/pom.xml
	archetypes/struts2-archetype-plugin/pom.xml
	archetypes/struts2-archetype-portlet/pom.xml
	archetypes/struts2-archetype-starter/pom.xml
	assembly/pom.xml
	bundles/admin/pom.xml
	bundles/demo/pom.xml
	bundles/pom.xml
	core/pom.xml
	core/src/main/resources/struts-default.xml
	plugins/cdi/pom.xml
	plugins/codebehind/pom.xml
	plugins/config-browser/pom.xml
	plugins/convention/pom.xml
	plugins/dojo/pom.xml
	plugins/dwr/pom.xml
	plugins/embeddedjsp/pom.xml
	plugins/gxp/pom.xml
	plugins/jasperreports/pom.xml
	plugins/javatemplates/pom.xml
	plugins/jfreechart/pom.xml
	plugins/jsf/pom.xml
	plugins/json/pom.xml
	plugins/junit/pom.xml
	plugins/osgi/pom.xml
	plugins/oval/pom.xml
	plugins/pell-multipart/pom.xml
	plugins/plexus/pom.xml
	plugins/pom.xml
	plugins/portlet-tiles/pom.xml
	plugins/portlet/pom.xml
	plugins/rest/pom.xml
	plugins/sitegraph/pom.xml
	plugins/sitemesh/pom.xml
	plugins/spring/pom.xml
	plugins/struts1/pom.xml
	plugins/testng/pom.xml
	plugins/tiles/pom.xml
	plugins/tiles3/pom.xml
	pom.xml
	xwork-core/pom.xml
2014-04-28 08:50:53 +02:00
Lukasz Lenart fbd75a892b [maven-release-plugin] prepare for next development iteration 2014-04-24 21:32:49 +02:00
Lukasz Lenart 7dd83dff48 [maven-release-plugin] prepare release STRUTS_2_3_16_2 2014-04-24 21:32:35 +02:00
Lukasz Lenart a2d0ecdcd3 Sets -SNAPSHOT version 2014-04-22 11:54:59 +02:00
Lukasz Lenart e1f97c8b07 [maven-release-plugin] prepare for next development iteration 2014-04-06 14:02:04 +02:00
Lukasz Lenart 7908a88a40 [maven-release-plugin] prepare release STRUTS_2_3_17 2014-04-06 14:01:53 +02:00
Lukasz Lenart 040fd67615 Bumps version to 2.3.17-SNAPSHOT 2014-03-06 21:57:37 +01:00
Lukasz Lenart a79955483b Merge branch 'release/fast-track-2-3-16-1'
Conflicts:
	apps/blank/pom.xml
	apps/jboss-blank/pom.xml
	apps/mailreader/pom.xml
	apps/pom.xml
	apps/portlet/pom.xml
	apps/rest-showcase/pom.xml
	apps/showcase/pom.xml
	archetypes/pom.xml
	archetypes/struts2-archetype-angularjs/pom.xml
	archetypes/struts2-archetype-blank/pom.xml
	archetypes/struts2-archetype-convention/pom.xml
	archetypes/struts2-archetype-dbportlet/pom.xml
	archetypes/struts2-archetype-plugin/pom.xml
	archetypes/struts2-archetype-portlet/pom.xml
	archetypes/struts2-archetype-starter/pom.xml
	assembly/pom.xml
	bundles/admin/pom.xml
	bundles/demo/pom.xml
	bundles/pom.xml
	core/pom.xml
	core/src/site/resources/tags/checkboxlist.html
	plugins/cdi/pom.xml
	plugins/codebehind/pom.xml
	plugins/config-browser/pom.xml
	plugins/convention/pom.xml
	plugins/dojo/pom.xml
	plugins/dwr/pom.xml
	plugins/embeddedjsp/pom.xml
	plugins/gxp/pom.xml
	plugins/jasperreports/pom.xml
	plugins/javatemplates/pom.xml
	plugins/jfreechart/pom.xml
	plugins/jsf/pom.xml
	plugins/json/pom.xml
	plugins/junit/pom.xml
	plugins/osgi/pom.xml
	plugins/oval/pom.xml
	plugins/pell-multipart/pom.xml
	plugins/plexus/pom.xml
	plugins/pom.xml
	plugins/portlet-tiles/pom.xml
	plugins/portlet/pom.xml
	plugins/rest/pom.xml
	plugins/sitegraph/pom.xml
	plugins/sitemesh/pom.xml
	plugins/spring/pom.xml
	plugins/struts1/pom.xml
	plugins/testng/pom.xml
	plugins/tiles/pom.xml
	plugins/tiles3/pom.xml
	pom.xml
	xwork-core/pom.xml
2014-03-06 21:41:39 +01:00
Lukasz Lenart b042b36365 [maven-release-plugin] prepare for next development iteration 2014-03-01 21:32:30 +01:00
Lukasz Lenart 6cddee6fc5 [maven-release-plugin] prepare release STRUTS_2_3_16 2014-03-01 21:31:38 +01:00
Lukasz Lenart 48f11742ed Updates <scm> tag 2014-03-01 16:57:21 +01:00
Lukasz Lenart 19e73e48fa Reverts version to -SNAPSHOT 2014-03-01 15:34:10 +01:00
Lukasz Lenart a2d4bdd8cf WW-4185 makes default json date format configurable
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1556522 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 13:02:59 +00:00
Lukasz Lenart e73cc3fb09 WW-4271 Improves pattern logging in JSONUtil
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1556509 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 12:03:18 +00:00
Lukasz Lenart 3c3168bff4 WW-4041 Uses the latest Commons Lang3 3.2 version and escapeJson method to solve problem with escaping single quote
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1554923 13f79535-47bb-0310-9956-ffa450edef68
2014-01-02 21:27:30 +00:00
Lukasz Lenart 0df28a4194 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1546715 13f79535-47bb-0310-9956-ffa450edef68
2013-11-30 10:28:53 +00:00
Lukasz Lenart ced5f0ea1a [maven-release-plugin] prepare release STRUTS_2_3_16
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1546710 13f79535-47bb-0310-9956-ffa450edef68
2013-11-30 09:35:02 +00:00
Lukasz Lenart 615bf35f4f WW-4233 Adds UTF-8 encoding property to all poms
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1534982 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 10:56:53 +00:00
Christian Grobmeier 5e3e793576 removed unused site folder and site.xml
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1521449 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 12:08:04 +00:00
Lukasz Lenart c8b616b17f Corrects typo
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1519959 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 09:46:14 +00:00
Lukasz Lenart 9f9f8eb045 Modifies expected results slightly
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1519925 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 07:36:00 +00:00
Lukasz Lenart 48a8dc5371 Modifies assertEquals on result to don't depend on order of validations
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1519918 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 06:51:05 +00:00
Lukasz Lenart ac5a18c4b8 Adds FEST assert to simplify testing
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1519917 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 06:50:12 +00:00