Commit @08121da72dc640400bfe241ba9bd54133a2b4eef

[Notice] Announcing the End of Demo Server [Read me]

Yi EungJun 2013-03-27

Rename 'date' fields to 'createdDate'.

'date' may be reserved by DBMS.

@08121da72dc640400bfe241ba9bd54133a2b4eef

9c00d70

08121da

app/controllers/AbstractPostingApp.java

--- app/controllers/AbstractPostingApp.java

+++ app/controllers/AbstractPostingApp.java


         }
 
         posting.id = original.id;
-        posting.date = original.date;
+        posting.createdDate = original.createdDate;
         posting.authorId = original.authorId;
         posting.authorLoginId = original.authorLoginId;
         posting.authorName = original.authorName;

9c00d70

08121da

app/controllers/BoardApp.java

--- app/controllers/BoardApp.java

+++ app/controllers/BoardApp.java


             return redirect(routes.BoardApp.newPost(userName, projectName));
         } else {
             Posting post = postForm.get();
-            post.date = JodaDateUtil.now();
+            post.createdDate = JodaDateUtil.now();
             post.setAuthor(UserApp.currentUser());
             post.project = project;
 

9c00d70

08121da

app/controllers/IssueApp.java

--- app/controllers/IssueApp.java

+++ app/controllers/IssueApp.java


             return badRequest(newIssue.render(issueForm.errors().toString(), issueForm, project));
         } else {
             Issue newIssue = issueForm.get();
-            newIssue.date = JodaDateUtil.now();
+            newIssue.createdDate = JodaDateUtil.now();
             newIssue.setAuthor(UserApp.currentUser());
             newIssue.project = project;
 

9c00d70

08121da

app/controllers/ProjectApp.java

--- app/controllers/ProjectApp.java

+++ app/controllers/ProjectApp.java


         OrderParams orderParams = new OrderParams();
         SearchParams searchParams = new SearchParams();
 
-        orderParams.add("date", Direction.DESC);
+        orderParams.add("createdDate", Direction.DESC);
         searchParams.add("name", filter, Matching.CONTAINS);
         if (state.toLowerCase().equals("public")) {
             searchParams.add("share_option", true, Matching.EQUALS);

9c00d70

08121da

app/models/AbstractPosting.java

--- app/models/AbstractPosting.java

+++ app/models/AbstractPosting.java


 
     @Constraints.Required
     @Formats.DateTime(pattern = "YYYY/MM/DD/hh/mm/ss")
-    public Date date;
+    public Date createdDate;
 
     public Long authorId;
     public String authorLoginId;

     abstract public int computeNumOfComments();
 
     public AbstractPosting() {
-        this.date = JodaDateUtil.now();
+        this.createdDate = JodaDateUtil.now();
     }
 
     public void save() {

      * @return
      */
     public Duration ago() {
-        return JodaDateUtil.ago(this.date);
+        return JodaDateUtil.ago(this.createdDate);
     }
 
     abstract public Resource asResource();

9c00d70

08121da

app/models/Comment.java

--- app/models/Comment.java

+++ app/models/Comment.java


     public String contents;
 
     @Constraints.Required
-    public Date date;
+    public Date createdDate;
 
     public Long authorId;
     public String authorLoginId;
     public String authorName;
 
     public Comment() {
-        date = new Date();
+        createdDate = new Date();
     }
 
     public Duration ago() {
-        return JodaDateUtil.ago(this.date);
+        return JodaDateUtil.ago(this.createdDate);
     }
 
     abstract public Resource asResource();

9c00d70

08121da

app/models/Issue.java

--- app/models/Issue.java

+++ app/models/Issue.java


      * @param title           이슈 제목
      * @param body            이슈 내용
      * @param state           이슈 상태(열림, 닫힘)
-     * @param date            이슈 등록 날짜
+     * @param createdDate            이슈 등록 날짜
      * @param authorId        이슈 작성자 ID
      * @param project         이슈가 등록된 프로젝트
      * @param assigneeId      이슈에 배정된 담당자 Id

 
     public static Finder<Long, Issue> finder = new Finder<Long, Issue>(Long.class, Issue.class);
 
-    public static final String DEFAULT_SORTER = "date";
+    public static final String DEFAULT_SORTER = "createdDate";
     public static final String TO_BE_ASSIGNED = "TBA";
 
     public State state;

             sheet.addCell(new Label(colcnt++, i, issue.state.toString(), cf2));
             sheet.addCell(new Label(colcnt++, i, issue.title, cf2));
             sheet.addCell(new Label(colcnt++, i, getAssigneeName(issue.assignee), cf2));
-            sheet.addCell(new Label(colcnt++, i, issue.date.toString(), cf2));
+            sheet.addCell(new Label(colcnt++, i, issue.createdDate.toString(), cf2));
         }
         workbook.write();
 

9c00d70

08121da

app/models/Project.java

--- app/models/Project.java

+++ app/models/Project.java


 	public boolean share_option;
 	public boolean isAuthorEditable;
 
-	public Date date;
+	public Date createdDate;
 
 	@OneToMany(mappedBy = "project", cascade = CascadeType.ALL)
 	public Set<Issue> issues;

 
 	public static Long create(Project newProject) {
 		newProject.siteurl = "http://localhost:9000/" + newProject.name;
-        newProject.date = new Date();
+        newProject.createdDate = new Date();
         newProject.save();
 		ProjectUser.assignRole(User.SITE_MANAGER_ID, newProject.id,
 				RoleType.SITEMANAGER);

             return sortByNameWithIgnoreCaseDesc;
         } else if ( orderString.contains("name") ) {
             return sortByNameWithIgnoreCase;
-        } else if ( orderString.contains("date desc") ){
+        } else if ( orderString.contains("createdDate desc") ){
             return sortByDateDesc;
-        } else if ( orderString.contains("date") ){
+        } else if ( orderString.contains("createdDate") ){
             return sortByDate;
         } else {  // TODO: another sorting case doesn't exist in this moment
             throw new UnsupportedOperationException("unsupported sorting type");

 		} catch (ServletException e) {
 			e.printStackTrace();
 		}
-		return this.date;
+		return this.createdDate;
 	}
 
 	public Duration ago() {

         public int compare(Object o1, Object o2) {
             Project s1 = (Project) o1;
             Project s2 = (Project) o2;
-            return s1.date.compareTo(s2.date);
+            return s1.createdDate.compareTo(s2.createdDate);
         }
     }
     public static class SortByDateDesc implements Comparator<Object> {

9c00d70

08121da

app/models/User.java

--- app/models/User.java

+++ app/models/User.java


     public boolean rememberMe;
 
     @Formats.DateTime(pattern = "yyyy-MM-dd")
-    public Date date;
+    public Date createdDate;
 
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
     public List<ProjectUser> projectUser;

      */
     public String getDateString() {
         SimpleDateFormat sdf = new SimpleDateFormat("MMM dd yyyy");
-        return sdf.format(this.date);
+        return sdf.format(this.createdDate);
     }
 
     public List<Project> myProjects(){

     }
 
     public static Long create(User user) {
-    	user.date = JodaDateUtil.now();
+    	user.createdDate = JodaDateUtil.now();
         user.save();
         return user.id;
     }

9c00d70

08121da

app/playRepository/GitRepository.java

--- app/playRepository/GitRepository.java

+++ app/playRepository/GitRepository.java


         result.put("type", type);
         result.put("msg", commit.getShortMessage());
         result.put("author", commit.getAuthorIdent().getName());
-        result.put("date", commitTime);
+        result.put("createdDate", commitTime);
 
         result.put("commitMessage", commit.getShortMessage());
         result.put("commiter", commit.getAuthorIdent().getName());

             data.put("type", treeWalk.isSubtree() ? "folder" : "file");
             data.put("msg", commit.getShortMessage());
             data.put("author", commit.getAuthorIdent().getName());
-            data.put("date", commit.getCommitTime() * 1000l);
+            data.put("createdDate", commit.getCommitTime() * 1000l);
             listData.put(treeWalk.getNameString(), data);
         }
         result.put("data", listData);

9c00d70

08121da

app/playRepository/SVNRepository.java

--- app/playRepository/SVNRepository.java

+++ app/playRepository/SVNRepository.java


                 data.put("type", entry.getKind() == SVNNodeKind.DIR ? "folder" : "file");
                 data.put("msg", entry.getCommitMessage());
                 data.put("author", entry.getAuthor());
-                data.put("date", entry.getDate().getTime());
+                data.put("createdDate", entry.getDate().getTime());
 
                 listData.put(entry.getName(), data);
             }

             result.put("revisionNo", prop.getStringValue(SVNProperty.COMMITTED_REVISION));
             result.put("author", prop.getStringValue(SVNProperty.LAST_AUTHOR));
 
