Menu
▾
▴
omc-commit — Mailing list for subversion commit activity
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
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
1
|
2
(1) |
3
|
4
|
5
|
6
|
7
|
|
8
|
9
|
10
|
11
|
12
|
13
|
14
|
|
15
|
16
|
17
(1) |
18
|
19
|
20
|
21
|
|
22
|
23
|
24
|
25
|
26
(2) |
27
|
28
|
|
29
|
30
(1) |
|
|
|
|
|
|
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.
|