pegasus/src/Pegasus/ControlProviders/InteropProvider/Namespace.cpp - diff

Return to Namespace.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / ControlProviders / InteropProvider

Diff for /pegasus/src/Pegasus/ControlProviders/InteropProvider/Namespace.cpp between version 1.8.4.1 and 1.13

version 1.8.4.1, 2008/07/01 15:18:17

version 1.13, 2008/12/01 17:50:33

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 127

Line 125

CIMInstance instanceskel = buildInstanceSkeleton(

PEGASUS_NAMESPACENAME_INTEROP,

PEGASUS_CLASSNAME_PG_NAMESPACEINMANAGER, targetClass);

PEGASUS_CLASSNAME_PG_NAMESPACEINMANAGER, true, targetClass);

// Build and instance for each namespace instance.

for (Uint32 i = 0 ; i < namespaceInstances.size() ; i++)

{

Line 160

Line 158

CIMClass targetClass;

CIMInstance instance = buildInstanceSkeleton(

PEGASUS_NAMESPACENAME_INTEROP, PEGASUS_CLASSNAME_PGNAMESPACE,

targetClass);

true, targetClass);

setCommonKeys(instance);

Line 239

Line 237

{

parent=value;

}

#ifdef PEGASUS_ENABLE_REMOTE_CMPI

else if (String::equalNoCase(key,"remoteInfo"))

{

//ATTN: remoteInfo property is not part of PG_Namespace class,

// add the property to PG_Namespace instance once avilable.

}

#endif

else

{

PEG_METHOD_EXIT();

Line 320

Line 325

if(propIndex == PEG_NOT_FOUND)

{

PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL1,

PEG_TRACE((TRC_CONTROLPROVIDER, Tracer::LEVEL1,

"Invalid CIM_Namespace Key Property " + propertyName.getString());

"Invalid CIM_Namespace Key Property %s",

(const char*)propertyName.getString().getCString()));

PEG_METHOD_EXIT();

throw CIMInvalidParameterException(

"Invalid CIM_Namespace key property: " + propertyName.getString());

Line 450

Line 456

repository->deleteNameSpace(deleteNamespaceName);

PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL4,

PEG_TRACE((TRC_CONTROLPROVIDER, Tracer::LEVEL4,

"Namespace = " + deleteNamespaceName.getString() +

"Namespace = %s successfully deleted.",

" successfully deleted.");

(const char*)deleteNamespaceName.getString().getCString()));

PEG_METHOD_EXIT();

}

Line 472

Line 478

// Create the new namespace

PEG_TRACE_STRING(TRC_CONTROLPROVIDER, Tracer::LEVEL4,

PEG_TRACE((TRC_CONTROLPROVIDER, Tracer::LEVEL4,

"Namespace = " + newNamespaceName.getString() +

"Namespace = %s to be created.",

" to be created.");

(const char*)newNamespaceName.getString().getCString()));

CIMRepository::NameSpaceAttributes attributes;

Legend:

Removed from v.1.8.4.1
changed lines
	Added in v.1.13

No CVS admin address has been configured