[Commits] (bcm) switch back to using Dates for Role and User so
that we can use the JSTL
commits at osafoundation.org
commits at osafoundation.org
Tue Feb 15 16:44:44 PST 2005
Commit by: bcm
Modified files:
server/slam/etc/MessageResources.properties 1.6 1.7
server/slam/src/org/osaf/slam/model/Role.java 1.3 1.4
server/slam/src/org/osaf/slam/model/User.java 1.5 1.6
server/slam/src/org/osaf/slam/spring/webdav/support/WebdavDaoSupport.java 1.4 1.5
server/slam/web/WEB-INF/jsp/user/list.jsp 1.4 1.5
server/slam/web/WEB-INF/jsp/user/view.jsp 1.2 1.3
Log message:
switch back to using Dates for Role and User so that we can use the JSTL
fmtDate tag to display them in the ui. convert the joda DateTimes to Dates in
the DAOs. show created and last modified dates on the view page as well.
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/slam/etc/MessageResources.properties.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/server/slam/src/org/osaf/slam/model/Role.java.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/server/slam/src/org/osaf/slam/model/User.java.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/server/slam/src/org/osaf/slam/spring/webdav/support/WebdavDaoSupport.java.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
http://cvs.osafoundation.org/index.cgi/server/slam/web/WEB-INF/jsp/user/list.jsp.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
http://cvs.osafoundation.org/index.cgi/server/slam/web/WEB-INF/jsp/user/view.jsp.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
Index: server/slam/src/org/osaf/slam/model/User.java
diff -u server/slam/src/org/osaf/slam/model/User.java:1.5 server/slam/src/org/osaf/slam/model/User.java:1.6
--- server/slam/src/org/osaf/slam/model/User.java:1.5 Mon Feb 14 13:12:50 2005
+++ server/slam/src/org/osaf/slam/model/User.java Tue Feb 15 16:44:42 2005
@@ -1,11 +1,11 @@
package org.osaf.slam.model;
+import java.util.Date;
+
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.joda.time.DateTime;
-
/**
*/
public class User extends BaseModelObject {
@@ -14,8 +14,8 @@
private String password;
private String email;
private String homedir;
- private DateTime dateCreated;
- private DateTime dateModified;
+ private Date dateCreated;
+ private Date dateModified;
/**
*/
@@ -72,25 +72,25 @@
/**
*/
- public DateTime getDateCreated() {
+ public Date getDateCreated() {
return dateCreated;
}
/**
*/
- public void setDateCreated(DateTime dateCreated) {
+ public void setDateCreated(Date dateCreated) {
this.dateCreated = dateCreated;
}
/**
*/
- public DateTime getDateModified() {
+ public Date getDateModified() {
return dateModified;
}
/**
*/
- public void setDateModified(DateTime dateModified) {
+ public void setDateModified(Date dateModified) {
this.dateModified = dateModified;
}
Index: server/slam/etc/MessageResources.properties
diff -u server/slam/etc/MessageResources.properties:1.6 server/slam/etc/MessageResources.properties:1.7
--- server/slam/etc/MessageResources.properties:1.6 Mon Feb 14 20:04:55 2005
+++ server/slam/etc/MessageResources.properties Tue Feb 15 16:44:42 2005
@@ -57,4 +57,5 @@
User.View.HeadTitle= Chandler Server | {0}
User.View.Title={0}
-
+User.View.DateCreated=Created:
+User.View.DateLastModified=Last Modified:
Index: server/slam/src/org/osaf/slam/model/Role.java
diff -u server/slam/src/org/osaf/slam/model/Role.java:1.3 server/slam/src/org/osaf/slam/model/Role.java:1.4
--- server/slam/src/org/osaf/slam/model/Role.java:1.3 Wed Feb 9 18:32:37 2005
+++ server/slam/src/org/osaf/slam/model/Role.java Tue Feb 15 16:44:42 2005
@@ -1,21 +1,20 @@
package org.osaf.slam.model;
+import java.util.Date;
import java.util.HashSet;
import java.util.Set;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.joda.time.DateTime;
-
/**
*/
public class Role extends BaseModelObject {
private String name;
- private DateTime dateCreated;
- private DateTime dateModified;
+ private Date dateCreated;
+ private Date dateModified;
private Set usernames;
/**
@@ -38,25 +37,25 @@
/**
*/
- public DateTime getDateCreated() {
+ public Date getDateCreated() {
return dateCreated;
}
/**
*/
- public void setDateCreated(DateTime dateCreated) {
+ public void setDateCreated(Date dateCreated) {
this.dateCreated = dateCreated;
}
/**
*/
- public DateTime getDateModified() {
+ public Date getDateModified() {
return dateModified;
}
/**
*/
- public void setDateModified(DateTime dateModified) {
+ public void setDateModified(Date dateModified) {
this.dateModified = dateModified;
}
Index: server/slam/web/WEB-INF/jsp/user/view.jsp
diff -u server/slam/web/WEB-INF/jsp/user/view.jsp:1.2 server/slam/web/WEB-INF/jsp/user/view.jsp:1.3
--- server/slam/web/WEB-INF/jsp/user/view.jsp:1.2 Mon Feb 14 20:05:00 2005
+++ server/slam/web/WEB-INF/jsp/user/view.jsp Tue Feb 15 16:44:43 2005
@@ -9,6 +9,22 @@
<table cellpadding="3" cellspacing="1" border="0">
<tr>
<td class="md" align="right">
+ <b><fmt:message key="User.View.DateCreated"/></b>
+ </td>
+ <td class="md" align="left">
+ <fmt:formatDate value="${User.dateCreated}" type="both"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="md" align="right">
+ <b><fmt:message key="User.View.DateLastModified"/></b>
+ </td>
+ <td class="md" align="left">
+ <fmt:formatDate value="${User.dateModified}" type="both"/>
+ </td>
+ </tr>
+ <tr>
+ <td class="md" align="right">
<b><fmt:message key="User.Form.Email"/></b>
</td>
<td class="md" align="left">
Index: server/slam/web/WEB-INF/jsp/user/list.jsp
diff -u server/slam/web/WEB-INF/jsp/user/list.jsp:1.4 server/slam/web/WEB-INF/jsp/user/list.jsp:1.5
--- server/slam/web/WEB-INF/jsp/user/list.jsp:1.4 Mon Feb 14 20:15:56 2005
+++ server/slam/web/WEB-INF/jsp/user/list.jsp Tue Feb 15 16:44:43 2005
@@ -37,10 +37,10 @@
<html:link href="/~${user.username}/">~${user.username}/</html:link>
</td>
<td class="md" nowrap="nowrap">
- ${user.dateCreated}
+ <fmt:formatDate value="${user.dateCreated}" type="both"/>
</td>
<td class="md" nowrap="nowrap">
- ${user.dateModified}
+ <fmt:formatDate value="${user.dateModified}" type="both"/>
</td>
</tr>
</c:forEach>
Index: server/slam/src/org/osaf/slam/spring/webdav/support/WebdavDaoSupport.java
diff -u server/slam/src/org/osaf/slam/spring/webdav/support/WebdavDaoSupport.java:1.4 server/slam/src/org/osaf/slam/spring/webdav/support/WebdavDaoSupport.java:1.5
--- server/slam/src/org/osaf/slam/spring/webdav/support/WebdavDaoSupport.java:1.4 Tue Feb 8 19:40:50 2005
+++ server/slam/src/org/osaf/slam/spring/webdav/support/WebdavDaoSupport.java Tue Feb 15 16:44:43 2005
@@ -3,6 +3,8 @@
import org.osaf.slam.spring.webdav.WebdavSystemException;
import org.osaf.slam.spring.webdav.WebdavTemplate;
+import java.util.Date;
+
import org.apache.commons.httpclient.HttpURL;
import org.apache.commons.logging.Log;
@@ -79,32 +81,15 @@
/**
* Parse a string as a datetime in ISO8601 format using the
- * date formatter created by <code>createDateTimeFormatter</code>.
- */
- public DateTime parseISO8601DateTime(String value) {
- if (dtf == null) {
- dtf = createDateTimeFormatter();
- }
- return dtf.parseDateTime(value);
- }
-
- /**
- * Return a String representation in ISO8601 format using the
- * date formatter created by
- * <code>createDateTimeFormatter</code>.
+ * date formatter created by <code>createDateTimeFormatter</code>
+ * and convert to a Date.
*/
- public String printISO8601DateTime(DateTime dt) {
+ public Date parseISO8601DateTime(String value) {
if (dtf == null) {
dtf = createDateTimeFormatter();
}
- return dtf.print(dt);
- }
-
- /**
- * Return a DateTime representing the current system millisecond.
- */
- public DateTime now() {
- return new DateTime(DateTimeZone.getInstance(TZ_GMT));
+ DateTime dt = dtf.parseDateTime(value);
+ return new Date(dt.getMillis());
}
/**
More information about the Commits
mailing list