Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5772118DDC for ; Fri, 12 Jun 2015 14:27:18 +0000 (UTC) Received: (qmail 47231 invoked by uid 500); 12 Jun 2015 14:27:18 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 47151 invoked by uid 500); 12 Jun 2015 14:27:18 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 46901 invoked by uid 99); 12 Jun 2015 14:27:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2015 14:27:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EBA77DFF48; Fri, 12 Jun 2015 14:27:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jogep@apache.org To: commits@struts.apache.org Date: Fri, 12 Jun 2015 14:27:18 -0000 Message-Id: <36d08ec3ea774b5e813f9820ead6fe55@git.apache.org> In-Reply-To: <64baf3ebd8af4eb89773795830df23e0@git.apache.org> References: <64baf3ebd8af4eb89773795830df23e0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] struts-examples git commit: Switch to log4j2 in all examples which are using log4j Switch to log4j2 in all examples which are using log4j Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/a66c0865 Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/a66c0865 Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/a66c0865 Branch: refs/heads/master Commit: a66c0865e8a3a8870c8e5183e439a08ee0a5b89e Parents: c917927 Author: Johannes Geppert Authored: Fri Jun 12 16:27:15 2015 +0200 Committer: Johannes Geppert Committed: Fri Jun 12 16:27:15 2015 +0200 ---------------------------------------------------------------------- annotations/pom.xml | 61 +++-- .../main/java/example/actions/HelloAction.java | 65 +++--- .../java/example/actions/RegisterAction.java | 81 +++---- .../src/main/java/example/model/Person.java | 36 ++- annotations/src/main/resources/log4j.dtd | 227 ------------------- annotations/src/main/resources/log4j.xml | 28 --- annotations/src/main/resources/log4j2.xml | 16 ++ .../webapp/WEB-INF/content/hello-success.jsp | 11 +- .../src/main/webapp/WEB-INF/content/index.jsp | 1 + .../webapp/WEB-INF/content/register-input.jsp | 28 +-- .../webapp/WEB-INF/content/register-success.jsp | 10 +- annotations/src/main/webapp/WEB-INF/web.xml | 36 +-- blank/src/main/webapp/WEB-INF/web.xml | 2 +- .../apache/struts/edit/action/EditAction.java | 60 +---- exclude_parameters/src/main/resources/log4j.dtd | 227 ------------------- exclude_parameters/src/main/resources/log4j.xml | 28 --- .../src/main/resources/log4j2.xml | 16 ++ pom.xml | 7 +- .../apache/struts/edit/action/EditAction.java | 191 +++++++--------- .../src/main/resources/log4j.dtd | 227 ------------------- .../src/main/resources/log4j.xml | 28 --- .../src/main/resources/log4j2.xml | 16 ++ .../org/apache/struts/example/MovieAction.java | 19 +- .../src/main/resources/log4j.dtd | 227 ------------------- .../src/main/resources/log4j.xml | 28 --- .../src/main/resources/log4j2.xml | 16 ++ wildcard_method_selection/pom.xml | 54 +++-- .../wildcardmethod/action/PersonAction.java | 194 +++++++--------- .../wildcardmethod/service/PersonService.java | 73 ++---- .../src/main/resources/log4j.dtd | 227 ------------------- .../src/main/resources/log4j.xml | 35 --- .../src/main/resources/log4j2.xml | 16 ++ .../src/main/webapp/WEB-INF/web.xml | 3 +- .../src/main/webapp/index.jsp | 1 + 34 files changed, 467 insertions(+), 1828 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/annotations/pom.xml ---------------------------------------------------------------------- diff --git a/annotations/pom.xml b/annotations/pom.xml index 3396449..98a1d45 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -1,33 +1,46 @@ - 4.0.0 - - struts.apache.org - struts2examples - 1.0.0 - + 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"> + 4.0.0 + + struts.apache.org + struts2examples + 1.0.0 + - annotations + annotations - annotations + Annotations with Convention Plugin - Annotations example application for the - Struts 2 getting started tutorials - war - - annotations - + Annotations example application for the Struts 2 getting started tutorials + war - + + + org.apache.struts + struts2-convention-plugin + ${struts2.version} + + - - - org.apache.struts - struts2-convention-plugin - ${struts2.version} - - + + annotations + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.16.v20140903 + + CTRL+C + 8999 + 10 + + src/main/webapp/WEB-INF/web.xml + + + + + http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/annotations/src/main/java/example/actions/HelloAction.java ---------------------------------------------------------------------- diff --git a/annotations/src/main/java/example/actions/HelloAction.java b/annotations/src/main/java/example/actions/HelloAction.java index 03f7eab..91c2c9d 100644 --- a/annotations/src/main/java/example/actions/HelloAction.java +++ b/annotations/src/main/java/example/actions/HelloAction.java @@ -1,48 +1,41 @@ package example.actions; -import org.apache.log4j.Logger; - - import com.opensymphony.xwork2.ActionSupport; - +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * Acts as a controller to handle actions * related to registering a user. - * @author bruce phillips * + * @author bruce phillips */ public class HelloAction extends ActionSupport { - - private static final long serialVersionUID = 1L; - - private static final Logger logger = Logger.getLogger( HelloAction.class.getName() ); - - private String message; - - - public String execute() throws Exception { - - logger.info("In execute method of class Hello"); - - message = "Hello from Struts 2 with no XML configuration."; - - return SUCCESS; - - } - - - public void setMessage(String message) { - this.message = message; - } - - - public String getMessage() { - return message; - } - - - - + + private static final long serialVersionUID = 1L; + + private static final Logger log = LogManager.getLogger(HelloAction.class); + + private String message; + + + public String execute() throws Exception { + + log.info("In execute method of class Hello"); + + message = "Hello from Struts 2 with no XML configuration."; + + return SUCCESS; + } + + + public void setMessage(String message) { + this.message = message; + } + + + public String getMessage() { + return message; + } } http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/annotations/src/main/java/example/actions/RegisterAction.java ---------------------------------------------------------------------- diff --git a/annotations/src/main/java/example/actions/RegisterAction.java b/annotations/src/main/java/example/actions/RegisterAction.java index 50d19ee..42e5f32 100644 --- a/annotations/src/main/java/example/actions/RegisterAction.java +++ b/annotations/src/main/java/example/actions/RegisterAction.java @@ -1,58 +1,49 @@ package example.actions; -import org.apache.log4j.Logger; -import org.apache.struts2.convention.annotation.Action; - import com.opensymphony.xwork2.ActionSupport; - import example.model.Person; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.struts2.convention.annotation.Action; /** * Acts as a controller to handle actions * related to registering a user. - * @author bruce phillips * + * @author bruce phillips */ public class RegisterAction extends ActionSupport { - - private static final long serialVersionUID = 1L; - - private static final Logger logger = Logger.getLogger( RegisterAction.class.getName() ); - - private Person personBean; - - @Action("register-input") - public String input() throws Exception { - - logger.info("In input method of class RegisterAction"); - - return INPUT; - - } - - public String execute() throws Exception { - - logger.info("In execute method of class RegisterAction"); - - //call Service class to store personBean's state in database - - return SUCCESS; - - } - - - - - public Person getPersonBean() { - - return personBean; - - } - - public void setPersonBean(Person person) { - - personBean = person; - - } + + private static final long serialVersionUID = 1L; + + private static final Logger log = LogManager.getLogger(RegisterAction.class); + + private Person personBean; + + @Action("register-input") + public String input() throws Exception { + + log.info("In input method of class RegisterAction"); + + return INPUT; + } + + public String execute() throws Exception { + + log.info("In execute method of class RegisterAction"); + + //call Service class to store personBean's state in database + + return SUCCESS; + } + + + public Person getPersonBean() { + return personBean; + } + + public void setPersonBean(Person person) { + personBean = person; + } } http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/annotations/src/main/java/example/model/Person.java ---------------------------------------------------------------------- diff --git a/annotations/src/main/java/example/model/Person.java b/annotations/src/main/java/example/model/Person.java index 010f9ef..92669e3 100644 --- a/annotations/src/main/java/example/model/Person.java +++ b/annotations/src/main/java/example/model/Person.java @@ -3,60 +3,50 @@ package example.model; /** * Models a Person who registers. - * @author bruce phillips * + * @author bruce phillips */ -public class Person -{ +public class Person { private String firstName; private String lastName; private String email; private int age; - public String getFirstName() - { + public String getFirstName() { return firstName; } - public void setFirstName(String firstName) - { + public void setFirstName(String firstName) { this.firstName = firstName; } - public String getLastName() - { + public String getLastName() { return lastName; } - public void setLastName(String lastName) - { + public void setLastName(String lastName) { this.lastName = lastName; } - public String getEmail() - { + public String getEmail() { return email; } - public void setEmail(String email) - { + public void setEmail(String email) { this.email = email; } - public int getAge() - { + public int getAge() { return age; } - public void setAge( int age) - { + public void setAge(int age) { this.age = age; } - public String toString() - { - return "First Name: " + getFirstName() + " Last Name: " + getLastName() + - " Email: " + getEmail() + " Age: " + getAge() ; + 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/a66c0865/annotations/src/main/resources/log4j.dtd ---------------------------------------------------------------------- diff --git a/annotations/src/main/resources/log4j.dtd b/annotations/src/main/resources/log4j.dtd deleted file mode 100644 index 1aabd96..0000000 --- a/annotations/src/main/resources/log4j.dtd +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/annotations/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/annotations/src/main/resources/log4j.xml b/annotations/src/main/resources/log4j.xml deleted file mode 100644 index 2100cb2..0000000 --- a/annotations/src/main/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/annotations/src/main/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/annotations/src/main/resources/log4j2.xml b/annotations/src/main/resources/log4j2.xml new file mode 100644 index 0000000..3b08ab1 --- /dev/null +++ b/annotations/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/annotations/src/main/webapp/WEB-INF/content/hello-success.jsp ---------------------------------------------------------------------- diff --git a/annotations/src/main/webapp/WEB-INF/content/hello-success.jsp b/annotations/src/main/webapp/WEB-INF/content/hello-success.jsp index 00119be..b02f233 100644 --- a/annotations/src/main/webapp/WEB-INF/content/hello-success.jsp +++ b/annotations/src/main/webapp/WEB-INF/content/hello-success.jsp @@ -1,19 +1,18 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> + pageEncoding="ISO-8859-1" %> - -Hello + + Hello -

