This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit 50fe4fc883510b88e7f3dc21d21291598a007e21 Author: Carsten Ziegeler <[email protected]> AuthorDate: Sat Aug 10 12:04:10 2013 +0000 SLING-2999 : JMX Resource Provider git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1512660 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/sling/jmx/provider/impl/AttributeResource.java | 5 ++--- .../java/org/apache/sling/jmx/provider/impl/AttributesResource.java | 5 ++--- src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java | 5 ++--- src/main/java/org/apache/sling/jmx/provider/impl/RootResource.java | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java b/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java index f715d3b..6f761c6 100644 --- a/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java +++ b/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java @@ -28,7 +28,6 @@ import javax.management.ObjectName; import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; -import org.apache.sling.api.SlingConstants; import org.apache.sling.api.resource.AbstractResource; import org.apache.sling.api.resource.ResourceMetadata; import org.apache.sling.api.resource.ResourceResolver; @@ -105,9 +104,9 @@ public class AttributeResource extends AbstractResource { private Map<String, Object> getPropertiesMap() { final Map<String, Object> result = new HashMap<String, Object>(); - result.put(SlingConstants.PROPERTY_RESOURCE_TYPE, this.getResourceType()); + result.put(ResourceResolver.PROPERTY_RESOURCE_TYPE, this.getResourceType()); if ( this.getResourceSuperType() != null ) { - result.put(SlingConstants.PROPERTY_RESOURCE_SUPER_TYPE, this.getResourceSuperType()); + result.put("sling:resourceSuperType", this.getResourceSuperType()); } if ( info.getDescription() != null ) { diff --git a/src/main/java/org/apache/sling/jmx/provider/impl/AttributesResource.java b/src/main/java/org/apache/sling/jmx/provider/impl/AttributesResource.java index 976cd06..4214569 100644 --- a/src/main/java/org/apache/sling/jmx/provider/impl/AttributesResource.java +++ b/src/main/java/org/apache/sling/jmx/provider/impl/AttributesResource.java @@ -21,7 +21,6 @@ package org.apache.sling.jmx.provider.impl; import java.util.HashMap; import java.util.Map; -import org.apache.sling.api.SlingConstants; import org.apache.sling.api.resource.AbstractResource; import org.apache.sling.api.resource.ResourceMetadata; import org.apache.sling.api.resource.ResourceResolver; @@ -88,9 +87,9 @@ public class AttributesResource extends AbstractResource { private Map<String, Object> getPropertiesMap() { final Map<String, Object> result = new HashMap<String, Object>(); - result.put(SlingConstants.PROPERTY_RESOURCE_TYPE, this.getResourceType()); + result.put(ResourceResolver.PROPERTY_RESOURCE_TYPE, this.getResourceType()); if ( this.getResourceSuperType() != null ) { - result.put(SlingConstants.PROPERTY_RESOURCE_SUPER_TYPE, this.getResourceSuperType()); + result.put("sling:resourceSuperType", this.getResourceSuperType()); } return result; diff --git a/src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java b/src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java index c3a89b8..dbad5e7 100644 --- a/src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java +++ b/src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java @@ -23,7 +23,6 @@ import java.util.Map; import javax.management.MBeanInfo; -import org.apache.sling.api.SlingConstants; import org.apache.sling.api.resource.AbstractResource; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceMetadata; @@ -99,9 +98,9 @@ public class MBeanResource extends AbstractResource { private Map<String, Object> getPropertiesMap() { final Map<String, Object> result = new HashMap<String, Object>(); - result.put(SlingConstants.PROPERTY_RESOURCE_TYPE, this.getResourceType()); + result.put(ResourceResolver.PROPERTY_RESOURCE_TYPE, this.getResourceType()); if ( this.getResourceSuperType() != null ) { - result.put(SlingConstants.PROPERTY_RESOURCE_SUPER_TYPE, this.getResourceSuperType()); + result.put("sling:resourceSuperType", this.getResourceSuperType()); } if ( this.info.getDescription() != null ) { diff --git a/src/main/java/org/apache/sling/jmx/provider/impl/RootResource.java b/src/main/java/org/apache/sling/jmx/provider/impl/RootResource.java index b687e90..7d1ee38 100644 --- a/src/main/java/org/apache/sling/jmx/provider/impl/RootResource.java +++ b/src/main/java/org/apache/sling/jmx/provider/impl/RootResource.java @@ -21,7 +21,6 @@ package org.apache.sling.jmx.provider.impl; import java.util.HashMap; import java.util.Map; -import org.apache.sling.api.SlingConstants; import org.apache.sling.api.resource.AbstractResource; import org.apache.sling.api.resource.ResourceMetadata; import org.apache.sling.api.resource.ResourceResolver; @@ -88,9 +87,9 @@ public class RootResource extends AbstractResource { private Map<String, Object> getPropertiesMap() { final Map<String, Object> result = new HashMap<String, Object>(); - result.put(SlingConstants.PROPERTY_RESOURCE_TYPE, this.getResourceType()); + result.put(ResourceResolver.PROPERTY_RESOURCE_TYPE, this.getResourceType()); if ( this.getResourceSuperType() != null ) { - result.put(SlingConstants.PROPERTY_RESOURCE_SUPER_TYPE, this.getResourceSuperType()); + result.put("sling:resourceSuperType", this.getResourceSuperType()); } return result; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
