Drops jboss-blank as a duplication of blank
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/7ce189c0 Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/7ce189c0 Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/7ce189c0 Branch: refs/heads/master Commit: 7ce189c030433b9208b04dd02982d13770b36b20 Parents: 4a7216c Author: Lukasz Lenart <lukasz.len...@gmail.com> Authored: Sat Jun 18 09:13:51 2016 +0200 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Sat Jun 18 09:13:51 2016 +0200 ---------------------------------------------------------------------- jboss-blank/README.txt | 16 -- jboss-blank/pom.xml | 63 ------- .../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 ------ pom.xml | 1 - 26 files changed, 816 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/README.txt ---------------------------------------------------------------------- diff --git a/jboss-blank/README.txt b/jboss-blank/README.txt deleted file mode 100644 index b05df6c..0000000 --- a/jboss-blank/README.txt +++ /dev/null @@ -1,16 +0,0 @@ -README.txt - JBoss Blank - -This is an "empty" application that you can deploy as the basis of your own -application. This specially dedicated to JBoss server as it includes the Javassist library. - -For more on getting started with Struts, see - -* http://cwiki.apache.org/WW/home.html - -I18N: -===== -Please note that this project was created with the assumption that it will be run -in an environment where the default locale is set to English. This means that -the default messages defined in package.properties are in English. If the default -locale for your server is different, then rename package.properties to package_en.properties -and create a new package.properties with proper values for your default locale. http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/pom.xml ---------------------------------------------------------------------- diff --git a/jboss-blank/pom.xml b/jboss-blank/pom.xml deleted file mode 100644 index 32624d2..0000000 --- a/jboss-blank/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -/* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.struts</groupId> - <artifactId>struts-examples</artifactId> - <version>1.0.0</version> - </parent> - - <artifactId>struts2-jboss-blank</artifactId> - <packaging>war</packaging> - <name>Struts 2 JBoss Blank Webapp</name> - - <dependencies> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-junit-plugin</artifactId> - <version>${struts2.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> -</project> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/java/example/ExampleSupport.java ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/java/example/ExampleSupport.java b/jboss-blank/src/main/java/example/ExampleSupport.java deleted file mode 100644 index 02264ed..0000000 --- a/jboss-blank/src/main/java/example/ExampleSupport.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * $Id: ExampleSupport.java 471756 2006-11-06 15:01:43Z husted $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package example; - -import com.opensymphony.xwork2.ActionSupport; - -/** - * Base Action class for the Tutorial package. - */ -public class ExampleSupport extends ActionSupport { -} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/java/example/HelloWorld.java ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/java/example/HelloWorld.java b/jboss-blank/src/main/java/example/HelloWorld.java deleted file mode 100644 index 941ba49..0000000 --- a/jboss-blank/src/main/java/example/HelloWorld.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * $Id: HelloWorld.java 471756 2006-11-06 15:01:43Z husted $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package example; - -/** - * <code>Set welcome message.</code> - */ -public class HelloWorld extends ExampleSupport { - - public String execute() throws Exception { - setMessage(getText(MESSAGE)); - return SUCCESS; - } - - /** - * Provide default valuie for Message property. - */ - public static final String MESSAGE = "HelloWorld.message"; - - /** - * Field for Message property. - */ - private String message; - - /** - * Return Message property. - * - * @return Message property - */ - public String getMessage() { - return message; - } - - /** - * Set Message property. - * - * @param message Text to display on HelloWorld page. - */ - public void setMessage(String message) { - this.message = message; - } -} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/java/example/Login.java ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/java/example/Login.java b/jboss-blank/src/main/java/example/Login.java deleted file mode 100644 index b7c046f..0000000 --- a/jboss-blank/src/main/java/example/Login.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * $Id: Login.java 471756 2006-11-06 15:01:43Z husted $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package example; - -public class Login extends ExampleSupport { - - public String execute() throws Exception { - - if (isInvalid(getUsername())) return INPUT; - - if (isInvalid(getPassword())) return INPUT; - - return SUCCESS; - } - - private boolean isInvalid(String value) { - return (value == null || value.length() == 0); - } - - private String username; - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - private String password; - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/resources/LICENSE.txt ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/resources/LICENSE.txt b/jboss-blank/src/main/resources/LICENSE.txt deleted file mode 100644 index c6055ec..0000000 --- a/jboss-blank/src/main/resources/LICENSE.txt +++ /dev/null @@ -1,174 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/resources/NOTICE.txt ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/resources/NOTICE.txt b/jboss-blank/src/main/resources/NOTICE.txt deleted file mode 100644 index 12fa3b8..0000000 --- a/jboss-blank/src/main/resources/NOTICE.txt +++ /dev/null @@ -1,5 +0,0 @@ -Apache Struts -Copyright 2000-2011 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/resources/example.xml ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/resources/example.xml b/jboss-blank/src/main/resources/example.xml deleted file mode 100644 index d929de1..0000000 --- a/jboss-blank/src/main/resources/example.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" - "http://struts.apache.org/dtds/struts-2.0.dtd";> - -<struts> - - <package name="example" namespace="/example" extends="struts-default"> - - <action name="HelloWorld" class="example.HelloWorld"> - <result>/WEB-INF/jsp/example/HelloWorld.jsp</result> - </action> - - <action name="Login_*" method="{1}" class="example.Login"> - <result name="input">/WEB-INF/jsp/example/Login.jsp</result> - <result type="redirectAction">Menu</result> - </action> - - <action name="*" class="example.ExampleSupport"> - <result>/WEB-INF/jsp/example/{1}.jsp</result> - </action> - - <!-- Add actions here --> - </package> -</struts> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/resources/example/Login-validation.xml ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/resources/example/Login-validation.xml b/jboss-blank/src/main/resources/example/Login-validation.xml deleted file mode 100644 index bd26502..0000000 --- a/jboss-blank/src/main/resources/example/Login-validation.xml +++ /dev/null @@ -1,16 +0,0 @@ -<!DOCTYPE validators PUBLIC - "-//Apache Struts//XWork Validator 1.0.2//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.2.dtd";> - -<validators> - <field name="username"> - <field-validator type="requiredstring"> - <message key="requiredstring"/> - </field-validator> - </field> - <field name="password"> - <field-validator type="requiredstring"> - <message key="requiredstring"/> - </field-validator> - </field> -</validators> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/resources/example/package.properties ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/resources/example/package.properties b/jboss-blank/src/main/resources/example/package.properties deleted file mode 100644 index 77d589d..0000000 --- a/jboss-blank/src/main/resources/example/package.properties +++ /dev/null @@ -1,5 +0,0 @@ -HelloWorld.message= Struts is up and running ... -requiredstring = ${getText(fieldName)} is required. -password = Password -username = User Name -Missing.message = This feature is under construction. Please try again in the next interation. http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/resources/example/package_es.properties ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/resources/example/package_es.properties b/jboss-blank/src/main/resources/example/package_es.properties deleted file mode 100644 index e4740a4..0000000 --- a/jboss-blank/src/main/resources/example/package_es.properties +++ /dev/null @@ -1,5 +0,0 @@ -HelloWorld.message= �Struts est� bien! ... -requiredstring = ${getText(fieldName)} se requiere. -password = Contrase�a -username = Nombre de Usuario -Missing.message = �en obras! �seguir intentando! http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/resources/log4j2.xml b/jboss-blank/src/main/resources/log4j2.xml deleted file mode 100644 index abe3dde..0000000 --- a/jboss-blank/src/main/resources/log4j2.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Configuration> - <Appenders> - <Console name="STDOUT" target="SYSTEM_OUT"> - <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/> - </Console> - </Appenders> - <Loggers> - <Logger name="com.opensymphony.xwork2" level="info"/> - <Logger name="org.apache.struts2" level="info"/> - <Root level="info"> - <AppenderRef ref="STDOUT"/> - </Root> - </Loggers> -</Configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/resources/struts.xml ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/resources/struts.xml b/jboss-blank/src/main/resources/struts.xml deleted file mode 100644 index 591ff8f..0000000 --- a/jboss-blank/src/main/resources/struts.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE struts PUBLIC - "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN" - "http://struts.apache.org/dtds/struts-2.5.dtd";> - -<struts> - - <constant name="struts.enable.DynamicMethodInvocation" value="false" /> - <constant name="struts.devMode" value="false" /> - - <include file="example.xml"/> - - - - <package name="default" namespace="/" extends="struts-default"> - <default-action-ref name="index" /> - <action name="index"> - <result type="redirectAction"> - <param name="actionName">HelloWorld</param> - <param name="namespace">/example</param> - </result> - </action> - </package> - - <!-- Add packages here --> - -</struts> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/resources/velocity.properties ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/resources/velocity.properties b/jboss-blank/src/main/resources/velocity.properties deleted file mode 100644 index 6299831..0000000 --- a/jboss-blank/src/main/resources/velocity.properties +++ /dev/null @@ -1 +0,0 @@ -runtime.log.logsystem.class=org.apache.velocity.runtime.log.NullLogChute http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp b/jboss-blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp deleted file mode 100644 index 938c761..0000000 --- a/jboss-blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp +++ /dev/null @@ -1,28 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<html> -<head> - <title><s:text name="HelloWorld.message"/></title> -</head> - -<body> -<h2><s:property value="message"/></h2> - -<h3>Languages</h3> -<ul> - <li> - <s:url id="url" action="HelloWorld"> - <s:param name="request_locale">en</s:param> - </s:url> - <s:a href="%{url}">English</s:a> - </li> - <li> - <s:url id="url" action="HelloWorld"> - <s:param name="request_locale">es</s:param> - </s:url> - <s:a href="%{url}">Espanol</s:a> - </li> -</ul> - -</body> -</html> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp b/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp deleted file mode 100644 index 6438080..0000000 --- a/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp +++ /dev/null @@ -1,15 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<html> -<head> - <title>Sign On</title> -</head> - -<body> -<s:form action="Login"> - <s:textfield key="username"/> - <s:password key="password" /> - <s:submit/> -</s:form> -</body> -</html> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp b/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp deleted file mode 100644 index a74bd2c..0000000 --- a/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp +++ /dev/null @@ -1,3 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<s:include value="Missing.jsp"/> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp b/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp deleted file mode 100644 index 7c01ac9..0000000 --- a/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp +++ /dev/null @@ -1,11 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<html> -<head><title>Missing Feature</title></head> - -<body> -<p> - <s:text name="Missing.message"/> -</p> -</body> -</html> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp b/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp deleted file mode 100644 index a74bd2c..0000000 --- a/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp +++ /dev/null @@ -1,3 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<s:include value="Missing.jsp"/> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp b/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp deleted file mode 100644 index 64ffe9b..0000000 --- a/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp +++ /dev/null @@ -1,18 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<html> -<head> - <title>Welcome</title> - <link href="<s:url value="/css/examplecss"/>" rel="stylesheet" - type="text/css"/> -</head> - -<body> -<h3>Commands</h3> -<ul> - <li><a href="<s:url action="Login_input"/>">Sign On</a></li> - <li><a href="<s:url action="Register"/>">Register</a></li> -</ul> - -</body> -</html> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/webapp/WEB-INF/web.xml b/jboss-blank/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 7f4ac3f..0000000 --- a/jboss-blank/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_9" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> - - <display-name>Struts Blank</display-name> - - <filter> - <filter-name>struts2</filter-name> - <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>struts2</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <welcome-file-list> - <welcome-file>index.html</welcome-file> - </welcome-file-list> - - <!-- Restricts access to pure JSP files - access available only via Struts action --> - <security-constraint> - <display-name>No direct JSP access</display-name> - <web-resource-collection> - <web-resource-name>No-JSP</web-resource-name> - <url-pattern>*.jsp</url-pattern> - </web-resource-collection> - <auth-constraint> - <role-name>no-users</role-name> - </auth-constraint> - </security-constraint> - - <security-role> - <description>Don't assign users to this role</description> - <role-name>no-users</role-name> - </security-role> - -</web-app> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/main/webapp/index.html ---------------------------------------------------------------------- diff --git a/jboss-blank/src/main/webapp/index.html b/jboss-blank/src/main/webapp/index.html deleted file mode 100644 index 8747c24..0000000 --- a/jboss-blank/src/main/webapp/index.html +++ /dev/null @@ -1,10 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> -<head> - <META HTTP-EQUIV="Refresh" CONTENT="0;URL=example/HelloWorld.action"> -</head> - -<body> -<p>Loading ...</p> -</body> -</html> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/test/java/example/ConfigTest.java ---------------------------------------------------------------------- diff --git a/jboss-blank/src/test/java/example/ConfigTest.java b/jboss-blank/src/test/java/example/ConfigTest.java deleted file mode 100644 index 28d6df6..0000000 --- a/jboss-blank/src/test/java/example/ConfigTest.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * $Id: ConfigTest.java 670170 2008-06-21 09:40:34Z hermanns $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package example; - -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.config.RuntimeConfiguration; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.ResultConfig; -import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; -import org.apache.struts2.StrutsTestCase; - -import java.util.List; -import java.util.Map; - -public class ConfigTest extends StrutsTestCase { - - protected void assertSuccess(String result) throws Exception { - assertTrue("Expected a success result!", - ActionSupport.SUCCESS.equals(result)); - } - - protected void assertInput(String result) throws Exception { - assertTrue("Expected an input result!", - ActionSupport.INPUT.equals(result)); - } - - protected Map<String, List<String>> assertFieldErrors(ActionSupport action) throws Exception { - assertTrue(action.hasFieldErrors()); - return action.getFieldErrors(); - } - - protected void assertFieldError(Map field_errors, String field_name, String error_message) { - - List errors = (List) field_errors.get(field_name); - assertNotNull("Expected errors for " + field_name, errors); - assertTrue("Expected errors for " + field_name, errors.size()>0); - // TODO: Should be a loop - assertEquals(error_message,errors.get(0)); - - } - - protected void setUp() throws Exception { - super.setUp(); - XmlConfigurationProvider c = new XmlConfigurationProvider("struts.xml"); - configurationManager.addContainerProvider(c); - configurationManager.reload(); - } - - protected ActionConfig assertClass(String namespace, String action_name, String class_name) { - RuntimeConfiguration configuration = configurationManager.getConfiguration().getRuntimeConfiguration(); - ActionConfig config = configuration.getActionConfig(namespace, action_name); - assertNotNull("Mssing action", config); - assertTrue("Wrong class name: [" + config.getClassName() + "]", - class_name.equals(config.getClassName())); - return config; - } - - protected ActionConfig assertClass(String action_name, String class_name) { - return assertClass("", action_name, class_name); - } - - protected void assertResult(ActionConfig config, String result_name, String result_value) { - Map results = config.getResults(); - ResultConfig result = (ResultConfig) results.get(result_name); - Map params = result.getParams(); - String value = (String) params.get("actionName"); - if (value == null) - value = (String) params.get("location"); - assertTrue("Wrong result value: [" + value + "]", - result_value.equals(value)); - } - - public void testConfig() throws Exception { - assertNotNull(configurationManager); - } - -} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/test/java/example/HelloWorldTest.java ---------------------------------------------------------------------- diff --git a/jboss-blank/src/test/java/example/HelloWorldTest.java b/jboss-blank/src/test/java/example/HelloWorldTest.java deleted file mode 100644 index 4a89271..0000000 --- a/jboss-blank/src/test/java/example/HelloWorldTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * $Id: HelloWorldTest.java 577750 2007-09-20 13:54:31Z mrdon $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package example; - -import com.opensymphony.xwork2.ActionSupport; -import org.apache.struts2.StrutsTestCase; - -public class HelloWorldTest extends StrutsTestCase { - - public void testHelloWorld() throws Exception { - HelloWorld hello_world = new HelloWorld(); - String result = hello_world.execute(); - assertTrue("Expected a success result!", - ActionSupport.SUCCESS.equals(result)); - assertTrue("Expected the default message!", - hello_world.getText(HelloWorld.MESSAGE).equals(hello_world.getMessage())); - } -} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/jboss-blank/src/test/java/example/LoginTest.java ---------------------------------------------------------------------- diff --git a/jboss-blank/src/test/java/example/LoginTest.java b/jboss-blank/src/test/java/example/LoginTest.java deleted file mode 100644 index 7dfb3f6..0000000 --- a/jboss-blank/src/test/java/example/LoginTest.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * $Id: LoginTest.java 471756 2006-11-06 15:01:43Z husted $ - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package example; - -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.config.entities.ActionConfig; - -import java.util.Map; - -public class LoginTest extends ConfigTest { - - public void FIXME_testLoginConfig() throws Exception { - ActionConfig config = assertClass("example", "Login_input", "example.Login"); - assertResult(config, ActionSupport.SUCCESS, "Menu"); - assertResult(config, ActionSupport.INPUT, "/example/Login.jsp"); - } - - public void testLoginSubmit() throws Exception { - Login login = new Login(); - login.setUsername("username"); - login.setPassword("password"); - String result = login.execute(); - assertSuccess(result); - } - - // Needs access to an envinronment that includes validators - public void FIXME_testLoginSubmitInput() throws Exception { - Login login = new Login(); - String result = login.execute(); - assertInput(result); - Map errors = assertFieldErrors(login); - assertFieldError(errors,"username","Username is required."); - assertFieldError(errors,"password","Password is required."); - } - -} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/7ce189c0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5719847..8d03f4d 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,6 @@ <module>helloworld</module> <module>http-session</module> <module>interceptors</module> - <module>jboss-blank</module> <module>mailreader</module> <module>message-resource</module> <module>preparable-interface</module>
