• R/O
  • HTTP
  • SSH
  • HTTPS

RabbitBTS: Commit

RabbitBTSのgitリポジトリ


Commit MetaInfo

Revision6eef456fc2e44c108352a5f3e2241313467d8b64 (tree)
Time2009-09-27 20:10:50
AuthorSenju Higurashi <senju@user...>
CommiterSenju Higurashi

Log Message

環境まわりの細かい修正(前回コミットし忘れ)

eclipseでjdk6が使用されるよう修正。
eclipseでのビルド時にlogback.xmlが削除されるのを修正。
eclipseのビルドパス修正。
GAE SDKのバージョンアップ。

Change Summary

Incremental Difference

--- a/.classpath
+++ b/.classpath
@@ -4,7 +4,6 @@
44 <classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
55 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
66 <classpathentry kind="lib" path="war/WEB-INF/lib/spring-webmvc.jar"/>
7- <classpathentry kind="lib" path="war/WEB-INF/lib/commons-logging.jar"/>
87 <classpathentry kind="lib" path="war/WEB-INF/lib/spring-modules-validation.jar"/>
98 <classpathentry kind="lib" path="war/WEB-INF/lib/aspectjrt.jar"/>
109 <classpathentry kind="lib" path="war/WEB-INF/lib/aspectjweaver.jar"/>
@@ -18,5 +17,6 @@
1817 <classpathentry kind="lib" path="war/WEB-INF/lib/commons-lang-2.4.jar"/>
1918 <classpathentry kind="lib" path="war/WEB-INF/lib/spring-orm.jar"/>
2019 <classpathentry kind="lib" path="war/WEB-INF/lib/spring-tx.jar"/>
20+ <classpathentry kind="lib" path="war/WEB-INF/lib/slf4j-api-1.5.8.jar"/>
2121 <classpathentry kind="output" path="war/WEB-INF/classes"/>
2222 </classpath>
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -1,4 +1,56 @@
1-#Wed Jul 29 20:41:23 JST 2009
1+#Sun Sep 27 19:55:26 JST 2009
2+cleanup.add_default_serial_version_id=true
3+cleanup.add_generated_serial_version_id=false
4+cleanup.add_missing_annotations=true
5+cleanup.add_missing_deprecated_annotations=true
6+cleanup.add_missing_methods=false
7+cleanup.add_missing_nls_tags=false
8+cleanup.add_missing_override_annotations=true
9+cleanup.add_serial_version_id=false
10+cleanup.always_use_blocks=true
11+cleanup.always_use_parentheses_in_expressions=false
12+cleanup.always_use_this_for_non_static_field_access=false
13+cleanup.always_use_this_for_non_static_method_access=false
14+cleanup.convert_to_enhanced_for_loop=false
15+cleanup.correct_indentation=false
16+cleanup.format_source_code=false
17+cleanup.format_source_code_changes_only=false
18+cleanup.make_local_variable_final=true
19+cleanup.make_parameters_final=false
20+cleanup.make_private_fields_final=true
21+cleanup.make_type_abstract_if_missing_method=false
22+cleanup.make_variable_declarations_final=false
23+cleanup.never_use_blocks=false
24+cleanup.never_use_parentheses_in_expressions=true
25+cleanup.organize_imports=false
26+cleanup.qualify_static_field_accesses_with_declaring_class=false
27+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
28+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
29+cleanup.qualify_static_member_accesses_with_declaring_class=true
30+cleanup.qualify_static_method_accesses_with_declaring_class=false
31+cleanup.remove_private_constructors=true
32+cleanup.remove_trailing_whitespaces=false
33+cleanup.remove_trailing_whitespaces_all=true
34+cleanup.remove_trailing_whitespaces_ignore_empty=false
35+cleanup.remove_unnecessary_casts=true
36+cleanup.remove_unnecessary_nls_tags=true
37+cleanup.remove_unused_imports=true
38+cleanup.remove_unused_local_variables=false
39+cleanup.remove_unused_private_fields=true
40+cleanup.remove_unused_private_members=false
41+cleanup.remove_unused_private_methods=true
42+cleanup.remove_unused_private_types=true
43+cleanup.sort_members=false
44+cleanup.sort_members_all=false
45+cleanup.use_blocks=false
46+cleanup.use_blocks_only_for_return_and_throw=false
47+cleanup.use_parentheses_in_expressions=false
48+cleanup.use_this_for_non_static_field_access=false
49+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
50+cleanup.use_this_for_non_static_method_access=false
51+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
52+cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
53+cleanup_settings_version=2
254 eclipse.preferences.version=1
355 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
456 org.eclipse.jdt.ui.javadoc=false
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
11 <!-- vim:set et sw=2 sts=2 ts=2 fenc=utf-8: -->
22 <project default="compile">
3- <property name="sdk.dir" location="../appengine-java-sdk-1.2.2" />
3+ <property name="sdk.dir" location="../appengine-java-sdk-1.2.5" />
44
55 <import file="${sdk.dir}/config/user/ant-macros.xml" />
66
@@ -15,6 +15,7 @@
1515 </path>
1616
1717 <target name="init">
18+ <!-- 不要ファイルの削除 -->
1819 <delete>
1920 <fileset dir=".">
2021 <include name="**/*.swp" />
--- a/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java
+++ b/src/jp/sourceforge/rabbitBTS/controllers/RegisterController.java
@@ -18,7 +18,6 @@
1818 package jp.sourceforge.rabbitBTS.controllers;
1919
2020 import java.util.Date;
21-import java.util.logging.Level;
2221
2322 import javax.servlet.http.HttpServletRequest;
2423
@@ -118,8 +117,7 @@ public final class RegisterController extends BaseController implements
118117
119118 try {
120119 // nickName重複チェック
121- if (this.accountService.getAccountByNickName(account
122- .getNickName()) != null) {
120+ if (this.accountService.getAccountByNickName(account.getNickName()) != null) {
123121 result.rejectValue("nickName", "Account.nickName[duplicate]");
124122 Sht.log(this).trace("nickName重複チェックエラー");
125123 return null;
Show on old repository browser