WW-3993 Merges PR
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/6651b182 Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/6651b182 Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/6651b182 Branch: refs/heads/master Commit: 6651b18203cb74c24cdbf9993f67726ecde6d9d5 Parents: 57df7ba dec0643 Author: Lukasz Lenart <[email protected]> Authored: Fri Jul 7 07:33:48 2017 +0200 Committer: Lukasz Lenart <[email protected]> Committed: Fri Jul 7 07:33:48 2017 +0200 ---------------------------------------------------------------------- .gitignore | 3 + crud/.gitignore | 1 + crud/README.md | 1 + crud/pom.xml | 23 ++ .../apache/struts/crud/action/PersonAction.java | 104 +++++++++ .../apache/struts/crud/dao/MemoryPersonDao.java | 81 +++++++ .../struts/crud/dao/MemoryPersonSupportDao.java | 56 +++++ .../org/apache/struts/crud/dao/PersonDao.java | 24 ++ .../struts/crud/dao/PersonSupportDao.java | 23 ++ .../org/apache/struts/crud/model/Country.java | 49 ++++ .../org/apache/struts/crud/model/Person.java | 142 ++++++++++++ .../crud/service/DefaultPersonService.java | 71 ++++++ .../struts/crud/service/PersonService.java | 32 +++ crud/src/main/resources/log4j.dtd | 227 +++++++++++++++++++ crud/src/main/resources/log4j.xml | 27 +++ .../crud/action/PersonAction-validation.xml | 35 +++ .../struts/crud/action/PersonAction.properties | 28 +++ crud/src/main/resources/struts.xml | 34 +++ crud/src/main/webapp/META-INF/MANIFEST.MF | 3 + crud/src/main/webapp/META-INF/context.xml | 2 + crud/src/main/webapp/WEB-INF/jsp/editPerson.jsp | 40 ++++ crud/src/main/webapp/WEB-INF/jsp/persons.jsp | 62 +++++ crud/src/main/webapp/WEB-INF/web.xml | 21 ++ crud/src/main/webapp/css/main.css | 56 +++++ crud/src/main/webapp/index.jsp | 16 ++ pom.xml | 1 + 26 files changed, 1162 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts-examples/blob/6651b182/.gitignore ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts-examples/blob/6651b182/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index a982693,8d4310e..eeeb117 --- a/pom.xml +++ b/pom.xml @@@ -12,78 -12,57 +12,79 @@@ go with the Struts 2 Getting Started series of tutorials. </description> - <properties> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + <comments/> + </license> + </licenses> + + <organization> + <name>Apache Software Foundation</name> + <url>http://www.apache.org</url> + </organization> + + <scm> + <connection>scm:git:git://git.apache.org/struts.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/struts-examples.git</developerConnection> + <url>http://git.apache.org/struts-examples.git</url> + <tag>HEAD</tag> + </scm> + + <issueManagement> + <system>JIRA</system> + <url>https://issues.apache.org/jira/browse/WW</url> + </issueManagement> + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - <struts2.version>2.3.16.1</struts2.version> - - <log4j.version>1.2.17</log4j.version> - + <struts2.version>2.5.12</struts2.version> + <log4j2.version>2.8.2</log4j2.version> </properties> - <developers> - <developer> - <id>bphillips</id> - <name>Bruce Phillips</name> - <email>[email protected]</email> - <organization>Apache Struts 2 Committer</organization> - <roles> - <role>Committer</role> - </roles> - </developer> - </developers> - <modules> - <module>basic_struts</module> - <module>helloworld</module> - <module>using_tags</module> - <module>coding_actions</module> - <module>form_processing</module> - <module>form_validation</module> - <module>message_resource</module> - <module>exception_handling</module> - <module>debugging_struts</module> - <module>form_tags</module> - <module>form_xml_validation</module> - <module>control_tags</module> - <module>wildcard_method_selection</module> - <module>themes</module> - <module>spring_struts</module> + <module>action-chaining</module> <module>annotations</module> + <module>basic-struts</module> + <module>bean-validation</module> + <module>blank</module> + <module>coding-actions</module> + <module>control-tags</module> ++ <module>crud</module> + <module>debugging-struts</module> + <module>exception-handling</module> + <module>exclude-parameters</module> + <module>file-upload</module> + <module>form-processing</module> + <module>form-tags</module> + <module>form-validation</module> + <module>form-xml-validation</module> + <module>helloworld</module> + <module>http-session</module> <module>interceptors</module> - <module>unit_testing</module> - <module>http_session</module> - <module>preparable_interface</module> - <module>exclude_parameters</module> + <module>json</module> + <module>mailreader</module> + <module>message-resource</module> + <module>message-store</module> + <module>portlet</module> + <module>preparable-interface</module> <module>restful2actionmapper</module> - <module>bean_validation</module> - <module>crud</module> + <module>rest-angular</module> + <module>spring-struts</module> + <module>text-provider</module> + <module>tiles</module> + <module>themes</module> + <module>themes-override</module> + <module>type-conversion</module> + <module>unit-testing</module> + <module>using-tags</module> + <module>wildcard-method-selection</module> + <module>wildcard-regex</module> + <module>unknown-handler</module> </modules> - - <dependencies> <dependency>
