Author: lukaszlenart Date: Wed Jul 14 19:55:21 2010 New Revision: 964154 URL: http://svn.apache.org/viewvc?rev=964154&view=rev Log: Dedicated JBoss Blank application without Javassist library
Added: struts/struts2/trunk/apps/jboss-blank/ struts/struts2/trunk/apps/jboss-blank/README.txt struts/struts2/trunk/apps/jboss-blank/pom.xml struts/struts2/trunk/apps/jboss-blank/src/ struts/struts2/trunk/apps/jboss-blank/src/main/ struts/struts2/trunk/apps/jboss-blank/src/main/java/ struts/struts2/trunk/apps/jboss-blank/src/main/java/example/ struts/struts2/trunk/apps/jboss-blank/src/main/java/example/ExampleSupport.java struts/struts2/trunk/apps/jboss-blank/src/main/java/example/HelloWorld.java struts/struts2/trunk/apps/jboss-blank/src/main/java/example/Login.java struts/struts2/trunk/apps/jboss-blank/src/main/resources/ struts/struts2/trunk/apps/jboss-blank/src/main/resources/LICENSE.txt struts/struts2/trunk/apps/jboss-blank/src/main/resources/NOTICE.txt struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/ struts/struts2/trunk/apps/jboss-blank/src/main/resources/example.xml struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/Login-validation.xml struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/package.properties struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/package_es.properties struts/struts2/trunk/apps/jboss-blank/src/main/resources/struts.xml struts/struts2/trunk/apps/jboss-blank/src/main/webapp/ struts/struts2/trunk/apps/jboss-blank/src/main/webapp/WEB-INF/ struts/struts2/trunk/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/ struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/HelloWorld.jsp struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Login.jsp struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Menu.jsp struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Missing.jsp struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Register.jsp struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Welcome.jsp struts/struts2/trunk/apps/jboss-blank/src/main/webapp/index.html struts/struts2/trunk/apps/jboss-blank/src/test/ struts/struts2/trunk/apps/jboss-blank/src/test/java/ struts/struts2/trunk/apps/jboss-blank/src/test/java/example/ struts/struts2/trunk/apps/jboss-blank/src/test/java/example/ConfigTest.java struts/struts2/trunk/apps/jboss-blank/src/test/java/example/HelloWorldTest.java struts/struts2/trunk/apps/jboss-blank/src/test/java/example/LoginTest.java Added: struts/struts2/trunk/apps/jboss-blank/README.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/README.txt?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/README.txt (added) +++ struts/struts2/trunk/apps/jboss-blank/README.txt Wed Jul 14 19:55:21 2010 @@ -0,0 +1,10 @@ +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 + +---------------------------------------------------------------------------- \ No newline at end of file Added: struts/struts2/trunk/apps/jboss-blank/pom.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/pom.xml?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/pom.xml (added) +++ struts/struts2/trunk/apps/jboss-blank/pom.xml Wed Jul 14 19:55:21 2010 @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* + * $Id: pom.xml 958826 2010-06-29 04:57:32Z lukaszlenart $ + * + * 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>struts2-apps</artifactId> + <version>2.2.1-SNAPSHOT</version> + </parent> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-jboss-blank</artifactId> + <packaging>war</packaging> + <name>JBoss Blank Webapp</name> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/apps/jboss-blank/</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/jboss-blank/ + </developerConnection> + <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/jboss-blank/</url> + </scm> + + <dependencies> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>${pom.groupId}</groupId> + <artifactId>struts2-junit-plugin</artifactId> + <version>${pom.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + +</project> Added: struts/struts2/trunk/apps/jboss-blank/src/main/java/example/ExampleSupport.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/java/example/ExampleSupport.java?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/java/example/ExampleSupport.java (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/java/example/ExampleSupport.java Wed Jul 14 19:55:21 2010 @@ -0,0 +1,30 @@ +/* + * $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 { +} Added: struts/struts2/trunk/apps/jboss-blank/src/main/java/example/HelloWorld.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/java/example/HelloWorld.java?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/java/example/HelloWorld.java (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/java/example/HelloWorld.java Wed Jul 14 19:55:21 2010 @@ -0,0 +1,61 @@ +/* + * $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; + } +} Added: struts/struts2/trunk/apps/jboss-blank/src/main/java/example/Login.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/java/example/Login.java?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/java/example/Login.java (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/java/example/Login.java Wed Jul 14 19:55:21 2010 @@ -0,0 +1,59 @@ +/* + * $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 Added: struts/struts2/trunk/apps/jboss-blank/src/main/resources/LICENSE.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/resources/LICENSE.txt?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/resources/LICENSE.txt (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/resources/LICENSE.txt Wed Jul 14 19:55:21 2010 @@ -0,0 +1,174 @@ + 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. Added: struts/struts2/trunk/apps/jboss-blank/src/main/resources/NOTICE.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/resources/NOTICE.txt?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/resources/NOTICE.txt (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/resources/NOTICE.txt Wed Jul 14 19:55:21 2010 @@ -0,0 +1,5 @@ +Apache Struts +Copyright 2000-2007 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file Added: struts/struts2/trunk/apps/jboss-blank/src/main/resources/example.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/resources/example.xml?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/resources/example.xml (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/resources/example.xml Wed Jul 14 19:55:21 2010 @@ -0,0 +1,25 @@ +<?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>/example/HelloWorld.jsp</result> + </action> + + <action name="Login_*" method="{1}" class="example.Login"> + <result name="input">/example/Login.jsp</result> + <result type="redirectAction">Menu</result> + </action> + + <action name="*" class="example.ExampleSupport"> + <result>/example/{1}.jsp</result> + </action> + + <!-- Add actions here --> + </package> +</struts> Added: struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/Login-validation.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/Login-validation.xml?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/Login-validation.xml (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/Login-validation.xml Wed Jul 14 19:55:21 2010 @@ -0,0 +1,16 @@ +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/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> Added: struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/package.properties URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/package.properties?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/package.properties (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/package.properties Wed Jul 14 19:55:21 2010 @@ -0,0 +1,5 @@ +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. Added: struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/package_es.properties URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/package_es.properties?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/package_es.properties (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/resources/example/package_es.properties Wed Jul 14 19:55:21 2010 @@ -0,0 +1,5 @@ +HelloWorld.message= ¡Struts está bien! ... +requiredstring = ${getText(fieldName)} se requiere. +password = Contraseña +username = Nombre de Usuario +Missing.message = ¡en obras! ¡seguir intentando! Added: struts/struts2/trunk/apps/jboss-blank/src/main/resources/struts.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/resources/struts.xml?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/resources/struts.xml (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/resources/struts.xml Wed Jul 14 19:55:21 2010 @@ -0,0 +1,27 @@ +<?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> + + <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> Added: struts/struts2/trunk/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml Wed Jul 14 19:55:21 2010 @@ -0,0 +1,20 @@ +<?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.ng.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> + +</web-app> Added: struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/HelloWorld.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/HelloWorld.jsp?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/HelloWorld.jsp (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/HelloWorld.jsp Wed Jul 14 19:55:21 2010 @@ -0,0 +1,28 @@ +<%@ 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> Added: struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Login.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Login.jsp?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Login.jsp (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Login.jsp Wed Jul 14 19:55:21 2010 @@ -0,0 +1,15 @@ +<%@ 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> Added: struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Menu.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Menu.jsp?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Menu.jsp (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Menu.jsp Wed Jul 14 19:55:21 2010 @@ -0,0 +1,3 @@ +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<s:include value="Missing.jsp"/> \ No newline at end of file Added: struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Missing.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Missing.jsp?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Missing.jsp (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Missing.jsp Wed Jul 14 19:55:21 2010 @@ -0,0 +1,11 @@ +<%@ 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> Added: struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Register.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Register.jsp?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Register.jsp (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Register.jsp Wed Jul 14 19:55:21 2010 @@ -0,0 +1,3 @@ +<%@ page contentType="text/html; charset=UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<s:include value="Missing.jsp"/> \ No newline at end of file Added: struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Welcome.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Welcome.jsp?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Welcome.jsp (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/webapp/example/Welcome.jsp Wed Jul 14 19:55:21 2010 @@ -0,0 +1,18 @@ +<%@ 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> Added: struts/struts2/trunk/apps/jboss-blank/src/main/webapp/index.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/main/webapp/index.html?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/main/webapp/index.html (added) +++ struts/struts2/trunk/apps/jboss-blank/src/main/webapp/index.html Wed Jul 14 19:55:21 2010 @@ -0,0 +1,10 @@ +<!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> Added: struts/struts2/trunk/apps/jboss-blank/src/test/java/example/ConfigTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/test/java/example/ConfigTest.java?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/test/java/example/ConfigTest.java (added) +++ struts/struts2/trunk/apps/jboss-blank/src/test/java/example/ConfigTest.java Wed Jul 14 19:55:21 2010 @@ -0,0 +1,97 @@ +/* + * $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 java.util.Map; +import java.util.List; + +import org.apache.struts2.StrutsTestCase; + +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.addConfigurationProvider(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); + } + +} Added: struts/struts2/trunk/apps/jboss-blank/src/test/java/example/HelloWorldTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/test/java/example/HelloWorldTest.java?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/test/java/example/HelloWorldTest.java (added) +++ struts/struts2/trunk/apps/jboss-blank/src/test/java/example/HelloWorldTest.java Wed Jul 14 19:55:21 2010 @@ -0,0 +1,39 @@ +/* + * $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 org.apache.struts2.StrutsTestCase; + +import com.opensymphony.xwork2.ActionSupport; +import junit.framework.TestCase; + +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())); + } +} Added: struts/struts2/trunk/apps/jboss-blank/src/test/java/example/LoginTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/jboss-blank/src/test/java/example/LoginTest.java?rev=964154&view=auto ============================================================================== --- struts/struts2/trunk/apps/jboss-blank/src/test/java/example/LoginTest.java (added) +++ struts/struts2/trunk/apps/jboss-blank/src/test/java/example/LoginTest.java Wed Jul 14 19:55:21 2010 @@ -0,0 +1,55 @@ +/* + * $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."); + } + +}