(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.99 and 1.102

version 1.99, 2003/08/11 20:53:35 version 1.102, 2003/08/17 23:37:03
Line 114 
Line 114 
 # include "cimserver_windows.cpp" # include "cimserver_windows.cpp"
 #elif defined(PEGASUS_OS_TYPE_UNIX) #elif defined(PEGASUS_OS_TYPE_UNIX)
 # if defined(PEGASUS_OS_OS400) # if defined(PEGASUS_OS_OS400)
   #  include "OS400ConvertChar.h"
 #  include "cimserver_os400.cpp" #  include "cimserver_os400.cpp"
 # else # else
 #  include "cimserver_unix.cpp" #  include "cimserver_unix.cpp"
Line 522 
Line 523 
 //l10n //l10n
  
 #ifdef PEGASUS_OS_OS400 #ifdef PEGASUS_OS_OS400
       // Convert the args to ASCII
       for(Uint32 i = 0;i< argc;++i)
       {
           EtoA(argv[i]);
       }
   
     // Initialize Pegasus home to the shipped OS/400 directory.     // Initialize Pegasus home to the shipped OS/400 directory.
     pegasusHome = OS400_DEFAULT_PEGASUS_HOME;     pegasusHome = OS400_DEFAULT_PEGASUS_HOME;
 #endif #endif
Line 530 
Line 537 
     //     //
     // Get environment variables:     // Get environment variables:
     //     //
   #ifdef PEGASUS_OS_OS400
   #pragma convert(37)
       const char* tmp = getenv("PEGASUS_HOME");
   #pragma convert(0)
       char home[256] = {0};
       if (tmp && strlen(tmp) < 256)
       {
           strcpy(home, tmp);
           EtoA(home);
           pegasusHome = home;
       }
   #else
     const char* tmp = getenv("PEGASUS_HOME");     const char* tmp = getenv("PEGASUS_HOME");
  
     if (tmp)     if (tmp)
     {     {
         pegasusHome = tmp;         pegasusHome = tmp;
     }     }
   #endif
  
     FileSystem::translateSlashes(pegasusHome);     FileSystem::translateSlashes(pegasusHome);
 #else #else
Line 1095 
Line 1115 
 #endif #endif
  
         Monitor monitor(true);         Monitor monitor(true);
           //monitor_2 monitor;
   
         CIMServer server(&monitor);         CIMServer server(&monitor);
  
   
   
         if (enableHttpConnection)         if (enableHttpConnection)
         {         {
             server.addAcceptor(false, portNumberHttp, false);             server.addAcceptor(false, portNumberHttp, false);
Line 1266 
Line 1290 
     }     }
     catch(Exception& e)     catch(Exception& e)
     {     {
   
         //l10n         //l10n
         //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,         //Logger::put(Logger::STANDARD_LOG, System::CIMSERVER, Logger::WARNING,
                     //"Error: $0", e.getMessage());                     //"Error: $0", e.getMessage());
Line 1279 
Line 1304 
         MessageLoaderParms parms("src.Server.cimserver.ERROR",         MessageLoaderParms parms("src.Server.cimserver.ERROR",
                                                          "Error: $0", e.getMessage());                                                          "Error: $0", e.getMessage());
         PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << PEGASUS_STD(endl);         PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << PEGASUS_STD(endl);
   
 #endif #endif
  
         //         //


Legend:
Removed from v.1.99  
changed lines
  Added in v.1.102

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2