-            result.put("date", prop.getStringValue(SVNProperty.COMMITTED_DATE));
+            result.put("createdDate", prop.getStringValue(SVNProperty.COMMITTED_DATE));
 
             result.put("data", baos.toString());
             return result;

                 data.put("type", entry.getKind() == SVNNodeKind.DIR ? "folder" : "file");
                 data.put("msg", entry.getCommitMessage());
                 data.put("author", entry.getAuthor());
-                data.put("date", entry.getDate().getTime());
+                data.put("createdDate", entry.getDate().getTime());
 
                 listData.put(entry.getName(), data);
             }

             result.put("revisionNo", prop.getStringValue(SVNProperty.COMMITTED_REVISION));
             result.put("author", prop.getStringValue(SVNProperty.LAST_AUTHOR));
 
-            result.put("date", prop.getStringValue(SVNProperty.COMMITTED_DATE));
+            result.put("createdDate", prop.getStringValue(SVNProperty.COMMITTED_DATE));
 
             result.put("data", baos.toString());
             return result;

08121da

conf/evolutions/default/3.sql (added)

+++ conf/evolutions/default/3.sql

...	...	@@ -0,0 +1,17 @@
	1	+# --- !Ups
	2	+
	3	+ALTER TABLE issue ALTER COLUMN date RENAME TO created_date;
	4	+ALTER TABLE issue_comment ALTER COLUMN date RENAME TO created_date;
	5	+ALTER TABLE posting ALTER COLUMN date RENAME TO created_date;
	6	+ALTER TABLE posting_comment ALTER COLUMN date RENAME TO created_date;
	7	+ALTER TABLE project ALTER COLUMN date RENAME TO created_date;
	8	+ALTER TABLE n4user ALTER COLUMN date RENAME TO created_date;
	9	+
	10	+# --- !Downs
	11	+
	12	+ALTER TABLE issue ALTER COLUMN created_date RENAME TO date;
	13	+ALTER TABLE issue_comment ALTER COLUMN created_date RENAME TO date;
	14	+ALTER TABLE posting ALTER COLUMN created_date RENAME TO date;
	15	+ALTER TABLE posting_comment ALTER COLUMN created_date RENAME TO date;
	16	+ALTER TABLE project ALTER COLUMN created_date RENAME TO date;
	17	+ALTER TABLE n4user ALTER COLUMN created_date RENAME TO date;

