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 2016/06/17 08:38:51 UTC
[1/2] struts-examples git commit: Uses the latest Struts version
Repository: struts-examples
Updated Branches:
refs/heads/master 880889720 -> f59d7baa2
Uses the latest Struts version
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/e6c39f79
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/e6c39f79
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/e6c39f79
Branch: refs/heads/master
Commit: e6c39f7937a2ec130a9a5e7898c8cb91456e2d07
Parents: 8808897
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Fri Jun 17 10:38:30 2016 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Fri Jun 17 10:38:30 2016 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
tiles/pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/e6c39f79/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1f2e00a..5719847 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <struts2.version>2.5</struts2.version>
- <log4j2.version>2.5</log4j2.version>
+ <struts2.version>2.5.1</struts2.version>
+ <log4j2.version>2.6</log4j2.version>
</properties>
<modules>
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/e6c39f79/tiles/pom.xml
----------------------------------------------------------------------
diff --git a/tiles/pom.xml b/tiles/pom.xml
index 0329054..ce8a87c 100644
--- a/tiles/pom.xml
+++ b/tiles/pom.xml
@@ -16,7 +16,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.4</version>
+ <version>${log4j2.version}</version>
</dependency>
<dependency>
[2/2] struts-examples git commit: Defines default action
Posted by lu...@apache.org.
Defines default action
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/f59d7baa
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/f59d7baa
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/f59d7baa
Branch: refs/heads/master
Commit: f59d7baa25fc33fad679f132f83822b0c3d5f5bd
Parents: e6c39f7
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Fri Jun 17 10:38:35 2016 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Fri Jun 17 10:38:35 2016 +0200
----------------------------------------------------------------------
tiles/src/main/resources/struts.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/f59d7baa/tiles/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/tiles/src/main/resources/struts.xml b/tiles/src/main/resources/struts.xml
index f3e463c..cd7f487 100644
--- a/tiles/src/main/resources/struts.xml
+++ b/tiles/src/main/resources/struts.xml
@@ -9,4 +9,15 @@
<include file="example.xml"/>
<!-- Add addition packages and configuration here. -->
+
+ <package name="default" extends="struts-default">
+ <default-action-ref name="index"/>
+ <action name="index">
+ <result type="redirectAction">
+ <param name="namespace">example</param>
+ <param name="actionName">HelloWorld</param>
+ </result>
+ </action>
+
+ </package>
</struts>