+

- -

Return to home page.

+

Return to home page.

\ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/annotations/src/main/webapp/WEB-INF/content/index.jsp ---------------------------------------------------------------------- diff --git a/annotations/src/main/webapp/WEB-INF/content/index.jsp b/annotations/src/main/webapp/WEB-INF/content/index.jsp new file mode 100644 index 0000000..08ef1fc --- /dev/null +++ b/annotations/src/main/webapp/WEB-INF/content/index.jsp @@ -0,0 +1 @@ +<% response.sendRedirect("/index.jsp"); %> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/annotations/src/main/webapp/WEB-INF/content/register-input.jsp ---------------------------------------------------------------------- diff --git a/annotations/src/main/webapp/WEB-INF/content/register-input.jsp b/annotations/src/main/webapp/WEB-INF/content/register-input.jsp index ab6562f..7ec62b7 100644 --- a/annotations/src/main/webapp/WEB-INF/content/register-input.jsp +++ b/annotations/src/main/webapp/WEB-INF/content/register-input.jsp @@ -1,27 +1,27 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> + pageEncoding="ISO-8859-1" %> - -Register - + + Register +

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/a66c0865/annotations/src/main/webapp/WEB-INF/content/register-success.jsp ---------------------------------------------------------------------- diff --git a/annotations/src/main/webapp/WEB-INF/content/register-success.jsp b/annotations/src/main/webapp/WEB-INF/content/register-success.jsp index 174f0ad..c9c0e52 100644 --- a/annotations/src/main/webapp/WEB-INF/content/register-success.jsp +++ b/annotations/src/main/webapp/WEB-INF/content/register-success.jsp @@ -1,19 +1,19 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> + pageEncoding="ISO-8859-1" %> - -Registration Successful + + Registration Successful

