Correct headers and copyrights in some XC-related .h and .c files

Some headers were missing, some did not follow PostgreSQL format.

15 files changed, 54 insertions, 47 deletions

diff --git a/src/backend/pgxc/pool/execRemote.c b/src/backend/pgxc/pool/execRemote.c
index b48f773759..ed2e841ad8 100644
--- a/src/backend/pgxc/pool/execRemote.c
+++ b/src/backend/pgxc/pool/execRemote.c
@@ -5,12 +5,12 @@
  *	  Functions to execute commands on remote Datanodes
  *
  *
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
- * Portions Copyright (c) 2010-2012 Nippon Telegraph and Telephone Corporation
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
  *
- * IDENTIFICATION
- *	  $$
  *
+ * IDENTIFICATION
+ *	  src/backend/pgxc/pool/execRemote.c
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/backend/pgxc/xc_maintenance_mode/xc_maintenance_mode.c b/src/backend/pgxc/xc_maintenance_mode/xc_maintenance_mode.c
index 7296b6e8d7..5fa3f3bb55 100644
--- a/src/backend/pgxc/xc_maintenance_mode/xc_maintenance_mode.c
+++ b/src/backend/pgxc/xc_maintenance_mode/xc_maintenance_mode.c
@@ -1,5 +1,17 @@
+/*-------------------------------------------------------------------------
+ *
+ * xc_maintenance_mode.c
+ *		XC maintenance mode parameters
+ *
+ *
+ * Portions Copyright (c) 1996-2011 PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
+ *
+ * src/backend/pgxc/xc_maintenance_mode/xc_maintenance_mode.c
+ *
+ *-------------------------------------------------------------------------
+ */
 #include "pgxc/xc_maintenance_mode.h"
 
 bool xc_maintenance_mode;
 GucContext currentGucContext;
-
diff --git a/src/include/pgxc/barrier.h b/src/include/pgxc/barrier.h
index 0ceb7a6f3b..1ed9ffb445 100644
--- a/src/include/pgxc/barrier.h
+++ b/src/include/pgxc/barrier.h
@@ -5,11 +5,10 @@
  *	  Definitions for the PITR barrier handling
  *
  *
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
  * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
  *
- * IDENTIFICATION
- *	  $$
+ * src/include/pgxc/barrier.h
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/pgxc/execRemote.h b/src/include/pgxc/execRemote.h
index c99db99725..9afccf5c8e 100644
--- a/src/include/pgxc/execRemote.h
+++ b/src/include/pgxc/execRemote.h
@@ -5,11 +5,10 @@
  *	  Functions to execute commands on multiple Datanodes
  *
  *
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group ?
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
  * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
  *
- * IDENTIFICATION
- *	  $$
+ * src/include/pgxc/execRemote.h
  *
  *-------------------------------------------------------------------------
  */
@@ -25,10 +24,8 @@
 #include "nodes/execnodes.h"
 #include "nodes/pg_list.h"
 #include "tcop/dest.h"
-#include "utils/snapshot.h"
-#ifdef PGXC
 #include "tcop/pquery.h"
-#endif
+#include "utils/snapshot.h"
 
 /* GUC parameters */
 extern bool EnforceTwoPhaseCommit;
diff --git a/src/include/pgxc/groupmgr.h b/src/include/pgxc/groupmgr.h
index a5fd1c7dd0..4a73d32076 100644
--- a/src/include/pgxc/groupmgr.h
+++ b/src/include/pgxc/groupmgr.h
@@ -4,14 +4,11 @@
  *	  Routines for PGXC node group management
  *
  *
- * Portions Copyright (c) 1996-2010  PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2011  PostgreSQL Global Development Group
  * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
  *
  * src/include/pgxc/groupmgr.h
  *
- * IDENTIFICATION  
- *	  $$
- *
  *-------------------------------------------------------------------------
  */
 #ifndef GROUPMGR_H
diff --git a/src/include/pgxc/locator.h b/src/include/pgxc/locator.h
index 3a98eee4cc..a9a2edfeef 100644
--- a/src/include/pgxc/locator.h
+++ b/src/include/pgxc/locator.h
@@ -6,9 +6,7 @@
  *
  * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
  *
- *
- * IDENTIFICATION
- *	  $$
+ * src/include/pgxc/locator.h
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/pgxc/nodemgr.h b/src/include/pgxc/nodemgr.h
index 5c9acc87c9..2604af6f73 100644
--- a/src/include/pgxc/nodemgr.h
+++ b/src/include/pgxc/nodemgr.h
@@ -4,14 +4,11 @@
  *  Routines for node management
  *
  *
