[Omc-commit] SF.net SVN: omc: [442] cmpibase/trunk/src/providers

[<np...@us...>]

Revision: 442
          http://svn.sourceforge.net/omc/?rev=442&view=rev
Author:   npaxton
Date:     2007-02-14 10:25:09 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
refactor for new omccmpi library

Modified Paths:
--------------
    cmpibase/trunk/src/providers/computer-system/Makefile.am
    cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.cpp
    cmpibase/trunk/src/providers/logical-file/FilesCommon.cpp
    cmpibase/trunk/src/providers/logical-file/Makefile.am
    cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.cpp
    cmpibase/trunk/src/providers/operating-system/Makefile.am
    cmpibase/trunk/src/providers/processes/Makefile.am
    cmpibase/trunk/src/providers/time-service/Makefile.am

Modified: cmpibase/trunk/src/providers/computer-system/Makefile.am
===================================================================
--- cmpibase/trunk/src/providers/computer-system/Makefile.am	2007-02-14 17:46:13 UTC (rev 441)
+++ cmpibase/trunk/src/providers/computer-system/Makefile.am	2007-02-14 18:25:09 UTC (rev 442)
@@ -6,21 +6,17 @@
 
 INCLUDES = -I$(top_srcdir)/src/include
 
-libomccmpi_computer_system_la_LIBADD = \
-	$(top_builddir)/src/lib/omc/libomc_cmpi.la \
-	$(top_builddir)/src/lib/omc/libomc_cbase.la
-
 libomccmpi_computer_system_la_SOURCES = \
 	computerSystem.c
 
 libomccmpi_computer_system_la_LDFLAGS = \
 	-lpthread \
+	-lomc_cmpi \
 	-version-info 1
 
 
 libomccmpi_hostnamesettingdata_la_LIBADD = \
-	$(top_builddir)/src/lib/omc/libomc_cmpi.la \
-	$(top_builddir)/src/lib/omc/libomc_cbase.la
+	$(top_builddir)/src/lib/omc/libomc_cmpi.la
 
 libomccmpi_hostnamesettingdata_la_SOURCES = \
 	hostNameSettingData.c
@@ -31,15 +27,12 @@
 
 
 
-libomccmpi_cshostnamesettingdata_la_LIBADD = \
-	$(top_builddir)/src/lib/omc/libomc_cmpi.la \
-	$(top_builddir)/src/lib/omc/libomc_cbase.la
-
 libomccmpi_cshostnamesettingdata_la_SOURCES = \
 	computerSystemHostNameSettingData.c
 
 libomccmpi_cshostnamesettingdata_la_LDFLAGS = \
 	-lpthread \
+	-lomc_cmpi \
 	-version-info 1
 
 

Modified: cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.cpp	2007-02-14 17:46:13 UTC (rev 441)
+++ cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.cpp	2007-02-14 18:25:09 UTC (rev 442)
@@ -31,8 +31,10 @@
 
 #include "CIM_LogicalFile_Provider.h"
 #include "OMC_LinuxDirectoryContainsFile.h"
-#include "omc/fileTools.h"
 #include "FilesCommon.hpp"
+
+#include <omc/fileTools.h>
+
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -61,7 +63,7 @@
     const CIM_LogicalFile* model,
     CIM_LogicalFile*& instance)
 {
-    instance = getFile(model->Name.value.c_str()); 
+    instance = getFile(model->Name.value.c_str());
     return GET_INSTANCE_OK;
 }
 
@@ -71,29 +73,29 @@
 {
     if (eqi(model->meta_class->name, "OMC_LinuxDirectory"))
     {
-	struct stat st; 
+	struct stat st;
 	if (lstat("/", &st) != 0)
 	{
 	    return ENUM_INSTANCES_FAILED;
 	}
-	omcFileKeys* keys = omcGetKeysForFileStat("/", &st); 
+	omcFileKeys* keys = omcGetKeysForFileStat("/", &st);
 	if (keys == NULL)
 	{
 	    return ENUM_INSTANCES_FAILED;
 	}
-	OMC_LinuxDirectory* dir = OMC_LinuxDirectory::create(); 
+	OMC_LinuxDirectory* dir = OMC_LinuxDirectory::create();
 	if (dir == NULL)
 	{
 	    return ENUM_INSTANCES_FAILED;
 	}
-	dir->CreationClassName.value = keys->CreationClassName; 
-	dir->CSCreationClassName.value = keys->CSCreationClassName; 
-	dir->CSName.value = keys->CSName; 
-	dir->Name.value = keys->Name; 
-	dir->FSName.value = keys->FSName; 
-	dir->FSCreationClassName.value = keys->FSCreationClassName; 
-	omcFileKeys_free(keys); 
-	handler->handle(cast<CIM_LogicalFile*>(dir)); 
+	dir->CreationClassName.value = keys->CreationClassName;
+	dir->CSCreationClassName.value = keys->CSCreationClassName;
+	dir->CSName.value = keys->CSName;
+	dir->Name.value = keys->Name;
+	dir->FSName.value = keys->FSName;
+	dir->FSCreationClassName.value = keys->FSCreationClassName;
+	omcFileKeys_free(keys);
+	handler->handle(cast<CIM_LogicalFile*>(dir));
     }
     return ENUM_INSTANCES_OK;
 }
