Merge remote-tracking branch 'origin/hotfix-userbug-liusw' into hotfix-userbug-liusw

src/main/resources/log4j.properties

@@ -9,7 +9,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d %p [%c]:%m%n
 log4j.appender.logfile=org.apache.log4j.RollingFileAppender
 log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
 log4j.appender.logfile.File=../log4j.log
-#log4j.appender.logfile.File=$CATALINA_BASE/logs/b2c_log4j.log
+#log4j.appender.logfile.File=${catalina.base}/logs/catalina.out
 # Keep three backup files.
 log4j.appender.logfile.MaxBackupIndex=3
 log4j.appender.logfile.MaxFileSize=5120KB