Log Message:
-----------
Fix a bunch of misspellings

Modified Files:
--------------
    slony1-engine/src/ducttape:
        test_1_pgbench (r1.19 -> r1.20)
        test_1_pgbench_no_node1 (r1.1 -> r1.2)
        test_2_pgbench (r1.12 -> r1.13)
        test_3_pgbench (r1.9 -> r1.10)
        test_4_pgbench (r1.6 -> r1.7)
        test_5_pgbench (r1.5 -> r1.6)
        test_7_defines (r1.1 -> r1.2)

-------------- next part --------------
Index: test_2_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_2_pgbench,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lsrc/ducttape/test_2_pgbench -Lsrc/ducttape/test_2_pgbench -u -w -r1.12 -r1.13
--- src/ducttape/test_2_pgbench
+++ src/ducttape/test_2_pgbench
@@ -27,7 +27,7 @@
 DB2=slony_test2
 DB3=slony_test3
 
-PGBENCH_SCALE=1
+PGBENCH_SCALE=10
 PGBENCH_CLIENTS=5
 PGBENCH_TRANS=`expr 50000 / $PGBENCH_CLIENTS`
 
@@ -134,7 +134,7 @@
 	exit -1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB1"
+echo "**** starting the Slony-I node daemon for $DB1"
 xterm -title "Slon node 1" -e sh -c "slon -d2 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
 slon1_pid=$!
 echo "slon[$slon1_pid] on dbname=$DB1"
@@ -230,7 +230,7 @@
 	exit -1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB1"
+echo "**** starting the Slony-I node daemon for $DB2"
 xterm -title "Slon node 2" -e sh -c "slon -d2 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
 slon2_pid=$!
 echo "slon[$slon2_pid] on dbname=$DB2"
@@ -306,7 +306,7 @@
 	exit -1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB3"
+echo "**** starting the Slony-I node daemon for $DB3"
 xterm -title "Slon node 3" -e sh -c "slon -d2 T1 dbname=$DB3; echo -n 'Enter>'; read line" &
 slon3_pid=$!
 echo "slon[$slon3_pid] on dbname=$DB3"
Index: test_1_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_1_pgbench,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lsrc/ducttape/test_1_pgbench -Lsrc/ducttape/test_1_pgbench -u -w -r1.19 -r1.20
--- src/ducttape/test_1_pgbench
+++ src/ducttape/test_1_pgbench
@@ -80,7 +80,7 @@
 #####
 # Create the "Primary Node"
 #####
-echo "**** creating database for Node 1"
+echo "**** creating database for Node 11"
 
 createdb $DB1 || exit 1
 pgbench -i -s $PGBENCH_SCALE $DB1
@@ -107,49 +107,50 @@
 # and create a replication set containing the pgbench tables.
 ######################################################################
 
+PREAMBLE="	cluster name = T1;
+	node 11 admin conninfo = 'dbname=$DB1';
+	node 22 admin conninfo = 'dbname=$DB2';
+"
+
 echo "**** initializing $DB1 as Primary Node for Slony-I cluster T1"
 slonik <<_EOF_
-	cluster name = T1;
-	node 1 admin conninfo = 'dbname=$DB1';
-	node 2 admin conninfo = 'dbname=$DB2';
-	init cluster (id = 1, comment = 'Node 1');
-	echo 'Database $DB1 initialized as Node 1';
+$PREAMBLE
+	init cluster (id = 11, comment = 'Node 11');
+	echo 'Database $DB1 initialized as Node 11';
 _EOF_
 if [ $? -ne 0 ] ; then
 	kill $pgbench_pid;
 	exit 1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB1"
-xterm -title "Slon node 1" -e sh -c "slon -d2 -s10000 -g10 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
+echo "**** starting the Slony-I node daemon for $DB1"
+xterm -title "Slon node 11" -e sh -c "slon -d2 -s500 -g10 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
 slon1_pid=$!
 echo "slon[$slon1_pid] on dbname=$DB1"
 
 echo "**** creating a replication set containing the 4 pgbench tables ... "
 slonik <<_EOF_
