Commit Graph

795 Commits

Author SHA1 Message Date
cnenning 87979d2821 WW-4606 made @TilesDefinition work with tiles 2 2016-02-03 14:18:54 +01:00
cnenning 5b2b244a66 added missing license header 2016-02-03 13:34:32 +01:00
cnenning 473403ca17 formatted annotations more nicely 2016-02-03 13:34:09 +01:00
cnenning 9a8f36dee2 WW-4606 added @TilesDefinition sample to showcase app 2016-02-03 13:21:59 +01:00
cnenning 2a6acabe5d updated comments 2016-01-29 13:54:31 +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
Johannes Geppert 7afa4ae925 WW-4492 Add support for Log4J2 as a struts and xwork logging backend
- Move log4j2 version to properties
2015-05-01 11:19:51 +02:00
Johannes Geppert 093532edc2 WW-4492 Add support for Log4J2 as a struts and xwork logging backend
- Use new log4j2 in blank and rest showcase app
 - Migrate to newer jetty plugin version
2015-04-18 21:15:48 +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
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 adc2d5ccf9 Adds fixed Jetty version 2014-12-23 07:45:58 +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
Lukasz Lenart 587e3a41b1 Adds BeanInfo to allow define class attribute in JSPs 2014-09-23 23:02:31 +02:00
Johannes Geppert 3826c3098f Switch to latest bootstrap version 3.2.0 in REST Showcase 2014-08-31 14:55:05 +02:00
Lukasz Lenart c1c10e017b Adds default velocity.properties with disabled logging 2014-08-26 08:37:17 +02:00
Lukasz Lenart cefdd16e39 Uses html instead of jsp index file as access to jsp is blocked 2014-08-25 08:56:05 +02:00
Lukasz Lenart f1861adff4 Adds proper logging dependency and configuration 2014-08-07 07:42:15 +02:00
Lukasz Lenart a2ba908fa7 Removes duplicated logging lib 2014-08-07 07:41:17 +02:00
Lukasz Lenart d20c2f10b7 Merge branch 'develop' into feature/WW-4295-localization
Conflicts:
	core/src/site/resources/tags/checkboxlist.html
2014-06-27 13:15:10 +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 b78349ad5d Extends blank app to demonstrate the new possibilities 2014-03-20 08:12:13 +01:00
Lukasz Lenart dfaaba7b2b Adds I18N note to all example apps 2014-03-07 07:02:34 +01:00
Lukasz Lenart eb7b570897 Merge branch 'develop' into feature/move-jsps-under-webinf 2014-03-06 21:58:26 +01:00
Lukasz Lenart 040fd67615 Bumps version to 2.3.17-SNAPSHOT 2014-03-06 21:57:37 +01:00
Lukasz Lenart 1ebedff98a Merge branch 'develop' into feature/move-jsps-under-webinf 2014-03-06 21:56:04 +01:00
Lukasz Lenart 8f5f4a7a40 Cleanups poms 2014-03-06 21:53:35 +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 d0c90dda95 Updates configuration and replaces jsp with action 2014-03-03 21:52:54 +01:00