You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2015/05/15 07:34:51 UTC
stratos git commit: rename application-applications
Repository: stratos
Updated Branches:
refs/heads/master 4de6b0285 -> 63a7c8b03
rename application-applications
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/63a7c8b0
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/63a7c8b0
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/63a7c8b0
Branch: refs/heads/master
Commit: 63a7c8b03717dd31ab8775c96a4785c22c415d6c
Parents: 4de6b02
Author: Udara Liyanage <ud...@wso2.com>
Authored: Fri May 15 11:04:13 2015 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Fri May 15 11:04:34 2015 +0530
----------------------------------------------------------------------
.../metadata/service/handlers/OAuthHandler.java | 2 +-
.../metadata/service/registry/CarbonRegistry.java | 2 +-
.../metadata/service/services/MetaDataAdmin.java | 16 ++++++++--------
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/63a7c8b0/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/OAuthHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/OAuthHandler.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/OAuthHandler.java
index c53a157..1d3379f 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/OAuthHandler.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/handlers/OAuthHandler.java
@@ -43,7 +43,7 @@ import java.security.interfaces.RSAPublicKey;
*/
public class OAuthHandler extends AbstractAuthenticationAuthorizationHandler {
public static final String BEARER = "Bearer ";
- public static final String APPLICATION = "application";
+ public static final String APPLICATION = "applications";
private static Log log = LogFactory.getLog(OAuthHandler.class);
private static String SUPPORTED_AUTHENTICATION_TYPE = "Bearer";
private static String oauthValidationEndpoint;
http://git-wip-us.apache.org/repos/asf/stratos/blob/63a7c8b0/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java
index a84ea79..ae28fd2 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/CarbonRegistry.java
@@ -134,7 +134,7 @@ public class CarbonRegistry implements DataStore {
if (registry.resourceExists(resourcePath)) {
nodeResource = registry.get(resourcePath);
} else {
- nodeResource = registry.newResource();
+ nodeResource = registry.newCollection();
if (log.isDebugEnabled()) {
log.debug("Registry resource is create at path for application: " + nodeResource.getPath());
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/63a7c8b0/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/services/MetaDataAdmin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/services/MetaDataAdmin.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/services/MetaDataAdmin.java
index 2a4360c..44d2ae7 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/services/MetaDataAdmin.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/services/MetaDataAdmin.java
@@ -49,7 +49,7 @@ public class MetaDataAdmin {
}
@GET
- @Path("/application/{application_id}/properties")
+ @Path("/applications/{application_id}/properties")
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@@ -81,7 +81,7 @@ public class MetaDataAdmin {
}
@GET
- @Path("/application/{application_id}/cluster/{cluster_id}/properties")
+ @Path("/applications/{application_id}/clusters/{cluster_id}/properties")
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@@ -112,7 +112,7 @@ public class MetaDataAdmin {
}
@GET
- @Path("/application/{application_id}/properties/{property_name}")
+ @Path("/applications/{application_id}/properties/{property_name}")
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@@ -150,7 +150,7 @@ public class MetaDataAdmin {
}
@GET
- @Path("/application/{application_id}/cluster/{cluster_id}/properties/{property_name}")
+ @Path("/applications/{application_id}/cluster/{cluster_id}/properties/{property_name}")
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@@ -185,7 +185,7 @@ public class MetaDataAdmin {
}
@POST
- @Path("application/{application_id}/properties")
+ @Path("applications/{application_id}/properties")
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@@ -205,7 +205,7 @@ public class MetaDataAdmin {
}
@POST
- @Path("application/{application_id}/cluster/{cluster_id}/properties")
+ @Path("applications/{application_id}/clusters/{cluster_id}/properties")
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@@ -226,7 +226,7 @@ public class MetaDataAdmin {
}
@DELETE
- @Path("application/{application_id}/properties")
+ @Path("applications/{application_id}/properties")
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
@@ -250,7 +250,7 @@ public class MetaDataAdmin {
}
@DELETE
- @Path("application/{application_id}/properties/{property_name}/value/{value}")
+ @Path("applications/{application_id}/properties/{property_name}/value/{value}")
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")