Commit Graph

4088 Commits

Author SHA1 Message Date
Lukasz Lenart 48ea26be79 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts 2015-09-28 20:42:36 +02:00
Johannes Geppert 43c0309410 WW-4522 Support latest stable AngularJS version in maven angularjs archetype
- Correct redirect to index action
2015-09-28 19:53:26 +02:00
Johannes Geppert cd4eb6f26d WW-4522 Support latest stable AngularJS version in maven angularjs archetype
- Merge Application into Index Action
- Use StrutsRestTestCase
- Use Junit4
- Add default action to package config
- Use latest eclipse jetty plugin
2015-09-27 14:06:55 +02:00
Johannes Geppert f819486c34 WW-4505 Add plugin to support bean validation
- Add pre configured interceptor stack to use bean validation with rest plugin
2015-09-24 19:59:35 +02:00
Lukasz Lenart db62a57bcb Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts 2015-09-23 08:56:51 +02:00
Lukasz Lenart dc270c2e09 Merges security fixes from 2.3.24.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
	bom/pom.xml
	bundles/admin/pom.xml
	bundles/demo/pom.xml
	bundles/pom.xml
	core/pom.xml
	plugins/bean-validation/pom.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/java8-support/pom.xml
	plugins/javatemplates/pom.xml
	plugins/jfreechart/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