9c00d70

08121da

conf/initial-data.yml

--- conf/initial-data.yml

+++ conf/initial-data.yml


         passwordSalt:   '[B@1032a4'
         email:          admin@nhn.com
         avatarUrl:      /assets/images/default-avatar-128.png
-        date:           2012-11-01 08:00:00
+        createdDate:           2012-11-01 08:00:00
     - !!models.User
         name:           Hobi
         loginId:        hobi

         passwordSalt:   '[B@1032a4'        
         email:          hobi@nhn.com
         avatarUrl:      /assets/images/default-avatar-128.png
-        date:           2012-12-01 08:00:00
+        createdDate:           2012-12-01 08:00:00
     - !!models.User
         name:           scott
         loginId:        k16wire

         passwordSalt:   '[B@1032a4'        
         email:          k16wire@naver.com
         avatarUrl:      /assets/images/default-avatar-128.png
-        date:           2012-01-01 08:00:00
+        createdDate:           2012-01-01 08:00:00
     - !!models.User
         name:           suwon
         loginId:        doortts

         passwordSalt:   '[B@1032a4'        
         email:          doortts@gmail.com
         avatarUrl:      /assets/images/default-avatar-128.png
-        date:           2012-07-01 08:00:00
+        createdDate:           2012-07-01 08:00:00
     - !!models.User
         name:           eungjun
         loginId:        nori

         passwordSalt:   '[B@1032a4'        
         email:          ejlee@nhn.com
         avatarUrl:      /assets/images/default-avatar-128.png
-        date:           2012-05-01 08:00:00
+        createdDate:           2012-05-01 08:00:00
 
 siteAdmins:
      - !!models.SiteAdmin

         siteurl:       http://localhost:9000/nForge4java
         owner:          hobi
         isAuthorEditable: true
-        date:           2012-02-01 08:00:00
+        createdDate:           2012-02-01 08:00:00
     - !!models.Project
         name:           Jindo
         overview:       Jindo는 NHN에서 제작한 Javascript Library 이다.

         siteurl:       http://localhost:9000/Jindo
         owner:          k16wire
         isAuthorEditable: false
-        date:           2012-01-01 08:00:00        
+        createdDate:           2012-01-01 08:00:00        
     - !!models.Project
         name:           CUBRID
         overview:       CUBRID는 엔터프라이즈급 오픈 소스 DBMS로서, 인터넷 서비스에 최적화된 DBMS를 지향하고 있습니다.

         siteurl:       http://localhost:9000/CUBRID
         owner:          doortts
         isAuthorEditable: true
-        date:           2012-08-01 08:00:00        
+        createdDate:           2012-08-01 08:00:00        
     - !!models.Project
         name:           HelloSocialApp
         overview:       네이버 앱팩토리 플랫폼에서 제공하는 오픈소셜 API를 직접 실행해 볼 수 있는 애플리케이션입니다.

         siteurl:       http://localhost:9000/HelloSocialApp
         owner:          hobi
         isAuthorEditable: true
-        date:           2012-12-01 08:00:00        
+        createdDate:           2012-12-01 08:00:00        
 
 # Board
 postings:

         state:          OPEN
         milestone:      !!models.Milestone
                             id: 1
-        date:           2012-11-01 08:00:00
+        createdDate:           2012-11-01 08:00:00
         project:        !!models.Project
                             id: 1
     - !!models.Issue

         state:          OPEN
         milestone:      !!models.Milestone
                             id: 2
-        date:           2012-11-02 08:00:00
+        createdDate:           2012-11-02 08:00:00
         project:        !!models.Project
                             id: 1
     - !!models.Issue

         state:          CLOSED
         milestone:      !!models.Milestone
                             id: 2
-        date:           2012-11-03 08:00:00
+        createdDate:           2012-11-03 08:00:00
         project:        !!models.Project
                             id: 1
         numOfComments:  1

         state:          CLOSED
         milestone:      !!models.Milestone
                             id: 2
-        date:           2012-11-04 08:00:00
+        createdDate:           2012-11-04 08:00:00
         project:        !!models.Project
                             id: 1
     - !!models.Issue

         title:          CUBRID 설치 문제
         body:           IOS는 설치 못하나요?
         state:          OPEN
-        date:           2012-11-05 08:00:00
+        createdDate:           2012-11-05 08:00:00
         project:        !!models.Project
                             id: 3
     - !!models.Issue

         state:          CLOSED
         milestone:      !!models.Milestone
                             id: 6
