pegasus/src/Pegasus/ProviderManager2/JMPI/JMPIProviderManager.cpp - diff

Return to JMPIProviderManager.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / ProviderManager2 / JMPI

Diff for /pegasus/src/Pegasus/ProviderManager2/JMPI/JMPIProviderManager.cpp between version 1.71.4.1 and 1.75

version 1.71.4.1, 2009/02/02 18:56:13

version 1.75, 2008/12/02 09:01:58

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.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

// 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.

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

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

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

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

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

// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN 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.

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

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

#include "JMPIProviderManager.h"

Line 675

Line 673

#define HandlerCatch(handler) \

catch(CIMException & e) \

{ PEG_TRACE_STRING(TRC_PROVIDERMANAGER, Tracer::LEVEL1, \

{ PEG_TRACE((TRC_PROVIDERMANAGER, Tracer::LEVEL1,"CIMException: %s", \

"Exception: " + e.getMessage()); \

(const char*)e.getMessage().getCString())); \

handler.setStatus(e.getCode(), e.getContentLanguages(), \

e.getMessage()); \

} \

catch(Exception & e) \

{ PEG_TRACE_STRING(TRC_PROVIDERMANAGER, Tracer::LEVEL1, \

{ PEG_TRACE((TRC_PROVIDERMANAGER, Tracer::LEVEL1,"Exception: %s", \

"Exception: " + e.getMessage()); \

(const char*)e.getMessage().getCString())); \

handler.setStatus(CIM_ERR_FAILED, e.getContentLanguages(), \

e.getMessage()); \

} \

Line 694

Line 692

static jobjectArray getList(JvmVector *jv, JNIEnv *env, CIMPropertyList &list)

{

jobjectArray pl=NULL;

if (!list.isNull())

{

Uint32 s=list.size();

jobjectArray pl=NULL;

if (s) {

jstring initial=env->NewString(NULL,0);

pl=(jobjectArray)env->NewObjectArray(s,jv->StringClassRef,initial);

for (Uint32 i=0; i<s; i++)

for (Uint32 i=0; i<s; i++) {

{

env->SetObjectArrayElement

(pl,i,env->NewStringUTF(list[i].getString().getCString()));

}

Line 8267

Line 8263

String& providerName,

String& location)

{

Uint32 pos = pInstance.findProperty(CIMName ("Name"));

Uint32 pos = pInstance.findProperty(PEGASUS_PROPERTYNAME_NAME);

pInstance.getProperty(pos).getValue().get(providerName);

pos = pmInstance.findProperty(CIMName ("Location"));

Line 9031

Line 9027

// get provider module name

String moduleName;

CIMInstance mInstance = request->providerModule;

Uint32 pos = mInstance.findProperty(CIMName ("Name"));

Uint32 pos = mInstance.findProperty(PEGASUS_PROPERTYNAME_NAME);

if(pos != PEG_NOT_FOUND)

{

Line 9182

Line 9178

CIMValue genericValue;

genericValue = providerId.getModule().getProperty(

providerId.getModule().findProperty("Name")).getValue();

providerId.getModule().findProperty(

PEGASUS_PROPERTYNAME_NAME)).getValue();

genericValue.get(moduleName);

genericValue = providerId.getProvider().getProperty(

providerId.getProvider().findProperty("Name")).getValue();

providerId.getProvider().findProperty(

PEGASUS_PROPERTYNAME_NAME)).getValue();

genericValue.get(providerName);

genericValue = providerId.getModule().getProperty(

Legend:

Removed from v.1.71.4.1
changed lines
	Added in v.1.75

No CVS admin address has been configured