Merge branch 'master' of ../struts

Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/585038a9
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/585038a9
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/585038a9

Branch: refs/heads/master
Commit: 585038a9a3f86cbab6a158281cb99c8f87f87563
Parents: 1b1c61e 58fcb43
Author: Johannes Geppert <jo...@apache.org>
Authored: Thu Jun 11 20:51:20 2015 +0200
Committer: Johannes Geppert <jo...@apache.org>
Committed: Thu Jun 11 20:51:20 2015 +0200

----------------------------------------------------------------------
 jboss-blank/README.txt                          |  16 ++
 jboss-blank/pom.xml                             |  69 ++++++++
 .../src/main/java/example/ExampleSupport.java   |  30 ++++
 .../src/main/java/example/HelloWorld.java       |  61 +++++++
 jboss-blank/src/main/java/example/Login.java    |  59 +++++++
 jboss-blank/src/main/resources/LICENSE.txt      | 174 +++++++++++++++++++
 jboss-blank/src/main/resources/NOTICE.txt       |   5 +
 jboss-blank/src/main/resources/example.xml      |  25 +++
 .../main/resources/example/Login-validation.xml |  16 ++
 .../main/resources/example/package.properties   |   5 +
 .../resources/example/package_es.properties     |   5 +
 jboss-blank/src/main/resources/log4j2.xml       |  15 ++
 jboss-blank/src/main/resources/struts.xml       |  27 +++
 .../src/main/resources/velocity.properties      |   1 +
 .../webapp/WEB-INF/jsp/example/HelloWorld.jsp   |  28 +++
 .../main/webapp/WEB-INF/jsp/example/Login.jsp   |  15 ++
 .../main/webapp/WEB-INF/jsp/example/Menu.jsp    |   3 +
 .../main/webapp/WEB-INF/jsp/example/Missing.jsp |  11 ++
 .../webapp/WEB-INF/jsp/example/Register.jsp     |   3 +
 .../main/webapp/WEB-INF/jsp/example/Welcome.jsp |  18 ++
 jboss-blank/src/main/webapp/WEB-INF/web.xml     |  37 ++++
 jboss-blank/src/main/webapp/index.html          |  10 ++
 .../src/test/java/example/ConfigTest.java       |  96 ++++++++++
 .../src/test/java/example/HelloWorldTest.java   |  37 ++++
 .../src/test/java/example/LoginTest.java        |  55 ++++++
 25 files changed, 821 insertions(+)
----------------------------------------------------------------------


Reply via email to