[2/4] struts-examples git commit: Cleans up pom
Cleans up pom
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/8deb681b
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/8deb681b
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/8deb681b
Branch: refs/heads/master
Commit: 8deb681bd89286553926d7976f23cffd5d9264d8
Parents: dc3eed1
Author: Lukasz Lenart
Authored: Wed Jan 13 17:24:06 2016 +0100
Committer: Lukasz Lenart
Committed: Wed Jan 13 17:24:06 2016 +0100
--
tiles/pom.xml | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/8deb681b/tiles/pom.xml
--
diff --git a/tiles/pom.xml b/tiles/pom.xml
index 9b62529..0329054 100644
--- a/tiles/pom.xml
+++ b/tiles/pom.xml
@@ -14,13 +14,6 @@
-javax.el
-el-api
-1.0
-provided
-
-
-
org.apache.logging.log4j
log4j-slf4j-impl
2.4
@@ -34,6 +27,12 @@
org.apache.struts
+struts2-tiles-plugin
+${struts2.version}
+
+
+
+org.apache.struts
struts2-config-browser-plugin
${struts2.version}
@@ -66,6 +65,13 @@
provided
+
+javax.el
+el-api
+1.0
+provided
+
+
@@ -77,12 +83,6 @@
CTRL+C
8999
-
-
-xwork.loggerFactory
-
com.opensymphony.xwork2.util.logging.log4j2.Log4j2LoggerFactory
-
-
10
${basedir}/src/main/webapp/
[4/4] struts-examples git commit: Switches to snapshot version
Switches to snapshot 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/cc5b6790 Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/cc5b6790 Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/cc5b6790 Branch: refs/heads/master Commit: cc5b6790d457c1c0a50b78bb55ecb26dee0712c7 Parents: 4c34965 Author: Lukasz Lenart Authored: Wed Jan 13 17:24:45 2016 +0100 Committer: Lukasz Lenart Committed: Wed Jan 13 17:24:45 2016 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cc5b6790/pom.xml -- diff --git a/pom.xml b/pom.xml index 8196932..e04ccda 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ UTF-8 -2.5-BETA2 +2.5-SNAPSHOT 2.3
[1/4] struts-examples git commit: Switches to Log4j2
Repository: struts-examples
Updated Branches:
refs/heads/master 9a5ae2a43 -> cc5b6790d
Switches to Log4j2
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/dc3eed1d
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/dc3eed1d
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/dc3eed1d
Branch: refs/heads/master
Commit: dc3eed1d409820d761670f43f607edc5ddc6befe
Parents: 9a5ae2a
Author: Lukasz Lenart
Authored: Wed Jan 13 17:23:50 2016 +0100
Committer: Lukasz Lenart
Committed: Wed Jan 13 17:23:50 2016 +0100
--
tiles/src/main/resources/log4j.properties | 55 --
tiles/src/main/resources/log4j2.xml | 15 +++
2 files changed, 15 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/dc3eed1d/tiles/src/main/resources/log4j.properties
--
diff --git a/tiles/src/main/resources/log4j.properties
b/tiles/src/main/resources/log4j.properties
deleted file mode 100644
index 7046b49..000
--- a/tiles/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-#--
-#
-# The following properties set the logging levels and log appender. The
-# log4j.rootCategory variable defines the default log level and one or more
-# appenders. For the console, use 'S'. For the daily rolling file, use 'R'.
-# For an HTML formatted log, use 'H'.
-#
-# To override the default (rootCategory) log level, define a property of the
-# form (see below for available values):
-#
-#log4j.logger. =
-#
-#Available logger names:
-# TODO
-#
-#Possible Log Levels:
-# FATAL, ERROR, WARN, INFO, DEBUG
-#
-#--
-log4j.rootCategory=INFO, CONSOLE
-
-#--
-#
-# The following properties configure the console (stdout) appender.
-# See http://logging.apache.org/log4j/docs/api/index.html for details.
-#
-#--
-log4j.appender.CONSOLE = org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout = org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern = %d{-MM-dd HH:mm:ss} %t
%c{1} [%p] %m%n
-
-#--
-#
-# The following properties configure the Daily Rolling File appender.
-# See http://logging.apache.org/log4j/docs/api/index.html for details.
-#
-#--
-#log4j.appender.S = org.apache.log4j.DailyRollingFileAppender
-#log4j.appender.S.File = demo.log
-#log4j.appender.S.Append = true
-#log4j.appender.S.DatePattern = '.'yyy-MM-dd
-#log4j.appender.S.layout = org.apache.log4j.PatternLayout
-#log4j.appender.S.layout.ConversionPattern = %d{-MM-dd HH:mm:ss} %t %c{1}
[%p] %m%n
-
-#--
-#
-# The following properties configure the Rolling File appender in HTML.
-# See http://logging.apache.org/log4j/docs/api/index.html for details.
-#
-#--
-#log4j.appender.H = org.apache.log4j.RollingFileAppender
-#log4j.appender.H.File = logs/apps.html
-#log4j.appender.H.MaxFileSize = 100KB
-#log4j.appender.H.Append = false
-#log4j.appender.H.layout = org.apache.log4j.HTMLLayout
http://git-wip-us.apache.org/repos/asf/struts-examples/blob/dc3eed1d/tiles/src/main/resources/log4j2.xml
--
diff --git a/tiles/src/main/resources/log4j2.xml
b/tiles/src/main/resources/log4j2.xml
new file mode 100644
index 000..9a695b4
--- /dev/null
+++ b/tiles/src/main/resources/log4j2.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
[3/4] struts-examples git commit: Uses proper filter
Uses proper filter Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/4c349653 Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/4c349653 Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/4c349653 Branch: refs/heads/master Commit: 4c349653d112a1e6185a47fd9d72d3f06a5a337d Parents: 8deb681 Author: Lukasz Lenart Authored: Wed Jan 13 17:24:17 2016 +0100 Committer: Lukasz Lenart Committed: Wed Jan 13 17:24:17 2016 +0100 -- tiles/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/4c349653/tiles/src/main/webapp/WEB-INF/web.xml -- diff --git a/tiles/src/main/webapp/WEB-INF/web.xml b/tiles/src/main/webapp/WEB-INF/web.xml index c7e60f7..485a9cb 100644 --- a/tiles/src/main/webapp/WEB-INF/web.xml +++ b/tiles/src/main/webapp/WEB-INF/web.xml @@ -13,7 +13,7 @@ struts2 - org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter +org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter
