とりあえずslf4jに対応。

diff --git a/build.xml b/build.xml
index 3b667f2..165fc0d 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <!-- vim:set et sw=2 sts=2 ts=2 fenc=utf-8: -->
-<project>
+<project default="compile">
   <property name="sdk.dir" location="../appengine-java-sdk-1.2.2" />
 
   <import file="${sdk.dir}/config/user/ant-macros.xml" />
@@ -70,6 +70,7 @@
     <appcfg action="request_logs" war="war">
       <options>
         <arg value="--num_days=5"/>
+        <arg value="--severity=0"/>
       </options>
       <args>
         <arg value="logs.txt"/>
@@ -77,5 +78,13 @@
     </appcfg>
   </target>
 
+  <target name="clean">
+    <delete>
+      <fileset dir="war/WEB-INF/classes">
+        <include name="**/*.class" />
+      </fileset>
+    </delete>
+  </target>
+
 </project>
 

diff --git a/jarlist b/jarlist
index d1a7904..bb1af69 100644 (file)
--- a/jarlist
+++ b/jarlist
@@ -4,7 +4,6 @@ aspectjweaver.jar
 cglib-nodep-2.1_3.jar
 commons-collections-3.2.1.jar
 commons-lang-2.4.jar
-commons-logging.jar
 freemarker.jar
 jdo2-api-2.3-SNAPSHOT.jar
 jstl.jar
@@ -20,3 +19,7 @@ spring-tx.jar
 spring-web.jar
 spring-webmvc.jar
 standard.jar
+logback-classic-0.9.17.jar
+logback-core-0.9.17.jar
+slf4j-api-1.5.8.jar
+jcl-over-slf4j-1.5.8.jar

diff --git a/src/jp/sourceforge/rabbitBTS/Sht.java b/src/jp/sourceforge/rabbitBTS/Sht.java
index 1f3548d..7911d98 100644 (file)
--- a/src/jp/sourceforge/rabbitBTS/Sht.java
+++ b/src/jp/sourceforge/rabbitBTS/Sht.java
@@ -17,7 +17,8 @@
 
 package jp.sourceforge.rabbitBTS;
 
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -51,10 +52,10 @@ public final class Sht {
        
        @SuppressWarnings("unchecked")
        public static final Logger log(Class c){
-               return Logger.getLogger(c.getName());
+               return LoggerFactory.getLogger(c.getName());
        }
        
        public static final Logger log(Object o){
-               return Logger.getLogger(o.getClass().getName());
+               return LoggerFactory.getLogger(o.getClass().getName());
        }
 }

diff --git a/src/jp/sourceforge/rabbitBTS/controllers/BbsController.java b/src/jp/sourceforge/rabbitBTS/controllers/BbsController.java
index 6d8580c..c22419f 100644 (file)
--- a/src/jp/sourceforge/rabbitBTS/controllers/BbsController.java
+++ b/src/jp/sourceforge/rabbitBTS/controllers/BbsController.java
@@ -60,7 +60,7 @@ public final class BbsController extends BaseController {
 
                this.validator.validate(post, result);
                if (result.hasErrors()) {
-                       Sht.log(this).finest("BBS Post Validate fail.");
+                       Sht.log(this).trace("BBS Post Validate fail.");
                        return null;
                }
 

diff --git a/src/jp/sourceforge/rabbitBTS/controllers/MembersController.java b/src/jp/sourceforge/rabbitBTS/controllers/MembersController.java
index 0d4a31c..04dfecf 100644 (file)
--- a/src/jp/sourceforge/rabbitBTS/controllers/MembersController.java
+++ b/src/jp/sourceforge/rabbitBTS/controllers/MembersController.java
@@ -74,7 +74,7 @@ public class MembersController extends BaseController implements IController {
                }
 
                if (account == null) {
-                       Sht.log(this).warning("存在しないアカウントの削除が試行されました。");
+                       Sht.log(this).warn("存在しないアカウントの削除が試行されました。");
                }
 
                map.addAttribute("accForDel", account);

diff --git a/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java b/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java
index d05d5fc..6c97323 100644 (file)
--- a/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java
+++ b/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java
@@ -69,12 +69,12 @@ public final class RegisterController extends BaseController implements
                                ret = null;
                        } else {
                                // すでに登録済みの場合ホームへリダイレクト
-                               Sht.log(this).finer("既に登録済み");
+                               Sht.log(this).trace("既に登録済み");
                                ret = REDIRECT_HOME_HTML;
                        }
                } catch (final HasNotValidIdException e) {
                        // googleにログインしてない場合
-                       Sht.log(this).finer("ログインが必要");
+                       Sht.log(this).trace("ログインが必要");
                        ret = "redirect:" + Sht.loginUrl(req);
                }
                return ret;
@@ -112,7 +112,7 @@ public final class RegisterController extends BaseController implements
                account.setEmail(Sht.user().getEmail());
                this.validator.validate(account, result);
                if (result.hasErrors()) {
-                       Sht.log(this).finer("ユーザ登録画面にてバリデートに失敗");
+                       Sht.log(this).trace("ユーザ登録画面にてバリデートに失敗");
                        return null;
                }
 
