[Registry-dev] svn commit r13256 - in trunk/registry/modules: core/src/main/java/org/wso2/registry/jdbc/dao webapps/src/main/webapp/admin

Tue Feb 5 01:15:29 PST 2008

Author: chathura
Date: Tue Feb  5 01:15:12 2008
New Revision: 13256

Log:


Reordered versions according to the version number (instead of date).
Used formated dates for comments and version displays.



Modified:
   trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java
   trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
   trunk/registry/modules/webapps/src/main/webapp/admin/versions.jsp

Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java
==============================================================================

--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java	(original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java	Tue Feb  5 01:15:12 2008
@@ -950,7 +950,7 @@
 
     public String[] getVersionNumbers(long resourceId, Connection connection) throws SQLException {
 
-        String SQL = "SELECT VN FROM VERSIONS WHERE AID=? ORDER BY UPDATED_TIME DESC";
+        String SQL = "SELECT VN FROM VERSIONS WHERE AID=? ORDER BY VN DESC";
         PreparedStatement s = connection.prepareStatement(SQL);
         s.setLong(1, resourceId);
         ResultSet result = s.executeQuery();

Modified: trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp	(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp	Tue Feb  5 01:15:12 2008
@@ -9,6 +9,7 @@
 <%@ page import="org.wso2.registry.web.actions.utils.ResourcePath" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Properties" %>
+<%@ page import="org.wso2.registry.web.utils.CommonUtil" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
 "http://www.w3.org/TR/html4/strict.dtd">
@@ -635,7 +636,7 @@
             Comment comment = (Comment) iComments.next();
     %>
     <div class="comments-header">
-        <strong>Commented on </strong><%=comment.getTime().toString()%><strong> by</strong> <a href="/wso2registry/system/people/<%=comment.getUser()%>"><%=comment.getUser()%></a>
+        <strong>Commented on </strong><%=CommonUtil.formatDate(comment.getTime())%><strong> by</strong> <a href="/wso2registry/system/people/<%=comment.getUser()%>"><%=comment.getUser()%></a>
         <div class="comments-bottom">
             <%=comment.getText()%>
         </div>

Modified: trunk/registry/modules/webapps/src/main/webapp/admin/versions.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/versions.jsp	(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/versions.jsp	Tue Feb  5 01:15:12 2008
@@ -3,6 +3,7 @@
 <%@ page import="java.util.List" %>
 <%@ page import="org.wso2.registry.web.UIConstants" %>
 <%@ page import="org.wso2.registry.web.beans.VersionsBean" %>
+<%@ page import="org.wso2.registry.web.utils.CommonUtil" %>
 <%--
   Created by IntelliJ IDEA.
   User: chathura
@@ -59,7 +60,7 @@
 
                 <tr>
                     <td><%=currentVersion.getVersionNumber()%> (Current version)</td>
-                    <td><%=currentVersion.getUpdatedOn().toString()%></td>
+                    <td><%=CommonUtil.formatDate(currentVersion.getUpdatedOn())%></td>
                     <td><%=currentVersion.getUpdater()%></td>
                     <td>
                         <a href="/wso2registry/web<%=currentVersion.getActiveResourcePath()%>" title="Details">Details <img src="/wso2registry/admin/images/icon-details.jpg" border="0" hspace="3" align="top" /></a>

