You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:50:54 UTC
[sling-org-apache-sling-jmx-provider] annotated tag
org.apache.sling.jmx.provider-1.0.2 created (now 7fddf82)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.jmx.provider-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git.
at 7fddf82 (tag)
tagging c783d63b53372fc0c829a5b598cee88e0391ad4b (commit)
by Carsten Ziegeler
on Thu Mar 20 00:03:15 2014 +0000
- Log -----------------------------------------------------------------
org.apache.sling.jmx.provider-1.0.2
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 961d545 SLING-2999 : JMX Resource Provider
new 0a6ebb3 SLING-2999 : JMX Resource Provider
new 8b1df92 SLING-2999 : JMX Resource Provider
new 0ad522b SLING-2999 : JMX Resource Provider
new 32d3a34 SLING-2999 : JMX Resource Provider
new 94e5196 SLING-2999 : JMX Resource Provider
new 7cb48f0 SLING-2999 : JMX Resource Provider - initial support for tabular and composite data
new ecc0c20 SLING-2999 : JMX Resource Provider - add sorting of tabular data
new 99a4f03 Update to parent pom 18
new 4ea28ab [maven-release-plugin] prepare release org.apache.sling.jmx.provider-0.5.0
new 7bd8c1b [maven-release-plugin] prepare for next development iteration
new be725e1 SLING-3176 : ValueMap of jmx resource should contain mbean attributes
new 770d4a1 SLING-3176 : ValueMap of jmx resource should contain mbean attributes
new 6f5fc97 SLING-3176 : ValueMap of jmx resource should contain mbean attributes
new cf50332 [maven-release-plugin] prepare release org.apache.sling.jmx.provider-0.6.0
new b44bf14 [maven-release-plugin] prepare for next development iteration
new 53b4e4e SLING-3200 : Avoid duplicated requests to mbeans when creating resources
new caba701 SLING-3200 : Avoid duplicated requests to mbeans when creating resources
new 269ee17 SLING-3200 : Avoid duplicated requests to mbeans when creating resources
new 2ca89af Add metatype information
new 37e96a7 Add metatype information for resource access security
new 07c15c2 Make important properties private
new 1c8b0ca [maven-release-plugin] prepare release org.apache.sling.jmx.provider-1.0.0
new dbefd44 [maven-release-plugin] prepare for next development iteration
new 78042c6 SLING-3450 : JMX Resource Provider should not use instanceof checks
new 8785692 SLING-3451 : Support for deep reads from a value map
new 0e16cf7 Use released api for release
new 1f3c01a [maven-release-plugin] prepare release org.apache.sling.jmx.provider-1.0.2
new c783d63 [maven-release-plugin] copy for tag org.apache.sling.jmx.provider-1.0.2
The 29 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-jmx-provider] 06/06: [maven-release-plugin]
copy for tag org.apache.sling.jmx.provider-1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jmx.provider-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit c783d63b53372fc0c829a5b598cee88e0391ad4b
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Mar 20 00:03:15 2014 +0000
[maven-release-plugin] copy for tag org.apache.sling.jmx.provider-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jmx.provider-1.0.2@1579483 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jmx-provider] 04/06: Use released api for
release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jmx.provider-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit 0e16cf71111821d1180cef99212d3d60f0a48d8a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Mar 20 00:02:23 2014 +0000
Use released api for release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1579481 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ef3a62f..b98b674 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <version>2.7.0</version>
<scope>provided</scope>
</dependency>
<dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jmx-provider] 01/06: [maven-release-plugin]
prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jmx.provider-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit dbefd4478c65197a6582cd45c4a3f1945133a76c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Mar 5 11:21:19 2014 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1574440 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7aa6ac0..09fe8c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,15 +28,15 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jmx.provider</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling JMX Resource Provider</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jmx.provider-1.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jmx.provider-1.0.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jmx.provider-1.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/jmxprovider</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jmx-provider] 02/06: SLING-3450 : JMX
Resource Provider should not use instanceof checks
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jmx.provider-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit 78042c6b801415a354b8d97634dcd4020466a5b9
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Mar 13 12:27:13 2014 +0000
SLING-3450 : JMX Resource Provider should not use instanceof checks
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1577132 13f79535-47bb-0310-9956-ffa450edef68
---
.../jmx/provider/impl/JMXResourceProvider.java | 28 ++++++++++++++++------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/sling/jmx/provider/impl/JMXResourceProvider.java b/src/main/java/org/apache/sling/jmx/provider/impl/JMXResourceProvider.java
index f56aa13..63e9c08 100644
--- a/src/main/java/org/apache/sling/jmx/provider/impl/JMXResourceProvider.java
+++ b/src/main/java/org/apache/sling/jmx/provider/impl/JMXResourceProvider.java
@@ -154,11 +154,11 @@ public class JMXResourceProvider implements ResourceProvider {
return new MBeanResource(this.mbeanServer, resourceResolver, this.convertObjectNameToResourcePath(info.objectName), path, info.mbeanInfo, info.objectName);
}
if ( info.pathInfo.equals("mbean:attributes") ) {
- final MBeanResource parent = (MBeanResource)resourceResolver.getResource(ResourceUtil.getParent(path));
+ final MBeanResource parent = (MBeanResource)this.getResource(resourceResolver, ResourceUtil.getParent(path));
return new AttributesResource(resourceResolver, path, parent);
}
if ( info.pathInfo.startsWith("mbean:attributes/") ) {
- final Resource parentRsrc = resourceResolver.getResource(ResourceUtil.getParent(path));
+ final Resource parentRsrc = this.getResource(resourceResolver, ResourceUtil.getParent(path));
final AttributesResource parentAttributesResource;
final MBeanResource parentMBeanResource;
if ( parentRsrc instanceof AttributesResource ) {
@@ -303,12 +303,22 @@ public class JMXResourceProvider implements ResourceProvider {
};
} else {
if ( info.pathInfo == null ) {
- final MBeanResource parentResource = (MBeanResource)parent;
+ final MBeanResource parentResource;
+ if ( parent instanceof MBeanResource ) {
+ parentResource = (MBeanResource)parent;
+ } else {
+ parentResource = (MBeanResource)this.getResource(parent.getResourceResolver(), parent.getPath());
+ }
final List<Resource> list = new ArrayList<Resource>();
list.add(new AttributesResource(parent.getResourceResolver(), parent.getPath() + "/mbean:attributes", parentResource));
return list.iterator();
} else if ( info.pathInfo.equals("mbean:attributes") ) {
- final AttributesResource parentResource = (AttributesResource)parent;
+ final AttributesResource parentResource;
+ if ( parent instanceof AttributesResource ) {
+ parentResource = (AttributesResource)parent;
+ } else {
+ parentResource = (AttributesResource) this.getResource(parent.getResourceResolver(), parent.getPath());
+ }
final MBeanResource parentMBeanResource = (MBeanResource)parentResource.getParent();
final AttributeList result = parentMBeanResource.getAttributes();
@@ -338,11 +348,15 @@ public class JMXResourceProvider implements ResourceProvider {
}
};
} else if ( info.pathInfo.startsWith("mbean:attributes/") ) {
+ Resource checkParentResource = parent;
+ if ( !(checkParentResource instanceof AttributeResource) && !(checkParentResource instanceof MapResource ) ) {
+ checkParentResource = this.getResource(parent.getResourceResolver(), parent.getPath());
+ }
final AttributeResource parentResource;
- if ( parent instanceof AttributeResource ) {
- parentResource = (AttributeResource)parent;
+ if ( checkParentResource instanceof AttributeResource ) {
+ parentResource = (AttributeResource)checkParentResource;
} else {
- parentResource = ((MapResource)parent).getAttributeResource();
+ parentResource = ((MapResource)checkParentResource).getAttributeResource();
}
final String attrPath = info.pathInfo.substring("mbean:attributes/".length());
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jmx-provider] 05/06: [maven-release-plugin]
prepare release org.apache.sling.jmx.provider-1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jmx.provider-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit 1f3c01a475b15fb7a71514c48dc03024a7136c11
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Mar 20 00:03:13 2014 +0000
[maven-release-plugin] prepare release org.apache.sling.jmx.provider-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1579482 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index b98b674..8bec357 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,15 +28,15 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jmx.provider</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2</version>
<packaging>bundle</packaging>
<name>Apache Sling JMX Resource Provider</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/jmxprovider</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jmx.provider-1.0.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jmx.provider-1.0.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jmx.provider-1.0.2</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jmx-provider] 03/06: SLING-3451 : Support
for deep reads from a value map
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jmx.provider-1.0.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit 8785692e43ea332281ca722bac720d93aa61941e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Mar 14 13:49:55 2014 +0000
SLING-3451 : Support for deep reads from a value map
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1577531 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
.../java/org/apache/sling/jmx/provider/impl/AttributeResource.java | 3 ++-
.../java/org/apache/sling/jmx/provider/impl/AttributesResource.java | 3 ++-
src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java | 3 ++-
src/main/java/org/apache/sling/jmx/provider/impl/MapResource.java | 3 ++-
src/main/java/org/apache/sling/jmx/provider/impl/RootResource.java | 3 ++-
6 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 09fe8c0..ef3a62f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.5.0</version>
+ <version>2.6.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
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 eabf9d2..64d7e32 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
@@ -43,6 +43,7 @@ import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.wrappers.DeepReadValueMapDecorator;
import org.apache.sling.api.wrappers.ValueMapDecorator;
public class AttributeResource extends AbstractResource {
@@ -115,7 +116,7 @@ public class AttributeResource extends AbstractResource {
public <AdapterType> AdapterType adaptTo(final Class<AdapterType> type) {
if ( type == ValueMap.class || type == Map.class ) {
final Map<String, Object> propMap = this.getPropertiesMap();
- return (AdapterType) new ValueMapDecorator(propMap);
+ return (AdapterType) new DeepReadValueMapDecorator(this, new ValueMapDecorator(propMap));
}
return super.adaptTo(type);
}
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 b3d65f6..24490b7 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
@@ -26,6 +26,7 @@ import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.wrappers.DeepReadValueMapDecorator;
import org.apache.sling.api.wrappers.ValueMapDecorator;
public class AttributesResource extends AbstractResource {
@@ -88,7 +89,7 @@ public class AttributesResource extends AbstractResource {
public <AdapterType> AdapterType adaptTo(final Class<AdapterType> type) {
if ( type == ValueMap.class || type == Map.class ) {
final Map<String, Object> propMap = this.getPropertiesMap();
- return (AdapterType) new ValueMapDecorator(propMap);
+ return (AdapterType) new DeepReadValueMapDecorator(this, new ValueMapDecorator(propMap));
}
return super.adaptTo(type);
}
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 78c9e5a..2364541 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
@@ -35,6 +35,7 @@ import org.apache.sling.api.resource.AbstractResource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.wrappers.DeepReadValueMapDecorator;
import org.apache.sling.api.wrappers.ValueMapDecorator;
public class MBeanResource extends AbstractResource {
@@ -136,7 +137,7 @@ public class MBeanResource extends AbstractResource {
public <AdapterType> AdapterType adaptTo(final Class<AdapterType> type) {
if ( type == ValueMap.class || type == Map.class ) {
final Map<String, Object> propMap = this.getPropertiesMap();
- return (AdapterType) new ValueMapDecorator(propMap);
+ return (AdapterType) new DeepReadValueMapDecorator(this, new ValueMapDecorator(propMap));
}
return super.adaptTo(type);
}
diff --git a/src/main/java/org/apache/sling/jmx/provider/impl/MapResource.java b/src/main/java/org/apache/sling/jmx/provider/impl/MapResource.java
index 596f4e0..2e75e96 100644
--- a/src/main/java/org/apache/sling/jmx/provider/impl/MapResource.java
+++ b/src/main/java/org/apache/sling/jmx/provider/impl/MapResource.java
@@ -26,6 +26,7 @@ import org.apache.sling.api.resource.AbstractResource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.wrappers.DeepReadValueMapDecorator;
import org.apache.sling.api.wrappers.ValueMapDecorator;
public class MapResource extends AbstractResource {
@@ -98,7 +99,7 @@ public class MapResource extends AbstractResource {
public <AdapterType> AdapterType adaptTo(final Class<AdapterType> type) {
if ( type == ValueMap.class || type == Map.class ) {
final Map<String, Object> propMap = Collections.unmodifiableMap(this.properties);
- return (AdapterType) new ValueMapDecorator(propMap);
+ return (AdapterType) new DeepReadValueMapDecorator(this, new ValueMapDecorator(propMap));
}
return super.adaptTo(type);
}
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 34fd064..0a56c8a 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
@@ -25,6 +25,7 @@ import org.apache.sling.api.resource.AbstractResource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.wrappers.DeepReadValueMapDecorator;
import org.apache.sling.api.wrappers.ValueMapDecorator;
public class RootResource extends AbstractResource {
@@ -80,7 +81,7 @@ public class RootResource extends AbstractResource {
public <AdapterType> AdapterType adaptTo(final Class<AdapterType> type) {
if ( type == ValueMap.class || type == Map.class ) {
final Map<String, Object> propMap = this.getPropertiesMap();
- return (AdapterType) new ValueMapDecorator(propMap);
+ return (AdapterType) new DeepReadValueMapDecorator(this, new ValueMapDecorator(propMap));
}
return super.adaptTo(type);
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.