/*
 * Copyright (c) 2010, Rickard Öberg. All Rights Reserved.
 *
 * Licensed 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.qi4j.library.jmx;

import java.util.List;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
import org.qi4j.api.service.ImportedServiceDescriptor;
import org.qi4j.api.service.ServiceImporter;
import org.qi4j.api.service.ServiceImporterException;

/**
 * Importer for the MBeanServer of the JVM. Either use the first server that can be located, or create a new one.
 */
public class MBeanServerImporter
    implements ServiceImporter
{
    public Object importService( ImportedServiceDescriptor serviceDescriptor )
        throws ServiceImporterException
    {
        List<MBeanServer> mbeanServers = MBeanServerFactory.findMBeanServer( null );
        if( mbeanServers.size() > 0 )
        {
            return mbeanServers.get( 0 );
        }
        else
        {
            return MBeanServerFactory.createMBeanServer("DefaultDomain");
        }
    }

    public boolean isActive( Object instance )
    {
        return true;
    }

    public boolean isAvailable( Object instance )
    {
        return true;
    }
}

@@ -643,112 +643,8 @@
 x;%0A%0A
-import java.util.List;%0Aimport javax.management.MBeanServer;%0Aimport javax.management.MBeanServerFactory;%0A
 impo
@@ -694,16 +694,16 @@
 riptor;%0A
+
 import o
@@ -794,16 +794,64 @@
 ption;%0A%0A
+import java.lang.management.ManagementFactory;%0A%0A
 /**%0A * I
@@ -1167,291 +1167,58 @@
     
-List%3CMBeanServer%3E mbeanServers = MBeanServerFactory.findMBeanServer( null );%0A        if( mbeanServers.size() %3E 0 )%0A        %7B%0A            return mbeanServers.get( 0 );%0A        %7D%0A        else%0A        %7B%0A            return MBeanServerFactory.createMBeanServer(%22DefaultDomain%22);%0A        %7D
+return ManagementFactory.getPlatformMBeanServer();
 %0A   

Use the Platform MBeanServer. This ensures that application MBeans are registered in the same MBeanServer as the platform MBeans.