Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-09-12 17:15:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,633 Commits 15 Branches 184 Tags
9254aaaefefbf0cc523c1bd710b60b9b815825e2
Commit Graph

919 Commits

Author SHA1 Message Date
Lukasz Lenart d2663cedd2 Sets correct version in poms to match actually released version 2014-05-08 21:57:25 +02:00
Lukasz Lenart 38a3f8bfb6 Merge branch 'hotfix/2.3.16.3' 
Conflicts:
	apps/rest-showcase/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/src/main/assembly/docs.xml
 2014-05-08 21:55:35 +02:00
Lukasz Lenart bcffc256fa [maven-release-plugin] prepare for next development iteration 2014-05-02 17:10:54 +02:00
Lukasz Lenart e03ff72861 [maven-release-plugin] prepare release STRUTS_2_3_16_3 2014-05-02 17:10:41 +02:00
Lukasz Lenart bca525da8d Sets version in poms to -SNAPSHOT 2014-05-02 15:36:19 +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 9c9d2b5a58 WW-3493 Adds new datetextfield tag 2014-03-27 19:42:35 +01:00
Lukasz Lenart fc6c34d85c Adds 'name' to be rendered for submit input type 'image' 2014-03-06 22:52:05 +01:00
Lukasz Lenart 040fd67615 Bumps version to 2.3.17-SNAPSHOT 2014-03-06 21:57:37 +01:00
Lukasz Lenart b180908eb9 Merge branch 'master' into develop 2014-03-06 21:42:26 +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 4da2ec65c7 Updates classes to use the new version of Dispatcher's methods without ServletContext 2014-02-17 09:35:20 +01:00
Lukasz Lenart 9ff04d17a5 Updates tests to new version of methods without ServletContext 2014-02-17 09:34:47 +01:00
Lukasz Lenart ddd27197f5 Updates tests to new version of methods without ServletContext 2014-02-17 09:34:10 +01:00
Lukasz Lenart e98cd4005a WW-3887 Updates unit tests to match the new error handling mechanism 2014-02-16 18:37:17 +01:00
Greg Huber 18b9c55b4b Code formatting changes only. 2014-02-03 14:02:39 +00:00
Greg Huber e858e4d000 Make we sure we handle doubles/longs correctly, for class cast 
exception.
 2014-02-03 10:09:22 +00:00
Greg Huber f3c54b90ac Copy changes from checkboxlist and refactor changes to match existing 
code.  See WW-4181.
 2014-01-31 13:45:03 +00:00
Lukasz Lenart b0e0ae4a0e Uses proper tagging for snippets 2014-01-20 09:21:43 +01:00
Lukasz Lenart 4ba5689b37 Uses proper tagging for snippets 2014-01-20 09:20:02 +01:00
Lukasz Lenart 750d68009c WW-4244 Uses ObjectFactory to instantiate action in config-browser 2014-01-15 09:12:23 +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 bb31672e8a WW-4263 Adds proper and thread safe handling of If-Modified-Since header 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1555018 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-03 06:42:19 +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 612c02874d WW-4254 Adds missing parent theme definition 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1554759 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-02 07:35:31 +00:00
Lukasz Lenart ab98daf826 WW-4252 Uses TagUtils instead directly calling Dispatcher.getInstance() 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1549067 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-08 17:12:01 +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 54f38af0bd WW-4243 Extracts BeanSelectionProvider interface 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1543527 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-19 17:56:18 +00:00
Lukasz Lenart 9f5ba8cc53 WW-4243 Renames based test case class to avoid using it outside of core 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1542825 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-17 21:21:36 +00:00
Lukasz Lenart 0aa0a69068 WW-4243 Splits interface in to two to allow using different implementation 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1542808 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-17 20:42:46 +00:00
Lukasz Lenart fd27e5cc74 WW-4213 Non-breaking sanitise mechanism 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1536698 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-29 13:00:58 +00:00
Lukasz Lenart 9cab14bcf7 WW-4044 Solves problem with infinitive loop when used with <s:action/> tag and attribute executeResult is set to "true" 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1536598 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-29 07:01:49 +00:00
Lukasz Lenart 11228e643c WW-3832 Solves problem when not using flat layout with Convention plugin 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1535364 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-24 12:50:37 +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
Lukasz Lenart 1189735db7 WW-4152 Solves problem with NPE as a side effect of concurrency issue, removes old code, use simpler dependency graph 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1534634 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-22 13:42:51 +00:00
Lukasz Lenart 01584fabc7 WW-4213 Sanitises input param namespace to avoid XSS 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1533354 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-18 08:10:07 +00:00
Lukasz Lenart 1c327e288a WW-4225 Extracts duplicated code into util class 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1533338 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-18 07:07:32 +00:00
Lukasz Lenart 020d93ab94 WW-4064 Reverts changes introduced by WW-3698 to avoid class cast exception 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1532741 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-16 12:05:23 +00:00
Lukasz Lenart f80c18d476 WW-4100 Solves problem with global "error" result when used with Convention plugin 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1532732 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-16 11:31:21 +00:00