Merge branch 'develop'
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/1d2ff236
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/1d2ff236
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/1d2ff236
Branch: refs/heads/master
Commit: 1d2ff23600c5ff9e4a1c451cd86703aabbc5cd6a
Parents: c4e1009 1af364c
Author: Lukasz Lenart <lukasz.len...@gmail.com>
Authored: Tue Dec 23 07:33:44 2014 +0100
Committer: Lukasz Lenart <lukasz.len...@gmail.com>
Committed: Tue Dec 23 07:33:44 2014 +0100
----------------------------------------------------------------------
pom.xml | 27 +-
themes_override/README.txt | 16 +
themes_override/pom.xml | 42 +++
.../apache/struts/edit/action/EditAction.java | 96 ++++++
.../org/apache/struts/edit/model/Person.java | 96 ++++++
.../org/apache/struts/edit/model/State.java | 39 +++
.../apache/struts/edit/service/EditService.java | 12 +
.../edit/service/EditServiceInMemory.java | 51 ++++
themes_override/src/main/resources/log4j.dtd | 227 ++++++++++++++
themes_override/src/main/resources/log4j.xml | 28 ++
.../struts/edit/action/EditAction.properties | 8 +
themes_override/src/main/resources/struts.xml | 30 ++
.../src/main/webapp/META-INF/MANIFEST.MF | 3 +
.../webapp/WEB-INF/template/simple/a-close.ftl | 45 +++
.../main/webapp/WEB-INF/template/simple/a.ftl | 22 ++
.../WEB-INF/template/simple/actionerror.ftl | 43 +++
.../WEB-INF/template/simple/actionmessage.ftl | 43 +++
.../webapp/WEB-INF/template/simple/checkbox.ftl | 50 +++
.../WEB-INF/template/simple/checkboxlist.ftl | 113 +++++++
.../webapp/WEB-INF/template/simple/combobox.ftl | 103 +++++++
.../template/simple/common-attributes.ftl | 25 ++
.../WEB-INF/template/simple/controlfooter.ftl | 22 ++
.../WEB-INF/template/simple/controlheader.ftl | 22 ++
.../main/webapp/WEB-INF/template/simple/css.ftl | 35 +++
.../webapp/WEB-INF/template/simple/debug.ftl | 82 +++++
.../WEB-INF/template/simple/div-close.ftl | 23 ++
.../main/webapp/WEB-INF/template/simple/div.ftl | 32 ++
.../WEB-INF/template/simple/doubleselect.ftl | 198 ++++++++++++
.../template/simple/dynamic-attributes.ftl | 34 +++
.../webapp/WEB-INF/template/simple/empty.ftl | 22 ++
.../WEB-INF/template/simple/fielderror.ftl | 82 +++++
.../webapp/WEB-INF/template/simple/file.ftl | 48 +++
.../WEB-INF/template/simple/form-close.ftl | 113 +++++++
.../WEB-INF/template/simple/form-common.ftl | 67 +++++
.../webapp/WEB-INF/template/simple/form.ftl | 27 ++
.../webapp/WEB-INF/template/simple/head.ftl | 23 ++
.../webapp/WEB-INF/template/simple/hidden.ftl | 41 +++
.../template/simple/inputtransferselect.ftl | 124 ++++++++
.../webapp/WEB-INF/template/simple/label.ftl | 45 +++
.../webapp/WEB-INF/template/simple/optgroup.ftl | 51 ++++
.../template/simple/optiontransferselect.ftl | 301 +++++++++++++++++++
.../webapp/WEB-INF/template/simple/password.ftl | 53 ++++
.../webapp/WEB-INF/template/simple/radiomap.ftl | 94 ++++++
.../webapp/WEB-INF/template/simple/reset.ftl | 76 +++++
.../template/simple/scripting-events.ftl | 64 ++++
.../webapp/WEB-INF/template/simple/select.ftl | 140 +++++++++
.../WEB-INF/template/simple/submit-close.ftl | 6 +
.../webapp/WEB-INF/template/simple/submit.ftl | 93 ++++++
.../webapp/WEB-INF/template/simple/table.ftl | 76 +++++
.../webapp/WEB-INF/template/simple/text.ftl | 54 ++++
.../webapp/WEB-INF/template/simple/textarea.ftl | 53 ++++
.../webapp/WEB-INF/template/simple/token.ftl | 24 ++
.../WEB-INF/template/simple/updownselect.ftl | 57 ++++
.../webapp/WEB-INF/template/xhtml/checkbox.ftl | 129 ++++++++
.../WEB-INF/template/xhtml/checkboxlist.ftl | 25 ++
.../webapp/WEB-INF/template/xhtml/combobox.ftl | 25 ++
.../WEB-INF/template/xhtml/control-close.ftl | 23 ++
.../webapp/WEB-INF/template/xhtml/control.ftl | 26 ++
.../WEB-INF/template/xhtml/controlfooter.ftl | 38 +++
.../template/xhtml/controlheader-core.ftl | 81 +++++
.../WEB-INF/template/xhtml/controlheader.ftl | 28 ++
.../WEB-INF/template/xhtml/doubleselect.ftl | 25 ++
.../main/webapp/WEB-INF/template/xhtml/file.ftl | 25 ++
.../template/xhtml/form-close-validate.ftl | 158 ++++++++++
.../WEB-INF/template/xhtml/form-close.ftl | 35 +++
.../WEB-INF/template/xhtml/form-validate.ftl | 31 ++
.../main/webapp/WEB-INF/template/xhtml/form.ftl | 33 ++
.../main/webapp/WEB-INF/template/xhtml/head.ftl | 24 ++
.../webapp/WEB-INF/template/xhtml/hidden.ftl | 27 ++
.../template/xhtml/inputtransferselect.ftl | 25 ++
.../webapp/WEB-INF/template/xhtml/label.ftl | 25 ++
.../template/xhtml/optiontransferselect.ftl | 25 ++
.../webapp/WEB-INF/template/xhtml/password.ftl | 25 ++
.../webapp/WEB-INF/template/xhtml/radiomap.ftl | 25 ++
.../webapp/WEB-INF/template/xhtml/reset.ftl | 31 ++
.../webapp/WEB-INF/template/xhtml/select.ftl | 25 ++
.../webapp/WEB-INF/template/xhtml/styles.css | 29 ++
.../WEB-INF/template/xhtml/submit-close.ftl | 25 ++
.../webapp/WEB-INF/template/xhtml/submit.ftl | 29 ++
.../main/webapp/WEB-INF/template/xhtml/text.ftl | 25 ++
.../webapp/WEB-INF/template/xhtml/textarea.ftl | 25 ++
.../WEB-INF/template/xhtml/theme.properties | 21 ++
.../webapp/WEB-INF/template/xhtml/tooltip.ftl | 41 +++
.../WEB-INF/template/xhtml/updownselect.ftl | 25 ++
.../webapp/WEB-INF/template/xhtml/validation.js | 139 +++++++++
themes_override/src/main/webapp/WEB-INF/web.xml | 19 ++
themes_override/src/main/webapp/edit.jsp | 29 ++
themes_override/src/main/webapp/index.jsp | 16 +
themes_override/src/main/webapp/thankyou.jsp | 21 ++
89 files changed, 4636 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/1d2ff236/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 9064786,9e9d737..9c5370b
--- a/pom.xml
+++ b/pom.xml
@@@ -13,13 -13,9 +13,9 @@@
</description>
<properties>
-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <struts2.version>2.3.16.3</struts2.version>
-
- <struts2.version>2.3.18-SNAPSHOT</struts2.version>
++ <struts2.version>2.3.20</struts2.version>
<log4j.version>1.2.17</log4j.version>
-
</properties>
<developers>
