Author: chathura
Date: Mon Jan 21 00:10:12 2008
New Revision: 12568
Log:
Improving the version view UIs.
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/VersionPath.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/beans/VersionsBean.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/ResourcesUtil.java
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
Mon Jan 21 00:10:12 2008
@@ -858,7 +858,7 @@
public String[] getVersionNumbers(long resourceId, Connection connection)
throws SQLException {
- String SQL = "SELECT VN FROM VERSIONS WHERE AID=?";
+ String SQL = "SELECT VN FROM VERSIONS WHERE AID=? ORDER BY
UPDATED_TIME DESC";
PreparedStatement s = connection.prepareStatement(SQL);
s.setLong(1, resourceId);
ResultSet result = s.executeQuery();
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/VersionPath.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/VersionPath.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/VersionPath.java
Mon Jan 21 00:10:12 2008
@@ -21,6 +21,7 @@
public class VersionPath {
private String completeVersionPath;
+ private String activeResourcePath;
private long versionNumber;
private String updater;
private Date updatedOn;
@@ -33,6 +34,14 @@
this.completeVersionPath = completeVersionPath;
}
+ public String getActiveResourcePath() {
+ return activeResourcePath;
+ }
+
+ public void setActiveResourcePath(String activeResourcePath) {
+ this.activeResourcePath = activeResourcePath;
+ }
+
public long getVersionNumber() {
return versionNumber;
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/beans/VersionsBean.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/beans/VersionsBean.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/beans/VersionsBean.java
Mon Jan 21 00:10:12 2008
@@ -16,6 +16,8 @@
package org.wso2.registry.web.beans;
+import org.wso2.registry.web.actions.utils.VersionPath;
+
import java.util.List;
import java.util.ArrayList;
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/ResourcesUtil.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/ResourcesUtil.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/ResourcesUtil.java
Mon Jan 21 00:10:12 2008
@@ -55,6 +55,7 @@
for (int i = 0; i < versions.length; i++) {
VersionPath versionPath = new VersionPath();
versionPath.setCompleteVersionPath(versions[i]);
+ versionPath.setActiveResourcePath(path);
if (versions[i].indexOf("?v=") > 0) {
long versionNumber = new
Long(versions[i].split("\\?v=")[1]).longValue();
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 Mon Jan
21 00:10:12 2008
@@ -13,90 +13,108 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
- <title>WSO2 Registry</title>
- <link type="text/css" href="/wso2registry/admin/css/main.css"
rel="stylesheet" />
+ <title>WSO2 Registry</title>
+ <link type="text/css" href="/wso2registry/admin/css/main.css"
rel="stylesheet" />
</head>
<body>
<div class="page-sizer">
-
-<jsp:include page="header.jsp" />
-<div class="content">
-<h1 class="headding-recent-activity">Versions</h1>
-
-
-
- <!-- Hear comes the box1 table -->
- <div class="box1-head">
- <table cellspacing="0" cellpadding="0"
border="0" style="width:100%">
- <tr>
- <td valign="top"
style="padding-top:0px;width:14px;"><img
src="/wso2registry/admin/images/box1-lefttop.jpg" /></td>
- <td valign="top">
- <h2>Search Activities</h2>
- </td>
- <td align="right" valign="top">
- <a href="#"
onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');">
- <img
src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top"
id="userIconExpanded" />
- <img
src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top"
id="userIconMinimized" style="display:none;" />
- </a>
- </td>
- <td valign="top" align="right"
style="width:14px; padding-top:0px;" ><img
src="/wso2registry/admin/images/box1-righttop.jpg" /></td>
- </tr>
- </table>
- </div>
- <div class="box1-mid" id="userMinimized"
style="display:none;">
- Expand to view details
- </div>
- <div class="box1-mid" id="userExpanded">
- <!-- all the content goes here -->
-
-
- <table cellpadding="0" cellspacing="0" border="0"
class="data-table" style="width:650px;">
- <tr>
- <th>Version </th>
- <th>Last Modified</th>
- <th>By</th>
- <th style="width:150px;"></th>
- </tr>
- <%
- VersionsBean versionBean = (VersionsBean)
request.getSession().getAttribute(UIConstants.VERSIONS_BEAN);
- Iterator iVersions =
versionBean.getVersionPaths().iterator();
- while (iVersions.hasNext()) {
- VersionPath versionPath = (VersionPath)
iVersions.next();
- %>
- <tr>
- <td><%=versionPath.getVersionNumber()%></td>
-
<td><%=versionPath.getUpdatedOn().toString()%></td>
- <td><%=versionPath.getUpdater()%></td>
- <td>
- <a
href="/wso2registry/web<%=versionPath.getCompleteVersionPath()%>"
title="Details">Details <img src="/wso2registry/admin/images/icon-details.gif"
border="0" hspace="3" /></a>
- <a
href="/wso2registry/system/restore?versionPath=<%=versionPath.getCompleteVersionPath()%>"
title="Restore" style="margin-left:5px;">Restore <img
src="/wso2registry/admin/images/icon-restore.gif" border="0" /></a>
- </td>
- </tr>
-
-
- <% } %>
- </table>
-
- <!-- End box1-mid div -->
- </div>
- <div class="box1-bot">
- <table cellspacing="0" cellpadding="0"
border="0" style="width:100%" >
- <tr>
- <td><img
src="/wso2registry/admin/images/box1-leftbot.jpg" /></td>
- <td align="right"><img
src="/wso2registry/admin/images/box1-rightbot.jpg" /></td>
- </tr>
- </table>
- </div>
-
-
-
-
-
-</div>
-<!-- START footer content -->
-<jsp:include page="footer.jsp" />
+ <jsp:include page="header.jsp" />
+ <div class="content">
+ <h1 class="headding-recent-activity">Versions</h1>
+
+
+
+ <!-- Hear comes the box1 table -->
+ <div class="box1-head">
+ <table cellspacing="0" cellpadding="0" border="0"
style="width:100%">
+ <tr>
+ <td valign="top" style="padding-top:0px;width:14px;"><img
src="/wso2registry/admin/images/box1-lefttop.jpg" /></td>
+ <td valign="top">
+ <h2>Search Activities</h2>
+ </td>
+ <td align="right" valign="top">
+ <a href="#"
onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');">
+ <img
src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top"
id="userIconExpanded" />
+ <img
src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top"
id="userIconMinimized" style="display:none;" />
+ </a>
+ </td>
+ <td valign="top" align="right" style="width:14px;
padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg"
/></td>
+ </tr>
+ </table>
+ </div>
+ <div class="box1-mid" id="userMinimized" style="display:none;">
+ Expand to view details
+ </div>
+ <div class="box1-mid" id="userExpanded">
+ <!-- all the content goes here -->
+
+
+ <table cellpadding="0" cellspacing="0" border="0"
class="data-table" style="width:650px;">
+ <tr>
+ <th>Version </th>
+ <th>Last Modified</th>
+ <th>By</th>
+ <th style="width:150px;"></th>
+ </tr>
+ <%
+ VersionsBean versionBean = (VersionsBean)
request.getSession().getAttribute(UIConstants.VERSIONS_BEAN);
+ List versionList = versionBean.getVersionPaths();
+
+ if (versionList.size() > 0) {
+ VersionPath currentVersion = (VersionPath)
versionList.get(0);
+ %>
+
+ <tr>
+ <td><%=currentVersion.getVersionNumber()%> (Current
version)</td>
+ <td><%=currentVersion.getUpdatedOn().toString()%></td>
+ <td><%=currentVersion.getUpdater()%></td>
+ <td>
+ <a
href="/wso2registry/web<%=currentVersion.getActiveResourcePath()%>"
title="Details">Details <img src="/wso2registry/admin/images/icon-details.gif"
border="0" hspace="3" /></a>
+ </td>
+ </tr>
+
+
+ <%
+ }
+
+ for (int i = 1; i < versionList.size(); i++) {
+ VersionPath versionPath = (VersionPath)
versionList.get(i);
+ %>
+ <tr>
+ <td><%=versionPath.getVersionNumber()%></td>
+ <td><%=versionPath.getUpdatedOn().toString()%></td>
+ <td><%=versionPath.getUpdater()%></td>
+ <td>
+ <a
href="/wso2registry/web<%=versionPath.getCompleteVersionPath()%>"
title="Details">Details <img src="/wso2registry/admin/images/icon-details.gif"
border="0" hspace="3" /></a>
+ <a
href="/wso2registry/system/restore?versionPath=<%=versionPath.getCompleteVersionPath()%>"
title="Restore" style="margin-left:5px;">Restore <img
src="/wso2registry/admin/images/icon-restore.gif" border="0" /></a>
+ </td>
+ </tr>
+
+
+ <% } %>
+ </table>
+
+ <!-- End box1-mid div -->
+ </div>
+ <div class="box1-bot">
+ <table cellspacing="0" cellpadding="0" border="0"
style="width:100%" >
+ <tr>
+ <td><img src="/wso2registry/admin/images/box1-leftbot.jpg"
/></td>
+ <td align="right"><img
src="/wso2registry/admin/images/box1-rightbot.jpg" /></td>
+ </tr>
+ </table>
+ </div>
+
+
+
+
+
+ </div>
+
+ <!-- START footer content -->
+ <jsp:include page="footer.jsp" />
</div>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
