Author: cziegeler
Date: Sat Aug 10 12:04:10 2013
New Revision: 1512660
URL: http://svn.apache.org/r1512660
Log:
SLING-2999 : JMX Resource Provider
Modified:
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/AttributesResource.java
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/RootResource.java
Modified:
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java?rev=1512660&r1=1512659&r2=1512660&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java
(original)
+++
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java
Sat Aug 10 12:04:10 2013
@@ -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 A
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 ) {
Modified:
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/AttributesResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/AttributesResource.java?rev=1512660&r1=1512659&r2=1512660&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/AttributesResource.java
(original)
+++
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/AttributesResource.java
Sat Aug 10 12:04:10 2013
@@ -21,7 +21,6 @@ package org.apache.sling.jmx.provider.im
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
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;
Modified:
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java?rev=1512660&r1=1512659&r2=1512660&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java
(original)
+++
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java
Sat Aug 10 12:04:10 2013
@@ -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 Abstr
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 ) {
Modified:
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/RootResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/RootResource.java?rev=1512660&r1=1512659&r2=1512660&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/RootResource.java
(original)
+++
sling/trunk/contrib/extensions/jmxprovider/src/main/java/org/apache/sling/jmx/provider/impl/RootResource.java
Sat Aug 10 12:04:10 2013
@@ -21,7 +21,6 @@ package org.apache.sling.jmx.provider.im
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 Abstra
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;
