You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2015/07/17 08:34:08 UTC
directory-kerby git commit: DIRKRB-380 Binding Log4j with SLF4j to
write the logs to file.
Repository: directory-kerby
Updated Branches:
refs/heads/master ff3d7be09 -> a6afb9ae9
DIRKRB-380 Binding Log4j with SLF4j to write the logs to file.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/a6afb9ae
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/a6afb9ae
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/a6afb9ae
Branch: refs/heads/master
Commit: a6afb9ae936792e97654382ada4e7fc6eee0a196
Parents: ff3d7be
Author: plusplusjiajia <ji...@intel.com>
Authored: Fri Jul 17 14:39:40 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Fri Jul 17 14:39:40 2015 +0800
----------------------------------------------------------------------
kerby-dist/kdc-dist/bin/kadmin.cmd | 3 ++-
kerby-dist/kdc-dist/bin/kadmin.sh | 1 +
kerby-dist/kdc-dist/bin/start-kdc.cmd | 1 +
kerby-dist/kdc-dist/bin/start-kdc.sh | 1 +
kerby-dist/kdc-dist/log4j.properties | 11 +++++++++++
kerby-dist/kdc-dist/pom.xml | 5 +++++
kerby-dist/tool-dist/bin/kinit.cmd | 1 +
kerby-dist/tool-dist/bin/kinit.sh | 1 +
kerby-dist/tool-dist/bin/klist.cmd | 3 ++-
kerby-dist/tool-dist/bin/klist.sh | 1 +
kerby-dist/tool-dist/log4j.properties | 11 +++++++++++
kerby-dist/tool-dist/pom.xml | 5 +++++
12 files changed, 42 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a6afb9ae/kerby-dist/kdc-dist/bin/kadmin.cmd
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/bin/kadmin.cmd b/kerby-dist/kdc-dist/bin/kadmin.cmd
index ca2f15c..9cd6050 100644
--- a/kerby-dist/kdc-dist/bin/kadmin.cmd
+++ b/kerby-dist/kdc-dist/bin/kadmin.cmd
@@ -1,3 +1,4 @@
java -Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=n -classpath ^
lib\* ^
-org.apache.kerby.kerberos.tool.kadmin.KadminTool %*
\ No newline at end of file
+-DKERBY_LOGFILE=kerby-kdc ^
+org.apache.kerby.kerberos.tool.kadmin.KadminTool %*
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a6afb9ae/kerby-dist/kdc-dist/bin/kadmin.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/bin/kadmin.sh b/kerby-dist/kdc-dist/bin/kadmin.sh
index 0327864..2643998 100644
--- a/kerby-dist/kdc-dist/bin/kadmin.sh
+++ b/kerby-dist/kdc-dist/bin/kadmin.sh
@@ -2,4 +2,5 @@
java -Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=n -classpath \
lib/*:. \
+-DKERBY_LOGFILE=kadmin \
org.apache.kerby.kerberos.tool.kadmin.KadminTool $@
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a6afb9ae/kerby-dist/kdc-dist/bin/start-kdc.cmd
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/bin/start-kdc.cmd b/kerby-dist/kdc-dist/bin/start-kdc.cmd
index 1da61e4..cb2c970 100644
--- a/kerby-dist/kdc-dist/bin/start-kdc.cmd
+++ b/kerby-dist/kdc-dist/bin/start-kdc.cmd
@@ -1,3 +1,4 @@
java -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -classpath ^
lib\* ^
+-DKERBY_LOGFILE=kdc ^
org.apache.kerby.kerberos.kdc.KerbyKdcServer -start %*
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a6afb9ae/kerby-dist/kdc-dist/bin/start-kdc.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/bin/start-kdc.sh b/kerby-dist/kdc-dist/bin/start-kdc.sh
index d3d7891..c8fc988 100644
--- a/kerby-dist/kdc-dist/bin/start-kdc.sh
+++ b/kerby-dist/kdc-dist/bin/start-kdc.sh
@@ -2,4 +2,5 @@
java -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -classpath \
lib/*:. \
+-DKERBY_LOGFILE=kdc \
org.apache.kerby.kerberos.kdc.KerbyKdcServer -start $@
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a6afb9ae/kerby-dist/kdc-dist/log4j.properties
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/log4j.properties b/kerby-dist/kdc-dist/log4j.properties
new file mode 100644
index 0000000..9c6914d
--- /dev/null
+++ b/kerby-dist/kdc-dist/log4j.properties
@@ -0,0 +1,11 @@
+log4j.rootLogger=INFO,R
+
+log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
+log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
+log4j.appender.STDOUT.layout.ConversionPattern=Logger-->%5p{%F:%L}-%m%n
+
+log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.R.File=logs/${KERBY_LOGFILE}.log
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=Logger-->%5p{%F:%L}-%m%n
+
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a6afb9ae/kerby-dist/kdc-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/pom.xml b/kerby-dist/kdc-dist/pom.xml
index 9433b79..0f0e2a2 100644
--- a/kerby-dist/kdc-dist/pom.xml
+++ b/kerby-dist/kdc-dist/pom.xml
@@ -122,6 +122,11 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a6afb9ae/kerby-dist/tool-dist/bin/kinit.cmd
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/bin/kinit.cmd b/kerby-dist/tool-dist/bin/kinit.cmd
index c717fac..0eb99ef 100644
--- a/kerby-dist/tool-dist/bin/kinit.cmd
+++ b/kerby-dist/tool-dist/bin/kinit.cmd
@@ -1,3 +1,4 @@
java -Xdebug -Xrunjdwp:transport=dt_socket,address=8002,server=y,suspend=n ^
-classpath lib\* ^
+-DKERBY_LOGFILE=kinit ^
org.apache.kerby.kerberos.tool.kinit.KinitTool %*
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a6afb9ae/kerby-dist/tool-dist/bin/kinit.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/bin/kinit.sh b/kerby-dist/tool-dist/bin/kinit.sh
index b103f3e..6ed54aa 100644
--- a/kerby-dist/tool-dist/bin/kinit.sh
+++ b/kerby-dist/tool-dist/bin/kinit.sh
@@ -2,4 +2,5 @@
java -Xdebug -Xrunjdwp:transport=dt_socket,address=8002,server=y,suspend=n \
-classpath lib/*:. \
+-DKERBY_LOGFILE=kinit \
org.apache.kerby.kerberos.tool.kinit.KinitTool $@
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a6afb9ae/kerby-dist/tool-dist/bin/klist.cmd
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/bin/klist.cmd b/kerby-dist/tool-dist/bin/klist.cmd
index ffaaedb..49532aa 100644
--- a/kerby-dist/tool-dist/bin/klist.cmd
+++ b/kerby-dist/tool-dist/bin/klist.cmd
@@ -1,3 +1,4 @@
-java -Xdebug -Xrunjdwp:transport=dt_socket,address=8004,server=n,suspend=n ^
+java -Xdebug -Xrunjdwp:transport=dt_socket,address=8004,server=y,suspend=n ^
-classpath lib\* ^
+-DKERBY_LOGFILE=klist ^
org.apache.kerby.kerberos.tool.klist.KlistTool %*
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a6afb9ae/kerby-dist/tool-dist/bin/klist.sh
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/bin/klist.sh b/kerby-dist/tool-dist/bin/klist.sh
index bf1c6ad..f671ae7 100644
--- a/kerby-dist/tool-dist/bin/klist.sh
+++ b/kerby-dist/tool-dist/bin/klist.sh
@@ -2,4 +2,5 @@
java -Xdebug -Xrunjdwp:transport=dt_socket,address=8004,server=y,suspend=n \
-classpath lib/*:. \
+-DKERBY_LOGFILE=klist \
org.apache.kerby.kerberos.tool.klist.KlistTool $@
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a6afb9ae/kerby-dist/tool-dist/log4j.properties
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/log4j.properties b/kerby-dist/tool-dist/log4j.properties
new file mode 100644
index 0000000..9c6914d
--- /dev/null
+++ b/kerby-dist/tool-dist/log4j.properties
@@ -0,0 +1,11 @@
+log4j.rootLogger=INFO,R
+
+log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
+log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
+log4j.appender.STDOUT.layout.ConversionPattern=Logger-->%5p{%F:%L}-%m%n
+
+log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.R.File=logs/${KERBY_LOGFILE}.log
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=Logger-->%5p{%F:%L}-%m%n
+
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/a6afb9ae/kerby-dist/tool-dist/pom.xml
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/pom.xml b/kerby-dist/tool-dist/pom.xml
index 999a50c..feeca97 100644
--- a/kerby-dist/tool-dist/pom.xml
+++ b/kerby-dist/tool-dist/pom.xml
@@ -56,6 +56,11 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>