Author: deepal
Date: Sun Dec 16 22:16:49 2007
New Revision: 11202
Log:
changed the constructor to feed the remote location of the registry
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAPPTargetResolver.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RemoteRegistry.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/JettyBasedServerTest.java
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAPPTargetResolver.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAPPTargetResolver.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryAPPTargetResolver.java
Sun Dec 16 22:16:49 2007
@@ -25,15 +25,10 @@
public RegistryAPPTargetResolver() {
setPattern("/atom(\\?[^#]*)?", TargetType.TYPE_COLLECTION);
-// setPattern("/atom([^/#?]+)(\\?[^#]*)?", TargetType.TYPE_ENTRY);
-// setPattern("/atom/([^/#?]+)(\\?[^#]*)?", TargetType.TYPE_COLLECTION);
setPattern("/atom/([^/#?]*)", TargetType.TYPE_COLLECTION);
-// setPattern("/atom/([^/#?]+)(\\?[^#]*)?", TargetType.TYPE_ENTRY);
-
//Working
setPattern("/atom/(.*)/([^/#?]+)(\\?[^#]*)?",
TargetType.TYPE_COLLECTION);
setPattern("/atom/(.*)([^/#?]+)(\\?[^#]*)?",
TargetType.TYPE_COLLECTION);
-
setPattern("/feed(\\?[^#]*)?", TargetType.TYPE_ENTRY);
setPattern("/feed/([^/#?]*)", TargetType.TYPE_ENTRY);
setPattern("/feed/(.*)/([^/#?]+)(\\?[^#]*)?", TargetType.TYPE_ENTRY);
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RemoteRegistry.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RemoteRegistry.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RemoteRegistry.java
Sun Dec 16 22:16:49 2007
@@ -31,6 +31,7 @@
import javax.xml.namespace.QName;
import java.io.ByteArrayInputStream;
+import java.net.URL;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -38,18 +39,28 @@
public class RemoteRegistry implements Registry {
- private static final String COLLECTION_ROOT =
"http://localhost:8080/wso2registry/atom";;
- private static final String ENTRY_ROOT =
"http://localhost:8080/wso2registry/feed";;
+ private String collectionRoot = "http://localhost:8080/wso2registry/atom";;
+ private String entryRoot = "http://localhost:8080/wso2registry/feed";;
private Log log = LogFactory.getLog(RemoteRegistry.class);
- public RemoteRegistry() throws RegistryException {
- //TODO , when creating the remote registry need to give the URL for
the registry
+ /**
+ * To create a remote registry need to provide a URL of a remote registry
and the URL
+ * should be something like
+ * http://localhost:8080/wso2registry
+ * NOTE : Should not have "/" after the wso2registry part
+ * @param registryURL : URL to the registry
+ * @throws RegistryException
+ */
+ public RemoteRegistry(URL registryURL) throws RegistryException {
+ String url = registryURL.toString();
+ collectionRoot = url + "/atom";
+ entryRoot = url + "/feed";
}
public Resource get(String path) throws RegistryException {
Abdera abdera = new Abdera();
AbderaClient abderaClient = new AbderaClient(abdera);
- ClientResponse clientResponse = abderaClient.get(COLLECTION_ROOT +
path);
+ ClientResponse clientResponse = abderaClient.get(collectionRoot +
path);
if (clientResponse.getType() == Response.ResponseType.SERVER_ERROR) {
throw new RegistryException("Resource Not found , please check the
resource path" + path);
}
@@ -60,7 +71,7 @@
if (feed.getSubtitle() != null &&
feed.getSubtitle().equals("Deleted")) {
throw new RegistryException("Resource not available.");
}
-
+
return createResourceFromFeed(feed);
}
@@ -76,7 +87,7 @@
resource.setProperty(key, feed.getAttributeValue(key));
}
}
- if (feed.getAuthor() !=null) {
+ if (feed.getAuthor() != null) {
resource.setAuthorUserName(feed.getAuthor().getName());
}
resource.setLastModified(feed.getUpdated());
@@ -122,8 +133,8 @@
AbderaClient abderaClient = new AbderaClient(abdera);
Entry entry = abdera.getFactory().newEntry();
entry.setTitle(path);
-
if(RegistryConstants.SQL_QUERY_MEDIA_TYPE.equals(resource.getMediaType()) ) {
- entry.setAttributeValue("mediaType" ,
RegistryConstants.SQL_QUERY_MEDIA_TYPE);
+ if
(RegistryConstants.SQL_QUERY_MEDIA_TYPE.equals(resource.getMediaType())) {
+ entry.setAttributeValue("mediaType",
RegistryConstants.SQL_QUERY_MEDIA_TYPE);
}
entry.setSummary(resource.getDescription());
entry.addAuthor(resource.getAuthorUserName());
@@ -150,7 +161,7 @@
entry.setContent((String) content);
}
}
- ClientResponse resp = abderaClient.post(COLLECTION_ROOT + path, entry);
+ ClientResponse resp = abderaClient.post(collectionRoot + path, entry);
if (resp.getType() == Response.ResponseType.SUCCESS) {
log.info("Resource added " + path);
} else {
@@ -162,7 +173,7 @@
public void delete(String path) throws RegistryException {
Abdera abdera = new Abdera();
AbderaClient abderaClient = new AbderaClient(abdera);
- ClientResponse resp = abderaClient.delete(ENTRY_ROOT + path);
+ ClientResponse resp = abderaClient.delete(entryRoot + path);
if (resp.getType() == Response.ResponseType.SUCCESS) {
log.info("Resource deleted " + path);
} else {
@@ -174,7 +185,7 @@
public String[] getVersions(String path) throws RegistryException {
Abdera abdera = new Abdera();
AbderaClient abderaClient = new AbderaClient(abdera);
- ClientResponse clientResponse = abderaClient.get(COLLECTION_ROOT +
path + "?" +
+ ClientResponse clientResponse = abderaClient.get(collectionRoot + path
+ "?" +
RegistryConstants.PARAMETER_VERSION);
Document introspection =
clientResponse.getDocument();
@@ -194,7 +205,7 @@
entry.setSummary(RegistryConstants.PARAMETER_RESTORE);
entry.setContent(versionPath);
entry.setAttributeValue("directory", "false");
- ClientResponse resp = abderaClient.put(ENTRY_ROOT, entry);
+ ClientResponse resp = abderaClient.put(entryRoot, entry);
if (resp.getType() == Response.ResponseType.SUCCESS) {
log.info("Resource restored " + versionPath);
} else {
@@ -211,7 +222,7 @@
entry.setSummary(RegistryConstants.PARAMETER_TAGS);
entry.setContent(tag);
entry.setAttributeValue("directory", "false");
- ClientResponse resp = abderaClient.put(ENTRY_ROOT, entry);
+ ClientResponse resp = abderaClient.put(entryRoot, entry);
if (resp.getType() == Response.ResponseType.SUCCESS) {
log.info("Resource tagged " + resourcePath);
} else {
@@ -224,7 +235,7 @@
public TaggedResourcePath[] getResourcePathsWithTag(String tag) throws
RegistryException {
Abdera abdera = new Abdera();
AbderaClient abderaClient = new AbderaClient(abdera);
- ClientResponse clientResponse = abderaClient.get(COLLECTION_ROOT + "?"
+
+ ClientResponse clientResponse = abderaClient.get(collectionRoot + "?" +
RegistryConstants.PARAMETER_TAG_PATHS + "=" + tag);
Document introspection =
clientResponse.getDocument();
@@ -247,7 +258,7 @@
public Tag[] getTags(String resourcePath) throws RegistryException {
Abdera abdera = new Abdera();
AbderaClient abderaClient = new AbderaClient(abdera);
- ClientResponse clientResponse = abderaClient.get(COLLECTION_ROOT +
resourcePath + "?" +
+ ClientResponse clientResponse = abderaClient.get(collectionRoot +
resourcePath + "?" +
RegistryConstants.PARAMETER_TAGS);
Document introspection =
clientResponse.getDocument();
@@ -274,7 +285,7 @@
entry.setTitle(path);
entry.setContent(tag);
entry.setSummary(RegistryConstants.PARAMETER_TAGS_REMOVED);
- ClientResponse resp = abderaClient.put(ENTRY_ROOT, entry);
+ ClientResponse resp = abderaClient.put(entryRoot, entry);
if (resp.getType() == Response.ResponseType.SUCCESS) {
log.info("Tag removed " + path);
} else {
@@ -292,7 +303,7 @@
entry.setUpdated(comment.getCommentedTime());
entry.addAuthor(comment.getCommentedUser());
entry.setContent(comment.getCommentText());
- ClientResponse resp = abderaClient.put(ENTRY_ROOT, entry);
+ ClientResponse resp = abderaClient.put(entryRoot, entry);
if (resp.getType() == Response.ResponseType.SUCCESS) {
log.info("Resource commented " + resourcePath);
} else {
@@ -305,7 +316,7 @@
public Comment[] getComments(String resourcePath) throws RegistryException
{
Abdera abdera = new Abdera();
AbderaClient abderaClient = new AbderaClient(abdera);
- ClientResponse clientResponse = abderaClient.get(COLLECTION_ROOT +
resourcePath + "?" +
+ ClientResponse clientResponse = abderaClient.get(collectionRoot +
resourcePath + "?" +
RegistryConstants.PARAMETER_COMMENTS);
Document introspection =
clientResponse.getDocument();
@@ -334,7 +345,7 @@
entry.setTitle(resourcePath);
entry.setContent("" + rating);
entry.setSummary(RegistryConstants.PARAMETER_REATINGS);
- ClientResponse resp = abderaClient.put(ENTRY_ROOT, entry);
+ ClientResponse resp = abderaClient.put(entryRoot, entry);
if (resp.getType() == Response.ResponseType.SUCCESS) {
log.info("Resource rated " + resourcePath);
} else {
@@ -346,7 +357,7 @@
public float getAverageRating(String resourcePath) throws
RegistryException {
Abdera abdera = new Abdera();
AbderaClient abderaClient = new AbderaClient(abdera);
- ClientResponse clientResponse = abderaClient.get(COLLECTION_ROOT +
resourcePath + "?" +
+ ClientResponse clientResponse = abderaClient.get(collectionRoot +
resourcePath + "?" +
RegistryConstants.PARAMETER_AVARAGE_REATINGS);
Document introspection =
clientResponse.getDocument();
@@ -358,7 +369,7 @@
public int getRating(String path, String userName) throws
RegistryException {
Abdera abdera = new Abdera();
AbderaClient abderaClient = new AbderaClient(abdera);
- ClientResponse clientResponse = abderaClient.get(COLLECTION_ROOT +
path + "/" + userName + "?" +
+ ClientResponse clientResponse = abderaClient.get(collectionRoot + path
+ "/" + userName + "?" +
RegistryConstants.PARAMETER_REATINGS);
Document introspection =
clientResponse.getDocument();
@@ -375,7 +386,7 @@
entry.setTitle(path);
entry.setSummary(RegistryConstants.PARAMETER_QUERY);
entry.setContent(encodeParametesAsString(parameters));
- ClientResponse resp = abderaClient.put(ENTRY_ROOT, entry);
+ ClientResponse resp = abderaClient.put(entryRoot, entry);
Document introspection =
resp.getDocument();
Feed feed = (Feed) introspection.getRoot();
@@ -405,7 +416,7 @@
Date from,
Date to,
boolean recentFirst) throws RegistryException {
-
+
Abdera abdera = new Abdera();
AbderaClient abderaClient = new AbderaClient(abdera);
Entry entry = abdera.getFactory().newEntry();
@@ -415,7 +426,7 @@
entry.setSummary(RegistryConstants.PARAMETER_LOGS);
entry.setContent(resourcePath);
entry.addAuthor(userName);
- ClientResponse resp = abderaClient.put(ENTRY_ROOT, entry);
+ ClientResponse resp = abderaClient.put(entryRoot, entry);
Document introspection =
resp.getDocument();
Feed feed = (Feed) introspection.getRoot();
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
Sun Dec 16 22:16:49 2007
@@ -33,6 +33,7 @@
import org.wso2.usermanager.Realm;
import javax.servlet.ServletException;
+import java.net.URL;
//This test case run all the test cases that there in JDBCRegistry using
RemoteRegistry
@@ -45,7 +46,7 @@
try {
if (registry == null) {
initJetty();
- registry = new RemoteRegistry();
+ registry = new RemoteRegistry(new
URL("http://localhost:8080/wso2registry/";));
}
} catch (Exception e) {
fail("Failed to initialize the registry.");
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
