Menu
▾
▴
omc-commit
|
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] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X