You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(26) |
Dec
(13) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(5) |
Feb
(16) |
Mar
(5) |
Apr
(5) |
May
(13) |
Jun
(12) |
Jul
(1) |
Aug
(2) |
Sep
(13) |
Oct
(6) |
Nov
(1) |
Dec
(29) |
2008 |
Jan
(2) |
Feb
(2) |
Mar
(2) |
Apr
(57) |
May
(35) |
Jun
(45) |
Jul
(132) |
Aug
(87) |
Sep
(141) |
Oct
(86) |
Nov
(17) |
Dec
(2) |
2009 |
Jan
(3) |
Feb
(2) |
Mar
(3) |
Apr
(3) |
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
2010 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
From: <ba...@us...> - 2007-05-12 00:26:13
|
Revision: 457 http://svn.sourceforge.net/omc/?rev=457&view=rev Author: bartw Date: 2007-05-11 17:26:15 -0700 (Fri, 11 May 2007) Log Message: ----------- Added ability to generate python provider stubs for CIM classes Modified Paths: -------------- tools/trunk/yawn/yawn.py Modified: tools/trunk/yawn/yawn.py =================================================================== --- tools/trunk/yawn/yawn.py 2007-05-09 22:56:36 UTC (rev 456) +++ tools/trunk/yawn/yawn.py 2007-05-12 00:26:15 UTC (rev 457) @@ -1273,7 +1273,8 @@ ht+= '<div align=center>View '+_makeHref(req, 'EnumInstanceNames', instUrlArgs, 'Instance Names') ht+= ' or '+_makeHref(req, 'EnumInstances', instUrlArgs, 'Instances') ht+= ' or '+_makeHref(req, 'AssociatedClasses', instUrlArgs, 'Associated Classes') - ht+= ' of this class.</div>' + ht+= ' of this class. '+_makeHref(req, + 'ProviderTemplate', instUrlArgs, 'Provider Template')+'</div>' ht+= '<table border="1" cellpadding="2">' if klass.qualifiers.has_key('aggregation'): titleBGColor = "green" @@ -1657,6 +1658,7 @@ return '</table></body></html>' ############################################################################## +############################################################################## def AssociatedClasses(req, url, ns, className): conn = _frontMatter(req, url, ns) classNames = None @@ -1903,6 +1905,314 @@ return ht ############################################################################## +############################################################################## +############################################################################## +def _providerTemplate (cc): + ################# + def format_desc (obj): + txt = '' + try: + raw = obj.qualifiers['description'].value + beg = 0 + end = 0 + while beg < len(raw): + beg = end + end += 65 + while beg < len(raw) and raw[beg] in string.whitespace: + beg = beg+1 + while end < len(raw) and end > beg \ + and raw[end] not in string.whitespace: + end = end-1 + line = raw[beg:end] + line = line.replace('\n',' ') + txt +=''' + %s''' % line + except KeyError: + pass + return txt + + ################# + def type_str (obj): + tx = obj.type + if tx == 'reference': + tx = 'REF %s (CIMInstanceName)' % obj.reference_class + if obj.is_array: + tx += '[]' + return tx + ################# + def is_required (obj): + try: + if obj.qualifiers['required'].value: + return '(Required)' + else: + return '' + except KeyError: + return '' + ################# + + mappings = {'classname':cc.classname, + } + isAssoc = 'association' in cc.qualifiers + + code = '''"""Python Provider for %(classname)s + +Instruments the CIM class %(classname)s +""" + +import pywbem + +class %(classname)sProvider: + """Instrument the CIM class %(classname)s +''' % mappings + code+= format_desc(cc) + code+= ''' + """ + + ######################################################################### + def __init__ (self): + pass + + ######################################################################### + def get_instance (self, env, model, cim_class): + """Return an instance of %(classname)s + + Keyword arguments: + env -- Provider Environment + model -- A template of the CIMInstance to be returned. The key + properties are set on this instance to correspond to the + instanceName that was requested. The properties of the model + are already filtered according to the PropertyList from the + request. + cim_class -- The CIMClass %(classname)s + + """ +''' % mappings + keyProps = [p for p in cc.properties.values() \ + if 'key' in p.qualifiers] + for prop in cc.properties.values(): + if 'key' in prop.qualifiers: + continue + code+= ''' + if '%(pname)s' in model.properties: + model['%(pname)s'] = # TODO (type = %(ptype)s) %(required)s''' \ + % { 'pname': prop.name, 'ptype': type_str(prop), + 'required':is_required(prop) } + + code+= ''' + return model + + ######################################################################### + def enum_instances(self, env, model, cim_class, keys_only): + """ Enumerate instances of %(classname)s + The WBEM operations EnumerateInstances and EnumerateInstanceNames + are both mapped to this method. + This method is a python generator + + Keyword arguments: + env -- Provider Environment + model -- A template of the CIMInstances to be generated. The + properties of the model are already filtered according to the + PropertyList from the request. + cim_class -- The CIMClass %(classname)s + keys_only -- A boolean. True if only the key properties should be + set on the generated instances. + + """ + + while False: # TODO more instances? + # TODO fetch system resource + # Key properties''' % mappings + for kp in keyProps: + code+=''' + model['%(pname)s'] = # TODO (type = %(ptype)s)''' \ + % { 'pname':kp.name, 'ptype':type_str(kp) } + code+=''' + if keys_only: + yield model + else: + try: + yield self.get_instance(env, model, cim_class) + except pywbem.CIMError, (num, msg): + if num in (pywbem.CIM_ERR_NOT_FOUND, + pywbem.CIM_ERR_ACCESS_DENIED): + pass # EnumerateInstances shouldn't return these + else: + raise +''' + + code+=''' + ######################################################################### + def set_instance(self, env, instance, previous_instance, cim_class): + """ Return a newly created or modified instance of %(classname)s + + Keyword arguments: + env -- Provider Environment + instance -- The new CIMInstance. If modifying an existing instance, + the properties on this instance have been filtered by the + PropertyList from the request. + previous_instance -- The previous instance if modifying an existing + instance. None if creating a new instance. + cim_class -- The CIMClass %(classname)s + + Return the new instance. The keys must be set on the new instance. + + """ + + # TODO create or modify the instance + return instance + + ######################################################################### + def delete_instance(self, env, instance_name): + """ Delete an instance of %(classname)s + + Keyword arguments: + env -- Provider Environment + instance_name -- A CIMInstanceName specifying the instance of + %(classname)s to delete. + + """ ''' % mappings + + for method in cc.methods.values(): + inParms = [ p for p in method.parameters.values() if \ + 'in' in p.qualifiers and p.qualifiers['in'].value ] + outParms = [ p for p in method.parameters.values() if \ + 'out' in p.qualifiers and p.qualifiers['out'].value ] + code+= ''' + ######################################################################### + def cim_method_%s(self, env, object_name, method''' % method.name.lower() + for p in inParms: + code+= ''', + param_%s''' % p.name.lower() + code+= '''): + """Implements %s.%s() +''' % (cc.classname, method.name) + code+= format_desc(method) + + code+= ''' + Keyword arguments: + env -- Provider Environment + object_name -- A CIMInstanceName or CIMCLassName specifying the + object on which the method %(mname)s should be invoked + method -- A CIMMethod representing the method meta-data''' + + for p in inParms: + code+= ''' + param_%s -- The input parameter %s (type %s) %s''' \ + % (p.name.lower(), p.name, type_str(p), is_required(p)) + code+= format_desc(p) + + code+=''' + + Returns a two-tuple containing the return value (type %s) + and a dictionary with the out-parameters + + Output parameters:''' %(method.return_type) + + if not outParms: + code+= ' none' + else: + for p in outParms: + code+=''' + %s -- (type %s) %s''' % (p.name, type_str(p), is_required(p)) + code+= format_desc(p) + + + code+=''' + + """ + + # TODO do something + out_params = {}''' + + for p in outParms: + code+=''' + out_params['%s'] = # TODO (type %s)''' % (p.name.lower(), type_str(p)) + + code+=''' + rval = # TODO (type %s) + return (rval, out_params) + ''' % method.return_type + + if isAssoc: + code+= ''' + ######################################################################### + def references(self, env, object_name, model, assoc_class, + result_class_name, role, result_role): + """Instrument %(classname)s Associations. + All four association-related operations (Associators, AssociatorNames, + References, ReferenceNames) are mapped to this method. + This method is a python generator + + Keyword arguments: + env -- Provider Environment + object_name -- A CIMInstanceName that defines the source CIM Object + whose associated Objects are to be returned. + model -- A template CIMInstance of %(classname)s to serve as a model + of the objects to be returned. Only properties present on this + model need to be returned. + assoc_class -- The CIMClass %(classname)s + result_class_name -- If not None, acts as a filter on the returned set + of Objects by mandating that each returned Object MUST be either + an Instance of this Class (or one of its subclasses) or be this + Class (or one of its subclasses). + role -- If not None, acts as a filter on the returned set of Objects + by mandating that each returned Object MUST be associated to the + source Object via an Association in which the source Object plays + the specified role (i.e. the name of the Property in the + Association Class that refers to the source Object MUST match + the value of this parameter). + result_role -- If not None, acts as a filter on the returned set of + Objects by mandating that each returned Object MUST be associated + to the source Object via an Association in which the returned + Object plays the specified role (i.e. the name of the Property in + the Association Class that refers to the returned Object MUST + match the value of this parameter). + """ + +''' % mappings + + code+= ''' + +## end of class %(classname)sProvider + +_prov = %(classname)sProvider() # initialize provider +py_providers = {'%(classname)s: _prov} # register provider +''' % mappings + + ptypes = ['1', 'Instance'] + if isAssoc: + ptypes[0]+= ',3' + ptypes[1]+= ', Associator' + if cc.methods: + ptypes[0]+= ',6' + ptypes[1]+= ', Method' + code+=''' +"""// Provider registration MOF for %(classname)s +instance of OpenWBEM_PyProviderRegistration +{ + InstanceID = "<org:product:unique_id>"; // TODO + NamespaceNames = {"root/cimv2"}; + ClassName = "%(classname)s"; + ProviderTypes = {%(ptypeNums)s}; // %(ptypeStrs)s + ModulePath = "/some/path/%(classname)sProvider.py"; +}; +""" +''' % {'classname': cc.classname, + 'ptypeNums': ptypes[0], + 'ptypeStrs': ptypes[1]} + + return code + +def ProviderTemplate(req, url, ns, className): + conn = _frontMatter(req, url, ns) + req.content_type = 'text/plain' + klass = _ex(req, conn.GetClass, ClassName = className, LocalOnly = "false", + IncludeClassOrigin = "true") + return _providerTemplate(klass) + + +############################################################################## +############################################################################## # TODO """ - Make GetClass links on REF type fields for properties and parameters. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ba...@us...> - 2007-05-09 22:56:42
|
Revision: 456 http://svn.sourceforge.net/omc/?rev=456&view=rev Author: bartw Date: 2007-05-09 15:56:36 -0700 (Wed, 09 May 2007) Log Message: ----------- changed to match new datetime functionality in pywbem Modified Paths: -------------- tools/trunk/yawn/yawn.py Modified: tools/trunk/yawn/yawn.py =================================================================== --- tools/trunk/yawn/yawn.py 2007-04-30 20:56:35 UTC (rev 455) +++ tools/trunk/yawn/yawn.py 2007-05-09 22:56:36 UTC (rev 456) @@ -29,7 +29,7 @@ # @author Norm Paxton <np...@no...> from mod_python import Cookie, apache -from datetime import datetime, timedelta +from datetime import timedelta import pywbem import cgi import types @@ -66,31 +66,9 @@ rval+= strItem rval+= '}' return cgi.escape(rval) - elif type(x) == datetime: - #http://windowssdk.msdn.microsoft.com/en-us/library/ms739696.aspx - rval = x.strftime('%Y%m%d%H%M%S') - mss = str(x.microsecond) - while len(mss) < 6: - mss = '0' + mss - rval += '.'+mss - uoff = x.utcoffset() - if uoff is None: - uoff = '+000' - else: - # make it fit in three digits - uoff = uoff.days*24*60 + uoff.seconds/60 - if uoff < -(60*12): - uoff = 24*60 + uoff - if uoff > (60*12): - uoff = uoff - 60*24 - neg = uoff < 0 - uoff = str(abs(uoff)) - while len(uoff) < 3: - uoff = '0'+uoff - uoff = neg and '-'+uoff or '+'+uoff - return cgi.escape(rval + uoff) elif type(x) == timedelta: - #http://windowssdk.msdn.microsoft.com/en-us/library/ms744132.aspx + #http://msdn2.microsoft.com/en-us/library/aa387237.aspx + #http://msdn2.microsoft.com/en-us/library/aa390895.aspx mss = str(x.microseconds) while len(mss) < 6: mss = '0' + mss @@ -413,7 +391,8 @@ req.write('<hr><h2>Objects of Class: ' + assocInstPath.classname + '</h2>') _printInstanceNames(req, urlargs, [assocInstPath]) elif assocCall=='References': - refs = conn.References(instName, **params)#, properties) + refs = _ex(req,conn.References,ObjectName=instName, + **params)#, properties) req.write('Showing ' + `len(refs)` + ' resulting object(s). <br><br>') for ref in refs: assocInstPath = ref.path This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ba...@us...> - 2007-04-30 20:56:38
|
Revision: 455 http://svn.sourceforge.net/omc/?rev=455&view=rev Author: bartw Date: 2007-04-30 13:56:35 -0700 (Mon, 30 Apr 2007) Log Message: ----------- fixed missing param in a link Modified Paths: -------------- tools/trunk/yawn/yawn.py Modified: tools/trunk/yawn/yawn.py =================================================================== --- tools/trunk/yawn/yawn.py 2007-04-26 22:22:35 UTC (rev 454) +++ tools/trunk/yawn/yawn.py 2007-04-30 20:56:35 UTC (rev 455) @@ -222,7 +222,7 @@ ') : ' + arg[1] + '</i>') req.write( '</body></html>') return; - urlargs = {'ns':ns,'url':url} + urlargs = {'ns':ns,'url':url,'className':instName.classname} req.write( _printHead('Deleted Instance of '+instName.classname, urlargs=urlargs)) req.write('Deleted Instance of ' + _makeHref(req, 'GetClass', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <np...@us...> - 2007-04-26 22:22:36
|
Revision: 454 http://svn.sourceforge.net/omc/?rev=454&view=rev Author: npaxton Date: 2007-04-26 15:22:35 -0700 (Thu, 26 Apr 2007) Log Message: ----------- versions and additional spec file Modified Paths: -------------- smash/branches/1.0/configure.ac smash/branches/1.0/omcsmash.spec Added Paths: ----------- smash/branches/1.0/openwbem-smash-providers.spec Modified: smash/branches/1.0/configure.ac =================================================================== --- smash/branches/1.0/configure.ac 2007-04-26 22:10:07 UTC (rev 453) +++ smash/branches/1.0/configure.ac 2007-04-26 22:22:35 UTC (rev 454) @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(openwbem-smash-providers, 1.0.8) +AC_INIT(openwbem-smash-providers, 1.0.9) AM_INIT_AUTOMAKE([tar-ustar]) AC_CONFIG_SRCDIR([src]) AC_CONFIG_HEADER([config.h]) Modified: smash/branches/1.0/omcsmash.spec =================================================================== --- smash/branches/1.0/omcsmash.spec 2007-04-26 22:10:07 UTC (rev 453) +++ smash/branches/1.0/omcsmash.spec 2007-04-26 22:22:35 UTC (rev 454) @@ -11,7 +11,7 @@ %define omclocalstatedir /var/lib/openwbem %define omcsysconfdir /etc/openwbem # Increment the version every time the source code changes. -Version: 1.0.6 +Version: 1.0.9 Release: 1 Group: System/Management Summary: An open-source instrumentation of DMTF SMASH profiles providers used by the OpenWBEM CIMOM Added: smash/branches/1.0/openwbem-smash-providers.spec =================================================================== --- smash/branches/1.0/openwbem-smash-providers.spec (rev 0) +++ smash/branches/1.0/openwbem-smash-providers.spec 2007-04-26 22:22:35 UTC (rev 454) @@ -0,0 +1,399 @@ +# +# spec file for package openwbem-smash-providers (Version 1.0.7) +# +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: openwbem-smash-providers +BuildRequires: gcc-c++ hwinfo-devel iproute libstdc++-devel openslp-devel openssl-devel openwbem-base-providers-devel openwbem-devel pam-devel +URL: https://forge.provo.novell.com/modules/xfmod/project/?nim +%define novellprefix /usr +%define novelllocalstatedir /var/lib/openwbem +%define novellsysconfdir /etc/openwbem +# Increment the version every time the source code changes. +Version: 1.0.9 +Release: 1 +Group: System/Management +Summary: A Novell instrumentation of DMTF SMASH profiles providers used by the OpenWBEM CIMOM +PreReq: /usr/bin/loadmof.sh, coreutils +License: BSD License and BSD-like +# This is necessary to build the RPM as a non-root user. +BuildRoot: %{_tmppath}/%{name}-%{version}-build +# "yes" is the default, but we put it here explicitly to avoid someone +# setting it to "no" +AutoReqProv: yes +Requires: openwbem +Requires: cim-schema >= 2.11 +Source0: %{name}-%{version}.tar.gz +Source1: %{name}-mof.tar.bz2 +%package devel +Group: System/Management +Summary: A Novell instrumentation of DMTF SMASH profiles providers used by the OpenWBEM CIMOM +Requires: openwbem, %{name} +Requires: cim-schema >= 2.11 + +%description +A Novell Linux instrumentation of the Distributed Management Task Force +(DMTF) Systems Managements Architecture for Server Hardware (SMASH) +profile providers used by the OpenWBEM (Web Based Enterprise +Management) Common Information Model Object Manager (CIMOM) for +OpenWBEM (Web Based Enterprise Management). + +This suite of specifications delivers architectural semantics, along +with industry standard protocols and profiles, to unify management of +the data center. + + + +Authors: +-------- + Norm Paxton + Jon Carey + Bart Whiteley + Bart Wise + J.B. Gill + + +%description devel +A Novell Linux instrumentation of the Distributed Management Task Force +(DMTF) Systems Managements Architecture for Server Hardware (SMASH) +profile providers used by the OpenWBEM (Web Based Enterprise +Management) Common Information Model Object Manager (CIMOM) for +OpenWBEM (Web Based Enterprise Management). + +This suite of specifications delivers architectural semantics, along +with industry standard protocols and profiles, to unify management of +the data center. + + + +Authors: +-------- + Norm Paxton + Jon Carey + Bart Whiteley + Bart Wise + J.B. Gill + +%prep +# Untar the sources. +%setup + +%build +# If the LD_RUN_PATH environment variable is set at link time, +# it's value is embedded in the resulting binary. At run time, +# The binary will look here first for shared libraries. This way +# we link against the libraries we want at run-time even if libs +# by the same name are in /usr/lib or some other path in /etc/ld.so.conf +autoreconf --force --install +CFLAGS="$RPM_OPT_FLAGS -fstack-protector" \ +CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector" ./configure --prefix=%{novellprefix} \ + --libdir=%_libdir \ + --sysconfdir=/etc +make %{?jobs:-j%jobs} + +%install +%{__rm} -rf $RPM_BUILD_ROOT +%{__mkdir} -p $RPM_BUILD_ROOT +# Tell 'make install' to install into the BuildRoot +make DESTDIR=$RPM_BUILD_ROOT install +MOFDIR=$RPM_BUILD_ROOT/%{novellprefix}/share/mof/%{name} +install -d $MOFDIR +tar jxv -C $MOFDIR -f %{S:1} +mv $MOFDIR/mof/* $MOFDIR/ +rmdir $MOFDIR/mof +%{__rm} -f $RPM_BUILD_ROOT%{novellprefix}/%_lib/openwbem/c++providers/*.{a,la} + +%clean +%{__rm} -rf $RPM_BUILD_ROOT + +%post +# put /opt/novell/lib in ld.so.conf +#if ! grep -q '^/opt/novell/lib$' /etc/ld.so.conf; then +# echo "/opt/novell/lib" >> /etc/ld.so.conf +#fi +# Any RPM that installs a shared library into any directory +# listed in /etc/ld.so.conf (or into /usr/lib if it hasn't been +# fixed yet to install into the correct FHS compliant paths) +# must run ldconfig in its post install script. +%run_ldconfig +# load MOF +MOFDIR=%{novellprefix}/share/mof/%{name} +NPBMOFDIR=%{novellprefix}/share/mof/openwbem-base-providers +#################################################################### +# The following is a script to add the namespaces to the openwbem.conf +# and to call loadmof for each of the namespaces +# +# TODO: Do I need to also loadmof for the interop namespace? +#################################################################### +# This should point to where smashNs is put down +SMASHNS=%{novellprefix}/bin/smashNs +# This should point directly to the wbem conf file (/etc/openwbem.conf) +WBEM_CONF=%{novellsysconfdir}/openwbem.conf +# This is a temp file that will be created during the modification. +# This should probably be put in /tmp/openwbem.conf---modified or something similar +WBEM_CONF_OUT=/tmp/openwbem.conf--modified +# This function appends $2 onto the end of $1 if $2 doesn't +# exist anywhere inside of $1 +function AppendToString() +{ + if [ $# -gt 1 ] + then + if ! echo "$1" | grep -we "$2" > /dev/null + then + # Append $2 to the end of $1 + echo "$1 $2" + else + # $2 is found somewhere inside of $1 + # so, just output $1 (don't append $2) + echo "$1" + fi + else + echo "$1" + fi +} +# This function takes the values in $3 - $@ and adds them to the key in $1 +# as long as they don't already exist in $1. +# $2 is the comment to add if the key is missing from the file +# if the KEY is commented out, then it adds a line below the comment +# if the KEY is not in the file, it appends it to the end, along with +function AddValuesToKeyInConfFile() +{ + if [ $# -gt 2 ] + then + KEY="$1" + COMMENT="$2" + shift 2 + VALUES="$@" + if grep -e "^[ ]*$KEY[ ]*=" $WBEM_CONF > /dev/null + then + # KEY is _NOT_ commented out + # adding our namespaces to the list + + # If multiple in file, only take namespaces from the last one + REPLACE_STR=$(grep -e "^[ ]*$KEY[ ]*=" $WBEM_CONF|tail -1) + for IX in $VALUES + do + REPLACE_STR=$(AppendToString "$REPLACE_STR" "$IX") + done + + SED_EXP='s#^[ ]*'$KEY'[ ]*=.*$#'$REPLACE_STR'#' + cat $WBEM_CONF | sed -e "$SED_EXP" > $WBEM_CONF_OUT || /bin/true + + elif grep -e "^[ ]*[;\#][ ]*$KEY[ ]*=" $WBEM_CONF > /dev/null + then + # KEY _IS_ commented out + # So, add our line below the commented out one + + SED_EXP='s#^[ ]*\([;\#]\)[ ]*'$KEY'[ ]*=\(.*\)$#\1'$KEY'= \2\n'$KEY' = '$VALUES'#' + cat $WBEM_CONF | sed -e "$SED_EXP" > $WBEM_CONF_OUT || /bin/true + else + cp $WBEM_CONF $WBEM_CONF_OUT || /bin/true + echo >> $WBEM_CONF_OUT + echo -e "$COMMENT" >> $WBEM_CONF_OUT + echo "$KEY = $VALUES" >> $WBEM_CONF_OUT + fi + # Move the modified conf file over the top of the original + mv $WBEM_CONF_OUT $WBEM_CONF || /bin/true + fi +} +# Import appropriate mofs into appropriate namespaces +INTEROP_NS=$(sed -n -e "/^owcimomd\.interop_schema_namespace/p" $WBEM_CONF | sed -r s/"owcimomd\.interop_schema_namespace[ ]*=[ ]*"//) +SMASH_NS=$($SMASHNS -s) +IPMI_NS=$($SMASHNS -f ipmi) +COMPOSITE_NS=$($SMASHNS -c) +# do the interop namespace +loadmof.sh -n $INTEROP_NS \ + $MOFDIR/omc-smash-providers/omc-smash-providers-interop-ns.mof || /bin/true +# do the smash namespace +loadmof.sh -n $SMASH_NS \ + $NPBMOFDIR/omc-base-providers.mof \ + $MOFDIR/omc-smash-providers/omc-smash-providers.mof || /bin/true +# do the composite (smash staging) namespace +loadmof.sh -n $COMPOSITE_NS \ + $MOFDIR/omc-smash-providers/omc-smash-providers-composite-ns.mof || /bin/true +# do all aggregate namespace: load the device mof only +for CUR_NS in $($SMASHNS -a | awk '{print $1}') +do + loadmof.sh -n $CUR_NS \ + $MOFDIR/omc-smash-providers/omc-smash-providers-composite-ns.mof || /bin/true +done +# load the raw ipmi class definitions into the ipmi namespace only. +if [ $? == 0 ]; then + loadmof.sh -n $IPMI_NS \ + $MOFDIR/omc-smash-providers/omc-rawipmi.mof || bin/true +fi +#end mof imports +COMMENT_1="################################################################################\n# A space-separated list of namespaces where providers won't be registerd\n# for classes if no namespace was specified during provider self-registration.\n# If providers use self-registration, and don't specify a namespace (only\n# a class name), they are registered for all namespaces in which the class\n# is present by default. This option allows the specified namespaces to be\n# excluded from this behavior.\n# This is a multi-valued option. Whitespace is the separator.\n# Example: owcimomd.explicit_registration_namespaces = root/private root/cache" + +COMMENT_2="################################################################################\n# A space-separated list of namespaces that the providers in\n# omc-base-providers will explicitly register for. The omc-base-providers\n# will always do non-explicit namespace registration for the\n# classes they instrument. This option causes them to register explicitly for\n# the specified namespaces. This option will typically be used to allow\n# the omc-base-providers to instrument their classes in\n# namespaces that have been specified in the\n# owcimomd.explicit_registration_namespaces option in the openwbem.conf file.\n# Example:\n#omc_base_providers.register_explicitly= smash root/some-namespace" +AddValuesToKeyInConfFile "owcimomd.explicit_registration_namespaces" "$COMMENT_1" $($SMASHNS) +AddValuesToKeyInConfFile "omc.register_explicitly" "$COMMENT_2" $($SMASHNS -s) +#################################################################### +# End of namespace script +#################################################################### + +%preun +# if -e operation, not -U +#if [ "x$1" = "x0" ] +#then +#fi + +%postun +%run_ldconfig + +%files +%defattr(-,root,root) +%doc README +%{novellprefix}/%_lib/openwbem/c++providers/*.so* +%{novellprefix}/%_lib/lib*.so* +%dir %{novellprefix}/share/mof/%{name} +%{novellprefix}/share/mof/%{name}/* +%{novellprefix}/bin/smashNs +%dir %{novellsysconfdir}/smash-config +%{novellsysconfdir}/smash-config/smash-config.xml + +%files devel +%defattr(-,root,root) +%dir %{novellprefix}/include/omc +%{novellprefix}/include/omc/* +%{novellprefix}/%_lib/lib*.la +%{novellprefix}/%_lib/lib*.a + +%changelog -n openwbem-smash-providers +* Wed Jan 17 2007 - np...@no... +- NOTE: Change to spec file only: + fix import directory for mof files from openwbem-base-providers + to match the change in openwbem-base-providers +* Tue May 30 2006 - np...@no... +- bugzilla 179939: When the composite device provider calls into + the smbios provider with a memory modules that was not produced + by the smbbios provider, it segfaults + Fixed. + Risk factor: While openwbem-smash-providers is not installed by + default, and the chance of hitting this bug is low, it does cause + a segfault in openWbem, which affects other default-installed + applications. +* Fri May 12 2006 - np...@no... +- bugzilla 174056: every UnixProcess was associated with + an ssh protocol endpoint (CIM objects / associations only) + Note: This was a CIM representation only. Nothing physical + on the machine was affected. Hence low risk. +- bugzilla 175476: AssociatedMemory associations were not + honoring filters, hence returning bogus objects as + associated objects. NOTE: This was CIM representation only + Nothing physical on the machine was affected. Hence low + risk. +- bugzilla 174928: ModifyInstance on threshold sensors caused + loss of threshold values. This was modifying IPMI incorrectly + hence loss of data. Low risk with fix. Higher risk if fix + is not incorporated. +* Tue May 02 2006 - bwh...@su... +- Removed verbose flag to calls to loadmof.sh (#171447) +* Fri Apr 14 2006 - np...@su... +- Bring Profiles up to the latest profile versions by DMTF + The following profiles have been upgraded to 1.0.0.a by DMTF + and openwbem-smash-providers has been changed to reflect those + modifications: + Fan, Sensor, SSH Service, Ethernet Port +* Thu Apr 06 2006 - np...@su... +- Fixed DeviceCapabilities to match the changes in the profiles. +- Fixed CompositeDevice provider where it was returning duplicate + object paths +- Bring Profiles up to the latest profile versions by DMTF +- Fix "Name" in IPProtocolEndpoint +* Tue Mar 28 2006 - np...@su... +- Included DNS and DHCP profiles that had been disabled in + previous build because of seg-faults, etc. Includes a + rework of how to obtain DHCP information, which is more + reliable than previous version. +* Fri Mar 17 2006 - np...@su... +- Fix several seg-faults and dereferencing-null-pointer + errors in ip-interface and ethernet port profiles. +* Fri Mar 10 2006 - np...@su... +- Fix a few residual issues from schema change + for bugzilla #155618. +* Thu Mar 09 2006 - np...@su... +- Correct a config file option in %%post in spec file +* Wed Mar 08 2006 - np...@su... +- Package approved for late update submissions + FATE package #: 300184 +- code towards completing the required profiles, + and bringing them up to the latest DMTF profile + version. +- Bugzilla # 155618: SMASH schema still has 'Novell_' +* Fri Mar 03 2006 - np...@su... +- Package approved for late update submissions + FATE package #: 300184 +- code towards completing the required profiles, + and bringing them up to the latest DMTF profile + version. +- Fixed Collections aspect of Record Log Profile +- Fixed segfaults in EthernetPort profile. +* Sat Feb 25 2006 - np...@su... +- Package approved for late update submissions + FATE package #: 300184 +- code towards completing the required profiles, + and bringing them up to the latest DMTF profile + version. +- Record Log Profile providers enhanced to latest profile version +- Sensor Profile providers enhanced to latest profile version +* Fri Feb 17 2006 - np...@su... +- Package approved for late udpate submissions + FATE package #: 300184 +- code towards completing the required profiles, + and bringing them up to the latest DMTF profile + version. +* Sat Feb 11 2006 - bwh...@su... +- changed group of -devel package to get past submitpac +* Sat Feb 11 2006 - bwh...@su... +- performed #neededforbuild -> BuildRequires change previously + clobbered by npaxton. +* Fri Feb 10 2006 - np...@su... +- Package approved for late udpate submissions + FATE package #: 300184 +- code towards completing the required profiles, + and bringing them up to the latest DMTF profile + version. +* Wed Jan 25 2006 - ml...@su... +- converted neededforbuild to BuildRequires +* Thu Jan 19 2006 - np...@su... +- new code, more complete internal IPMI usage +* Wed Jan 18 2006 - np...@su... +- still more libhd/pci_id fixes +* Tue Jan 17 2006 - np...@su... +- fix to libhd removing old pci_ids +- new mofs for ip/ethernet +* Sun Jan 15 2006 - np...@su... +- spec file clean-up +* Sun Jan 15 2006 - np...@su... +- Really re-order mof files for dependencies for mof-install +* Fri Jan 13 2006 - np...@su... +- Re-order mof files for dependencies for mof-install +* Fri Jan 13 2006 - np...@su... +- Added dhcp profile, updated version to 0.9.1 +* Fri Jan 13 2006 - np...@su... +- Change versioned dependency to have spaces: cim-schema >= 2.11 +* Thu Jan 12 2006 - np...@su... +- Up version to 0.9.0 +* Thu Jan 12 2006 - np...@su... +- Update to newer code. +- Remove dependency on OpenIPMI +* Tue Jan 10 2006 - np...@su... +- Change package name from novell-smash to openwbem-smash-providers. +- Transitioning to new ipmi library (from openIPMI) +- DNS / DHCP profiles +- Change requirements from novell-provider-base to openwbem-base-providers +- Added versioned dependency on cim-schema>=2.11 +* Thu Dec 22 2005 - np...@no... +- Update to newer code. First submission by Norm +* Thu Dec 15 2005 - bwh...@su... +- Update to newer code +* Sat Dec 03 2005 - bwh...@su... +- Initial build This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <np...@us...> - 2007-04-26 22:10:06
|
Revision: 453 http://svn.sourceforge.net/omc/?rev=453&view=rev Author: npaxton Date: 2007-04-26 15:10:07 -0700 (Thu, 26 Apr 2007) Log Message: ----------- - Initial population of branch for cmpi/c++ smash Added Paths: ----------- smash/branches/cmpi/ Copied: smash/branches/cmpi (from rev 452, smash/branches/1.0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ba...@us...> - 2007-04-17 20:50:43
|
Revision: 452 http://svn.sourceforge.net/omc/?rev=452&view=rev Author: bartw Date: 2007-04-17 13:50:09 -0700 (Tue, 17 Apr 2007) Log Message: ----------- fixing utcoffset problem Modified Paths: -------------- tools/trunk/yawn/yawn.py Modified: tools/trunk/yawn/yawn.py =================================================================== --- tools/trunk/yawn/yawn.py 2007-04-02 17:34:49 UTC (rev 451) +++ tools/trunk/yawn/yawn.py 2007-04-17 20:50:09 UTC (rev 452) @@ -73,11 +73,12 @@ while len(mss) < 6: mss = '0' + mss rval += '.'+mss - uoff = x.utcoffset() + uoff = x.utcoffset() if uoff is None: uoff = '+000' else: # make it fit in three digits + uoff = uoff.days*24*60 + uoff.seconds/60 if uoff < -(60*12): uoff = 24*60 + uoff if uoff > (60*12): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <np...@us...> - 2007-04-02 17:34:50
|
Revision: 451 http://svn.sourceforge.net/omc/?rev=451&view=rev Author: npaxton Date: 2007-04-02 10:34:49 -0700 (Mon, 02 Apr 2007) Log Message: ----------- stubbed out code for 'omccmpiGetStringFromObjectPath' - there is a cmpi macro for this but the underlying code to the macro bails in ow. Modified Paths: -------------- omccmpi/trunk/src/include/omc/cmpiUtils.h omccmpi/trunk/src/lib/omc/cmpiUtils.c omccmpi/trunk/src/lib/omc/fileTools.c omccmpi/trunk/src/lib/omc/ntpServer.c Added Paths: ----------- omccmpi/trunk/omccmpi.spec Added: omccmpi/trunk/omccmpi.spec =================================================================== --- omccmpi/trunk/omccmpi.spec (rev 0) +++ omccmpi/trunk/omccmpi.spec 2007-04-02 17:34:49 UTC (rev 451) @@ -0,0 +1,125 @@ +# +# spec file for package omccmpi (Version 1.0.0) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild +# usedforbuild aaa_base acl attr audit-libs autoconf automake bash bind-libs bind-utils binutils bison blocxx blocxx-devel bzip2 cim-schema coreutils cpio cpp cracklib cvs cyrus-sasl db dbus-1 dbus-1-glib dejagnu diffutils docbook-xsl-stylesheets docbook_4 doxygen e2fsprogs expat expect file filesystem fillup findutils flex fop gawk gcc gcc-c++ gdbm gdbm-devel gettext gettext-devel glib2 glibc glibc-devel glibc-locale gnome-filesystem gpm grep groff gzip hal hwinfo hwinfo-devel info insserv java-1_4_2-sun jpackage-utils klogd less libacl libapr-util1 libapr1 libattr libcom_err libgcc libgcrypt libgpg-error libltdl libnscd libpng libstdc++ libstdc++-devel libtool libusb libvolume_id libxcrypt libxml2 libxslt libzio limal limal-devel limal-devtools limal-runlevel limal-runlevel-devel m4 make man mktemp module-init-tools ncurses ncurses-devel neon net-tools netcfg openldap2-client openslp openslp-devel openssl openssl-devel openwbem openwbem-devel pam pam-devel pam-modules patch pcre pcre-devel perl perl-Config-IniFiles perl-XML-Parser perl-XML-Writer permissions pkgconfig popt procinfo procps psmisc pwdutils rcs readline recode rpm sed strace subversion swig sysfsutils sysvinit tar tcl tcpd texinfo timezone udev unzip util-linux vim wireless-tools zlib zlib-devel + +Name: omccmpi +BuildRequires: gcc tog-pegasus-devel pkgconfig +%if 0%{?suse_version} >= 100 +BuildRequires: gcc tog-pegasus-devel pkgconfig +%else +BuildRequires: gcc tog-pegasus-devel pkgconfig +%endif +%define tarname omccmpi +URL: http://www.omc-project.org +%define omcprefix /usr + +# Increment the version every time the source code changes. +Version: 1.0.0 +Release: 0 +Group: System/Management +Summary: Linux Instrumentation for Enterprise OpenWBEM providers +PreReq: coreutils +License: Other License(s), see package, Commercial + +# This is necessary to build the RPM as a non-root user. +BuildRoot: %{_tmppath}/%{name}-%{version}-build +# "yes" is the default, but we put it here explicitly to avoid someone +# setting it to "no" +AutoReqProv: yes +Source0: %{tarname}-%{version}.tar.gz +%package devel +Group : Programming/Library +Summary : Headers files for %{name} +Requires : omccmpi-devel, %{name} + +%description +Linux providers for cmpi instrumentation of base operating system components +such as computer, system, operating system, and processes. These are +used by the OpenWBEM (Web-Based Enterprise Management) Common +Information Model (CIM) object broker. + + + +Authors: +-------- + Jon Carey + Norm Paxton + Bart Whiteley + + +%description devel +Linux providers for cmpi instrumentation of base operating system components +such as computer, system, operating system, and processes. These are +used by the OpenWBEM (Web-Based Enterprise Management) Common +Information Model (CIM) object broker. + + + +Authors: +-------- + Jon Carey + Norm Paxton + Bart Whiteley + + +%prep +# Untar the sources. +%setup -n %{tarname}-%{version} + +%build +# If the LD_RUN_PATH environment variable is set at link time, +# it's value is embedded in the resulting binary. At run time, +# The binary will look here first for shared libraries. This way +# we link against the libraries we want at run-time even if libs +# by the same name are in /usr/lib or some other path in /etc/ld.so.conf +autoreconf --force --install +CFLAGS="$RPM_OPT_FLAGS -fstack-protector" \ +CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector" \ +./configure --prefix=%{omcprefix} \ + --libdir=%_libdir \ + --with-cmpi-include-dir=/usr/include/Pegasus/Provider/CMPI +make %{?jobs:-j%jobs} + +%install +%{__rm} -rf $RPM_BUILD_ROOT +%{__mkdir} -p $RPM_BUILD_ROOT +# Tell 'make install' to install into the BuildRoot +make DESTDIR=$RPM_BUILD_ROOT install + +%clean +%{__rm} -rf $RPM_BUILD_ROOT + +%post +# Any RPM that installs a shared library into any directory +# listed in /etc/ld.so.conf (or into /usr/lib if it hasn't been +# fixed yet to install into the correct FHS compliant paths) +# must run ldconfig in its post install script. +%run_ldconfig + +%preun + +%postun +%run_ldconfig + +%files +%defattr(-,root,root) +%{omcprefix}/%_lib/*.so* + +%files devel +%defattr(-,root,root) +%dir %{omcprefix}/include/omc +%{omcprefix}/include/omc/* +%{omcprefix}/%_lib/lib*.la +%{omcprefix}/%_lib/lib*.a + +%changelog -n omccmpi + Modified: omccmpi/trunk/src/include/omc/cmpiUtils.h =================================================================== --- omccmpi/trunk/src/include/omc/cmpiUtils.h 2007-03-30 16:28:56 UTC (rev 450) +++ omccmpi/trunk/src/include/omc/cmpiUtils.h 2007-04-02 17:34:49 UTC (rev 451) @@ -137,7 +137,19 @@ const char* fileName, int lineno); + /** + * Given a CMPIObjectPath, create a string-ified version of the + * object path + */ +/* +CMPIString* +omccmpiGetStringFromObjectPath( + CMPIBroker *broker, + const CMPIObjectPath *cop, + CMPIStatus *pStatus ); +*/ +/** * A convenience macro for calling omccmpiSetStatus. This will * automatically pass the current file name and line number * into the function Modified: omccmpi/trunk/src/lib/omc/cmpiUtils.c =================================================================== --- omccmpi/trunk/src/lib/omc/cmpiUtils.c 2007-03-30 16:28:56 UTC (rev 450) +++ omccmpi/trunk/src/lib/omc/cmpiUtils.c 2007-04-02 17:34:49 UTC (rev 451) @@ -565,3 +565,134 @@ return 1; // TRUE } + + + +/** + * Given a CMPIObjectPath, create a string-ified version of the + * object path + */ +/* +CMPIString * +omccmpiGetStringFromObjectPath( + CMPIBroker *broker, + const CMPIObjectPath *cop, + CMPIStatus *pStatus ) +{ + if ((cop == NULL) || CMIsNullObject(cop)) + { + return NULL; + } + + CMPIString *str = NULL; + char stringCop[4096] = {0}; + + CMPIString *hostname = CMGetHostname(cop, pStatus); + CMPIString *ns = CMGetNameSpace(cop, pStatus); + CMPIString *classname = CMGetClassName(cop, pStatus); + unsigned int keyCount = CMGetKeyCount(cop, pStatus); + unsigned int i=0; + char host[128] = {0}; + + if (!CMIsNullObject(hostname)) + { + strncpy(host, CMGetCharPtr(hostname), 128); + } + else + { + omcGetComputerSystemName(host, 128); + } + + if (!*host) + return NULL; + + if (CMIsNullObject(ns)) + return NULL; + + if (CMIsNullObject(classname)) + return NULL; + + sprintf(stringCop, "//%s/%s:%s.", host, CMGetCharPtr(ns), CMGetCharPtr(classname)); + + for (i=0; i<keyCount; i++) + { + CMPIString *name; + CMPIData keydata = CMGetKeyAt(cop, i, &name, pStatus); + CMPIValue keyval = keydata.value; + + char strVal[1024] = {0}; + + switch (keydata.type) + { + case CMPI_boolean: + sprintf(strVal, "%d", (int)keyval.boolean); + break; + case CMPI_char16: + sprintf(strVal, "%d", (int)keyval.char16); + break; + case CMPI_real32: + sprintf(strVal, "%f", (int)keyval.real32); + break; + case CMPI_real64: + sprintf(strVal, "%f", (int)keyval.real64); + break; + case CMPI_uint8: + sprintf(strVal, "%d", (int)keyval.uint8); + break; + case CMPI_uint16: + sprintf(strVal, "%d", (int)keyval.uint16); + break; + case CMPI_uint32: + sprintf(strVal, "%d", (int)keyval.uint32); + break; + case CMPI_uint64: + sprintf(strVal, "%u", (int)keyval.uint64); + break; + case CMPI_sint8: + sprintf(strVal, "%d", (int)keyval.sint8); + break; + case CMPI_sint16: + sprintf(strVal, "%d", (int)keyval.sint16); + break; + case CMPI_sint32: + sprintf(strVal, "%d", (int)keyval.sint32); + break; + case CMPI_sint64: + sprintf(strVal, "%d", (int)keyval.sing64); + break; + case CMPI_ref: + sprintf(strVal, "%s", CMGetCharPtr( + omccmpiGetStringFromObjectPath(keyval.ref, + pStatus ))); + break; + case CMPI_string: + sprintf(strVal, "%s", (char *)CMGetCharPtr(keyval.string)); + break; + case CMPI_chars: + sprintf(strVal, "%s", (char *)(keyval.chars)); + break; + case CMPI_dateTime: + sprintf(strVal, "%s", (char *)CMGetStringFormat(keyval.dateTime, pStatus)); + break; + //case CMPI_ptr: + // don't know how to handle + //case CMPI_charsptr: + // don't know how to handle + // + // TODO: Add handling for arrays + default: + bRetVal = 0; + break; + } + + + char tmpStrVal[4096] = {0}; + snprintf(tmpStrVal, 4096, "%s=\\\"%s\\\"", CMGetCharPtr(name), strVal); + strncat(stringCop, tmpStrVal, 4096-strlen(strVal)); + + str = CMNewString(broker, stringCop, pStatus); + } + return str; +} +*/ + Modified: omccmpi/trunk/src/lib/omc/fileTools.c =================================================================== --- omccmpi/trunk/src/lib/omc/fileTools.c 2007-03-30 16:28:56 UTC (rev 450) +++ omccmpi/trunk/src/lib/omc/fileTools.c 2007-04-02 17:34:49 UTC (rev 451) @@ -31,12 +31,10 @@ #include "omc/fileTools.h" -//#include "omccmpi/string.h" -//#include "omccmpi/ioUtils.h" -//#include "string.h" -//#include "ioUtils.h" -#include <libgen.h> #include "omc/string.h" +#include "omc/ioUtils.h" + +#include <libgen.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> @@ -49,153 +47,153 @@ char* omc_dirname(const char* path) { - char* tmp = strdup(path); - char* rv = dirname(tmp); + char* tmp = strdup(path); + char* rv = dirname(tmp); if (rv == NULL) { - free(tmp); + free(tmp); } - return rv; + return rv; } void omcFileKeys_free(omcFileKeys* fk) { if (fk == NULL) { - return; + return; } //free(fk->CSCreationClassName); // not malloc'd - free(fk->CSName); + free(fk->CSName); //free(fk->CreationClassName); // not malloc'd - free(fk->FSCreationClassName); - free(fk->FSName); - free(fk->Name); - free(fk); + free(fk->FSCreationClassName); + free(fk->FSName); + free(fk->Name); + free(fk); } omcFileKeys* omcGetKeysForFile(const char* path) { - struct stat st; + struct stat st; if (lstat(path, &st) != 0) { - return NULL; + return NULL; } - return omcGetKeysForFileStat(path, &st); + return omcGetKeysForFileStat(path, &st); } omcFileKeys* omcGetKeysForFileStat(const char* path, struct stat* st) { omcFileKeys* rv = (omcFileKeys*)malloc(sizeof(omcFileKeys)); - memset(rv, 0, sizeof(omcFileKeys)); + memset(rv, 0, sizeof(omcFileKeys)); if (S_ISREG(st->st_mode)) { - rv->CreationClassName = "OMC_LinuxDataFile"; + rv->CreationClassName = "OMC_LinuxDataFile"; } else if (S_ISDIR(st->st_mode)) { - rv->CreationClassName = "OMC_LinuxDirectory"; + rv->CreationClassName = "OMC_LinuxDirectory"; } else if (S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode)) { - rv->CreationClassName = "OMC_LinuxDeviceFile"; + rv->CreationClassName = "OMC_LinuxDeviceFile"; } else if (S_ISFIFO(st->st_mode)) { - rv->CreationClassName = "OMC_LinuxFIFOPipeFile"; + rv->CreationClassName = "OMC_LinuxFIFOPipeFile"; } else if (S_ISLNK(st->st_mode)) { - rv->CreationClassName = "OMC_LinuxSymbolicLink"; + rv->CreationClassName = "OMC_LinuxSymbolicLink"; } else { - free(rv); - return NULL; + free(rv); + return NULL; } - rv->Name = strdup(path); - rv->CSCreationClassName = "OMC_LinuxUnitaryComputerSystem"; - rv->CSName = (char*)malloc(256); - gethostname(rv->CSName, 256); - FILE* mounts = fopen("/proc/mounts", "r"); + rv->Name = strdup(path); + rv->CSCreationClassName = "OMC_LinuxUnitaryComputerSystem"; + rv->CSName = (char*)malloc(256); + gethostname(rv->CSName, 256); + FILE* mounts = fopen("/proc/mounts", "r"); if (mounts == NULL) { - omcFileKeys_free(rv); - return NULL; + omcFileKeys_free(rv); + return NULL; } - char* line = NULL; - char* p = NULL; - size_t bfrLen = 0; + char* line = NULL; + char* p = NULL; + size_t bfrLen = 0; for(p = omcReadLine(mounts, &line,&bfrLen); p; p = omcReadLine(mounts, &line,&bfrLen )) { - int count = omcStrTokenCount(line, " \t\r\n"); + int count = omcStrTokenCount(line, " \t\r\n"); if (count != 6) { - continue; + continue; } - size_t numElems = 0; - char** strs = omcStrTokenize(line, " \t\r\n", &numElems); + size_t numElems = 0; + char** strs = omcStrTokenize(line, " \t\r\n", &numElems); if (strs == NULL) { - continue; + continue; } if (strs[1][0] != '/') { - free(strs); - continue; + free(strs); + continue; } if (strs[1][1] == 0 && strcmp(strs[0], "rootfs") == 0) { /* skip rootfs junk */ - free(strs); - continue; + free(strs); + continue; } - struct stat dst; + struct stat dst; if (stat(strs[1], &dst) != 0) { - free(strs); - continue; + free(strs); + continue; } if (st->st_dev == dst.st_dev) { - rv->FSName = strdup(strs[0]); - char* fstype = strs[2]; + rv->FSName = strdup(strs[0]); + char* fstype = strs[2]; if (strcmp(fstype, "ext2") == 0) { - rv->FSCreationClassName = strdup("OMC_LinuxExt2FileSystem"); + rv->FSCreationClassName = strdup("OMC_LinuxExt2FileSystem"); } else if (strcmp(fstype, "ext3") == 0) { - rv->FSCreationClassName = strdup("OMC_LinuxExt3FileSystem"); + rv->FSCreationClassName = strdup("OMC_LinuxExt3FileSystem"); } else if (strcmp(fstype, "reiserfs") == 0) { - rv->FSCreationClassName = strdup("OMC_LinuxReiserFileSystem"); + rv->FSCreationClassName = strdup("OMC_LinuxReiserFileSystem"); } else if (strcmp(fstype, "nfs") == 0) { - rv->FSCreationClassName = strdup("OMC_LinuxNFS"); + rv->FSCreationClassName = strdup("OMC_LinuxNFS"); } else if (strcmp(fstype, "cifs") == 0) { rv->FSCreationClassName = strdup("OMC_LinuxCIFS"); /* TODO CIM class doesn't exist yet */ } else { - int len = snprintf(NULL, 0, "Unknown:%s", fstype); + int len = snprintf(NULL, 0, "Unknown:%s", fstype); if (len > 0) { rv->FSCreationClassName = (char*)malloc(len + 1); - snprintf(rv->FSCreationClassName, len+1, "Unknown:%s", fstype); + snprintf(rv->FSCreationClassName, len+1, "Unknown:%s", fstype); } else { - rv->FSCreationClassName = strdup("Unknown"); + rv->FSCreationClassName = strdup("Unknown"); } } } - free(strs); + free(strs); if (rv->FSName != NULL) { - break; + break; } } if (line) { - free(line); + free(line); } - fclose(mounts); - return rv; + fclose(mounts); + return rv; } Modified: omccmpi/trunk/src/lib/omc/ntpServer.c =================================================================== --- omccmpi/trunk/src/lib/omc/ntpServer.c 2007-03-30 16:28:56 UTC (rev 450) +++ omccmpi/trunk/src/lib/omc/ntpServer.c 2007-04-02 17:34:49 UTC (rev 451) @@ -239,7 +239,7 @@ serverFromLine(line, &lookupServer); if(strcasecmp(lookupServer.serverName, ntpServer.serverName) == 0) { - DEBUGOUT(" myNTPServerModifyLine() about to write out ntpServer: %s\n name: %s\n key: %d\n version: %d\n minpoll: %d\n maxpoll: %d\n", ntpServer.serverName, ntpServer.key, ntpServer.ntpVersion, ntpServer.minPoll, ntpServer.maxPoll); + DEBUGOUT(" myNTPServerModifyLine() about to write out ntpServer: \n name: %s\n key: %d\n version: %d\n minpoll: %d\n maxpoll: %d\n", ntpServer.serverName, ntpServer.key, ntpServer.ntpVersion, ntpServer.minPoll, ntpServer.maxPoll); char *newLine = lineFromServer(&ntpServer); DEBUGOUT(" myNTPServerModifyLine() modifying line for server: %s\n oldline: %s\n newline: %s\n", ntpServer.serverName, line, newLine); fputs(newLine, ostrm); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ba...@us...> - 2007-03-30 16:28:56
|
Revision: 450 http://svn.sourceforge.net/omc/?rev=450&view=rev Author: bartw Date: 2007-03-30 09:28:56 -0700 (Fri, 30 Mar 2007) Log Message: ----------- bug fix Modified Paths: -------------- tools/trunk/yawn/yawn.py Modified: tools/trunk/yawn/yawn.py =================================================================== --- tools/trunk/yawn/yawn.py 2007-03-28 00:31:08 UTC (rev 449) +++ tools/trunk/yawn/yawn.py 2007-03-30 16:28:56 UTC (rev 450) @@ -466,7 +466,7 @@ class_urlargs['ns'] = ns class_urlargs['url'] = url class_urlargs["className"] = instName.classname - ht = _printHead('Filtered ReferenceNames Dialog... (Coming...)', urlargs=urlargs) + ht = _printHead('Filtered ReferenceNames Dialog... (Coming...)', urlargs=class_urlargs) ht+= '<h1>Filtered References on Class '+_makeHref(req, 'GetClass', class_urlargs, instName.classname)+'</h1>' req.write(ht) _printInstanceNames(req, class_urlargs, [instName]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ba...@us...> - 2007-03-28 00:31:07
|
Revision: 449 http://svn.sourceforge.net/omc/?rev=449&view=rev Author: bartw Date: 2007-03-27 17:31:08 -0700 (Tue, 27 Mar 2007) Log Message: ----------- fixed the build Modified Paths: -------------- cmpibase/trunk/configure.ac cmpibase/trunk/src/providers/computer-system/Makefile.am Modified: cmpibase/trunk/configure.ac =================================================================== --- cmpibase/trunk/configure.ac 2007-03-28 00:30:21 UTC (rev 448) +++ cmpibase/trunk/configure.ac 2007-03-28 00:31:08 UTC (rev 449) @@ -191,10 +191,6 @@ AC_CONFIG_FILES([Makefile src/Makefile - src/lib/Makefile - src/lib/omc/Makefile - src/include/Makefile - src/include/omc/Makefile src/providers/Makefile src/providers/processes/Makefile src/providers/computer-system/Makefile Modified: cmpibase/trunk/src/providers/computer-system/Makefile.am =================================================================== --- cmpibase/trunk/src/providers/computer-system/Makefile.am 2007-03-28 00:30:21 UTC (rev 448) +++ cmpibase/trunk/src/providers/computer-system/Makefile.am 2007-03-28 00:31:08 UTC (rev 449) @@ -15,13 +15,12 @@ -version-info 1 -libomccmpi_hostnamesettingdata_la_LIBADD = \ - $(top_builddir)/src/lib/omc/libomc_cmpi.la libomccmpi_hostnamesettingdata_la_SOURCES = \ hostNameSettingData.c libomccmpi_hostnamesettingdata_la_LDFLAGS = \ + -lomc_cmpi \ -lpthread \ -version-info 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ba...@us...> - 2007-03-28 00:30:21
|
Revision: 448 http://svn.sourceforge.net/omc/?rev=448&view=rev Author: bartw Date: 2007-03-27 17:30:21 -0700 (Tue, 27 Mar 2007) Log Message: ----------- regenerated code with newer cimple Modified Paths: -------------- cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.h cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.h cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalIdentity.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedElement.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.h cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.h cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDirectory.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDirectory.h cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_DataFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_DataFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_DirectoryContainsFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_FIFOPipeFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_FIFOPipeFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_FileIdentity.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDataFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDataFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDeviceFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDeviceFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDirectory.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDirectory.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDirectoryContainsFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFIFOPipeFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFIFOPipeFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFileIdentity.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxSymbolicLink.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxSymbolicLink.h cmpibase/trunk/src/providers/logical-file/schema/OMC_SymbolicLink.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_SymbolicLink.h cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDeviceFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDeviceFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDirectory.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDirectory.h cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixFile.h cmpibase/trunk/src/providers/logical-file/schema/repository.cpp Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Reference _CIM_Component_GroupComponent; @@ -27,6 +27,7 @@ "GroupComponent", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_ManagedElement::static_meta_class, CIMPLE_OFF(CIM_Component,GroupComponent) }; @@ -42,14 +43,15 @@ "PartComponent", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_ManagedElement::static_meta_class, CIMPLE_OFF(CIM_Component,PartComponent) }; static Meta_Feature* _CIM_Component_MFA[] = { - (Meta_Feature*)&_CIM_Component_GroupComponent, - (Meta_Feature*)&_CIM_Component_PartComponent, + (Meta_Feature*)(void*)&_CIM_Component_GroupComponent, + (Meta_Feature*)(void*)&_CIM_Component_PartComponent, }; static const Meta_Feature_Local _locals[] = @@ -72,8 +74,9 @@ 0, /* super_class */ 2, /* num_keys */ 0xD1D41B62, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -90,30 +90,30 @@ static Meta_Feature* _CIM_DataFile_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FileSize, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastModified, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastAccessed, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Readable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Writeable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Executable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CompressionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_EncryptionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount, }; static const Meta_Feature_Local _locals[] = @@ -158,8 +158,9 @@ &CIM_LogicalFile::static_meta_class, 6, /* num_keys */ 0xCE1F7591, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,18 +71,17 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; // CIM_LogicalElement features: // CIM_LogicalFile features: - Property<String> CSCreationClassName; - Property<String> CSName; - Property<String> FSCreationClassName; - Property<String> FSName; - Property<String> CreationClassName; + Property<String> CSCreationClassName; // KEY + Property<String> CSName; // KEY + Property<String> FSCreationClassName; // KEY + Property<String> FSName; // KEY + Property<String> CreationClassName; // KEY Property<uint64> FileSize; Property<Datetime> CreationDate; Property<Datetime> LastModified; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -90,30 +90,30 @@ static Meta_Feature* _CIM_DeviceFile_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FileSize, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastModified, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastAccessed, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Readable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Writeable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Executable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CompressionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_EncryptionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount, }; static const Meta_Feature_Local _locals[] = @@ -158,8 +158,9 @@ &CIM_LogicalFile::static_meta_class, 6, /* num_keys */ 0xB3825686, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,18 +71,17 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; // CIM_LogicalElement features: // CIM_LogicalFile features: - Property<String> CSCreationClassName; - Property<String> CSName; - Property<String> FSCreationClassName; - Property<String> FSName; - Property<String> CreationClassName; + Property<String> CSCreationClassName; // KEY + Property<String> CSName; // KEY + Property<String> FSCreationClassName; // KEY + Property<String> FSName; // KEY + Property<String> CreationClassName; // KEY Property<uint64> FileSize; Property<Datetime> CreationDate; Property<Datetime> LastModified; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -90,30 +90,30 @@ static Meta_Feature* _CIM_Directory_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FileSize, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastModified, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastAccessed, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Readable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Writeable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Executable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CompressionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_EncryptionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount, }; static const Meta_Feature_Local _locals[] = @@ -158,8 +158,9 @@ &CIM_LogicalFile::static_meta_class, 6, /* num_keys */ 0x771AB4F7, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,18 +71,17 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; // CIM_LogicalElement features: // CIM_LogicalFile features: - Property<String> CSCreationClassName; - Property<String> CSName; - Property<String> FSCreationClassName; - Property<String> FSName; - Property<String> CreationClassName; + Property<String> CSCreationClassName; // KEY + Property<String> CSName; // KEY + Property<String> FSCreationClassName; // KEY + Property<String> FSName; // KEY + Property<String> CreationClassName; // KEY Property<uint64> FileSize; Property<Datetime> CreationDate; Property<Datetime> LastModified; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Reference _CIM_DirectoryContainsFile_GroupComponent; @@ -27,6 +27,7 @@ "GroupComponent", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_Directory::static_meta_class, CIMPLE_OFF(CIM_DirectoryContainsFile,GroupComponent) }; @@ -42,14 +43,15 @@ "PartComponent", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_LogicalFile::static_meta_class, CIMPLE_OFF(CIM_DirectoryContainsFile,PartComponent) }; static Meta_Feature* _CIM_DirectoryContainsFile_MFA[] = { - (Meta_Feature*)&_CIM_DirectoryContainsFile_GroupComponent, - (Meta_Feature*)&_CIM_DirectoryContainsFile_PartComponent, + (Meta_Feature*)(void*)&_CIM_DirectoryContainsFile_GroupComponent, + (Meta_Feature*)(void*)&_CIM_DirectoryContainsFile_PartComponent, }; static const Meta_Feature_Local _locals[] = @@ -72,8 +74,9 @@ &CIM_Component::static_meta_class, 2, /* num_keys */ 0xB7798F04, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -90,30 +90,30 @@ static Meta_Feature* _CIM_FIFOPipeFile_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FileSize, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastModified, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastAccessed, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Readable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Writeable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Executable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CompressionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_EncryptionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount, }; static const Meta_Feature_Local _locals[] = @@ -158,8 +158,9 @@ &CIM_LogicalFile::static_meta_class, 6, /* num_keys */ 0x3E090D33, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,18 +71,17 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; // CIM_LogicalElement features: // CIM_LogicalFile features: - Property<String> CSCreationClassName; - Property<String> CSName; - Property<String> FSCreationClassName; - Property<String> FSName; - Property<String> CreationClassName; + Property<String> CSCreationClassName; // KEY + Property<String> CSName; // KEY + Property<String> FSCreationClassName; // KEY + Property<String> FSName; // KEY + Property<String> CreationClassName; // KEY Property<uint64> FileSize; Property<Datetime> CreationDate; Property<Datetime> LastModified; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Reference _CIM_FileIdentity_SystemElement; @@ -27,6 +27,7 @@ "SystemElement", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_LogicalFile::static_meta_class, CIMPLE_OFF(CIM_FileIdentity,SystemElement) }; @@ -42,14 +43,15 @@ "SameElement", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_UnixFile::static_meta_class, CIMPLE_OFF(CIM_FileIdentity,SameElement) }; static Meta_Feature* _CIM_FileIdentity_MFA[] = { - (Meta_Feature*)&_CIM_FileIdentity_SystemElement, - (Meta_Feature*)&_CIM_FileIdentity_SameElement, + (Meta_Feature*)(void*)&_CIM_FileIdentity_SystemElement, + (Meta_Feature*)(void*)&_CIM_FileIdentity_SameElement, }; static const Meta_Feature_Local _locals[] = @@ -72,8 +74,9 @@ &CIM_LogicalIdentity::static_meta_class, 2, /* num_keys */ 0xFFB6B12C, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -45,15 +45,15 @@ static Meta_Feature* _CIM_LogicalElement_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_ManagedSystemElement_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, }; static const Meta_Feature_Local _locals[] = @@ -83,8 +83,9 @@ &CIM_ManagedSystemElement::static_meta_class, 0, /* num_keys */ 0x65D846FD, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,7 +71,6 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -314,30 +314,30 @@ static Meta_Feature* _CIM_LogicalFile_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FileSize, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastModified, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastAccessed, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Readable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Writeable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Executable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CompressionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_EncryptionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount, }; static const Meta_Feature_Local _locals[] = @@ -382,8 +382,9 @@ &CIM_LogicalElement::static_meta_class, 6, /* num_keys */ 0x2D6A6CBB, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,18 +71,17 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; // CIM_LogicalElement features: // CIM_LogicalFile features: - Property<String> CSCreationClassName; - Property<String> CSName; - Property<String> FSCreationClassName; - Property<String> FSName; - Property<String> CreationClassName; + Property<String> CSCreationClassName; // KEY + Property<String> CSName; // KEY + Property<String> FSCreationClassName; // KEY + Property<String> FSName; // KEY + Property<String> CreationClassName; // KEY Property<uint64> FileSize; Property<Datetime> CreationDate; Property<Datetime> LastModified; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalIdentity.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalIdentity.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalIdentity.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Reference _CIM_LogicalIdentity_SystemElement; @@ -27,6 +27,7 @@ "SystemElement", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_ManagedElement::static_meta_class, CIMPLE_OFF(CIM_LogicalIdentity,SystemElement) }; @@ -42,14 +43,15 @@ "SameElement", 0, /* meta_qualifiers */ 0, /* num_meta_qaulifiers */ + 0, /* subscript */ &CIM_ManagedElement::static_meta_class, CIMPLE_OFF(CIM_LogicalIdentity,SameElement) }; static Meta_Feature* _CIM_LogicalIdentity_MFA[] = { - (Meta_Feature*)&_CIM_LogicalIdentity_SystemElement, - (Meta_Feature*)&_CIM_LogicalIdentity_SameElement, + (Meta_Feature*)(void*)&_CIM_LogicalIdentity_SystemElement, + (Meta_Feature*)(void*)&_CIM_LogicalIdentity_SameElement, }; static const Meta_Feature_Local _locals[] = @@ -72,8 +74,9 @@ 0, /* super_class */ 2, /* num_keys */ 0x73E9D550, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedElement.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedElement.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedElement.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -69,9 +69,9 @@ static Meta_Feature* _CIM_ManagedElement_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, }; static const Meta_Feature_Local _locals[] = @@ -95,8 +95,9 @@ 0, /* super_class */ 0, /* num_keys */ 0x5B2A3886, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -129,15 +129,15 @@ static Meta_Feature* _CIM_ManagedSystemElement_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_ManagedSystemElement_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, }; static const Meta_Feature_Local _locals[] = @@ -167,8 +167,9 @@ &CIM_ManagedElement::static_meta_class, 0, /* num_keys */ 0x0DD66B62, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,7 +71,6 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -107,31 +107,31 @@ static Meta_Feature* _CIM_SymbolicLink_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, - (Meta_Feature*)&_CIM_SymbolicLink_TargetFile, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FileSize, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastModified, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastAccessed, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Readable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Writeable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Executable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CompressionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_EncryptionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount, + (Meta_Feature*)(void*)&_CIM_SymbolicLink_TargetFile, }; static const Meta_Feature_Local _locals[] = @@ -177,8 +177,9 @@ &CIM_LogicalFile::static_meta_class, 6, /* num_keys */ 0x6A3588EC, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,18 +71,17 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; // CIM_LogicalElement features: // CIM_LogicalFile features: - Property<String> CSCreationClassName; - Property<String> CSName; - Property<String> FSCreationClassName; - Property<String> FSName; - Property<String> CreationClassName; + Property<String> CSCreationClassName; // KEY + Property<String> CSName; // KEY + Property<String> FSCreationClassName; // KEY + Property<String> FSName; // KEY + Property<String> CreationClassName; // KEY Property<uint64> FileSize; Property<Datetime> CreationDate; Property<Datetime> LastModified; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -192,36 +192,36 @@ static Meta_Feature* _CIM_UnixDeviceFile_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, - (Meta_Feature*)&_CIM_UnixDeviceFile_DeviceFileType, - (Meta_Feature*)&_CIM_UnixDeviceFile_OtherTypeDescription, - (Meta_Feature*)&_CIM_UnixDeviceFile_DeviceId, - (Meta_Feature*)&_CIM_UnixDeviceFile_DeviceDescription, - (Meta_Feature*)&_CIM_UnixDeviceFile_DeviceMajor, - (Meta_Feature*)&_CIM_UnixDeviceFile_DeviceMinor, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_InstallDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Name, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_OperationalStatus, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_StatusDescriptions, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_Status, + (Meta_Feature*)(void*)&_CIM_ManagedSystemElement_HealthState, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSCreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FSName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationClassName, + (Meta_Feature*)(void*)&_CIM_LogicalFile_FileSize, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CreationDate, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastModified, + (Meta_Feature*)(void*)&_CIM_LogicalFile_LastAccessed, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Readable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Writeable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_Executable, + (Meta_Feature*)(void*)&_CIM_LogicalFile_CompressionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_EncryptionMethod, + (Meta_Feature*)(void*)&_CIM_LogicalFile_InUseCount, + (Meta_Feature*)(void*)&_CIM_UnixDeviceFile_DeviceFileType, + (Meta_Feature*)(void*)&_CIM_UnixDeviceFile_OtherTypeDescription, + (Meta_Feature*)(void*)&_CIM_UnixDeviceFile_DeviceId, + (Meta_Feature*)(void*)&_CIM_UnixDeviceFile_DeviceDescription, + (Meta_Feature*)(void*)&_CIM_UnixDeviceFile_DeviceMajor, + (Meta_Feature*)(void*)&_CIM_UnixDeviceFile_DeviceMinor, }; static const Meta_Feature_Local _locals[] = @@ -272,8 +272,9 @@ &CIM_DeviceFile::static_meta_class, 6, /* num_keys */ 0xD5640978, /* crc */ - &__meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB, + &__meta_repository_05D9AAA275241F50AA3C54D0749DD74C, }; CIMPLE_NAMESPACE_END +CIMPLE_ID("$Header$"); Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.h 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.h 2007-03-28 00:30:21 UTC (rev 448) @@ -24,7 +24,7 @@ // CIM_ManagedSystemElement features: Property<Datetime> InstallDate; Property<String> Name; - struct + struct _OperationalStatus { enum { @@ -50,14 +50,13 @@ enum_DMTF_Reserved = 0, enum_Vendor_Reserved = 0, }; - uint16 value; + Array_uint16 value; uint8 null; - char padding[40]; } OperationalStatus; Property<Array_String> StatusDescriptions; Property<String> Status; - struct + struct _HealthState { enum { @@ -72,18 +71,17 @@ }; uint16 value; uint8 null; - char padding[40]; } HealthState; // CIM_LogicalElement features: // CIM_LogicalFile features: - Property<String> CSCreationClassName; - Property<String> CSName; - Property<String> FSCreationClassName; - Property<String> FSName; - Property<String> CreationClassName; + Property<String> CSCreationClassName; // KEY + Property<String> CSName; // KEY + Property<String> FSCreationClassName; // KEY + Property<String> FSName; // KEY + Property<String> CreationClassName; // KEY Property<uint64> FileSize; Property<Datetime> CreationDate; Property<Datetime> LastModified; @@ -98,7 +96,7 @@ // CIM_DeviceFile features: // CIM_UnixDeviceFile features: - struct + struct _DeviceFileType { enum { @@ -109,7 +107,6 @@ }; uint16 value; uint8 null; - char padding[40]; } DeviceFileType; Property<String> OtherTypeDescription; Modified: cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDirectory.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDirectory.cpp 2007-03-27 23:16:48 UTC (rev 447) +++ cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDirectory.cpp 2007-03-28 00:30:21 UTC (rev 448) @@ -14,7 +14,7 @@ using namespace cimple; -extern const Meta_Repository __meta_repository_ED0B972F51471FD5A6B6EFAAB4B85BDB; +extern const Meta_Repository __meta_repository_05D9AAA275241F50AA3C54D0749DD74C; extern const Meta_Property _CIM_ManagedElement_Caption; @@ -107,31 +107,31 @@ static Meta_Feature* _CIM_UnixDirectory_MFA[] = { - (Meta_Feature*)&_CIM_ManagedElement_Caption, - (Meta_Feature*)&_CIM_ManagedElement_Description, - (Meta_Feature*)&_CIM_ManagedElement_ElementName, - (Meta_Feature*)&_CIM_ManagedSystemElement_InstallDate, - (Meta_Feature*)&_CIM_LogicalFile_Name, - (Meta_Feature*)&_CIM_ManagedSystemElement_OperationalStatus, - (Meta_Feature*)&_CIM_ManagedSystemElement_StatusDescriptions, - (Meta_Feature*)&_CIM_ManagedSystemElement_Status, - (Meta_Feature*)&_CIM_ManagedSystemElement_HealthState, - (Meta_Feature*)&_CIM_LogicalFile_CSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_CSName, - (Meta_Feature*)&_CIM_LogicalFile_FSCreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FSName, - (Meta_Feature*)&_CIM_LogicalFile_CreationClassName, - (Meta_Feature*)&_CIM_LogicalFile_FileSize, - (Meta_Feature*)&_CIM_LogicalFile_CreationDate, - (Meta_Feature*)&_CIM_LogicalFile_LastModified, - (Meta_Feature*)&_CIM_LogicalFile_LastAccessed, - (Meta_Feature*)&_CIM_LogicalFile_Readable, - (Meta_Feature*)&_CIM_LogicalFile_Writeable, - (Meta_Feature*)&_CIM_LogicalFile_Executable, - (Meta_Feature*)&_CIM_LogicalFile_CompressionMethod, - (Meta_Feature*)&_CIM_LogicalFile_EncryptionMethod, - (Meta_Feature*)&_CIM_LogicalFile_InUseCount, - (Meta_Feature*)&_CIM_UnixDirectory_FileSizeBits, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Caption, + (Meta_Feature*)(void*)&_CIM_ManagedElement_Description, + (Meta_Feature*)(void*)&_CIM_ManagedElement_ElementName, + (Meta_Feat... [truncated message content] |
From: <ba...@us...> - 2007-03-27 23:16:48
|
Revision: 447 http://svn.sourceforge.net/omc/?rev=447&view=rev Author: bartw Date: 2007-03-27 16:16:48 -0700 (Tue, 27 Mar 2007) Log Message: ----------- renamed file Modified Paths: -------------- schema/trunk/mof/base/omc-base-providers.mof schema/trunk/mof/base/omc-core.mof Added Paths: ----------- schema/trunk/mof/base/omc-logical-file.mof Removed Paths: ------------- schema/trunk/mof/base/omc-posix-file-elements.mof Modified: schema/trunk/mof/base/omc-base-providers.mof =================================================================== --- schema/trunk/mof/base/omc-base-providers.mof 2007-03-09 03:57:56 UTC (rev 446) +++ schema/trunk/mof/base/omc-base-providers.mof 2007-03-27 23:16:48 UTC (rev 447) @@ -1,7 +1,7 @@ #pragma include ("omc-core.mof") #pragma include ("omc-computer-system.mof") #pragma include ("omc-operating-system.mof") -#pragma include ("omc-posix-file-elements.mof") +#pragma include ("omc-logical-file.mof") #pragma include ("omc-file-system-elements.mof") #pragma include ("omc-processes.mof") #pragma include ("omc-time-service.mof") Modified: schema/trunk/mof/base/omc-core.mof =================================================================== --- schema/trunk/mof/base/omc-core.mof 2007-03-09 03:57:56 UTC (rev 446) +++ schema/trunk/mof/base/omc-core.mof 2007-03-27 23:16:48 UTC (rev 447) @@ -32,85 +32,4 @@ }; ////////////////////////////////////////////////////////////////////////////// -[ Abstract ] -class OMC_DataFile : CIM_DataFile -{ - sint32 append([IN(true), OUT(false), REQUIRED(true)] string newtext); - sint32 write([IN(true), OUT(false), REQUIRED(true)] string newtext); - sint32 read([IN(false), OUT(true), REQUIRED(true)] string filetext); -}; -////////////////////////////////////////////////////////////////////////////// -[ Abstract ] -class OMC_UnixDeviceFile : CIM_UnixDeviceFile -{ -}; - -////////////////////////////////////////////////////////////////////////////// -[ Abstract ] -class OMC_SymbolicLink : CIM_SymbolicLink -{ -}; - -////////////////////////////////////////////////////////////////////////////// -[ Abstract ] -class OMC_UnixDirectory : CIM_UnixDirectory -{ -}; - -////////////////////////////////////////////////////////////////////////////// -[ Abstract ] -class OMC_FIFOPipeFile : CIM_FIFOPipeFile -{ -}; - -////////////////////////////////////////////////////////////////////////////// -[ Abstract ] -class OMC_UnixFile : CIM_UnixFile -{ - boolean UserReadable; - boolean UserWritable; - boolean UserExecutable; - boolean GroupReadable; - boolean GroupWritable; - boolean GroupExecutable; - boolean WorldReadable; - boolean WorldWritable; - boolean WorldExecutable; -}; - -////////////////////////////////////////////////////////////////////////////// -[ Association, Aggregation, Composition, Abstract, - Description("Specifies the hierarchical arrangement of LogicalFiles in a " - "Directory.")] -class OMC_DirectoryContainsFile : CIM_DirectoryContainsFile -{ - [Override ("GroupComponent"), Aggregate, Max(1), - Description ("The Directory") ] - OMC_UnixDirectory REF GroupComponent; - - [Override ("PartComponent"), - Description ("The LogicalFile 'contained within' the Directory.") ] - CIM_LogicalFile REF PartComponent; -}; - -////////////////////////////////////////////////////////////////////////////// -[ Association, Abstract, Description ( - "CIM_FileIdentity indicates that a UnixFile describes Unix-" - "specific aspects of the various subclasses of LogicalFile. " - "The association exists since it forces UnixFile to be " - "weak to (scoped by) the LogicalFile. This is not true in " - "the association's superclass, LogicalIdentity.")] -class OMC_FileIdentity : CIM_FileIdentity -{ - [Override ("SystemElement"), Min (1), Max (1), - Description ("The Logical File.") ] - CIM_LogicalFile ref SystemElement; - - [Override ("SameElement"), Weak, Max (1), - Description ("SameElement represents the additional aspects of the " - "Unix/Linux Logical file.") ] - OMC_UnixFile ref SameElement; - -}; - Added: schema/trunk/mof/base/omc-logical-file.mof =================================================================== --- schema/trunk/mof/base/omc-logical-file.mof (rev 0) +++ schema/trunk/mof/base/omc-logical-file.mof 2007-03-27 23:16:48 UTC (rev 447) @@ -0,0 +1,191 @@ +/******************************************************************************* + * Novell_LinuxSSHService and associated classes + * + * + * Copyright (C) 2004 Novell, Inc. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * - Neither the name of Novell, Inc. nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL Novell, Inc. OR THE CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + ******************************************************************************/ +#pragma locale ("en_US") + +////////////////////////////////////////////////////////////////////////////// +[ Abstract ] +class OMC_DataFile : CIM_DataFile +{ + sint32 append([IN(true), OUT(false), REQUIRED(true)] string newtext); + sint32 write([IN(true), OUT(false), REQUIRED(true)] string newtext); + sint32 read([IN(false), OUT(true), REQUIRED(true)] string filetext); +}; + +////////////////////////////////////////////////////////////////////////////// +[ Abstract ] +class OMC_UnixDeviceFile : CIM_UnixDeviceFile +{ +}; + +////////////////////////////////////////////////////////////////////////////// +[ Abstract ] +class OMC_SymbolicLink : CIM_SymbolicLink +{ +}; + +////////////////////////////////////////////////////////////////////////////// +[ Abstract ] +class OMC_UnixDirectory : CIM_UnixDirectory +{ +}; + +////////////////////////////////////////////////////////////////////////////// +[ Abstract ] +class OMC_FIFOPipeFile : CIM_FIFOPipeFile +{ +}; + +////////////////////////////////////////////////////////////////////////////// +[ Abstract ] +class OMC_UnixFile : CIM_UnixFile +{ + boolean UserReadable; + boolean UserWritable; + boolean UserExecutable; + boolean GroupReadable; + boolean GroupWritable; + boolean GroupExecutable; + boolean WorldReadable; + boolean WorldWritable; + boolean WorldExecutable; +}; + +////////////////////////////////////////////////////////////////////////////// +[ Association, Aggregation, Composition, Abstract, + Description("Specifies the hierarchical arrangement of LogicalFiles in a " + "Directory.")] +class OMC_DirectoryContainsFile : CIM_DirectoryContainsFile +{ + [Override ("GroupComponent"), Aggregate, Max(1), + Description ("The Directory") ] + OMC_UnixDirectory REF GroupComponent; + + [Override ("PartComponent"), + Description ("The LogicalFile 'contained within' the Directory.") ] + CIM_LogicalFile REF PartComponent; +}; + +////////////////////////////////////////////////////////////////////////////// +[ Association, Abstract, Description ( + "CIM_FileIdentity indicates that a UnixFile describes Unix-" + "specific aspects of the various subclasses of LogicalFile. " + "The association exists since it forces UnixFile to be " + "weak to (scoped by) the LogicalFile. This is not true in " + "the association's superclass, LogicalIdentity.")] +class OMC_FileIdentity : CIM_FileIdentity +{ + [Override ("SystemElement"), Min (1), Max (1), + Description ("The Logical File.") ] + CIM_LogicalFile ref SystemElement; + + [Override ("SameElement"), Weak, Max (1), + Description ("SameElement represents the additional aspects of the " + "Unix/Linux Logical file.") ] + OMC_UnixFile ref SameElement; + +}; + +////////////////////////////////////////////////////////////////////////////// +[ provider("cmpi:CIM_LogicalFile_Provider")] +class OMC_LinuxDataFile : OMC_DataFile +{ +}; + +////////////////////////////////////////////////////////////////////////////// +[ provider("cmpi:CIM_LogicalFile_Provider")] +class OMC_LinuxDeviceFile : OMC_UnixDeviceFile +{ +}; + +////////////////////////////////////////////////////////////////////////////// +[ provider("cmpi:CIM_LogicalFile_Provider")] +class OMC_LinuxSymbolicLink : OMC_SymbolicLink +{ +}; + +////////////////////////////////////////////////////////////////////////////// +[ provider("cmpi:CIM_LogicalFile_Provider")] +class OMC_LinuxDirectory : OMC_UnixDirectory +{ +}; + +////////////////////////////////////////////////////////////////////////////// +[ provider("cmpi:CIM_LogicalFile_Provider")] +class OMC_LinuxFIFOPipeFile : OMC_FIFOPipeFile +{ +}; + +////////////////////////////////////////////////////////////////////////////// +[ provider("cmpi:OMC_LinuxFile_Provider")] +class OMC_LinuxFile : OMC_UnixFile +{ +}; + +////////////////////////////////////////////////////////////////////////////// +[Association, Aggregation, Composition, + Description("Specifies the hierarchical arrangement of LogicalFiles in a " + "Directory.") + ,provider("cmpi:OMC_LinuxDirectoryContainsFile_Provider") +] +class OMC_LinuxDirectoryContainsFile : OMC_DirectoryContainsFile +{ + [Override ("GroupComponent"), Aggregate, Max(1), + Description ("The Directory") ] + OMC_LinuxDirectory REF GroupComponent; + + [Override ("PartComponent"), + Description ("The LogicalFile 'contained within' the Directory.") ] + CIM_LogicalFile REF PartComponent; +}; + +////////////////////////////////////////////////////////////////////////////// +[Association, Description ( + "CIM_FileIdentity indicates that a UnixFile describes Unix-" + "specific aspects of the various subclasses of LogicalFile. " + "The association exists since it forces UnixFile to be " + "weak to (scoped by) the LogicalFile. This is not true in " + "the association's superclass, LogicalIdentity."), + provider("cmpi:OMC_LinuxFileIdentity_Provider") ] +class OMC_LinuxFileIdentity : OMC_FileIdentity +{ + [Override ("SystemElement"), Min (1), Max (1), + Description ("The Logical File.") ] + CIM_LogicalFile ref SystemElement; + + [Override ("SameElement"), Weak, Max (1), Description ( + "SameElement represents the additional aspects of the " + "Unix/Linux Logical file.") ] + OMC_LinuxFile ref SameElement; + +}; + Deleted: schema/trunk/mof/base/omc-posix-file-elements.mof =================================================================== --- schema/trunk/mof/base/omc-posix-file-elements.mof 2007-03-09 03:57:56 UTC (rev 446) +++ schema/trunk/mof/base/omc-posix-file-elements.mof 2007-03-27 23:16:48 UTC (rev 447) @@ -1,104 +0,0 @@ -/******************************************************************************* - * Novell_LinuxSSHService and associated classes - * - * - * Copyright (C) 2004 Novell, Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * - Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * - Neither the name of Novell, Inc. nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL Novell, Inc. OR THE CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - ******************************************************************************/ -#pragma locale ("en_US") - -////////////////////////////////////////////////////////////////////////////// -class OMC_LinuxDataFile : OMC_DataFile -{ -}; - -////////////////////////////////////////////////////////////////////////////// -class OMC_LinuxBlockDeviceFile : OMC_UnixDeviceFile -{ -}; - -////////////////////////////////////////////////////////////////////////////// -class OMC_LinuxCharacterDeviceFile : OMC_UnixDeviceFile -{ -}; - -////////////////////////////////////////////////////////////////////////////// -class OMC_LinuxSymbolicLink : OMC_SymbolicLink -{ -}; - -////////////////////////////////////////////////////////////////////////////// -class OMC_LinuxDirectory : OMC_UnixDirectory -{ -}; - -////////////////////////////////////////////////////////////////////////////// -class OMC_LinuxFIFOPipeFile : OMC_FIFOPipeFile -{ -}; - -////////////////////////////////////////////////////////////////////////////// -class OMC_LinuxFile : OMC_UnixFile -{ -}; - -////////////////////////////////////////////////////////////////////////////// -[Association, Aggregation, Composition, - Description("Specifies the hierarchical arrangement of LogicalFiles in a " - "Directory.")] -class OMC_LinuxDirectoryContainsFile : OMC_DirectoryContainsFile -{ - [Override ("GroupComponent"), Aggregate, Max(1), - Description ("The Directory") ] - OMC_LinuxDirectory REF GroupComponent; - - [Override ("PartComponent"), - Description ("The LogicalFile 'contained within' the Directory.") ] - CIM_LogicalFile REF PartComponent; -}; - -////////////////////////////////////////////////////////////////////////////// -[Association, Description ( - "CIM_FileIdentity indicates that a UnixFile describes Unix-" - "specific aspects of the various subclasses of LogicalFile. " - "The association exists since it forces UnixFile to be " - "weak to (scoped by) the LogicalFile. This is not true in " - "the association's superclass, LogicalIdentity.") ] -class OMC_LinuxFileIdentity : OMC_FileIdentity -{ - [Override ("SystemElement"), Min (1), Max (1), - Description ("The Logical File.") ] - CIM_LogicalFile ref SystemElement; - - [Override ("SameElement"), Weak, Max (1), Description ( - "SameElement represents the additional aspects of the " - "Unix/Linux Logical file.") ] - OMC_LinuxFile ref SameElement; - -}; - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ba...@us...> - 2007-03-09 03:57:55
|
Revision: 446 http://svn.sourceforge.net/omc/?rev=446&view=rev Author: bartw Date: 2007-03-08 19:57:56 -0800 (Thu, 08 Mar 2007) Log Message: ----------- fixed typo Modified Paths: -------------- tools/trunk/yawn/yawn.py Modified: tools/trunk/yawn/yawn.py =================================================================== --- tools/trunk/yawn/yawn.py 2007-02-27 00:42:17 UTC (rev 445) +++ tools/trunk/yawn/yawn.py 2007-03-09 03:57:56 UTC (rev 446) @@ -1051,7 +1051,7 @@ paramVal = [_decodeObject(x) for x in paramVal] else: paramVal = [pywbem.tocimobj(dt, x) for x in paramVal] - inParams[paramName] = paramVal + inParms[paramName] = paramVal else: if metaParm.reference_class is not None: inParms[paramName] = _decodeObject(paramVal) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ba...@us...> - 2007-02-27 00:42:19
|
Revision: 445 http://svn.sourceforge.net/omc/?rev=445&view=rev Author: bartw Date: 2007-02-26 16:42:17 -0800 (Mon, 26 Feb 2007) Log Message: ----------- adding link to return to namespace on top; clickable method REF out params Modified Paths: -------------- tools/trunk/yawn/yawn.py Modified: tools/trunk/yawn/yawn.py =================================================================== --- tools/trunk/yawn/yawn.py 2007-02-22 00:19:49 UTC (rev 444) +++ tools/trunk/yawn/yawn.py 2007-02-27 00:42:17 UTC (rev 445) @@ -65,7 +65,7 @@ strItem = '"' + strItem + '"' rval+= strItem rval+= '}' - return rval + return cgi.escape(rval) elif type(x) == datetime: #http://windowssdk.msdn.microsoft.com/en-us/library/ms739696.aspx rval = x.strftime('%Y%m%d%H%M%S') @@ -87,7 +87,7 @@ while len(uoff) < 3: uoff = '0'+uoff uoff = neg and '-'+uoff or '+'+uoff - return rval + uoff + return cgi.escape(rval + uoff) elif type(x) == timedelta: #http://windowssdk.msdn.microsoft.com/en-us/library/ms744132.aspx mss = str(x.microseconds) @@ -108,10 +108,10 @@ days = str(x.days) while len(days) < 8: days = '0'+days - return days + hours + mins + secs + '.' + mss + ':000' + return cgi.escape(days + hours + mins + secs + '.' + mss + ':000') else: - return str(x) + return cgi.escape(str(x)) ############################################################################## _status_codes = [('', '') @@ -221,9 +221,11 @@ ') : ' + arg[1] + '</i>') req.write( '</body></html>') return; - req.write( _printHead('Deleted Instance of '+instName.classname)) - urlargs = {} - req.write('Deleted Instance of ' + instName.classname) + urlargs = {'ns':ns,'url':url} + req.write( _printHead('Deleted Instance of '+instName.classname, + urlargs=urlargs)) + req.write('Deleted Instance of ' + _makeHref(req, 'GetClass', + urlargs, instName.classname)) _printInstanceNames(req, urlargs, [instName], omitGetLink=True) return '</body></html>' @@ -265,7 +267,7 @@ class_urlargs["className"] = instName.classname ht = 'Objects associated with instance of ' ht+= _makeHref(req, 'GetClass', class_urlargs, instName.classname) - ht = _printHead('ReferenceNames '+instName.classname, ht, req) + ht = _printHead('ReferenceNames '+instName.classname, ht, req, urlargs) req.write(ht) _printInstanceNames(req, urlargs, [instName]) @@ -359,7 +361,7 @@ urlargs['url'] = url instName = _decodeObject(instPath) refs = None - req.write( _printHead(assocCall+' '+instName.classname)) + req.write( _printHead(assocCall+' '+instName.classname,urlargs=urlargs)) class_urlargs = urlargs.copy() class_urlargs["className"] = instName.classname @@ -440,7 +442,7 @@ urlargs['url'] = url instName = _decodeObject(instPath) assocs = _ex(req,conn.AssociatorNames,ObjectName=instName) - ht = _printHead('AssociatorNames '+instName.classname) + ht = _printHead('AssociatorNames '+instName.classname, urlargs=urlargs) groupedAssocs = {} for assoc in assocs: if assoc.classname not in groupedAssocs.keys(): @@ -464,7 +466,7 @@ class_urlargs['ns'] = ns class_urlargs['url'] = url class_urlargs["className"] = instName.classname - ht = _printHead('Filtered ReferenceNames Dialog... (Coming...)') + ht = _printHead('Filtered ReferenceNames Dialog... (Coming...)', urlargs=urlargs) ht+= '<h1>Filtered References on Class '+_makeHref(req, 'GetClass', class_urlargs, instName.classname)+'</h1>' req.write(ht) _printInstanceNames(req, class_urlargs, [instName]) @@ -626,7 +628,7 @@ inst = None klass = _ex(req,conn.GetClass,ClassName=instName.classname, LocalOnly = False, IncludeQualifiers = True) inst = _ex(req,conn.GetInstance,InstanceName=instName, LocalOnly = False) - ht = _printHead('Instance of '+instName.classname, req=req) + ht = _printHead('Instance of '+instName.classname, req=req, urlargs=urlargs) ht+= _displayInstance(req, inst, instName, klass, urlargs) return ht + '</body></html>' @@ -721,7 +723,7 @@ urlargs['ns'] = ns urlargs['url'] = url insts = _ex(req,conn.EnumerateInstances,ClassName = className, LocalOnly = False) - ht = _printHead('Instances of '+className, 'Instances of '+className, req) + ht = _printHead('Instances of '+className, 'Instances of '+className, req, urlargs=urlargs) numInsts = len(insts) msgStart = 'Showing '+`numInsts`+' Instances<br />' if numInsts == 0: @@ -811,7 +813,7 @@ def CreateInstancePrep(req, url, ns, className): conn = _frontMatter(req, url, ns) klass = _ex(req, conn.GetClass, ClassName = className, LocalOnly = False, IncludeQualifiers = True) - ht = _printHead('Create Instances of '+className,'Create Instances of '+className, req) + ht = _printHead('Create Instances of '+className,'Create Instances of '+className, req, urlargs={'ns':ns, 'url':url}) ht+= _displayInstanceMod(req, conn, url, ns, klass) return ht + '</body></html>' @@ -820,7 +822,7 @@ conn = _frontMatter(req, url, ns) instPathDec = _decodeObject(instPath) klass = _ex(req,conn.GetClass,ClassName=instPathDec.classname, LocalOnly = False, IncludeQualifiers = True) - ht = _printHead('Modify Instances of '+instPathDec.classname,'Modify Instances of '+instPathDec.classname, req) + ht = _printHead('Modify Instances of '+instPathDec.classname,'Modify Instances of '+instPathDec.classname, req, urlargs={'ns':ns, 'url':url}) ht+= _displayInstanceMod(req, conn, url, ns, klass, (instPath, instPathDec)) return ht + '</body></html>' @@ -980,7 +982,7 @@ class_urlargs["className"] = className ht+= ' of ' ht+= _makeHref(req, 'GetClass', class_urlargs, className) + '</h1>' - ht = _printHead('Instances of '+className, ht, req) + ht = _printHead('Instances of '+className, ht, req, urlargs=urlargs) req.write(ht) _printInstanceNames(req, urlargs, instNames) ht = '<p>' @@ -1013,7 +1015,7 @@ ht = 'Invoked method '+_makeHref(req, 'GetClass', urlargs, className) ht+= '::'+_makeHref(req, 'GetClass', urlargs, method, '#'+method.lower()) ht+= '()' - ht = _printHead('Results of Method '+className+'::'+method, ht, req) + ht = _printHead('Results of Method '+className+'::'+method, ht, req, urlargs=urlargs) cimmethod = klass.methods[method] inParms = {} @@ -1065,8 +1067,12 @@ ht+= '<th>Data Type</th><th>Param Name</th><th>Value</th></tr>' for parmName, parm in outParms.items(): metaParm = cimmethod.parameters[parmName] + isRef = False if metaParm.reference_class is not None: - dt = metaParm.reference_class + isRef = True + urlargs['className'] = metaParm.reference_class + dt = _makeHref(req, 'GetClass', urlargs, + metaParm.reference_class) else: dt = metaParm.type ht+= '<tr><td>'+dt+'</td><td>'+metaParm.name+'</td><td>' @@ -1080,7 +1086,10 @@ display = display + ' ('+valuesQual[valIdx]+')' ht+= display else: - ht+= _val2str(parm) + if isRef: + ht+= _makeGetInstLink(req, urlargs, parm, _val2str(parm)) + else: + ht+= _val2str(parm) ht+= '</td></tr>' ht+= '</table>' @@ -1118,12 +1127,12 @@ outParms.append(param) - ht = _printHead('Method '+className+'::'+method) classUrlArgs = urlargs.copy() classUrlArgs['className'] = className ht = 'Invoke method '+_makeHref(req, 'GetClass', classUrlArgs, className) ht+= '::'+_makeHref(req, 'GetClass', classUrlArgs, method, '#'+method.lower())+'()' - ht = _printHead('Method '+className+'::'+method, ht, req) + # note, ht passed in as param. + ht = _printHead('Method '+className+'::'+method, ht, req, urlargs=urlargs) if isinstance(lobjPath, pywbem.CIMInstanceName): ht+= 'on instance' req.write(ht,0) @@ -1277,7 +1286,7 @@ urlargs['ns'] = ns urlargs['url'] = url klass = _ex(req, conn.GetClass, ClassName = className, LocalOnly = "false", IncludeClassOrigin = "true") - ht = _printHead('Class '+className, 'Class '+className, req) + ht = _printHead('Class '+className, 'Class '+className, req, urlargs=urlargs) instUrlArgs = urlargs.copy() instUrlArgs['className'] = className ht+= '<table border=0><tr><td>' @@ -1316,7 +1325,7 @@ ht+= ', ' ht+= qual.name if qual.name not in ["Composition", "Association", "Aggregation"]: - ht+= ' ("'+cgi.escape(_val2str(qual.value))+'") ' + ht+= ' ("'+_val2str(qual.value)+'") ' ht+= '</td></tr>' ht+= '<tr><td align="center" bgcolor="#C0C0C0" colspan="3"><b>' ht+= 'Parameters (local in grey)</b></td></tr>' @@ -1765,7 +1774,7 @@ return "</table></body></html>" ############################################################################## -def _printHead(title = None, heading = None, req = None): +def _printHead(title = None, heading = None, req = None, urlargs = None): ht = '\n<html><head><title>YAWN: CIM' if title is not None: ht+= ' ' + title @@ -1777,7 +1786,13 @@ ht+= '<table border=0 cellpadding=0 cellspacing=0 vspace=0><tr><td nowrap width=100% valign=top>' if heading is not None: ht+= '<h1>'+heading+'</h1>' - ht+= '</td><td valign=top nowrap align=right><font size=-1><i>' + ht+= '</td>' + if urlargs and 'ns' in urlargs.keys() and 'url' in urlargs.keys(): + lurlargs = {'ns':urlargs['ns'], 'url':urlargs['url']} + ht+= '<td valign=top nowrap align=right><font size=-1><i>' + ht+= _makeHref(req, 'EnumClassNames', lurlargs, lurlargs['ns']) + ht+= ' </i></td>' + ht+= '<td valign=top nowrap align=right><font size=-1><i>' ht+= '<a href="'+_baseScript(req)+'/Logout">Logout >></a></i>' ht+= '</td></tr></table>' return ht @@ -1841,6 +1856,8 @@ ht+= 'Unable to enumerate Namespaces. Return to the ' ht+= '<a href="'+_baseScript(req)+'">Login page</a> and specify a ' ht+= 'Namespace.' + if req.conn.last_reply is not None: + ht+= '<pre>'+cgi.escape(req.conn.last_reply)+'</pre>' return ht + '</body></html>' urlargs = {} urlargs['url'] = url This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ba...@us...> - 2007-02-22 00:19:50
|
Revision: 444 http://svn.sourceforge.net/omc/?rev=444&view=rev Author: bartw Date: 2007-02-21 16:19:49 -0800 (Wed, 21 Feb 2007) Log Message: ----------- fixed stringarray properties and parameters so that array elements can include commas Modified Paths: -------------- tools/trunk/yawn/yawn.py Modified: tools/trunk/yawn/yawn.py =================================================================== --- tools/trunk/yawn/yawn.py 2007-02-20 21:59:16 UTC (rev 443) +++ tools/trunk/yawn/yawn.py 2007-02-22 00:19:49 UTC (rev 444) @@ -60,7 +60,10 @@ for item in x: if item is not x[0]: rval+= ', ' - rval+= _val2str(item) + strItem = _val2str(item) + if type(item) in types.StringTypes: + strItem = '"' + strItem + '"' + rval+= strItem rval+= '}' return rval elif type(x) == datetime: @@ -759,10 +762,15 @@ if metaProp.is_array: if type(propVal) is not list: propVal = propVal.strip() - propVal = propVal.strip('{}') + propVal = propVal.strip('{}[]') propVal = propVal.strip() - propVal = propVal.split(',') - propVal = [x.strip() for x in propVal] + if len(propVal) > 2 and dt == 'string' \ + and propVal[0] == '"' and propVal[-1] == '"' : + propVal = '['+propVal+']' + propVal = eval(propVal) + else: + propVal = propVal.split(",") + propVal = [x.strip() for x in propVal] propVal = [pywbem.tocimobj(dt, x) for x in propVal] inst.properties[propName] = propVal else: @@ -933,7 +941,10 @@ else: ht+= '<input type=text size=50 name="'+fPropName+'"' if oldVal is not None: - ht+= ' value="'+_val2str(oldVal)+'"' + strValue = _val2str(oldVal) + if isinstance(oldVal,list): + strValue = strValue.replace('"','"') + ht+= ' value="'+strValue+'"' ht+= '>' ht+= '</td></tr>' @@ -1025,10 +1036,15 @@ if metaParm.is_array: if type(paramVal) is not list: paramVal = paramVal.strip() - paramVal = paramVal.strip('{}') + paramVal = paramVal.strip('{}[]') paramVal = paramVal.strip() - paramVal = paramVal.split(',') - paramVal = [x.strip() for x in paramVal] + if len(paramVal) > 2 and dt == 'string' \ + and paramVal[0] == '"' and paramVal[-1] == '"' : + paramVal = '['+paramVal+']' + paramVal = eval(paramVal) + else: + paramVal = paramVal.split(",") + paramVal = [x.strip() for x in paramVal] if metaParm.reference_class is not None: paramVal = [_decodeObject(x) for x in paramVal] else: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bni...@us...> - 2007-02-20 21:59:36
|
Revision: 443 http://svn.sourceforge.net/omc/?rev=443&view=rev Author: bnicholes Date: 2007-02-20 13:59:16 -0800 (Tue, 20 Feb 2007) Log Message: ----------- OMC Contributor Agreement Added Paths: ----------- OMC-Project_Contributor_Agreement.pdf Added: OMC-Project_Contributor_Agreement.pdf =================================================================== --- OMC-Project_Contributor_Agreement.pdf (rev 0) +++ OMC-Project_Contributor_Agreement.pdf 2007-02-20 21:59:16 UTC (rev 443) @@ -0,0 +1,389 @@ +%PDF-1.4 +%äüöß +2 0 obj +<< /Length 3 0 R + /Filter /FlateDecode +>> +stream +x\x9C\xED]ۊ\xE4\xC8|\x98\xA8g\x83ۺ\x96\xAA`1T\xF7L\xFBy\xED\x80o`\xBC\xEF\xCB\xFE\xBEUխ\x94J\x8ALIݽc300\x9A\x92\x94:y\xAEq.Y~\xF9\xFC\xE9?\x87\xE2\xF0\xDB\xE2\xA1<˪\xFF\xBB;_\xFF\xFE\xF9o\x87?\xFF\xE6\xF0\xEF\x97\xFF\xBD\xFE\xF9\xF9\x9F?=~\xFB\xFC\xA9j\xCE\xE7CW\xC7÷\xBF~\xF7\\xCA\xE2\xF0\xED\xEF\x87\x8A\xF2\xF7\x87o\xFF\xFC\xFC\xA9{\xA8\xDA\xFE\x86\xFE?(\xAA\x97Km\xFF\xE3\xD7+uѼ\\xEB\x9FІߵ/תɭ\xE1R=\9W\xBA\xF0\xA3n\xB8t +\x97N\xE1\xD2p\xE5\x8B\xB8\x8F\xC3Z\xE5\xB3:x\xD6\xD3p_\xB8\xF2\xE5\xE5\xCAi\\xE7W\xA4>\xE8\xF9\xE5\xCA\xF1\xA1{\xBDR/W\xEA\xF1A\x81z\x81Pe Ti\xE0Gť|\xBD\xF3k\xBFa?^\xF7\xB0\xBC\xEDay\x98\xEE\xDE_~\xFA\xFC\xE9\xB6\xBF\xBCn\xF1\xFF\xD0_\xB8\xB2\xC2\xE9\xF0ӡ,o\x9Bq\xFBz}Μ\xFA\xFB\xC7\xF3\xB9g\x98/ /\x9C\xF1\xFB\xAA9\xA1&d ?\xAA\xE7D(\x91e;\xDD\xF8쎬\xA9\x8D\xBFoܽ\xF0\xBE\xE3\xB0{\xE3}\xBC\x8F<\xA9\x90\x95\x9F\x8Ej\xC4S#\xE9\xC6u\x87.\xCFÚ\x86g\x97\x97a\xAFz\xA6>p\xBCt)g\u\xCF +\xE7\xE2p\xECڇ*\xB0Byc\x85\xF2ixT9\xAC\xEBqXD9[i\xFD\x804?\xEF\xFF2<g.\xFD\x93\xE7\xBB>\xBD\xB6\xA1\x83\xB7\x85\xF7?\xECv\xF8\xAB\xF1\xA0\x81\xE4\xE3\xB2G֜c=<\xFC~\xF6\x8CO'/\x8F/\xF1\xF9͜\x87\x8F=\xE5\xEFy\x83Q|N_\xB6\xE1\xCA \xEE:\xC3"\xC9m\x97aIe9\xCA\xB9\xB5*\x86\xCF8\xB6*a\xE5\xCD\xFC +ن\xAF\xF0gc*x\x97\xF5up[/\x9B0ox\xFFȽdȾ|\xEDQ\xAC\xA9\xC1\x85\xE3\xB7L\xD8)\x85\xB8\x84\xE3ȳ;\x83t\xB8\x80\xAA\x86\xE0\xEB\xAAbx\xD4iT\x9B\xC1\xBE\x9C\x85\xCA\xC2%T +\xDE\x9C\x81\xDC3\xAE\xB3\x82G\x87\x97\x95\xF7\xBCL\xF8k\xF4}\xCA\xF1KZ\xA4o;_\xD1\xE0\xFA\x98\xFA\xD1\xE20\xB6Qst\xF9d\xACj\xA55h\x8B\xA2W\xA6\xCC \xEFf\xE4X]-\xDD\xFDm\xD51\xE8h\xA5\xEDQ&\x93\xB2\xE7D̐\xE9\x85\xB5\xE4 c\x82\x9C\xCF>\x86|\xF2ffb*i\xE0\x92Q\xE8; +\xD1x[\x8BB\xB9z\xE1\xFF2l\xE8\xF8\xA0\xAF3\xE1\xC3\xC7\xDF\xC0\xE3D\xEE=\xBE>xܓU\xC2F立U"ji\xA2\xD7:\xFC\x96\xB4y'|1\xF9`\xF1\xBD\xD5 \x9E^\xB7#\xB8^\xCB.d}\x8Bf\xB2/<\x9AerB\xA6J0\xEEf\x9BbAC\xABH?D\xFAJ\xE9z\xB3r\x9E\x93\xAE\xBCKXm(\x86G5Q\x8AO8<j\x95?>S\xCD\xA8&\xFE\xE8v\xF9e\x84\x81\x95\x84\x8BU\x83`N\x9DZ\xE2\xB4\xE3M,<\xAA\xCB`\xA4\x88r$A\x82\xF0\xF5\x91\x9AJ\xC9(\xADf\xBA\xF6$\x9A\xA9ځ\xF2\x828t\xD1ղL3z\xE5\xE8鍴\xAA𣅎Tos\xA2\xCC\xED\xF7\xC1\xD3Gc4%\xB6\xA0\xA8I|J\xEED\xD1\x8F\xD0ct\xE7J\x9FF\x90\xCA\xD9P<N\xFD\xF0\xF87\x93$Ƣ\xC5\xE8$ŪG\xD4ys\xBE*\xAAї\xFD\xE7\xF6|\xEE}\xEF\xD9]w\xA2\xFB\xAB\x95\\xE1:Z\xA2\xEB\xC4v\x9E`\xC9$\x8B\\xAD\xD0\xEA\x89Ȥ\x8C\xBAˮ\xBA\x87\x91\xF8\x99\x80\xE8A\xA2\xD0d\x90&\xEE\xB3@ + \xC1\xC0P\xA7\xF8\xE7z\xFAf\xC7 \xE7\x89;RrCo}\x90GZ粪隙\xA2A+5n\x8E\xAB\x8F\xF5Q\xB3xvB8܅\x9E\xEA\x9EΝ\xA1o\xEB\xDFMPY\xF5\xB4c\x8C{&\xEBB|i|v\xEB\xCE\xC7T\xFA!E=\xBC3X\xEC\xF8\x89L\xCC3\xB7\xD8y\xDD\=ZnU\xF54\xB2bY\x8F)Ӽ0\x8D,*X\x9B&z\x97\xC6\xFAR\x94\xBDc6\xDF\xF5zc\xF4f]h\x9BS\xBF\xFB\xF7\xBA\x9E\xC0Nd\xE3\x9EaA\x9B\xE7\x82\xB1\x84o#y\xEB˜\xFE,.\xBA\xB0 \x81#3\xE3\x83x \x96h\xE2\xDE!\xB5 +G\xD8\xD07\xC8\xD12qQq\\xBE\xAA\xD8\xE0\x8E\x9CPj\x8A\xA0Y\xF2)\xCD\xEEd +\xEC!y\x92\xFE\xAB\x98\xAD"/y\x86}\xDDW\x9Cw\xDA}x\xC8\xBBΝ\xA9 \x8Aor85\xDB|[,\xDA?]\xEB8\x98\x865<\xF0\xFA\xF8 |
From: <np...@us...> - 2007-02-14 18:25:14
|
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. |
From: <np...@us...> - 2007-02-14 17:46:14
|
Revision: 441 http://svn.sourceforge.net/omc/?rev=441&view=rev Author: npaxton Date: 2007-02-14 09:46:13 -0800 (Wed, 14 Feb 2007) Log Message: ----------- svn:ignore properties Property Changed: ---------------- omccmpi/ omccmpi/branches/ omccmpi/tags/ omccmpi/trunk/ omccmpi/trunk/src/ omccmpi/trunk/src/include/ omccmpi/trunk/src/include/omc/ omccmpi/trunk/src/lib/ omccmpi/trunk/src/lib/omc/ Property changes on: omccmpi ___________________________________________________________________ Name: svn:ignore + workspace monitor mybuild Makefile Makefile.in configure aclocal.m4 autom4te.cache config.guess config.log config.status config.sub config.h.in libtool ltmain.sh *.vpj config depcomp missing *.vpw *.vpwhistu *.vtg *.swp Property changes on: omccmpi/branches ___________________________________________________________________ Name: svn:ignore + workspace monitor mybuild Makefile Makefile.in configure aclocal.m4 autom4te.cache config.guess config.log config.status config.sub config.h.in libtool ltmain.sh *.vpj config depcomp missing *.vpw *.vpwhistu *.vtg *.swp Property changes on: omccmpi/tags ___________________________________________________________________ Name: svn:ignore + workspace monitor mybuild Makefile Makefile.in configure aclocal.m4 autom4te.cache config.guess config.log config.status config.sub config.h.in libtool ltmain.sh *.vpj config depcomp missing *.vpw *.vpwhistu *.vtg *.swp Property changes on: omccmpi/trunk ___________________________________________________________________ Name: svn:ignore + workspace monitor mybuild Makefile Makefile.in configure aclocal.m4 autom4te.cache config.guess config.log config.status config.sub config.h.in libtool ltmain.sh *.vpj config depcomp missing *.vpw *.vpwhistu *.vtg *.swp Property changes on: omccmpi/trunk/src ___________________________________________________________________ Name: svn:ignore + workspace monitor mybuild Makefile Makefile.in configure aclocal.m4 autom4te.cache config.guess config.log config.status config.sub config.h.in libtool ltmain.sh *.vpj config depcomp missing *.vpw *.vpwhistu *.vtg *.swp Property changes on: omccmpi/trunk/src/include ___________________________________________________________________ Name: svn:ignore + workspace monitor mybuild Makefile Makefile.in configure aclocal.m4 autom4te.cache config.guess config.log config.status config.sub config.h.in libtool ltmain.sh *.vpj config depcomp missing *.vpw *.vpwhistu *.vtg *.swp Property changes on: omccmpi/trunk/src/include/omc ___________________________________________________________________ Name: svn:ignore + workspace monitor mybuild Makefile Makefile.in configure aclocal.m4 autom4te.cache config.guess config.log config.status config.sub config.h.in libtool ltmain.sh *.vpj config depcomp missing *.vpw *.vpwhistu *.vtg *.swp Property changes on: omccmpi/trunk/src/lib ___________________________________________________________________ Name: svn:ignore + workspace monitor mybuild Makefile Makefile.in configure aclocal.m4 autom4te.cache config.guess config.log config.status config.sub config.h.in libtool ltmain.sh *.vpj config depcomp missing *.vpw *.vpwhistu *.vtg *.swp Property changes on: omccmpi/trunk/src/lib/omc ___________________________________________________________________ Name: svn:ignore + workspace monitor mybuild Makefile Makefile.in configure aclocal.m4 autom4te.cache config.guess config.log config.status config.sub config.h.in libtool ltmain.sh *.vpj config depcomp missing *.vpw *.vpwhistu *.vtg *.swp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ba...@us...> - 2007-02-14 17:38:59
|
Revision: 440 http://svn.sourceforge.net/omc/?rev=440&view=rev Author: bartw Date: 2007-02-14 09:38:58 -0800 (Wed, 14 Feb 2007) Log Message: ----------- re-added fileTools Modified Paths: -------------- omccmpi/trunk/src/include/omc/Makefile.am omccmpi/trunk/src/lib/omc/Makefile.am Added Paths: ----------- omccmpi/trunk/src/include/omc/fileTools.h omccmpi/trunk/src/lib/omc/fileTools.c Removed Paths: ------------- omccmpi/trunk/src/include/omc/Makefile.in Modified: omccmpi/trunk/src/include/omc/Makefile.am =================================================================== --- omccmpi/trunk/src/include/omc/Makefile.am 2007-02-14 17:17:15 UTC (rev 439) +++ omccmpi/trunk/src/include/omc/Makefile.am 2007-02-14 17:38:58 UTC (rev 440) @@ -8,6 +8,7 @@ exec.h \ ioUtils.h \ modifyFile.h \ + fileTools.h \ string.h \ linuxProcUtils.h \ cmpiUtils.h \ Deleted: omccmpi/trunk/src/include/omc/Makefile.in =================================================================== --- omccmpi/trunk/src/include/omc/Makefile.in 2007-02-14 17:17:15 UTC (rev 439) +++ omccmpi/trunk/src/include/omc/Makefile.in 2007-02-14 17:38:58 UTC (rev 440) @@ -1,406 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -top_builddir = ../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src/include/omc -DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pkgincludedir)" -pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(pkginclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkgincludedir = $(includedir)/omccmpi -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CP = @CP@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MV = @MV@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -RM = @RM@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -YACC = @YACC@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -pkginclude_HEADERS = \ - base.h \ - exec.h \ - ioUtils.h \ - modifyFile.h \ - string.h \ - linuxProcUtils.h \ - cmpiUtils.h \ - cmpiSimpleAssoc.h \ - cmpiTimeServiceUtils.h \ - ntpServer.h - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/include/omc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/include/omc/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-pkgincludeHEADERS: $(pkginclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ - $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ - done - -uninstall-pkgincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(pkgincludedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-pkgincludeHEADERS - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-pkgincludeHEADERS \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ - uninstall-pkgincludeHEADERS - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Added: omccmpi/trunk/src/include/omc/fileTools.h =================================================================== --- omccmpi/trunk/src/include/omc/fileTools.h (rev 0) +++ omccmpi/trunk/src/include/omc/fileTools.h 2007-02-14 17:38:58 UTC (rev 440) @@ -0,0 +1,104 @@ +/******************************************************************************* +* Copyright (C) 2005, 2006 Novell, Inc. All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* - Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* +* - Redistributions in binary form must reproduce the above copyright notice, +* this list of conditions and the following disclaimer in the documentation +* and/or other materials provided with the distribution. +* +* - Neither the name of Novell, Inc. nor the names of its +* contributors may be used to endorse or promote products derived from this +* software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL Novell, Inc. OR THE CONTRIBUTORS +* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +* +******************************************************************************/ + + +#ifndef OMCFILETOOLS_H_GUARD__ +#define OMCFILETOOLS_H_GUARD__ + +#ifdef __cplusplus +extern "C" { +#endif + +struct stat; + +/** + * Return the name of the directory containing the file (or + * directory) referenced by path. + * + * @param path The path + * + * @return The directory containing the file. The caller is + * responsible to free the buffer returned. + */ +char* omc_dirname(const char* path); + +/** + * Struct containing the six keys of CIM file classes. + * (CIM_LogicalFile and children) + */ +typedef struct omcFileKeys_ +{ + char * CSCreationClassName; + char * CSName; + char * CreationClassName; + char * FSCreationClassName; + char * FSName; + char * Name; +} omcFileKeys; + +/** + * Free a omcFileKeys structure and the pointers contained + * therein. + * + * @param fk pointer to the omcFileKeys structure to be freed. + */ +void omcFileKeys_free(omcFileKeys* fk); + +/** + * Determine the keys for the CIM instance representing a given + * file. + * @param path The full path to the file + * + * @return A pointer to an omcFileKeys structure. The caller is + * responsible to free this with a call to + * omcFileKeys_free(). + */ +omcFileKeys* omcGetKeysForFile(const char* path); + +/** + * Determine the keys for the CIM instance representing a given + * file. Use this version if you already have a stat for the + * file and wish to avoid an aditional stat. + * + * @param path The full path to the file + * @param st A stat structure for the file obtained from stat() + * + * @return A pointer to an omcFileKeys structure. The caller is + * responsible to free this with a call to + * omcFileKeys_free(). + */ +omcFileKeys* omcGetKeysForFileStat(const char* path, struct stat* st); + +#ifdef __cplusplus +} +#endif + +#endif Modified: omccmpi/trunk/src/lib/omc/Makefile.am =================================================================== --- omccmpi/trunk/src/lib/omc/Makefile.am 2007-02-14 17:17:15 UTC (rev 439) +++ omccmpi/trunk/src/lib/omc/Makefile.am 2007-02-14 17:38:58 UTC (rev 440) @@ -21,4 +21,5 @@ modifyFile.c \ string.c \ linuxProcUtils.c \ +fileTools.c \ ntpServer.c Added: omccmpi/trunk/src/lib/omc/fileTools.c =================================================================== --- omccmpi/trunk/src/lib/omc/fileTools.c (rev 0) +++ omccmpi/trunk/src/lib/omc/fileTools.c 2007-02-14 17:38:58 UTC (rev 440) @@ -0,0 +1,201 @@ +/******************************************************************************* +* Copyright (C) 2005, 2006 Novell, Inc. All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* - Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* +* - Redistributions in binary form must reproduce the above copyright notice, +* this list of conditions and the following disclaimer in the documentation +* and/or other materials provided with the distribution. +* +* - Neither the name of Novell, Inc. nor the names of its +* contributors may be used to endorse or promote products derived from this +* software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL Novell, Inc. OR THE CONTRIBUTORS +* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +* +******************************************************************************/ + + +#include "omc/fileTools.h" +//#include "omccmpi/string.h" +//#include "omccmpi/ioUtils.h" +//#include "string.h" +//#include "ioUtils.h" +#include <libgen.h> +#include "omc/string.h" +#include <sys/stat.h> +#include <sys/types.h> +#include <unistd.h> + +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +#include <stdlib.h> +#include <stdio.h> + +char* omc_dirname(const char* path) +{ + char* tmp = strdup(path); + char* rv = dirname(tmp); + if (rv == NULL) + { + free(tmp); + } + return rv; +} + +void omcFileKeys_free(omcFileKeys* fk) +{ + if (fk == NULL) + { + return; + } + //free(fk->CSCreationClassName); // not malloc'd + free(fk->CSName); + //free(fk->CreationClassName); // not malloc'd + free(fk->FSCreationClassName); + free(fk->FSName); + free(fk->Name); + free(fk); +} + +omcFileKeys* omcGetKeysForFile(const char* path) +{ + struct stat st; + if (lstat(path, &st) != 0) + { + return NULL; + } + return omcGetKeysForFileStat(path, &st); +} + +omcFileKeys* omcGetKeysForFileStat(const char* path, struct stat* st) +{ + omcFileKeys* rv = (omcFileKeys*)malloc(sizeof(omcFileKeys)); + memset(rv, 0, sizeof(omcFileKeys)); + if (S_ISREG(st->st_mode)) + { + rv->CreationClassName = "OMC_LinuxDataFile"; + } else if (S_ISDIR(st->st_mode)) + { + rv->CreationClassName = "OMC_LinuxDirectory"; + } else if (S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode)) + { + rv->CreationClassName = "OMC_LinuxDeviceFile"; + } else if (S_ISFIFO(st->st_mode)) + { + rv->CreationClassName = "OMC_LinuxFIFOPipeFile"; + } else if (S_ISLNK(st->st_mode)) + { + rv->CreationClassName = "OMC_LinuxSymbolicLink"; + } else + { + free(rv); + return NULL; + } + rv->Name = strdup(path); + rv->CSCreationClassName = "OMC_LinuxUnitaryComputerSystem"; + rv->CSName = (char*)malloc(256); + gethostname(rv->CSName, 256); + FILE* mounts = fopen("/proc/mounts", "r"); + if (mounts == NULL) + { + omcFileKeys_free(rv); + return NULL; + } + char* line = NULL; + char* p = NULL; + size_t bfrLen = 0; + for(p = omcReadLine(mounts, &line,&bfrLen); p; p = omcReadLine(mounts, &line,&bfrLen )) + { + int count = omcStrTokenCount(line, " \t\r\n"); + if (count != 6) + { + continue; + } + size_t numElems = 0; + char** strs = omcStrTokenize(line, " \t\r\n", &numElems); + if (strs == NULL) + { + continue; + } + if (strs[1][0] != '/') + { + free(strs); + continue; + } + if (strs[1][1] == 0 && strcmp(strs[0], "rootfs") == 0) + { + /* skip rootfs junk */ + free(strs); + continue; + } + struct stat dst; + if (stat(strs[1], &dst) != 0) + { + free(strs); + continue; + } + if (st->st_dev == dst.st_dev) + { + rv->FSName = strdup(strs[0]); + char* fstype = strs[2]; + if (strcmp(fstype, "ext2") == 0) + { + rv->FSCreationClassName = strdup("OMC_LinuxExt2FileSystem"); + } else if (strcmp(fstype, "ext3") == 0) + { + rv->FSCreationClassName = strdup("OMC_LinuxExt3FileSystem"); + } else if (strcmp(fstype, "reiserfs") == 0) + { + rv->FSCreationClassName = strdup("OMC_LinuxReiserFileSystem"); + } else if (strcmp(fstype, "nfs") == 0) + { + rv->FSCreationClassName = strdup("OMC_LinuxNFS"); + } else if (strcmp(fstype, "cifs") == 0) + { + rv->FSCreationClassName = strdup("OMC_LinuxCIFS"); /* TODO CIM class doesn't exist yet */ + } + else + { + int len = snprintf(NULL, 0, "Unknown:%s", fstype); + if (len > 0) + { + rv->FSCreationClassName = (char*)malloc(len + 1); + snprintf(rv->FSCreationClassName, len+1, "Unknown:%s", fstype); + } + else + { + rv->FSCreationClassName = strdup("Unknown"); + } + } + } + free(strs); + if (rv->FSName != NULL) + { + break; + } + } + if (line) + { + free(line); + } + fclose(mounts); + return rv; + +} + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <np...@us...> - 2007-02-14 17:17:21
|
Revision: 439 http://svn.sourceforge.net/omc/?rev=439&view=rev Author: npaxton Date: 2007-02-14 09:17:15 -0800 (Wed, 14 Feb 2007) Log Message: ----------- steps towards refactor to new omccmpi library Removed Paths: ------------- cmpibase/trunk/src/include/ cmpibase/trunk/src/lib/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <np...@us...> - 2007-02-14 17:16:48
|
Revision: 438 http://svn.sourceforge.net/omc/?rev=438&view=rev Author: npaxton Date: 2007-02-14 09:16:47 -0800 (Wed, 14 Feb 2007) Log Message: ----------- time-service update Modified Paths: -------------- cmpibase/trunk/src/Makefile.am cmpibase/trunk/src/providers/time-service/Makefile.am cmpibase/trunk/src/providers/time-service/hostedTimeService.c cmpibase/trunk/src/providers/time-service/mof/TimeServiceProviderReg.mof cmpibase/trunk/src/providers/time-service/remoteTimeServicePort.c cmpibase/trunk/src/providers/time-service/timeServiceAccessBySAP.c cmpibase/trunk/src/providers/time-service/timeServiceAvailableToElement.c cmpibase/trunk/src/providers/time-service/timeZoneSettingData.c Modified: cmpibase/trunk/src/Makefile.am =================================================================== --- cmpibase/trunk/src/Makefile.am 2007-02-14 17:05:52 UTC (rev 437) +++ cmpibase/trunk/src/Makefile.am 2007-02-14 17:16:47 UTC (rev 438) @@ -1,7 +1,5 @@ AUTOMAKE_OPTIONS = gnu SUBDIRS = \ - lib \ - include \ providers Modified: cmpibase/trunk/src/providers/time-service/Makefile.am =================================================================== --- cmpibase/trunk/src/providers/time-service/Makefile.am 2007-02-14 17:05:52 UTC (rev 437) +++ cmpibase/trunk/src/providers/time-service/Makefile.am 2007-02-14 17:16:47 UTC (rev 438) @@ -4,9 +4,9 @@ libomccmpi_remoteTimeServicePort.la \ libomccmpi_timeZoneSettingData.la \ libomccmpi_hostedTimeService.la \ - libomccmpi_timeServiceTimeZoneSettingData.la -# libomccmpi_timeServiceAccessBySAP.la -# libomccmpi_timeServiceAvailableToElement.la + libomccmpi_timeServiceTimeZoneSettingData.la \ + libomccmpi_timeServiceAccessBySAP.la \ + libomccmpi_timeServiceAvailableToElement.la INCLUDES = -I$(top_srcdir)/src/include @@ -71,28 +71,26 @@ -version-info 1 -#libomccmpi_timeServiceAccessBySAP_la_LIBADD = \ +libomccmpi_timeServiceAccessBySAP_la_LIBADD = \ $(top_builddir)/src/lib/omc/libomc_cmpi.la \ $(top_builddir)/src/lib/omc/libomc_cbase.la -#libomccmpi_timeServiceAccessBySAP_la_SOURCES = \ +libomccmpi_timeServiceAccessBySAP_la_SOURCES = \ timeServiceAccessBySAP.c -#libomccmpi_timeServiceAccessBySAP_la_LDFLAGS = \ +libomccmpi_timeServiceAccessBySAP_la_LDFLAGS = \ -lpthread \ -version-info 1 -#libomccmpi_timeServiceAvailableToElement_la_LIBADD = \ +libomccmpi_timeServiceAvailableToElement_la_LIBADD = \ $(top_builddir)/src/lib/omc/libomc_cmpi.la \ $(top_builddir)/src/lib/omc/libomc_cbase.la -#libomccmpi_timeServiceAvailableToElement_la_SOURCES = \ +libomccmpi_timeServiceAvailableToElement_la_SOURCES = \ timeServiceAvailableToElement.c -#libomccmpi_timeServiceAvailableToElement_la_LDFLAGS = \ +libomccmpi_timeServiceAvailableToElement_la_LDFLAGS = \ -lpthread \ -version-info 1 - - Modified: cmpibase/trunk/src/providers/time-service/hostedTimeService.c =================================================================== --- cmpibase/trunk/src/providers/time-service/hostedTimeService.c 2007-02-14 17:05:52 UTC (rev 437) +++ cmpibase/trunk/src/providers/time-service/hostedTimeService.c 2007-02-14 17:16:47 UTC (rev 438) @@ -42,7 +42,7 @@ #include <stdlib.h> #include <string.h> -#define LOCAL_DEBUG +//#define LOCAL_DEBUG #ifdef LOCAL_DEBUG #define DEBUGOUT(fmt, args...) printf(fmt,## args) Modified: cmpibase/trunk/src/providers/time-service/mof/TimeServiceProviderReg.mof =================================================================== --- cmpibase/trunk/src/providers/time-service/mof/TimeServiceProviderReg.mof 2007-02-14 17:05:52 UTC (rev 437) +++ cmpibase/trunk/src/providers/time-service/mof/TimeServiceProviderReg.mof 2007-02-14 17:16:47 UTC (rev 438) @@ -151,3 +151,65 @@ CapabilityID = "OMC_TimeServiceTimeZoneSettingData-1"; }; + + + +instance of PG_ProviderModule +{ + Name = "OMC_TimeServiceAccessBySAP_Module"; + Location = "omccmpi_timeServiceAccessBySAP"; + Vendor = "OMC"; + Version = "2.0.0"; + InterfaceType = "CMPI"; + InterfaceVersion = "2.0.0"; +}; + +instance of PG_Provider +{ + Name = "OMC_TimeServiceAccessBySAP_Provider"; + ProviderModuleName = "OMC_TimeServiceAccessBySAP_Module"; +}; + +instance of PG_ProviderCapabilities +{ + ProviderModuleName = "OMC_TimeServiceAccessBySAP_Module"; + ProviderName = "OMC_TimeServiceAccessBySAP_Provider"; + ClassName = "OMC_TimeServiceAccessBySAP"; + ProviderType = { 2, 3 }; + Namespaces = {"smash"}; + SupportedProperties = NULL; + SupportedMethods = NULL; + CapabilityID = "OMC_TimeServiceAccessBySAP-1"; +}; + + + + +instance of PG_ProviderModule +{ + Name = "OMC_TimeServiceAvailableToElement_Module"; + Location = "omccmpi_timeServiceAvailableToElement"; + Vendor = "OMC"; + Version = "2.0.0"; + InterfaceType = "CMPI"; + InterfaceVersion = "2.0.0"; +}; + +instance of PG_Provider +{ + Name = "OMC_TimeServiceAvailableToElement_Provider"; + ProviderModuleName = "OMC_TimeServiceAvailableToElement_Module"; +}; + +instance of PG_ProviderCapabilities +{ + ProviderModuleName = "OMC_TimeServiceAvailableToElement_Module"; + ProviderName = "OMC_TimeServiceAvailableToElement_Provider"; + ClassName = "OMC_TimeServiceAvailableToElement"; + ProviderType = { 2, 3 }; + Namespaces = {"smash"}; + SupportedProperties = NULL; + SupportedMethods = NULL; + CapabilityID = "OMC_TimeServiceAvailableToElement-1"; +}; + Modified: cmpibase/trunk/src/providers/time-service/remoteTimeServicePort.c =================================================================== --- cmpibase/trunk/src/providers/time-service/remoteTimeServicePort.c 2007-02-14 17:05:52 UTC (rev 437) +++ cmpibase/trunk/src/providers/time-service/remoteTimeServicePort.c 2007-02-14 17:16:47 UTC (rev 438) @@ -251,28 +251,30 @@ char *inServerName = CMGetCharPtr(key.value.string); DEBUGOUT(" got servername: %s\n", inServerName); - NTPServer *ntpServer = getNTPServer(inServerName); - if (ntpServer) + //NTPServer *ntpServer = getNTPServer(inServerName); + //if (ntpServer) { - DEBUGOUT(" got NTPServer: %s\n", ntpServer->serverName); + //DEBUGOUT(" got NTPServer: %s\n", ntpServer->serverName); CMPIInstance *inst = makeRemoteTimeServicePortInstance( _broker, ns, - ntpServer->serverName, + inServerName, &status, properties); if (!CMIsNullObject(cop)) { CMReturnInstance(results, inst); } - free(ntpServer); + //free(ntpServer); } + /* else { OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_FAILED, "Didn't find ntpServer in file"); DEBUGOUT("RemoteTimeServerPort: getNTPServer() failed - %s\n", CMGetCharPtr(status.msg)); return status; } + */ } CMReturnDone(results); @@ -303,66 +305,90 @@ const CMPIInstance * newinstance, const char ** properties) { - CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL}; + CMPIStatus status = {CMPI_RC_OK, NULL}; - DEBUGOUT("RemoteTimeServicePort: ModifyInstance() called - Not Supported\n"); + DEBUGOUT("RemoteTimeServicePort: ModifyInstance() called\n"); //TODO: this should support ModifyInstance - edit an entry in the file -/* - if (::geteuid() != 0) - { - OW_THROWCIM(CIMException::ACCESS_DENIED); - } + if (geteuid() != 0) + { + OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_ACCESS_DENIED, + "You don't have rights to modify the RemoteTimeServicePort"); + return status; + } - if(!serverSupportsNTP()) - { - OW_THROWCIMMSG(CIMException::NOT_SUPPORTED, - "NTP Support is not available"); - } + if(!serverSupportsNTP()) + { + OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_NOT_SUPPORTED, + "NTP Support is not available on this server"); + return status; + } - CIMInstance mci = modifiedInstance.createModifiedInstance( - previousInstance, includeQualifiers, propertyList, theClass); + NTPServer modServer = {{0},0,0,0,0}; + DEBUGOUT(" modServer initialized: %s\n key: %d\n version: %d\n minpoll: %d\n maxpoll: %d\n", modServer.serverName, modServer.key, modServer.ntpVersion, modServer.minPoll, modServer.maxPoll); - CIMValue cv = mci.getPropertyValue("Name"); - if(!cv) - { - OW_THROWCIMMSG(CIMException::INVALID_PARAMETER, - "Name property must be specified"); - } + CMPIData nameVal, preferVal, keyVal, verVal, minVal, maxVal; - NTPServer server; - cv.get(server.serverName); - if(server.serverName.empty()) - { - OW_THROWCIMMSG(CIMException::INVALID_PARAMETER, - "Name property must be specified"); - } + nameVal = CMGetProperty(newinstance, "Name", &status); + if (!CMIsNullValue(nameVal)) + { + strncpy(modServer.serverName, CMGetCharPtr(nameVal.value.string), NTP_SERVER_NAME_LEN); + } - cv = mci.getPropertyValue("Prefer"); - if(cv) - { - Bool prefer; - cv.get(prefer); - server.prefer = prefer; - } + if (!*(modServer.serverName)) + { + OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_INVALID_PARAMETER, + "Name property must be specified"); + return status; + } - server.key = getUIntFromCIMValue("key", mci); - server.ntpVersion = getUIntFromCIMValue("ntpversion", mci); - server.minPoll = getUIntFromCIMValue("minpoll", mci); - server.maxPoll = getUIntFromCIMValue("maxpoll", mci); + preferVal = CMGetProperty(newinstance, "Prefer", &status); + if (!CMIsNullValue(preferVal)) + { + modServer.prefer = preferVal.value.uint32; + DEBUGOUT(" Retrieved Value: Prefer: %d\n", modServer.prefer); + } - if(NTPConf::setServer(server) != 0) - { - OW_THROWCIM(CIMException::FAILED); - } + keyVal = CMGetProperty(newinstance, "Key", &status); + if (!CMIsNullValue(keyVal)) + { + modServer.key = keyVal.value.uint32; + DEBUGOUT(" Retrieved Value: Key: %d\n", modServer.key); + } - String errMsg; - if(restartNTP(errMsg) != 0) - { - OW_THROWCIMMSG(CIMException::FAILED, errMsg.c_str()); - } + verVal = CMGetProperty(newinstance, "NTPversion", &status); + if (!CMIsNullValue(verVal)) + { + modServer.ntpVersion = verVal.value.uint32; + DEBUGOUT(" Retrieved Value: ntpVersion: %d\n", modServer.ntpVersion); + } -*/ + minVal = CMGetProperty(newinstance, "MinPoll", &status); + if (!CMIsNullValue(minVal)) + { + modServer.minPoll = minVal.value.uint32; + DEBUGOUT(" Retrieved Value: minPoll: %d\n", modServer.minPoll); + } + + maxVal = CMGetProperty(newinstance, "MaxPoll", &status); + if (!CMIsNullValue(maxVal)) + { + modServer.maxPoll = maxVal.value.uint32; + DEBUGOUT(" Retrieved Value: maxPoll: %d\n", modServer.maxPoll); + } + + DEBUGOUT(" about to call setNTPServer: %s\n key: %d\n version: %d\n minpoll: %d\n maxpoll: %d\n", modServer.serverName, modServer.key, modServer.ntpVersion, modServer.minPoll, modServer.maxPoll); + if (setNTPServer(modServer.serverName, &modServer) != 0) + { + OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_FAILED, + "Failed to delete the server from /etc/ntp.conf"); + return status; + } + + + // TODO: + // restartNTP + DEBUGOUT("RemoteTimeServicePort: Leaving ModifyInstance(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -388,7 +414,7 @@ //TODO: this should support CreateInstance - add an entry to the file /* - if (::geteuid() != 0) + if (geteuid() != 0) { OW_THROWCIM(CIMException::ACCESS_DENIED); } @@ -462,38 +488,36 @@ DEBUGOUT("RemoteTimeServicePort: DeleteInstance() called\n"); //TODO: this should support DeleteInstance - remove an entry from the file -/* - if (::geteuid() != 0) - { - OW_THROWCIM(CIMException::ACCESS_DENIED); - } + if (geteuid() != 0) + { + OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_ACCESS_DENIED, + "You don't have rights to modify the RemoteTimeServicePort"); + return status; + } - if(!serverSupportsNTP()) - { - OW_THROWCIMMSG(CIMException::NOT_SUPPORTED, - "NTP Support is not available"); - } + if(!serverSupportsNTP()) + { + OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_NOT_SUPPORTED, + "NTP Support is not available on this server"); + return status; + } - CIMValue cv = cop.getKeyValue("Name"); - if(!cv) - { - OW_THROWCIMMSG(CIMException::INVALID_PARAMETER, - "Name is missing from given object path"); - } + CMPIData nameVal; - String serverName; - cv.get(serverName); - if(serverName.length() == 0) - { - OW_THROWCIMMSG(CIMException::INVALID_PARAMETER, - "Name is missing from given object path"); - } + nameVal = CMGetKey(cop, "Name", &status); + if (!CMIsNullValue(nameVal)) + { + char *serverName = CMGetCharPtr(nameVal.value.string); + if (deleteNTPServer(serverName) != 0) + { + OMC_SETSTATUS(_broker, &status, CMPI_RC_ERR_FAILED, + "Failed to delete the server from /etc/ntp.conf"); + return status; + } + } - if(NTPConf::deleteServer(serverName) != 0) - { - OW_THROWCIM(CIMException::FAILED); - } - + // TODO: restart NTP Server +/* String errMsg; if(restartNTP(errMsg) != 0) { Modified: cmpibase/trunk/src/providers/time-service/timeServiceAccessBySAP.c =================================================================== --- cmpibase/trunk/src/providers/time-service/timeServiceAccessBySAP.c 2007-02-14 17:05:52 UTC (rev 437) +++ cmpibase/trunk/src/providers/time-service/timeServiceAccessBySAP.c 2007-02-14 17:16:47 UTC (rev 438) @@ -37,6 +37,8 @@ #include <omc/base.h> #include <omc/cmpiUtils.h> #include <omc/cmpiSimpleAssoc.h> +#include <omc/cmpiTimeServiceUtils.h> +#include <omc/ntpServer.h> #include <stdlib.h> #include <string.h> @@ -49,18 +51,18 @@ #define DEBUGOUT(fmt, args...) #endif -static const char* classKeys[] = { "ManagedElement", "SettingData", NULL }; +static const char* classKeys[] = { "Antecedent", "Dependent", NULL }; // Global handle to the CIM broker // This is initialized by the CIMOM when the provider is loaded static const CMPIBroker * _broker; -static char * ASSOC_CLASSNAME = "OMC_ComputerSystemHostNameSettingData"; -static char * LEFT_CLASSNAME = "OMC_UnitaryComputerSystem"; -static char * RIGHT_CLASSNAME = "OMC_HostNameSettingData"; -static char * LEFT_PROPERTYNAME = "ManagedElement"; -static char * RIGHT_PROPERTYNAME = "SettingData"; +static char * ASSOC_CLASSNAME = "OMC_TimeServiceAccessBySAP"; +static char * LEFT_CLASSNAME = "OMC_SystemTimeService"; +static char * RIGHT_CLASSNAME = "OMC_RemoteTimeServicePort"; +static char * LEFT_PROPERTYNAME = "Antecedent"; +static char * RIGHT_PROPERTYNAME = "Dependent"; // **************************************************************************** // CMPI INSTANCE PROVIDER FUNCTIONS @@ -83,126 +85,61 @@ const CMPIResult * results, const CMPIObjectPath * cop) { - DEBUGOUT("%s", "EnumInstanceNames() called\n"); + DEBUGOUT("TimeServiceAccessBySAP::EnumInstanceNames() called\n"); CMPIStatus status = {CMPI_RC_OK, NULL}; char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL)); - // Create and populate cs object path - CMPIObjectPath *cscop = omccmpiCreateCSObjectPath( _broker, ns, &status); - if (CMIsNullObject(cscop)) + if(serverSupportsNTP()) { - CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, - "Could not create computerSystem cop"); - return status; - } + // Create and populate systemTimeService object path (LEFT) + CMPIObjectPath *tscop = makeTimeServiceObjectPath( _broker, ns, &status); + if (CMIsNullObject(tscop)) + { + CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, + "Could not create systemTimeService cop"); + return status; + } - // Create and populate hostname object path - CMPIObjectPath * hnsdcop = CMNewObjectPath(_broker, + int numServers = 0; + NTPServer *sra = getNTPServers(&numServers); + if (sra && numServers) + { + int i=0; + for (i=0; i<numServers; i++) + { + CMPIObjectPath *rpcop = makeRemoteTimeServicePortObjectPath( + _broker, ns, - RIGHT_CLASSNAME, + sra[i].serverName, &status); - if ((status.rc != CMPI_RC_OK) || CMIsNullObject(hnsdcop)) - { - CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, - "Could not create host name setting data ObjectPath"); - return status; + if (!CMIsNullObject(cop)) + { + CMPIObjectPath *assocCop = omccmpiCreateAssociationPath(_broker, + ns, + ASSOC_CLASSNAME, + LEFT_PROPERTYNAME, + RIGHT_PROPERTYNAME, + tscop, + rpcop, + &status); + CMReturnObjectPath(results, assocCop); + } + } + free(sra); + } } - else - { - // Add key to new object path - char instanceID[] = "omc:computername"; - CMAddKey(hnsdcop, "InstanceID", (CMPIValue *)instanceID, CMPI_chars); - } - CMPIObjectPath *assocCop = omccmpiCreateAssociationPath(_broker, - ns, - ASSOC_CLASSNAME, - LEFT_PROPERTYNAME, - RIGHT_PROPERTYNAME, - cscop, - hnsdcop, - &status); - - if (!CMIsNullObject(assocCop)) - { - //return (handle) object path - CMReturnObjectPath(results, assocCop); - } - //close return handler CMReturnDone(results); - DEBUGOUT("Leaving EnumInstanceNames(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving EnumInstanceNames(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } // **************************************************************************** -// CreateAssocInstance() -// params: CMPIObjectPath* cop: [in] target namespace and classname, -// and desired objectpath -// char **properties: [in] propertylist filter, null=all -// **************************************************************************** -static CMPIInstance * -CreateAssocInstance( - const CMPIObjectPath * cop, - const char ** properties, - CMPIStatus *pStatus) -{ - DEBUGOUT("%s", "CreateAssocInst() called\n"); - - char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL)); - - //DEBUGOUT("%s", "About to create cs cop\n"); - // Create and populate cs object path - CMPIObjectPath *cscop = omccmpiCreateCSObjectPath( _broker, ns, pStatus); - if (CMIsNullObject(cscop)) - { - CMSetStatusWithChars(_broker, pStatus, CMPI_RC_ERR_FAILED, - "Could not create computerSystem cop"); - return NULL; - } - - //DEBUGOUT("%s", "About to create host name setting data cop\n"); - // Create and populate hostname object path - CMPIObjectPath * hnsdcop = CMNewObjectPath(_broker, - ns, - RIGHT_CLASSNAME, - pStatus); - if ((pStatus->rc != CMPI_RC_OK) || CMIsNullObject(hnsdcop)) - { - CMSetStatusWithChars(_broker, pStatus, CMPI_RC_ERR_FAILED, - "Could not create host name setting data ObjectPath"); - return NULL; - } - else - { - // Add key to new object path - char instanceID[] = "omc:computername"; - CMAddKey(hnsdcop, "InstanceID", (CMPIValue *)instanceID, CMPI_chars); - } - - CMPIInstance *assocInst = omccmpiCreateAssociationInst(_broker, - ns, - ASSOC_CLASSNAME, - classKeys, - properties, - LEFT_PROPERTYNAME, - RIGHT_PROPERTYNAME, - cscop, - hnsdcop, - pStatus); - - DEBUGOUT("Leaving EnumInstanceNames(): %s\n", - (pStatus->rc == CMPI_RC_OK)? "succeeded":"failed"); - return assocInst; -} - - - -// **************************************************************************** // EnumInstances() // params: CMPIInstanceMI* self: [in] Handle to this provider // CMPIContext* context: [in] any additional context info @@ -219,24 +156,57 @@ const CMPIObjectPath * cop, const char ** properties) { - DEBUGOUT("%s", "EnumInstances() called\n"); + DEBUGOUT("TimeServiceAccessBySAP::EnumInstances() called\n"); CMPIStatus status = {CMPI_RC_OK, NULL}; + char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL)); - // Create and check new instance - CMPIInstance * instance = CreateAssocInstance(cop, properties, &status); - if ((instance == NULL) || (CMIsNullObject(instance))) + if(serverSupportsNTP()) { - CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, - "Could not create computerSystemHostNameSettingData instance"); - return status; + // Create and populate systemTimeService object path (LEFT) + CMPIObjectPath *tscop = makeTimeServiceObjectPath( _broker, ns, &status); + if (CMIsNullObject(tscop)) + { + CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, + "Could not create systemTimeService cop"); + return status; + } + + int numServers = 0; + NTPServer *sra = getNTPServers(&numServers); + if (sra && numServers) + { + int i=0; + for (i=0; i<numServers; i++) + { + CMPIObjectPath *rpcop = makeRemoteTimeServicePortObjectPath( + _broker, + ns, + sra[i].serverName, + &status); + if (!CMIsNullObject(cop)) + { + CMPIInstance *assocInst = omccmpiCreateAssociationInst(_broker, + ns, + ASSOC_CLASSNAME, + classKeys, + properties, + LEFT_PROPERTYNAME, + RIGHT_PROPERTYNAME, + tscop, + rpcop, + &status); + CMReturnInstance(results, assocInst); + } + } + free(sra); + } } - CMReturnInstance(results, instance); //close return handler CMReturnDone(results); - DEBUGOUT("Leaving EnumInstances(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving EnumInstances(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -259,15 +229,15 @@ const CMPIObjectPath * cop, const char ** properties) { - DEBUGOUT("%s", "GetInstance() called\n"); + DEBUGOUT("TimeServiceAccessBySAP::GetInstance() called\n"); CMPIStatus status = {CMPI_RC_OK, NULL}; char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL)); // do work here - CMPIData mekey = CMGetKey(cop, LEFT_PROPERTYNAME, &status); - CMPIData sdkey = CMGetKey(cop, RIGHT_PROPERTYNAME, &status); - if (!CMIsNullValue(mekey) && !CMIsNullValue(sdkey)) + CMPIData leftkey = CMGetKey(cop, LEFT_PROPERTYNAME, &status); + CMPIData rightkey = CMGetKey(cop, RIGHT_PROPERTYNAME, &status); + if (!CMIsNullValue(leftkey) && !CMIsNullValue(rightkey)) { CMPIInstance *assocInst = omccmpiCreateAssociationInst(_broker, ns, @@ -276,8 +246,8 @@ properties, LEFT_PROPERTYNAME, RIGHT_PROPERTYNAME, - mekey.value.ref, - sdkey.value.ref, + leftkey.value.ref, + rightkey.value.ref, &status); CMReturnInstance(results, assocInst); @@ -285,7 +255,7 @@ CMReturnDone(results); } - DEBUGOUT("Leaving GetInstance(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving GetInstance(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -311,11 +281,11 @@ { CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL}; - DEBUGOUT("%s", "ModifyInstance() called - Not Supported\n"); + DEBUGOUT("TimeServiceAccessBySAP::ModifyInstance() called - Not Supported\n"); // do work here if supported - DEBUGOUT("Leaving ModifyInstance(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving ModifyInstance(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -339,11 +309,11 @@ { CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL}; - DEBUGOUT("%s", "CreateInstance() called - Not Supported\n"); + DEBUGOUT("TimeServiceAccessBySAP::CreateInstance() called - Not Supported\n"); // do work here if supported - DEBUGOUT("Leaving CreateInstance(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving CreateInstance(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -365,11 +335,11 @@ { CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL}; - DEBUGOUT("%s", "DeleteInstance() called\n"); + DEBUGOUT("TimeServiceAccessBySAP::DeleteInstance() called\n"); // do work here if supported - DEBUGOUT("Leaving DeleteInstance(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving DeleteInstance(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -395,11 +365,11 @@ { CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL}; - DEBUGOUT("%s", "ExecQuery() called - Not Supported\n"); + DEBUGOUT("TimeServiceAccessBySAP::ExecQuery() called - Not Supported\n"); // do work here if supported - DEBUGOUT("Leaving ExecQuery(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving ExecQuery(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -418,11 +388,11 @@ { CMPIStatus status = {CMPI_RC_OK, NULL}; - DEBUGOUT("%s", "Cleanup() called\n"); + DEBUGOUT("TimeServiceAccessBySAP::Cleanup() called\n"); // do work here if necessary - DEBUGOUT("Leaving Cleanup(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving Cleanup(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -437,11 +407,11 @@ { CMPIStatus status = {CMPI_RC_OK, NULL}; - DEBUGOUT("%s", "Initialize() called\n"); + DEBUGOUT("TimeServiceAccessBySAP::Initialize() called\n"); // do work here if necessary - DEBUGOUT("Leaving Initialize(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving Initialize(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); } @@ -463,11 +433,11 @@ { CMPIStatus status = {CMPI_RC_OK, NULL}; - DEBUGOUT("AssocInit() called\n"); + DEBUGOUT("TimeServiceAccessBySAP::AssocInit() called\n"); // do work here if necessary - DEBUGOUT("Leaving AssocInit(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving AssocInit(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); } @@ -487,11 +457,11 @@ { CMPIStatus status = {CMPI_RC_OK, NULL}; - DEBUGOUT("AssociationCleanup() called\n"); + DEBUGOUT("TimeServiceAccessBySAP::AssociationCleanup() called\n"); // do work here if necessary - DEBUGOUT("Leaving AssociationCleanup(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving AssociationCleanup(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -504,7 +474,7 @@ // to be filtered by the SimpleAssociatior helper functions to return // the correct object (instance or object path) // **************************************************************************** -CMPIStatus +static CMPIStatus doReferences( omccmpiSimpleAssocCtx ctx, CMPIAssociationMI* self, @@ -518,7 +488,7 @@ const char *resultRole, const char** properties) { - DEBUGOUT("TimeServiceAccessBySAP::doReferences called\n"); + DEBUGOUT("TimeServiceAccessBySAP::TimeServiceAccessBySAP::doReferences called\n"); CMPIStatus status = {CMPI_RC_OK, NULL}; char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL)); @@ -529,8 +499,8 @@ if(strcasecmp(objClassName, LEFT_CLASSNAME) == 0) { - // this is a UnitaryComputerSystem - // need to get approprate HostNameSettingData for assoc inst + // this is a SystemTimeService + // need to get all approprate remoteTimeServicePort for assoc inst // but if resultClass is set, it must match int bHaveMatch = 1; // TRUE @@ -556,58 +526,52 @@ if (bHaveMatch) { - char name[128] = {0}; - omcGetComputerSystemName(name, 128); - + // get the name from the SystemTimeService cop sent in + // should be 'omc:timeservice' CMPIData data = CMGetKey(cop, "Name", &status); char *inName = CMGetCharPtr(data.value.string); - //DEBUGOUT("Comparing inName: %s with name: %s\n", inName, name); - if (strcasecmp(inName, name) == 0) + if (strcasecmp(inName, "omc:timeservice") == 0) { - // create the host name cop that I'll use below - CMPIObjectPath *hncop = CMNewObjectPath(_broker, - ns, - RIGHT_CLASSNAME, - &status); - if ((status.rc != CMPI_RC_OK) || CMIsNullObject(hncop)) + if(serverSupportsNTP()) { - CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, - "Could not create host name setting data cop"); - return status; - } - else - { - char instanceID[] = "omc:computername"; - CMAddKey(hncop, - "InstanceID", - (CMPIValue *)instanceID, - CMPI_chars); - } - // create an association instance - CMPIInstance *assocInst = omccmpiCreateAssociationInst(_broker, + int numServers = 0; + NTPServer *sra = getNTPServers(&numServers); + if (sra && numServers) + { + int i=0; + for (i=0; i<numServers; i++) + { + CMPIObjectPath *rpcop = makeRemoteTimeServicePortObjectPath( + _broker, ns, - ASSOC_CLASSNAME, - classKeys, - properties, - LEFT_PROPERTYNAME, - RIGHT_PROPERTYNAME, - cop, - hncop, + sra[i].serverName, &status); - omccmpiSimpleAssocResults(ctx, assocInst, &status); + if (!CMIsNullObject(rpcop)) + { + CMPIInstance *assocInst = omccmpiCreateAssociationInst(_broker, + ns, + ASSOC_CLASSNAME, + classKeys, + properties, + LEFT_PROPERTYNAME, + RIGHT_PROPERTYNAME, + cop, + rpcop, + &status); + omccmpiSimpleAssocResults(ctx, assocInst, &status); + } + } + free(sra); + } + } } } } else if(strcmp(objClassName, RIGHT_CLASSNAME) == 0) { - // this is a hostNameSettingData - // need to get apppropriate UnitaryComputerSystem for assocInst + // this is a remoteTimeServicePort + // need to get (one and only) apppropriate SystemTimeService for assocInst - CMPIData data = CMGetKey(cop, "InstanceID", &status); - char *inName = CMGetCharPtr(data.value.string); - //DEBUGOUT("comparing inName (%s) with name (%s)\n", - // inName, - // "omc:computername"); int bHaveMatch = 1; // TRUE if ((resultClass != NULL) && (*resultClass != 0)) { @@ -631,31 +595,29 @@ if (bHaveMatch) { - if (strcasecmp(inName, "omc:computername") == 0) + // the tscop that I'll use below + CMPIObjectPath *tscop = makeTimeServiceObjectPath( + _broker, + ns, + &status); + if ((status.rc != CMPI_RC_OK) || CMIsNullObject(tscop)) { - // the cscop that I'll use below - CMPIObjectPath *cscop = omccmpiCreateCSObjectPath( _broker, - ns, - &status); - if ((status.rc != CMPI_RC_OK) || CMIsNullObject(cscop)) - { - CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, - "Could not create computerSystem cop"); - return status; - } - // create an association instance - CMPIInstance *assocInst = omccmpiCreateAssociationInst(_broker, - ns, - ASSOC_CLASSNAME, - classKeys, - properties, - LEFT_PROPERTYNAME, - RIGHT_PROPERTYNAME, - cscop, - cop, - &status); - omccmpiSimpleAssocResults(ctx, assocInst, &status); + CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, + "Could not create computerSystem cop"); + return status; } + // create an association instance + CMPIInstance *assocInst = omccmpiCreateAssociationInst(_broker, + ns, + ASSOC_CLASSNAME, + classKeys, + properties, + LEFT_PROPERTYNAME, + RIGHT_PROPERTYNAME, + tscop, + cop, + &status); + omccmpiSimpleAssocResults(ctx, assocInst, &status); } } else @@ -666,7 +628,7 @@ //close return handler CMReturnDone(results); - DEBUGOUT("Leaving doReferences\n"); + DEBUGOUT("TimeServiceAccessBySAP::Leaving doReferences\n"); return status; } @@ -697,13 +659,13 @@ const char *resultRole, const char** properties) { - DEBUGOUT("Associators() called. assocClass: %s\n", assocClass); + DEBUGOUT("TimeServiceAccessBySAP::Associators() called. assocClass: %s\n", assocClass); CMPIStatus status = omccmpiSimpleAssociators( doReferences, self, _broker, context, results, cop, assocClass, resultClass, role, resultRole, properties); - DEBUGOUT("Leaving Associatiors(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving Associatiors(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -732,13 +694,13 @@ const char *role, const char *resultRole) { - DEBUGOUT("AssociatorNames() called\n"); + DEBUGOUT("TimeServiceAccessBySAP::AssociatorNames() called\n"); CMPIStatus status = omccmpiSimpleAssociatorNames( doReferences, self, _broker, context, results, cop, assocClass, resultClass, role, resultRole); - DEBUGOUT("Leaving AssociatiorNames(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving AssociatiorNames(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -765,12 +727,12 @@ const char *role , const char** properties) { - DEBUGOUT("References() called\n"); + DEBUGOUT("TimeServiceAccessBySAP::References() called\n"); CMPIStatus status = omccmpiSimpleReferences( doReferences, self, _broker, context, results, cop, resultClass, role, properties); - DEBUGOUT("Leaving References(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving References(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -795,12 +757,12 @@ const char* resultClass, const char* role) { - DEBUGOUT("ReferenceNames() called\n"); + DEBUGOUT("TimeServiceAccessBySAP::ReferenceNames() called\n"); CMPIStatus status = omccmpiSimpleReferenceNames( doReferences, self, _broker, context, results, cop, resultClass, role); - DEBUGOUT("Leaving ReferenceNames(): %s\n", + DEBUGOUT("TimeServiceAccessBySAP::Leaving ReferenceNames(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -825,10 +787,10 @@ If no additional init is required, specify "CMNoHook" */ -CMInstanceMIStub( , OMC_CS_HostNameSettingData_Provider, +CMInstanceMIStub( , OMC_TimeServiceAccessBySAP_Provider, _broker, Init(&mi)); -CMAssociationMIStub( , OMC_CS_HostNameSettingData_Provider, +CMAssociationMIStub( , OMC_TimeServiceAccessBySAP_Provider, _broker, AssocInit(&mi)); Modified: cmpibase/trunk/src/providers/time-service/timeServiceAvailableToElement.c =================================================================== --- cmpibase/trunk/src/providers/time-service/timeServiceAvailableToElement.c 2007-02-14 17:05:52 UTC (rev 437) +++ cmpibase/trunk/src/providers/time-service/timeServiceAvailableToElement.c 2007-02-14 17:16:47 UTC (rev 438) @@ -37,6 +37,7 @@ #include <omc/base.h> #include <omc/cmpiUtils.h> #include <omc/cmpiSimpleAssoc.h> +#include <omc/cmpiTimeServiceUtils.h> #include <stdlib.h> #include <string.h> @@ -49,18 +50,18 @@ #define DEBUGOUT(fmt, args...) #endif -static const char* classKeys[] = { "ManagedElement", "SettingData", NULL }; +static const char* classKeys[] = { "UserOfService", "ServiceProvided", NULL }; // Global handle to the CIM broker // This is initialized by the CIMOM when the provider is loaded static const CMPIBroker * _broker; -static char * ASSOC_CLASSNAME = "OMC_ComputerSystemHostNameSettingData"; +static char * ASSOC_CLASSNAME = "OMC_TimeServiceAvailableToElement"; static char * LEFT_CLASSNAME = "OMC_UnitaryComputerSystem"; -static char * RIGHT_CLASSNAME = "OMC_HostNameSettingData"; -static char * LEFT_PROPERTYNAME = "ManagedElement"; -static char * RIGHT_PROPERTYNAME = "SettingData"; +static char * RIGHT_CLASSNAME = "OMC_SystemTimeService"; +static char * LEFT_PROPERTYNAME = "UserOfService"; +static char * RIGHT_PROPERTYNAME = "ServiceProvided"; // **************************************************************************** // CMPI INSTANCE PROVIDER FUNCTIONS @@ -83,12 +84,12 @@ const CMPIResult * results, const CMPIObjectPath * cop) { - DEBUGOUT("%s", "EnumInstanceNames() called\n"); + DEBUGOUT("TimeServiceAvailableToElement::EnumInstanceNames() called\n"); CMPIStatus status = {CMPI_RC_OK, NULL}; char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL)); - // Create and populate cs object path + // Create and populate cs object path (LEFT) CMPIObjectPath *cscop = omccmpiCreateCSObjectPath( _broker, ns, &status); if (CMIsNullObject(cscop)) { @@ -97,23 +98,14 @@ return status; } - // Create and populate hostname object path - CMPIObjectPath * hnsdcop = CMNewObjectPath(_broker, - ns, - RIGHT_CLASSNAME, - &status); - if ((status.rc != CMPI_RC_OK) || CMIsNullObject(hnsdcop)) + // Create and populate systemTimeService object path (RIGHT) + CMPIObjectPath *tscop = makeTimeServiceObjectPath( _broker, ns, &status); + if (CMIsNullObject(tscop)) { CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, - "Could not create host name setting data ObjectPath"); + "Could not create systemTimeService cop"); return status; } - else - { - // Add key to new object path - char instanceID[] = "omc:computername"; - CMAddKey(hnsdcop, "InstanceID", (CMPIValue *)instanceID, CMPI_chars); - } CMPIObjectPath *assocCop = omccmpiCreateAssociationPath(_broker, ns, @@ -121,7 +113,7 @@ LEFT_PROPERTYNAME, RIGHT_PROPERTYNAME, cscop, - hnsdcop, + tscop, &status); if (!CMIsNullObject(assocCop)) @@ -133,7 +125,7 @@ //close return handler CMReturnDone(results); - DEBUGOUT("Leaving EnumInstanceNames(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving EnumInstanceNames(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -151,11 +143,12 @@ const char ** properties, CMPIStatus *pStatus) { - DEBUGOUT("%s", "CreateAssocInst() called\n"); + DEBUGOUT("TimeServiceAvailableToElement::CreateAssocInst() called\n"); + CMPIStatus status = {CMPI_RC_OK, NULL}; char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL)); - //DEBUGOUT("%s", "About to create cs cop\n"); + //DEBUGOUT("About to create cs cop\n"); // Create and populate cs object path CMPIObjectPath *cscop = omccmpiCreateCSObjectPath( _broker, ns, pStatus); if (CMIsNullObject(cscop)) @@ -165,24 +158,15 @@ return NULL; } - //DEBUGOUT("%s", "About to create host name setting data cop\n"); - // Create and populate hostname object path - CMPIObjectPath * hnsdcop = CMNewObjectPath(_broker, - ns, - RIGHT_CLASSNAME, - pStatus); - if ((pStatus->rc != CMPI_RC_OK) || CMIsNullObject(hnsdcop)) + //DEBUGOUT("About to create systemTimeService data cop\n"); + // Create and populate systemTimeService object path (RIGHT) + CMPIObjectPath *tscop = makeTimeServiceObjectPath( _broker, ns, &status); + if (CMIsNullObject(tscop)) { - CMSetStatusWithChars(_broker, pStatus, CMPI_RC_ERR_FAILED, - "Could not create host name setting data ObjectPath"); + CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, + "Could not create systemTimeService cop"); return NULL; } - else - { - // Add key to new object path - char instanceID[] = "omc:computername"; - CMAddKey(hnsdcop, "InstanceID", (CMPIValue *)instanceID, CMPI_chars); - } CMPIInstance *assocInst = omccmpiCreateAssociationInst(_broker, ns, @@ -192,10 +176,10 @@ LEFT_PROPERTYNAME, RIGHT_PROPERTYNAME, cscop, - hnsdcop, + tscop, pStatus); - DEBUGOUT("Leaving EnumInstanceNames(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving EnumInstanceNames(): %s\n", (pStatus->rc == CMPI_RC_OK)? "succeeded":"failed"); return assocInst; } @@ -219,7 +203,7 @@ const CMPIObjectPath * cop, const char ** properties) { - DEBUGOUT("%s", "EnumInstances() called\n"); + DEBUGOUT("TimeServiceAvailableToElement::EnumInstances() called\n"); CMPIStatus status = {CMPI_RC_OK, NULL}; @@ -236,7 +220,7 @@ //close return handler CMReturnDone(results); - DEBUGOUT("Leaving EnumInstances(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving EnumInstances(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -259,15 +243,15 @@ const CMPIObjectPath * cop, const char ** properties) { - DEBUGOUT("%s", "GetInstance() called\n"); + DEBUGOUT("TimeServiceAvailableToElement::GetInstance() called\n"); CMPIStatus status = {CMPI_RC_OK, NULL}; char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL)); // do work here - CMPIData mekey = CMGetKey(cop, LEFT_PROPERTYNAME, &status); - CMPIData sdkey = CMGetKey(cop, RIGHT_PROPERTYNAME, &status); - if (!CMIsNullValue(mekey) && !CMIsNullValue(sdkey)) + CMPIData leftkey = CMGetKey(cop, LEFT_PROPERTYNAME, &status); + CMPIData rightkey = CMGetKey(cop, RIGHT_PROPERTYNAME, &status); + if (!CMIsNullValue(leftkey) && !CMIsNullValue(rightkey)) { CMPIInstance *assocInst = omccmpiCreateAssociationInst(_broker, ns, @@ -276,8 +260,8 @@ properties, LEFT_PROPERTYNAME, RIGHT_PROPERTYNAME, - mekey.value.ref, - sdkey.value.ref, + leftkey.value.ref, + rightkey.value.ref, &status); CMReturnInstance(results, assocInst); @@ -285,7 +269,7 @@ CMReturnDone(results); } - DEBUGOUT("Leaving GetInstance(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving GetInstance(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -311,11 +295,11 @@ { CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL}; - DEBUGOUT("%s", "ModifyInstance() called - Not Supported\n"); + DEBUGOUT("TimeServiceAvailableToElement::ModifyInstance() called - Not Supported\n"); // do work here if supported - DEBUGOUT("Leaving ModifyInstance(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving ModifyInstance(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -339,11 +323,11 @@ { CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL}; - DEBUGOUT("%s", "CreateInstance() called - Not Supported\n"); + DEBUGOUT("TimeServiceAvailableToElement::CreateInstance() called - Not Supported\n"); // do work here if supported - DEBUGOUT("Leaving CreateInstance(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving CreateInstance(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -365,11 +349,11 @@ { CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL}; - DEBUGOUT("%s", "DeleteInstance() called\n"); + DEBUGOUT("TimeServiceAvailableToElement::DeleteInstance() called\n"); // do work here if supported - DEBUGOUT("Leaving DeleteInstance(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving DeleteInstance(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -395,11 +379,11 @@ { CMPIStatus status = {CMPI_RC_ERR_NOT_SUPPORTED, NULL}; - DEBUGOUT("%s", "ExecQuery() called - Not Supported\n"); + DEBUGOUT("TimeServiceAvailableToElement::ExecQuery() called - Not Supported\n"); // do work here if supported - DEBUGOUT("Leaving ExecQuery(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving ExecQuery(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -418,11 +402,11 @@ { CMPIStatus status = {CMPI_RC_OK, NULL}; - DEBUGOUT("%s", "Cleanup() called\n"); + DEBUGOUT("TimeServiceAvailableToElement::Cleanup() called\n"); // do work here if necessary - DEBUGOUT("Leaving Cleanup(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving Cleanup(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -437,11 +421,11 @@ { CMPIStatus status = {CMPI_RC_OK, NULL}; - DEBUGOUT("%s", "Initialize() called\n"); + DEBUGOUT("TimeServiceAvailableToElement::Initialize() called\n"); // do work here if necessary - DEBUGOUT("Leaving Initialize(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving Initialize(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); } @@ -463,11 +447,11 @@ { CMPIStatus status = {CMPI_RC_OK, NULL}; - DEBUGOUT("AssocInit() called\n"); + DEBUGOUT("TimeServiceAvailableToElement::AssocInit() called\n"); // do work here if necessary - DEBUGOUT("Leaving AssocInit(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving AssocInit(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); } @@ -487,11 +471,11 @@ { CMPIStatus status = {CMPI_RC_OK, NULL}; - DEBUGOUT("AssociationCleanup() called\n"); + DEBUGOUT("TimeServiceAvailableToElement::AssociationCleanup() called\n"); // do work here if necessary - DEBUGOUT("Leaving AssociationCleanup(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving AssociationCleanup(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -504,7 +488,7 @@ // to be filtered by the SimpleAssociatior helper functions to return // the correct object (instance or object path) // **************************************************************************** -CMPIStatus +static CMPIStatus doReferences( omccmpiSimpleAssocCtx ctx, CMPIAssociationMI* self, @@ -518,7 +502,7 @@ const char *resultRole, const char** properties) { - DEBUGOUT("TimeServiceAvailableToElement::doReferences called\n"); + DEBUGOUT("TimeServiceAvailableToElement: doReferences called\n"); CMPIStatus status = {CMPI_RC_OK, NULL}; char * ns = CMGetCharPtr(CMGetNameSpace(cop, NULL)); @@ -526,147 +510,135 @@ if (strcasecmp(assocClass, ASSOC_CLASSNAME) == 0) { char *objClassName = CMGetCharPtr(CMGetClassName(cop, NULL)); - - if(strcasecmp(objClassName, LEFT_CLASSNAME) == 0) + if (objClassName) { - // this is a UnitaryComputerSystem - // need to get approprate HostNameSettingData for assoc inst - // but if resultClass is set, it must match + DEBUGOUT(" Incoming className: %s\n", objClassName); - int bHaveMatch = 1; // TRUE - if ((resultClass != NULL) && (*resultClass != 0)) + if(strcasecmp(objClassName, LEFT_CLASSNAME) == 0) { - // check - if (!omccmpiClassIsDerivedFrom(RIGHT_CLASSNAME, - resultClass, - _broker,ns,&status)) + // this is a UnitaryComputerSystem + // need to get approprate SystemTimeService for assoc inst + // but if resultClass is set, it must match + + int bHaveMatch = 1; // TRUE + if ((resultClass != NULL) && (*resultClass != 0)) { - bHaveMatch = 0; // FALSE + // check + if (!omccmpiClassIsDerivedFrom(RIGHT_CLASSNAME, + resultClass, + _broker,ns,&status)) + { + bHaveMatch = 0; // FALSE + } } - } - if ((resultRole != NULL) && (*resultRole != 0)) - { - // check - if (strcasecmp(resultRole, RIGHT_PROPERTYNAME) != 0) + if ((resultRole != NULL) && (*resultRole != 0)) { - bHaveMatch = 0; // FALSE + // check + if (strcasecmp(resultRole, RIGHT_PROPERTYNAME) != 0) + { + bHaveMatch = 0; // FALSE + } } - } - if (bHaveMatch) - { - char name[128] = {0}; - omcGetComputerSystemName(name, 128); - - CMPIData data = CMGetKey(cop, "Name", &status); - char *inName = CMGetCharPtr(data.value.string); - //DEBUGOUT("Comparing inName: %s with name: %s\n", inName, name); - if (strcasecmp(inName, name) == 0) + if (bHaveMatch) { - // create the host name cop that I'll use below - CMPIObjectPath *hncop = CMNewObjectPath(_broker, - ns, - RIGHT_CLASSNAME, - &status); - if ((status.rc != CMPI_RC_OK) || CMIsNullObject(hncop)) + char name[128] = {0}; + omcGetComputerSystemName(name, 128); + + CMPIData data = CMGetKey(cop, "Name", &status); + if (!CMIsNullValue(data)) { - CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, - "Could not create host name setting data cop"); - return status; + char *inName = CMGetCharPtr(data.value.string); + if (inName) + { + DEBUGOUT("Comparing inName: %s with name: %s\n", inName, name); + if (strcasecmp(inName, name) == 0) + { + // it matches, return the one and only instance we have: + CMPIInstance * instance = CreateAssocInstance(cop, properties, &status); + if ((instance == NULL) || (CMIsNullObject(instance))) + { + CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, + "Could not create TimeServiceAvailableToElement instance"); + return status; + } + omccmpiSimpleAssocResults(ctx, instance, &status); + } + } + else + { + DEBUGOUT("Got empty value for key Name\n"); + } } else { - char instanceID[] = "omc:computername"; - CMAddKey(hncop, - "InstanceID", - (CMPIValue *)instanceID, - CMPI_chars); + DEBUGOUT("Got null value for key Name\n"); } - // create an association instance - CMPIInstance *assocInst = omccmpiCreateAssociationInst(_broker, - ns, - ASSOC_CLASSNAME, - classKeys, - properties, - LEFT_PROPERTYNAME, - RIGHT_PROPERTYNAME, - cop, - hncop, - &status); - omccmpiSimpleAssocResults(ctx, assocInst, &status); } } - } - else if(strcmp(objClassName, RIGHT_CLASSNAME) == 0) - { - // this is a hostNameSettingData - // need to get apppropriate UnitaryComputerSystem for assocInst - - CMPIData data = CMGetKey(cop, "InstanceID", &status); - char *inName = CMGetCharPtr(data.value.string); - //DEBUGOUT("comparing inName (%s) with name (%s)\n", - // inName, - // "omc:computername"); - int bHaveMatch = 1; // TRUE - if ((resultClass != NULL) && (*resultClass != 0)) + else if(strcmp(objClassName, RIGHT_CLASSNAME) == 0) { - // check - if (!omccmpiClassIsDerivedFrom(LEFT_CLASSNAME, - resultClass, - _broker,ns,&status)) + // this is a SystemTimeService + // need to get apppropriate UnitaryComputerSystem for assocInst + + CMPIData data = CMGetKey(cop, "Name", &status); + char *inName = CMGetCharPtr(data.value.string); + //DEBUGOUT("comparing inName (%s) with name (%s)\n", + // inName, + // "omc:computername"); + int bHaveMatch = 1; // TRUE + if ((resultClass != NULL) && (*resultClass != 0)) { - bHaveMatch = 0; // FALSE + // check + if (!omccmpiClassIsDerivedFrom(LEFT_CLASSNAME, + resultClass, + _broker,ns,&status)) + { + bHaveMatch = 0; // FALSE + } } - } - if ((resultRole != NULL) && (*resultRole != 0)) - { - // check - if (strcasecmp(resultRole, LEFT_PROPERTYNAME) != 0) + if ((resultRole != NULL) && (*resultRole != 0)) { - bHaveMatch = 0; // FALSE + // check + if (strcasecmp(resultRole, LEFT_PROPERTYNAME) != 0) + { + bHaveMatch = 0; // FALSE + } } - } - if (bHaveMatch) - { - if (strcasecmp(inName, "omc:computername") == 0) + if (bHaveMatch) { - // the cscop that I'll use below - CMPIObjectPath *cscop = omccmpiCreateCSObjectPath( _broker, - ns, - &status); - if ((status.rc != CMPI_RC_OK) || CMIsNullObject(cscop)) + if (strcasecmp(inName, "omc:timeservice") == 0) { - CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, - "Could not create computerSystem cop"); - return status; + // it matches, return the one and only instance we have: + CMPIInstance * instance = CreateAssocInstance(cop, properties, &status); + if ((instance == NULL) || (CMIsNullObject(instance))) + { + CMSetStatusWithChars(_broker, &status, CMPI_RC_ERR_FAILED, + "Could not create TimeServiceAvailableToElement instance"); + return status; + } + omccmpiSimpleAssocResults(ctx, instance, &status); } - // create an association instance - CMPIInstance *assocInst = omccmpiCreateAssociationInst(_broker, - ns, - ASSOC_CLASSNAME, - classKeys, - properties, - LEFT_PROPERTYNAME, - RIGHT_PROPERTYNAME, - cscop, - cop, - &status); - omccmpiSimpleAssocResults(ctx, assocInst, &status); } } + else + { + DEBUGOUT("!!! Object type unknown: %s\n", objClassName); + } } else { - DEBUGOUT("!!! Object type unknown: %s\n", objClassName); + // not an error - this gets called for ALL CIM_ManagedElement objects + // we don't want to handle them all. } } //close return handler CMReturnDone(results); - DEBUGOUT("Leaving doReferences\n"); + DEBUGOUT("TimeServiceAvailableToElement::Leaving doReferences\n"); return status; } @@ -697,13 +669,13 @@ const char *resultRole, const char** properties) { - DEBUGOUT("Associators() called. assocClass: %s\n", assocClass); + DEBUGOUT("TimeServiceAvailableToElement::Associators() called. assocClass: %s\n", assocClass); CMPIStatus status = omccmpiSimpleAssociators( doReferences, self, _broker, context, results, cop, assocClass, resultClass, role, resultRole, properties); - DEBUGOUT("Leaving Associatiors(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving Associatiors(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -732,13 +704,13 @@ const char *role, const char *resultRole) { - DEBUGOUT("AssociatorNames() called\n"); + DEBUGOUT("TimeServiceAvailableToElement::AssociatorNames() called\n"); CMPIStatus status = omccmpiSimpleAssociatorNames( doReferences, self, _broker, context, results, cop, assocClass, resultClass, role, resultRole); - DEBUGOUT("Leaving AssociatiorNames(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving AssociatiorNames(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -765,12 +737,12 @@ const char *role , const char** properties) { - DEBUGOUT("References() called\n"); + DEBUGOUT("TimeServiceAvailableToElement::References() called\n"); CMPIStatus status = omccmpiSimpleReferences( doReferences, self, _broker, context, results, cop, resultClass, role, properties); - DEBUGOUT("Leaving References(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving References(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -795,12 +767,12 @@ const char* resultClass, const char* role) { - DEBUGOUT("ReferenceNames() called\n"); + DEBUGOUT("TimeServiceAvailableToElement::ReferenceNames() called\n"); CMPIStatus status = omccmpiSimpleReferenceNames( doReferences, self, _broker, context, results, cop, resultClass, role); - DEBUGOUT("Leaving ReferenceNames(): %s\n", + DEBUGOUT("TimeServiceAvailableToElement::Leaving ReferenceNames(): %s\n", (status.rc == CMPI_RC_OK)? "succeeded":"failed"); return status; } @@ -825,10 +797,10 @@ If no additional init is required, specify "CMNoHook" */ -CMInstanceMIStub( , OMC_CS_HostNameSettingData_Provider, +CMInstanceMIStub( , OMC_TimeServiceAvailableToElement_Provider, _broker, Init(&mi)); -CMAssociationMIStub( , OMC_CS_HostNameSettingData_Provider, +CMAssociationMIStub( , OMC_TimeServiceAvailableToElement_Provider, _broker, AssocInit(&mi)); Modified: cmpibase/trunk/src/providers/time-service/timeZoneSettingData.c =================================================================== --- cmpibase/trunk/src/providers/time-service/timeZoneSettingData.c 2007-02-14 17:05:52 UTC (rev 437) +++ cmpibase/trunk/src/providers/time-service/timeZoneSettingData.c 2007-02-14 17:16:47 UTC (rev 438) @@ -48,7 +48,7 @@ //static char * classKeys[] = {"InstanceID", NULL}; //static char instanceID[] = "omc:timezone"; -#define LOCAL_DEBUG +//#define LOCAL_DEBUG #ifdef LOCAL_DEBUG #define DEBUGOUT(fmt, args...) printf(fmt,## args) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <np...@us...> - 2007-02-14 17:05:53
|
Revision: 437 http://svn.sourceforge.net/omc/?rev=437&view=rev Author: npaxton Date: 2007-02-14 09:05:52 -0800 (Wed, 14 Feb 2007) Log Message: ----------- remove test subtree - shouldn't have been there on initial checkin Removed Paths: ------------- omccmpi/test/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <np...@us...> - 2007-02-14 17:04:58
|
Revision: 436 http://svn.sourceforge.net/omc/?rev=436&view=rev Author: npaxton Date: 2007-02-14 09:04:47 -0800 (Wed, 14 Feb 2007) Log Message: ----------- new project: omc cmpi library: with cmpi utils and straight c utility files for use by cmpi providers Added Paths: ----------- omccmpi/ omccmpi/branches/ omccmpi/tags/ omccmpi/test/ omccmpi/test/AUTHORS omccmpi/test/COPYING omccmpi/test/ChangeLog omccmpi/test/INSTALL omccmpi/test/LICENSE omccmpi/test/Makefile.am omccmpi/test/Makefile.in omccmpi/test/NEWS omccmpi/test/README omccmpi/test/aclocal.m4 omccmpi/test/autom4te.cache/ omccmpi/test/autom4te.cache/output.0 omccmpi/test/autom4te.cache/output.1 omccmpi/test/autom4te.cache/requests omccmpi/test/autom4te.cache/traces.0 omccmpi/test/autom4te.cache/traces.1 omccmpi/test/bootstrap.sh omccmpi/test/config.guess omccmpi/test/config.h.in omccmpi/test/config.sub omccmpi/test/configure omccmpi/test/configure.ac omccmpi/test/depcomp omccmpi/test/install-sh omccmpi/test/ltmain.sh omccmpi/test/missing omccmpi/test/src/ omccmpi/test/src/Makefile.am omccmpi/test/src/Makefile.in omccmpi/test/src/include/ omccmpi/test/src/include/Makefile.am omccmpi/test/src/include/Makefile.in omccmpi/test/src/include/omc/ omccmpi/test/src/include/omc/Makefile.am omccmpi/test/src/include/omc/Makefile.in omccmpi/test/src/include/omc/base.h omccmpi/test/src/include/omc/cmpiSimpleAssoc.h omccmpi/test/src/include/omc/cmpiTimeServiceUtils.h omccmpi/test/src/include/omc/cmpiUtils.h omccmpi/test/src/include/omc/exec.h omccmpi/test/src/include/omc/ioUtils.h omccmpi/test/src/include/omc/linuxProcUtils.h omccmpi/test/src/include/omc/modifyFile.h omccmpi/test/src/include/omc/ntpServer.h omccmpi/test/src/include/omc/string.h omccmpi/test/src/lib/ omccmpi/test/src/lib/Makefile.am omccmpi/test/src/lib/Makefile.in omccmpi/test/src/lib/omc/ omccmpi/test/src/lib/omc/Makefile.am omccmpi/test/src/lib/omc/Makefile.in omccmpi/test/src/lib/omc/base.c omccmpi/test/src/lib/omc/cmpiSimpleAssoc.c omccmpi/test/src/lib/omc/cmpiTimeServiceUtils.c omccmpi/test/src/lib/omc/cmpiUtils.c omccmpi/test/src/lib/omc/exec.c omccmpi/test/src/lib/omc/ioUtils.c omccmpi/test/src/lib/omc/linuxProcUtils.c omccmpi/test/src/lib/omc/modifyFile.c omccmpi/test/src/lib/omc/ntpServer.c omccmpi/test/src/lib/omc/string.c omccmpi/trunk/ omccmpi/trunk/AUTHORS omccmpi/trunk/COPYING omccmpi/trunk/ChangeLog omccmpi/trunk/LICENSE omccmpi/trunk/Makefile.am omccmpi/trunk/NEWS omccmpi/trunk/README omccmpi/trunk/bootstrap.sh omccmpi/trunk/configure.ac omccmpi/trunk/src/ omccmpi/trunk/src/Makefile.am omccmpi/trunk/src/include/ omccmpi/trunk/src/include/Makefile.am omccmpi/trunk/src/include/omc/ omccmpi/trunk/src/include/omc/Makefile.am omccmpi/trunk/src/include/omc/Makefile.in omccmpi/trunk/src/include/omc/base.h omccmpi/trunk/src/include/omc/cmpiSimpleAssoc.h omccmpi/trunk/src/include/omc/cmpiTimeServiceUtils.h omccmpi/trunk/src/include/omc/cmpiUtils.h omccmpi/trunk/src/include/omc/exec.h omccmpi/trunk/src/include/omc/ioUtils.h omccmpi/trunk/src/include/omc/linuxProcUtils.h omccmpi/trunk/src/include/omc/modifyFile.h omccmpi/trunk/src/include/omc/ntpServer.h omccmpi/trunk/src/include/omc/string.h omccmpi/trunk/src/lib/ omccmpi/trunk/src/lib/Makefile.am omccmpi/trunk/src/lib/omc/ omccmpi/trunk/src/lib/omc/Makefile.am omccmpi/trunk/src/lib/omc/base.c omccmpi/trunk/src/lib/omc/cmpiSimpleAssoc.c omccmpi/trunk/src/lib/omc/cmpiTimeServiceUtils.c omccmpi/trunk/src/lib/omc/cmpiUtils.c omccmpi/trunk/src/lib/omc/exec.c omccmpi/trunk/src/lib/omc/ioUtils.c omccmpi/trunk/src/lib/omc/linuxProcUtils.c omccmpi/trunk/src/lib/omc/modifyFile.c omccmpi/trunk/src/lib/omc/ntpServer.c omccmpi/trunk/src/lib/omc/string.c Added: omccmpi/test/AUTHORS =================================================================== --- omccmpi/test/AUTHORS (rev 0) +++ omccmpi/test/AUTHORS 2007-02-14 17:04:47 UTC (rev 436) @@ -0,0 +1,2 @@ +Norm Paxton +Jon Carey Added: omccmpi/test/COPYING =================================================================== Added: omccmpi/test/ChangeLog =================================================================== --- omccmpi/test/ChangeLog (rev 0) +++ omccmpi/test/ChangeLog 2007-02-14 17:04:47 UTC (rev 436) @@ -0,0 +1 @@ +Initial. Added: omccmpi/test/INSTALL =================================================================== --- omccmpi/test/INSTALL (rev 0) +++ omccmpi/test/INSTALL 2007-02-14 17:04:47 UTC (rev 436) @@ -0,0 +1 @@ +link /usr/share/automake-1.9/INSTALL \ No newline at end of file Property changes on: omccmpi/test/INSTALL ___________________________________________________________________ Name: svn:special + * Added: omccmpi/test/LICENSE =================================================================== --- omccmpi/test/LICENSE (rev 0) +++ omccmpi/test/LICENSE 2007-02-14 17:04:47 UTC (rev 436) @@ -0,0 +1,91 @@ +OMC is primarily constrained by BSD License. +However, some files have a more restrictive license (GPL): +* SysLog-NG + +Please pay attention to the license for each file. + +Below are some of the license notices you will encounter throughout the OMC project: + +Notice for Projects/Files Released Under the GPL + +/**************************************************************************** + | + | Copyright (c) [YEARS] Novell, Inc. + | All Rights Reserved. + | + | This program is free software; you can redistribute it and/or + | modify it under the terms of version 2 of the GNU General Public License as + | published by the Free Software Foundation. + | + | This program is distributed in the hope that it will be useful, + | but WITHOUT ANY WARRANTY; without even the implied warranty of + | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + | GNU General Public License for more details. + | + | You should have received a copy of the GNU General Public License + | along with this program; if not, contact Novell, Inc. + | + | To contact Novell about this file by physical or electronic mail, + | you may find current contact information at www.novell.com + | + |*************************************************************************** + + +Notice for Projects/Files Released Under the LGPL + +/**************************************************************************** + | + | Copyright (c) [YEARS] Novell, Inc. + | All Rights Reserved. + | + | This library is free software; you can redistribute it and/or + | modify it under the terms of the GNU Lesser General Public License as + | published by the Free Software Foundation; version 2.1 of the license. + | + | This library is distributed in the hope that it will be useful, + | but WITHOUT ANY WARRANTY; without even the implied warranty of + | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + | GNU Lesser General Public License for more details. + | + | You should have received a copy of the GNU Lesser General Public License + | along with this library; if not, contact Novell, Inc. + | + | To contact Novell about this file by physical or electronic mail, + | you may find current contact information at www.novell.com + | + |*************************************************************************** + + +Notice for Projects/Files Released Under the BSD License + +/****************************************************************************** +* Copyright (c) [YEARS], Novell, Inc. All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions +* are met: +* +* - Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* +* - Redistributions in binary form must reproduce the above copyright notice, +* this list of conditions and the following disclaimer in the documentation +* and/or other materials provided with the distribution. +* +* - Neither the name of the Novell nor the names of its contributors may be +* used to endorse or promote products derived from this software without +* specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +******************************************************************************/ + Added: omccmpi/test/Makefile.am =================================================================== --- omccmpi/test/Makefile.am (rev 0) +++ omccmpi/test/Makefile.am 2007-02-14 17:04:47 UTC (rev 436) @@ -0,0 +1,9 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = gnu + +SUBDIRS = \ + . \ + src + + Added: omccmpi/test/Makefile.in =================================================================== --- omccmpi/test/Makefile.in (rev 0) +++ omccmpi/test/Makefile.in 2007-02-14 17:04:47 UTC (rev 436) @@ -0,0 +1,619 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = . +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ + config.guess config.sub depcomp install-sh ltmain.sh missing +subdir = . +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno configure.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CP = @CP@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MV = @MV@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +RM = @RM@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +AUTOMAKE_OPTIONS = gnu +SUBDIRS = \ + . \ + src + +all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +.SUFFIXES: +am--refresh: + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ + cd $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + +config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ + $(MAKE) stamp-h1; \ + else :; fi + +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h +$(srcdir)/config.h.in: $(am__configure_deps) + cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ + +distclean-hdr: + -rm -f config.h stamp-h1 + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + $(am__remove_distdir) + mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + distdir) \ + || exit 1; \ + fi; \ + done + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + +dist dist-all: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' +distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am +check: check-recursive +all-am: Makefile config.h +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-hdr \ + distclean-libtool distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-info-am + +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ + check-am clean clean-generic clean-libtool clean-recursive \ + ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ + dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-recursive distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am uninstall-info-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Added: omccmpi/test/NEWS =================================================================== --- omccmpi/test/NEWS (rev 0) +++ omccmpi/test/NEWS 2007-02-14 17:04:47 UTC (rev 436) @@ -0,0 +1 @@ + Added: omccmpi/test/README =================================================================== Added: omccmpi/test/aclocal.m4 =================================================================== --- omccmpi/test/aclocal.m4 (rev 0) +++ omccmpi/test/aclocal.m4 2007-02-14 17:04:47 UTC (rev 436) @@ -0,0 +1,7227 @@ +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + +# serial 48 AC_PROG_LIBTOOL + + +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) + + +# AC_PROG_LIBTOOL +# --------------- +AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) + +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL + + +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl + +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' +AC_SUBST(LIBTOOL)dnl + +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) +])# _AC_PROG_LIBTOOL + + +# AC_LIBTOOL_SETUP +# ---------------- +AC_DEFUN([AC_LIBTOOL_SETUP], +[AC_PREREQ(2.50)dnl +AC_REQUIRE([AC_ENABLE_SHARED])dnl +AC_REQUIRE([AC_ENABLE_STATIC])dnl +AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_LD])dnl +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_REQUIRE([AC_PROG_NM])dnl + +AC_REQUIRE([AC_PROG_LN_S])dnl +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +AC_REQUIRE([AC_OBJEXT])dnl +AC_REQUIRE([AC_EXEEXT])dnl +dnl + +AC_LIBTOOL_SYS_MAX_CMD_LEN +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +AC_LIBTOOL_OBJDIR + +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +_LT_AC_PROG_ECHO_BACKSLASH + +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES + fi + ;; +esac + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +Xsed='sed -e 1s/^X//' +[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] + +# Same as above, but do not quote variable references. +[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +# Constants: +rm="rm -f" + +# Global variables: +default_ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" +with_gnu_ld="$lt_cv_prog_gnu_ld" + +AC_CHECK_TOOL(AR, ar, false) +AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(STRIP, strip, :) + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" +test -z "$MAGIC_CMD" && MAGIC_CMD=file +test -z "$NM" && NM=nm +test -z "$SED" && SED=sed +test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: +test -z "$ac_objext" && ac_objext=o + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi + +_LT_CC_BASENAME([$compiler]) + +# Only perform the check for file, if the check method requires it +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + AC_PATH_MAGIC + fi + ;; +esac + +AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +enable_win32_dll=yes, enable_win32_dll=no) + +AC_ARG_ENABLE([libtool-lock], + [AC_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +AC_ARG_WITH([pic], + [AC_HELP_STRING([--with-pic], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [pic_mode="$withval"], + [pic_mode=default]) +test -z "$pic_mode" && pic_mode=default + +# Use C for the default configuration in the libtool script +tagname= +AC_LIBTOOL_LANG_C_CONFIG +_LT_AC_TAGCONFIG +])# AC_LIBTOOL_SETUP + + +# _LT_AC_SYS_COMPILER +# ------------------- +AC_DEFUN([_LT_AC_SYS_COMPILER], +[AC_REQUIRE([AC_PROG_CC])dnl + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC +])# _LT_AC_SYS_COMPILER + + +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +AC_DEFUN([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +AC_DEFUN([_LT_COMPILER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +AC_DEFUN([_LT_LINKER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_LINKER_BOILERPLATE + + +# _LT_AC_SYS_LIBPATH_AIX +# ---------------------- +# Links a minimal program and checks the executable +# for the system default hardcoded library path. In most cases, +# this is /usr/lib:/lib, but when the MPI compilers are used +# the location of the communication and MPI libs are included too. +# If we don't find anything, use the default library path according +# to the aix ld manual. +AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } +}'`; fi],[]) +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +])# _LT_AC_SYS_LIBPATH_AIX + + +# _LT_AC_SHELL_INIT(ARG) +# ---------------------- +AC_DEFUN([_LT_AC_SHELL_INIT], +[ifdef([AC_DIVERSION_NOTICE], + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], + [AC_DIVERT_PUSH(NOTICE)]) +$1 +AC_DIVERT_POP +])# _LT_AC_SHELL_INIT + + +# _LT_AC_PROG_ECHO_BACKSLASH +# -------------------------- +# Add some code to the start of the generated configure script which +# will find an echo command which doesn't interpret backslashes. +AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +[_LT_AC_SHELL_INIT([ +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} + +case X$ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ;; +esac + +echo=${ECHO-echo} +if test "X[$]1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X[$]1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then + # Yippee, $echo works! + : +else + # Restart under the correct shell. + exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} +fi + +if test "X[$]1" = X--fallback-echo; then + # used as fallback echo + shift + cat <<EOF +[$]* +EOF + exit 0 +fi + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +if test -z "$ECHO"; then +if test "X${echo_test_string+set}" != Xset; then +# find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break + fi + done +fi + +if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : +else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" + + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + echo='print -r' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} + else + # Try using printf. + echo='printf %s\n' + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + echo="$CONFIG_SHELL [$]0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$CONFIG_SHELL [$]0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "[$]0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} + else + # Oops. We lost completely, so just stick with echo. + echo=echo + fi + fi + fi + fi +fi +fi + +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +ECHO=$echo +if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then + ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +fi + +AC_SUBST(ECHO) +])])# _LT_AC_PROG_ECHO_BACKSLASH + + +# _LT_AC_LOCK +# ----------- +AC_DEFUN([_LT_AC_LOCK], +[AC_ARG_ENABLE([libtool-lock], + [AC_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes + +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '[#]line __oline__ "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" + ;; + *N32*) + LD="${LD-ld} -melf32bmipn32" + ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; + +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*|powerpc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, + [AC_LANG_PUSH(C) + AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) + AC_LANG_POP]) + if test x"$lt_cv_cc_needs_belf" != x"yes"; then + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +[*-*-cygwin* | *-*-mingw* | *-*-pw32*) + AC_CHECK_TOOL(DLLTOOL, dlltool, false) + AC_CHECK_TOOL(AS, as, false) + AC_CHECK_TOOL(OBJDUMP, objdump, false) + ;; + ]) +esac + +need_locks="$enable_libtool_lock" + +])# _LT_AC_LOCK + + +# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) +# ---------------------------------------------------------------- +# Check whether the given compiler option works +AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], +[AC_REQUIRE([LT_AC_PROG_SED]) +AC_CACHE_CHECK([$1], [$2], + [$2=no + ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) + printf "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="$3" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + fi + $rm conftest* +]) + +if test x"[$]$2" = xyes; then + ifelse([$5], , :, [$5]) +else + ifelse([$6], , :, [$6]) +fi +])# AC_LIBTOOL_COMPILER_OPTION + + +# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, +# [ACTION-SUCCESS], [ACTION-FAILURE]) +# ------------------------------------------------------------ +# Check whether the given compiler option works +AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], +[AC_CACHE_CHECK([$1], [$2], + [$2=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $3" + printf "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&AS_MESSAGE_LOG_FD + $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + $2=yes + fi + else + $2=yes + fi + fi + $rm conftest* + LDFLAGS="$save_LDFLAGS" +]) + +if test x"[$]$2" = xyes; then + ifelse([$4], , :, [$4]) +else + ifelse([$5], , :, [$5]) +fi +])# AC_LIBTOOL_LINKER_OPTION + + +# AC_LIBTOOL_SYS_MAX_CMD_LEN +# -------------------------- +AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], +[# find the maximum length of command line arguments +AC_MSG_CHECKING([the maximum length of command line arguments]) +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl + i=0 + teststring="ABCD" + + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; + + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; + + cygwin* | mingw*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; + + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; + + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; + + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; + + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + = "XX$teststring") >/dev/null 2>&1 && + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + ;; + esac +]) +if test -n $lt_cv_sys_max_cmd_len ; then + AC_MSG_RESULT($lt_cv_sys_max_cmd_len) +else + AC_MSG_RESULT(none) +fi +])# AC_LIBTOOL_SYS_MAX_CMD_LEN + + +# _LT_AC_CHECK_DLFCN +# ------------------ +AC_DEFUN([_LT_AC_CHECK_DLFCN], +[AC_CHECK_HEADERS(dlfcn.h)dnl +])# _LT_AC_CHECK_DLFCN + + +# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, +# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) +# --------------------------------------------------------------------- +AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], +[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +if test "$cross_compiling" = yes; then : + [$4] +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<EOF +[#line __oline__ "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include <dlfcn.h> +#endif + +#include <stdio.h> + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +#ifdef __cplusplus +extern "C" void exit (int); +#endif + +void fnord() { int i=42;} +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + /* dlclose (self); */ + } + else + puts (dlerror ()); + + exit (status); +}] +EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) $1 ;; + x$lt_dlneed_uscore) $2 ;; + x$lt_dlunknown|x*) $3 ;; + esac + else : + # compilation failed + $3 + fi +fi +rm -fr conftest* +])# _LT_AC_TRY_DLOPEN_SELF + + +# AC_LIBTOOL_DLOPEN_SELF +# ---------------------- +AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], +[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl +if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown +else + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; + + mingw* | pw32*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; + + darwin*) + # if libdl is installed we need to link against it + AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ]) + ;; + + *) + AC_CHECK_FUNC([shl_load], + [lt_cv_dlopen="shl_load"], + [AC_CHECK_LIB([dld], [shl_load], + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], + [AC_CHECK_FUNC([dlopen], + [lt_cv_dlopen="dlopen"], + [AC_CHECK_LIB([dl], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [AC_CHECK_LIB([svld], [dlopen], + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [AC_CHECK_LIB([dld], [dld_link], + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) + ]) + ]) + ]) + ]) + ]) + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes + else + enable_dlopen=no + fi + + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + AC_CACHE_CHECK([whether a program can dlopen itself], + lt_cv_dlopen_self, [dnl + _LT_AC_TRY_DLOPEN_SELF( + lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, + lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) + ]) + + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + AC_CACHE_CHECK([whether a statically linked program can dlopen itself], + lt_cv_dlopen_self_static, [dnl + _LT_AC_TRY_DLOPEN_SELF( + lt_cv_dlopen_self_static=yes... [truncated message content] |
From: <ba...@us...> - 2007-02-09 01:31:14
|
Revision: 435 http://svn.sourceforge.net/omc/?rev=435&view=rev Author: bartw Date: 2007-02-08 17:31:11 -0800 (Thu, 08 Feb 2007) Log Message: ----------- Added CIMPLE provider for subclasses of CIM_LogicalFile Modified Paths: -------------- cmpibase/trunk/configure.ac cmpibase/trunk/src/include/omc/Makefile.am cmpibase/trunk/src/lib/omc/Makefile.am cmpibase/trunk/src/providers/Makefile.am Added Paths: ----------- cmpibase/trunk/src/include/omc/fileTools.h cmpibase/trunk/src/lib/omc/fileTools.c cmpibase/trunk/src/providers/logical-file/ cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.cpp cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.h cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider_module.cpp cmpibase/trunk/src/providers/logical-file/FilesCommon.cpp cmpibase/trunk/src/providers/logical-file/FilesCommon.hpp cmpibase/trunk/src/providers/logical-file/Makefile.am cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.cpp cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.h cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider_module.cpp cmpibase/trunk/src/providers/logical-file/OMC_LinuxFileIdentity_Provider.cpp cmpibase/trunk/src/providers/logical-file/OMC_LinuxFileIdentity_Provider.h cmpibase/trunk/src/providers/logical-file/OMC_LinuxFileIdentity_Provider_module.cpp cmpibase/trunk/src/providers/logical-file/OMC_LinuxFile_Provider.cpp cmpibase/trunk/src/providers/logical-file/OMC_LinuxFile_Provider.h cmpibase/trunk/src/providers/logical-file/OMC_LinuxFile_Provider_module.cpp cmpibase/trunk/src/providers/logical-file/schema/ cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_Component.h cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_DataFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_DeviceFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_Directory.h cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_DirectoryContainsFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_FIFOPipeFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_FileIdentity.h cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalElement.h cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalIdentity.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_LogicalIdentity.h cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedElement.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedElement.h cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_ManagedSystemElement.h cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_SymbolicLink.h cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDeviceFile.h cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDirectory.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixDirectory.h cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixFile.cpp cmpibase/trunk/src/providers/logical-file/schema/CIM_UnixFile.h cmpibase/trunk/src/providers/logical-file/schema/Makefile.am cmpibase/trunk/src/providers/logical-file/schema/OMC_DataFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_DataFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_DirectoryContainsFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_DirectoryContainsFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_FIFOPipeFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_FIFOPipeFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_FileIdentity.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_FileIdentity.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDataFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDataFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDeviceFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDeviceFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDirectory.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDirectory.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDirectoryContainsFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxDirectoryContainsFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFIFOPipeFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFIFOPipeFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFileIdentity.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxFileIdentity.h cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxSymbolicLink.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_LinuxSymbolicLink.h cmpibase/trunk/src/providers/logical-file/schema/OMC_SymbolicLink.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_SymbolicLink.h cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDeviceFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDeviceFile.h cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDirectory.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixDirectory.h cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixFile.cpp cmpibase/trunk/src/providers/logical-file/schema/OMC_UnixFile.h cmpibase/trunk/src/providers/logical-file/schema/repository.cpp cmpibase/trunk/src/providers/logical-file/schema/repository.h Removed Paths: ------------- cmpibase/trunk/src/include/omc/Makefile.in cmpibase/trunk/src/providers/time-service/Makefile.in Property Changed: ---------------- cmpibase/trunk/ cmpibase/trunk/src/ cmpibase/trunk/src/include/ cmpibase/trunk/src/include/omc/ cmpibase/trunk/src/lib/ cmpibase/trunk/src/lib/omc/ cmpibase/trunk/src/providers/ cmpibase/trunk/src/providers/computer-system/ cmpibase/trunk/src/providers/operating-system/ cmpibase/trunk/src/providers/processes/ cmpibase/trunk/src/providers/time-service/ Property changes on: cmpibase/trunk ___________________________________________________________________ Name: svn:ignore - Makefile.in configure aclocal.m4 Makefile autom4te.cache config.guess config.log config.status config.sub config.h.in libtool ltmain.sh mybuild *.vpj config depcomp missing *.vpw *.vpwhistu *.vtg *.swp + stamp-h1 configure Makefile.in config.log depcomp config.guess config.h ltmain.sh config.sub Makefile omccmpi-*.tar.gz config.status config.h.in libtool autom4te.cache missing aclocal.m4 Modified: cmpibase/trunk/configure.ac =================================================================== --- cmpibase/trunk/configure.ac 2007-02-01 17:59:16 UTC (rev 434) +++ cmpibase/trunk/configure.ac 2007-02-09 01:31:11 UTC (rev 435) @@ -155,6 +155,15 @@ AC_HEADER_SYS_WAIT AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h sys/time.h openssl/evp.h sys/param.h sys/vfs.h],,[AC_MSG_ERROR(Missing headers: likely won't compile)]) +AC_LANG_CPLUSPLUS +AC_CHECK_HEADERS([cimple/cimple.h],[HAVE_CIMPLE="1"],[HAVE_CIMPLE="0"]) +AM_CONDITIONAL(DO_CIMPLE_PROVIDERS, test "$HAVE_CIMPLE" = 1) + +AC_CHECK_HEADERS([cimple/OpenWBEM_Adapter.h],[HAVE_CIMPLE_OW_ADAPTER="1"],[HAVE_CIMPLE_OW_ADAPTER="0"]) +AM_CONDITIONAL(USE_CIMPLE_OW_ADAPTER, test "$HAVE_CIMPLE_OW_ADAPTER" = 1) +AC_LANG_C + + # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL AC_C_CONST @@ -191,5 +200,7 @@ src/providers/computer-system/Makefile src/providers/operating-system/Makefile src/providers/time-service/Makefile + src/providers/logical-file/Makefile + src/providers/logical-file/schema/Makefile ]) AC_OUTPUT Property changes on: cmpibase/trunk/src ___________________________________________________________________ Name: svn:ignore - Makefile.in + Makefile Makefile.in Property changes on: cmpibase/trunk/src/include ___________________________________________________________________ Name: svn:ignore - Makefile.in + Makefile.in Makefile Property changes on: cmpibase/trunk/src/include/omc ___________________________________________________________________ Name: svn:ignore - Makefile.in + Makefile Makefile.in Modified: cmpibase/trunk/src/include/omc/Makefile.am =================================================================== --- cmpibase/trunk/src/include/omc/Makefile.am 2007-02-01 17:59:16 UTC (rev 434) +++ cmpibase/trunk/src/include/omc/Makefile.am 2007-02-09 01:31:11 UTC (rev 435) @@ -6,6 +6,7 @@ exec.h \ ioUtils.h \ modifyFile.h \ + fileTools.h \ string.h \ linuxProcUtils.h \ cmpiUtils.h \ Deleted: cmpibase/trunk/src/include/omc/Makefile.in =================================================================== --- cmpibase/trunk/src/include/omc/Makefile.in 2007-02-01 17:59:16 UTC (rev 434) +++ cmpibase/trunk/src/include/omc/Makefile.in 2007-02-09 01:31:11 UTC (rev 435) @@ -1,406 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -top_builddir = ../../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src/include/omc -DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(pkgincludedir)" -pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(pkginclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkgincludedir = $(includedir)/omccmpi -ACLOCAL = @ACLOCAL@ -ALLOCA = @ALLOCA@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CP = @CP@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MV = @MV@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -RM = @RM@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -YACC = @YACC@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -pkginclude_HEADERS = \ - base.h \ - exec.h \ - ioUtils.h \ - modifyFile.h \ - string.h \ - linuxProcUtils.h \ - cmpiUtils.h \ - cmpiSimpleAssoc.h \ - cmpiTimeServiceUtils.h \ - ntpServer.h - -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/include/omc/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/include/omc/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-pkgincludeHEADERS: $(pkginclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ - $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ - done - -uninstall-pkgincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(pkginclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(pkgincludedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-pkgincludeHEADERS - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-pkgincludeHEADERS \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ - uninstall-pkgincludeHEADERS - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: Added: cmpibase/trunk/src/include/omc/fileTools.h =================================================================== --- cmpibase/trunk/src/include/omc/fileTools.h (rev 0) +++ cmpibase/trunk/src/include/omc/fileTools.h 2007-02-09 01:31:11 UTC (rev 435) @@ -0,0 +1,104 @@ +/******************************************************************************* +* Copyright (C) 2005, 2006 Novell, Inc. All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* - Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* +* - Redistributions in binary form must reproduce the above copyright notice, +* this list of conditions and the following disclaimer in the documentation +* and/or other materials provided with the distribution. +* +* - Neither the name of Novell, Inc. nor the names of its +* contributors may be used to endorse or promote products derived from this +* software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL Novell, Inc. OR THE CONTRIBUTORS +* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +* +******************************************************************************/ + + +#ifndef OMCFILETOOLS_H_GUARD__ +#define OMCFILETOOLS_H_GUARD__ + +#ifdef __cplusplus +extern "C" { +#endif + +struct stat; + +/** + * Return the name of the directory containing the file (or + * directory) referenced by path. + * + * @param path The path + * + * @return The directory containing the file. The caller is + * responsible to free the buffer returned. + */ +char* omc_dirname(const char* path); + +/** + * Struct containing the six keys of CIM file classes. + * (CIM_LogicalFile and children) + */ +typedef struct omcFileKeys_ +{ + char * CSCreationClassName; + char * CSName; + char * CreationClassName; + char * FSCreationClassName; + char * FSName; + char * Name; +} omcFileKeys; + +/** + * Free a omcFileKeys structure and the pointers contained + * therein. + * + * @param fk pointer to the omcFileKeys structure to be freed. + */ +void omcFileKeys_free(omcFileKeys* fk); + +/** + * Determine the keys for the CIM instance representing a given + * file. + * @param path The full path to the file + * + * @return A pointer to an omcFileKeys structure. The caller is + * responsible to free this with a call to + * omcFileKeys_free(). + */ +omcFileKeys* omcGetKeysForFile(const char* path); + +/** + * Determine the keys for the CIM instance representing a given + * file. Use this version if you already have a stat for the + * file and wish to avoid an aditional stat. + * + * @param path The full path to the file + * @param st A stat structure for the file obtained from stat() + * + * @return A pointer to an omcFileKeys structure. The caller is + * responsible to free this with a call to + * omcFileKeys_free(). + */ +omcFileKeys* omcGetKeysForFileStat(const char* path, struct stat* st); + +#ifdef __cplusplus +} +#endif + +#endif Property changes on: cmpibase/trunk/src/lib ___________________________________________________________________ Name: svn:ignore - Makefile.in + Makefile Makefile.in Property changes on: cmpibase/trunk/src/lib/omc ___________________________________________________________________ Name: svn:ignore - Makefile.in + .deps .libs Makefile.in Makefile Modified: cmpibase/trunk/src/lib/omc/Makefile.am =================================================================== --- cmpibase/trunk/src/lib/omc/Makefile.am 2007-02-01 17:59:16 UTC (rev 434) +++ cmpibase/trunk/src/lib/omc/Makefile.am 2007-02-09 01:31:11 UTC (rev 435) @@ -15,6 +15,7 @@ exec.c \ ioUtils.c \ modifyFile.c \ +fileTools.c \ string.c \ linuxProcUtils.c \ ntpServer.c Added: cmpibase/trunk/src/lib/omc/fileTools.c =================================================================== --- cmpibase/trunk/src/lib/omc/fileTools.c (rev 0) +++ cmpibase/trunk/src/lib/omc/fileTools.c 2007-02-09 01:31:11 UTC (rev 435) @@ -0,0 +1,201 @@ +/******************************************************************************* +* Copyright (C) 2005, 2006 Novell, Inc. All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* - Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* +* - Redistributions in binary form must reproduce the above copyright notice, +* this list of conditions and the following disclaimer in the documentation +* and/or other materials provided with the distribution. +* +* - Neither the name of Novell, Inc. nor the names of its +* contributors may be used to endorse or promote products derived from this +* software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL Novell, Inc. OR THE CONTRIBUTORS +* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +* +******************************************************************************/ + + +#include "omc/fileTools.h" +//#include "omccmpi/string.h" +//#include "omccmpi/ioUtils.h" +//#include "string.h" +//#include "ioUtils.h" +#include <libgen.h> +#include "omc/string.h" +#include <sys/stat.h> +#include <sys/types.h> +#include <unistd.h> + +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif +#include <stdlib.h> +#include <stdio.h> + +char* omc_dirname(const char* path) +{ + char* tmp = strdup(path); + char* rv = dirname(tmp); + if (rv == NULL) + { + free(tmp); + } + return rv; +} + +void omcFileKeys_free(omcFileKeys* fk) +{ + if (fk == NULL) + { + return; + } + //free(fk->CSCreationClassName); // not malloc'd + free(fk->CSName); + //free(fk->CreationClassName); // not malloc'd + free(fk->FSCreationClassName); + free(fk->FSName); + free(fk->Name); + free(fk); +} + +omcFileKeys* omcGetKeysForFile(const char* path) +{ + struct stat st; + if (lstat(path, &st) != 0) + { + return NULL; + } + return omcGetKeysForFileStat(path, &st); +} + +omcFileKeys* omcGetKeysForFileStat(const char* path, struct stat* st) +{ + omcFileKeys* rv = (omcFileKeys*)malloc(sizeof(omcFileKeys)); + memset(rv, 0, sizeof(omcFileKeys)); + if (S_ISREG(st->st_mode)) + { + rv->CreationClassName = "OMC_LinuxDataFile"; + } else if (S_ISDIR(st->st_mode)) + { + rv->CreationClassName = "OMC_LinuxDirectory"; + } else if (S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode)) + { + rv->CreationClassName = "OMC_LinuxDeviceFile"; + } else if (S_ISFIFO(st->st_mode)) + { + rv->CreationClassName = "OMC_LinuxFIFOPipeFile"; + } else if (S_ISLNK(st->st_mode)) + { + rv->CreationClassName = "OMC_LinuxSymbolicLink"; + } else + { + free(rv); + return NULL; + } + rv->Name = strdup(path); + rv->CSCreationClassName = "OMC_LinuxUnitaryComputerSystem"; + rv->CSName = (char*)malloc(256); + gethostname(rv->CSName, 256); + FILE* mounts = fopen("/proc/mounts", "r"); + if (mounts == NULL) + { + omcFileKeys_free(rv); + return NULL; + } + char* line = NULL; + char* p = NULL; + size_t bfrLen = 0; + for(p = omcReadLine(mounts, &line,&bfrLen); p; p = omcReadLine(mounts, &line,&bfrLen )) + { + int count = omcStrTokenCount(line, " \t\r\n"); + if (count != 6) + { + continue; + } + size_t numElems = 0; + char** strs = omcStrTokenize(line, " \t\r\n", &numElems); + if (strs == NULL) + { + continue; + } + if (strs[1][0] != '/') + { + free(strs); + continue; + } + if (strs[1][1] == 0 && strcmp(strs[0], "rootfs") == 0) + { + /* skip rootfs junk */ + free(strs); + continue; + } + struct stat dst; + if (stat(strs[1], &dst) != 0) + { + free(strs); + continue; + } + if (st->st_dev == dst.st_dev) + { + rv->FSName = strdup(strs[0]); + char* fstype = strs[2]; + if (strcmp(fstype, "ext2") == 0) + { + rv->FSCreationClassName = strdup("OMC_LinuxExt2FileSystem"); + } else if (strcmp(fstype, "ext3") == 0) + { + rv->FSCreationClassName = strdup("OMC_LinuxExt3FileSystem"); + } else if (strcmp(fstype, "reiserfs") == 0) + { + rv->FSCreationClassName = strdup("OMC_LinuxReiserFileSystem"); + } else if (strcmp(fstype, "nfs") == 0) + { + rv->FSCreationClassName = strdup("OMC_LinuxNFS"); + } else if (strcmp(fstype, "cifs") == 0) + { + rv->FSCreationClassName = strdup("OMC_LinuxCIFS"); /* TODO CIM class doesn't exist yet */ + } + else + { + int len = snprintf(NULL, 0, "Unknown:%s", fstype); + if (len > 0) + { + rv->FSCreationClassName = (char*)malloc(len + 1); + snprintf(rv->FSCreationClassName, len+1, "Unknown:%s", fstype); + } + else + { + rv->FSCreationClassName = strdup("Unknown"); + } + } + } + free(strs); + if (rv->FSName != NULL) + { + break; + } + } + if (line) + { + free(line); + } + fclose(mounts); + return rv; + +} + Property changes on: cmpibase/trunk/src/providers ___________________________________________________________________ Name: svn:ignore - Makefile.in + Makefile.in Makefile Modified: cmpibase/trunk/src/providers/Makefile.am =================================================================== --- cmpibase/trunk/src/providers/Makefile.am 2007-02-01 17:59:16 UTC (rev 434) +++ cmpibase/trunk/src/providers/Makefile.am 2007-02-09 01:31:11 UTC (rev 435) @@ -6,3 +6,7 @@ operating-system \ time-service +if DO_CIMPLE_PROVIDERS +SUBDIRS += logical-file +endif + Property changes on: cmpibase/trunk/src/providers/computer-system ___________________________________________________________________ Name: svn:ignore - Makefile.in + .deps .libs Makefile.in Makefile Property changes on: cmpibase/trunk/src/providers/logical-file ___________________________________________________________________ Name: svn:ignore + .deps .libs Makefile.in Makefile Added: cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.cpp (rev 0) +++ cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.cpp 2007-02-09 01:31:11 UTC (rev 435) @@ -0,0 +1,140 @@ +/******************************************************************************* +* Copyright (C) 2005, 2006 Novell, Inc. All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* - Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* +* - Redistributions in binary form must reproduce the above copyright notice, +* this list of conditions and the following disclaimer in the documentation +* and/or other materials provided with the distribution. +* +* - Neither the name of Novell, Inc. nor the names of its +* contributors may be used to endorse or promote products derived from this +* software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL Novell, Inc. OR THE CONTRIBUTORS +* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +* +******************************************************************************/ + +#include "CIM_LogicalFile_Provider.h" +#include "OMC_LinuxDirectoryContainsFile.h" +#include "omc/fileTools.h" +#include "FilesCommon.hpp" +#include <sys/stat.h> +#include <sys/types.h> +#include <unistd.h> + +CIMPLE_NAMESPACE_BEGIN + +CIM_LogicalFile_Provider::CIM_LogicalFile_Provider() +{ +} + +CIM_LogicalFile_Provider::~CIM_LogicalFile_Provider() +{ +} + +Load_Status CIM_LogicalFile_Provider::load() +{ + return LOAD_OK; +} + +Unload_Status CIM_LogicalFile_Provider::unload() +{ + return UNLOAD_OK; +} + +Get_Instance_Status CIM_LogicalFile_Provider::get_instance( + const CIM_LogicalFile* model, + CIM_LogicalFile*& instance) +{ + instance = getFile(model->Name.value.c_str()); + return GET_INSTANCE_OK; +} + +Enum_Instances_Status CIM_LogicalFile_Provider::enum_instances( + const CIM_LogicalFile* model, + Enum_Instances_Handler<CIM_LogicalFile>* handler) +{ + if (eqi(model->meta_class->name, "OMC_LinuxDirectory")) + { + struct stat st; + if (lstat("/", &st) != 0) + { + return ENUM_INSTANCES_FAILED; + } + omcFileKeys* keys = omcGetKeysForFileStat("/", &st); + if (keys == NULL) + { + return ENUM_INSTANCES_FAILED; + } + 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)); + } + return ENUM_INSTANCES_OK; +} + +Create_Instance_Status CIM_LogicalFile_Provider::create_instance( + const CIM_LogicalFile* instance) +{ + return CREATE_INSTANCE_UNSUPPORTED; +} + +Delete_Instance_Status CIM_LogicalFile_Provider::delete_instance( + const CIM_LogicalFile* instance) +{ + return DELETE_INSTANCE_UNSUPPORTED; +} + +Modify_Instance_Status CIM_LogicalFile_Provider::modify_instance( + const CIM_LogicalFile* instance) +{ + return MODIFY_INSTANCE_UNSUPPORTED; +} + +int CIM_LogicalFile_Provider::proc( + const Registration* registration, + 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 + // GENERATED. + + typedef CIM_LogicalFile Class; + typedef CIM_LogicalFile_Provider Provider; + return Provider_Proc_T<Provider>::proc(registration, + operation, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); +} + +CIMPLE_NAMESPACE_END Added: cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.h =================================================================== --- cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.h (rev 0) +++ cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider.h 2007-02-09 01:31:11 UTC (rev 435) @@ -0,0 +1,55 @@ +#ifndef _CIM_LogicalFile_Provider_h +#define _CIM_LogicalFile_Provider_h + +#include <cimple/cimple.h> +#include "CIM_LogicalFile.h" + +CIMPLE_NAMESPACE_BEGIN + +class CIM_LogicalFile_Provider +{ +public: + + typedef CIM_LogicalFile Class; + + CIM_LogicalFile_Provider(); + + ~CIM_LogicalFile_Provider(); + + Load_Status load(); + + Unload_Status unload(); + + Get_Instance_Status get_instance( + const CIM_LogicalFile* model, + CIM_LogicalFile*& instance); + + Enum_Instances_Status enum_instances( + const CIM_LogicalFile* model, + Enum_Instances_Handler<CIM_LogicalFile>* handler); + + Create_Instance_Status create_instance( + const CIM_LogicalFile* instance); + + Delete_Instance_Status delete_instance( + const CIM_LogicalFile* instance); + + Modify_Instance_Status modify_instance( + const CIM_LogicalFile* instance); + + static int proc( + const Registration* registration, + int operation, + void* arg0, + void* arg1, + void* arg2, + void* arg3, + void* arg4, + void* arg5, + void* arg6, + void* arg7); +}; + +CIMPLE_NAMESPACE_END + +#endif /* _CIM_LogicalFile_Provider_h */ Added: cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider_module.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider_module.cpp (rev 0) +++ cmpibase/trunk/src/providers/logical-file/CIM_LogicalFile_Provider_module.cpp 2007-02-09 01:31:11 UTC (rev 435) @@ -0,0 +1,16 @@ + +#include "config.h" +#include "CIM_LogicalFile_Provider.h" + +using namespace cimple; + +CIMPLE_MODULE(CIM_LogicalFile_Module); + +CIMPLE_PROVIDER(CIM_LogicalFile_Provider); +CIMPLE_CMPI_INSTANCE_PROVIDER(CIM_LogicalFile_Provider); + +#ifdef HAVE_CIMPLE_OPENWBEM_ADAPTER_H + #include <cimple/OpenWBEM_Adapter.h> + CIMPLE_OPENWBEM_PROVIDER(CIM_LogicalFile_Provider); +#endif + Added: cmpibase/trunk/src/providers/logical-file/FilesCommon.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/FilesCommon.cpp (rev 0) +++ cmpibase/trunk/src/providers/logical-file/FilesCommon.cpp 2007-02-09 01:31:11 UTC (rev 435) @@ -0,0 +1,226 @@ +/******************************************************************************* +* Copyright (C) 2005, 2006 Novell, Inc. All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* - Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* +* - Redistributions in binary form must reproduce the above copyright notice, +* this list of conditions and the following disclaimer in the documentation +* and/or other materials provided with the distribution. +* +* - Neither the name of Novell, Inc. nor the names of its +* contributors may be used to endorse or promote products derived from this +* software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL Novell, Inc. OR THE CONTRIBUTORS +* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +* +******************************************************************************/ + +#include "OMC_LinuxDirectory.h" +#include "OMC_LinuxDeviceFile.h" +#include "OMC_LinuxDataFile.h" +#include "OMC_LinuxFIFOPipeFile.h" +#include "OMC_LinuxSymbolicLink.h" +#include "OMC_LinuxFile.h" +#include "FilesCommon.hpp" +#include "omc/fileTools.h" + +#include <dirent.h> +#include <sys/param.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <sys/param.h> +#include <unistd.h> +#include <grp.h> +#include <pwd.h> + + +CIMPLE_NAMESPACE_BEGIN + + +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); + if (rv == 0 && pgr) + { + rval = gr.gr_name; + } else + { + snprintf(buf, sizeof(buf), "%d", gid); + rval = buf; + } + return rval; +} + +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); + if (rv == 0 && ppw) + { + //rval = strdup(pw.pw_name); + rval = pw.pw_name; + } else + { + snprintf(buf,sizeof(buf),"%d", uid); + rval = buf; + } + return rval; +} + +OMC_LinuxFile* getLinuxFile(const char* path) +{ + struct stat st; + if (stat(path, &st) != 0) + { + return 0; + } + omcFileKeys* keys = omcGetKeysForFileStat(path, &st); + if (!keys) + { + 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; +} + +CIM_LogicalFile* getFile(const char* path) +{ + struct stat st; + if (lstat(path, &st) != 0) + { + return NULL; + } + omcFileKeys* keys = omcGetKeysForFileStat(path, &st); + if (keys == NULL) + { + return NULL; + } + + CIM_LogicalFile* rval = NULL; + if (S_ISREG(st.st_mode)) + { + 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); + } else if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) + { + OMC_LinuxDeviceFile* dev = OMC_LinuxDeviceFile::create(); + if (S_ISCHR(st.st_mode)) + { + dev->DeviceFileType.value = dev->DeviceFileType.enum_Character; + } + else + { + 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); + } else if (S_ISFIFO(st.st_mode)) + { + 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); + if (rrdlnk != -1) + { + link->TargetFile.value = buf; + } + rval = cast<CIM_LogicalFile*>(link); + } else + { + 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->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 = ; + + return rval; +} + +CIMPLE_NAMESPACE_END + Added: cmpibase/trunk/src/providers/logical-file/FilesCommon.hpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/FilesCommon.hpp (rev 0) +++ cmpibase/trunk/src/providers/logical-file/FilesCommon.hpp 2007-02-09 01:31:11 UTC (rev 435) @@ -0,0 +1,16 @@ +#ifndef OMC_FilesCommon_hpp_include_guard__ +#define OMC_FilesCommon_hpp_include_guard__ + +#include "CIM_LogicalFile.h" +#include "OMC_LinuxFile.h" + +CIMPLE_NAMESPACE_BEGIN + +#define PWENT_GRPENT_BUF_SIZE 1024 + +CIM_LogicalFile* getFile(const char* path); +OMC_LinuxFile* getLinuxFile(const char* path); + +CIMPLE_NAMESPACE_END + +#endif // #ifndef OMC_FilesCommon_hpp_include_guard__ Added: cmpibase/trunk/src/providers/logical-file/Makefile.am =================================================================== --- cmpibase/trunk/src/providers/logical-file/Makefile.am (rev 0) +++ cmpibase/trunk/src/providers/logical-file/Makefile.am 2007-02-09 01:31:11 UTC (rev 435) @@ -0,0 +1,76 @@ +SUBDIRS = schema + +lib_LTLIBRARIES = libOMC_FilesCommon.la + +provider_LTLIBRARIES = \ + libCIM_LogicalFile_Provider.la \ + libOMC_LinuxDirectoryContainsFile_Provider.la \ + libOMC_LinuxFileIdentity_Provider.la \ + libOMC_LinuxFile_Provider.la + +providerdir = ${libdir}/cmpi + +CIMPLE_ADAPTERS = -lcimplecmpiadap +if USE_CIMPLE_OW_ADAPTER + CIMPLE_ADAPTERS += -lcimpleowadap +endif + +libCIM_LogicalFile_Provider_la_LIBADD = \ + libOMC_FilesCommon.la \ + ${CIMPLE_ADAPTERS} \ + schema/libOMC_File_Schema.la +libOMC_LinuxFile_Provider_la_LIBADD = \ + libOMC_FilesCommon.la \ + ${CIMPLE_ADAPTERS} \ + schema/libOMC_File_Schema.la +libOMC_LinuxFileIdentity_Provider_la_LIBADD = \ + libOMC_FilesCommon.la \ + ${CIMPLE_ADAPTERS} \ + schema/libOMC_File_Schema.la +libOMC_LinuxDirectoryContainsFile_Provider_la_LIBADD = \ + libOMC_FilesCommon.la \ + ${CIMPLE_ADAPTERS} \ + schema/libOMC_File_Schema.la + +libOMC_FilesCommon_la_LIBADD = \ + schema/libOMC_File_Schema.la \ + ${top_builddir}/src/lib/omc/libomc_cbase.la + + +INCLUDES = -I${srcdir}/schema -I${top_srcdir}/src/include -I${top_srcdir} + +libOMC_FilesCommon_la_SOURCES = \ +FilesCommon.cpp \ +FilesCommon.hpp + +libOMC_LinuxFile_Provider_la_SOURCES = \ +OMC_LinuxFile_Provider.cpp \ +OMC_LinuxFile_Provider.h \ +OMC_LinuxFile_Provider_module.cpp + +libOMC_LinuxDirectoryContainsFile_Provider_la_SOURCES = \ +OMC_LinuxDirectoryContainsFile_Provider.cpp \ +OMC_LinuxDirectoryContainsFile_Provider.h \ +OMC_LinuxDirectoryContainsFile_Provider_module.cpp + +libOMC_LinuxFileIdentity_Provider_la_SOURCES = \ +OMC_LinuxFileIdentity_Provider.cpp \ +OMC_LinuxFileIdentity_Provider.h \ +OMC_LinuxFileIdentity_Provider_module.cpp + +libCIM_LogicalFile_Provider_la_SOURCES = \ +CIM_LogicalFile_Provider.cpp \ +CIM_LogicalFile_Provider.h \ +CIM_LogicalFile_Provider_module.cpp + +stubs : classes + export CIMPLE_MOF_PATH=/usr/share/mof/cim-current && \ + genprov -M omc-logical-file.mof -m CIM_LogicalFile && \ + mv module.cpp CIM_LogicalFile_Provider_module.cpp && \ + genprov -M omc-logical-file.mof -m OMC_LinuxDirectoryContainsFile && \ + mv module.cpp OMC_LinuxDirectoryContainsFile_Provider_module.cpp && \ + genprov -M omc-logical-file.mof -m OMC_LinuxFileIdentity && \ + mv module.cpp OMC_LinuxFileIdentity_Provider_module.cpp && \ + genprov -M omc-logical-file.mof -m OMC_LinuxFile && \ + mv module.cpp OMC_LinuxFile_Provider_module.cpp + Added: cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.cpp =================================================================== --- cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.cpp (rev 0) +++ cmpibase/trunk/src/providers/logical-file/OMC_LinuxDirectoryContainsFile_Provider.cpp 2007-02-09 01:31:11 UTC (rev 435) @@ -0,0 +1,256 @@ +/******************************************************************************* +* Copyright (C) 2005, 2006 Novell, Inc. All rights reserved. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* - Redistributions of source code must retain the above copyright notice, +* this list of conditions and the following disclaimer. +* +* - Redistributions in binary form must reproduce the above copyright notice, +* this list of conditions and the following disclaimer in the documentation +* and/or other materials provided with the distribution. +* +* - Neither the name of Novell, Inc. nor the names of its +* contributors may be used to endorse or promote products derived from this +* software without specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL Novell, Inc. OR THE CONTRIBUTORS +* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +* POSSIBILITY OF SUCH DAMAGE. +* +******************************************************************************/ +#include "OMC_LinuxDirectoryContainsFile_Provider.h" +#include "OMC_LinuxDirectory.h" +#include "CIM_LogicalFile.h" +#include "omc/fileTools.h" +#include "FilesCommon.hpp" +#include <sys/types.h> +#include <dirent.h> + +CIMPLE_NAMESPACE_BEGIN + +#if 0 +# define TRACE CIMPLE_TRACE +#else +# define TRACE +#endif + +OMC_LinuxDirectoryContainsFile_Provider::OMC_LinuxDirectoryContainsFile_Provider() +{ +} + +OMC_LinuxDirectoryContainsFile_Provider::~OMC_LinuxDirectoryContainsFile_Provider() +{ +} + +Load_Status OMC_LinuxDirectoryContainsFile_Provider::load() +{ + return LOAD_OK; +} + +Unload_Status OMC_LinuxDirectoryContainsFile_Provider::unload() +{ + return UNLOAD_OK; +} + +Get_Instance_Status OMC_LinuxDirectoryContainsFile_Provider::get_instance( + const OMC_LinuxDirectoryContainsFile* model, + OMC_LinuxDirectoryContainsFile*& instance) +{ + instance = model->clone(); + return GET_INSTANCE_OK; +} + +Enum_Instances_Status OMC_LinuxDirectoryContainsFile_Provider::enum_instances( + const OMC_LinuxDirectoryContainsFile* model, + Enum_Instances_Handler<OMC_LinuxDirectoryContainsFile>* handler) +{ + return ENUM_INSTANCES_OK; +} + +Create_Instance_Status OMC_LinuxDirectoryContainsFile_Provider::create_instance( + const OMC_LinuxDirectoryContainsFile* instance) +{ + return CREATE_INSTANCE_UNSUPPORTED; +} + +Delete_Instance_Status OMC_LinuxDirectoryContainsFile_Provider::delete_instance( + const OMC_LinuxDirectoryContainsFile* instance) +{ + return DELETE_INSTANCE_UNSUPPORTED; +} + +Modify_Instance_Status OMC_LinuxDirectoryContainsFile_Provider::modify_instance( + const OMC_LinuxDirectoryContainsFile* instance) +{ + return MODIFY_INSTANCE_UNSUPPORTED; +} + +Enum_Associator_Names_Status OMC_LinuxDirectoryContainsFile_Provider::enum_associator_names( + const Instance* instance, + const String& result_class, + const String& role, + const String& result_role, + Enum_Associator_Names_Handler<Instance>* handler) +{ + 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); + } + 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; + if (eqi(dirc->CreationClassName.value, "OMC_LinuxDirectory")) + { + 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] != '/') + { + TRACE; + prefix.append('/'); + } + TRACE; + for (pDent = readdir(pDir); pDent != 0; pDent = readdir(pDir)) + { + String curName = pDent->d_name; + if (curName.equal(".") or curName.equal("..")) + { + continue; + } + String fullName = prefix; + fullName.append(curName); + CIM_LogicalFile* fileInDir = getFile(fullName.c_str()); + if (fileInDir) + { + TRACE; + handler->handle(fileInDir); + } + } + } + closedir(pDir); + } + } + return ENUM_ASSOCIATOR_NAMES_OK; +} + +Enum_References_Status OMC_LinuxDirectoryContainsFile_Provider::enum_references( + const Instance* instance, + const OMC_LinuxDirectoryContainsFile* model, + const String& role, + Enum_References_Handler<OMC_LinuxDirectoryContainsFile>* handler) +{ + 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); + } + 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; + if (eqi(dirc->CreationClassName.value, "OMC_LinuxDirectory")) + { + 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] != '/') + { + TRACE; + prefix.append('/'); + } + TRACE; + for (pDent = readdir(pDir); pDent != 0; pDent = readdir(pDir)) + { + String curName = pDent->d_name; + if (curName.equal(".") or curName.equal("..")) + { + continue; + } + 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); + } + } + } + closedir(pDir); + } + } + return ENUM_REFERENCES_OK; +} + +int OMC_LinuxDirectoryContainsFile_Provider::proc( + const Registration* registration, + 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 + // GENERATED. + + typedef OMC_LinuxDirectoryContainsFile Class; + typedef OMC_LinuxDirectoryContainsFile_Provider Provider; + return Association_Provider_Proc_T<Provider>::proc(registration, + operation, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7); +} + +CIMPLE_NAMESPACE_END Added... [truncated message content] |
From: <np...@us...> - 2007-02-01 17:59:15
|
Revision: 434 http://svn.sourceforge.net/omc/?rev=434&view=rev Author: npaxton Date: 2007-02-01 09:59:16 -0800 (Thu, 01 Feb 2007) Log Message: ----------- Change CIM_SoftwareIdentityCollection to CIM_SystemSpecificCollection: SoftwareIdentityCollection was removed from the cimv2.14 exp. schema. All refs to it revert back to CIM_SystemSpecificCollection Modified Paths: -------------- smash/trunk/src/providers/firmware-inventory-profile/HostedFirmwareCollection.cpp smash/trunk/src/providers/firmware-inventory-profile/RegisteredFirmwareInvProfile.cpp Modified: smash/trunk/src/providers/firmware-inventory-profile/HostedFirmwareCollection.cpp =================================================================== --- smash/trunk/src/providers/firmware-inventory-profile/HostedFirmwareCollection.cpp 2007-02-01 17:58:54 UTC (rev 433) +++ smash/trunk/src/providers/firmware-inventory-profile/HostedFirmwareCollection.cpp 2007-02-01 17:59:16 UTC (rev 434) @@ -179,11 +179,14 @@ } else { - // If this is the CIM_SoftwareIdentityCollection or one + // If this is the CIM_SystemSpecificCollection or one // of it's base classes, then do all // OMC_XXXFirmwareIdentityCollection classes + // NOTE: This was previously CIM_SoftwareIdentityCollection, but that class + // was removed from the cim experimental schema in cim v 2.14. All refs to + // that class revert back to parent class: CIM_SystemSpecificCollection if (!OMC::CIMUtils::classIsDerivedFrom( - "CIM_SoftwareIdentityCollection", resultClass, + "CIM_SystemSpecificCollection", resultClass, env->getCIMOMHandle(), ns)) { return; Modified: smash/trunk/src/providers/firmware-inventory-profile/RegisteredFirmwareInvProfile.cpp =================================================================== --- smash/trunk/src/providers/firmware-inventory-profile/RegisteredFirmwareInvProfile.cpp 2007-02-01 17:58:54 UTC (rev 433) +++ smash/trunk/src/providers/firmware-inventory-profile/RegisteredFirmwareInvProfile.cpp 2007-02-01 17:59:16 UTC (rev 434) @@ -211,11 +211,14 @@ } else { - // If this is the CIM_SoftwareIdentityCollection or one + // If this is the CIM_SystemSpecificCollection or one // of it's base classes, then do all // OMC_XXXFirmwareIdentityCollection classes + // NOTE: This was previously CIM_SoftwareIdentityCollection, but that class + // was removed from the cim experimental schema in cim v 2.14. All refs to + // that class revert back to parent class: CIM_SystemSpecificCollection if (!OMC::CIMUtils::classIsDerivedFrom( - "CIM_SoftwareIdentityCollection", resultClass, + "CIM_SystemSpecificCollection", resultClass, env->getCIMOMHandle(), ns)) { return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <np...@us...> - 2007-02-01 17:59:01
|
Revision: 433 http://svn.sourceforge.net/omc/?rev=433&view=rev Author: npaxton Date: 2007-02-01 09:58:54 -0800 (Thu, 01 Feb 2007) Log Message: ----------- Change CIM_SoftwareIdentityCollection to CIM_SystemSpecificCollection: SoftwareIdentityCollection was removed from the cimv2.14 exp. schema. All refs to it revert back to CIM_SystemSpecificCollection Modified Paths: -------------- schema/trunk/mof/smash/omc-firmware-inventory-profile.mof Modified: schema/trunk/mof/smash/omc-firmware-inventory-profile.mof =================================================================== --- schema/trunk/mof/smash/omc-firmware-inventory-profile.mof 2007-02-01 17:55:26 UTC (rev 432) +++ schema/trunk/mof/smash/omc-firmware-inventory-profile.mof 2007-02-01 17:58:54 UTC (rev 433) @@ -14,8 +14,12 @@ Description ( "SoftwareIdentityCollection for installed firmware") ] class OMC_InstalledFirmwareIdentityCollection - : CIM_SoftwareIdentityCollection -{ + : CIM_SystemSpecificCollection + // NOTE: This was previously CIM_SoftwareIdentityCollection, but + // that class was removed from the cimv2.14 exp version of the + // schema. All refs to SoftwareIdentityCollection revert back + // to CIM_SystemSpecificCollection +{ }; // ================================================================== @@ -25,7 +29,11 @@ Description ( "SoftwareIdentityCollection for available firmware") ] class OMC_AvailableFirmwareIdentityCollection - : CIM_SoftwareIdentityCollection + : CIM_SystemSpecificCollection + // NOTE: This was previously CIM_SoftwareIdentityCollection, but + // that class was removed from the cimv2.14 exp version of the + // schema. All refs to SoftwareIdentityCollection revert back + // to CIM_SystemSpecificCollection { }; @@ -37,7 +45,11 @@ "SoftwareIdentityCollection for firmware images that are " "available for remote systems") ] class OMC_ServableFirmwareIdentityCollection - : CIM_SoftwareIdentityCollection + : CIM_SystemSpecificCollection + // NOTE: This was previously CIM_SoftwareIdentityCollection, but + // that class was removed from the cimv2.14 exp version of the + // schema. All refs to SoftwareIdentityCollection revert back + // to CIM_SystemSpecificCollection { }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |