Index: /trunk/Nebulous-Server/t/02_server_setup.t
===================================================================
--- /trunk/Nebulous-Server/t/02_server_setup.t	(revision 4872)
+++ /trunk/Nebulous-Server/t/02_server_setup.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 02_server_setup.t,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 02_server_setup.t,v 1.4 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 
 ok(
-    Nebulous::Server->setup(
-        "DBI:mysql:database=test:host=localhost",
-        "test",
-        "",
+    Nebulous::Server->init(
+        dsn         => "DBI:mysql:database=test:host=localhost",
+        dbuser      => "test",
+        dbpasswd    => "",
     ),
     "connect",
@@ -29,8 +29,8 @@
 
 eval {
-    Nebulous::Server->setup(
-        "DBI:mysql:database=foobar:host=localhost",
-        "baz",
-        "boo",
+    Nebulous::Server->init(
+        dsn         => "DBI:mysql:database=foobar:host=localhost",
+        dbuser      => "baz",
+        dbpasswd    =>"boo",
     );
 };
Index: /trunk/Nebulous-Server/t/03_server_create_object.t
===================================================================
--- /trunk/Nebulous-Server/t/03_server_create_object.t	(revision 4872)
+++ /trunk/Nebulous-Server/t/03_server_create_object.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 03_server_create_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 03_server_create_object.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 my $neb = "Nebulous::Server";
 
-$neb->setup(
-    "DBI:mysql:database=test:host=localhost",
-    "test",
-    "",
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
 );
 
Index: /trunk/Nebulous-Server/t/04_server_replicate_object.t
===================================================================
--- /trunk/Nebulous-Server/t/04_server_replicate_object.t	(revision 4872)
+++ /trunk/Nebulous-Server/t/04_server_replicate_object.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 04_server_replicate_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 04_server_replicate_object.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 my $neb = "Nebulous::Server";
 
-$neb->setup(
-    "DBI:mysql:database=test:host=localhost",
-    "test",
-    "",
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
 );
 
Index: /trunk/Nebulous-Server/t/05_server_lock_object.t
===================================================================
--- /trunk/Nebulous-Server/t/05_server_lock_object.t	(revision 4872)
+++ /trunk/Nebulous-Server/t/05_server_lock_object.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 05_server_lock_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 05_server_lock_object.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 my $neb = "Nebulous::Server";
 
-$neb->setup(
-    "DBI:mysql:database=test:host=localhost",
-    "test",
-    "",
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
 );
 
Index: /trunk/Nebulous-Server/t/06_server_unlock_object.t
===================================================================
--- /trunk/Nebulous-Server/t/06_server_unlock_object.t	(revision 4872)
+++ /trunk/Nebulous-Server/t/06_server_unlock_object.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 06_server_unlock_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 06_server_unlock_object.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 my $neb = "Nebulous::Server";
 
-$neb->setup(
-    "DBI:mysql:database=test:host=localhost",
-    "test",
-    "",
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
 );
 
Index: /trunk/Nebulous-Server/t/07_server_find_instances.t
===================================================================
--- /trunk/Nebulous-Server/t/07_server_find_instances.t	(revision 4872)
+++ /trunk/Nebulous-Server/t/07_server_find_instances.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 07_server_find_instances.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 07_server_find_instances.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 my $neb = "Nebulous::Server";
 
-$neb->setup(
-    "DBI:mysql:database=test:host=localhost",
-    "test",
-    "",
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
 );
 
Index: /trunk/Nebulous-Server/t/08_server_delete_instance.t
===================================================================
--- /trunk/Nebulous-Server/t/08_server_delete_instance.t	(revision 4872)
+++ /trunk/Nebulous-Server/t/08_server_delete_instance.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 08_server_delete_instance.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 08_server_delete_instance.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 my $neb = "Nebulous::Server";
 
-$neb->setup(
-    "DBI:mysql:database=test:host=localhost",
-    "test",
-    "",
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
 );
 
Index: /trunk/Nebulous-Server/t/09_server_stat_object.t
===================================================================
--- /trunk/Nebulous-Server/t/09_server_stat_object.t	(revision 4872)
+++ /trunk/Nebulous-Server/t/09_server_stat_object.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 09_server_stat_object.t,v 1.5 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 09_server_stat_object.t,v 1.6 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 my $neb = "Nebulous::Server";
 
-$neb->setup(
-    "DBI:mysql:database=test:host=localhost",
-    "test",
-    "",
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
 );
 
Index: /trunk/Nebulous/t/02_server_setup.t
===================================================================
--- /trunk/Nebulous/t/02_server_setup.t	(revision 4872)
+++ /trunk/Nebulous/t/02_server_setup.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 02_server_setup.t,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 02_server_setup.t,v 1.4 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 
 ok(
-    Nebulous::Server->setup(
-        "DBI:mysql:database=test:host=localhost",
-        "test",
-        "",
+    Nebulous::Server->init(
+        dsn         => "DBI:mysql:database=test:host=localhost",
+        dbuser      => "test",
+        dbpasswd    => "",
     ),
     "connect",
@@ -29,8 +29,8 @@
 
 eval {
-    Nebulous::Server->setup(
-        "DBI:mysql:database=foobar:host=localhost",
-        "baz",
-        "boo",
+    Nebulous::Server->init(
+        dsn         => "DBI:mysql:database=foobar:host=localhost",
+        dbuser      => "baz",
+        dbpasswd    =>"boo",
     );
 };
Index: /trunk/Nebulous/t/03_server_create_object.t
===================================================================
--- /trunk/Nebulous/t/03_server_create_object.t	(revision 4872)
+++ /trunk/Nebulous/t/03_server_create_object.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 03_server_create_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 03_server_create_object.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 my $neb = "Nebulous::Server";
 
-$neb->setup(
-    "DBI:mysql:database=test:host=localhost",
-    "test",
-    "",
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
 );
 
Index: /trunk/Nebulous/t/04_server_replicate_object.t
===================================================================
--- /trunk/Nebulous/t/04_server_replicate_object.t	(revision 4872)
+++ /trunk/Nebulous/t/04_server_replicate_object.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 04_server_replicate_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 04_server_replicate_object.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 my $neb = "Nebulous::Server";
 
-$neb->setup(
-    "DBI:mysql:database=test:host=localhost",
-    "test",
-    "",
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
 );
 
Index: /trunk/Nebulous/t/05_server_lock_object.t
===================================================================
--- /trunk/Nebulous/t/05_server_lock_object.t	(revision 4872)
+++ /trunk/Nebulous/t/05_server_lock_object.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 05_server_lock_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 05_server_lock_object.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 my $neb = "Nebulous::Server";
 
-$neb->setup(
-    "DBI:mysql:database=test:host=localhost",
-    "test",
-    "",
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
 );
 
Index: /trunk/Nebulous/t/06_server_unlock_object.t
===================================================================
--- /trunk/Nebulous/t/06_server_unlock_object.t	(revision 4872)
+++ /trunk/Nebulous/t/06_server_unlock_object.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 06_server_unlock_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 06_server_unlock_object.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 my $neb = "Nebulous::Server";
 
-$neb->setup(
-    "DBI:mysql:database=test:host=localhost",
-    "test",
-    "",
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
 );
 
Index: /trunk/Nebulous/t/07_server_find_instances.t
===================================================================
--- /trunk/Nebulous/t/07_server_find_instances.t	(revision 4872)
+++ /trunk/Nebulous/t/07_server_find_instances.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 07_server_find_instances.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 07_server_find_instances.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 my $neb = "Nebulous::Server";
 
-$neb->setup(
-    "DBI:mysql:database=test:host=localhost",
-    "test",
-    "",
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
 );
 
Index: /trunk/Nebulous/t/08_server_delete_instance.t
===================================================================
--- /trunk/Nebulous/t/08_server_delete_instance.t	(revision 4872)
+++ /trunk/Nebulous/t/08_server_delete_instance.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 08_server_delete_instance.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 08_server_delete_instance.t,v 1.5 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 my $neb = "Nebulous::Server";
 
-$neb->setup(
-    "DBI:mysql:database=test:host=localhost",
-    "test",
-    "",
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
 );
 
Index: /trunk/Nebulous/t/09_server_stat_object.t
===================================================================
--- /trunk/Nebulous/t/09_server_stat_object.t	(revision 4872)
+++ /trunk/Nebulous/t/09_server_stat_object.t	(revision 4873)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 09_server_stat_object.t,v 1.5 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 09_server_stat_object.t,v 1.6 2005-08-25 01:40:04 jhoblitt Exp $
 
 use strict;
@@ -18,8 +18,8 @@
 my $neb = "Nebulous::Server";
 
-$neb->setup(
-    "DBI:mysql:database=test:host=localhost",
-    "test",
-    "",
+$neb->init(
+    dsn         => "DBI:mysql:database=test:host=localhost",
+    dbuser      => "test",
+    dbpasswd    => "",
 );
 
Index: /trunk/Nebulous/t/conf/startup.pl.in
===================================================================
--- /trunk/Nebulous/t/conf/startup.pl.in	(revision 4872)
+++ /trunk/Nebulous/t/conf/startup.pl.in	(revision 4873)
@@ -1,3 +1,4 @@
 use strict;
+use warnings FATAL => qw( all );
 
 use Apache::DBI;
@@ -6,11 +7,15 @@
 use Nebulous::Server;
 
-my $dsn     = "DBI:mysql:database=test:host=localhost";
-my $dbuser  = "test";
-my $dbpass  = "";
+my $dsn         = "DBI:mysql:database=test:host=localhost";
+my $dbuser      = "test";
+my $dbpasswd    = "";
 
-Apache::DBI->connect_on_init( $dsn, $dbuser, $dbpass );
-Nebulous::Server->setup( $dsn, $dbuser, $dbpass );
+Apache::DBI->connect_on_init( $dsn, $dbuser, $dbpasswd );
+Nebulous::Server->init(
+    dsn         => $dsn,
+    dbuser      => $dbuser,
+    dbpasswd    => $dbpasswd,
+    log_level   => 'all',
+);
 
 1;
-