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
|
3
|
4
|
5
|
6
|
|
7
|
8
|
9
|
10
|
11
|
12
(1) |
13
|
|
14
|
15
|
16
|
17
|
18
(2) |
19
|
20
|
|
21
|
22
|
23
|
24
|
25
|
26
|
27
|
|
28
|
29
(2) |
30
|
31
|
|
|
|
|
From: <bni...@us...> - 2007-01-29 23:32:36
|
Revision: 429
http://svn.sourceforge.net/omc/?rev=429&view=rev
Author: bnicholes
Date: 2007-01-29 15:32:37 -0800 (Mon, 29 Jan 2007)
Log Message:
-----------
Relicense the composite device provider (aka. aggregator) as BSD
Modified Paths:
--------------
LICENSE
Modified: LICENSE
===================================================================
--- LICENSE 2007-01-29 23:31:55 UTC (rev 428)
+++ LICENSE 2007-01-29 23:32:37 UTC (rev 429)
@@ -1,9 +1,8 @@
OMC is a project with many modules / sub-projects. As such it is constrained by various open-source licenses.
Primarily, license differences will occur at the sub-project level.
However, even within a project, some files may have a more restrictive license than the primary license for the project, for various reasons.
-For example, within the SMASH sub-project, which is primarily BSD license, the composite-device provider code is constrained by the GPL license.
-Likewise, in the BASE sub-project, the syslogng provider is necessarily constrained by the GPL license, as it uses GPL code from syslogng.
-This is not meant to be a complete list of license 'abnormalities', but rather just a few examples.
+For example, in the BASE sub-project, the syslogng provider is necessarily constrained by the GPL license, as it uses GPL code from syslogng.
+This is not meant to be a complete list of license 'abnormalities', but rather just an example.
If your use of the code requires such, please pay attention to the license for each file.
Below are some of the license notices you will encounter throughout the OMC project:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bni...@us...> - 2007-01-29 23:31:58
|
Revision: 428
http://svn.sourceforge.net/omc/?rev=428&view=rev
Author: bnicholes
Date: 2007-01-29 15:31:55 -0800 (Mon, 29 Jan 2007)
Log Message:
-----------
Relicense the composite device provider (aka. aggregator) as BSD
Modified Paths:
--------------
smash/branches/1.0/LICENSE
smash/branches/1.0/src/providers/device/composite-device/CompositeAssociations.cpp
smash/branches/1.0/src/providers/device/composite-device/CompositeCapabilitiesProvider.cpp
smash/branches/1.0/src/providers/device/composite-device/CompositeCapabilitiesProvider.hpp
smash/branches/1.0/src/providers/device/composite-device/CompositeDeviceProvider.cpp
smash/branches/1.0/src/providers/device/composite-device/CompositeDeviceProvider.hpp
smash/branches/1.0/src/providers/device/composite-device/CompositeMethods.cpp
smash/branches/1.0/src/providers/device/composite-device/MergeInstances.cpp
smash/branches/1.0/src/providers/device/composite-device/MergeInstances.hpp
smash/branches/1.0/src/providers/device/composite-device/ResultHandlers.cpp
smash/branches/1.0/src/providers/device/composite-device/ResultHandlers.hpp
smash/trunk/LICENSE
smash/trunk/src/providers/device/composite-device/CompositeAssociations.cpp
smash/trunk/src/providers/device/composite-device/CompositeCapabilitiesProvider.cpp
smash/trunk/src/providers/device/composite-device/CompositeCapabilitiesProvider.hpp
smash/trunk/src/providers/device/composite-device/CompositeDeviceProvider.cpp
smash/trunk/src/providers/device/composite-device/CompositeDeviceProvider.hpp
smash/trunk/src/providers/device/composite-device/CompositeMethods.cpp
smash/trunk/src/providers/device/composite-device/MergeInstances.cpp
smash/trunk/src/providers/device/composite-device/MergeInstances.hpp
smash/trunk/src/providers/device/composite-device/ResultHandlers.cpp
smash/trunk/src/providers/device/composite-device/ResultHandlers.hpp
Modified: smash/branches/1.0/LICENSE
===================================================================
--- smash/branches/1.0/LICENSE 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/branches/1.0/LICENSE 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,6 +1,4 @@
OMC-Smash is primarily BSD.
-However, within this project, some files have a more restrictive license (GPL).
-* Composite-Device Provider Code
Please pay attention to the license for each file.
Modified: smash/branches/1.0/src/providers/device/composite-device/CompositeAssociations.cpp
===================================================================
--- smash/branches/1.0/src/providers/device/composite-device/CompositeAssociations.cpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/branches/1.0/src/providers/device/composite-device/CompositeAssociations.cpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#include <openwbem/OW_CppSimpleAssociatorProviderIFC.hpp>
#include <openwbem/OW_CIMValue.hpp>
Modified: smash/branches/1.0/src/providers/device/composite-device/CompositeCapabilitiesProvider.cpp
===================================================================
--- smash/branches/1.0/src/providers/device/composite-device/CompositeCapabilitiesProvider.cpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/branches/1.0/src/providers/device/composite-device/CompositeCapabilitiesProvider.cpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#include <config.h>
#include <openwbem/OW_Format.hpp>
Modified: smash/branches/1.0/src/providers/device/composite-device/CompositeCapabilitiesProvider.hpp
===================================================================
--- smash/branches/1.0/src/providers/device/composite-device/CompositeCapabilitiesProvider.hpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/branches/1.0/src/providers/device/composite-device/CompositeCapabilitiesProvider.hpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#ifndef COMPOSITECAPABILITIESPROVIDER_HPP_GUARD
#define COMPOSITECAPABILITIESPROVIDER_HPP_GUARD
Modified: smash/branches/1.0/src/providers/device/composite-device/CompositeDeviceProvider.cpp
===================================================================
--- smash/branches/1.0/src/providers/device/composite-device/CompositeDeviceProvider.cpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/branches/1.0/src/providers/device/composite-device/CompositeDeviceProvider.cpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#include <config.h>
#include <openwbem/OW_Format.hpp>
Modified: smash/branches/1.0/src/providers/device/composite-device/CompositeDeviceProvider.hpp
===================================================================
--- smash/branches/1.0/src/providers/device/composite-device/CompositeDeviceProvider.hpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/branches/1.0/src/providers/device/composite-device/CompositeDeviceProvider.hpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#ifndef COMPOSITEPROVIDER_HPP_GUARD
#define COMPOSITEPROVIDER_HPP_GUARD
Modified: smash/branches/1.0/src/providers/device/composite-device/CompositeMethods.cpp
===================================================================
--- smash/branches/1.0/src/providers/device/composite-device/CompositeMethods.cpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/branches/1.0/src/providers/device/composite-device/CompositeMethods.cpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#include <openwbem/OW_CppMethodProviderIFC.hpp>
#include <openwbem/OW_CIMValue.hpp>
#include <openwbem/OW_Format.hpp>
Modified: smash/branches/1.0/src/providers/device/composite-device/MergeInstances.cpp
===================================================================
--- smash/branches/1.0/src/providers/device/composite-device/MergeInstances.cpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/branches/1.0/src/providers/device/composite-device/MergeInstances.cpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#include <config.h>
Modified: smash/branches/1.0/src/providers/device/composite-device/MergeInstances.hpp
===================================================================
--- smash/branches/1.0/src/providers/device/composite-device/MergeInstances.hpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/branches/1.0/src/providers/device/composite-device/MergeInstances.hpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#ifndef MERGE_INSTANCES_HPP_GUARD
#define MERGE_INSTANCES_HPP_GUARD
Modified: smash/branches/1.0/src/providers/device/composite-device/ResultHandlers.cpp
===================================================================
--- smash/branches/1.0/src/providers/device/composite-device/ResultHandlers.cpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/branches/1.0/src/providers/device/composite-device/ResultHandlers.cpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#include <config.h>
Modified: smash/branches/1.0/src/providers/device/composite-device/ResultHandlers.hpp
===================================================================
--- smash/branches/1.0/src/providers/device/composite-device/ResultHandlers.hpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/branches/1.0/src/providers/device/composite-device/ResultHandlers.hpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#ifndef RESULTHANDLERS_HPP_GUARD
#define RESULTHANDLERS_HPP_GUARD
Modified: smash/trunk/LICENSE
===================================================================
--- smash/trunk/LICENSE 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/trunk/LICENSE 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,6 +1,4 @@
OMC-Smash is primarily BSD.
-However, within this project, some files have a more restrictive license (GPL).
-* Composite-Device Provider Code
Please pay attention to the license for each file.
Modified: smash/trunk/src/providers/device/composite-device/CompositeAssociations.cpp
===================================================================
--- smash/trunk/src/providers/device/composite-device/CompositeAssociations.cpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/trunk/src/providers/device/composite-device/CompositeAssociations.cpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#include <openwbem/OW_CppSimpleAssociatorProviderIFC.hpp>
#include <openwbem/OW_CIMValue.hpp>
Modified: smash/trunk/src/providers/device/composite-device/CompositeCapabilitiesProvider.cpp
===================================================================
--- smash/trunk/src/providers/device/composite-device/CompositeCapabilitiesProvider.cpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/trunk/src/providers/device/composite-device/CompositeCapabilitiesProvider.cpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#include <config.h>
#include <openwbem/OW_Format.hpp>
Modified: smash/trunk/src/providers/device/composite-device/CompositeCapabilitiesProvider.hpp
===================================================================
--- smash/trunk/src/providers/device/composite-device/CompositeCapabilitiesProvider.hpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/trunk/src/providers/device/composite-device/CompositeCapabilitiesProvider.hpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#ifndef COMPOSITECAPABILITIESPROVIDER_HPP_GUARD
#define COMPOSITECAPABILITIESPROVIDER_HPP_GUARD
Modified: smash/trunk/src/providers/device/composite-device/CompositeDeviceProvider.cpp
===================================================================
--- smash/trunk/src/providers/device/composite-device/CompositeDeviceProvider.cpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/trunk/src/providers/device/composite-device/CompositeDeviceProvider.cpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#include <config.h>
#include <openwbem/OW_Format.hpp>
Modified: smash/trunk/src/providers/device/composite-device/CompositeDeviceProvider.hpp
===================================================================
--- smash/trunk/src/providers/device/composite-device/CompositeDeviceProvider.hpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/trunk/src/providers/device/composite-device/CompositeDeviceProvider.hpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#ifndef COMPOSITEPROVIDER_HPP_GUARD
#define COMPOSITEPROVIDER_HPP_GUARD
Modified: smash/trunk/src/providers/device/composite-device/CompositeMethods.cpp
===================================================================
--- smash/trunk/src/providers/device/composite-device/CompositeMethods.cpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/trunk/src/providers/device/composite-device/CompositeMethods.cpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#include <openwbem/OW_CppMethodProviderIFC.hpp>
#include <openwbem/OW_CIMValue.hpp>
#include <openwbem/OW_Format.hpp>
Modified: smash/trunk/src/providers/device/composite-device/MergeInstances.cpp
===================================================================
--- smash/trunk/src/providers/device/composite-device/MergeInstances.cpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/trunk/src/providers/device/composite-device/MergeInstances.cpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#include <config.h>
Modified: smash/trunk/src/providers/device/composite-device/MergeInstances.hpp
===================================================================
--- smash/trunk/src/providers/device/composite-device/MergeInstances.hpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/trunk/src/providers/device/composite-device/MergeInstances.hpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electronic mail,
-* you may find current contact information at www.novell.com
-****************************************************************************/
+* - Neither the name of 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.
+******************************************************************************/
#ifndef MERGE_INSTANCES_HPP_GUARD
#define MERGE_INSTANCES_HPP_GUARD
Modified: smash/trunk/src/providers/device/composite-device/ResultHandlers.cpp
===================================================================
--- smash/trunk/src/providers/device/composite-device/ResultHandlers.cpp 2007-01-18 01:17:01 UTC (rev 427)
+++ smash/trunk/src/providers/device/composite-device/ResultHandlers.cpp 2007-01-29 23:31:55 UTC (rev 428)
@@ -1,22 +1,33 @@
-/****************************************************************************
-* Copyright (c) 2005,2006 Novell, Inc.
-* All Rights Reserved.
+/******************************************************************************
+* Copyright (c) 2005,2006, 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.
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
*
-* 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.
+* - Redistributions of source code must retain the above copyright notice,
+* this list of conditions and the following disclaimer.
*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, contact Novell, Inc.
+* - 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.
*
-* To contact Novell about this file by physical or electron...
[truncated message content] |
|
From: <ba...@us...> - 2007-01-18 01:17:01
|
Revision: 427
http://svn.sourceforge.net/omc/?rev=427&view=rev
Author: bartw
Date: 2007-01-17 17:17:01 -0800 (Wed, 17 Jan 2007)
Log Message:
-----------
removed xml service schema
Modified Paths:
--------------
schema/branches/1.0/mof/base/omc-base-providers.mof
Removed Paths:
-------------
schema/branches/1.0/mof/base/omc-xml-service.mof
Modified: schema/branches/1.0/mof/base/omc-base-providers.mof
===================================================================
--- schema/branches/1.0/mof/base/omc-base-providers.mof 2007-01-18 01:15:58 UTC (rev 426)
+++ schema/branches/1.0/mof/base/omc-base-providers.mof 2007-01-18 01:17:01 UTC (rev 427)
@@ -7,4 +7,3 @@
#pragma include ("omc-time-service.mof")
#pragma include ("omc-initd.mof")
#pragma include ("omc-syslog-ng.mof")
-#pragma include ("omc-xml-service.mof")
Deleted: schema/branches/1.0/mof/base/omc-xml-service.mof
===================================================================
--- schema/branches/1.0/mof/base/omc-xml-service.mof 2007-01-18 01:15:58 UTC (rev 426)
+++ schema/branches/1.0/mof/base/omc-xml-service.mof 2007-01-18 01:17:01 UTC (rev 427)
@@ -1,282 +0,0 @@
-#pragma locale ("en_US")
-
-// ==================================================================
-// OMC_ServiceFromXML
-// ==================================================================
-[ Description("The OMC_ServiceFromXML class represents a service "
- "that is instrumented by the XML service provider") ]
-class OMC_ServiceFromXML : CIM_Service
-{
- [ Description("HealthPollingInterval specifies how often the "
- "XML Service provider will check the health of the service"),
- Units("Seconds") ]
- uint64 HealthPollingInterval;
-
- [ Description("RequiredBadHits specifies the number of times "
- "a service must report a unhealthy status at poll time "
- "before an indication is generated. If this property is "
- "not specified the value of 3 is assumed") ]
- uint32 RequiredBadHits = 3;
-
- [ Description ("The BadHealthActions property holds the actions that must "
- "be performed when the HealthState property for this service reaches "
- "a degraded(10) or major failure(20) state. The only actions that can "
- "be performed are stop and re-start. The property is an array of 2 "
- "elements with the elements corresponding to the HealthState "
- "property as follows:\n"
- "Index 0 = Action to perform for degraded state(HealthState==10)\n"
- "Index 1 = Action to perform for major failure state(HealthState==20\n"
- "The value for each one of the elements can be as follows:\n"
- "0 = Do nothing\n"
- "1 = Restart the service\n"
- "2 = Stop the service"),
- ValueMap { 0, 1, 2 },
- Values{ "No Action", "Restart", "Stop" },
- ArrayType ("Indexed"),
- ModelCorrespondence { "CIM_ManagedSystemElement.HealthState" } ]
-
- uint16 BadHealthActions[];
-};
-
-// ==================================================================
-// OMC_ServiceFromXMLConfigTool
-// ==================================================================
-class OMC_ServiceFromXMLConfigTool
-{
- [ Key, Propagated("OMC_ServiceFromXML.Name"),
- Description("This is the name of the service that configuration "
- "tool is used for") ]
- string ServiceName;
-
- [ Key, Description("The TaskName property provides a short name for the "
- "task this configuration tool is used for") ]
- string TaskName;
-
- [ Description("The Description property provides discriptive test "
- "about this task/configuration tool") ]
- string Description;
-
- [ Required, Description("The Type property specifies what type of "
- "access is needed to use the configuration tool") ]
- string Type;
-
- [ Required, Description("The Uri property provides the addressing "
- "information needed to access the configuration tool") ]
- String Uri;
-};
-
-// ==================================================================
-// OMC_ServiceHealthData
-// ==================================================================
-[ Description("The OMC_ServiceHealthData class represents a single health "
- "data item for a service") ]
-class OMC_ServiceHealthData
-{
- [ Key, Propagated("OMC_ServiceFromXML.Name"),
- Description("This is the name of the service that this health data "
- "belongs to.") ]
- string ServiceName;
-
- [ Key, Description("The name of the health data being reported by "
- "the service") ]
- string DataName;
-
- [ Description("Free form text that describes this health data") ]
- string Description;
-
- [ Description ("The information in the DataValue property and any "
- "of the thresholds is presented as string data. However the "
- "appropriate datatype for this information may be something "
- "else (e.g. signed 32 bit integer). Knowledge of the appropriate "
- "data type may be needed for comparison when processing "
- "thresholds."),
- ValueMap { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 },
- Values{ "Unknown", "String", "Unsigned 8 bit", "Signed 8 bit",
- "Unsigned 16 bit", "Signed 16 bit", "Unsigned 32 bit",
- "Signed 32 bit", "Unsigned 64 bit", "Signed 64 bit",
- "Real 32 bit", "Real 64 bit" } ]
- uint16 DataType;
-
- [ Description("The value of the health data specified by DataName "
- "for the service") ]
- string DataValue;
-
- [ ArrayType ("Indexed"),
- Description("These are the default thresholds that have been set by "
- "the service provider. They are used if the actual thresholds "
- "have not been set by the administrator. This is an array of "
- "six elements with each element representing a certain "
- "threshold. The array is ordered as follows:\n"
- "0 = Lower Fatal threshold\n"
- "1 = Lower Critical threshold\n"
- "2 = Lower Non-Critical threshold\n"
- "3 = Upper Non-Critical threshold\n"
- "4 = Upper Critical threshold\n"
- "5 = Upper Fatal threshold\n"
- "Each element is the string representation of that threshold "
- "value."),
- ModelCorrespondence {
- "OMC_ServiceHealthData.DataType",
- "OMC_ServiceHealthData.DataValue" } ]
- string DefaultThresholds[];
-
- [ Write, ArrayType ("Indexed"),
- Description("These are the thresholds specified by the administrator "
- "If they are present, the DefaultThresholds are ignored."
- "This is an array of six elements with each element representing "
- "a certain threshold. The array is ordered as follows:\n"
- "0 = Lower Fatal threshold\n"
- "1 = Lower Critical threshold\n"
- "2 = Lower Non-Critical threshold\n"
- "3 = Upper Non-Critical threshold\n"
- "4 = Upper Critical threshold\n"
- "5 = Upper Fatal threshold\n"
- "Each element is the string representation of that threshold "
- "value."),
- ModelCorrespondence {
- "OMC_ServiceHealthData.DataType",
- "OMC_ServiceHealthData.DataValue" } ]
- string ActualThresholds[];
-
- [ Description("The health state the value of the health item "
- "represents"),
- ValueMap { "0", "5", "10", "20" },
- Values { "Unknown", "OK", "Degraded/Warning",
- "Major failure" } ]
- uint16 HealthState;
-};
-
-// ==================================================================
-// OMC_AssociatedConfigTool
-// ==================================================================
-[ Association, Version ( "0.0.1" ),
- Description ("The AssociatedConfigTool association related the "
- "service to its configuration tools") ]
-class OMC_AssociatedConfigTool
-{
- [ Key, Min(1), Max(1), Description("The service the health "
- "data belongs to") ]
- OMC_ServiceFromXML REF Service;
-
- [ Key, Description("A configuration tool object for the service") ]
- OMC_ServiceFromXMLConfigTool REF ConfigTool;
-};
-
-// ==================================================================
-// OMC_AssociatedHealthData
-// ==================================================================
-[ Association, Version ( "0.0.1" ),
- Description ("The AssociatedHealthData association related the "
- "ServiceHealthData objects with the ServiceFromXML "
- "objects") ]
-class OMC_AssociatedHealthData
-{
- [ Key, Min(1), Max(1), Description("The service the health "
- "data belongs to") ]
- OMC_ServiceFromXML REF Service;
-
- [ Key, Description("A health data object for the service") ]
- OMC_ServiceHealthData REF HealthData;
-};
-
-// ==================================================================
-// OMC_XMLServiceProcess
-// ==================================================================
-[ Association, Version ( "0.0.1" ),
- Description ("The XMLService process relates a service "
- "to its processes") ]
-class OMC_XMLServiceProcess : CIM_ServiceProcess
-{
- [ Override("Service"), Key, Description("The ServiceFromXML "
- "that is associated to a process.") ]
- OMC_ServiceFromXML REF Service;
-
- [ Override("Process"), Key, Description("The process that "
- "the XMLService is running in.") ]
- OMC_UnixProcess REF Process;
-};
-
-// ==================================================================
-// OMC_HostedXMLService
-// ==================================================================
-[ Association, Version ( "0.0.1" ),
- Description ("The HostedXMLService relates the service to "
- "the computer system it is running on") ]
-class OMC_HostedXMLService : CIM_HostedService
-{
- [ Override("Antecedent"), Key, Description("The computer system "
- "that hosts the service") ]
- OMC_UnitaryComputerSystem REF Antecedent;
-
- [ Override("Dependent"), Key, Description("The service that is hosted "
- "on the computer system.") ]
- OMC_ServiceFromXML REF Dependent;
-};
-
-// ==================================================================
-// OMC_XMLServiceServiceDependency
-// ==================================================================
-[ Association, Description("OMC_XMLServiceServiceDependency "
- "represents the relationship of one OMC_ServiceFromXML "
- "depending on another") ]
-class OMC_XMLServiceServiceDependency : CIM_ServiceServiceDependency
-{
- [Override ( "Antecedent" ), Description (
- "The required Service.")]
- OMC_ServiceFromXML REF Antecedent;
-
- [Override ( "Dependent" ), Description (
- "The Service that is dependent on an underlying Service.")]
- OMC_ServiceFromXML REF Dependent;
-};
-
-// ==================================================================
-// OMC_XMLServiceHealthAlert
-// ==================================================================
-[ Indication,
- Description("The alert that goes out when health data exceeds the "
- "critical or fatal thresholds") ]
-class OMC_XMLServiceHealthAlert : CIM_AlertIndication
-{
- [ Description("The name of the service the alert is for."
- "This is one of the keys to the OMC_ServiceHealthData object") ]
- string ServiceName;
-
- [ Description("The name of the health data item that has exceeded "
- "the critical or fatal threshold. This is one of the keys to the "
- "OMC_ServiceHealthData object") ]
- string HealthDataItemName;
-
- [ Description("The current value of the item specified in by the "
- "HealthDataitemName property") ]
- string CurrentValue;
-
- [ Description ("The information in the CurrentValue property and any "
- "of the thresholds is presented as string data. However the "
- "appropriate datatype for this information may be something "
- "else (e.g. signed 32 bit integer). Knowledge of the appropriate "
- "data type may be needed for comparison when processing "
- "thresholds."),
- ValueMap { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 },
- Values{ "Unknown", "String", "Unsigned 8 bit", "Signed 8 bit",
- "Unsigned 16 bit", "Signed 16 bit", "Unsigned 32 bit",
- "Signed 32 bit", "Unsigned 64 bit", "Signed 64 bit",
- "Real 32 bit", "Real 64 bit" } ]
- uint16 DataType;
-
- [ Description("The threshold the current value has exceeded"),
- ValueMap { 0, 1, 2, 3, 4, 5 },
- Values{ "Lower Fatal", "Lower Critical", "Lower Non-Critical",
- "Upper Fatal", "Upper Critical", "Upper Non-Critical" } ]
- uint16 ThresholdType;
-
- [ Description("The value of the threshold that has been exceeded") ]
- string ThresholdValue;
-
- [ Description("The health state the ThresholdValue represents"),
- ValueMap { "0", "5", "10", "20" },
- Values { "Unknown", "OK", "Degraded/Warning",
- "Major failure" } ]
- uint16 HealthState;
-};
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2007-01-18 01:16:01
|
Revision: 426
http://svn.sourceforge.net/omc/?rev=426&view=rev
Author: bartw
Date: 2007-01-17 17:15:58 -0800 (Wed, 17 Jan 2007)
Log Message:
-----------
removed xml service provider
Modified Paths:
--------------
base/branches/1.0/configure.ac
base/branches/1.0/src/providers/Makefile.am
Removed Paths:
-------------
base/branches/1.0/src/providers/xml-service/
Modified: base/branches/1.0/configure.ac
===================================================================
--- base/branches/1.0/configure.ac 2007-01-12 00:35:28 UTC (rev 425)
+++ base/branches/1.0/configure.ac 2007-01-18 01:15:58 UTC (rev 426)
@@ -186,7 +186,6 @@
src/providers/time-service/Makefile
src/providers/initd/Makefile
src/providers/syslog/Makefile
- src/providers/xml-service/Makefile
test/Makefile
test/unit/Makefile
])
Modified: base/branches/1.0/src/providers/Makefile.am
===================================================================
--- base/branches/1.0/src/providers/Makefile.am 2007-01-12 00:35:28 UTC (rev 425)
+++ base/branches/1.0/src/providers/Makefile.am 2007-01-18 01:15:58 UTC (rev 426)
@@ -10,8 +10,7 @@
operating-system \
posix-file-elements \
processes \
-syslog \
-xml-service
+syslog
if DO_INITD_PROVIDER
SUBDIRS += initd
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jc...@us...> - 2007-01-12 00:35:30
|
Revision: 425
http://svn.sourceforge.net/omc/?rev=425&view=rev
Author: jcarey
Date: 2007-01-11 16:35:28 -0800 (Thu, 11 Jan 2007)
Log Message:
-----------
Changed location where the xml service provider looks for xml service description documents to %{prefix}/share/omc/svcinfo.d
Modified Paths:
--------------
contrib/xml-service-provider/trunk/configure.ac
contrib/xml-service-provider/trunk/example-services/apache/Apache.xml
contrib/xml-service-provider/trunk/openwbem-xmlservice-providers.spec
contrib/xml-service-provider/trunk/src/servicexml/XMLSvcUtils.hpp
contrib/xml-service-provider/trunk/xmlschema/xml-service-provider.xsd
Modified: contrib/xml-service-provider/trunk/configure.ac
===================================================================
--- contrib/xml-service-provider/trunk/configure.ac 2006-12-13 00:50:35 UTC (rev 424)
+++ contrib/xml-service-provider/trunk/configure.ac 2007-01-12 00:35:28 UTC (rev 425)
@@ -32,17 +32,19 @@
## It now uses compile (primarily) but still uses pre-processor for interim transition / backward compatibility
## pre-processor needs the CPPFLAGS
+if test "x$prefix" != "xNONE"; then
+ prefixDir=${prefix}
+else
+ prefixDir=${ac_default_prefix}
+fi
+AC_DEFINE_UNQUOTED(XMLSVC_PREFIX_DIR, "${prefixDir}", "Default prefix dir")
#######################################################################
# set the location of the sysconf dir
if test "x$sysconfdir" != "x\${prefix}/etc"; then
tempDir=$sysconfdir
else
- if test "x$prefix" != "xNONE"; then
- tempDir=${prefix}/etc
- else
- tempDir=${ac_default_prefix}/etc
- fi
+ tempDir=${prefixDir}/etc
fi
AC_DEFINE_UNQUOTED(XMLSVC_SYSCONF_DIR, "${tempDir}", "Default sysconfig dir")
Modified: contrib/xml-service-provider/trunk/example-services/apache/Apache.xml
===================================================================
--- contrib/xml-service-provider/trunk/example-services/apache/Apache.xml 2006-12-13 00:50:35 UTC (rev 424)
+++ contrib/xml-service-provider/trunk/example-services/apache/Apache.xml 2007-01-12 00:35:28 UTC (rev 425)
@@ -2,7 +2,7 @@
<!--
Sample Service Description XML Document.
-This file should be placed in /etc/omc/svcinfo.d
+This file should be placed in /usr/share/omc/svcinfo.d
It should be named <service name>.xml. The reason for the naming scheme,
is that other services can refer to this service in their dependency list using
the file name minus the '.xml' extension.
@@ -53,7 +53,8 @@
<!--
Define the services that this service has a dependency on.
There must be a corresponding Service Description XML file
- for the antecedent service in the /etc/omc/svcinfo.d directory.
+ for the antecedent service in the /usr/share/omc/svcinfo.d
+ directory.
-->
<dependsOn>
<serviceName>Service1-That-Apache-Depends-On</serviceName>
Modified: contrib/xml-service-provider/trunk/openwbem-xmlservice-providers.spec
===================================================================
--- contrib/xml-service-provider/trunk/openwbem-xmlservice-providers.spec 2006-12-13 00:50:35 UTC (rev 424)
+++ contrib/xml-service-provider/trunk/openwbem-xmlservice-providers.spec 2007-01-12 00:35:28 UTC (rev 425)
@@ -57,7 +57,8 @@
%{__mkdir} -p $RPM_BUILD_ROOT
# Tell 'make install' to install into the BuildRoot
make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/%{xmlsvcsysconfdir}/omc/svcinfo.d
+mkdir -p $RPM_BUILD_ROOT/%{xmlsvcprefix}/share/omc/svcinfo.d
+
MOFDIR=$RPM_BUILD_ROOT/%{xmlsvcprefix}/share/mof/%{name}
install -d $MOFDIR
install mof/*.mof $MOFDIR/
@@ -102,8 +103,9 @@
%{xmlsvcprefix}/%_lib/lib*.so*
%dir %{xmlsvcprefix}/share/mof/%{name}
%{xmlsvcprefix}/share/mof/%{name}/*
-%dir %{xmlsvcsysconfdir}/omc
-%dir %{xmlsvcsysconfdir}/omc/svcinfo.d
+%dir %{xmlsvcprefix}/share/omc
+%dir %{xmlsvcprefix}/share/omc/svcinfo.d
+
%changelog -n openwbem-xmlservice-providers
Modified: contrib/xml-service-provider/trunk/src/servicexml/XMLSvcUtils.hpp
===================================================================
--- contrib/xml-service-provider/trunk/src/servicexml/XMLSvcUtils.hpp 2006-12-13 00:50:35 UTC (rev 424)
+++ contrib/xml-service-provider/trunk/src/servicexml/XMLSvcUtils.hpp 2007-01-12 00:35:28 UTC (rev 425)
@@ -41,10 +41,8 @@
return env->getLogger(COMPONENT);
}
+#define SVCINFO_DIR XMLSVC_PREFIX_DIR"/share/omc/svcinfo.d"
-//#define SVCINFO_DIR "/etc/omc/svcinfo.d"
-#define SVCINFO_DIR XMLSVC_SYSCONF_DIR"/omc/svcinfo.d"
-
// XML Tags
#define SERVICE_DESC_TAG "serviceDescription"
#define NAME_TAG "name"
Modified: contrib/xml-service-provider/trunk/xmlschema/xml-service-provider.xsd
===================================================================
--- contrib/xml-service-provider/trunk/xmlschema/xml-service-provider.xsd 2006-12-13 00:50:35 UTC (rev 424)
+++ contrib/xml-service-provider/trunk/xmlschema/xml-service-provider.xsd 2007-01-12 00:35:28 UTC (rev 425)
@@ -60,10 +60,10 @@
<xs:documentation xml:lang="en-US">
Define the services that this service has a dependency on.
There must be a corresponding Service Description XML file
- for the antecedent service in the /etc/omc/svcinfo.d directory.
+ for the antecedent service in the /usr/share/omc/svcinfo.d directory.
If serviceName is specified as "Foo", then it is assumed the
the Service Description XML document for "Foo" is contained in
- the file /etc/omc/svcinfo.d/Foo.xml.
+ the file /usr/share/omc/svcinfo.d/Foo.xml.
</xs:documentation>
</xs:annotation>
<xs:sequence>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|