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/04/20 05:20:53 UTC
[1/3] struts-examples git commit: Uses proper DTDs for Struts 2.5 and
Tiles 3.0
Repository: struts-examples
Updated Branches:
refs/heads/master 18affab89 -> 178ed4c1f
Uses proper DTDs for Struts 2.5 and Tiles 3.0
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/28f5a589
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/28f5a589
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/28f5a589
Branch: refs/heads/master
Commit: 28f5a58919174cd3f7b2fe1a8d4216ab13e1386a
Parents: 18affab
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Thu Apr 20 07:03:18 2017 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Thu Apr 20 07:19:01 2017 +0200
----------------------------------------------------------------------
tiles/src/main/resources/example.xml | 4 ++--
tiles/src/main/resources/struts.xml | 4 ++--
tiles/src/main/webapp/WEB-INF/tiles.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/28f5a589/tiles/src/main/resources/example.xml
----------------------------------------------------------------------
diff --git a/tiles/src/main/resources/example.xml b/tiles/src/main/resources/example.xml
index 4aaaf03..33f2a5b 100644
--- a/tiles/src/main/resources/example.xml
+++ b/tiles/src/main/resources/example.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<!--
- This file is included by the struts.xml file as an example
- of how to break up the configuration file into multiple files.
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/28f5a589/tiles/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/tiles/src/main/resources/struts.xml b/tiles/src/main/resources/struts.xml
index cd7f487..c0c0b52 100644
--- a/tiles/src/main/resources/struts.xml
+++ b/tiles/src/main/resources/struts.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
- "http://struts.apache.org/dtds/struts-2.3.dtd">
+ "-//Apache Software Foundation//DTD Struts Configuration 2.5//EN"
+ "http://struts.apache.org/dtds/struts-2.5.dtd">
<struts>
<constant name="struts.enable.DynamicMethodInvocation" value="false"/>
<constant name="struts.devMode" value="false"/>
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/28f5a589/tiles/src/main/webapp/WEB-INF/tiles.xml
----------------------------------------------------------------------
diff --git a/tiles/src/main/webapp/WEB-INF/tiles.xml b/tiles/src/main/webapp/WEB-INF/tiles.xml
index 32c4c21..bc9f084 100644
--- a/tiles/src/main/webapp/WEB-INF/tiles.xml
+++ b/tiles/src/main/webapp/WEB-INF/tiles.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE tiles-definitions PUBLIC
- "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
- "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
+ "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
+ "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
<tiles-definitions>
[2/3] struts-examples git commit: Setups logging just for tiles
package
Posted by lu...@apache.org.
Setups logging just for tiles package
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/6d2b1697
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/6d2b1697
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/6d2b1697
Branch: refs/heads/master
Commit: 6d2b1697b043964c47c1f943fdeafb4f3b2a8615
Parents: 28f5a58
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Thu Apr 20 07:03:53 2017 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Thu Apr 20 07:19:46 2017 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
tiles/pom.xml | 6 ++++++
tiles/src/main/resources/log4j2.xml | 5 ++---
3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/6d2b1697/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 16778d5..1e40f3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<struts2.version>2.5.11-SNAPSHOT</struts2.version>
- <log4j2.version>2.8.2</log4j2.version>
+ <log4j2.version>2.8</log4j2.version>
</properties>
<modules>
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/6d2b1697/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/tiles/pom.xml b/tiles/pom.xml
index 440b8f2..a89690b 100644
--- a/tiles/pom.xml
+++ b/tiles/pom.xml
@@ -33,6 +33,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/6d2b1697/tiles/src/main/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/tiles/src/main/resources/log4j2.xml b/tiles/src/main/resources/log4j2.xml
index 9a695b4..d5f3566 100644
--- a/tiles/src/main/resources/log4j2.xml
+++ b/tiles/src/main/resources/log4j2.xml
@@ -6,9 +6,8 @@
</Console>
</Appenders>
<Loggers>
- <Logger name="com.opensymphony.xwork2" level="trace"/>
- <Logger name="org.apache.struts2" level="trace"/>
- <Root level="warn">
+ <Logger name="org.apache.struts2.tiles" level="trace"/>
+ <Root level="info">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
[3/3] struts-examples git commit: Uses descriptive names
Posted by lu...@apache.org.
Uses descriptive names
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/178ed4c1
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/178ed4c1
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/178ed4c1
Branch: refs/heads/master
Commit: 178ed4c1f8b3f1848dc664dc2ef3229323d9f16e
Parents: 6d2b169
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Thu Apr 20 07:05:50 2017 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Thu Apr 20 07:19:46 2017 +0200
----------------------------------------------------------------------
http-session/pom.xml | 5 +----
json/pom.xml | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/178ed4c1/http-session/pom.xml
----------------------------------------------------------------------
diff --git a/http-session/pom.xml b/http-session/pom.xml
index 6da6233..a72452c 100644
--- a/http-session/pom.xml
+++ b/http-session/pom.xml
@@ -10,11 +10,8 @@
</parent>
<artifactId>http-session</artifactId>
-
- <name>http-session</name>
-
+ <name>Http Session</name>
<description>Struts 2 example application for the HTTP Session getting started tutorial</description>
-
<packaging>war</packaging>
<build>
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/178ed4c1/json/pom.xml
----------------------------------------------------------------------
diff --git a/json/pom.xml b/json/pom.xml
index 872939e..681a804 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -12,7 +12,7 @@
<artifactId>json</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>war</packaging>
- <name>json</name>
+ <name>JSON produce/consume</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>