@@ -118,17 +120,17 @@
 
 int CIM_LogicalFile_Provider::proc(
     const Registration* registration,
-    int operation, 
-    void* arg0, 
-    void* arg1, 
-    void* arg2, 
+    int operation,
+    void* arg0,
+    void* arg1,
+    void* arg2,
     void* arg3,
     void* arg4,
     void* arg5,
     void* arg6,
     void* arg7)
 {
-    // CAUTION: PLEASE DO NOT MODIFY THIS FUNCTION; IT WAS AUTOMATICALLY 
+    // CAUTION: PLEASE DO NOT MODIFY THIS FUNCTION; IT WAS AUTOMATICALLY
     // GENERATED.
 
     typedef CIM_LogicalFile Class;

Modified: cmpibase/trunk/src/providers/logical-file/FilesCommon.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/FilesCommon.cpp	2007-02-14 17:46:13 UTC (rev 441)
+++ cmpibase/trunk/src/providers/logical-file/FilesCommon.cpp	2007-02-14 18:25:09 UTC (rev 442)
@@ -36,8 +36,9 @@
 #include "OMC_LinuxSymbolicLink.h"
 #include "OMC_LinuxFile.h"
 #include "FilesCommon.hpp"
-#include "omc/fileTools.h"
 
+#include <omc/fileTools.h>
+
 #include <dirent.h>
 #include <sys/param.h>
 #include <sys/stat.h>
@@ -54,172 +55,172 @@
 static
 cimple::String _getGroupFromGID(gid_t gid)
 {
-    String rval; 
-    char buf[PWENT_GRPENT_BUF_SIZE]; 
-    struct group gr; 
-    struct group* pgr; 
-    int rv = getgrgid_r(gid, &gr, buf, PWENT_GRPENT_BUF_SIZE, &pgr); 
+    String rval;
+    char buf[PWENT_GRPENT_BUF_SIZE];
+    struct group gr;
+    struct group* pgr;
+    int rv = getgrgid_r(gid, &gr, buf, PWENT_GRPENT_BUF_SIZE, &pgr);
     if (rv == 0 && pgr)
     {
-        rval = gr.gr_name; 
+        rval = gr.gr_name;
     } else
     {
-	snprintf(buf, sizeof(buf), "%d", gid); 
-	rval = buf; 
+	snprintf(buf, sizeof(buf), "%d", gid);
+	rval = buf;
     }
-    return rval; 
+    return rval;
 }
 
-static 
+static
 cimple::String _getNameFromUID(uid_t uid)
 {
-    String rval; 
-    char buf[PWENT_GRPENT_BUF_SIZE]; 
-    struct passwd pw; 
-    struct passwd* ppw = 0; 
-    int rv = getpwuid_r(uid, &pw, buf, PWENT_GRPENT_BUF_SIZE, &ppw); 
+    String rval;
+    char buf[PWENT_GRPENT_BUF_SIZE];
+    struct passwd pw;
+    struct passwd* ppw = 0;
+    int rv = getpwuid_r(uid, &pw, buf, PWENT_GRPENT_BUF_SIZE, &ppw);
     if (rv == 0 && ppw)
     {
-        //rval = strdup(pw.pw_name); 
-	rval = pw.pw_name; 
+        //rval = strdup(pw.pw_name);
+	rval = pw.pw_name;
     } else
     {
-	snprintf(buf,sizeof(buf),"%d", uid); 
-	rval = buf; 
+	snprintf(buf,sizeof(buf),"%d", uid);
+	rval = buf;
     }
     return rval;
 }
 
 OMC_LinuxFile* getLinuxFile(const char* path)
 {
-    struct stat st; 
+    struct stat st;
     if (stat(path, &st) != 0)
     {
-	return 0; 
+	return 0;
     }
-    omcFileKeys* keys = omcGetKeysForFileStat(path, &st); 
+    omcFileKeys* keys = omcGetKeysForFileStat(path, &st);
     if (!keys)
     {
-	return 0; 
+	return 0;
     }
 
-    OMC_LinuxFile* instance = OMC_LinuxFile::create(); 
-    instance->LFName.value = keys->Name; 
-    instance->FSCreationClassName.value = keys->FSCreationClassName; 
-    instance->FSName.value = keys->FSName; 
-    instance->LFCreationClassName.value = keys->CreationClassName; 
-    instance->CSCreationClassName.value = keys->CSCreationClassName; 
-    instance->CSName.value = keys->CSName; 
-    omcFileKeys_free(keys); 
-    instance->UserReadable.value = st.st_mode & S_IRUSR; 
-    instance->UserWritable.value = st.st_mode & S_IWUSR; 
-    instance->UserExecutable.value = st.st_mode & S_IXUSR; 
-    instance->GroupReadable.value = st.st_mode & S_IRGRP; 
-    instance->GroupWritable.value = st.st_mode & S_IWGRP; 
-    instance->GroupExecutable.value = st.st_mode & S_IXGRP; 
-    instance->WorldReadable.value = st.st_mode & S_IROTH; 
-    instance->WorldWritable.value = st.st_mode & S_IWOTH; 
-    instance->WorldExecutable.value = st.st_mode & S_IXOTH; 
-    instance->UserID.value = _getNameFromUID(st.st_uid); 
-    instance->GroupID.value = _getGroupFromGID(st.st_gid); 
-    instance->SaveText.value = st.st_mode & S_ISVTX; 
-    instance->LinkCount.value = st.st_nlink; 
-    char buf[256]; 
-    snprintf(buf, 255, "%lld", uint64(st.st_ino)); 
-    instance->FileInodeNumber.value = buf; 
-    instance->SetUid.value = st.st_mode & S_ISUID; 
-    instance->SetGid.value = st.st_mode & S_ISGID; 
-    instance->LastModifiedInode.value = Datetime(uint64(st.st_mtime)*1000000L, 0); 
-    instance->NameMax.value = MAXNAMLEN; 
-    instance->PathMax.value = MAXPATHLEN; 
-    return instance; 
+    OMC_LinuxFile* instance = OMC_LinuxFile::create();
+    instance->LFName.value = keys->Name;
+    instance->FSCreationClassName.value = keys->FSCreationClassName;
+    instance->FSName.value = keys->FSName;
+    instance->LFCreationClassName.value = keys->CreationClassName;
+    instance->CSCreationClassName.value = keys->CSCreationClassName;
+    instance->CSName.value = keys->CSName;
+    omcFileKeys_free(keys);
+    instance->UserReadable.value = st.st_mode & S_IRUSR;
+    instance->UserWritable.value = st.st_mode & S_IWUSR;
+    instance->UserExecutable.value = st.st_mode & S_IXUSR;
+    instance->GroupReadable.value = st.st_mode & S_IRGRP;
+    instance->GroupWritable.value = st.st_mode & S_IWGRP;
+    instance->GroupExecutable.value = st.st_mode & S_IXGRP;
+    instance->WorldReadable.value = st.st_mode & S_IROTH;
+    instance->WorldWritable.value = st.st_mode & S_IWOTH;
+    instance->WorldExecutable.value = st.st_mode & S_IXOTH;
+    instance->UserID.value = _getNameFromUID(st.st_uid);
+    instance->GroupID.value = _getGroupFromGID(st.st_gid);
+    instance->SaveText.value = st.st_mode & S_ISVTX;
+    instance->LinkCount.value = st.st_nlink;
+    char buf[256];
+    snprintf(buf, 255, "%lld", uint64(st.st_ino));
+    instance->FileInodeNumber.value = buf;
+    instance->SetUid.value = st.st_mode & S_ISUID;
+    instance->SetGid.value = st.st_mode & S_ISGID;
+    instance->LastModifiedInode.value = Datetime(uint64(st.st_mtime)*1000000L, 0);
+    instance->NameMax.value = MAXNAMLEN;
+    instance->PathMax.value = MAXPATHLEN;
+    return instance;
 }
 
 CIM_LogicalFile* getFile(const char* path)
 {
-    struct stat st; 
+    struct stat st;
     if (lstat(path, &st) != 0)
     {
 	return NULL;
     }
-    omcFileKeys* keys = omcGetKeysForFileStat(path, &st); 
+    omcFileKeys* keys = omcGetKeysForFileStat(path, &st);
     if (keys == NULL)
     {
-	return NULL; 
+	return NULL;
     }
 
-    CIM_LogicalFile* rval = NULL; 
+    CIM_LogicalFile* rval = NULL;
     if (S_ISREG(st.st_mode))
     {
-	OMC_LinuxDataFile* df = OMC_LinuxDataFile::create(); 
-	rval = cast<CIM_LogicalFile*>(df); 
+	OMC_LinuxDataFile* df = OMC_LinuxDataFile::create();
+	rval = cast<CIM_LogicalFile*>(df);
     } else if (S_ISDIR(st.st_mode))
     {
-	OMC_LinuxDirectory* dir = OMC_LinuxDirectory::create(); 
-	//dir->FileSizeBits.value = ; 
-	rval = cast<CIM_LogicalFile*>(dir); 
+	OMC_LinuxDirectory* dir = OMC_LinuxDirectory::create();
+	//dir->FileSizeBits.value = ;
+	rval = cast<CIM_LogicalFile*>(dir);
     } else if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))
     {
-	OMC_LinuxDeviceFile* dev = OMC_LinuxDeviceFile::create(); 
+	OMC_LinuxDeviceFile* dev = OMC_LinuxDeviceFile::create();
 	if (S_ISCHR(st.st_mode))
 	{
-	    dev->DeviceFileType.value = dev->DeviceFileType.enum_Character; 
+	    dev->DeviceFileType.value = dev->DeviceFileType.enum_Character;
 	}
 	else
 	{
-	    dev->DeviceFileType.value = dev->DeviceFileType.enum_Block; 
+	    dev->DeviceFileType.value = dev->DeviceFileType.enum_Block;
 	}
-	//dev->DeviceDescription.value = ; 
-	//dev->DeviceMinor.value = ; 
-	//dev->DeviceMajor.value = ; 
-	//dev->DeviceId.value = ; 
-	//dev->OtherTypeDescription.value = ; 
-	rval = cast<CIM_LogicalFile*>(dev); 
+	//dev->DeviceDescription.value = ;
+	//dev->DeviceMinor.value = ;
+	//dev->DeviceMajor.value = ;
+	//dev->DeviceId.value = ;
+	//dev->OtherTypeDescription.value = ;
+	rval = cast<CIM_LogicalFile*>(dev);
     } else if (S_ISFIFO(st.st_mode))
     {
-	OMC_LinuxFIFOPipeFile* fifo = OMC_LinuxFIFOPipeFile::create(); 
-	rval = cast<CIM_LogicalFile*>(fifo); 
+	OMC_LinuxFIFOPipeFile* fifo = OMC_LinuxFIFOPipeFile::create();
+	rval = cast<CIM_LogicalFile*>(fifo);
     } else if (S_ISLNK(st.st_mode))
     {
-	OMC_LinuxSymbolicLink* link = OMC_LinuxSymbolicLink::create(); 
-	char buf[MAXPATHLEN]; 
-	int rrdlnk = readlink(keys->Name, buf, MAXPATHLEN); 
+	OMC_LinuxSymbolicLink* link = OMC_LinuxSymbolicLink::create();
+	char buf[MAXPATHLEN];
+	int rrdlnk = readlink(keys->Name, buf, MAXPATHLEN);
 	if (rrdlnk != -1)
 	{
-	    link->TargetFile.value = buf; 
+	    link->TargetFile.value = buf;
 	}
-	rval = cast<CIM_LogicalFile*>(link); 
+	rval = cast<CIM_LogicalFile*>(link);
     } else
     {
-	    return NULL; 
+	    return NULL;
     }
