From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 18 Sep 2007 20:17:18 -0000 Subject: [Cluster-devel] conga/ricci/modules/cluster ClusterConf.cpp Cl ... Message-ID: <20070918201718.30796.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: conga Changes by: rmccabe at sourceware.org 2007-09-18 20:17:16 Modified files: ricci/modules/cluster: ClusterConf.cpp ClusterConf.h ClusterModule.cpp ClusterModule.h ClusterStatus.cpp ClusterStatus.h Clusvcadm.cpp Clusvcadm.h Fence.cpp Fence.h NoServiceManager.h Virt.cpp Virt.h main.cpp Log message: Cleanup includes and license text Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterConf.cpp.diff?cvsroot=cluster&r1=1.11&r2=1.12 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterConf.h.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterModule.cpp.diff?cvsroot=cluster&r1=1.8&r2=1.9 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterModule.h.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.cpp.diff?cvsroot=cluster&r1=1.21&r2=1.22 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterStatus.h.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Clusvcadm.cpp.diff?cvsroot=cluster&r1=1.15&r2=1.16 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Clusvcadm.h.diff?cvsroot=cluster&r1=1.5&r2=1.6 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Fence.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Fence.h.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/NoServiceManager.h.diff?cvsroot=cluster&r1=1.3&r2=1.4 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Virt.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Virt.h.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/main.cpp.diff?cvsroot=cluster&r1=1.5&r2=1.6 --- conga/ricci/modules/cluster/ClusterConf.cpp 2007/08/23 15:30:27 1.11 +++ conga/ricci/modules/cluster/ClusterConf.cpp 2007/09/18 20:17:16 1.12 @@ -1,26 +1,25 @@ /* - Copyright Red Hat, Inc. 2005-2007 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - MA 02139, USA. +** Copyright (C) Red Hat, Inc. 2005-2007 +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License version 2 as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; see the file COPYING. If not, write to the +** Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +** MA 02139, USA. */ + /* * Author: Stanko Kupcevic */ - #include "ClusterConf.h" #include "utils.h" --- conga/ricci/modules/cluster/ClusterConf.h 2007/09/04 18:28:40 1.5 +++ conga/ricci/modules/cluster/ClusterConf.h 2007/09/18 20:17:16 1.6 @@ -1,28 +1,27 @@ /* - Copyright Red Hat, Inc. 2005-2007 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - MA 02139, USA. +** Copyright Red Hat, Inc. 2005-2007 +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License version 2 as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; see the file COPYING. If not, write to the +** Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +** MA 02139, USA. */ + /* * Author: Stanko Kupcevic */ - -#ifndef __CONGA_CLUSTERCONF_H -#define __CONGA_CLUSTERCONF_H +#ifndef __CONGA_MODCLUSTER_CLUSTERCONF_H +#define __CONGA_MODCLUSTER_CLUSTERCONF_H #include "XML.h" --- conga/ricci/modules/cluster/ClusterModule.cpp 2007/07/23 18:47:50 1.8 +++ conga/ricci/modules/cluster/ClusterModule.cpp 2007/09/18 20:17:16 1.9 @@ -1,21 +1,21 @@ /* - Copyright Red Hat, Inc. 2006-2007 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - MA 02139, USA. +** Copyright (C) Red Hat, Inc. 2006-2007 +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License version 2 as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; see the file COPYING. If not, write to the +** Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +** MA 02139, USA. */ + /* * Author: Stanko Kupcevic * Author: Ryan McCabe --- conga/ricci/modules/cluster/ClusterModule.h 2007/09/04 18:28:40 1.3 +++ conga/ricci/modules/cluster/ClusterModule.h 2007/09/18 20:17:16 1.4 @@ -1,28 +1,27 @@ /* - Copyright Red Hat, Inc. 2006-2007 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - MA 02139, USA. +** Copyright (C) Red Hat, Inc. 2006-2007 +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License version 2 as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; see the file COPYING. If not, write to the +** Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +** MA 02139, USA. */ + /* * Author: Stanko Kupcevic */ - -#ifndef __CONGA_CLUSTERMODULE_H -#define __CONGA_CLUSTERMODULE_H +#ifndef __CONGA_MODCLUSTER_CLUSTERMODULE_H +#define __CONGA_MODCLUSTER_CLUSTERMODULE_H #include "Module.h" --- conga/ricci/modules/cluster/ClusterStatus.cpp 2007/08/23 15:30:27 1.21 +++ conga/ricci/modules/cluster/ClusterStatus.cpp 2007/09/18 20:17:16 1.22 @@ -1,26 +1,25 @@ /* - Copyright Red Hat, Inc. 2005-2007 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - MA 02139, USA. +** Copyright (C) Red Hat, Inc. 2005-2007 +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License version 2 as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; see the file COPYING. If not, write to the +** Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +** MA 02139, USA. */ + /* * Author: Stanko Kupcevic */ - #include "ClusterStatus.h" #include "Socket.h" #include "Time.h" --- conga/ricci/modules/cluster/ClusterStatus.h 2007/09/04 18:28:40 1.6 +++ conga/ricci/modules/cluster/ClusterStatus.h 2007/09/18 20:17:16 1.7 @@ -1,28 +1,27 @@ /* - Copyright Red Hat, Inc. 2005-2007 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - MA 02139, USA. +** Copyright (C) Red Hat, Inc. 2005-2007 +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License version 2 as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; see the file COPYING. If not, write to the +** Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +** MA 02139, USA. */ + /* * Author: Stanko Kupcevic */ - -#ifndef __CONGA_CLUSTERSTATUS_H -#define __CONGA_CLUSTERSTATUS_H +#ifndef __CONGA_MODCLUSTER_CLUSTERSTATUS_H +#define __CONGA_MODCLUSTER_CLUSTERSTATUS_H #include "XML.h" --- conga/ricci/modules/cluster/Clusvcadm.cpp 2007/08/23 15:30:27 1.15 +++ conga/ricci/modules/cluster/Clusvcadm.cpp 2007/09/18 20:17:16 1.16 @@ -1,26 +1,25 @@ /* - Copyright Red Hat, Inc. 2005-2007 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - MA 02139, USA. +** Copyright (C) Red Hat, Inc. 2005-2007 +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License version 2 as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; see the file COPYING. If not, write to the +** Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +** MA 02139, USA. */ + /* * Author: Stanko Kupcevic */ - #include "Clusvcadm.h" #include "NoServiceManager.h" #include "utils.h" --- conga/ricci/modules/cluster/Clusvcadm.h 2007/09/04 18:28:40 1.5 +++ conga/ricci/modules/cluster/Clusvcadm.h 2007/09/18 20:17:16 1.6 @@ -1,27 +1,27 @@ /* - Copyright Red Hat, Inc. 2005-2007 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - MA 02139, USA. +** Copyright (C) Red Hat, Inc. 2005-2007 +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License version 2 as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; see the file COPYING. If not, write to the +** Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +** MA 02139, USA. */ + /* * Author: Stanko Kupcevic */ -#ifndef __CONGA_CLUSVCADM_H -#define __CONGA_CLUSVCADM_H +#ifndef __CONGA_MODCLUSTER_CLUSVCADM_H +#define __CONGA_MODCLUSTER_CLUSVCADM_H #include "String.h" --- conga/ricci/modules/cluster/Fence.cpp 2007/08/23 15:30:27 1.6 +++ conga/ricci/modules/cluster/Fence.cpp 2007/09/18 20:17:16 1.7 @@ -1,30 +1,28 @@ /* - Copyright Red Hat, Inc. 2005-2007 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - MA 02139, USA. +** Copyright (C) Red Hat, Inc. 2005-2007 +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License version 2 as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; see the file COPYING. If not, write to the +** Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +** MA 02139, USA. */ + /* * Author: Stanko Kupcevic */ - #include "Fence.h" #include "utils.h" - using namespace std; #define FENCE_NODE_TOOL_PATH "/sbin/fence_node" --- conga/ricci/modules/cluster/Fence.h 2007/09/04 18:28:40 1.4 +++ conga/ricci/modules/cluster/Fence.h 2007/09/18 20:17:16 1.5 @@ -1,28 +1,27 @@ /* - Copyright Red Hat, Inc. 2006-2007 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - MA 02139, USA. +** Copyright (C) Red Hat, Inc. 2006-2007 +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License version 2 as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; see the file COPYING. If not, write to the +** Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +** MA 02139, USA. */ + /* * Author: Stanko Kupcevic */ - -#ifndef __CONGA_FENCE_H -#define __CONGA_FENCE_H +#ifndef __CONGA_MODCLUSTER_FENCE_H +#define __CONGA_MODCLUSTER_FENCE_H #include "String.h" --- conga/ricci/modules/cluster/NoServiceManager.h 2007/09/04 18:28:40 1.3 +++ conga/ricci/modules/cluster/NoServiceManager.h 2007/09/18 20:17:16 1.4 @@ -1,28 +1,27 @@ /* - Copyright Red Hat, Inc. 2005-2007 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - MA 02139, USA. +** Copyright (C) Red Hat, Inc. 2005-2007 +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License version 2 as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; see the file COPYING. If not, write to the +** Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +** MA 02139, USA. */ + /* * Author: Stanko Kupcevic */ - -#ifndef __CONGA_NOSERVICEMANAGER_H -#define __CONGA_NOSERVICEMANAGER_H +#ifndef __CONGA_MODCLUSTER_NOSERVICEMANAGER_H +#define __CONGA_MODCLUSTER_NOSERVICEMANAGER_H #include "Except.h" --- conga/ricci/modules/cluster/Virt.cpp 2007/09/11 00:26:52 1.6 +++ conga/ricci/modules/cluster/Virt.cpp 2007/09/18 20:17:16 1.7 @@ -1,20 +1,19 @@ /* - Copyright Red Hat, Inc. 2006-2007 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - MA 02139, USA. +** Copyright (C) Red Hat, Inc. 2006-2007 +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License version 2 as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; see the file COPYING. If not, write to the +** Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +** MA 02139, USA. */ extern "C" { --- conga/ricci/modules/cluster/Virt.h 2007/08/23 15:30:27 1.4 +++ conga/ricci/modules/cluster/Virt.h 2007/09/18 20:17:16 1.5 @@ -1,24 +1,23 @@ /* - Copyright Red Hat, Inc. 2006-2007 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - MA 02139, USA. +** Copyright (C) Red Hat, Inc. 2006-2007 +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License version 2 as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; see the file COPYING. If not, write to the +** Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +** MA 02139, USA. */ -#ifndef __RICCI_CLUSTER_VIRT_H -#define __RICCI_CLUSTER_VIRT_H +#ifndef __CONGA_MODCLUSTER_VIRT_H +#define __CONGA_MODCLUSTER_VIRT_H #include "String.h" --- conga/ricci/modules/cluster/main.cpp 2007/08/23 15:30:27 1.5 +++ conga/ricci/modules/cluster/main.cpp 2007/09/18 20:17:16 1.6 @@ -1,21 +1,21 @@ /* - Copyright Red Hat, Inc. 2005-2007 - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 675 Mass Ave, Cambridge, - MA 02139, USA. +** Copyright (C) Red Hat, Inc. 2005-2007 +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License version 2 as +** published by the Free Software Foundation. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** You should have received a copy of the GNU General Public License +** along with this program; see the file COPYING. If not, write to the +** Free Software Foundation, Inc., 675 Mass Ave, Cambridge, +** MA 02139, USA. */ + /* * Author: Stanko Kupcevic */