You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/07/07 05:41:36 UTC
[1/3] struts-examples git commit: Fixes post merge issues
Repository: struts-examples
Updated Branches:
refs/heads/master 6651b1820 -> 9f8e55972
Fixes post merge issues
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/634e4922
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/634e4922
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/634e4922
Branch: refs/heads/master
Commit: 634e49228ea3ff8018e03e73fa6e3a3f2595db5e
Parents: 6651b18
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Fri Jul 7 07:41:04 2017 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Fri Jul 7 07:41:04 2017 +0200
----------------------------------------------------------------------
crud/pom.xml | 37 ++++++++++++++++----
.../apache/struts/crud/action/PersonAction.java | 6 ++--
.../apache/struts/crud/dao/MemoryPersonDao.java | 7 ++--
3 files changed, 37 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/634e4922/crud/pom.xml
----------------------------------------------------------------------
diff --git a/crud/pom.xml b/crud/pom.xml
index 2bcf555..6e1d9ad 100755
--- a/crud/pom.xml
+++ b/crud/pom.xml
@@ -3,21 +3,44 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>struts.apache.org</groupId>
- <artifactId>struts2examples</artifactId>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-examples</artifactId>
<version>1.0.0</version>
</parent>
- <artifactId>struts_crud</artifactId>
+ <artifactId>crud</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>war</packaging>
+ <name>CRUD Example</name>
+ <description>
+ Example of using Struts 2 for a web app that allows users to
+ Create, Read, Update, and Delete data.
+ </description>
- <name>Struts CRUD Example</name>
- <description>Example of using Struts 2 for a web app that allows users to
- Create, Read, Update, and Delete data.</description>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
<build>
- <finalName>crud_struts</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>8.1.16.v20140903</version>
+ <configuration>
+ <stopKey>CTRL+C</stopKey>
+ <stopPort>8999</stopPort>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <webAppSourceDirectory>${basedir}/src/main/webapp/</webAppSourceDirectory>
+ <webAppConfig>
+ <descriptor>${basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
+ </webAppConfig>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
+
</project>
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/634e4922/crud/src/main/java/org/apache/struts/crud/action/PersonAction.java
----------------------------------------------------------------------
diff --git a/crud/src/main/java/org/apache/struts/crud/action/PersonAction.java b/crud/src/main/java/org/apache/struts/crud/action/PersonAction.java
index efa8569..6a85cea 100755
--- a/crud/src/main/java/org/apache/struts/crud/action/PersonAction.java
+++ b/crud/src/main/java/org/apache/struts/crud/action/PersonAction.java
@@ -1,9 +1,9 @@
package org.apache.struts.crud.action;
-import static com.opensymphony.xwork2.Action.SUCCESS;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.Preparable;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts.crud.model.Country;
import org.apache.struts.crud.model.Person;
import org.apache.struts.crud.service.DefaultPersonService;
@@ -17,7 +17,7 @@ import org.apache.struts.crud.service.PersonService;
*/
public class PersonAction extends ActionSupport implements Preparable {
- private static final Logger LOG = Logger.getLogger(PersonAction.class.getName());
+ private static final Logger LOG = LogManager.getLogger(PersonAction.class.getName());
private PersonService personService = new DefaultPersonService();
private Person person;
private Person[] persons;
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/634e4922/crud/src/main/java/org/apache/struts/crud/dao/MemoryPersonDao.java
----------------------------------------------------------------------
diff --git a/crud/src/main/java/org/apache/struts/crud/dao/MemoryPersonDao.java b/crud/src/main/java/org/apache/struts/crud/dao/MemoryPersonDao.java
index 9bf1603..6b58df3 100755
--- a/crud/src/main/java/org/apache/struts/crud/dao/MemoryPersonDao.java
+++ b/crud/src/main/java/org/apache/struts/crud/dao/MemoryPersonDao.java
@@ -2,8 +2,9 @@ package org.apache.struts.crud.dao;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
-import org.apache.struts.crud.action.PersonAction;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.struts.crud.model.Person;
/**
@@ -13,7 +14,7 @@ import org.apache.struts.crud.model.Person;
* @author antonio sanchez
*/
public class MemoryPersonDao implements PersonDao {
- private static final Logger LOG = Logger.getLogger(MemoryPersonDao.class.getName());
+ private static final Logger LOG = LogManager.getLogger(MemoryPersonDao.class.getName());
private final static List<Person> persons;
[3/3] struts-examples git commit: Uses proper filter definition
Posted by lu...@apache.org.
Uses proper filter definition
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/9f8e5597
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/9f8e5597
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/9f8e5597
Branch: refs/heads/master
Commit: 9f8e55972bcaf8e90d84f9167df4be17a77420ea
Parents: 3ed7606
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Fri Jul 7 07:41:28 2017 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Fri Jul 7 07:41:28 2017 +0200
----------------------------------------------------------------------
crud/src/main/webapp/WEB-INF/web.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/9f8e5597/crud/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/crud/src/main/webapp/WEB-INF/web.xml b/crud/src/main/webapp/WEB-INF/web.xml
index d0864b2..65cd4a2 100755
--- a/crud/src/main/webapp/WEB-INF/web.xml
+++ b/crud/src/main/webapp/WEB-INF/web.xml
@@ -10,7 +10,7 @@
<filter>
<filter-name>struts2</filter-name>
- <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+ <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
</filter>
<filter-mapping>
[2/3] struts-examples git commit: Drops unused definition
Posted by lu...@apache.org.
Drops unused definition
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/3ed76060
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/3ed76060
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/3ed76060
Branch: refs/heads/master
Commit: 3ed76060a64240e1404d109d3ea6f44412fa8c57
Parents: 634e492
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Fri Jul 7 07:41:18 2017 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Fri Jul 7 07:41:18 2017 +0200
----------------------------------------------------------------------
action-chaining/pom.xml | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/3ed76060/action-chaining/pom.xml
----------------------------------------------------------------------
diff --git a/action-chaining/pom.xml b/action-chaining/pom.xml
index b5d17df..58a7f8f 100644
--- a/action-chaining/pom.xml
+++ b/action-chaining/pom.xml
@@ -20,15 +20,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <encoding>UTF-8</encoding>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>8.1.16.v20140903</version>