-        date:           2012-11-06 08:00:00
+        createdDate:           2012-11-06 08:00:00
         project:        !!models.Project
                             id: 3
     - !!models.Issue

         state:          OPEN
         milestone:      !!models.Milestone
                             id: 5
-        date:           2012-11-07 08:00:00
+        createdDate:           2012-11-07 08:00:00
         project:        !!models.Project
                             id: 3
     - !!models.Issue

         state:          CLOSED
         milestone:      !!models.Milestone
                             id: 5
-        date: 2012-11-08 08:00:00
+        createdDate: 2012-11-08 08:00:00
         project:        !!models.Project
                             id: 3
     - !!models.Issue

         state:          CLOSED
         milestone:      !!models.Milestone
                             id: 1
-        date: 2012-11-09 08:00:00
+        createdDate: 2012-11-09 08:00:00
         project:        !!models.Project
                             id: 1
     - !!models.Issue

         state:          CLOSED
         milestone:      !!models.Milestone
                             id: 1
-        date:           2012-11-10 08:00:00
+        createdDate:           2012-11-10 08:00:00
         project:        !!models.Project
                             id: 1
     - !!models.Issue

         state:          OPEN
         milestone:      !!models.Milestone
                             id: 1
-        date:           2012-11-11 08:00:00
+        createdDate:           2012-11-11 08:00:00
         project:        !!models.Project
                             id: 1
     - !!models.Issue

         state:          CLOSED
         milestone:      !!models.Milestone
                             id: 3
-        date:           2012-11-12 08:00:00
+        createdDate:           2012-11-12 08:00:00
         project:        !!models.Project
                             id: 2
     - !!models.Issue

         state:          CLOSED
         milestone:      !!models.Milestone
                             id: 3
-        date:           2012-11-13 08:00:00
+        createdDate:           2012-11-13 08:00:00
         project:        !!models.Project
                             id: 2
     - !!models.Issue

         state:          OPEN
         milestone:      !!models.Milestone
                             id: 4
-        date:           2012-11-14 08:00:00
+        createdDate:           2012-11-14 08:00:00
         project:        !!models.Project
                             id: 2
     - !!models.Issue

         state:          OPEN
         milestone:      !!models.Milestone
                             id: 4
-        date:           2012-11-15 08:00:00
+        createdDate:           2012-11-15 08:00:00
         project:        !!models.Project
                             id: 2
     - !!models.Issue

         state:          OPEN
         milestone:      !!models.Milestone
                             id: 4
-        date:           2012-11-15 08:00:00
+        createdDate:           2012-11-15 08:00:00
         project:        !!models.Project
                             id: 2
     - !!models.Issue

         state:          OPEN
         milestone:      !!models.Milestone
                             id: 4
-        date:           2012-11-16 08:00:00
+        createdDate:           2012-11-16 08:00:00
         project:        !!models.Project
                             id: 3
 issueComments:

9c00d70

08121da

test/models/MilestoneTest.java

--- test/models/MilestoneTest.java

+++ test/models/MilestoneTest.java


         int openNumber = m5.getNumOpenIssues();
         Issue issue = new Issue();
         issue.title = "불필요한 로그 출력 코드 제거test";
-        issue.date = JodaDateUtil.today();
+        issue.createdDate = JodaDateUtil.today();
         issue.state = State.OPEN;
         issue.authorId = User.find.byId(1l).id;
         issue.milestone = Milestone.find.byId(5l);

9c00d70

08121da

test/models/PostingTest.java

--- test/models/PostingTest.java

+++ test/models/PostingTest.java


         Posting post = new Posting();
         post.setBody("new Contents");
         post.title = "new_title";
-        post.date = JodaDateUtil.now();
+        post.createdDate = JodaDateUtil.now();
         post.project = Project.find.byId(1l);
         post.setAuthor(getTestUser());
 

         assertThat(post.id).isGreaterThan(0);
         assertThat(actual.title).isEqualTo(post.title);
         assertThat(actual.getBody()).isEqualTo(post.getBody());
-        assertThat(actual.date).isEqualTo(post.date);
+        assertThat(actual.createdDate).isEqualTo(post.createdDate);
         assertThat(actual.authorId).isEqualTo(getTestUser().id);
         assertThat(actual.id).isEqualTo(post.id);
     }

Add a comment

Open 0
Closed 0

List

...	...	@@ -91,7 +91,7 @@
91	91	}
92	92
93	93	posting.id = original.id;
94		- posting.date = original.date;
	94	+ posting.createdDate = original.createdDate;
95	95	posting.authorId = original.authorId;
96	96	posting.authorLoginId = original.authorLoginId;
97	97	posting.authorName = original.authorName;

