(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.179 and 1.180

version 1.179, 2006/01/30 16:19:33 version 1.180, 2006/02/08 21:29:13
Line 181 
Line 181 
     }     }
  
     //defined in PegasusVersion.h     //defined in PegasusVersion.h
       virtual const char* getCompleteVersion() const
       {
         if (PEGASUS_PRODUCT_STATUS == "" )
           return PEGASUS_PRODUCT_VERSION;
         else
           return PEGASUS_PRODUCT_VERSION " " PEGASUS_PRODUCT_STATUS;
       }
   
       //defined in PegasusVersion.h
     virtual const char* getVersion() const     virtual const char* getVersion() const
     {     {
         return PEGASUS_PRODUCT_VERSION;         return PEGASUS_PRODUCT_VERSION;
Line 319 
Line 328 
     usage.append ("                    - sets CIM Server configuration property\n");     usage.append ("                    - sets CIM Server configuration property\n");
  
     cout << endl;     cout << endl;
     cout << _cimServerProcess->getProductName() << " " << _cimServerProcess->getVersion() << endl;      cout << _cimServerProcess->getProductName() << " " << _cimServerProcess->getCompleteVersion() << endl;
     cout << endl;     cout << endl;
  
 #if defined(PEGASUS_OS_TYPE_WINDOWS) #if defined(PEGASUS_OS_TYPE_WINDOWS)
Line 693 
Line 702 
             }             }
             else if(String::equal(arg,"--version"))             else if(String::equal(arg,"--version"))
             {             {
                 cout << _cimServerProcess->getVersion() << endl;                  cout << _cimServerProcess->getCompleteVersion() << endl;
                 exit(0);                 exit(0);
             }             }
             // Check for -option             // Check for -option
Line 708 
Line 717 
                 if (*option == OPTION_VERSION &&                 if (*option == OPTION_VERSION &&
                     strlen(option) == 1)                     strlen(option) == 1)
                 {                 {
                     cout << _cimServerProcess->getVersion() << endl;                      cout << _cimServerProcess->getCompleteVersion() << endl;
                     exit(0);                     exit(0);
                 }                 }
                 //                 //
Line 1168 
Line 1177 
     }     }
 #if defined(PEGASUS_DEBUG) #if defined(PEGASUS_DEBUG)
     // Put out startup up message.     // Put out startup up message.
     cout << _cimServerProcess->getProductName() << " " << _cimServerProcess->getVersion() << endl;      cout << _cimServerProcess->getProductName() << " " << _cimServerProcess->getCompleteVersion() << endl;
     //l10n     //l10n
     //cout << "Built " << __DATE__ << " " << __TIME__ << endl;     //cout << "Built " << __DATE__ << " " << __TIME__ << endl;
     //cout <<"Starting..."     //cout <<"Starting..."
Line 1454 
Line 1463 
             Logger::INFORMATION,             Logger::INFORMATION,
             "src.Server.cimserver.STARTED_VERSION",             "src.Server.cimserver.STARTED_VERSION",
             "Started $0 version $1.",             "Started $0 version $1.",
             _cimServerProcess->getProductName(), _cimServerProcess->getVersion());                        _cimServerProcess->getProductName(), _cimServerProcess->getCompleteVersion());
  
 #if defined(PEGASUS_OS_TYPE_UNIX) #if defined(PEGASUS_OS_TYPE_UNIX)
         if (daemonOption && !debugOutputOption)         if (daemonOption && !debugOutputOption)

Legend:
Removed from v.1.179  
changed lines
  Added in v.1.180
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2