PEP#: 274

TITLE: CIM API

DESCRIPTION: support for CMPI Providers and cimconfig

diff --git a/src/Pegasus/Client/Makefile2 b/src/Pegasus/Client/Makefile2
index 6f6fdebfdcd7cf6cfb9d6c883b9766741d7e6dbc..13b537056ed2adeef0000165efcf305b8b23a641 100644 (file)
--- a/src/Pegasus/Client/Makefile2
+++ b/src/Pegasus/Client/Makefile2
@@ -1,130 +1,149 @@
-#//%2006////////////////////////////////////////////////////////////////////////
-#//
-#// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
-#// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
-#// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;
-#// IBM Corp.; EMC Corporation, The Open Group.
-#// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
-#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
-#// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
-#// EMC Corporation; VERITAS Software Corporation; The Open Group.
-#// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
-#// EMC Corporation; Symantec 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"), to
-#// deal in the Software without restriction, including without limitation the
-#// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-#// sell copies of the Software, and to permit persons to whom the Software is
-#// furnished to do so, subject to the following conditions:
-#// 
-#// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN
-#// ALL COPIES OR SUBSTANTIAL PORTIONS OF 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.
-#//
-#//==============================================================================
-ROOT = ../../..
-DIR = Pegasus/Client
-include $(ROOT)/mak/config.mak
-
-#
-# src/Pegasus/Client/Makefile2 (this one) is used for direct access CIM build.
-#
-
-ifdef PEGASUS_HAS_SSL
-  FLAGS += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE
-  SYS_INCLUDES += -I$(OPENSSL_HOME)/include
-endif
-
-ifeq ($(PEGASUS_ENABLE_SLP),true)
-  FLAGS += -DPEGASUS_SLP_CLIENT_INTERFACE_WRAPPER
-endif
-
-EXTRA_INCLUDES = $(SYS_INCLUDES)
-
-LOCAL_DEFINES = -DPEGASUS_CLIENT_INTERNAL -DPEGASUS_INTERNALONLY 
-
-LIBRARY = pegclient
-
-LIBRARIES = \
-    pegcommon
-
-REBUILD_FOR_DIRECTACCESS=2
-       
-$(warning PEGASUS_USE_DIRECTACCESS_FOR_LOCAL = $(PEGASUS_USE_DIRECTACCESS_FOR_LOCAL))
-$(warning PEGASUS_DIRECTACCESS_BUILDTYPE = $(PEGASUS_DIRECTACCESS_BUILDTYPE))
-$(warning REBUILD_FOR_DIRECTACCESS = $(REBUILD_FOR_DIRECTACCESS))
-       
-       
-
-ifeq ($(PEGASUS_ENABLE_SLP),true)
-ifneq ($(OS_TYPE),windows)
-LIBRARIES += pegslp_client
-endif
-endif
-
-ifeq ($(REBUILD_FOR_DIRECTACCESS),2)
-LIBRARIES += \
-    pegpmservice \
-    pegrepository \
-    DefaultProviderManager \
-    pegserver
-endif
-
-PRE_DEPEND_INCLUDES = -I./depends
-
-SOURCES = \
-    ClientPerfDataStore.cpp \
-    ClientOpPerformanceDataHandler.cpp \
-    CIMClientRep.cpp \
-    CIMClient.cpp \
-    CIMOperationRequestEncoder.cpp \
-    CIMOperationResponseDecoder.cpp \
-    ClientAuthenticator.cpp \
-    CIMClientException.cpp
-
-SOURCES_SLP = \
-    CIMServerDiscovery.cpp
-
-SOURCES_DACIM = \
-       CIMDirectAccess.cpp \
-       CIMDirectAccessRep.cpp 
-       
-ifeq ($(PEGASUS_ENABLE_SLP),true)
-  SOURCES += $(SOURCES_SLP)
-endif
-
-ifeq ($(REBUILD_FOR_DIRECTACCESS),2)
-  DEFINES += -DPEGASUS_USE_DIRECTACCESS_FOR_LOCAL_DEPEND
-  SOURCES += $(SOURCES_DACIM)
-endif
-
-OBJECTS = $(SOURCES:.cpp=$(OBJ))
-
-include $(ROOT)/mak/library.mak
-
-
-#ifeq ($(REBUILD_FOR_DIRECTACCESS),1)
-#    REBUILD_FOR_DIRECTACCESS = 2
-#$(SOURCES):: dacim_function
-#dacim_function :
-#      @$(TOUCH)  CIMClientRep.cpp   
-#endif
-
-ifeq ($(OS_TYPE),windows)
-SYS_LIBS = ws2_32.lib advapi32.lib
-endif
-
-ifeq ($(PEGASUS_ENABLE_SLP),true)
-$(SOURCES): slp_client
-slp_client :
-       @ $(MAKE) -SC $(ROOT)/src/slp/slp_client
-ifeq ($(OS_TYPE),windows)
-SYS_LIBS += $(PEGASUS_HOME)/lib/pegslp_client.lib
-endif
-endif
+#//%2006////////////////////////////////////////////////////////////////////////\r
+#//\r
+#// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development\r
+#// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.\r
+#// Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;\r
+#// IBM Corp.; EMC Corporation, The Open Group.\r
+#// Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;\r
+#// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.\r
+#// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;\r
+#// EMC Corporation; VERITAS Software Corporation; The Open Group.\r
+#// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;\r
+#// EMC Corporation; Symantec Corporation; The Open Group.\r
+#//\r
+#// Permission is hereby granted, free of charge, to any person obtaining a copy\r
+#// of this software and associated documentation files (the "Software"), to\r
+#// deal in the Software without restriction, including without limitation the\r
+#// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or\r
+#// sell copies of the Software, and to permit persons to whom the Software is\r
+#// furnished to do so, subject to the following conditions:\r
+#// \r
+#// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN\r
+#// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED\r
+#// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT\r
+#// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR\r
+#// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT\r
+#// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\r
+#// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
+#// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+#//\r
+#//==============================================================================\r
+ROOT = ../../..\r
+DIR = Pegasus/Client\r
+include $(ROOT)/mak/config.mak\r
+\r
+#\r
+# src/Pegasus/Client/Makefile2 (this one) is used for direct access CIM build.\r
+#\r
+\r
+ifdef PEGASUS_HAS_SSL\r
+  FLAGS += -DPEGASUS_HAS_SSL -DPEGASUS_SSL_RANDOMFILE\r
+  SYS_INCLUDES += -I$(OPENSSL_HOME)/include\r
+endif\r
+\r
+ifeq ($(PEGASUS_ENABLE_SLP),true)\r
+  FLAGS += -DPEGASUS_SLP_CLIENT_INTERFACE_WRAPPER\r
+endif\r
+\r
+EXTRA_INCLUDES = $(SYS_INCLUDES)\r
+\r
+LOCAL_DEFINES = -DPEGASUS_CLIENT_INTERNAL -DPEGASUS_INTERNALONLY \r
+\r
+LIBRARY = pegclient\r
+\r
+LIBRARIES = \\r
+    pegcommon\r
+\r
+REBUILD_FOR_DIRECTACCESS=2\r
+ifneq ($(OS_TYPE),windows)     \r
+    $(warning PEGASUS_USE_DIRECTACCESS_FOR_LOCAL = $(PEGASUS_USE_DIRECTACCESS_FOR_LOCAL))\r
+    $(warning PEGASUS_DIRECTACCESS_BUILDTYPE = $(PEGASUS_DIRECTACCESS_BUILDTYPE))\r
+    $(warning REBUILD_FOR_DIRECTACCESS = $(REBUILD_FOR_DIRECTACCESS))\r
+endif    \r
+       \r
+       \r
+\r
+ifeq ($(PEGASUS_ENABLE_SLP),true)\r
+ifneq ($(OS_TYPE),windows)\r
+LIBRARIES += pegslp_client\r
+endif\r
+endif\r
+\r
+ifeq ($(REBUILD_FOR_DIRECTACCESS),2)\r
+LIBRARIES += \\r
+    pegpmservice \\r
+    pegrepository \\r
+    DefaultProviderManager \\r
+    pegserver \\r
+    pegprovidermanager \\r
+    pegserver \\r
+    pegprm \\r
+    pegconfig \\r
+    pegprovider \\r
+    pegrepository \\r
+    NamespaceProvider \\r
+    InteropProvider \\r
+    ProviderRegistrationProvider \\r
+    CIMOMStatDataProvider \\r
+    ConfigSettingProvider \\r
+    CIMQueryCapabilitiesProvider \\r
+    CMPIProviderManager \\r
+    pegwql \\r
+    pegcql \\r
+    pegqueryexpression \\r
+    pegquerycommon\r
+    \r
+endif\r
+\r
+PRE_DEPEND_INCLUDES = -I./depends\r
+\r
+SOURCES = \\r
+    ClientPerfDataStore.cpp \\r
+    ClientOpPerformanceDataHandler.cpp \\r
+    CIMClientRep.cpp \\r
+    CIMClient.cpp \\r
+    CIMOperationRequestEncoder.cpp \\r
+    CIMOperationResponseDecoder.cpp \\r
+    ClientAuthenticator.cpp \\r
+    CIMClientException.cpp\r
+\r
+SOURCES_SLP = \\r
+    CIMServerDiscovery.cpp\r
+\r
+SOURCES_DACIM = \\r
+       CIMDirectAccess.cpp \\r
+       CIMDirectAccessRep.cpp \r
+       \r
+ifeq ($(PEGASUS_ENABLE_SLP),true)\r
+  SOURCES += $(SOURCES_SLP)\r
+endif\r
+\r
+ifeq ($(REBUILD_FOR_DIRECTACCESS),2)\r
+  DEFINES += -DPEGASUS_USE_DIRECTACCESS_FOR_LOCAL_DEPEND\r
+  SOURCES += $(SOURCES_DACIM)\r
+endif\r
+\r
+OBJECTS = $(SOURCES:.cpp=$(OBJ))\r
+\r
+include $(ROOT)/mak/library.mak\r
+\r
+\r
+#ifeq ($(REBUILD_FOR_DIRECTACCESS),1)\r
+#    REBUILD_FOR_DIRECTACCESS = 2\r
+#$(SOURCES):: dacim_function\r
+#dacim_function :\r
+#      @$(TOUCH)  CIMClientRep.cpp   \r
+#endif\r
+\r
+ifeq ($(OS_TYPE),windows)\r
+SYS_LIBS = ws2_32.lib advapi32.lib\r
+endif\r
+\r
+ifeq ($(PEGASUS_ENABLE_SLP),true)\r
+$(SOURCES): slp_client\r
+slp_client :\r
+       @ $(MAKE) -SC $(ROOT)/src/slp/slp_client\r
+ifeq ($(OS_TYPE),windows)\r
+SYS_LIBS += $(PEGASUS_HOME)/lib/pegslp_client.lib\r
+endif\r
+endif\r