Thank you for registering for a prize.

-

Your registration information:

+

Your registration information:

-

Return to home page.

+

Return to home page.

\ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/annotations/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/annotations/src/main/webapp/WEB-INF/web.xml b/annotations/src/main/webapp/WEB-INF/web.xml index 84ed515..f67db04 100644 --- a/annotations/src/main/webapp/WEB-INF/web.xml +++ b/annotations/src/main/webapp/WEB-INF/web.xml @@ -1,25 +1,25 @@ - annotations - - index.jsp - + 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"> + annotations + + index.jsp + - - struts2 - org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter - - struts.devMode - true - - + + struts2 + org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter + + struts.devMode + true + + - - struts2 - /* - + + struts2 + /* + http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/blank/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/blank/src/main/webapp/WEB-INF/web.xml b/blank/src/main/webapp/WEB-INF/web.xml index f15252b..301bcb2 100644 --- a/blank/src/main/webapp/WEB-INF/web.xml +++ b/blank/src/main/webapp/WEB-INF/web.xml @@ -16,7 +16,7 @@ - index.html + index.jsp http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/exclude_parameters/src/main/java/org/apache/struts/edit/action/EditAction.java ---------------------------------------------------------------------- diff --git a/exclude_parameters/src/main/java/org/apache/struts/edit/action/EditAction.java b/exclude_parameters/src/main/java/org/apache/struts/edit/action/EditAction.java index a576a9d..0383bbc 100644 --- a/exclude_parameters/src/main/java/org/apache/struts/edit/action/EditAction.java +++ b/exclude_parameters/src/main/java/org/apache/struts/edit/action/EditAction.java @@ -1,10 +1,9 @@ package org.apache.struts.edit.action; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.apache.log4j.Logger; +import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Preparable; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.struts.edit.model.Person; import org.apache.struts.edit.model.State; import org.apache.struts.edit.service.CarModelsService; @@ -12,8 +11,9 @@ import org.apache.struts.edit.service.CarModelsServiceHardCoded; import org.apache.struts.edit.service.EditService; import org.apache.struts.edit.service.EditServiceInMemory; -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.Preparable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; /** * Acts as a controller to handle actions @@ -22,98 +22,64 @@ import com.opensymphony.xwork2.Preparable; * */ public class EditAction extends ActionSupport implements Preparable { - - private static Logger log = Logger.getLogger( EditAction.class.getName() ); - + + private static Logger log = LogManager.getLogger(EditAction.class); private static final long serialVersionUID = 1L; private EditService editService = new EditServiceInMemory(); - private CarModelsService carModelsService = new CarModelsServiceHardCoded() ; private Person personBean; - private String [] sports = {"football", "baseball", "basketball" }; - private String [] genders = {"male", "female", "not sure" }; - private List states ; - private String [] carModelsAvailable ; - - @Override public void prepare() throws Exception { - log.info("In prepare method..."); - carModelsAvailable = carModelsService.getCarModels() ; - setPersonBean( editService.getPerson() ); - } public void prepareExecute() { - log.info("In prepareExecute method..."); - - } public String execute() throws Exception { - log.info ("In execute method..."); - editService.savePerson( getPersonBean() ); - return SUCCESS; - } public void prepareInput() { - log.info("In prepareInput method..."); - } public String input() throws Exception { - log.info("In input method..."); - - return INPUT; } public Person getPersonBean() { - - return personBean; - } public void setPersonBean(Person person) { - personBean = person; - } - public List getSports() { return Arrays.asList(sports); } public List getGenders() { - return Arrays.asList(genders); - } - - public List getStates() { - - states = new ArrayList(); + + states = new ArrayList<>(); states.add( new State("AZ", "Arizona") ); states.add( new State("CA", "California") ); states.add( new State("FL", "Florida") ); @@ -123,11 +89,7 @@ public class EditAction extends ActionSupport implements Preparable { return states; } - - public String [] getCarModelsAvailable() { return carModelsAvailable; } - - } http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/exclude_parameters/src/main/resources/log4j.dtd ---------------------------------------------------------------------- diff --git a/exclude_parameters/src/main/resources/log4j.dtd b/exclude_parameters/src/main/resources/log4j.dtd deleted file mode 100644 index 1aabd96..0000000 --- a/exclude_parameters/src/main/resources/log4j.dtd +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/exclude_parameters/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/exclude_parameters/src/main/resources/log4j.xml b/exclude_parameters/src/main/resources/log4j.xml deleted file mode 100644 index 2100cb2..0000000 --- a/exclude_parameters/src/main/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/exclude_parameters/src/main/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/exclude_parameters/src/main/resources/log4j2.xml b/exclude_parameters/src/main/resources/log4j2.xml new file mode 100644 index 0000000..d7c09f9 --- /dev/null +++ b/exclude_parameters/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 2e355a9..86ee2cb 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,6 @@ UTF-8 2.3.25-SNAPSHOT - 1.2.17 2.3 @@ -78,9 +77,9 @@ - log4j - log4j - ${log4j.version} + org.apache.logging.log4j + log4j-core + ${log4j2.version} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/preparable_interface/src/main/java/org/apache/struts/edit/action/EditAction.java ---------------------------------------------------------------------- diff --git a/preparable_interface/src/main/java/org/apache/struts/edit/action/EditAction.java b/preparable_interface/src/main/java/org/apache/struts/edit/action/EditAction.java index a576a9d..1d9f288 100644 --- a/preparable_interface/src/main/java/org/apache/struts/edit/action/EditAction.java +++ b/preparable_interface/src/main/java/org/apache/struts/edit/action/EditAction.java @@ -1,10 +1,9 @@ package org.apache.struts.edit.action; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.apache.log4j.Logger; +import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.Preparable; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.struts.edit.model.Person; import org.apache.struts.edit.model.State; import org.apache.struts.edit.service.CarModelsService; @@ -12,122 +11,86 @@ import org.apache.struts.edit.service.CarModelsServiceHardCoded; import org.apache.struts.edit.service.EditService; import org.apache.struts.edit.service.EditServiceInMemory; -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.Preparable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; /** * Acts as a controller to handle actions * related to editing a Person. - * @author bruce phillips * + * @author bruce phillips */ public class EditAction extends ActionSupport implements Preparable { - - private static Logger log = Logger.getLogger( EditAction.class.getName() ); - - private static final long serialVersionUID = 1L; - - private EditService editService = new EditServiceInMemory(); - - private CarModelsService carModelsService = new CarModelsServiceHardCoded() ; - - private Person personBean; - - private String [] sports = {"football", "baseball", "basketball" }; - - private String [] genders = {"male", "female", "not sure" }; - - private List states ; - - private String [] carModelsAvailable ; - - - - @Override - public void prepare() throws Exception { - - log.info("In prepare method..."); - - carModelsAvailable = carModelsService.getCarModels() ; - - setPersonBean( editService.getPerson() ); - - } - - public void prepareExecute() { - - log.info("In prepareExecute method..."); - - - } - - public String execute() throws Exception { - - log.info ("In execute method..."); - - editService.savePerson( getPersonBean() ); - - return SUCCESS; - - } - - public void prepareInput() { - - log.info("In prepareInput method..."); - - } - - public String input() throws Exception { - - log.info("In input method..."); - - - return INPUT; - } - - public Person getPersonBean() { - - - return personBean; - - } - - public void setPersonBean(Person person) { - - personBean = person; - - } - - - public List getSports() { - return Arrays.asList(sports); - } - - public List getGenders() { - - return Arrays.asList(genders); - - } - - - - public List getStates() { - - states = new ArrayList(); - states.add( new State("AZ", "Arizona") ); - states.add( new State("CA", "California") ); - states.add( new State("FL", "Florida") ); - states.add( new State("KS", "Kansas") ); - states.add( new State("NY", "New York") ); - - return states; - } - - - - public String [] getCarModelsAvailable() { - return carModelsAvailable; - } + private static Logger log = LogManager.getLogger(EditAction.class); + private static final long serialVersionUID = 1L; + + private EditService editService = new EditServiceInMemory(); + private CarModelsService carModelsService = new CarModelsServiceHardCoded(); + + private Person personBean; + private String[] sports = {"football", "baseball", "basketball"}; + private String[] genders = {"male", "female", "not sure"}; + private List states; + private String[] carModelsAvailable; + + + @Override + public void prepare() throws Exception { + log.debug("In prepare method..."); + carModelsAvailable = carModelsService.getCarModels(); + setPersonBean(editService.getPerson()); + } + + public void prepareExecute() { + log.debug("In prepareExecute method..."); + } + + public String execute() throws Exception { + log.debug("In execute method..."); + editService.savePerson(getPersonBean()); + return SUCCESS; + } + + public void prepareInput() { + log.debug("In prepareInput method..."); + } + + public String input() throws Exception { + log.debug("In input method..."); + return INPUT; + } + + public Person getPersonBean() { + return personBean; + } + + public void setPersonBean(Person person) { + personBean = person; + } + + public List getSports() { + return Arrays.asList(sports); + } + + public List getGenders() { + return Arrays.asList(genders); + } + + public List getStates() { + + states = new ArrayList<>(); + states.add(new State("AZ", "Arizona")); + states.add(new State("CA", "California")); + states.add(new State("FL", "Florida")); + states.add(new State("KS", "Kansas")); + states.add(new State("NY", "New York")); + + return states; + } + public String[] getCarModelsAvailable() { + return carModelsAvailable; + } } http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/preparable_interface/src/main/resources/log4j.dtd ---------------------------------------------------------------------- diff --git a/preparable_interface/src/main/resources/log4j.dtd b/preparable_interface/src/main/resources/log4j.dtd deleted file mode 100644 index 1aabd96..0000000 --- a/preparable_interface/src/main/resources/log4j.dtd +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/preparable_interface/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/preparable_interface/src/main/resources/log4j.xml b/preparable_interface/src/main/resources/log4j.xml deleted file mode 100644 index 2100cb2..0000000 --- a/preparable_interface/src/main/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/preparable_interface/src/main/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/preparable_interface/src/main/resources/log4j2.xml b/preparable_interface/src/main/resources/log4j2.xml new file mode 100644 index 0000000..d7c09f9 --- /dev/null +++ b/preparable_interface/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/restful2actionmapper/src/main/java/org/apache/struts/example/MovieAction.java ---------------------------------------------------------------------- diff --git a/restful2actionmapper/src/main/java/org/apache/struts/example/MovieAction.java b/restful2actionmapper/src/main/java/org/apache/struts/example/MovieAction.java index 82773ae..76b1cfb 100644 --- a/restful2actionmapper/src/main/java/org/apache/struts/example/MovieAction.java +++ b/restful2actionmapper/src/main/java/org/apache/struts/example/MovieAction.java @@ -1,13 +1,12 @@ package org.apache.struts.example; -import org.apache.log4j.Logger; - import com.opensymphony.xwork2.ActionSupport; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class MovieAction extends ActionSupport { - - private static final Logger LOGGER = Logger.getLogger(MovieAction.class.getName() ); + private static final Logger log = LogManager.getLogger(MovieAction.class.getName()); private static final long serialVersionUID = 1L; private String id; @@ -19,11 +18,8 @@ public class MovieAction extends ActionSupport { * @return success */ public String view() { - - LOGGER.debug("Value of id is " + id); - + log.debug("Value of id is " + id); return SUCCESS; - } /** @@ -32,12 +28,8 @@ public class MovieAction extends ActionSupport { * @return */ public String index() { - - - LOGGER.debug("Value of id is " + id); - + log.debug("Value of id is " + id); return SUCCESS; - } public String getId() { @@ -47,5 +39,4 @@ public class MovieAction extends ActionSupport { public void setId(String id) { this.id = id; } - } http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/restful2actionmapper/src/main/resources/log4j.dtd ---------------------------------------------------------------------- diff --git a/restful2actionmapper/src/main/resources/log4j.dtd b/restful2actionmapper/src/main/resources/log4j.dtd deleted file mode 100755 index 1aabd96..0000000 --- a/restful2actionmapper/src/main/resources/log4j.dtd +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/restful2actionmapper/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/restful2actionmapper/src/main/resources/log4j.xml b/restful2actionmapper/src/main/resources/log4j.xml deleted file mode 100755 index aac92af..0000000 --- a/restful2actionmapper/src/main/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/restful2actionmapper/src/main/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/restful2actionmapper/src/main/resources/log4j2.xml b/restful2actionmapper/src/main/resources/log4j2.xml new file mode 100644 index 0000000..b92f2ea --- /dev/null +++ b/restful2actionmapper/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/wildcard_method_selection/pom.xml ---------------------------------------------------------------------- diff --git a/wildcard_method_selection/pom.xml b/wildcard_method_selection/pom.xml index d8c0881..a76d999 100644 --- a/wildcard_method_selection/pom.xml +++ b/wildcard_method_selection/pom.xml @@ -1,22 +1,40 @@ - - 4.0.0 - - struts.apache.org - struts2examples - 1.0.0 - + + 4.0.0 + + struts.apache.org + struts2examples + 1.0.0 + - wildcard_method_selection + wildcard_method_selection + + Wildcard Method Selection + + Wildcard method selection example application for the + Struts 2 getting started tutorials + + war + + + wildcard_method_selection + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.16.v20140903 + + CTRL+C + 8999 + 10 + + src/main/webapp/WEB-INF/web.xml + + + + + - wildcard method selection - - Wildcard method selection example application for the - Struts 2 getting started tutorials - war - - wildcard_method_selection - - http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/wildcard_method_selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/action/PersonAction.java ---------------------------------------------------------------------- diff --git a/wildcard_method_selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/action/PersonAction.java b/wildcard_method_selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/action/PersonAction.java index 55cdfda..ac3bf53 100644 --- a/wildcard_method_selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/action/PersonAction.java +++ b/wildcard_method_selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/action/PersonAction.java @@ -1,129 +1,93 @@ package org.apache.struts.tutorials.wildcardmethod.action; -import java.util.List; - -import org.apache.log4j.Logger; +import com.opensymphony.xwork2.ActionSupport; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.struts.tutorials.wildcardmethod.model.Person; import org.apache.struts.tutorials.wildcardmethod.service.PersonService; +import java.util.List; +public class PersonAction extends ActionSupport { + //Create a Logger object + private static final Logger log = LogManager.getLogger(PersonAction.class); + private static final long serialVersionUID = 1L; -import com.opensymphony.xwork2.ActionSupport; + Person person; + int id; + List personList = PersonService.getPersons(); + PersonService personService = new PersonService(); + public String execute() throws Exception { + log.debug("In execute method"); + return SUCCESS; + } + public String create() { + log.debug("In create method"); + person = new Person(); + + return INPUT; + } + + public String edit() { + log.debug("In edit method"); + person = personService.getPerson(id); + + return INPUT; + } + + public String saveOrUpdate() { + log.debug("In saveOrUpdate method"); + if (person.getId() > -1) { + personService.update(person); + } else { + personService.save(person); + } + + personList = PersonService.getPersons(); + return SUCCESS; + } + + + public String delete() { + log.debug("In delete method"); + personService.deletePerson(id); + + personList = PersonService.getPersons(); + + return SUCCESS; + } + + + public Person getPerson() { + return person; + } + + + public void setPerson(Person person) { + this.person = person; + } + + + public List getPersonList() { + return personList; + } + + + public void setPersonList(List personList) { + this.personList = personList; + } + + + public int getId() { + return id; + } -public class PersonAction extends ActionSupport { - - //Create a Logger object - private static final Logger logger = Logger.getLogger( PersonAction.class.getName() ); - - - private static final long serialVersionUID = 1L; - - Person person ; - - int id ; - - List personList = PersonService.getPersons(); - - PersonService personService = new PersonService(); - - public String execute() throws Exception { - - logger.debug("In execute method"); - return SUCCESS; - } - - - public String create() { - - logger.debug("In create method"); - person = new Person(); - - return INPUT; - - - } - - - public String edit() { - - logger.debug("In edit method"); - person = personService.getPerson(id); - - return INPUT; - - - } - - - public String saveOrUpdate() { - - - logger.debug("In saveOrUpdate method"); - if ( person.getId() > -1 ) { - - personService.update(person) ; - - - } else { - - personService.save(person); - } - - - personList = PersonService.getPersons() ; - - return SUCCESS; - - - } - - - public String delete() { - - logger.debug("In delete method"); - personService.deletePerson(id); - - personList = PersonService.getPersons() ; - - return SUCCESS; - } - - - public Person getPerson() { - return person; - } - - - public void setPerson(Person person) { - this.person = person; - } - - - public List getPersonList() { - return personList; - } - - - public void setPersonList(List personList) { - this.personList = personList; - } - - - public int getId() { - return id; - } - - - public void setId(int id) { - this.id = id; - } - - - - + public void setId(int id) { + this.id = id; + } } http://git-wip-us.apache.org/repos/asf/struts-examples/blob/a66c0865/wildcard_method_selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/service/PersonService.java ---------------------------------------------------------------------- diff --git a/wildcard_method_selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/service/PersonService.java b/wildcard_method_selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/service/PersonService.java index 4e85eb7..0aa657c 100644 --- a/wildcard_method_selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/service/PersonService.java +++ b/wildcard_method_selection/src/main/java/org/apache/struts/tutorials/wildcardmethod/service/PersonService.java @@ -1,133 +1,88 @@ package org.apache.struts.tutorials.wildcardmethod.service; -import java.util.ArrayList; -import java.util.List; -import java.util.NoSuchElementException; -import java.util.SortedMap; -import java.util.TreeMap; - -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.struts.tutorials.wildcardmethod.model.Person; +import java.util.*; + public class PersonService { //Create a Logger object - private static final Logger logger = Logger.getLogger( PersonService.class.getName() ); + private static final Logger log = LogManager.getLogger(PersonService.class); - - private static SortedMap people = new TreeMap(); + private static SortedMap people = new TreeMap<>(); static { - people.put(0, new Person(0, "Steve", "Smith") ); people.put(1, new Person(1, "Sue", "Jones") ); - - } - - - private static List personList = new ArrayList(); + + + private static List personList = new ArrayList<>(); static{ - for (Integer id : people.keySet() ) { - personList.add( people.get(id)); - } - } public static List getPersons() { - return personList; - } public void save(Person person) { - int newId = getNewId(); - person.setId( newId ); - people.put( newId, person); - rebuildPersonList(); - } private int getNewId() { - int newId = 0; try { - newId = people.lastKey() + 1; - } catch (NoSuchElementException ex) { - - logger.info("Id value set to 0"); - - } + log.info("Id value set to 0"); + } return newId; - - } public void update(Person person) { - - - Person tempPerson = people.get( person.getId() ); tempPerson.setFirstName( person.getFirstName() ); tempPerson.setLastName(person.getLastName() ); rebuildPersonList(); - - } public void deletePerson(int ID) { - - people.remove(ID); rebuildPersonList(); - } public Person getPerson(int id) { - return people.get(id); - } public static void rebuildPersonList() { - - - personList = new ArrayList(); - - for (Integer id : people.keySet() ) { - + personList = new ArrayList<>(); + + for (Integer id : people.keySet() ) { personList.add( people.get(id)); - } - - - - } - - }