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:37 UTC
[sling-org-apache-sling-jmx-provider] annotated tag
org.apache.sling.jmx.provider-0.6.0 created (now 12c816a)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.jmx.provider-0.6.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git.
at 12c816a (tag)
tagging 1f814eed81a9d39a0b12f8f55c37b3ec721372c6 (commit)
by Carsten Ziegeler
on Sun Oct 20 14:07:14 2013 +0000
- Log -----------------------------------------------------------------
org.apache.sling.jmx.provider-0.6.0
-----------------------------------------------------------------------
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 1f814ee [maven-release-plugin] copy for tag org.apache.sling.jmx.provider-0.6.0
The 16 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] 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-0.6.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit 7bd8c1b4607230f4180cc350f34f93be8afc4bdd
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 1 09:43:50 2013 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1528011 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2fd384c..4e775dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,15 +28,15 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jmx.provider</artifactId>
- <version>0.5.0</version>
+ <version>0.5.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-0.5.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jmx.provider-0.5.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jmx.provider-0.5.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] 05/06: [maven-release-plugin]
prepare release org.apache.sling.jmx.provider-0.6.0
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-0.6.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit cf50332794d9f105f6721a26bf24d07770fc4e7b
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Oct 20 14:06:33 2013 +0000
[maven-release-plugin] prepare release org.apache.sling.jmx.provider-0.6.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1533903 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4e775dd..fcba229 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,15 +28,15 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jmx.provider</artifactId>
- <version>0.5.1-SNAPSHOT</version>
+ <version>0.6.0</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-0.6.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jmx.provider-0.6.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jmx.provider-0.6.0</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-3176 : ValueMap
of jmx resource should contain mbean attributes
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-0.6.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit 770d4a154dad49ec266a561dda1973d1f8aba1bb
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 15 16:44:53 2013 +0000
SLING-3176 : ValueMap of jmx resource should contain mbean attributes
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1532424 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/jmx/provider/impl/MBeanResource.java | 40 +++++++++++++++-------
1 file changed, 27 insertions(+), 13 deletions(-)
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 21aa8e3..d479f45 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
@@ -19,8 +19,11 @@
package org.apache.sling.jmx.provider.impl;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
+import javax.management.Attribute;
+import javax.management.AttributeList;
import javax.management.AttributeNotFoundException;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanAttributeInfo;
@@ -128,22 +131,33 @@ public class MBeanResource extends AbstractResource {
result.put(Constants.PROP_OBJECTNAME, this.objectName.getCanonicalName());
final MBeanAttributeInfo[] attribs = this.info.getAttributes();
+ final String[] names = new String[attribs.length];
+ int index = 0;
for(final MBeanAttributeInfo i : attribs) {
- Object value = null;
- try {
- value = this.mbeanServer.getAttribute(this.objectName, i.getName());
- if ( value != null ) {
- result.put(i.getName(), value);
+ names[index] = i.getName();
+ index++;
+ }
+ AttributeList values = null;
+ try {
+ values = this.mbeanServer.getAttributes(this.objectName, names);
+ if ( values != null ) {
+ final Iterator iter = values.iterator();
+ while ( iter.hasNext() ) {
+ final Attribute a = (Attribute)iter.next();
+ final Object value = a.getValue();
+ if ( value != null ) {
+ result.put(a.getName(), value);
+ }
}
- } catch (final AttributeNotFoundException e) {
- // ignore
- } catch (final InstanceNotFoundException e) {
- // ignore
- } catch (final MBeanException e) {
- // ignore
- } catch (final ReflectionException e) {
- // ignore
}
+ } catch (final AttributeNotFoundException e) {
+ // ignore
+ } catch (final InstanceNotFoundException e) {
+ // ignore
+ } catch (final MBeanException e) {
+ // ignore
+ } catch (final ReflectionException e) {
+ // ignore
}
return result;
--
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-0.6.0
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-0.6.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit 1f814eed81a9d39a0b12f8f55c37b3ec721372c6
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Oct 20 14:07:14 2013 +0000
[maven-release-plugin] copy for tag org.apache.sling.jmx.provider-0.6.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jmx.provider-0.6.0@1533905 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] 02/06: SLING-3176 : ValueMap
of jmx resource should contain mbean attributes
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-0.6.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit be725e14f1a29e1605f30a426e626ef44121a8ef
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 15 14:19:40 2013 +0000
SLING-3176 : ValueMap of jmx resource should contain mbean attributes
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1532351 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/jmx/provider/impl/Constants.java | 2 +-
.../jmx/provider/impl/JMXResourceProvider.java | 4 +--
.../sling/jmx/provider/impl/MBeanResource.java | 32 +++++++++++++++++++++-
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/jmx/provider/impl/Constants.java b/src/main/java/org/apache/sling/jmx/provider/impl/Constants.java
index 8bccecb..8f20f09 100644
--- a/src/main/java/org/apache/sling/jmx/provider/impl/Constants.java
+++ b/src/main/java/org/apache/sling/jmx/provider/impl/Constants.java
@@ -45,4 +45,4 @@ public abstract class Constants {
public static final String TYPE_MBEAN = "sling:mbean";
public static final String TYPE_MBEANS = "sling:mbeans";
-}
+}
\ No newline at end of file
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 bfdbd85..602fd35 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
@@ -142,7 +142,7 @@ public class JMXResourceProvider implements ResourceProvider {
}
} else {
if (info.pathInfo == null ) {
- return new MBeanResource(resourceResolver, this.convertObjectNameToResourcePath(info.objectName), path, info.mbeanInfo, info.objectName);
+ return new MBeanResource(this.mbeanServer, resourceResolver, this.convertObjectNameToResourcePath(info.objectName), path, info.mbeanInfo, info.objectName);
}
if ( info.pathInfo.equals("mbean:attributes") ) {
return new AttributesResource(resourceResolver, path);
@@ -231,7 +231,7 @@ public class JMXResourceProvider implements ResourceProvider {
final MBeanInfo info = mbeanServer.getMBeanInfo(on);
final String path = convertObjectNameToResourcePath(on);
final int sep = path.lastIndexOf('/');
- this.next = new MBeanResource(parent.getResourceResolver(), path, parent.getPath() + "/" + path.substring(sep + 1), info, on);
+ this.next = new MBeanResource(mbeanServer, parent.getResourceResolver(), path, parent.getPath() + "/" + path.substring(sep + 1), info, on);
} catch (final IntrospectionException e) {
// ignore
} catch (final InstanceNotFoundException e) {
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 1c778d9..21aa8e3 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
@@ -21,8 +21,14 @@ package org.apache.sling.jmx.provider.impl;
import java.util.HashMap;
import java.util.Map;
+import javax.management.AttributeNotFoundException;
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanAttributeInfo;
+import javax.management.MBeanException;
import javax.management.MBeanInfo;
+import javax.management.MBeanServer;
import javax.management.ObjectName;
+import javax.management.ReflectionException;
import org.apache.sling.api.resource.AbstractResource;
import org.apache.sling.api.resource.ResourceMetadata;
@@ -44,11 +50,16 @@ public class MBeanResource extends AbstractResource {
private final String resourceType;
- public MBeanResource(final ResourceResolver resolver,
+ /** The mbean server. */
+ private final MBeanServer mbeanServer;
+
+ public MBeanResource(final MBeanServer mbeanServer,
+ final ResourceResolver resolver,
final String resourceType,
final String path,
final MBeanInfo info,
final ObjectName objectName) {
+ this.mbeanServer = mbeanServer;
this.resourceResolver = resolver;
this.path = path;
this.info = info;
@@ -116,6 +127,25 @@ public class MBeanResource extends AbstractResource {
result.put(Constants.PROP_CLASSNAME, this.info.getClassName());
result.put(Constants.PROP_OBJECTNAME, this.objectName.getCanonicalName());
+ final MBeanAttributeInfo[] attribs = this.info.getAttributes();
+ for(final MBeanAttributeInfo i : attribs) {
+ Object value = null;
+ try {
+ value = this.mbeanServer.getAttribute(this.objectName, i.getName());
+ if ( value != null ) {
+ result.put(i.getName(), value);
+ }
+ } catch (final AttributeNotFoundException e) {
+ // ignore
+ } catch (final InstanceNotFoundException e) {
+ // ignore
+ } catch (final MBeanException e) {
+ // ignore
+ } catch (final ReflectionException e) {
+ // ignore
+ }
+ }
+
return result;
}
}
--
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: SLING-3176 : ValueMap
of jmx resource should contain mbean attributes
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-0.6.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit 6f5fc977b7bee0f2d15644cede1fe0b5a2e30c8b
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 15 16:56:48 2013 +0000
SLING-3176 : ValueMap of jmx resource should contain mbean attributes
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1532428 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java | 6 ------
1 file changed, 6 deletions(-)
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 d479f45..e062612 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
@@ -24,10 +24,8 @@ import java.util.Map;
import javax.management.Attribute;
import javax.management.AttributeList;
-import javax.management.AttributeNotFoundException;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanException;
import javax.management.MBeanInfo;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -150,12 +148,8 @@ public class MBeanResource extends AbstractResource {
}
}
}
- } catch (final AttributeNotFoundException e) {
- // ignore
} catch (final InstanceNotFoundException e) {
// ignore
- } catch (final MBeanException e) {
- // ignore
} catch (final ReflectionException e) {
// ignore
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.