...	...	@@ -79,7 +79,7 @@
79	79	return redirect(routes.BoardApp.newPost(userName, projectName));
80	80	} else {
81	81	Posting post = postForm.get();
82		- post.date = JodaDateUtil.now();
	82	+ post.createdDate = JodaDateUtil.now();
83	83	post.setAuthor(UserApp.currentUser());
84	84	post.project = project;
85	85

...	...	@@ -195,7 +195,7 @@
195	195	return badRequest(newIssue.render(issueForm.errors().toString(), issueForm, project));
196	196	} else {
197	197	Issue newIssue = issueForm.get();
198		- newIssue.date = JodaDateUtil.now();
	198	+ newIssue.createdDate = JodaDateUtil.now();
199	199	newIssue.setAuthor(UserApp.currentUser());
200	200	newIssue.project = project;
201	201

...	...	@@ -250,7 +250,7 @@
250	250	OrderParams orderParams = new OrderParams();
251	251	SearchParams searchParams = new SearchParams();
252	252
253		- orderParams.add("date", Direction.DESC);
	253	+ orderParams.add("createdDate", Direction.DESC);
254	254	searchParams.add("name", filter, Matching.CONTAINS);
255	255	if (state.toLowerCase().equals("public")) {
256	256	searchParams.add("share_option", true, Matching.EQUALS);

...	...	@@ -44,7 +44,7 @@
44	44
45	45	@Constraints.Required
46	46	@Formats.DateTime(pattern = "YYYY/MM/DD/hh/mm/ss")
47		- public Date date;
	47	+ public Date createdDate;
48	48
49	49	public Long authorId;
50	50	public String authorLoginId;
...	...	@@ -60,7 +60,7 @@
60	60	abstract public int computeNumOfComments();
61	61
62	62	public AbstractPosting() {
63		- this.date = JodaDateUtil.now();
	63	+ this.createdDate = JodaDateUtil.now();
64	64	}
65	65
66	66	public void save() {
...	...	@@ -85,7 +85,7 @@
85	85	* @return
86	86	*/
87	87	public Duration ago() {
88		- return JodaDateUtil.ago(this.date);
	88	+ return JodaDateUtil.ago(this.createdDate);
89	89	}
90	90
91	91	abstract public Resource asResource();

...	...	@@ -22,18 +22,18 @@
22	22	public String contents;
23	23
24	24	@Constraints.Required
25		- public Date date;
	25	+ public Date createdDate;
26	26
27	27	public Long authorId;
28	28	public String authorLoginId;
29	29	public String authorName;
30	30
31	31	public Comment() {
32		- date = new Date();
	32	+ createdDate = new Date();
33	33	}
34	34
35	35	public Duration ago() {
36		- return JodaDateUtil.ago(this.date);
	36	+ return JodaDateUtil.ago(this.createdDate);
37	37	}
38	38
39	39	abstract public Resource asResource();

...	...	@@ -22,7 +22,7 @@
22	22	* @param title 이슈 제목
23	23	* @param body 이슈 내용
24	24	* @param state 이슈 상태(열림, 닫힘)
25		- * @param date 이슈 등록 날짜
	25	+ * @param createdDate 이슈 등록 날짜
26	26	* @param authorId 이슈 작성자 ID
27	27	* @param project 이슈가 등록된 프로젝트
28	28	* @param assigneeId 이슈에 배정된 담당자 Id
...	...	@@ -34,7 +34,7 @@
34	34
35	35	public static Finder<Long, Issue> finder = new Finder<Long, Issue>(Long.class, Issue.class);
36	36
37		- public static final String DEFAULT_SORTER = "date";
	37	+ public static final String DEFAULT_SORTER = "createdDate";
38	38	public static final String TO_BE_ASSIGNED = "TBA";
39	39
40	40	public State state;
...	...	@@ -125,7 +125,7 @@
125	125	sheet.addCell(new Label(colcnt++, i, issue.state.toString(), cf2));
126	126	sheet.addCell(new Label(colcnt++, i, issue.title, cf2));
127	127	sheet.addCell(new Label(colcnt++, i, getAssigneeName(issue.assignee), cf2));
128		- sheet.addCell(new Label(colcnt++, i, issue.date.toString(), cf2));
	128	+ sheet.addCell(new Label(colcnt++, i, issue.createdDate.toString(), cf2));
129	129	}
130	130	workbook.write();
131	131

...	...	@@ -64,7 +64,7 @@
64	64	public boolean share_option;
65	65	public boolean isAuthorEditable;
66	66
67		- public Date date;
	67	+ public Date createdDate;
68	68
69	69	@OneToMany(mappedBy = "project", cascade = CascadeType.ALL)
70	70	public Set<Issue> issues;
...	...	@@ -83,7 +83,7 @@
83	83
84	84	public static Long create(Project newProject) {
85	85	newProject.siteurl = "http://localhost:9000/" + newProject.name;
86		- newProject.date = new Date();
	86	+ newProject.createdDate = new Date();
87	87	newProject.save();
88	88	ProjectUser.assignRole(User.SITE_MANAGER_ID, newProject.id,
89	89	RoleType.SITEMANAGER);
...	...	@@ -191,9 +191,9 @@
191	191	return sortByNameWithIgnoreCaseDesc;
192	192	} else if ( orderString.contains("name") ) {
193	193	return sortByNameWithIgnoreCase;
194		- } else if ( orderString.contains("date desc") ){
	194	+ } else if ( orderString.contains("createdDate desc") ){
195	195	return sortByDateDesc;
196		- } else if ( orderString.contains("date") ){
	196	+ } else if ( orderString.contains("createdDate") ){
197	197	return sortByDate;
198	198	} else { // TODO: another sorting case doesn't exist in this moment
199	199	throw new UnsupportedOperationException("unsupported sorting type");
...	...	@@ -236,7 +236,7 @@
236	236	} catch (ServletException e) {
237	237	e.printStackTrace();
238	238	}
239		- return this.date;
	239	+ return this.createdDate;
240	240	}
241	241
242	242	public Duration ago() {
...	...	@@ -269,7 +269,7 @@
269	269	public int compare(Object o1, Object o2) {
270	270	Project s1 = (Project) o1;
271	271	Project s2 = (Project) o2;
272		- return s1.date.compareTo(s2.date);
	272	+ return s1.createdDate.compareTo(s2.createdDate);
273	273	}
274	274	}
275	275	public static class SortByDateDesc implements Comparator<Object> {

...	...	@@ -57,7 +57,7 @@
57	57	public boolean rememberMe;
58	58
59	59	@Formats.DateTime(pattern = "yyyy-MM-dd")
60		- public Date date;
	60	+ public Date createdDate;
61	61
62	62	@OneToMany(mappedBy = "user", cascade = CascadeType.ALL)
63	63	public List<ProjectUser> projectUser;
...	...	@@ -74,7 +74,7 @@
74	74	*/
75	75	public String getDateString() {
76	76	SimpleDateFormat sdf = new SimpleDateFormat("MMM dd yyyy");
77		- return sdf.format(this.date);
	77	+ return sdf.format(this.createdDate);
78	78	}
79	79
80	80	public List<Project> myProjects(){
...	...	@@ -82,7 +82,7 @@
82	82	}
83	83
84	84	public static Long create(User user) {
85		- user.date = JodaDateUtil.now();
	85	+ user.createdDate = JodaDateUtil.now();
86	86	user.save();
87	87	return user.id;
88	88	}

...	...	@@ -136,7 +136,7 @@
136	136	result.put("type", type);
137	137	result.put("msg", commit.getShortMessage());
138	138	result.put("author", commit.getAuthorIdent().getName());
139		- result.put("date", commitTime);
	139	+ result.put("createdDate", commitTime);
140	140
141	141	result.put("commitMessage", commit.getShortMessage());
142	142	result.put("commiter", commit.getAuthorIdent().getName());
...	...	@@ -165,7 +165,7 @@
165	165	data.put("type", treeWalk.isSubtree() ? "folder" : "file");
166	166	data.put("msg", commit.getShortMessage());
167	167	data.put("author", commit.getAuthorIdent().getName());
168		- data.put("date", commit.getCommitTime() * 1000l);
	168	+ data.put("createdDate", commit.getCommitTime() * 1000l);
169	169	listData.put(treeWalk.getNameString(), data);
170	170	}
171	171	result.put("data", listData);

...	...	@@ -85,7 +85,7 @@
85	85	data.put("type", entry.getKind() == SVNNodeKind.DIR ? "folder" : "file");
86	86	data.put("msg", entry.getCommitMessage());
87	87	data.put("author", entry.getAuthor());
88		- data.put("date", entry.getDate().getTime());
	88	+ data.put("createdDate", entry.getDate().getTime());
89	89
90	90	listData.put(entry.getName(), data);
91	91	}
...	...	@@ -107,7 +107,7 @@
107	107	result.put("revisionNo", prop.getStringValue(SVNProperty.COMMITTED_REVISION));
108	108	result.put("author", prop.getStringValue(SVNProperty.LAST_AUTHOR));
109	109
110		- result.put("date", prop.getStringValue(SVNProperty.COMMITTED_DATE));
	110	+ result.put("createdDate", prop.getStringValue(SVNProperty.COMMITTED_DATE));
