You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2015/08/12 07:31:45 UTC
svn commit: r1695420 - in /jackrabbit/oak/trunk/oak-pojosr/src:
main/java/org/apache/jackrabbit/oak/run/osgi/
test/groovy/org/apache/jackrabbit/oak/run/osgi/
Author: chetanm
Date: Wed Aug 12 05:31:44 2015
New Revision: 1695420
URL: http://svn.apache.org/r1695420
Log:
OAK-3214 - Enable registration of MBean via Aries JMX Whiteboard support
Added:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/MBeanIntegrationTest.groovy
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
Modified: jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java?rev=1695420&r1=1695419&r2=1695420&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactory.java Wed Aug 12 05:31:44 2015
@@ -19,12 +19,13 @@
package org.apache.jackrabbit.oak.run.osgi;
+import java.lang.management.ManagementFactory;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
+import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
@@ -35,14 +36,18 @@ import java.util.concurrent.TimeoutExcep
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.RepositoryFactory;
+import javax.management.Attribute;
+import javax.management.AttributeList;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.SettableFuture;
+import org.apache.commons.io.FilenameUtils;
import org.apache.felix.connect.launch.BundleDescriptor;
import org.apache.felix.connect.launch.ClasspathScanner;
import org.apache.felix.connect.launch.PojoServiceRegistry;
import org.apache.felix.connect.launch.PojoServiceRegistryFactory;
-import org.apache.commons.io.FilenameUtils;
import org.apache.jackrabbit.api.JackrabbitRepository;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import org.osgi.framework.BundleActivator;
@@ -198,6 +203,7 @@ public class OakOSGiRepositoryFactory im
processConfig(config);
PojoServiceRegistry registry = createServiceRegistry(config);
+ registerMBeanServer(registry);
startConfigTracker(registry, config);
preProcessRegistry(registry);
startBundles(registry, (String)config.get(REPOSITORY_BUNDLE_FILTER));
@@ -310,6 +316,35 @@ public class OakOSGiRepositoryFactory im
}
}
+ /**
+ * Registers the Platform MBeanServer as OSGi service. This would enable
+ * Aries JMX Whitboard support to then register the JMX MBean which are registered as OSGi service
+ * to be registered against the MBean server
+ */
+ private static void registerMBeanServer(PojoServiceRegistry registry) {
+ MBeanServer platformMBeanServer = ManagementFactory.getPlatformMBeanServer();
+ Hashtable<String, Object> mbeanProps = new Hashtable<String, Object>();
+ try {
+ ObjectName beanName = ObjectName.getInstance("JMImplementation:type=MBeanServerDelegate");
+ AttributeList attrs = platformMBeanServer.getAttributes(beanName,
+ new String[]{"MBeanServerId", "SpecificationName",
+ "SpecificationVersion", "SpecificationVendor",
+ "ImplementationName", "ImplementationVersion",
+ "ImplementationVendor"});
+ for (Object object : attrs) {
+ Attribute attr = (Attribute) object;
+ if (attr.getValue() != null) {
+ mbeanProps.put(attr.getName(), attr.getValue().toString());
+ }
+ }
+ } catch (Exception je) {
+ log.info("Cannot set service properties of Platform MBeanServer service, registering without",
+ je);
+ }
+ registry.registerService(MBeanServer.class.getName(),
+ platformMBeanServer, mbeanProps);
+ }
+
private static class RepositoryTracker extends ServiceTracker<Repository, Repository> {
private final SettableFuture<Repository> repoFuture;
private final PojoServiceRegistry registry;
Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy?rev=1695420&r1=1695419&r2=1695420&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/AbstractRepositoryFactoryTest.groovy Wed Aug 12 05:31:44 2015
@@ -52,7 +52,7 @@ abstract class AbstractRepositoryFactory
workDir = tmpFolder.getRoot();
config = [
(REPOSITORY_HOME): workDir.absolutePath,
- (REPOSITORY_STARTUP_TIMEOUT) : 2,
+ (REPOSITORY_STARTUP_TIMEOUT) : 60,
(REPOSITORY_BUNDLE_FILTER) : '''
(|
(Bundle-SymbolicName=org.apache.jackrabbit*)
Added: jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/MBeanIntegrationTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/MBeanIntegrationTest.groovy?rev=1695420&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/MBeanIntegrationTest.groovy (added)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/MBeanIntegrationTest.groovy Wed Aug 12 05:31:44 2015
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.run.osgi
+
+import org.apache.jackrabbit.oak.api.jmx.RepositoryManagementMBean;
+import org.junit.Before
+import org.junit.Test
+
+import javax.management.MBeanServer
+import javax.management.ObjectInstance
+import javax.management.ObjectName
+import javax.management.Query
+import javax.management.QueryExp
+import java.lang.management.ManagementFactory;
+
+import static org.apache.jackrabbit.oak.run.osgi.OakOSGiRepositoryFactory.REPOSITORY_CONFIG_FILE;
+
+public class MBeanIntegrationTest extends AbstractRepositoryFactoryTest {
+ @Before
+ void setupRepo() {
+ config[REPOSITORY_CONFIG_FILE] = createConfigValue("oak-base-config.json", "oak-tar-config.json")
+ }
+
+ @Test
+ public void jmxIntegration() throws Exception{
+ repository = repositoryFactory.getRepository(config)
+ MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+ QueryExp q = Query.isInstanceOf(Query.value(RepositoryManagementMBean.class.name))
+ Set<ObjectInstance> mbeans = server.queryMBeans(new ObjectName("org.apache.jackrabbit.oak:*"), q)
+ assert mbeans.size() == 1
+ }
+}