-    rval->Name.value = keys->Name; 
-    rval->CreationClassName.value = keys->CreationClassName; 
-    rval->FSName.value = keys->FSName; 
-    rval->FSCreationClassName.value = keys->FSCreationClassName; 
-    rval->CSName.value = keys->CSName; 
-    rval->CSCreationClassName.value = keys->CSCreationClassName; 
-    omcFileKeys_free(keys); 
+    rval->Name.value = keys->Name;
+    rval->CreationClassName.value = keys->CreationClassName;
+    rval->FSName.value = keys->FSName;
+    rval->FSCreationClassName.value = keys->FSCreationClassName;
+    rval->CSName.value = keys->CSName;
+    rval->CSCreationClassName.value = keys->CSCreationClassName;
+    omcFileKeys_free(keys);
 
-    rval->Writeable.value = st.st_mode & S_IWUSR; 
-    rval->Executable.value = st.st_mode & S_IXUSR; 
-    rval->Readable.value = st.st_mode & S_IRUSR; 
-    rval->FileSize.value = st.st_size; 
-    //rval->CompressionMethod.value = ; 
-    rval->LastModified.value = Datetime(uint64(st.st_mtime)*1000000L, 0); 
-    //rval->InUseCount.value = ; 
-    //rval->EncryptionMethod.value = ; 
-    rval->LastAccessed.value = Datetime(uint64(st.st_atime)*1000000L, 0); 
-    //rval->HealthState.value = ; 
-    //rval->StatusDescriptions.value = ; 
-    //rval->OperationalStatus.value = ; 
-    //rval->Description.value = ; 
-    rval->InstallDate.value = Datetime(uint64(st.st_ctime)*1000000L, 0); 
+    rval->Writeable.value = st.st_mode & S_IWUSR;
+    rval->Executable.value = st.st_mode & S_IXUSR;
+    rval->Readable.value = st.st_mode & S_IRUSR;
+    rval->FileSize.value = st.st_size;
+    //rval->CompressionMethod.value = ;
+    rval->LastModified.value = Datetime(uint64(st.st_mtime)*1000000L, 0);
+    //rval->InUseCount.value = ;
+    //rval->EncryptionMethod.value = ;
+    rval->LastAccessed.value = Datetime(uint64(st.st_atime)*1000000L, 0);
+    //rval->HealthState.value = ;
+    //rval->StatusDescriptions.value = ;
+    //rval->OperationalStatus.value = ;
+    //rval->Description.value = ;
+    rval->InstallDate.value = Datetime(uint64(st.st_ctime)*1000000L, 0);
 