111	111
112	112	result.put("data", baos.toString());
113	113	return result;
...	...	@@ -142,7 +142,7 @@
142	142	data.put("type", entry.getKind() == SVNNodeKind.DIR ? "folder" : "file");
143	143	data.put("msg", entry.getCommitMessage());
144	144	data.put("author", entry.getAuthor());
145		- data.put("date", entry.getDate().getTime());
	145	+ data.put("createdDate", entry.getDate().getTime());
146	146
147	147	listData.put(entry.getName(), data);
148	148	}
...	...	@@ -164,7 +164,7 @@
164	164	result.put("revisionNo", prop.getStringValue(SVNProperty.COMMITTED_REVISION));
165	165	result.put("author", prop.getStringValue(SVNProperty.LAST_AUTHOR));
166	166
167		- result.put("date", prop.getStringValue(SVNProperty.COMMITTED_DATE));
	167	+ result.put("createdDate", prop.getStringValue(SVNProperty.COMMITTED_DATE));
168	168
169	169	result.put("data", baos.toString());
170	170	return result;

...	...	@@ -7,7 +7,7 @@
7	7	passwordSalt: '[B@1032a4'
8	8	email: admin@nhn.com
9	9	avatarUrl: /assets/images/default-avatar-128.png
10		- date: 2012-11-01 08:00:00
	10	+ createdDate: 2012-11-01 08:00:00
11	11	- !!models.User
12	12	name: Hobi
13	13	loginId: hobi
...	...	@@ -15,7 +15,7 @@
15	15	passwordSalt: '[B@1032a4'
16	16	email: hobi@nhn.com
17	17	avatarUrl: /assets/images/default-avatar-128.png
18		- date: 2012-12-01 08:00:00
	18	+ createdDate: 2012-12-01 08:00:00