-	cluster name = T1;
-	node 1 admin conninfo = 'dbname=$DB1';
-	node 2 admin conninfo = 'dbname=$DB2';
+$PREAMBLE
 
 	try {
-		table add key (node id = 1, fully qualified name = 'public.history');
+		table add key (node id = 11, fully qualified name = 'public.history');
 	}
 	on error {
 		exit 1;
 	}
 
 	try {
-		create set (id = 1, origin = 1, comment = 'Set 1 - pgbench tables');
-		set add table (set id = 1, origin = 1,
+		create set (id = 1, origin = 11, comment = 'Set 1 - pgbench tables');
+		set add table (set id = 1, origin = 11,
 			id = 1, fully qualified name = 'public.accounts',
 			comment = 'Table accounts');
-		set add table (set id = 1, origin = 1,
+		set add table (set id = 1, origin = 11,
 			id = 2, fully qualified name = 'public.branches',
 			comment = 'Table branches');
-		set add table (set id = 1, origin = 1,
+		set add table (set id = 1, origin = 11,
 			id = 3, fully qualified name = 'public.tellers',
 			comment = 'Table tellers');
-		set add table (set id = 1, origin = 1,
+		set add table (set id = 1, origin = 11,
 			id = 4, fully qualified name = 'public.history',
 			key = serial, comment = 'Table accounts');
 	}
@@ -187,25 +188,32 @@
 # Setup DB2 as a subscriber node and let it subscribe the replication
 # set of the running pgbench
 ######################################################################
-echo "**** creating database for Node 2"
+echo "**** creating database for node 22"
 if ! createdb $DB2 ; then
 	kill $pgbench_pid 2>/dev/null
 	kill $slon1_pid 2>/dev/null
 	exit 1
 fi
 
-echo "**** initializing $DB2 as Node 2 of Slony-I cluster T1"
+echo "**** initializing $DB2 as node 22 of Slony-I cluster T1"
 slonik <<_EOF_
-	cluster name = T1;
-	node 1 admin conninfo = 'dbname=$DB1';
-	node 2 admin conninfo = 'dbname=$DB2';
+$PREAMBLE
+	echo 'Creating node 22';
+	try {
+		store node (id = 22, comment = 'node 22', event node = 11);
+        } on error {
+	    echo 'could not establish node 22';
+	    exit -1;
+	}
 	try {
-		store node (id = 2, comment = 'Node 2');
-		store path (server = 1, client = 2, conninfo = 'dbname=$DB1');
-		store path (server = 2, client = 1, conninfo = 'dbname=$DB2');
+		store path (server = 11, client = 22, conninfo = 'dbname=$DB1');
+		store path (server = 22, client = 11, conninfo = 'dbname=$DB2');
+	}
+	on error { 
+	    echo 'could not establish paths between 11 and 22';
+	    exit -1; 
 	}
-	on error { exit -1; }
-	echo 'Database $DB2 added as Node 2';
+	echo 'Database $DB2 added as node 22';
 _EOF_
 if [ $? -ne 0 ] ; then
 	kill $pgbench_pid 2>/dev/null
@@ -213,8 +221,8 @@
 	exit 1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB1"
-xterm -title "Slon node 2" -e sh -c "slon -d2 -s10000 -g10 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
+echo "**** starting the Slony-I node daemon for $DB1"
+xterm -title "Slon node 22" -e sh -c "slon -d2 -s10000 -o10000 -g10 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
 slon2_pid=$!
 echo "slon[$slon2_pid] on dbname=$DB2"
 
@@ -231,16 +239,14 @@
 # And now comes the moment where the big elephant starts to pee
 # and the attendants in the first row climb on their chairs ...
 ######################################################################
-echo "**** creating pgbench tables and subscribing Node 2 to set 1"
+echo "**** creating pgbench tables and subscribing node 22 to set 1"
 (
 	cat pgbench_schema.sql
 ) | psql -q $DB2
 slonik <<_EOF_
-	cluster name = T1;
-	node 1 admin conninfo = 'dbname=$DB1';
-	node 2 admin conninfo = 'dbname=$DB2';
+$PREAMBLE
 
-	subscribe set ( id = 1, provider = 1, receiver = 2, forward = yes );
+	subscribe set ( id = 1, provider = 11, receiver = 22, forward = yes );
 _EOF_
 
 echo ""
Index: test_7_defines
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_7_defines,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ducttape/test_7_defines -Lsrc/ducttape/test_7_defines -u -w -r1.1 -r1.2
--- src/ducttape/test_7_defines
+++ src/ducttape/test_7_defines
@@ -132,7 +132,7 @@
 	exit 1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB1"
+echo "**** starting the Slony-I node daemon for $DB1"
 xterm -title "Slon node 11" -e sh -c "slon -d2 -s500 -g10 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
 slon1_pid=$!
 echo "slon[$slon1_pid] on dbname=$DB1"
@@ -229,7 +229,7 @@
 	exit 1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB1"
+echo "**** starting the Slony-I node daemon for $DB1"
 xterm -title "Slon node 22" -e sh -c "slon -d2 -s10000 -o10000 -g10 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
 slon2_pid=$!
 echo "slon[$slon2_pid] on dbname=$DB2"
Index: test_1_pgbench_no_node1
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_1_pgbench_no_node1,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/ducttape/test_1_pgbench_no_node1 -Lsrc/ducttape/test_1_pgbench_no_node1 -u -w -r1.1 -r1.2
--- src/ducttape/test_1_pgbench_no_node1
+++ src/ducttape/test_1_pgbench_no_node1
@@ -123,7 +123,7 @@
 	exit 1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB1"
+echo "**** starting the Slony-I node daemon for $DB1"
 xterm -title "Slon node 11" -e sh -c "slon -d2 -s500 -g10 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
 slon1_pid=$!
 echo "slon[$slon1_pid] on dbname=$DB1"
@@ -226,7 +226,7 @@
 	exit 1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB1"
+echo "**** starting the Slony-I node daemon for $DB1"
 xterm -title "Slon node 22" -e sh -c "slon -d2 -s10000 -o10000 -g10 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
 slon2_pid=$!
 echo "slon[$slon2_pid] on dbname=$DB2"
Index: test_4_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_4_pgbench,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lsrc/ducttape/test_4_pgbench -Lsrc/ducttape/test_4_pgbench -u -w -r1.6 -r1.7
--- src/ducttape/test_4_pgbench
+++ src/ducttape/test_4_pgbench
@@ -113,7 +113,7 @@
 	exit 1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB1"
+echo "**** starting the Slony-I node daemon for $DB1"
 xterm -title "Slon node 1" -e sh -c "slon -d2 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
 slon1_pid=$!
 echo "slon[$slon1_pid] on dbname=$DB1"
@@ -205,7 +205,7 @@
 	exit 1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB1"
+echo "**** starting the Slony-I node daemon for $DB1"
 xterm -title "Slon node 2" -e sh -c "slon -d2 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
 slon2_pid=$!
 echo "slon[$slon2_pid] on dbname=$DB2"
Index: test_3_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_3_pgbench,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/ducttape/test_3_pgbench -Lsrc/ducttape/test_3_pgbench -u -w -r1.9 -r1.10
--- src/ducttape/test_3_pgbench
+++ src/ducttape/test_3_pgbench
@@ -173,7 +173,7 @@
 	exit 1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB1"
+echo "**** starting the Slony-I node daemon for $DB1"
 xterm -title "Slon node 1" -e sh -c "slon -d2 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
 slon1_pid=$!
 echo "slon[$slon1_pid] on dbname=$DB1"
@@ -276,7 +276,7 @@
 	exit 1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB1"
+echo "**** starting the Slony-I node daemon for $DB1"
 xterm -title "Slon node 2" -e sh -c "slon -d2 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
 slon2_pid=$!
 echo "slon[$slon2_pid] on dbname=$DB2"
Index: test_5_pgbench
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/test_5_pgbench,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lsrc/ducttape/test_5_pgbench -Lsrc/ducttape/test_5_pgbench -u -w -r1.5 -r1.6
--- src/ducttape/test_5_pgbench
+++ src/ducttape/test_5_pgbench
@@ -124,7 +124,7 @@
 	exit 1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB1"
+echo "**** starting the Slony-I node daemon for $DB1"
 xterm -title "Slon node 1" -e sh -c "slon -d2 T1 dbname=$DB1; echo -n 'Enter>'; read line" &
 slon1_pid=$!
 echo "slon[$slon1_pid] on dbname=$DB1"
@@ -219,7 +219,7 @@
 	exit 1
 fi
 
-echo "**** starting the Slony-I node deamon for $DB1"
+echo "**** starting the Slony-I node daemon for $DB1"
 xterm -title "Slon node 2" -e sh -c "slon -d2 T1 dbname=$DB2; echo -n 'Enter>'; read line" &
 slon2_pid=$!
 echo "slon[$slon2_pid] on dbname=$DB2"