-    rval->ElementName.value = rval->Name.value; 
-    //rval->Caption.value = ; 
+    rval->ElementName.value = rval->Name.value;
+    //rval->Caption.value = ;
 
-    return rval; 
+    return rval;
 }
 
 CIMPLE_NAMESPACE_END

Modified: cmpibase/trunk/src/providers/logical-file/Makefile.am
===================================================================
--- cmpibase/trunk/src/providers/logical-file/Makefile.am	2007-02-14 17:46:13 UTC (rev 441)
+++ cmpibase/trunk/src/providers/logical-file/Makefile.am	2007-02-14 18:25:09 UTC (rev 442)
@@ -33,9 +33,10 @@
 	schema/libOMC_File_Schema.la
 
 libOMC_FilesCommon_la_LIBADD = \
-	schema/libOMC_File_Schema.la \
-	${top_builddir}/src/lib/omc/libomc_cbase.la
+	schema/libOMC_File_Schema.la
 
+libOMC_FilesCommon_la_LDFLAGS = \
+	-lomc_cmpi
 
 INCLUDES = -I${srcdir}/schema -I${top_srcdir}/src/include -I${top_srcdir}
 

Modified: cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.cpp
===================================================================
--- cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.cpp	2007-02-14 17:46:13 UTC (rev 441)
+++ cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.cpp	2007-02-14 18:25:09 UTC (rev 442)
@@ -31,8 +31,10 @@
 #include "OMC_LinuxDirectoryContainsFile_Provider.h"
 #include "OMC_LinuxDirectory.h"
 #include "CIM_LogicalFile.h"
