(file) Return to cimserver.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Server

Diff for /pegasus/src/Server/cimserver.cpp between version 1.211.2.12 and 1.211.2.13

version 1.211.2.12, 2007/10/06 13:18:27 version 1.211.2.13, 2007/10/09 21:41:40
Line 89 
Line 89 
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Common/LanguageParser.h> #include <Pegasus/Common/LanguageParser.h>
 #include <Pegasus/Config/ConfigManager.h> #include <Pegasus/Config/ConfigManager.h>
 #include <Pegasus/Client/CIMClient.h>  
 #include <Pegasus/Server/CIMServer.h> #include <Pegasus/Server/CIMServer.h>
 #include <Service/ServerProcess.h> #include <Service/ServerProcess.h>
 #include <Service/ServerShutdownClient.h>  
 #include <Service/ServerRunStatus.h> #include <Service/ServerRunStatus.h>
  
   #if !defined(PEGASUS_REMOVE_SERVER_CLIENT_USAGE)
   # include <Pegasus/Client/CIMClient.h>
   # include <Service/ServerShutdownClient.h>
   #endif
   
 #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) #if defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM)
 #include <Pegasus/Common/SetFileDescriptorToEBCDICEncoding.h> #include <Pegasus/Common/SetFileDescriptorToEBCDICEncoding.h>
 #include <Service/ARM_zOS.h> #include <Service/ARM_zOS.h>
Line 819 
Line 822 
 #endif #endif
  
         //         //
       // Some platforms do not support using client to shutdown server.
       //
   #if !defined(PEGASUS_REMOVE_SERVER_CLIENT_USAGE)
           //
         // Check to see if we need to shutdown CIMOM         // Check to see if we need to shutdown CIMOM
         //         //
         if (shutdownOption)         if (shutdownOption)
Line 842 
Line 849 
             cout << MessageLoader::getMessage(parms) << endl;             cout << MessageLoader::getMessage(parms) << endl;
             return 0;             return 0;
         }         }
   #endif /* PEGASUS_REMOVE_SERVER_CLIENT_USAGE */
  
 #if defined(PEGASUS_DEBUG) && !defined(PEGASUS_USE_SYSLOGS) #if defined(PEGASUS_DEBUG) && !defined(PEGASUS_USE_SYSLOGS)
         // Leave this in until people get familiar with the logs.         // Leave this in until people get familiar with the logs.


Legend:
Removed from v.1.211.2.12  
changed lines
  Added in v.1.211.2.13

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2