2015-09-23 08:42:01 +02:00
Johannes Geppert 18fc7eb155 WW-4549 - Extend Struts Test Case to support tests for REST plugin actions 2015-09-22 18:18:55 +02:00
cnenning f829e01f6e fixes broken tests due to WW-4544 / #48 2015-09-22 16:17:14 +02:00
cnenning c9efe4d0ee WW-4544 Merges #48 which makes ContainUtil more consistent 2015-09-22 14:39:45 +02:00
Lukasz Lenart bfe51fcb7f [maven-release-plugin] prepare for next development iteration 2015-09-22 07:49:39 +02:00
Lukasz Lenart 7a9863169f [maven-release-plugin] prepare release STRUTS_2_3_24_1 STRUTS_2_3_24_1 2015-09-22 07:49:22 +02:00
Lukasz Lenart 27f451d99a Updates bom 2015-09-22 07:41:42 +02:00
Lukasz Lenart 0cefe507fb Sets SNAPSHOT version 2015-09-22 07:39:39 +02:00
Lukasz Lenart f420f28466 Solves issue with vulnerable parameters 2015-09-22 07:24:49 +02:00
Johannes Geppert 4cd9a74cb8 WW-4545 - Setting status code in HttpHeaders will be ignored 2015-09-10 19:11:12 +02:00
Johannes Geppert e10658cb3c WW-4547 - Rest showcase does not show the validation result 2015-09-10 17:37:41 +02:00
zhouyanming b3e8da2ec8 Uniform comparison
Add more defense, like compare Enum to String or else.
2015-09-09 18:20:45 +08:00
Johannes Geppert 4286d6a9dc WW-4522 Support latest stable AngularJS version in maven angularjs archetype
- Upgrade to latest stable angular js version 1.4.5
2015-09-06 18:15:15 +02:00
Johannes Geppert 215a4f9853 WW-4522 Support latest stable AngularJS version in maven angularjs archetype
- Improve data service internal generic _request method
2015-09-06 18:14:39 +02:00
Johannes Geppert 0fac53954a WW-4537 Support for latest jackson lib as json content handler in rest plugin 2015-08-23 13:45:38 +02:00
Johannes Geppert 3bd1b7a723 Use ControllerAs pattern in angularjs archetype 2015-08-22 12:38:51 +02:00
Lukasz Lenart 16fa0ed80c WW-4342 Moves snippets directly to the Wiki 2015-08-11 16:15:12 +02:00
Johannes Geppert 5cf3381b89 Merge remote-tracking branch 'origin/master' 2015-08-04 22:02:38 +02:00
Johannes Geppert 3e1087a7fa WW-4532 Javascript generated by s:doubleselect has global variables that can interfer with the rest of the app
- Fix problem with missing var for loop variable and possible mixed scope
2015-08-04 22:02:24 +02:00
Johannes Geppert 0469947e67 WW-4532 Javascript generated by s:doubleselect has global variables that can interfer with the rest of the app
- Follow jslint recommendations in javascript resources
2015-08-04 22:01:39 +02:00
Johannes Geppert 49c43b377e WW-4532 Javascript generated by s:doubleselect has global variables that can interfer with the rest of the app
- Introduce new build plugin to automatically execute jslint checks during build on javascript resources
2015-08-04 22:00:16 +02:00
Lukasz Lenart 9e0aa504e6 Uses proper links to docs and drops XWork package 2015-07-31 09:20:34 +02:00
Johannes Geppert 5cf0671b60 WW-4522 Support latest stable AngularJS version in maven angularjs archetype
- Add maven plugin for automatic concatenating and minifying of resources during build
2015-07-25 11:20:30 +02:00
Johannes Geppert 775c82a743 WW-4531- Improve javadoc to be compatible with more strict JDK8 javadoc standard 2015-07-24 20:27:31 +02:00
Lukasz Lenart 98d7756cbb [maven-release-plugin] prepare for next development iteration 2015-07-17 09:36:30 +02:00
Lukasz Lenart 2a37a2e32d [maven-release-plugin] prepare release STRUTS_2_5_BETA1 STRUTS_2_5_BETA1 2015-07-17 09:36:16 +02:00
Lukasz Lenart eda791e12a Cleans up after dropping blank and mailreader app 2015-07-17 09:27:48 +02:00
Johannes Geppert 1817207816 Correct Exception type in java doc 2015-07-16 22:35:32 +02:00
Johannes Geppert eb564a25e1 Fix wrong closing HTML tags in javadoc comments 2015-07-16 22:02:21 +02:00
Aleksandr Mashchenko f85c60ea47 WW-4527 - Show property class in debug tag 2015-07-14 22:24:08 +03:00
Johannes Geppert 9172cf34f2 Fix wrong closing HTML tags in javadoc comments 2015-07-13 21:01:16 +02:00
Johannes Geppert d8c4062519 WW-4523 - Add more log statements to RolesInterceptor 2015-07-12 18:14:37 +02:00
Aleksandr Mashchenko 3c9ff04bdb using log with message parameters 2015-07-11 14:59:57 +03:00
Johannes Geppert 4969750f37 WW-4522 Support latest stable AngularJS version in maven angularjs archetype
- Add maven plugin for automatic jshint execution on build
2015-07-11 10:45:31 +02:00
Johannes Geppert 9ef3aba047 WW-4522 Support latest stable AngularJS version in maven angularjs archetype
- Rename exposed service object to avoid naming conflict
2015-07-11 10:44:49 +02:00
Johannes Geppert f200a84a8a WW-4522 Support latest stable AngularJS version in maven angularjs archetype
- Add missing semicolon
2015-07-11 10:34:54 +02:00
Aleksandr Mashchenko 72e8b109b5 WW-4523 - Add more log statements to RolesInterceptor 2015-07-10 21:40:30 +03:00
Johannes Geppert d0a25d688a WW-4522 Support latest stable AngularJS version in maven angularjs archetype
- Refactor the DataService to only expose the callable members
2015-07-10 17:37:10 +02:00
Johannes Geppert 55e10bcf10 WW-4522 Support latest stable AngularJS version in maven angularjs archetype
- Use the 3.1.0 version of servlet api in all archetypes
2015-07-10 17:16:32 +02:00
Johannes Geppert 19a55a8857 WW-4522 Support latest stable AngularJS version in maven angularjs archetype
- Follow angular style guide and use one file for each controller and service
2015-07-10 17:09:58 +02:00
Johannes Geppert 8312ed14ba WW-4522 Support latest stable AngularJS version in maven angularjs archetype
- Rename HelloAction to ApplicationAction
2015-07-10 16:32:23 +02:00
Johannes Geppert 7928d345eb WW-4522 Support latest stable AngularJS version in maven angularjs archetype
- Upgrade angular resources to version 1.4.2
2015-07-10 16:31:33 +02:00
Lukasz Lenart 2ef7cd1223 WW-4519 Adds additional log statement when sending stream 2015-06-28 16:16:52 +02:00
Lukasz Lenart 4672c9ebb5 WW-4355 Replace depreacted HTML attributes with CSS 2015-06-26 21:53:17 +02:00
Lukasz Lenart 46b0ef632f WW-4516 Allows disable BeanInfo cache in devMode 2015-06-26 21:45:30 +02:00