-#include "omc/fileTools.h"
 #include "FilesCommon.hpp"
+
+#include <omc/fileTools.h>
+
 #include <sys/types.h>
 #include <dirent.h>
 
@@ -66,7 +68,7 @@
     const OMC_LinuxDirectoryContainsFile* model,
     OMC_LinuxDirectoryContainsFile*& instance)
 {
-    instance = model->clone(); 
+    instance = model->clone();
     return GET_INSTANCE_OK;
 }
 
@@ -102,61 +104,61 @@
     const String& result_role,
     Enum_Associator_Names_Handler<Instance>* handler)
 {
-    if (eqi(role, "PartComponent") 
-	|| eqi(result_role, "GroupComponent") 
+    if (eqi(role, "PartComponent")
+	|| eqi(result_role, "GroupComponent")
 	|| (role.empty() && result_role.empty()))
     {
-	TRACE; 
-	CIM_LogicalFile* clf = cast<CIM_LogicalFile*>(instance); 
-	char* parentPath = omc_dirname(clf->Name.value.c_str()); 
-	CIM_LogicalFile* parentc = getFile(parentPath); 
-	free(parentPath); 
-	OMC_LinuxDirectory* parent = cast<OMC_LinuxDirectory*>(parentc); 
-	handler->handle(parent); 
+	TRACE;
+	CIM_LogicalFile* clf = cast<CIM_LogicalFile*>(instance);
+	char* parentPath = omc_dirname(clf->Name.value.c_str());
+	CIM_LogicalFile* parentc = getFile(parentPath);
+	free(parentPath);
+	OMC_LinuxDirectory* parent = cast<OMC_LinuxDirectory*>(parentc);
+	handler->handle(parent);
     }
-    if (eqi(role, "GroupComponent") 
-	|| eqi(result_role, "PartComponent") 
+    if (eqi(role, "GroupComponent")
+	|| eqi(result_role, "PartComponent")
 	|| (role.empty() && result_role.empty()))
     {
-	TRACE; 
-	CIM_LogicalFile* dirc = cast<CIM_LogicalFile*>(instance); 
-	TRACE; 
-	dirc = getFile(dirc->Name.value.c_str()); 
-	Ref<Instance> dirc_d(dirc); 
-	TRACE; 
+	TRACE;
+	CIM_LogicalFile* dirc = cast<CIM_LogicalFile*>(instance);
+	TRACE;
+	dirc = getFile(dirc->Name.value.c_str());
+	Ref<Instance> dirc_d(dirc);
+	TRACE;
 	if (eqi(dirc->CreationClassName.value, "OMC_LinuxDirectory"))
 	{
-	    struct dirent* pDent; 
-	    DIR* pDir; 
-	    pDir = opendir(dirc->Name.value.c_str()); 
+	    struct dirent* pDent;
+	    DIR* pDir;
+	    pDir = opendir(dirc->Name.value.c_str());
 	    if (pDir != 0)
 	    {
-		String prefix = dirc->Name.value; 
-		TRACE; 
-		if (prefix[prefix.size()-1] != '/') 
+		String prefix = dirc->Name.value;
+		TRACE;
+		if (prefix[prefix.size()-1] != '/')
 		{
-		    TRACE; 
-		    prefix.append('/'); 
+		    TRACE;
+		    prefix.append('/');
 		}
-		TRACE; 
+		TRACE;
 		for (pDent = readdir(pDir); pDent != 0; pDent = readdir(pDir))
 		{
-		    String curName = pDent->d_name; 
+		    String curName = pDent->d_name;
 		    if (curName.equal(".") or curName.equal(".."))
 		    {
-			continue; 
+			continue;
 		    }
-		    String fullName = prefix; 
-		    fullName.append(curName); 
-		    CIM_LogicalFile* fileInDir = getFile(fullName.c_str()); 
+		    String fullName = prefix;
+		    fullName.append(curName);
+		    CIM_LogicalFile* fileInDir = getFile(fullName.c_str());
 		    if (fileInDir)
 		    {
-			TRACE; 
-			handler->handle(fileInDir); 
+			TRACE;
+			handler->handle(fileInDir);
 		    }
 		}
 	    }
-	    closedir(pDir); 
+	    closedir(pDir);
 	}
     }
     return ENUM_ASSOCIATOR_NAMES_OK;
@@ -168,65 +170,65 @@
     const String& role,
     Enum_References_Handler<OMC_LinuxDirectoryContainsFile>* handler)
 {
-    TRACE; 
+    TRACE;
     if (eqi(role, "PartComponent") || role.empty())
     {
-	TRACE; 
-	CIM_LogicalFile* clf = cast<CIM_LogicalFile*>(instance); 
-	char* parentPath = omc_dirname(clf->Name.value.c_str()); 
-	CIM_LogicalFile* parentc = getFile(parentPath); 
-	free(parentPath); 
-	OMC_LinuxDirectory* parent = cast<OMC_LinuxDirectory*>(parentc); 
-	OMC_LinuxDirectoryContainsFile* assoc = OMC_LinuxDirectoryContainsFile::create(); 
-	assoc->PartComponent = clf->clone(); 
-	assoc->GroupComponent = parent; 
-	handler->handle(assoc); 
+	TRACE;
+	CIM_LogicalFile* clf = cast<CIM_LogicalFile*>(instance);
+	char* parentPath = omc_dirname(clf->Name.value.c_str());
+	CIM_LogicalFile* parentc = getFile(parentPath);
+	free(parentPath);
+	OMC_LinuxDirectory* parent = cast<OMC_LinuxDirectory*>(parentc);
+	OMC_LinuxDirectoryContainsFile* assoc = OMC_LinuxDirectoryContainsFile::create();
+	assoc->PartComponent = clf->clone();
+	assoc->GroupComponent = parent;
+	handler->handle(assoc);
     }
     if (eqi(role, "GroupComponent") || role.empty())
     {
-	TRACE; 
-	CIM_LogicalFile* dirc = cast<CIM_LogicalFile*>(instance); 
-	TRACE; 
-	dirc = getFile(dirc->Name.value.c_str()); 
-	Ref<Instance> dirc_d(dirc); 
-	TRACE; 
+	TRACE;
+	CIM_LogicalFile* dirc = cast<CIM_LogicalFile*>(instance);
+	TRACE;
+	dirc = getFile(dirc->Name.value.c_str());
+	Ref<Instance> dirc_d(dirc);
+	TRACE;
 	if (eqi(dirc->CreationClassName.value, "OMC_LinuxDirectory"))
 	{
-	    struct dirent* pDent; 
-	    DIR* pDir; 
-	    pDir = opendir(dirc->Name.value.c_str()); 
+	    struct dirent* pDent;
+	    DIR* pDir;
+	    pDir = opendir(dirc->Name.value.c_str());
 	    if (pDir != 0)
 	    {
-		String prefix = dirc->Name.value; 
-		TRACE; 
-		if (prefix[prefix.size()-1] != '/') 
+		String prefix = dirc->Name.value;
+		TRACE;
+		if (prefix[prefix.size()-1] != '/')
 		{
-		    TRACE; 
-		    prefix.append('/'); 
+		    TRACE;
+		    prefix.append('/');
 		}
-		TRACE; 
+		TRACE;
 		for (pDent = readdir(pDir); pDent != 0; pDent = readdir(pDir))
 		{
-		    String curName = pDent->d_name; 
+		    String curName = pDent->d_name;
 		    if (curName.equal(".") or curName.equal(".."))
 		    {
-			continue; 
+			continue;
 		    }
-		    String fullName = prefix; 
-		    fullName.append(curName); 
-		    CIM_LogicalFile* fileInDir = getFile(fullName.c_str()); 
+		    String fullName = prefix;
+		    fullName.append(curName);
+		    CIM_LogicalFile* fileInDir = getFile(fullName.c_str());
 		    if (fileInDir)
 		    {
-			TRACE; 
-			OMC_LinuxDirectoryContainsFile* assoc = OMC_LinuxDirectoryContainsFile::create(); 
-			OMC_LinuxDirectory* old = cast<OMC_LinuxDirectory*>(dirc); 
-			assoc->GroupComponent = old->clone(); 
-			assoc->PartComponent = fileInDir; 
-			handler->handle(assoc); 
+			TRACE;
+			OMC_LinuxDirectoryContainsFile* assoc = OMC_LinuxDirectoryContainsFile::create();
+			OMC_LinuxDirectory* old = cast<OMC_LinuxDirectory*>(dirc);
+			assoc->GroupComponent = old->clone();
+			assoc->PartComponent = fileInDir;
+			handler->handle(assoc);
 		    }
 		}
 	    }
-	    closedir(pDir); 
+	    closedir(pDir);
 	}
     }
     return ENUM_REFERENCES_OK;
@@ -234,22 +236,22 @@
 
 int OMC_LinuxDirectoryContainsFile_Provider::proc(
     const Registration* registration,
-    int operation, 
-    void* arg0, 
-    void* arg1, 
-    void* arg2, 
+    int operation,
+    void* arg0,
+    void* arg1,
+    void* arg2,
     void* arg3,
     void* arg4,
     void* arg5,
     void* arg6,
     void* arg7)
 {
-    // CAUTION: PLEASE DO NOT MODIFY THIS FUNCTION; IT WAS AUTOMATICALLY 
+    // CAUTION: PLEASE DO NOT MODIFY THIS FUNCTION; IT WAS AUTOMATICALLY
     // GENERATED.
 
     typedef OMC_LinuxDirectoryContainsFile Class;
     typedef OMC_LinuxDirectoryContainsFile_Provider Provider;
-    return Association_Provider_Proc_T<Provider>::proc(registration, 
+    return Association_Provider_Proc_T<Provider>::proc(registration,
 	operation, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 }
 

Modified: cmpibase/trunk/src/providers/operating-system/Makefile.am
===================================================================
--- cmpibase/trunk/src/providers/operating-system/Makefile.am	2007-02-14 17:46:13 UTC (rev 441)
+++ cmpibase/trunk/src/providers/operating-system/Makefile.am	2007-02-14 18:25:09 UTC (rev 442)
@@ -7,10 +7,6 @@
 
 INCLUDES = -I$(top_srcdir)/src/include
 
-libOMC_LinuxOS_la_LIBADD = \
-	$(top_builddir)/src/lib/omc/libomc_cmpi.la \
-	$(top_builddir)/src/lib/omc/libomc_cbase.la
-
 libOMC_LinuxOS_la_SOURCES = \
 	LinuxOSProvider.c \
 	LinuxOSInfo.c \
@@ -18,28 +14,23 @@
 
 libOMC_LinuxOS_la_LDFLAGS = \
 	-lpthread \
+	-lomc_cmpi \
 	-version-info 1
 
 
-libOMC_RunningLinuxOS_la_LIBADD = \
-	$(top_builddir)/src/lib/omc/libomc_cmpi.la \
-	$(top_builddir)/src/lib/omc/libomc_cbase.la
-
 libOMC_RunningLinuxOS_la_SOURCES = \
 	LinuxRunningOS.c
 
 libOMC_RunningLinuxOS_la_LDFLAGS = \
 	-lpthread \
+	-lomc_cmpi \
 	-version-info 1
 
 
-libOMC_InstalledLinuxOS_la_LIBADD = \
-	$(top_builddir)/src/lib/omc/libomc_cmpi.la \
-	$(top_builddir)/src/lib/omc/libomc_cbase.la
-
 libOMC_InstalledLinuxOS_la_SOURCES = \
 	LinuxInstalledOS.c
 
 libOMC_InstalledLinuxOS_la_LDFLAGS = \
 	-lpthread \
+	-lomc_cmpi \
 	-version-info 1

Modified: cmpibase/trunk/src/providers/processes/Makefile.am
===================================================================
--- cmpibase/trunk/src/providers/processes/Makefile.am	2007-02-14 17:46:13 UTC (rev 441)
+++ cmpibase/trunk/src/providers/processes/Makefile.am	2007-02-14 18:25:09 UTC (rev 442)
@@ -4,15 +4,12 @@
 
 INCLUDES = -I$(top_srcdir)/src/include
 
-libOMC_UnixProcess_la_LIBADD = \
-	$(top_builddir)/src/lib/omc/libomc_cmpi.la \
-	$(top_builddir)/src/lib/omc/libomc_cbase.la
-
 libOMC_UnixProcess_la_SOURCES = \
 	LinuxProcessProvider.c
 
 libOMC_UnixProcess_la_LDFLAGS = \
 	-lpthread \
+	-lomc_cmpi \
 	-version-info 1
 
 

Modified: cmpibase/trunk/src/providers/time-service/Makefile.am
===================================================================
--- cmpibase/trunk/src/providers/time-service/Makefile.am	2007-02-14 17:46:13 UTC (rev 441)
+++ cmpibase/trunk/src/providers/time-service/Makefile.am	2007-02-14 18:25:09 UTC (rev 442)
@@ -11,86 +11,65 @@
 
 INCLUDES = -I$(top_srcdir)/src/include
 
-libomccmpi_systemTimeService_la_LIBADD = \
-	$(top_builddir)/src/lib/omc/libomc_cmpi.la \
-	$(top_builddir)/src/lib/omc/libomc_cbase.la
-
 libomccmpi_systemTimeService_la_SOURCES = \
 	systemTimeService.c
 
 libomccmpi_systemTimeService_la_LDFLAGS = \
 	-lpthread \
+	-lomc_cmpi \
 	-version-info 1
 
 
-libomccmpi_remoteTimeServicePort_la_LIBADD = \
-	$(top_builddir)/src/lib/omc/libomc_cmpi.la \
-	$(top_builddir)/src/lib/omc/libomc_cbase.la
-
 libomccmpi_remoteTimeServicePort_la_SOURCES = \
 	remoteTimeServicePort.c
 
 libomccmpi_remoteTimeServicePort_la_LDFLAGS = \
 	-lpthread \
+	-lomc_cmpi \
 	-version-info 1
 
 
-libomccmpi_timeZoneSettingData_la_LIBADD = \
-	$(top_builddir)/src/lib/omc/libomc_cmpi.la \
-	$(top_builddir)/src/lib/omc/libomc_cbase.la
-
 libomccmpi_timeZoneSettingData_la_SOURCES = \
 	timeZoneSettingData.c
 
 libomccmpi_timeZoneSettingData_la_LDFLAGS = \
 	-lpthread \
+	-lomc_cmpi \
 	-version-info 1
 
 
-libomccmpi_hostedTimeService_la_LIBADD = \
-	$(top_builddir)/src/lib/omc/libomc_cmpi.la \
-	$(top_builddir)/src/lib/omc/libomc_cbase.la
-
 libomccmpi_hostedTimeService_la_SOURCES = \
 	hostedTimeService.c
 
 libomccmpi_hostedTimeService_la_LDFLAGS = \
 	-lpthread \
+	-lomc_cmpi \
 	-version-info 1
 
 
-libomccmpi_timeServiceTimeZoneSettingData_la_LIBADD = \
-	$(top_builddir)/src/lib/omc/libomc_cmpi.la \
-	$(top_builddir)/src/lib/omc/libomc_cbase.la
-
 libomccmpi_timeServiceTimeZoneSettingData_la_SOURCES = \
 	timeServiceTimeZoneSettingData.c
 
 libomccmpi_timeServiceTimeZoneSettingData_la_LDFLAGS = \
 	-lpthread \
+	-lomc_cmpi \
 	-version-info 1
 
 
-libomccmpi_timeServiceAccessBySAP_la_LIBADD = \
-	$(top_builddir)/src/lib/omc/libomc_cmpi.la \
-	$(top_builddir)/src/lib/omc/libomc_cbase.la
-
 libomccmpi_timeServiceAccessBySAP_la_SOURCES = \
 	timeServiceAccessBySAP.c
 
 libomccmpi_timeServiceAccessBySAP_la_LDFLAGS = \
 	-lpthread \
+	-lomc_cmpi \
 	-version-info 1
 
 
-libomccmpi_timeServiceAvailableToElement_la_LIBADD = \
-	$(top_builddir)/src/lib/omc/libomc_cmpi.la \
-	$(top_builddir)/src/lib/omc/libomc_cbase.la
-
 libomccmpi_timeServiceAvailableToElement_la_SOURCES = \
 	timeServiceAvailableToElement.c
 
 libomccmpi_timeServiceAvailableToElement_la_LDFLAGS = \
 	-lpthread \
+	-lomc_cmpi \
 	-version-info 1
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.