Author: chathura
Date: Mon Dec 3 03:43:25 2007
New Revision: 10430
Log:
Integrating version handling to the UI.
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
Mon Dec 3 03:43:25 2007
@@ -191,6 +191,11 @@
length(), uri.length());
}
+ String qPart = request.getQueryString();
+ if (qPart != null && qPart.startsWith("v")) {
+ path = path + "?" + qPart;
+ }
+
request.getSession().setAttribute(UIConstants.PATH_ATTR, path);
actionInvoker.invokeActions(request);
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/CollectionViewAction.java
Mon Dec 3 03:43:25 2007
@@ -167,9 +167,9 @@
public void setPath(String path) {
// we are handling only the current version in the human view
- if (path.indexOf("?") > 0) {
- path = path.split("\\?")[0];
- }
+ //if (path.indexOf("?") > 0) {
+ // path = path.split("\\?")[0];
+ //}
this.path = path;
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/ResourceDetailsAction.java
Mon Dec 3 03:43:25 2007
@@ -111,10 +111,18 @@
for (int i = 0; i < versions.length; i++) {
VersionPath versionPath = new VersionPath();
versionPath.setCompleteVersionPath(versions[i]);
+
if (versions[i].indexOf("?v=") > 0) {
long versionNumber = new
Long(versions[i].split("\\?v=")[1]).longValue();
versionPath.setVersionNumber(versionNumber);
}
+
+ Resource versionResource = registry.get(versions[i]);
+ if (versionResource != null) {
+
versionPath.setUpdater(versionResource.getLastUpdaterUserName());
+ versionPath.setUpdatedOn(versionResource.getLastModified());
+ }
+
versionPaths.add(versionPath);
}
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
Mon Dec 3 03:43:25 2007
@@ -207,7 +207,8 @@
<table cellpadding="0" cellspacing="0" border="0"
style="width:100%" >
<tr>
<th align="left">Version</th>
- <th align="left">Modified</th>
+ <th align="left">Updated by</th>
+ <th align="left">Updated on</th>
<th colspan="2"></th>
</tr>
@@ -218,8 +219,8 @@
%>
<tr>
-
<td><%=versionPath.getVersionNumber()%></td><td><%=versionPath.getVersionNumber()%></td>
- <td align="right"><a href="#" title="Details"
style="margin-left:5px;"><img src="/wso2registry/admin/images/icon-details.gif"
border="0" hspace="3" /></a></td>
+
<td><%=versionPath.getVersionNumber()%></td><td><%=versionPath.getUpdater()%></td><td><%=versionPath.getUpdatedOn().toString()%></td>
+ <td align="right"><a
href="/wso2registry/web<%=versionPath.getCompleteVersionPath()%>"
title="Details" style="margin-left:5px;"><img
src="/wso2registry/admin/images/icon-details.gif" border="0" hspace="3"
/></a></td>
<td align="right"><a href="#" title="Restore"
style="margin-left:5px;"><img src="/wso2registry/admin/images/icon-restore.gif"
border="0" /></a></td>
</tr>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
