[Registry-dev] svn commit r16611 - in
trunk/registry/modules/core/src:
main/java/org/wso2/registry/jdbc/dao
main/java/org/wso2/registry/servlet test/java/org/wso2/registry/jdbc
svn at wso2.org
svn at wso2.org
Wed May 7 03:41:12 PDT 2008
Author: chathura
Date: Wed May 7 03:40:06 2008
New Revision: 16611
Log:
Adding the versioning support to the UI.
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/ResourceVersionDAO.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/ResourceRequestProcessor.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/VersionHandlingTest.java
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/ResourceVersionDAO.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/ResourceVersionDAO.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/ResourceVersionDAO.java Wed May 7 03:40:06 2008
@@ -281,7 +281,7 @@
Connection conn = Transaction.getConnection();
String sql = "SELECT SNAPSHOT_ID FROM SNAPSHOT " +
- "WHERE ROOT_ID=(SELECT RID FROM RESOURCE WHERE PATH=?)";
+ "WHERE ROOT_ID=(SELECT RID FROM RESOURCE WHERE PATH=?) ORDER BY SNAPSHOT_ID DESC";
try {
PreparedStatement ps = conn.prepareStatement(sql);
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/RegistryServlet.java Wed May 7 03:40:06 2008
@@ -262,10 +262,10 @@
// if user is browsing an old version of the resource, we append it to the path, so that
// the backend registry gives the details of the version
- String qPart = request.getQueryString();
- if (qPart != null && qPart.startsWith("v")) {
- path = path + "?" + qPart;
- }
+ //String qPart = request.getQueryString();
+ //if (qPart != null && qPart.startsWith("v")) {
+ // path = path + "?" + qPart;
+ //}
ResourceRequestProcessor.processResourceGET(request, response, path);
}
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/ResourceRequestProcessor.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/ResourceRequestProcessor.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/ResourceRequestProcessor.java Wed May 7 03:40:06 2008
@@ -174,11 +174,7 @@
resourcePath = path.substring(0, path.indexOf("?"));
}
- if (userRegistry.resourceExists(resourcePath)) {
- return userRegistry.get(path);
- } else {
- return null;
- }
+ return userRegistry.get(path);
}
public static UserRegistry getUserRegistry(HttpServletRequest request)
Modified: trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
==============================================================================
--- trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java (original)
+++ trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java Wed May 7 03:40:06 2008
@@ -175,9 +175,9 @@
String[] versionPaths = registry.getVersions("/r5");
- Resource v1 = registry.get(versionPaths[0]);
+ Resource v1 = registry.get(versionPaths[2]);
Resource v2 = registry.get(versionPaths[1]);
- Resource v3 = registry.get(versionPaths[2]);
+ Resource v3 = registry.get(versionPaths[0]);
String content1 = new String((byte[])v1.getContent());
String content2 = new String((byte[])v2.getContent());
@@ -188,7 +188,7 @@
assertEquals("Content is not versioned properly.", content3, "New content2");
try {
- registry.restoreVersion(versionPaths[0]);
+ registry.restoreVersion(versionPaths[2]);
} catch (RegistryException e) {
fail("Valid restore version failed.");
}
@@ -272,8 +272,8 @@
String[] versionPaths = registry.getVersions("/c10");
- Resource c10v1 = registry.get(versionPaths[0]);
- Resource c10v2 = registry.get(versionPaths[1]);
+ Resource c10v1 = registry.get(versionPaths[1]);
+ Resource c10v2 = registry.get(versionPaths[0]);
String[] chidrenOfv1 = (String[])c10v1.getContent();
assertTrue("collection content is not versioned properly.",
@@ -285,7 +285,7 @@
assertTrue("collection content is not versioned properly.",
containsString(chidrenOfv2, "/c10/r2"));
- registry.restoreVersion(versionPaths[0]);
+ registry.restoreVersion(versionPaths[1]);
Resource restoredC10 = registry.get("/c10");
Modified: trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/VersionHandlingTest.java
==============================================================================
--- trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/VersionHandlingTest.java (original)
+++ trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/VersionHandlingTest.java Wed May 7 03:40:06 2008
@@ -78,12 +78,12 @@
String[] r1Versions = registry.getVersions("/v2/r1");
- Resource r1vv1 = registry.get(r1Versions[0]);
+ Resource r1vv1 = registry.get(r1Versions[1]);
assertEquals("r1's first version's content should be 'content 1'",
new String((byte[]) r1vv1.getContent()), "content 1");
- Resource r1vv2 = registry.get(r1Versions[1]);
+ Resource r1vv2 = registry.get(r1Versions[0]);
assertEquals("r1's second version's content should be 'content 2'",
new String((byte[]) r1vv2.getContent()), "content 2");
@@ -102,12 +102,12 @@
String[] r1Versions = registry.getVersions("/v4/r1");
- Resource r1vv1 = registry.get(r1Versions[0]);
+ Resource r1vv1 = registry.get(r1Versions[1]);
assertEquals("r1's first version should contain a property p1 with value v1",
r1vv1.getProperty("p1"), "v1");
- Resource r1vv2 = registry.get(r1Versions[1]);
+ Resource r1vv2 = registry.get(r1Versions[0]);
assertEquals("r1's second version should contain a property p1 with value v1",
r1vv2.getProperty("p1"), "v1");
@@ -161,7 +161,7 @@
registry.put("/test/v10/r1", r1e1);
String[] r1Versions = registry.getVersions("/test/v10/r1");
- registry.restoreVersion(r1Versions[0]);
+ registry.restoreVersion(r1Versions[1]);
Resource r1r1 = registry.get("/test/v10/r1");
@@ -191,7 +191,7 @@
String[] c1Versions = registry.getVersions("/test/v11/c1");
assertEquals("/test/v11/c1 should have 3 versions.", c1Versions.length, 3);
- registry.restoreVersion(c1Versions[0]);
+ registry.restoreVersion(c1Versions[2]);
Collection c1r1 = (Collection) registry.get("/test/v11/c1");
assertEquals("version 1 of c1 should not have any children", 0, c1r1.getChildren().length);
@@ -222,7 +222,7 @@
}
- registry.restoreVersion(c1Versions[2]);
+ registry.restoreVersion(c1Versions[0]);
Collection c1r3 = (Collection) registry.get("/test/v11/c1");
assertEquals("version 3 of c1 should have 2 children", 2, c1r3.getChildren().length);
@@ -266,7 +266,7 @@
String[] c1Versions = registry.getVersions("/test/v12/c1");
assertEquals("c1 should have 4 versions", c1Versions.length, 4);
- registry.restoreVersion(c1Versions[0]);
+ registry.restoreVersion(c1Versions[3]);
try {
registry.get("/test/v12/c1/c11");
@@ -274,7 +274,7 @@
} catch (RegistryException e) {
}
- registry.restoreVersion(c1Versions[1]);
+ registry.restoreVersion(c1Versions[2]);
try {
registry.get("/test/v12/c1/c11");
@@ -288,7 +288,7 @@
fail("Version 2 of c1 should have child c11/r1");
}
- registry.restoreVersion(c1Versions[2]);
+ registry.restoreVersion(c1Versions[1]);
Resource r1e2 = null;
try {
@@ -306,7 +306,7 @@
String r1e2Content = new String((byte[]) r1e2.getContent());
assertEquals("c11/r1 content should be 'r1c1", r1e2Content, "r1c1");
- registry.restoreVersion(c1Versions[3]);
+ registry.restoreVersion(c1Versions[0]);
Resource r1e3 = registry.get("/test/v12/c1/c11/r1");
String r1e3Content = new String((byte[]) r1e3.getContent());
More information about the Registry-dev
mailing list