Commit Graph

759 Commits

Author SHA1 Message Date
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 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
Lukasz Lenart c0a312a822 Reverts security constraint 2014-03-02 22:17:12 +01:00
Lukasz Lenart 65eb97514c Moves showcase related JSPs under WEB-INF 2014-03-02 22:02:49 +01:00
Lukasz Lenart d07e8044be Moves mailreader related JSPs under WEB-INF 2014-03-02 21:17:30 +01:00
Lukasz Lenart 95b309a9b9 Adds security constraints to web.xml to block access to pure JSP files 2014-03-02 21:13:38 +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 6f43464fca Adds security constraints to block access to jsp files 2014-02-25 10:57:21 +01:00
Lukasz Lenart 6b00db2d23 Moves jsps under WEB-INF 2014-02-25 10:56:53 +01:00
Lukasz Lenart 763264238a Moves JSP files into WEB-INF/jsp to promote best practises 2014-01-21 07:44:28 +01:00
Lukasz Lenart 9cf7bb4fcd Adds proper snipet tag 2014-01-20 09:36:51 +01:00
Lukasz Lenart 9d1b6bea54 Reformats source code 2014-01-20 09:34:08 +01:00
Lukasz Lenart 18da65e43b Adds missing snippet start 2014-01-20 09:32:26 +01:00
Lukasz Lenart 17507dcf8e Applies the same naming pattern and removes unused profile
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1554402 13f79535-47bb-0310-9956-ffa450edef68
2013-12-31 11:29:15 +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 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 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 9488fd0afb Adds dedicated method to display Login form and base on declarative validation instead of on programmatic one
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1525512 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 06:45:12 +00:00
Johannes Geppert ae4e2a80d8 Revert: WW-4197 Update Archetypes READMEs
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1521944 13f79535-47bb-0310-9956-ffa450edef68
2013-09-11 17:25:25 +00:00
Johannes Geppert b54f37823b WW-4197 Update Archetypes READMEs
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1521940 13f79535-47bb-0310-9956-ffa450edef68
2013-09-11 17:06:05 +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 303eb9f66d WW-3872 Moves files to appropriate locations
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1509085 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 06:04:23 +00:00
René Gielen 630e1ba065 Merged from STRUTS_2_3_15_X
WW-4140
- Lukasz' patch applied [from revision 1502979]

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1503127 13f79535-47bb-0310-9956-ffa450edef68
2013-07-15 08:02:23 +00:00
René Gielen 43d067f52b Merged from STRUTS_2_3_15_X
WW-4136 - Demonstrate proper input sanitizing for file download showcase example
- added demo code to prevent input paths containing "WEB-INF" [from revision 1500082]

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1500083 13f79535-47bb-0310-9956-ffa450edef68
2013-07-05 17:47:42 +00:00
Lukasz Lenart 597b14b13b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1493007 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 09:30:23 +00:00
Lukasz Lenart edb9c5e120 [maven-release-plugin] prepare release STRUTS_2_3_15
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1493005 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 09:29:42 +00:00
Lukasz Lenart eb2a9eb8ff WW-3593 Adds missing html files
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1486344 13f79535-47bb-0310-9956-ffa450edef68
2013-05-25 16:37:42 +00:00
Lukasz Lenart f3dc60ac8a WW-4021 Cleans up poms
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1484384 13f79535-47bb-0310-9956-ffa450edef68
2013-05-20 07:29:24 +00:00
Lukasz Lenart 64328943bd Configures logging
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1483512 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 19:11:03 +00:00
Lukasz Lenart 143fa76ddb Changes log levels to be more realistic
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1476063 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 06:27:17 +00:00
Lukasz Lenart e82957c5eb [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1462299 13f79535-47bb-0310-9956-ffa450edef68
2013-03-28 20:52:33 +00:00
Lukasz Lenart 07fca85b08 [maven-release-plugin] prepare release STRUTS_2_3_14
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1462297 13f79535-47bb-0310-9956-ffa450edef68
2013-03-28 20:51:02 +00:00
Lukasz Lenart 00ce58a3d6 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1460302 13f79535-47bb-0310-9956-ffa450edef68
2013-03-24 09:58:59 +00:00
Lukasz Lenart 8ca0e87d35 [maven-release-plugin] prepare release STRUTS_2_3_13
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1460299 13f79535-47bb-0310-9956-ffa450edef68
2013-03-24 09:57:28 +00:00