- * Portions Copyright (c) 1996-2010  PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2011  PostgreSQL Global Development Group
  * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
  *
  * src/include/pgxc/nodemgr.h
  *
- * IDENTIFICATION
- *	  $$
- *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEMGR_H
diff --git a/src/include/pgxc/pgxc.h b/src/include/pgxc/pgxc.h
index 45b9627360..898fe15df3 100644
--- a/src/include/pgxc/pgxc.h
+++ b/src/include/pgxc/pgxc.h
@@ -1,14 +1,13 @@
 /*-------------------------------------------------------------------------
  *
  * pgxc.h
- *		PG-XC
+ *		Postgres-XC flags and connection control information
  *
  *
- * Portions Copyright (c) 1996-2010  PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2011  PostgreSQL Global Development Group
  * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
  *
- * IDENTIFICATION
- *	  $$
+ * src/include/pgxc/pgxc.h
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/pgxc/pgxcnode.h b/src/include/pgxc/pgxcnode.h
index c1047d12f9..2797b56849 100644
--- a/src/include/pgxc/pgxcnode.h
+++ b/src/include/pgxc/pgxcnode.h
@@ -5,11 +5,10 @@
  *	  Utility functions to communicate to Datanodes and Coordinators
  *
  *
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group ?
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group ?
  * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
  *
- * IDENTIFICATION
- *	  $$
+ * src/include/pgxc/pgxcnode.h
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/pgxc/planner.h b/src/include/pgxc/planner.h
index f844050e56..20054810bd 100644
--- a/src/include/pgxc/planner.h
+++ b/src/include/pgxc/planner.h
@@ -4,11 +4,10 @@
  *		Externally declared locator functions
  *
  *
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group ?
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
  * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
  *
- * IDENTIFICATION
- *	  $$
+ * src/include/pgxc/planner.h
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/pgxc/poolcomm.h b/src/include/pgxc/poolcomm.h
index d223e29261..98a62ee2ad 100644
--- a/src/include/pgxc/poolcomm.h
+++ b/src/include/pgxc/poolcomm.h
@@ -5,11 +5,10 @@
  *	  Definitions for the Pooler-Seesion communications.
  *
  *
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
  * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
  *
- * IDENTIFICATION
- *	  $$
+ * src/include/pgxc/poolcomm.h
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/pgxc/poolmgr.h b/src/include/pgxc/poolmgr.h
index a43946aeb5..7def1eb494 100644
--- a/src/include/pgxc/poolmgr.h
+++ b/src/include/pgxc/poolmgr.h
@@ -5,11 +5,10 @@
  *	  Definitions for the Datanode connection pool.
  *
  *
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
  * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
  *
- * IDENTIFICATION
- *	  $$
+ * src/include/pgxc/poolmgr.h
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/pgxc/poolutils.h b/src/include/pgxc/poolutils.h
index 15a7a2e9fa..cd261ac521 100644
--- a/src/include/pgxc/poolutils.h
+++ b/src/include/pgxc/poolutils.h
@@ -4,11 +4,10 @@
  *
  *		Utilities for Postgres-XC Pooler
  *
- * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
  * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
  *
- * IDENTIFICATION
- *	$$
+ * src/include/pgxc/poolutils.h
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/pgxc/postgresql_fdw.h b/src/include/pgxc/postgresql_fdw.h
index 365f4769dc..3054e7dcc1 100644
--- a/src/include/pgxc/postgresql_fdw.h
+++ b/src/include/pgxc/postgresql_fdw.h
@@ -4,10 +4,10 @@
  *
  *		foreign-data wrapper for PostgreSQL
  *
- * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2012, Postgres-XC Development Group
  *
- * IDENTIFICATION
- *	$PostgreSQL$
+ * src/include/pgxc/postgresql_fdw.h
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/pgxc/xc_maintenance_mode.h b/src/include/pgxc/xc_maintenance_mode.h
index a96148c385..0d477788a2 100644
--- a/src/include/pgxc/xc_maintenance_mode.h
+++ b/src/include/pgxc/xc_maintenance_mode.h
@@ -1,3 +1,16 @@
+/*-------------------------------------------------------------------------
+ *
+ * pgxc.h
+ *		XC maintenance mode stuff
+ *
+ *
+ * Portions Copyright (c) 1996-2011 PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2012 Postgres-XC Development Group
+ *
+ * src/include/pgxc/xc_maintenance_mode.h
+ *
+ *-------------------------------------------------------------------------
+ */
 #ifndef XC_MAINTENANCE_MODE_H
 #define XC_MAINTENANCE_MODE_H