Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/struts into asf
Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/48b06408 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/48b06408 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/48b06408 Branch: refs/heads/master Commit: 48b064083186ef241776c9550f3650a06ea3c894 Parents: a1abdd8 fa9cac7 Author: cnenning <cnenn...@apache.org> Authored: Fri Jun 12 10:52:54 2015 +0200 Committer: cnenning <cnenn...@apache.org> Committed: Fri Jun 12 10:52:54 2015 +0200 ---------------------------------------------------------------------- apps/blank/README.txt | 16 - apps/blank/pom.xml | 86 - .../src/main/java/example/ExampleSupport.java | 30 - .../blank/src/main/java/example/HelloWorld.java | 68 - apps/blank/src/main/java/example/Login.java | 58 - apps/blank/src/main/java/example/YesNo.java | 5 - apps/blank/src/main/resources/LICENSE.txt | 174 -- apps/blank/src/main/resources/NOTICE.txt | 5 - apps/blank/src/main/resources/example.xml | 25 - .../main/resources/example/Login-validation.xml | 16 - .../main/resources/example/package.properties | 7 - .../resources/example/package_es.properties | 5 - apps/blank/src/main/resources/log4j2.xml | 15 - apps/blank/src/main/resources/struts.xml | 35 - .../src/main/resources/velocity.properties | 1 - .../blank/src/main/webapp/WEB-INF/jsp/error.jsp | 15 - .../webapp/WEB-INF/jsp/example/HelloWorld.jsp | 30 - .../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 - apps/blank/src/main/webapp/WEB-INF/web.xml | 39 - apps/blank/src/main/webapp/index.html | 10 - .../blank/src/test/java/example/ConfigTest.java | 96 - .../src/test/java/example/HelloWorldTest.java | 37 - apps/blank/src/test/java/example/LoginTest.java | 55 - apps/jboss-blank/README.txt | 16 - apps/jboss-blank/pom.xml | 69 - .../src/main/java/example/ExampleSupport.java | 30 - .../src/main/java/example/HelloWorld.java | 61 - .../src/main/java/example/Login.java | 59 - apps/jboss-blank/src/main/resources/LICENSE.txt | 174 -- apps/jboss-blank/src/main/resources/NOTICE.txt | 5 - apps/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 - apps/jboss-blank/src/main/resources/log4j2.xml | 15 - apps/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 - apps/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 - apps/mailreader/README.txt | 23 - apps/mailreader/pom.xml | 95 - .../src/main/java/alternate.properties | 3 - .../src/main/java/alternate_ja.properties | 1 - .../src/main/java/mailreader-default.xml | 47 - .../src/main/java/mailreader-support.xml | 63 - .../java/mailreader2/ApplicationListener.java | 234 -- .../mailreader2/AuthenticationInterceptor.java | 52 - .../src/main/java/mailreader2/Constants.java | 128 - .../main/java/mailreader2/Login-validation.xml | 14 - .../src/main/java/mailreader2/Login.java | 48 - .../src/main/java/mailreader2/Logout.java | 35 - .../java/mailreader2/MailreaderSupport.java | 583 ----- .../mailreader2/MailreaderSupport.properties | 97 - .../mailreader2/MailreaderSupport_ja.properties | 89 - .../mailreader2/MailreaderSupport_ru.properties | 89 - ...egistration-Registration_save-validation.xml | 28 - .../mailreader2/Registration-validation.xml | 32 - .../src/main/java/mailreader2/Registration.java | 122 - ...ubscription-Subscription_save-validation.xml | 23 - .../mailreader2/Subscription-validation.xml | 11 - .../src/main/java/mailreader2/Subscription.java | 145 - .../src/main/java/mailreader2/Welcome.java | 49 - apps/mailreader/src/main/java/struts.xml | 16 - apps/mailreader/src/main/resources/LICENSE.txt | 174 -- apps/mailreader/src/main/resources/NOTICE.txt | 5 - apps/mailreader/src/main/resources/log4j2.xml | 16 - .../src/main/resources/velocity.properties | 1 - .../src/main/webapp/META-INF/context.xml | 3 - .../src/main/webapp/WEB-INF/database.xml | 9 - .../main/webapp/WEB-INF/jsp/ChangePassword.jsp | 25 - .../src/main/webapp/WEB-INF/jsp/Error.jsp | 40 - .../src/main/webapp/WEB-INF/jsp/Footer.jsp | 6 - .../src/main/webapp/WEB-INF/jsp/Login.jsp | 30 - .../src/main/webapp/WEB-INF/jsp/MainMenu.jsp | 25 - .../main/webapp/WEB-INF/jsp/Registration.jsp | 115 - .../main/webapp/WEB-INF/jsp/Subscription.jsp | 60 - .../src/main/webapp/WEB-INF/jsp/Welcome.jsp | 55 - apps/mailreader/src/main/webapp/WEB-INF/web.xml | 47 - .../src/main/webapp/css/mailreader.css | 46 - apps/mailreader/src/main/webapp/index.html | 10 - .../mailreader/src/main/webapp/struts-power.gif | Bin 1798 -> 0 bytes apps/mailreader/src/main/webapp/tour.html | 2470 ------------------ apps/pom.xml | 3 - 96 files changed, 6866 deletions(-) ----------------------------------------------------------------------
