pegasus/src/Server/cimserver.cpp - diff

Return to cimserver.cpp CVS log

Up to [Pegasus] / pegasus / src / Server

Diff for /pegasus/src/Server/cimserver.cpp between version 1.224 and 1.230

version 1.224, 2008/11/11 04:59:56

version 1.230, 2009/02/11 05:49:14

Line 1

//%2006////////////////////////////////////////////////////////////////////////

//%LICENSE////////////////////////////////////////////////////////////////

// Licensed to The Open Group (TOG) under one or more contributor license

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with

// this work for additional information regarding copyright ownership.

// IBM Corp.; EMC Corporation, The Open Group.

// Each contributor licenses this file to you under the OpenPegasus Open

// Source License; you may not use this file except in compliance with the

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// License.

// EMC Corporation; VERITAS Software Corporation; The Open Group.

// Permission is hereby granted, free of charge, to any person obtaining a

// copy of this software and associated documentation files (the "Software"),

// EMC Corporation; Symantec Corporation; The Open Group.

// to deal in the Software without restriction, including without limitation

// the rights to use, copy, modify, merge, publish, distribute, sublicense,

// Permission is hereby granted, free of charge, to any person obtaining a copy

// and/or sell copies of the Software, and to permit persons to whom the

// of this software and associated documentation files (the "Software"), to

// Software is furnished to do so, subject to the following conditions:

// deal in the Software without restriction, including without limitation the

// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

// The above copyright notice and this permission notice shall be included

// sell copies of the Software, and to permit persons to whom the Software is

// in all copies or substantial portions of the Software.

// furnished to do so, subject to the following conditions:

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN

// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED

// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

//==============================================================================

//////////////////////////////////////////////////////////////////////////

//%/////////////////////////////////////////////////////////////////////////////

Line 277

Line 275

usage.append(" [ [ options ] | [ configProperty=value, ... ] ]\n");

usage.append(" options\n");

usage.append(" -v, --version - displays CIM Server version number\n");

usage.append(" --status - displays the running status of"

" the CIM Server\n");

usage.append(" -h, --help - prints this help message\n");

usage.append(" -s - shuts down CIM Server\n");

#if !defined(PEGASUS_USE_RELEASE_DIRS)

Line 505

#endif /* !defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) */

// Get help, version, and shutdown options

// Get help, version, status and shutdown options

for (int i = 1; i < argc; )

{

Line 516

Executor::daemonizeExecutor();

exit(0);

}

if (strcmp(arg, "--status") == 0)

{

int retValue = 0;

if (_serverRunStatus.isServerRunning())

{

MessageLoaderParms parms(

"src.Server.cimserver.CIMSERVER_RUNNING",

"The CIM Server is running.");

cout << MessageLoader::getMessage(parms) << endl;

}

else

{

MessageLoaderParms parms(

"src.Server.cimserver.CIMSERVER_NOT_RUNNING",

"The CIM Server is not running.");

cout << MessageLoader::getMessage(parms) << endl;

retValue = 2;

}

Executor::daemonizeExecutor();

exit(retValue);

}

else if (strcmp(arg, "--version") == 0)

{

cout << _cimServerProcess->getCompleteVersion() << endl;

Line 1013

Line 1034

portNumberHttp = System::lookupPort(

WBEM_HTTP_SERVICE_NAME, WBEM_DEFAULT_HTTP_PORT);

char strHttpPort[22];

Uint32 n;

const char *startP = Uint32ToString(

strHttpPort,

portNumberHttp,

n);

configManager->initCurrentValue("httpPort", String(startP, n));

}

else

{

Line 1038

Line 1066

_cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION,

portNumberHttp, false);

}

// The port number is converted to a string to avoid the

// addition of localized characters (e.g., "5,988").

char scratchBuffer[22];

Uint32 n;

const char * portNumberHttpStr = Uint32ToString(

Line 1065

Line 1094

portNumberHttps = System::lookupPort(

WBEM_HTTPS_SERVICE_NAME, WBEM_DEFAULT_HTTPS_PORT);

char strHttpsPort[22];

Uint32 n;

const char *startP = Uint32ToString(

strHttpsPort,

portNumberHttps,

n);

configManager->initCurrentValue("httpsPort", String(startP, n));

}

else

{

Line 1089

Line 1125

_cimServer->addAcceptor(HTTPAcceptor::IPV4_CONNECTION,

portNumberHttps, true);

}

// The port number is converted to a string to avoid the

// addition of localized characters (e.g., "5,989").

char scratchBuffer[22];

Uint32 n;

const char * portNumberHttpsStr = Uint32ToString(

Legend:

Removed from v.1.224
changed lines
	Added in v.1.230

No CVS admin address has been configured