Commit Graph

3937 Commits

Author SHA1 Message Date
Lukasz Lenart 17d73d21a1 Moves deprecated plugins to struts-archive repo 2015-05-22 12:58:01 +02:00
Lukasz Lenart 9a33d29bec Starts work on 2.5 version 2015-05-21 20:43:19 +02:00
Lukasz Lenart 003fe35c90 Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/struts into develop 2015-05-15 21:36:20 +02:00
Lukasz Lenart ebb1e3fe39 Merge branch 'struts-2-3-20-1' into develop 2015-05-15 21:35:40 +02:00
Johannes Geppert 01279636d9 Correct usage of promises and improve logging in data service 2015-05-06 20:49:29 +02:00
Johannes Geppert aa1e50f412 Remove unused dependency from ApacheProjectsController 2015-05-06 20:34:35 +02:00
Lukasz Lenart f19707cb76 [maven-release-plugin] prepare for next development iteration 2015-05-06 07:59:11 +02:00
Lukasz Lenart a9974eec56 [maven-release-plugin] prepare release STRUTS_2_3_20_1 STRUTS_2_3_20_1 2015-05-06 07:57:47 +02:00
Lukasz Lenart b01a7d566a Uses proper path to docs 2015-05-06 07:49:45 +02:00
Lukasz Lenart d832747d64 Applies better exclude patterns 2015-05-03 20:57:15 +02:00
Lukasz Lenart 8ab3272d9f Sets SNAPSHOT version to allow release plugin to work 2015-05-03 20:44:32 +02:00
Lukasz Lenart ea098ba08f Merge branch 'master' into develop 2015-05-03 14:01:21 +02:00
Lukasz Lenart 26ab3e477b Merge branch 'release/2.3.24' 2015-05-03 14:01:18 +02:00
Lukasz Lenart c19a14f1a7 [maven-release-plugin] prepare for next development iteration 2015-05-03 12:08:08 +02:00
Lukasz Lenart 925741ad1e [maven-release-plugin] prepare release STRUTS_2_3_24 STRUTS_2_3_24 2015-05-03 12:07:56 +02:00
Johannes Geppert 7063f5e25d WW-4492 Add support for Log4J2 as a struts and xwork logging backend
- Use log4j2 in the struts2 blank maven archetype
2015-05-01 13:37:15 +02:00
Johannes Geppert d586fd50c1 Migrate angularjs version in maven angularjs archetype from 1.2 to latest stable version 1.3 2015-05-01 13:22:55 +02:00
Johannes Geppert 45d8f37c77 WW-4492 Add support for Log4J2 as a struts and xwork logging backend
- Use log4j2 in the convention plugin based maven archetype
 - Escape base directory property in angularjs maven archetype pom.xml
2015-05-01 13:10:18 +02:00
Johannes Geppert f150c9f295 Refactor angularjs maven archetype to support html5 uris 2015-05-01 12:59:46 +02:00
Johannes Geppert e3682f9472 Refactor angularjs maven archetype to have a separate namespace for data action and DataService with promises 2015-05-01 12:48:09 +02:00
Johannes Geppert e990fbb751 WW-4492 Add support for Log4J2 as a struts and xwork logging backend
- Use log4j2 in the angularjs maven archetype
2015-05-01 12:46:59 +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
Lukasz Lenart 45071a7ff1 WW-4494 Uses 2.3.0 FreeMarker incompatibility level by default 2015-04-30 08:55:06 +02:00
Lukasz Lenart 791364cf6d WW-4493 Allows to pass parameters witch dashes in names 2015-04-30 08:27:27 +02:00
Lukasz Lenart 5649ff1ac5 Includes action: and method: as excluded patterns and drops class 2015-04-29 21:35:04 +02:00
Lukasz Lenart 326e89daf3 Refactors logger factory to simplify adding new implementations 2015-04-19 14:03:27 +02:00
Johannes Geppert 951a4f8f2b WW-4492 Add support for Log4J2 as a struts and xwork logging backend
- Extend xwork LoggerFactory  to autodetect log4j2 if available in classpath
2015-04-18 21:27:22 +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
Johannes Geppert 48c0764f73 WW-4492 Add support for Log4J2 as a struts and xwork logging backend 2015-04-18 12:29:13 +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 84defe9a6b Merge branch 'release/2.3.23'
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/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/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
2015-04-07 11:25:51 +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 STRUTS_2_3_23 2015-04-07 09:52:32 +02:00
Lukasz Lenart f99a614d4a Fixes problem with missing JSPs 2015-04-07 09:34:13 +02:00
Lukasz Lenart 4651f37501 WW-4484 Upgrades Freemarker 2015-04-03 07:16:29 +02:00
Lukasz Lenart 4a08f070f1 WW-4482 Fallbacks to non-collection evaluation for non-collection param 2015-04-02 10:17:23 +02:00
Lukasz Lenart 6021995bfb WW-4481 Adds context to deprecations warning 2015-03-30 09:51:54 +02:00
Lukasz Lenart 8cb1feb418 Sets proper released version 2015-03-19 09:36:52 +01:00
Lukasz Lenart 1a842d7344 Sets proper released version 2015-03-19 09:35:29 +01:00
Lukasz Lenart aeed126a3e Merge branch 'release/2.3.22'
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/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/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
2015-03-19 09:33:17 +01: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 STRUTS_2_3_22 2015-03-19 07:11:15 +01:00
Lukasz Lenart 4f0f7d1384 Adds additional use case to check access to values of int type 2015-03-07 07:39:44 +01:00
Lukasz Lenart 54c6423484 WW-4457 Uses dedicated type to match content type of uploaded files 2015-03-06 22:34:35 +01:00
Lukasz Lenart 5665dd52b5 WW-4468 Switched to buildError on file limit excided 2015-03-06 21:40:10 +01:00
Lukasz Lenart a1d277fac5 WW-4467 disableRequestAttributeValueStackLookup applied
to MultiPartRequestWrapper
2015-03-06 21:20:08 +01:00
Lukasz Lenart 4ad023207f WW-4473 Adds support for title attribute in SubmitHandler 2015-03-06 21:07:17 +01:00
Lukasz Lenart 66248a80e3 WW-4427 adds complete fix 2015-02-17 07:49:15 +01:00
Lukasz Lenart c5867e2ea2 WW-4465 Ignores statusCode parameter when building redirect url 2015-02-17 07:38:13 +01:00