http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/form_xml_validation/src/main/resources/log4j.dtd ---------------------------------------------------------------------- diff --git a/form_xml_validation/src/main/resources/log4j.dtd b/form_xml_validation/src/main/resources/log4j.dtd deleted file mode 100644 index 1aabd96..0000000 --- a/form_xml_validation/src/main/resources/log4j.dtd +++ /dev/null @@ -1,227 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!-- - 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. ---> - -<!-- Authors: Chris Taylor, Ceki Gulcu. --> - -<!-- Version: 1.2 --> - -<!-- A configuration element consists of optional renderer -elements,appender elements, categories and an optional root -element. --> - -<!ELEMENT log4j:configuration (renderer*, appender*,plugin*, (category|logger)*,root?, - (categoryFactory|loggerFactory)?)> - -<!-- The "threshold" attribute takes a level value below which --> -<!-- all logging statements are disabled. --> - -<!-- Setting the "debug" enable the printing of internal log4j logging --> -<!-- statements. --> - -<!-- By default, debug attribute is "null", meaning that we not do touch --> -<!-- internal log4j logging settings. The "null" value for the threshold --> -<!-- attribute can be misleading. The threshold field of a repository --> -<!-- cannot be set to null. The "null" value for the threshold attribute --> -<!-- simply means don't touch the threshold field, the threshold field --> -<!-- keeps its old value. --> - -<!ATTLIST log4j:configuration - xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"; - threshold (all|trace|debug|info|warn|error|fatal|off|null) "null" - debug (true|false|null) "null" - reset (true|false) "false" -> - -<!-- renderer elements allow the user to customize the conversion of --> -<!-- message objects to String. --> - -<!ELEMENT renderer EMPTY> -<!ATTLIST renderer - renderedClass CDATA #REQUIRED - renderingClass CDATA #REQUIRED -> - -<!-- Appenders must have a name and a class. --> -<!-- Appenders may contain an error handler, a layout, optional parameters --> -<!-- and filters. They may also reference (or include) other appenders. --> -<!ELEMENT appender (errorHandler?, param*, - rollingPolicy?, triggeringPolicy?, connectionSource?, - layout?, filter*, appender-ref*)> -<!ATTLIST appender - name CDATA #REQUIRED - class CDATA #REQUIRED -> - -<!ELEMENT layout (param*)> -<!ATTLIST layout - class CDATA #REQUIRED -> - -<!ELEMENT filter (param*)> -<!ATTLIST filter - class CDATA #REQUIRED -> - -<!-- ErrorHandlers can be of any class. They can admit any number of --> -<!-- parameters. --> - -<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)> -<!ATTLIST errorHandler - class CDATA #REQUIRED -> - -<!ELEMENT root-ref EMPTY> - -<!ELEMENT logger-ref EMPTY> -<!ATTLIST logger-ref - ref CDATA #REQUIRED -> - -<!ELEMENT param EMPTY> -<!ATTLIST param - name CDATA #REQUIRED - value CDATA #REQUIRED -> - - -<!-- The priority class is org.apache.log4j.Level by default --> -<!ELEMENT priority (param*)> -<!ATTLIST priority - class CDATA #IMPLIED - value CDATA #REQUIRED -> - -<!-- The level class is org.apache.log4j.Level by default --> -<!ELEMENT level (param*)> -<!ATTLIST level - class CDATA #IMPLIED - value CDATA #REQUIRED -> - - -<!-- If no level element is specified, then the configurator MUST not --> -<!-- touch the level of the named category. --> -<!ELEMENT category (param*,(priority|level)?,appender-ref*)> -<!ATTLIST category - class CDATA #IMPLIED - name CDATA #REQUIRED - additivity (true|false) "true" -> - -<!-- If no level element is specified, then the configurator MUST not --> -<!-- touch the level of the named logger. --> -<!ELEMENT logger (level?,appender-ref*)> -<!ATTLIST logger - name CDATA #REQUIRED - additivity (true|false) "true" -> - - -<!ELEMENT categoryFactory (param*)> -<!ATTLIST categoryFactory - class CDATA #REQUIRED> - -<!ELEMENT loggerFactory (param*)> -<!ATTLIST loggerFactory - class CDATA #REQUIRED> - -<!ELEMENT appender-ref EMPTY> -<!ATTLIST appender-ref - ref CDATA #REQUIRED -> - -<!-- plugins must have a name and class and can have optional parameters --> -<!ELEMENT plugin (param*, connectionSource?)> -<!ATTLIST plugin - name CDATA #REQUIRED - class CDATA #REQUIRED -> - -<!ELEMENT connectionSource (dataSource?, param*)> -<!ATTLIST connectionSource - class CDATA #REQUIRED -> - -<!ELEMENT dataSource (param*)> -<!ATTLIST dataSource - class CDATA #REQUIRED -> - -<!ELEMENT triggeringPolicy ((param|filter)*)> -<!ATTLIST triggeringPolicy - name CDATA #IMPLIED - class CDATA #REQUIRED -> - -<!ELEMENT rollingPolicy (param*)> -<!ATTLIST rollingPolicy - name CDATA #IMPLIED - class CDATA #REQUIRED -> - - -<!-- If no priority element is specified, then the configurator MUST not --> -<!-- touch the priority of root. --> -<!-- The root category always exists and cannot be subclassed. --> -<!ELEMENT root (param*, (priority|level)?, appender-ref*)> - - -<!-- ==================================================================== --> -<!-- A logging event --> -<!-- ==================================================================== --> -<!ELEMENT log4j:eventSet (log4j:event*)> -<!ATTLIST log4j:eventSet - xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"; - version (1.1|1.2) "1.2" - includesLocationInfo (true|false) "true" -> - - - -<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?, - log4j:locationInfo?, log4j:properties?) > - -<!-- The timestamp format is application dependent. --> -<!ATTLIST log4j:event - logger CDATA #REQUIRED - level CDATA #REQUIRED - thread CDATA #REQUIRED - timestamp CDATA #REQUIRED - time CDATA #IMPLIED -> - -<!ELEMENT log4j:message (#PCDATA)> -<!ELEMENT log4j:NDC (#PCDATA)> - -<!ELEMENT log4j:throwable (#PCDATA)> - -<!ELEMENT log4j:locationInfo EMPTY> -<!ATTLIST log4j:locationInfo - class CDATA #REQUIRED - method CDATA #REQUIRED - file CDATA #REQUIRED - line CDATA #REQUIRED -> - -<!ELEMENT log4j:properties (log4j:data*)> - -<!ELEMENT log4j:data EMPTY> -<!ATTLIST log4j:data - name CDATA #REQUIRED - value CDATA #REQUIRED ->
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/form_xml_validation/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/form_xml_validation/src/main/resources/log4j.xml b/form_xml_validation/src/main/resources/log4j.xml deleted file mode 100644 index 2100cb2..0000000 --- a/form_xml_validation/src/main/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE log4j:configuration PUBLIC "-//log4j/log4j Configuration//EN" "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> - - <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender"> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p %c.%M:%L - %m%n"/> - </layout> - </appender> - - <!-- specify the logging level for loggers from other libraries --> - <logger name="com.opensymphony"> - <level value="DEBUG" /> - </logger> - - <logger name="org.apache.struts2"> - <level value="DEBUG" /> - </logger> - - <!-- for all other loggers log only debug and above log messages --> - <root> - <priority value="INFO"/> - <appender-ref ref="STDOUT" /> - </root> - -</log4j:configuration> - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/form_xml_validation/src/main/resources/org/apache/struts/edit/action/EditAction-validation.xml ---------------------------------------------------------------------- diff --git a/form_xml_validation/src/main/resources/org/apache/struts/edit/action/EditAction-validation.xml b/form_xml_validation/src/main/resources/org/apache/struts/edit/action/EditAction-validation.xml deleted file mode 100644 index bb91b97..0000000 --- a/form_xml_validation/src/main/resources/org/apache/struts/edit/action/EditAction-validation.xml +++ /dev/null @@ -1,34 +0,0 @@ -<!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd";> -<validators> - <validator type="requiredstring"> - <param name="fieldname">personBean.firstName</param> - <message>First name is required.</message> - </validator> - <validator type="requiredstring"> - <param name="fieldname">personBean.lastName</param> - <message>Last name is required.</message> - </validator> - <validator type="requiredstring"> - <param name="fieldname">personBean.email</param> - <message>Email address is required.</message> - </validator> - <validator type="email"> - <param name="fieldname">personBean.email</param> - <message>Email address not valid.</message> - </validator> - <validator type="requiredstring"> - <param name="fieldname">personBean.phoneNumber</param> - <message>Phone number is required.</message> - </validator> -<validator type="regex"> - <param name="fieldname">personBean.phoneNumber</param> - <param name="regex"><![CDATA[\d{3}-\d{3}-\d{4}]]></param> - <message>Phone number must be entered as 999-999-9999.</message> -</validator> -<validator type="fieldexpression"> - <param name="fieldname">personBean.carModels</param> - <param name="expression"><![CDATA[personBean.carModels.length > 0]]></param> - <message>You must select at least one car model.</message> -</validator> -</validators> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/form_xml_validation/src/main/resources/org/apache/struts/edit/action/EditAction.properties ---------------------------------------------------------------------- diff --git a/form_xml_validation/src/main/resources/org/apache/struts/edit/action/EditAction.properties b/form_xml_validation/src/main/resources/org/apache/struts/edit/action/EditAction.properties deleted file mode 100644 index 83f400a..0000000 --- a/form_xml_validation/src/main/resources/org/apache/struts/edit/action/EditAction.properties +++ /dev/null @@ -1,10 +0,0 @@ -personBean.firstName=First name -personBean.lastName=Last name -personBean.email=Email address -personBean.phoneNumber=Phone number (999-999-9999) -personBean.sport=Favorite sport -personBean.gender=Gender -personBean.residency=State resident -personBean.over21=21 or older -personBean.carModels=Car models owned -submit=Save Changes \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/form_xml_validation/src/main/resources/struts.xml ---------------------------------------------------------------------- diff --git a/form_xml_validation/src/main/resources/struts.xml b/form_xml_validation/src/main/resources/struts.xml deleted file mode 100644 index 893019d..0000000 --- a/form_xml_validation/src/main/resources/struts.xml +++ /dev/null @@ -1,30 +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> - - <constant name="struts.devMode" value="true" /> - - <package name="basicstruts2" extends="struts-default"> - - <!-- If no class attribute is specified the framework will assume success and - render the result index.jsp --> - <!-- If no name value for the result node is specified the success value is the default --> - <action name="index"> - <result>/index.jsp</result> - </action> - - <action name="edit" class="org.apache.struts.edit.action.EditAction" method="input"> - <result name="input">/edit.jsp</result> - </action> - - <action name="save" class="org.apache.struts.edit.action.EditAction" method="execute"> - <result name="input">/edit.jsp</result> - <result name="success">/thankyou.jsp</result> - </action> - - </package> - -</struts> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/form_xml_validation/src/main/webapp/META-INF/MANIFEST.MF ---------------------------------------------------------------------- diff --git a/form_xml_validation/src/main/webapp/META-INF/MANIFEST.MF b/form_xml_validation/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 5e94951..0000000 --- a/form_xml_validation/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/form_xml_validation/src/main/webapp/META-INF/context.xml ---------------------------------------------------------------------- diff --git a/form_xml_validation/src/main/webapp/META-INF/context.xml b/form_xml_validation/src/main/webapp/META-INF/context.xml deleted file mode 100644 index 047bfdc..0000000 --- a/form_xml_validation/src/main/webapp/META-INF/context.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Context antiJARLocking="true" path="/form_xml_validation"/> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/form_xml_validation/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/form_xml_validation/src/main/webapp/WEB-INF/web.xml b/form_xml_validation/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 452d0d7..0000000 --- a/form_xml_validation/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" 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>Form XML Validation</display-name> - <welcome-file-list> - <welcome-file>index.jsp</welcome-file> - </welcome-file-list> - - - <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> - -</web-app> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/form_xml_validation/src/main/webapp/edit.jsp ---------------------------------------------------------------------- diff --git a/form_xml_validation/src/main/webapp/edit.jsp b/form_xml_validation/src/main/webapp/edit.jsp deleted file mode 100644 index 67a9901..0000000 --- a/form_xml_validation/src/main/webapp/edit.jsp +++ /dev/null @@ -1,30 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> -<%@ taglib prefix="s" uri="/struts-tags" %> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<html> -<head> -<s:head /> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Struts 2 Form Tags - Edit Person</title> -</head> -<body> -<h1>Update Information</h1> - -<p>Use the form below to edit your information.</p> - -<s:form action="save" method="post"> -<s:textfield key="personBean.firstName" /> -<s:textfield key="personBean.lastName" /> -<s:textfield key="personBean.email" /> -<s:textfield key="personBean.phoneNumber" /> -<s:select key="personBean.sport" list="sports" /> -<s:radio key="personBean.gender" list="genders" /> -<s:select key="personBean.residency" list="states" listKey="stateAbbr" listValue="stateName" /> -<s:checkbox key="personBean.over21" /> -<s:checkboxlist key="personBean.carModels" list="carModelsAvailable" /> -<s:submit key="submit" /> -</s:form> - -</body> -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/form_xml_validation/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/form_xml_validation/src/main/webapp/index.jsp b/form_xml_validation/src/main/webapp/index.jsp deleted file mode 100644 index 88209d8..0000000 --- a/form_xml_validation/src/main/webapp/index.jsp +++ /dev/null @@ -1,16 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> -<%@ taglib prefix="s" uri="/struts-tags" %> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Struts 2 Form Tags - Welcome</title> -</head> -<body> -<h1>Welcome To Struts 2!</h1> - -<p><a href='<s:url action="edit" />' >Edit your information</a></p> - -</body> -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/form_xml_validation/src/main/webapp/thankyou.jsp ---------------------------------------------------------------------- diff --git a/form_xml_validation/src/main/webapp/thankyou.jsp b/form_xml_validation/src/main/webapp/thankyou.jsp deleted file mode 100644 index 5fa306f..0000000 --- a/form_xml_validation/src/main/webapp/thankyou.jsp +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> -<html xmlns="http://www.w3.org/1999/xhtml";> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>Update Successful</title> -</head> -<body> - -<h1>Updated Information</h1> - - -<p>Your information: <s:property value="personBean" /> </p> - -<p><a href="<s:url action='index' />" >Return to home page</a>.</p> - -</body> -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/helloworld/README.txt ---------------------------------------------------------------------- diff --git a/helloworld/README.txt b/helloworld/README.txt index fdbba31..19d2338 100755 --- a/helloworld/README.txt +++ b/helloworld/README.txt @@ -10,7 +10,7 @@ The war file is created in the target sub-folder. Copy the war file to your Servlet container (e.g. Tomcat) and then startup the Servlet container. -In a web browser go to: http://localhost:8080/hello_world/index.action. +In a web browser go to: http://localhost:8080/hello-world/index.action. You should see a web page with Welcome to Struts 2! http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/helloworld/pom.xml ---------------------------------------------------------------------- diff --git a/helloworld/pom.xml b/helloworld/pom.xml index a80e532..ef4ea50 100644 --- a/helloworld/pom.xml +++ b/helloworld/pom.xml @@ -1,19 +1,22 @@ <?xml version="1.0"?> <project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; - xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>struts.apache.org</groupId> - <artifactId>struts2examples</artifactId> - <version>1.0.0</version> - </parent> - <artifactId>helloworld</artifactId> - <packaging>war</packaging> - <name>Hello World Struts 2 Example Application</name> - <description>Hello world example application for the - Struts 2 Getting Started tutorials</description> - <build> - <finalName>hello_world</finalName> - </build> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; + xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>struts.apache.org</groupId> + <artifactId>struts2examples</artifactId> + <version>1.0.0</version> + </parent> + + <artifactId>helloworld</artifactId> + <packaging>war</packaging> + + <name>Hello World Struts 2 Example Application</name> + + <description>Hello world example application for the Struts 2 Getting Started tutorials</description> + + <build> + <finalName>hello-world</finalName> + </build> </project> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http-session/README.txt ---------------------------------------------------------------------- diff --git a/http-session/README.txt b/http-session/README.txt new file mode 100644 index 0000000..8689b30 --- /dev/null +++ b/http-session/README.txt @@ -0,0 +1,16 @@ +This is the example project referred to in the +Struts 2 documentation, HTTP Session tutorial. +See: http://struts.apache.org. + +To build the application's war file run mvn clean package +from the project's root folder. + +The war file is created in the target sub-folder. + +Copy the war file to your Servlet container (e.g. Tomcat, GlassFish) and +then startup the Servlet container. + +In a web browser go to: http://localhost:8080/http-session/index.action. + +You should see a web page with Welcome to Struts 2! + http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http-session/pom.xml ---------------------------------------------------------------------- diff --git a/http-session/pom.xml b/http-session/pom.xml new file mode 100644 index 0000000..f5d0a1c --- /dev/null +++ b/http-session/pom.xml @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; + xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>struts.apache.org</groupId> + <artifactId>struts2examples</artifactId> + <version>1.0.0</version> + </parent> + + <artifactId>http-session</artifactId> + + <name>http-session</name> + + <description>Struts 2 example application for the HTTP Session getting started tutorial</description> + + <packaging>war</packaging> + + <build> + <finalName>http-session</finalName> + </build> +</project> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http-session/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java ---------------------------------------------------------------------- diff --git a/http-session/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java b/http-session/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java new file mode 100644 index 0000000..37660d1 --- /dev/null +++ b/http-session/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java @@ -0,0 +1,120 @@ +package org.apache.struts.helloworld.action; + +import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.interceptor.ParameterNameAware; +import org.apache.struts.helloworld.model.MessageStore; +import org.apache.struts2.interceptor.SessionAware; + +import java.util.Map; + +/** + * Acts as a Struts 2 controller that responds + * to a user action by setting the value + * of the Message model class, and returns a String + * result. + * @author Bruce Phillips + * + */ +public class HelloWorldAction extends ActionSupport implements SessionAware, ParameterNameAware { + + private static final long serialVersionUID = 1L; + + /** + * The model class that stores the message + * to display in the view. + */ + private MessageStore messageStore; + + private Map<String, Object> userSession ; + + private static final String HELLO_COUNT = "helloCount"; + + + + private String userName; + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + /* + * Creates the MessageStore model object, + * increase helloCount stored in the HTTP session by 1 and + * returns success. The MessageStore model + * object will be available to the view. + * (non-Javadoc) + * @see com.opensymphony.xwork2.ActionSupport#execute() + */ + public String execute() throws Exception { + + messageStore = new MessageStore() ; + + //Action included a query string parameter of userName + //or a form field with name of userName + if (userName != null) { + + messageStore.setMessage( messageStore.getMessage() + " " + userName); + + } + + increaseHelloCount(); + + return SUCCESS; + } + + /** + * Increase the value of HELLO_COUNT stored in the user's + * HTTP session. + */ + private void increaseHelloCount() { + + Integer helloCount = (Integer) userSession.get(HELLO_COUNT); + + if (helloCount == null ) { + + helloCount = 1; + + } else { + + helloCount++; + } + + userSession.put(HELLO_COUNT, helloCount); + + } + + public MessageStore getMessageStore() { + return messageStore; + } + + public void setMessageStore(MessageStore messageStore) { + this.messageStore = messageStore; + } + + + public void setSession(Map<String, Object> session) { + + userSession = session ; + + } + + public boolean acceptableParameterName(String parameterName) { + + boolean allowedParameterName = true ; + + if ( parameterName.contains("session") || parameterName.contains("request") ) { + + allowedParameterName = false ; + + } + + return allowedParameterName; + } + + + +} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http-session/src/main/java/org/apache/struts/helloworld/model/MessageStore.java ---------------------------------------------------------------------- diff --git a/http-session/src/main/java/org/apache/struts/helloworld/model/MessageStore.java b/http-session/src/main/java/org/apache/struts/helloworld/model/MessageStore.java new file mode 100644 index 0000000..b7fceeb --- /dev/null +++ b/http-session/src/main/java/org/apache/struts/helloworld/model/MessageStore.java @@ -0,0 +1,31 @@ +package org.apache.struts.helloworld.model; + +/** + * Model class that stores a message. + * @author Bruce Phillips + * + */ +public class MessageStore { + + private String message; + + public MessageStore() { + + setMessage("Hello Struts User"); + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public String toString() { + + return message + " (from toString)"; + + } + +} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http-session/src/main/resources/log4j.dtd ---------------------------------------------------------------------- diff --git a/http-session/src/main/resources/log4j.dtd b/http-session/src/main/resources/log4j.dtd new file mode 100644 index 0000000..1aabd96 --- /dev/null +++ b/http-session/src/main/resources/log4j.dtd @@ -0,0 +1,227 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + 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. +--> + +<!-- Authors: Chris Taylor, Ceki Gulcu. --> + +<!-- Version: 1.2 --> + +<!-- A configuration element consists of optional renderer +elements,appender elements, categories and an optional root +element. --> + +<!ELEMENT log4j:configuration (renderer*, appender*,plugin*, (category|logger)*,root?, + (categoryFactory|loggerFactory)?)> + +<!-- The "threshold" attribute takes a level value below which --> +<!-- all logging statements are disabled. --> + +<!-- Setting the "debug" enable the printing of internal log4j logging --> +<!-- statements. --> + +<!-- By default, debug attribute is "null", meaning that we not do touch --> +<!-- internal log4j logging settings. The "null" value for the threshold --> +<!-- attribute can be misleading. The threshold field of a repository --> +<!-- cannot be set to null. The "null" value for the threshold attribute --> +<!-- simply means don't touch the threshold field, the threshold field --> +<!-- keeps its old value. --> + +<!ATTLIST log4j:configuration + xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"; + threshold (all|trace|debug|info|warn|error|fatal|off|null) "null" + debug (true|false|null) "null" + reset (true|false) "false" +> + +<!-- renderer elements allow the user to customize the conversion of --> +<!-- message objects to String. --> + +<!ELEMENT renderer EMPTY> +<!ATTLIST renderer + renderedClass CDATA #REQUIRED + renderingClass CDATA #REQUIRED +> + +<!-- Appenders must have a name and a class. --> +<!-- Appenders may contain an error handler, a layout, optional parameters --> +<!-- and filters. They may also reference (or include) other appenders. --> +<!ELEMENT appender (errorHandler?, param*, + rollingPolicy?, triggeringPolicy?, connectionSource?, + layout?, filter*, appender-ref*)> +<!ATTLIST appender + name CDATA #REQUIRED + class CDATA #REQUIRED +> + +<!ELEMENT layout (param*)> +<!ATTLIST layout + class CDATA #REQUIRED +> + +<!ELEMENT filter (param*)> +<!ATTLIST filter + class CDATA #REQUIRED +> + +<!-- ErrorHandlers can be of any class. They can admit any number of --> +<!-- parameters. --> + +<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)> +<!ATTLIST errorHandler + class CDATA #REQUIRED +> + +<!ELEMENT root-ref EMPTY> + +<!ELEMENT logger-ref EMPTY> +<!ATTLIST logger-ref + ref CDATA #REQUIRED +> + +<!ELEMENT param EMPTY> +<!ATTLIST param + name CDATA #REQUIRED + value CDATA #REQUIRED +> + + +<!-- The priority class is org.apache.log4j.Level by default --> +<!ELEMENT priority (param*)> +<!ATTLIST priority + class CDATA #IMPLIED + value CDATA #REQUIRED +> + +<!-- The level class is org.apache.log4j.Level by default --> +<!ELEMENT level (param*)> +<!ATTLIST level + class CDATA #IMPLIED + value CDATA #REQUIRED +> + + +<!-- If no level element is specified, then the configurator MUST not --> +<!-- touch the level of the named category. --> +<!ELEMENT category (param*,(priority|level)?,appender-ref*)> +<!ATTLIST category + class CDATA #IMPLIED + name CDATA #REQUIRED + additivity (true|false) "true" +> + +<!-- If no level element is specified, then the configurator MUST not --> +<!-- touch the level of the named logger. --> +<!ELEMENT logger (level?,appender-ref*)> +<!ATTLIST logger + name CDATA #REQUIRED + additivity (true|false) "true" +> + + +<!ELEMENT categoryFactory (param*)> +<!ATTLIST categoryFactory + class CDATA #REQUIRED> + +<!ELEMENT loggerFactory (param*)> +<!ATTLIST loggerFactory + class CDATA #REQUIRED> + +<!ELEMENT appender-ref EMPTY> +<!ATTLIST appender-ref + ref CDATA #REQUIRED +> + +<!-- plugins must have a name and class and can have optional parameters --> +<!ELEMENT plugin (param*, connectionSource?)> +<!ATTLIST plugin + name CDATA #REQUIRED + class CDATA #REQUIRED +> + +<!ELEMENT connectionSource (dataSource?, param*)> +<!ATTLIST connectionSource + class CDATA #REQUIRED +> + +<!ELEMENT dataSource (param*)> +<!ATTLIST dataSource + class CDATA #REQUIRED +> + +<!ELEMENT triggeringPolicy ((param|filter)*)> +<!ATTLIST triggeringPolicy + name CDATA #IMPLIED + class CDATA #REQUIRED +> + +<!ELEMENT rollingPolicy (param*)> +<!ATTLIST rollingPolicy + name CDATA #IMPLIED + class CDATA #REQUIRED +> + + +<!-- If no priority element is specified, then the configurator MUST not --> +<!-- touch the priority of root. --> +<!-- The root category always exists and cannot be subclassed. --> +<!ELEMENT root (param*, (priority|level)?, appender-ref*)> + + +<!-- ==================================================================== --> +<!-- A logging event --> +<!-- ==================================================================== --> +<!ELEMENT log4j:eventSet (log4j:event*)> +<!ATTLIST log4j:eventSet + xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"; + version (1.1|1.2) "1.2" + includesLocationInfo (true|false) "true" +> + + + +<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?, + log4j:locationInfo?, log4j:properties?) > + +<!-- The timestamp format is application dependent. --> +<!ATTLIST log4j:event + logger CDATA #REQUIRED + level CDATA #REQUIRED + thread CDATA #REQUIRED + timestamp CDATA #REQUIRED + time CDATA #IMPLIED +> + +<!ELEMENT log4j:message (#PCDATA)> +<!ELEMENT log4j:NDC (#PCDATA)> + +<!ELEMENT log4j:throwable (#PCDATA)> + +<!ELEMENT log4j:locationInfo EMPTY> +<!ATTLIST log4j:locationInfo + class CDATA #REQUIRED + method CDATA #REQUIRED + file CDATA #REQUIRED + line CDATA #REQUIRED +> + +<!ELEMENT log4j:properties (log4j:data*)> + +<!ELEMENT log4j:data EMPTY> +<!ATTLIST log4j:data + name CDATA #REQUIRED + value CDATA #REQUIRED +> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http-session/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/http-session/src/main/resources/log4j.xml b/http-session/src/main/resources/log4j.xml new file mode 100644 index 0000000..2100cb2 --- /dev/null +++ b/http-session/src/main/resources/log4j.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE log4j:configuration PUBLIC "-//log4j/log4j Configuration//EN" "log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> + + <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender"> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %-5p %c.%M:%L - %m%n"/> + </layout> + </appender> + + <!-- specify the logging level for loggers from other libraries --> + <logger name="com.opensymphony"> + <level value="DEBUG" /> + </logger> + + <logger name="org.apache.struts2"> + <level value="DEBUG" /> + </logger> + + <!-- for all other loggers log only debug and above log messages --> + <root> + <priority value="INFO"/> + <appender-ref ref="STDOUT" /> + </root> + +</log4j:configuration> + http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http-session/src/main/resources/struts.xml ---------------------------------------------------------------------- diff --git a/http-session/src/main/resources/struts.xml b/http-session/src/main/resources/struts.xml new file mode 100644 index 0000000..b882764 --- /dev/null +++ b/http-session/src/main/resources/struts.xml @@ -0,0 +1,45 @@ +<?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.devMode" value="true" /> + + <package name="basicstruts2" extends="struts-default"> + + <!-- setup the default-stack exception mapping interceptor + so that any exceptions not caught by this application + will be logged and then handled by the global exception + mapping + also modify the params interceptor so it excludes + request attributes that start with session or request--> + <interceptors> + <interceptor-stack name="appDefault"> + <interceptor-ref name="defaultStack"> + <param name="exception.logEnabled">true</param> + <param name="exception.logLevel">ERROR</param> + <param name="params.excludeParams">dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,parameters\...*</param> + </interceptor-ref> + </interceptor-stack> + </interceptors> + + <default-interceptor-ref name="appDefault" /> + + <!-- If no class attribute is specified the framework will assume success and + render the result index.jsp --> + <!-- If no name value for the result node is specified the success value is the default --> + <action name="index"> + <result>/index.jsp</result> + </action> + + <!-- If the URL is hello.action the call the execute method of class HelloWorldAction. + If the result returned by the execute method is success render the HelloWorld.jsp --> + <action name="hello" class="org.apache.struts.helloworld.action.HelloWorldAction" method="execute"> + <result name="success">/HelloWorld.jsp</result> + </action> + + </package> + +</struts> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http-session/src/main/webapp/HelloWorld.jsp ---------------------------------------------------------------------- diff --git a/http-session/src/main/webapp/HelloWorld.jsp b/http-session/src/main/webapp/HelloWorld.jsp new file mode 100644 index 0000000..c946804 --- /dev/null +++ b/http-session/src/main/webapp/HelloWorld.jsp @@ -0,0 +1,17 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@ taglib prefix="s" uri="/struts-tags" %> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<title>Hello World!</title> +</head> +<body> +<h2><s:property value="messageStore.message" /></h2> +<p>I've said hello to you <s:property value="#session.helloCount" /> times!</p> +<p><s:property value="messageStore" /></p> +<hr /> +<p><a href='<s:url action="index" />'>Return Home</a></p> +</body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http-session/src/main/webapp/META-INF/MANIFEST.MF ---------------------------------------------------------------------- diff --git a/http-session/src/main/webapp/META-INF/MANIFEST.MF b/http-session/src/main/webapp/META-INF/MANIFEST.MF new file mode 100644 index 0000000..254272e --- /dev/null +++ b/http-session/src/main/webapp/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http-session/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/http-session/src/main/webapp/WEB-INF/web.xml b/http-session/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..c80f689 --- /dev/null +++ b/http-session/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app id="WebApp_ID" 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>HTTP Session Struts 2</display-name> + <welcome-file-list> + <welcome-file>index.jsp</welcome-file> + </welcome-file-list> + + + <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> + +</web-app> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http-session/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/http-session/src/main/webapp/index.jsp b/http-session/src/main/webapp/index.jsp new file mode 100644 index 0000000..f1a5444 --- /dev/null +++ b/http-session/src/main/webapp/index.jsp @@ -0,0 +1,28 @@ +<%@ page language="java" contentType="text/html; charset=ISO-8859-1" + pageEncoding="ISO-8859-1"%> +<%@ taglib prefix="s" uri="/struts-tags" %> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<title>Basic Struts 2 Application - Welcome</title> +</head> +<body> +<h1>Welcome To Struts 2!</h1> +<p><a href="<s:url action='hello'/>">Hello World</a></p> +<s:url action="hello" var="helloLink"> + <s:param name="userName">Bruce Phillips</s:param> +</s:url> +<p><a href="${helloLink}">Hello Bruce Phillips</a></p> + +<p>Get your own personal hello by filling out and submitting this form.</p> + +<s:form action="hello"> + + <s:textfield name="userName" label="%{'Your name'}" /> + + <s:submit value="%{'Submit'}" /> + +</s:form> +</body> +</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http_session/README.txt ---------------------------------------------------------------------- diff --git a/http_session/README.txt b/http_session/README.txt deleted file mode 100644 index 896890b..0000000 --- a/http_session/README.txt +++ /dev/null @@ -1,16 +0,0 @@ -This is the example project referred to in the -Struts 2 documentation, HTTP Session tutorial. -See: http://struts.apache.org. - -To build the application's war file run mvn clean package -from the project's root folder. - -The war file is created in the target sub-folder. - -Copy the war file to your Servlet container (e.g. Tomcat, GlassFish) and -then startup the Servlet container. - -In a web browser go to: http://localhost:8080/http_session/index.action. - -You should see a web page with Welcome to Struts 2! - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http_session/pom.xml ---------------------------------------------------------------------- diff --git a/http_session/pom.xml b/http_session/pom.xml deleted file mode 100644 index 511b643..0000000 --- a/http_session/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>struts.apache.org</groupId> - <artifactId>struts2examples</artifactId> - <version>1.0.0</version> - </parent> - - <artifactId>http_session</artifactId> - - <name>http_session</name> - - <description>Struts 2 example application for the - HTTP Sesssion getting started tutorial</description> - - <packaging>war</packaging> - - <build> - <finalName>http_session</finalName> - </build> -</project> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http_session/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java ---------------------------------------------------------------------- diff --git a/http_session/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java b/http_session/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java deleted file mode 100644 index 5d06792..0000000 --- a/http_session/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java +++ /dev/null @@ -1,121 +0,0 @@ -package org.apache.struts.helloworld.action; - -import java.util.Map; - -import org.apache.struts.helloworld.model.MessageStore; -import org.apache.struts2.interceptor.SessionAware; - -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.interceptor.ParameterNameAware; - -/** - * Acts as a Struts 2 controller that responds - * to a user action by setting the value - * of the Message model class, and returns a String - * result. - * @author Bruce Phillips - * - */ -public class HelloWorldAction extends ActionSupport implements SessionAware, ParameterNameAware { - - private static final long serialVersionUID = 1L; - - /** - * The model class that stores the message - * to display in the view. - */ - private MessageStore messageStore; - - private Map<String, Object> userSession ; - - private static final String HELLO_COUNT = "helloCount"; - - - - private String userName; - - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - /* - * Creates the MessageStore model object, - * increase helloCount stored in the HTTP session by 1 and - * returns success. The MessageStore model - * object will be available to the view. - * (non-Javadoc) - * @see com.opensymphony.xwork2.ActionSupport#execute() - */ - public String execute() throws Exception { - - messageStore = new MessageStore() ; - - //Action included a query string parameter of userName - //or a form field with name of userName - if (userName != null) { - - messageStore.setMessage( messageStore.getMessage() + " " + userName); - - } - - increaseHelloCount(); - - return SUCCESS; - } - - /** - * Increase the value of HELLO_COUNT stored in the user's - * HTTP session. - */ - private void increaseHelloCount() { - - Integer helloCount = (Integer) userSession.get(HELLO_COUNT); - - if (helloCount == null ) { - - helloCount = 1; - - } else { - - helloCount++; - } - - userSession.put(HELLO_COUNT, helloCount); - - } - - public MessageStore getMessageStore() { - return messageStore; - } - - public void setMessageStore(MessageStore messageStore) { - this.messageStore = messageStore; - } - - - public void setSession(Map<String, Object> session) { - - userSession = session ; - - } - - public boolean acceptableParameterName(String parameterName) { - - boolean allowedParameterName = true ; - - if ( parameterName.contains("session") || parameterName.contains("request") ) { - - allowedParameterName = false ; - - } - - return allowedParameterName; - } - - - -} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http_session/src/main/java/org/apache/struts/helloworld/model/MessageStore.java ---------------------------------------------------------------------- diff --git a/http_session/src/main/java/org/apache/struts/helloworld/model/MessageStore.java b/http_session/src/main/java/org/apache/struts/helloworld/model/MessageStore.java deleted file mode 100644 index b7fceeb..0000000 --- a/http_session/src/main/java/org/apache/struts/helloworld/model/MessageStore.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.apache.struts.helloworld.model; - -/** - * Model class that stores a message. - * @author Bruce Phillips - * - */ -public class MessageStore { - - private String message; - - public MessageStore() { - - setMessage("Hello Struts User"); - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public String toString() { - - return message + " (from toString)"; - - } - -} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http_session/src/main/resources/log4j.dtd ---------------------------------------------------------------------- diff --git a/http_session/src/main/resources/log4j.dtd b/http_session/src/main/resources/log4j.dtd deleted file mode 100644 index 1aabd96..0000000 --- a/http_session/src/main/resources/log4j.dtd +++ /dev/null @@ -1,227 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!-- - 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. ---> - -<!-- Authors: Chris Taylor, Ceki Gulcu. --> - -<!-- Version: 1.2 --> - -<!-- A configuration element consists of optional renderer -elements,appender elements, categories and an optional root -element. --> - -<!ELEMENT log4j:configuration (renderer*, appender*,plugin*, (category|logger)*,root?, - (categoryFactory|loggerFactory)?)> - -<!-- The "threshold" attribute takes a level value below which --> -<!-- all logging statements are disabled. --> - -<!-- Setting the "debug" enable the printing of internal log4j logging --> -<!-- statements. --> - -<!-- By default, debug attribute is "null", meaning that we not do touch --> -<!-- internal log4j logging settings. The "null" value for the threshold --> -<!-- attribute can be misleading. The threshold field of a repository --> -<!-- cannot be set to null. The "null" value for the threshold attribute --> -<!-- simply means don't touch the threshold field, the threshold field --> -<!-- keeps its old value. --> - -<!ATTLIST log4j:configuration - xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"; - threshold (all|trace|debug|info|warn|error|fatal|off|null) "null" - debug (true|false|null) "null" - reset (true|false) "false" -> - -<!-- renderer elements allow the user to customize the conversion of --> -<!-- message objects to String. --> - -<!ELEMENT renderer EMPTY> -<!ATTLIST renderer - renderedClass CDATA #REQUIRED - renderingClass CDATA #REQUIRED -> - -<!-- Appenders must have a name and a class. --> -<!-- Appenders may contain an error handler, a layout, optional parameters --> -<!-- and filters. They may also reference (or include) other appenders. --> -<!ELEMENT appender (errorHandler?, param*, - rollingPolicy?, triggeringPolicy?, connectionSource?, - layout?, filter*, appender-ref*)> -<!ATTLIST appender - name CDATA #REQUIRED - class CDATA #REQUIRED -> - -<!ELEMENT layout (param*)> -<!ATTLIST layout - class CDATA #REQUIRED -> - -<!ELEMENT filter (param*)> -<!ATTLIST filter - class CDATA #REQUIRED -> - -<!-- ErrorHandlers can be of any class. They can admit any number of --> -<!-- parameters. --> - -<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)> -<!ATTLIST errorHandler - class CDATA #REQUIRED -> - -<!ELEMENT root-ref EMPTY> - -<!ELEMENT logger-ref EMPTY> -<!ATTLIST logger-ref - ref CDATA #REQUIRED -> - -<!ELEMENT param EMPTY> -<!ATTLIST param - name CDATA #REQUIRED - value CDATA #REQUIRED -> - - -<!-- The priority class is org.apache.log4j.Level by default --> -<!ELEMENT priority (param*)> -<!ATTLIST priority - class CDATA #IMPLIED - value CDATA #REQUIRED -> - -<!-- The level class is org.apache.log4j.Level by default --> -<!ELEMENT level (param*)> -<!ATTLIST level - class CDATA #IMPLIED - value CDATA #REQUIRED -> - - -<!-- If no level element is specified, then the configurator MUST not --> -<!-- touch the level of the named category. --> -<!ELEMENT category (param*,(priority|level)?,appender-ref*)> -<!ATTLIST category - class CDATA #IMPLIED - name CDATA #REQUIRED - additivity (true|false) "true" -> - -<!-- If no level element is specified, then the configurator MUST not --> -<!-- touch the level of the named logger. --> -<!ELEMENT logger (level?,appender-ref*)> -<!ATTLIST logger - name CDATA #REQUIRED - additivity (true|false) "true" -> - - -<!ELEMENT categoryFactory (param*)> -<!ATTLIST categoryFactory - class CDATA #REQUIRED> - -<!ELEMENT loggerFactory (param*)> -<!ATTLIST loggerFactory - class CDATA #REQUIRED> - -<!ELEMENT appender-ref EMPTY> -<!ATTLIST appender-ref - ref CDATA #REQUIRED -> - -<!-- plugins must have a name and class and can have optional parameters --> -<!ELEMENT plugin (param*, connectionSource?)> -<!ATTLIST plugin - name CDATA #REQUIRED - class CDATA #REQUIRED -> - -<!ELEMENT connectionSource (dataSource?, param*)> -<!ATTLIST connectionSource - class CDATA #REQUIRED -> - -<!ELEMENT dataSource (param*)> -<!ATTLIST dataSource - class CDATA #REQUIRED -> - -<!ELEMENT triggeringPolicy ((param|filter)*)> -<!ATTLIST triggeringPolicy - name CDATA #IMPLIED - class CDATA #REQUIRED -> - -<!ELEMENT rollingPolicy (param*)> -<!ATTLIST rollingPolicy - name CDATA #IMPLIED - class CDATA #REQUIRED -> - - -<!-- If no priority element is specified, then the configurator MUST not --> -<!-- touch the priority of root. --> -<!-- The root category always exists and cannot be subclassed. --> -<!ELEMENT root (param*, (priority|level)?, appender-ref*)> - - -<!-- ==================================================================== --> -<!-- A logging event --> -<!-- ==================================================================== --> -<!ELEMENT log4j:eventSet (log4j:event*)> -<!ATTLIST log4j:eventSet - xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"; - version (1.1|1.2) "1.2" - includesLocationInfo (true|false) "true" -> - - - -<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?, - log4j:locationInfo?, log4j:properties?) > - -<!-- The timestamp format is application dependent. --> -<!ATTLIST log4j:event - logger CDATA #REQUIRED - level CDATA #REQUIRED - thread CDATA #REQUIRED - timestamp CDATA #REQUIRED - time CDATA #IMPLIED -> - -<!ELEMENT log4j:message (#PCDATA)> -<!ELEMENT log4j:NDC (#PCDATA)> - -<!ELEMENT log4j:throwable (#PCDATA)> - -<!ELEMENT log4j:locationInfo EMPTY> -<!ATTLIST log4j:locationInfo - class CDATA #REQUIRED - method CDATA #REQUIRED - file CDATA #REQUIRED - line CDATA #REQUIRED -> - -<!ELEMENT log4j:properties (log4j:data*)> - -<!ELEMENT log4j:data EMPTY> -<!ATTLIST log4j:data - name CDATA #REQUIRED - value CDATA #REQUIRED -> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http_session/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/http_session/src/main/resources/log4j.xml b/http_session/src/main/resources/log4j.xml deleted file mode 100644 index 2100cb2..0000000 --- a/http_session/src/main/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE log4j:configuration PUBLIC "-//log4j/log4j Configuration//EN" "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> - - <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender"> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p %c.%M:%L - %m%n"/> - </layout> - </appender> - - <!-- specify the logging level for loggers from other libraries --> - <logger name="com.opensymphony"> - <level value="DEBUG" /> - </logger> - - <logger name="org.apache.struts2"> - <level value="DEBUG" /> - </logger> - - <!-- for all other loggers log only debug and above log messages --> - <root> - <priority value="INFO"/> - <appender-ref ref="STDOUT" /> - </root> - -</log4j:configuration> - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http_session/src/main/resources/struts.xml ---------------------------------------------------------------------- diff --git a/http_session/src/main/resources/struts.xml b/http_session/src/main/resources/struts.xml deleted file mode 100644 index b882764..0000000 --- a/http_session/src/main/resources/struts.xml +++ /dev/null @@ -1,45 +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> - - <constant name="struts.devMode" value="true" /> - - <package name="basicstruts2" extends="struts-default"> - - <!-- setup the default-stack exception mapping interceptor - so that any exceptions not caught by this application - will be logged and then handled by the global exception - mapping - also modify the params interceptor so it excludes - request attributes that start with session or request--> - <interceptors> - <interceptor-stack name="appDefault"> - <interceptor-ref name="defaultStack"> - <param name="exception.logEnabled">true</param> - <param name="exception.logLevel">ERROR</param> - <param name="params.excludeParams">dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,parameters\...*</param> - </interceptor-ref> - </interceptor-stack> - </interceptors> - - <default-interceptor-ref name="appDefault" /> - - <!-- If no class attribute is specified the framework will assume success and - render the result index.jsp --> - <!-- If no name value for the result node is specified the success value is the default --> - <action name="index"> - <result>/index.jsp</result> - </action> - - <!-- If the URL is hello.action the call the execute method of class HelloWorldAction. - If the result returned by the execute method is success render the HelloWorld.jsp --> - <action name="hello" class="org.apache.struts.helloworld.action.HelloWorldAction" method="execute"> - <result name="success">/HelloWorld.jsp</result> - </action> - - </package> - -</struts> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http_session/src/main/webapp/HelloWorld.jsp ---------------------------------------------------------------------- diff --git a/http_session/src/main/webapp/HelloWorld.jsp b/http_session/src/main/webapp/HelloWorld.jsp deleted file mode 100644 index c946804..0000000 --- a/http_session/src/main/webapp/HelloWorld.jsp +++ /dev/null @@ -1,17 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> -<%@ taglib prefix="s" uri="/struts-tags" %> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Hello World!</title> -</head> -<body> -<h2><s:property value="messageStore.message" /></h2> -<p>I've said hello to you <s:property value="#session.helloCount" /> times!</p> -<p><s:property value="messageStore" /></p> -<hr /> -<p><a href='<s:url action="index" />'>Return Home</a></p> -</body> -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http_session/src/main/webapp/META-INF/MANIFEST.MF ---------------------------------------------------------------------- diff --git a/http_session/src/main/webapp/META-INF/MANIFEST.MF b/http_session/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 254272e..0000000 --- a/http_session/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http_session/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/http_session/src/main/webapp/WEB-INF/web.xml b/http_session/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index c80f689..0000000 --- a/http_session/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" 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>HTTP Session Struts 2</display-name> - <welcome-file-list> - <welcome-file>index.jsp</welcome-file> - </welcome-file-list> - - - <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> - -</web-app> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/http_session/src/main/webapp/index.jsp ---------------------------------------------------------------------- diff --git a/http_session/src/main/webapp/index.jsp b/http_session/src/main/webapp/index.jsp deleted file mode 100644 index f1a5444..0000000 --- a/http_session/src/main/webapp/index.jsp +++ /dev/null @@ -1,28 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> -<%@ taglib prefix="s" uri="/struts-tags" %> -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>Basic Struts 2 Application - Welcome</title> -</head> -<body> -<h1>Welcome To Struts 2!</h1> -<p><a href="<s:url action='hello'/>">Hello World</a></p> -<s:url action="hello" var="helloLink"> - <s:param name="userName">Bruce Phillips</s:param> -</s:url> -<p><a href="${helloLink}">Hello Bruce Phillips</a></p> - -<p>Get your own personal hello by filling out and submitting this form.</p> - -<s:form action="hello"> - - <s:textfield name="userName" label="%{'Your name'}" /> - - <s:submit value="%{'Submit'}" /> - -</s:form> -</body> -</html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/interceptors/pom.xml ---------------------------------------------------------------------- diff --git a/interceptors/pom.xml b/interceptors/pom.xml index 4e99612..955a08c 100644 --- a/interceptors/pom.xml +++ b/interceptors/pom.xml @@ -1,23 +1,24 @@ <?xml version="1.0"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>struts.apache.org</groupId> - <artifactId>struts2examples</artifactId> - <version>1.0.0</version> - </parent> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; + xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>struts.apache.org</groupId> + <artifactId>struts2examples</artifactId> + <version>1.0.0</version> + </parent> - <artifactId>interceptors</artifactId> + <artifactId>interceptors</artifactId> + + <name>Struts 2 Interceptors</name> + + <description>Form XML validation example application for the Struts 2 getting started tutorials</description> + + <packaging>war</packaging> + + <build> + <finalName>interceptors</finalName> + </build> - <name>Struts 2 Interceptors</name> - - <description>Form XML validation example application for the - Struts 2 getting started tutorials</description> - <packaging>war</packaging> - - <build> - <finalName>interceptors</finalName> - </build> - </project> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/jboss-blank/pom.xml ---------------------------------------------------------------------- diff --git a/jboss-blank/pom.xml b/jboss-blank/pom.xml index 6935569..3aabdf3 100644 --- a/jboss-blank/pom.xml +++ b/jboss-blank/pom.xml @@ -49,13 +49,6 @@ <scope>provided</scope> </dependency> - <!-- Logging --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> - </dependency> - <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-junit-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/mailreader/pom.xml ---------------------------------------------------------------------- diff --git a/mailreader/pom.xml b/mailreader/pom.xml index 743bcaf..1f70592 100644 --- a/mailreader/pom.xml +++ b/mailreader/pom.xml @@ -51,11 +51,6 @@ <!-- Logging --> <dependency> <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4j2.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> <version>${log4j2.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/message-resource/README.txt ---------------------------------------------------------------------- diff --git a/message-resource/README.txt b/message-resource/README.txt new file mode 100644 index 0000000..299304a --- /dev/null +++ b/message-resource/README.txt @@ -0,0 +1,16 @@ +This is the example project referred to in the +Struts 2 documentation, Message Resource tutorial. +See: http://struts.apache.org. + +To build the application's war file run mvn clean package +from the project's root folder. + +The war file is created in the target sub-folder. + +Copy the war file to your Servlet container (e.g. Tomcat, GlassFish) and +then startup the Servlet container. + +In a web browser go to: http://localhost:8080/message-resource/index.action. + +You should see a web page with Welcome to Struts 2! + http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/message-resource/pom.xml ---------------------------------------------------------------------- diff --git a/message-resource/pom.xml b/message-resource/pom.xml new file mode 100644 index 0000000..ea9f2d0 --- /dev/null +++ b/message-resource/pom.xml @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; + xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>struts.apache.org</groupId> + <artifactId>struts2examples</artifactId> + <version>1.0.0</version> + </parent> + + <artifactId>message-resource</artifactId> + + <name>Message resource</name> + + <description>Message resource example application for the Struts 2 getting started tutorials</description> + + <packaging>war</packaging> + + <build> + <finalName>message-resource</finalName> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/message-resource/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java ---------------------------------------------------------------------- diff --git a/message-resource/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java b/message-resource/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java new file mode 100644 index 0000000..1285010 --- /dev/null +++ b/message-resource/src/main/java/org/apache/struts/helloworld/action/HelloWorldAction.java @@ -0,0 +1,79 @@ +package org.apache.struts.helloworld.action; + +import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts.helloworld.model.MessageStore; + +/** + * Acts as a Struts 2 controller that responds + * to a user action by setting the value + * of the Message model class, and returns a String + * result. + * @author Bruce Phillips + * + */ +public class HelloWorldAction extends ActionSupport { + + private static final long serialVersionUID = 1L; + + /** + * The model class that stores the message + * to display in the view. + */ + private MessageStore messageStore; + + private static int helloCount = 0; + + public int getHelloCount() { + return helloCount; + } + + public void setHelloCount(int helloCount) { + HelloWorldAction.helloCount = helloCount; + } + + private String userName; + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + /* + * Creates the MessageStore model object, + * increase helloCount by 1 and + * returns success. The MessageStore model + * object will be available to the view. + * (non-Javadoc) + * @see com.opensymphony.xwork2.ActionSupport#execute() + */ + public String execute() throws Exception { + + messageStore = new MessageStore() ; + + //Action included a query string parameter of userName + //or a form field with name of userName + if (userName != null) { + + messageStore.setMessage( messageStore.getMessage() + " " + userName); + + } + + helloCount++; + + return SUCCESS; + } + + public MessageStore getMessageStore() { + return messageStore; + } + + public void setMessageStore(MessageStore messageStore) { + this.messageStore = messageStore; + } + + + +} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/message-resource/src/main/java/org/apache/struts/helloworld/model/MessageStore.java ---------------------------------------------------------------------- diff --git a/message-resource/src/main/java/org/apache/struts/helloworld/model/MessageStore.java b/message-resource/src/main/java/org/apache/struts/helloworld/model/MessageStore.java new file mode 100644 index 0000000..b7fceeb --- /dev/null +++ b/message-resource/src/main/java/org/apache/struts/helloworld/model/MessageStore.java @@ -0,0 +1,31 @@ +package org.apache.struts.helloworld.model; + +/** + * Model class that stores a message. + * @author Bruce Phillips + * + */ +public class MessageStore { + + private String message; + + public MessageStore() { + + setMessage("Hello Struts User"); + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public String toString() { + + return message + " (from toString)"; + + } + +} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/message-resource/src/main/java/org/apache/struts/register/action/Register.java ---------------------------------------------------------------------- diff --git a/message-resource/src/main/java/org/apache/struts/register/action/Register.java b/message-resource/src/main/java/org/apache/struts/register/action/Register.java new file mode 100644 index 0000000..8cc4716 --- /dev/null +++ b/message-resource/src/main/java/org/apache/struts/register/action/Register.java @@ -0,0 +1,64 @@ +package org.apache.struts.register.action; + +import com.opensymphony.xwork2.ActionSupport; +import org.apache.struts.register.model.Person; + +/** + * Acts as a controller to handle actions + * related to registering a user. + * @author bruce phillips + * + */ +public class Register extends ActionSupport { + + private static final long serialVersionUID = 1L; + + private Person personBean; + + + public String execute() throws Exception { + + //call Service class to store personBean's state in database + + return SUCCESS; + + } + + public void validate(){ + + if ( personBean.getFirstName().length() == 0 ){ + + addFieldError( "personBean.firstName", "First name is required." ); + + } + + + if ( personBean.getEmail().length() == 0 ){ + + addFieldError( "personBean.email", "Email is required." ); + + } + + if ( personBean.getAge() < 18 ){ + + addFieldError( "personBean.age", "Age is required and must be 18 or older" ); + + } + + + } + + + public Person getPersonBean() { + + return personBean; + + } + + public void setPersonBean(Person person) { + + personBean = person; + + } + +} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/message-resource/src/main/java/org/apache/struts/register/model/Person.java ---------------------------------------------------------------------- diff --git a/message-resource/src/main/java/org/apache/struts/register/model/Person.java b/message-resource/src/main/java/org/apache/struts/register/model/Person.java new file mode 100644 index 0000000..3020bbb --- /dev/null +++ b/message-resource/src/main/java/org/apache/struts/register/model/Person.java @@ -0,0 +1,62 @@ +package org.apache.struts.register.model; + + +/** + * Models a Person who registers. + * @author bruce phillips + * + */ +public class Person +{ + private String firstName; + private String lastName; + private String email; + private int age; + + public String getFirstName() + { + return firstName; + } + + public void setFirstName(String firstName) + { + this.firstName = firstName; + } + + public String getLastName() + { + return lastName; + } + + public void setLastName(String lastName) + { + this.lastName = lastName; + } + + public String getEmail() + { + return email; + } + + public void setEmail(String email) + { + this.email = email; + } + + public int getAge() + { + return age; + } + + public void setAge( int age) + { + this.age = age; + } + + + public String toString() + { + return "First Name: " + getFirstName() + " Last Name: " + getLastName() + + " Email: " + getEmail() + " Age: " + getAge() ; + } +} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/message-resource/src/main/resources/global.properties ---------------------------------------------------------------------- diff --git a/message-resource/src/main/resources/global.properties b/message-resource/src/main/resources/global.properties new file mode 100644 index 0000000..6b21b29 --- /dev/null +++ b/message-resource/src/main/resources/global.properties @@ -0,0 +1 @@ +contact=For assistance contact <a href='mailto:[email protected]'>[email protected]</a> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/message-resource/src/main/resources/global_es.properties ---------------------------------------------------------------------- diff --git a/message-resource/src/main/resources/global_es.properties b/message-resource/src/main/resources/global_es.properties new file mode 100644 index 0000000..fa01513 --- /dev/null +++ b/message-resource/src/main/resources/global_es.properties @@ -0,0 +1 @@ +contact=Para asistencia, comun�quese <a href='mailto:comun�[email protected]'>comun�[email protected]</a> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/message-resource/src/main/resources/log4j.dtd ---------------------------------------------------------------------- diff --git a/message-resource/src/main/resources/log4j.dtd b/message-resource/src/main/resources/log4j.dtd new file mode 100644 index 0000000..1aabd96 --- /dev/null +++ b/message-resource/src/main/resources/log4j.dtd @@ -0,0 +1,227 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + 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. +--> + +<!-- Authors: Chris Taylor, Ceki Gulcu. --> + +<!-- Version: 1.2 --> + +<!-- A configuration element consists of optional renderer +elements,appender elements, categories and an optional root +element. --> + +<!ELEMENT log4j:configuration (renderer*, appender*,plugin*, (category|logger)*,root?, + (categoryFactory|loggerFactory)?)> + +<!-- The "threshold" attribute takes a level value below which --> +<!-- all logging statements are disabled. --> + +<!-- Setting the "debug" enable the printing of internal log4j logging --> +<!-- statements. --> + +<!-- By default, debug attribute is "null", meaning that we not do touch --> +<!-- internal log4j logging settings. The "null" value for the threshold --> +<!-- attribute can be misleading. The threshold field of a repository --> +<!-- cannot be set to null. The "null" value for the threshold attribute --> +<!-- simply means don't touch the threshold field, the threshold field --> +<!-- keeps its old value. --> + +<!ATTLIST log4j:configuration + xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"; + threshold (all|trace|debug|info|warn|error|fatal|off|null) "null" + debug (true|false|null) "null" + reset (true|false) "false" +> + +<!-- renderer elements allow the user to customize the conversion of --> +<!-- message objects to String. --> + +<!ELEMENT renderer EMPTY> +<!ATTLIST renderer + renderedClass CDATA #REQUIRED + renderingClass CDATA #REQUIRED +> + +<!-- Appenders must have a name and a class. --> +<!-- Appenders may contain an error handler, a layout, optional parameters --> +<!-- and filters. They may also reference (or include) other appenders. --> +<!ELEMENT appender (errorHandler?, param*, + rollingPolicy?, triggeringPolicy?, connectionSource?, + layout?, filter*, appender-ref*)> +<!ATTLIST appender + name CDATA #REQUIRED + class CDATA #REQUIRED +> + +<!ELEMENT layout (param*)> +<!ATTLIST layout + class CDATA #REQUIRED +> + +<!ELEMENT filter (param*)> +<!ATTLIST filter + class CDATA #REQUIRED +> + +<!-- ErrorHandlers can be of any class. They can admit any number of --> +<!-- parameters. --> + +<!ELEMENT errorHandler (param*, root-ref?, logger-ref*, appender-ref?)> +<!ATTLIST errorHandler + class CDATA #REQUIRED +> + +<!ELEMENT root-ref EMPTY> + +<!ELEMENT logger-ref EMPTY> +<!ATTLIST logger-ref + ref CDATA #REQUIRED +> + +<!ELEMENT param EMPTY> +<!ATTLIST param + name CDATA #REQUIRED + value CDATA #REQUIRED +> + + +<!-- The priority class is org.apache.log4j.Level by default --> +<!ELEMENT priority (param*)> +<!ATTLIST priority + class CDATA #IMPLIED + value CDATA #REQUIRED +> + +<!-- The level class is org.apache.log4j.Level by default --> +<!ELEMENT level (param*)> +<!ATTLIST level + class CDATA #IMPLIED + value CDATA #REQUIRED +> + + +<!-- If no level element is specified, then the configurator MUST not --> +<!-- touch the level of the named category. --> +<!ELEMENT category (param*,(priority|level)?,appender-ref*)> +<!ATTLIST category + class CDATA #IMPLIED + name CDATA #REQUIRED + additivity (true|false) "true" +> + +<!-- If no level element is specified, then the configurator MUST not --> +<!-- touch the level of the named logger. --> +<!ELEMENT logger (level?,appender-ref*)> +<!ATTLIST logger + name CDATA #REQUIRED + additivity (true|false) "true" +> + + +<!ELEMENT categoryFactory (param*)> +<!ATTLIST categoryFactory + class CDATA #REQUIRED> + +<!ELEMENT loggerFactory (param*)> +<!ATTLIST loggerFactory + class CDATA #REQUIRED> + +<!ELEMENT appender-ref EMPTY> +<!ATTLIST appender-ref + ref CDATA #REQUIRED +> + +<!-- plugins must have a name and class and can have optional parameters --> +<!ELEMENT plugin (param*, connectionSource?)> +<!ATTLIST plugin + name CDATA #REQUIRED + class CDATA #REQUIRED +> + +<!ELEMENT connectionSource (dataSource?, param*)> +<!ATTLIST connectionSource + class CDATA #REQUIRED +> + +<!ELEMENT dataSource (param*)> +<!ATTLIST dataSource + class CDATA #REQUIRED +> + +<!ELEMENT triggeringPolicy ((param|filter)*)> +<!ATTLIST triggeringPolicy + name CDATA #IMPLIED + class CDATA #REQUIRED +> + +<!ELEMENT rollingPolicy (param*)> +<!ATTLIST rollingPolicy + name CDATA #IMPLIED + class CDATA #REQUIRED +> + + +<!-- If no priority element is specified, then the configurator MUST not --> +<!-- touch the priority of root. --> +<!-- The root category always exists and cannot be subclassed. --> +<!ELEMENT root (param*, (priority|level)?, appender-ref*)> + + +<!-- ==================================================================== --> +<!-- A logging event --> +<!-- ==================================================================== --> +<!ELEMENT log4j:eventSet (log4j:event*)> +<!ATTLIST log4j:eventSet + xmlns:log4j CDATA #FIXED "http://jakarta.apache.org/log4j/"; + version (1.1|1.2) "1.2" + includesLocationInfo (true|false) "true" +> + + + +<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?, + log4j:locationInfo?, log4j:properties?) > + +<!-- The timestamp format is application dependent. --> +<!ATTLIST log4j:event + logger CDATA #REQUIRED + level CDATA #REQUIRED + thread CDATA #REQUIRED + timestamp CDATA #REQUIRED + time CDATA #IMPLIED +> + +<!ELEMENT log4j:message (#PCDATA)> +<!ELEMENT log4j:NDC (#PCDATA)> + +<!ELEMENT log4j:throwable (#PCDATA)> + +<!ELEMENT log4j:locationInfo EMPTY> +<!ATTLIST log4j:locationInfo + class CDATA #REQUIRED + method CDATA #REQUIRED + file CDATA #REQUIRED + line CDATA #REQUIRED +> + +<!ELEMENT log4j:properties (log4j:data*)> + +<!ELEMENT log4j:data EMPTY> +<!ATTLIST log4j:data + name CDATA #REQUIRED + value CDATA #REQUIRED +> http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/message-resource/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/message-resource/src/main/resources/log4j.xml b/message-resource/src/main/resources/log4j.xml new file mode 100644 index 0000000..2100cb2 --- /dev/null +++ b/message-resource/src/main/resources/log4j.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE log4j:configuration PUBLIC "-//log4j/log4j Configuration//EN" "log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> + + <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender"> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %-5p %c.%M:%L - %m%n"/> + </layout> + </appender> + + <!-- specify the logging level for loggers from other libraries --> + <logger name="com.opensymphony"> + <level value="DEBUG" /> + </logger> + + <logger name="org.apache.struts2"> + <level value="DEBUG" /> + </logger> + + <!-- for all other loggers log only debug and above log messages --> + <root> + <priority value="INFO"/> + <appender-ref ref="STDOUT" /> + </root> + +</log4j:configuration> + http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/message-resource/src/main/resources/org/apache/struts/package.properties ---------------------------------------------------------------------- diff --git a/message-resource/src/main/resources/org/apache/struts/package.properties b/message-resource/src/main/resources/org/apache/struts/package.properties new file mode 100644 index 0000000..4ac5698 --- /dev/null +++ b/message-resource/src/main/resources/org/apache/struts/package.properties @@ -0,0 +1,2 @@ +greeting=Welcome to The Wonderful World of Struts 2 +instructions=Register for a prize by completing this form. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/message-resource/src/main/resources/org/apache/struts/package_es.properties ---------------------------------------------------------------------- diff --git a/message-resource/src/main/resources/org/apache/struts/package_es.properties b/message-resource/src/main/resources/org/apache/struts/package_es.properties new file mode 100644 index 0000000..8f0857c --- /dev/null +++ b/message-resource/src/main/resources/org/apache/struts/package_es.properties @@ -0,0 +1,2 @@ +greeting=Bienvenido al maravilloso mundo de Struts 2 +instructions=Reg�strese para obtener un premio por completar este formulario. \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/message-resource/src/main/resources/org/apache/struts/register/action/Register.properties ---------------------------------------------------------------------- diff --git a/message-resource/src/main/resources/org/apache/struts/register/action/Register.properties b/message-resource/src/main/resources/org/apache/struts/register/action/Register.properties new file mode 100644 index 0000000..767e5db --- /dev/null +++ b/message-resource/src/main/resources/org/apache/struts/register/action/Register.properties @@ -0,0 +1,6 @@ +personBean.firstName=First name +personBean.lastName=Last name +personBean.age=Age +personBean.email=Email +thankyou=Thank you for registering %{personBean.firstName}. +submit=Register \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/433ea016/message-resource/src/main/resources/org/apache/struts/register/action/Register_es.properties ---------------------------------------------------------------------- diff --git a/message-resource/src/main/resources/org/apache/struts/register/action/Register_es.properties b/message-resource/src/main/resources/org/apache/struts/register/action/Register_es.properties new file mode 100644 index 0000000..b72712f --- /dev/null +++ b/message-resource/src/main/resources/org/apache/struts/register/action/Register_es.properties @@ -0,0 +1,6 @@ +personBean.firstName=Nombre +personBean.lastName=Apellidos +personBean.age=Edad +personBean.email=Correo +thankyou=Gracias por registrarse %{personBean.firstName}. +submit=someter \ No newline at end of file
