[Registry-dev] svn commit r15522 - in
trunk/registry/modules/core/src: main/java/org/wso2/registry
main/java/org/wso2/registry/app main/java/org/wso2/registry/jdbc
main/java/org/wso2/registry/secure test/java/org/wso2/registry/jdbc
svn at wso2.org
svn at wso2.org
Thu Apr 3 04:46:18 PDT 2008
Author: azeez
Date: Thu Apr 3 04:46:00 2008
New Revision: 15522
Log:
Minor API improvement
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/Registry.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/AtomRegistry.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RemoteRegistry.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/JDBCRegistry.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/DependencyTest.java
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/Registry.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/Registry.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/Registry.java Thu Apr 3 04:46:00 2008
@@ -103,7 +103,7 @@
* @return List of Association
* @throws RegistryException : If something went wrong
*/
- Association[] getAllAssociation(String resourcePath) throws RegistryException;
+ Association[] getAllAssociations(String resourcePath) throws RegistryException;
/**
* Get all associations of the given resource for a give association type.
@@ -117,7 +117,7 @@
* @return List of Association
* @throws RegistryException : If something went wrong
*/
- Association[] getAllAssociation(String resourcePath, String associationType)
+ Association[] getAssociations(String resourcePath, String associationType)
throws RegistryException;
////////////////////////////////////////////////////////
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/app/AtomRegistry.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/app/AtomRegistry.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/app/AtomRegistry.java Thu Apr 3 04:46:00 2008
@@ -1031,9 +1031,9 @@
RequestContext request) throws RegistryException {
Association associations [] ;
if(associateType == null ){
- associations = getSecureRegistry(request).getAllAssociation(path);
+ associations = getSecureRegistry(request).getAllAssociations(path);
} else {
- associations = getSecureRegistry(request).getAllAssociation(path , associateType);
+ associations = getSecureRegistry(request).getAssociations(path , associateType);
}
Feed feed = getFeedInstance(abdera);
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 Thu Apr 3 04:46:00 2008
@@ -473,7 +473,7 @@
}
- public Association[] getAllAssociation(String resourcePath) throws RegistryException {
+ public Association[] getAllAssociations(String resourcePath) throws RegistryException {
Abdera abdera = new Abdera();
AbderaClient abderaClient = new AbderaClient(abdera);
ClientResponse clientResponse = abderaClient.get(baseURI +
@@ -500,7 +500,7 @@
return associations;
}
- public Association[] getAllAssociation(String resourcePath, String associationType) throws RegistryException {
+ public Association[] getAssociations(String resourcePath, String associationType) throws RegistryException {
Abdera abdera = new Abdera();
AbderaClient abderaClient = new AbderaClient(abdera);
ClientResponse clientResponse = abderaClient.get(baseURI +
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/JDBCRegistry.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/JDBCRegistry.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/JDBCRegistry.java Thu Apr 3 04:46:00 2008
@@ -643,7 +643,7 @@
}
}
- public Association[] getAllAssociation(String resourcePath) throws RegistryException {
+ public Association[] getAllAssociations(String resourcePath) throws RegistryException {
Connection conn = null;
try {
conn = getConnection();
@@ -668,7 +668,7 @@
}
}
- public Association[] getAllAssociation(String resourcePath, String associationType) throws RegistryException {
+ public Association[] getAssociations(String resourcePath, String associationType) throws RegistryException {
Connection conn = null;
try {
conn = getConnection();
Modified: trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java
==============================================================================
--- trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java (original)
+++ trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/SecureRegistry.java Thu Apr 3 04:46:00 2008
@@ -749,12 +749,12 @@
}
- public Association[] getAllAssociation(String resourcePath) throws RegistryException {
- return registry.getAllAssociation(resourcePath);
+ public Association[] getAllAssociations(String resourcePath) throws RegistryException {
+ return registry.getAllAssociations(resourcePath);
}
- public Association[] getAllAssociation(String resourcePath, String associationType) throws RegistryException {
- return registry.getAllAssociation(resourcePath, associationType);
+ public Association[] getAssociations(String resourcePath, String associationType) throws RegistryException {
+ return registry.getAssociations(resourcePath, associationType);
}
public void beginTransaction() throws RegistryException {
Modified: trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/DependencyTest.java
==============================================================================
--- trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/DependencyTest.java (original)
+++ trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/DependencyTest.java Thu Apr 3 04:46:00 2008
@@ -52,7 +52,7 @@
Resource r21 = registry.get("/depTest/test1/r1");
Resource r22 = registry.get("/depTest/test1/r2");
- Association association [] = registry.getAllAssociation(r21.getPath()) ;
+ Association association [] = registry.getAllAssociations(r21.getPath()) ;
assertNotNull(association);
boolean found = false;
for (int i = 0; i < association.length; i++) {
@@ -62,7 +62,7 @@
}
}
assertTrue(found);
- association = registry.getAllAssociation(r22.getPath()) ;
+ association = registry.getAllAssociations(r22.getPath()) ;
assertNotNull(association);
found = false;
for (int i = 0; i < association.length; i++) {
@@ -89,7 +89,7 @@
Resource r21 = registry.get("/depTest/test2/r1");
Resource r22 = registry.get("/depTest/test2/r2");
- Association association [] = registry.getAllAssociation(r21.getPath()) ;
+ Association association [] = registry.getAllAssociations(r21.getPath()) ;
assertNotNull(association);
boolean found = false;
for (int i = 0; i < association.length; i++) {
@@ -99,7 +99,7 @@
}
}
assertTrue(found);
- association = registry.getAllAssociation(r22.getPath()) ;
+ association = registry.getAllAssociations(r22.getPath()) ;
assertNotNull(association);
found = false;
for (int i = 0; i < association.length; i++) {
More information about the Registry-dev
mailing list