*** old/src/share/vm/services/diagnosticCommand.cpp	Mon Sep 17 16:14:40 2012
--- new/src/share/vm/services/diagnosticCommand.cpp	Mon Sep 17 16:14:38 2012

*** 41,53 ****
--- 41,53 ----
    DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<PrintSystemPropertiesDCmd>(true, false));
    DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<PrintVMFlagsDCmd>(true, false));
    DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VMUptimeDCmd>(true, false));
    DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemGCDCmd>(true, false));
    DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<RunFinalizationDCmd>(true, false));
! #ifndef SERVICES_KERNEL   // Heap dumping not supported
! #if INCLUDE_SERVICES // Heap dumping supported
    DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapDumpDCmd>(true, false));
! #endif // SERVICES_KERNEL
! #endif // INCLUDE_SERVICES
    DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHistogramDCmd>(true, false));
    DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ThreadDumpDCmd>(true, false));
  
    //Enhanced JMX Agent Support
    DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStartRemoteDCmd>(true,false));

*** 250,260 ****
--- 250,260 ----
    JavaCalls::call_static(&result, klass,
                           vmSymbols::run_finalization_name(),
                           vmSymbols::void_method_signature(), CHECK);
  }
  
! #ifndef SERVICES_KERNEL   // Heap dumping not supported
! #if INCLUDE_SERVICES // Heap dumping supported
  HeapDumpDCmd::HeapDumpDCmd(outputStream* output, bool heap) :
                             DCmdWithParser(output, heap),
    _filename("filename","Name of the dump file", "STRING",true),
    _all("-all", "Dump all objects, including unreachable objects",
         "BOOLEAN", false, "false") {

*** 290,300 ****
--- 290,300 ----
      return dcmd->_dcmdparser.num_arguments();
    } else {
      return 0;
    }
  }
! #endif // SERVICES_KERNEL
! #endif // INCLUDE_SERVICES
  
  ClassHistogramDCmd::ClassHistogramDCmd(outputStream* output, bool heap) :
                                         DCmdWithParser(output, heap),
    _all("-all", "Inspect all objects, including unreachable objects",
         "BOOLEAN", false, "false") {