@@ -121,13 +121,13 @@ public final class RegisterController extends BaseController implements
                        if (this.accountService.fetchAccountByNickName(account
                                        .getNickName()) != null) {
                                result.rejectValue("nickName", "Account.nickName[duplicate]");
-                               Sht.log(this).finer("nickName重複チェックエラー");
+                               Sht.log(this).trace("nickName重複チェックエラー");
                                return null;
                        }
 
                        this.accountService.registAccount(account);
                } catch (final RabbitBTSException e) {
-                       Sht.log(this).log(Level.WARNING, "ユーザー登録で例外発生", e);
+                       Sht.log(this).warn("ユーザー登録で例外発生", e);
                        // TODO:resultにセット
                        map.addAttribute("errorMessage", "登録に失敗しました。再度やりなおしてください。");
                        return null;

diff --git a/src/jp/sourceforge/rabbitBTS/interceptors/AuthenticationInterceptor.java b/src/jp/sourceforge/rabbitBTS/interceptors/AuthenticationInterceptor.java
index 4e6b38d..21001c1 100644 (file)
--- a/src/jp/sourceforge/rabbitBTS/interceptors/AuthenticationInterceptor.java
+++ b/src/jp/sourceforge/rabbitBTS/interceptors/AuthenticationInterceptor.java
@@ -56,7 +56,7 @@ public class AuthenticationInterceptor extends HandlerInterceptorAdapter {
                        }
                        // アカウント未登録の場合、登録ページにリダイレクトする。
                        response.sendRedirect("/register/");
-                       Sht.log(this).warning(
+                       Sht.log(this).warn(
                                        "403(not registerd.) " + request.getRequestURL());
                        return false;
                } catch (final HasNotValidIdException e) {
@@ -67,7 +67,7 @@ public class AuthenticationInterceptor extends HandlerInterceptorAdapter {
 
                        // ログインしていない場合、ログインページにリダイレクトする。
                        response.sendRedirect(Sht.loginUrl(request));
-                       Sht.log(this).warning("403 " + request.getRequestURL());
+                       Sht.log(this).warn("403 " + request.getRequestURL());
                        return false;
                }
        }

diff --git a/src/jp/sourceforge/rabbitBTS/interceptors/CSRFInterceptor.java b/src/jp/sourceforge/rabbitBTS/interceptors/CSRFInterceptor.java
index 28a588f..bd2be5f 100644 (file)
--- a/src/jp/sourceforge/rabbitBTS/interceptors/CSRFInterceptor.java
+++ b/src/jp/sourceforge/rabbitBTS/interceptors/CSRFInterceptor.java
@@ -51,7 +51,7 @@ public class CSRFInterceptor extends HandlerInterceptorAdapter {
                                c.setCsrfSafe(true);
                        } else {
                                c.setCsrfSafe(false);
-                               Sht.log(this).warning("CSRF detected.");
+                               Sht.log(this).warn("CSRF detected.");
                        }
                }
                return true;
@@ -78,7 +78,7 @@ public class CSRFInterceptor extends HandlerInterceptorAdapter {
                        // きちんとCSRFチェックが行われているかチェックする
                        final IController c = (IController) handler;
                        if (!c.isCsrfChecked()) {
-                               Sht.log(this).severe("CSRFチェックを行っていないPOST");
+                               Sht.log(this).error("CSRFチェックを行っていないPOST");
                        }
                        assert c.isCsrfChecked() : "CSRFチェックを行っていないPOST";
                }

diff --git a/src/jp/sourceforge/rabbitBTS/interceptors/TraceInterceptor.java b/src/jp/sourceforge/rabbitBTS/interceptors/TraceInterceptor.java
index 7167d2e..1f2b2da 100644 (file)
--- a/src/jp/sourceforge/rabbitBTS/interceptors/TraceInterceptor.java
+++ b/src/jp/sourceforge/rabbitBTS/interceptors/TraceInterceptor.java
@@ -31,13 +31,13 @@ public class TraceInterceptor extends HandlerInterceptorAdapter {
        public void postHandle(HttpServletRequest request,
                        HttpServletResponse response, Object handler,
                        ModelAndView modelAndView) throws Exception {
-               Sht.log(this).finest("postHandle " + makeURL(request));
+               Sht.log(this).trace("postHandle " + makeURL(request));
        }
 
        @Override
        public boolean preHandle(HttpServletRequest request,
                        HttpServletResponse response, Object handler) throws Exception {
-               Sht.log(this).finest("preHandle " + makeURL(request));
+               Sht.log(this).trace("preHandle " + makeURL(request));
                return true;
        }
 

diff --git a/src/jp/sourceforge/rabbitBTS/services/AccountService.java b/src/jp/sourceforge/rabbitBTS/services/AccountService.java
index a608e99..22e6ed1 100644 (file)
--- a/src/jp/sourceforge/rabbitBTS/services/AccountService.java
+++ b/src/jp/sourceforge/rabbitBTS/services/AccountService.java
@@ -106,7 +106,7 @@ public class AccountService {
                // 最初のスーパーユーザーかチェック
                if (account.getEmail().equals(this.firstSuperUser)) {
                        account.setAdmin(true);
-                       Sht.log(this).warning(
+                       Sht.log(this).warn(
                                        "Admin Account Created. " + this.firstSuperUser);
                }