19	19	- !!models.User
20	20	name: scott
21	21	loginId: k16wire
...	...	@@ -23,7 +23,7 @@
23	23	passwordSalt: '[B@1032a4'
24	24	email: k16wire@naver.com
25	25	avatarUrl: /assets/images/default-avatar-128.png
26		- date: 2012-01-01 08:00:00
	26	+ createdDate: 2012-01-01 08:00:00
27	27	- !!models.User
28	28	name: suwon
29	29	loginId: doortts
...	...	@@ -31,7 +31,7 @@
31	31	passwordSalt: '[B@1032a4'
32	32	email: doortts@gmail.com
33	33	avatarUrl: /assets/images/default-avatar-128.png
34		- date: 2012-07-01 08:00:00
	34	+ createdDate: 2012-07-01 08:00:00
35	35	- !!models.User
36	36	name: eungjun
37	37	loginId: nori
...	...	@@ -39,7 +39,7 @@
39	39	passwordSalt: '[B@1032a4'
40	40	email: ejlee@nhn.com
41	41	avatarUrl: /assets/images/default-avatar-128.png
42		- date: 2012-05-01 08:00:00
	42	+ createdDate: 2012-05-01 08:00:00
43	43
44	44	siteAdmins:
45	45	- !!models.SiteAdmin
...	...	@@ -56,7 +56,7 @@
56	56	siteurl: http://localhost:9000/nForge4java
57	57	owner: hobi
58	58	isAuthorEditable: true
59		- date: 2012-02-01 08:00:00
	59	+ createdDate: 2012-02-01 08:00:00
60	60	- !!models.Project
61	61	name: Jindo
62	62	overview: Jindo는 NHN에서 제작한 Javascript Library 이다.
...	...	@@ -65,7 +65,7 @@
65	65	siteurl: http://localhost:9000/Jindo
66	66	owner: k16wire
67	67	isAuthorEditable: false
68		- date: 2012-01-01 08:00:00
	68	+ createdDate: 2012-01-01 08:00:00
69	69	- !!models.Project
70	70	name: CUBRID
71	71	overview: CUBRID는 엔터프라이즈급 오픈 소스 DBMS로서, 인터넷 서비스에 최적화된 DBMS를 지향하고 있습니다.
...	...	@@ -74,7 +74,7 @@
74	74	siteurl: http://localhost:9000/CUBRID
75	75	owner: doortts
76	76	isAuthorEditable: true
77		- date: 2012-08-01 08:00:00
	77	+ createdDate: 2012-08-01 08:00:00
78	78	- !!models.Project
79	79	name: HelloSocialApp
80	80	overview: 네이버 앱팩토리 플랫폼에서 제공하는 오픈소셜 API를 직접 실행해 볼 수 있는 애플리케이션입니다.
...	...	@@ -83,7 +83,7 @@
83	83	siteurl: http://localhost:9000/HelloSocialApp
84	84	owner: hobi
85	85	isAuthorEditable: true
86		- date: 2012-12-01 08:00:00
	86	+ createdDate: 2012-12-01 08:00:00
87	87
88	88	# Board
89	89	postings:
...	...	@@ -115,7 +115,7 @@
115	115	state: OPEN
116	116	milestone: !!models.Milestone
117	117	id: 1
118		- date: 2012-11-01 08:00:00
	118	+ createdDate: 2012-11-01 08:00:00
119	119	project: !!models.Project
120	120	id: 1
121	121	- !!models.Issue
...	...	@@ -126,7 +126,7 @@
126	126	state: OPEN
127	127	milestone: !!models.Milestone
128	128	id: 2
129		- date: 2012-11-02 08:00:00
	129	+ createdDate: 2012-11-02 08:00:00
130	130	project: !!models.Project
131	131	id: 1
132	132	- !!models.Issue
...	...	@@ -137,7 +137,7 @@
137	137	state: CLOSED
138	138	milestone: !!models.Milestone
139	139	id: 2
140		- date: 2012-11-03 08:00:00
	140	+ createdDate: 2012-11-03 08:00:00
141	141	project: !!models.Project
142	142	id: 1
143	143	numOfComments: 1
...	...	@@ -149,7 +149,7 @@
149	149	state: CLOSED
150	150	milestone: !!models.Milestone
151	151	id: 2
152		- date: 2012-11-04 08:00:00
	152	+ createdDate: 2012-11-04 08:00:00
153	153	project: !!models.Project
154	154	id: 1
155	155	- !!models.Issue
...	...	@@ -158,7 +158,7 @@
158	158	title: CUBRID 설치 문제
159	159	body: IOS는 설치 못하나요?
160	160	state: OPEN
161		- date: 2012-11-05 08:00:00
	161	+ createdDate: 2012-11-05 08:00:00
162	162	project: !!models.Project
163	163	id: 3
164	164	- !!models.Issue
...	...	@@ -169,7 +169,7 @@
169	169	state: CLOSED
170	170	milestone: !!models.Milestone
171	171	id: 6
172		- date: 2012-11-06 08:00:00
	172	+ createdDate: 2012-11-06 08:00:00
