Author: chathura
Date: Mon Dec 10 21:34:01 2007
New Revision: 10878
Log:
Integrated resource delete functionality to the UI.
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/JettyBasedServerTest.java
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/DeleteResourceAction.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/ResourceData.java
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/JettyBasedServerTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/JettyBasedServerTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/JettyBasedServerTest.java
Mon Dec 10 21:34:01 2007
@@ -63,7 +63,7 @@
AbstractSingletonProviderManager pm = new
RegistryAtomProviderManager();
abderaServiceContext.setProviderManager(pm);
- server = new Server(8080);
+ server = new Server(9090);
Context root = new Context(server, "/wso2registry",
Context.NO_SESSIONS);
root.addServlet(new ServletHolder(new AbderaServlet() {
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 10 21:34:01 2007
@@ -562,6 +562,19 @@
request.getSession().setAttribute(UIConstants.AJAX_DESCRIPTION_STRING,
getDescriptionAction.getDescription());
request.getRequestDispatcher(UIConstants.AJAX_DESCRIPTION_JSP).forward(request,
response);
+
+ } else if (command.equals("/deleteResource")) {
+
+ DeleteResourceAction deleteResourceAction = new
DeleteResourceAction();
+
deleteResourceAction.setPathToDelete(request.getParameter("resourcePath"));
+
+ try {
+ deleteResourceAction.execute(request);
+ } catch (Exception e) {
+ setErrorMessage(request, e.getMessage());
+ }
+
+ forwardToResources(request, response, path);
}
}
}
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/DeleteResourceAction.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/DeleteResourceAction.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/DeleteResourceAction.java
Mon Dec 10 21:34:01 2007
@@ -20,19 +20,18 @@
import org.wso2.registry.Registry;
import org.wso2.registry.RegistryException;
-public class DeleteResourceAction extends AbstractRegistryAction {
+import javax.servlet.http.HttpServletRequest;
- /**
- * Path of the parent collection. After deleting the resource, UI should
display this path.
- */
- private String parentPath;
+public class DeleteResourceAction extends AbstractRegistryAction {
/**
* Path of the resource to be deleted.
*/
private String pathToDelete;
- public String execute() throws Exception {
+ public String execute(HttpServletRequest request) throws Exception {
+
+ setRequest(request);
if (pathToDelete == null || pathToDelete.length() == 0) {
return ERROR;
@@ -51,15 +50,7 @@
}
return SUCCESS;
- }
-
- public String getParentPath() {
- return parentPath;
- }
-
- public void setParentPath(String parentPath) {
- this.parentPath = parentPath;
- }
+ }
public String getPathToDelete() {
return pathToDelete;
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/ResourceData.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/ResourceData.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/actions/utils/ResourceData.java
Mon Dec 10 21:34:01 2007
@@ -35,7 +35,7 @@
* Unknown type is set for entities, to which the current user doesn't
have get permissions
*/
private String resourceType;
-
+
private String authorUserName;
private String description;
private float averageRating;
@@ -47,6 +47,15 @@
}
public void setName(String name) {
+
+ String[] q = name.split("\\?");
+ if (q.length == 2) {
+ if (q[1].startsWith("v=")) {
+ String versionNumber = q[1].substring("v=".length());
+ name = q[0] + " (version " + versionNumber + ")";
+ }
+ }
+
this.name = name;
}
@@ -63,8 +72,8 @@
if (resourcePath.startsWith(RegistryConstants.PATH_SEPARATOR)) {
relativePath = resourcePath.substring(1,
resourcePath.length());
}
- }
- }
+ }
+ }
public String getRelativePath() {
return relativePath;
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 10 21:34:01 2007
@@ -202,10 +202,9 @@
<td>
<a href="#" title="Sub Items"><img
src="/wso2registry/admin/images/icon-subitems.gif" border="0" /></a>
<a href="#" title="Show Details" style="margin-left:5px;"><img
src="/wso2registry/admin/images/icon-details.gif" border="0" /></a>
- <a href="#" title="Delete" style="margin-left:5px;"><img
src="/wso2registry/admin/images/icon-trash.gif" border="0" /></a>
+ <a
href="/wso2registry/system/deleteResource?resourcePath=<%=resourceData.getResourcePath()%>"
title="Delete" style="margin-left:5px;"><img
src="/wso2registry/admin/images/icon-trash.gif" border="0" /></a>
</td>
-
</tr>
<tr id="1-des" style="display:none;">
<td colspan="6" class="table-description">
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