173	173	project: !!models.Project
174	174	id: 3
175	175	- !!models.Issue
...	...	@@ -180,7 +180,7 @@
180	180	state: OPEN
181	181	milestone: !!models.Milestone
182	182	id: 5
183		- date: 2012-11-07 08:00:00
	183	+ createdDate: 2012-11-07 08:00:00
184	184	project: !!models.Project
185	185	id: 3
186	186	- !!models.Issue
...	...	@@ -191,7 +191,7 @@
191	191	state: CLOSED
192	192	milestone: !!models.Milestone
193	193	id: 5
194		- date: 2012-11-08 08:00:00
	194	+ createdDate: 2012-11-08 08:00:00
195	195	project: !!models.Project
196	196	id: 3
197	197	- !!models.Issue
...	...	@@ -202,7 +202,7 @@
202	202	state: CLOSED
203	203	milestone: !!models.Milestone
204	204	id: 1
205		- date: 2012-11-09 08:00:00
	205	+ createdDate: 2012-11-09 08:00:00
206	206	project: !!models.Project
207	207	id: 1
208	208	- !!models.Issue
...	...	@@ -213,7 +213,7 @@
213	213	state: CLOSED
214	214	milestone: !!models.Milestone
215	215	id: 1
216		- date: 2012-11-10 08:00:00
	216	+ createdDate: 2012-11-10 08:00:00
217	217	project: !!models.Project
218	218	id: 1
219	219	- !!models.Issue
...	...	@@ -224,7 +224,7 @@
224	224	state: OPEN
225	225	milestone: !!models.Milestone
226	226	id: 1
227		- date: 2012-11-11 08:00:00
	227	+ createdDate: 2012-11-11 08:00:00
228	228	project: !!models.Project
229	229	id: 1
230	230	- !!models.Issue
...	...	@@ -235,7 +235,7 @@
235	235	state: CLOSED
236	236	milestone: !!models.Milestone
237	237	id: 3
238		- date: 2012-11-12 08:00:00
	238	+ createdDate: 2012-11-12 08:00:00
239	239	project: !!models.Project
240	240	id: 2
241	241	- !!models.Issue
...	...	@@ -246,7 +246,7 @@
246	246	state: CLOSED
247	247	milestone: !!models.Milestone
248	248	id: 3
249		- date: 2012-11-13 08:00:00
	249	+ createdDate: 2012-11-13 08:00:00
250	250	project: !!models.Project
251	251	id: 2
252	252	- !!models.Issue
...	...	@@ -257,7 +257,7 @@
257	257	state: OPEN
258	258	milestone: !!models.Milestone
259	259	id: 4
260		- date: 2012-11-14 08:00:00
	260	+ createdDate: 2012-11-14 08:00:00
261	261	project: !!models.Project
262	262	id: 2
263	263	- !!models.Issue
...	...	@@ -268,7 +268,7 @@
268	268	state: OPEN
269	269	milestone: !!models.Milestone
270	270	id: 4
271		- date: 2012-11-15 08:00:00
	271	+ createdDate: 2012-11-15 08:00:00
272	272	project: !!models.Project
273	273	id: 2
274	274	- !!models.Issue
...	...	@@ -279,7 +279,7 @@
279	279	state: OPEN
280	280	milestone: !!models.Milestone
281	281	id: 4
282		- date: 2012-11-15 08:00:00
	282	+ createdDate: 2012-11-15 08:00:00
283	283	project: !!models.Project
284	284	id: 2
285	285	- !!models.Issue
...	...	@@ -290,7 +290,7 @@
290	290	state: OPEN
291	291	milestone: !!models.Milestone
292	292	id: 4
293		- date: 2012-11-16 08:00:00
	293	+ createdDate: 2012-11-16 08:00:00
294	294	project: !!models.Project
295	295	id: 3
296	296	issueComments:

...	...	@@ -186,7 +186,7 @@
186	186	int openNumber = m5.getNumOpenIssues();
187	187	Issue issue = new Issue();
188	188	issue.title = "불필요한 로그 출력 코드 제거test";
189		- issue.date = JodaDateUtil.today();
	189	+ issue.createdDate = JodaDateUtil.today();
190	190	issue.state = State.OPEN;
191	191	issue.authorId = User.find.byId(1l).id;
192	192	issue.milestone = Milestone.find.byId(5l);

...	...	@@ -57,7 +57,7 @@
57	57	Posting post = new Posting();
58	58	post.setBody("new Contents");
59	59	post.title = "new_title";
60		- post.date = JodaDateUtil.now();
	60	+ post.createdDate = JodaDateUtil.now();
61	61	post.project = Project.find.byId(1l);
62	62	post.setAuthor(getTestUser());
63	63
...	...	@@ -70,7 +70,7 @@
70	70	assertThat(post.id).isGreaterThan(0);
71	71	assertThat(actual.title).isEqualTo(post.title);
72	72	assertThat(actual.getBody()).isEqualTo(post.getBody());
73		- assertThat(actual.date).isEqualTo(post.date);
	73	+ assertThat(actual.createdDate).isEqualTo(post.createdDate);
74	74	assertThat(actual.authorId).isEqualTo(getTestUser().id);
75	75	assertThat(actual.id).isEqualTo(post.id);
76	76	}

Delete comment