Index: /trunk/Nebulous-Server/Build.PL =================================================================== --- /trunk/Nebulous-Server/Build.PL (revision 4439) +++ /trunk/Nebulous-Server/Build.PL (revision 4440) @@ -7,6 +7,6 @@ $build_pkg->new( - module_name => 'PS::IPP::IData', - dist_version_from => 'lib/PS/IPP/IData/Server.pm', + module_name => 'Nebulous', + dist_version_from => 'lib/Nebulous/Server.pm', author => 'Joshua Hoblitt ', license => 'gpl', Index: /trunk/Nebulous-Server/MANIFEST =================================================================== --- /trunk/Nebulous-Server/MANIFEST (revision 4439) +++ /trunk/Nebulous-Server/MANIFEST (revision 4440) @@ -7,5 +7,4 @@ README Todo -bootstrap.sh docs/apache_setup.txt docs/c_api.h @@ -16,13 +15,13 @@ docs/setup.txt docs/tmp.txt -gsoap/idata.wsdl -lib/PS/IPP/IData/Client.pm -lib/PS/IPP/IData/Client/HTTP.pm -lib/PS/IPP/IData/Client/Log.pm -lib/PS/IPP/IData/Server.pm -lib/PS/IPP/IData/Server/Apache.pm -lib/PS/IPP/IData/Server/Log.pm -lib/PS/IPP/IData/Server/SQL.pm -lib/PS/IPP/IData/Util.pm +gsoap/nebulous.wsdl +lib/Nebulous/Client.pm +lib/Nebulous/Client/HTTP.pm +lib/Nebulous/Client/Log.pm +lib/Nebulous/Server.pm +lib/Nebulous/Server/Apache.pm +lib/Nebulous/Server/Log.pm +lib/Nebulous/Server/SQL.pm +lib/Nebulous/Util.pm scripts/bench_test.pl scripts/imageserver.pl @@ -45,8 +44,16 @@ t/15_client_unlock.t t/16_client_find_instances.t +t/17_client_find.t +t/18_client_open.t +t/19_client_delete.t +t/20_client_copy.t +t/21_client_move.t +t/22_client_delete_instance.t +t/23_client_stat.t t/TEST.PL -t/Test/IData.pm +t/Test/Nebulous.pm t/apache_03_server_create_object.x t/apache_04_server_replicate_object.x t/apache_05_server_lock_object.x t/conf/extra.conf.in +t/conf/startup.pl.in Index: /trunk/Nebulous-Server/Todo =================================================================== --- /trunk/Nebulous-Server/Todo (revision 4439) +++ /trunk/Nebulous-Server/Todo (revision 4440) @@ -1,3 +1,3 @@ -TODO list for Perl module PS::IPP::IData +TODO list for Perl module Nebulous - redo database scheme with foreign keys Index: /trunk/Nebulous-Server/docs/apache_setup.txt =================================================================== --- /trunk/Nebulous-Server/docs/apache_setup.txt (revision 4439) +++ /trunk/Nebulous-Server/docs/apache_setup.txt (revision 4440) @@ -1,5 +1,5 @@ # Copyright (C) 2004-2005 Joshua Hoblitt # -# $Id: apache_setup.txt,v 1.2 2005-01-14 21:23:35 jhoblitt Exp $ +# $Id: apache_setup.txt,v 1.3 2005-06-30 02:35:05 jhoblitt Exp $ - mod_perl-1.29 install @@ -8,6 +8,8 @@ #MP_TRACE = 1 MP_DEBUG = 1 MP_USE_DSO = 1 MP_INST_APACHE2 = 1 MP_APXS = /usr/sbin/apxs2 -- add the "idata" group to /etc/group -- configure Apache to run as the idata group. +- add the "nebulous" group to /etc/group +- configure Apache to run as the nebulous group. + +# out of data from here down... # @@ -15,5 +17,5 @@ # -ScriptAlias /idata /usr/local/apache/perl/imageserver.pl +ScriptAlias /nebulous /usr/local/apache/perl/imageserver.pl @@ -34,13 +36,13 @@ # -# PS::IPP::IData::Apache interface +# Nebulous::Apache interface # PerlModule Apache::DBI -PerlModule PS::IPP::IData::Apache +PerlModule Nebulous::Apache - + SetHandler perl-script - PerlHandler PS::IPP::IData::Apache + PerlHandler Nebulous::Apache Index: /trunk/Nebulous-Server/docs/setup.txt =================================================================== --- /trunk/Nebulous-Server/docs/setup.txt (revision 4439) +++ /trunk/Nebulous-Server/docs/setup.txt (revision 4440) @@ -33,7 +33,7 @@ -mkdir /po01/idata -chown root:idata /po01/idata -chmod 0770 /po01/idata +mkdir /po01/nebulous +chown root:nebulous /po01/nebulous +chmod 0770 /po01/nebulous in /etc/mysql/my.cnf Index: /trunk/Nebulous-Server/lib/Nebulous/Server.pm =================================================================== --- /trunk/Nebulous-Server/lib/Nebulous/Server.pm (revision 4439) +++ /trunk/Nebulous-Server/lib/Nebulous/Server.pm (revision 4440) @@ -1,7 +1,7 @@ # Copyright (c) 2004 Joshua Hoblitt # -# $Id: Server.pm,v 1.8 2005-01-05 04:31:59 jhoblitt Exp $ - -package PS::IPP::IData::Server; +# $Id: Server.pm,v 1.9 2005-06-30 02:35:06 jhoblitt Exp $ + +package Nebulous::Server; use strict; @@ -11,7 +11,7 @@ use DBI; -use PS::IPP::IData::Util qw( :standard ); -use PS::IPP::IData::Server::Log; -use PS::IPP::IData::Server::SQL; +use Nebulous::Util qw( :standard ); +use Nebulous::Server::Log; +use Nebulous::Server::SQL; use Log::Log4perl; use Params::Validate qw( validate_pos SCALAR ); @@ -40,6 +40,6 @@ ); - $log = Log::Log4perl::get_logger( "PS::IPP::IData::Server" ); - $sql = PS::IPP::IData::Server::SQL->new; + $log = Log::Log4perl::get_logger( "Nebulous::Server" ); + $sql = Nebulous::Server::SQL->new; $log->debug( "entered - @_" ); Index: /trunk/Nebulous-Server/lib/Nebulous/Server.pod =================================================================== --- /trunk/Nebulous-Server/lib/Nebulous/Server.pod (revision 4439) +++ /trunk/Nebulous-Server/lib/Nebulous/Server.pod (revision 4440) @@ -3,22 +3,22 @@ =head1 NAME -PS::IPP::IData::Server - iData server component +Nebulous::Server - Nebulous server component =head1 SYNOPSIS - use PS::IPP::IData::Server; + use Nebulous::Server; - PS::IPP::IData::Server->setup( $dsn, $username, $passwd ); - PS::IPP::IData::Server->create_object( $key, $class, $volume, $comment ); - PS::IPP::IData::Server->replicate_object( $key, $volume ); - PS::IPP::IData::Server->lock_object( $key, $type ); - PS::IPP::IData::Server->unlock_object( $key, $type ); - PS::IPP::IData::Server->find_instance( $key, $volume ); - PS::IPP::IData::Server->delete_instance( $uri ); - PS::IPP::IData::Server->stat_object( $key ); + Nebulous::Server->setup( $dsn, $username, $passwd ); + Nebulous::Server->create_object( $key, $class, $volume, $comment ); + Nebulous::Server->replicate_object( $key, $volume ); + Nebulous::Server->lock_object( $key, $type ); + Nebulous::Server->unlock_object( $key, $type ); + Nebulous::Server->find_instance( $key, $volume ); + Nebulous::Server->delete_instance( $uri ); + Nebulous::Server->stat_object( $key ); =head1 DESCRIPTION -This is the server side component of the iData system. It is primarily a +This is the server side component of the Nebulous system. It is primarily a middle-ware abstraction of an SQL database. @@ -120,5 +120,5 @@ =head1 SEE ALSO -L +L =cut Index: /trunk/Nebulous-Server/lib/Nebulous/Server/Apache.pm =================================================================== --- /trunk/Nebulous-Server/lib/Nebulous/Server/Apache.pm (revision 4439) +++ /trunk/Nebulous-Server/lib/Nebulous/Server/Apache.pm (revision 4440) @@ -3,5 +3,5 @@ # $Id -package PS::IPP::IData::Server::Apache; +package Nebulous::Server::Apache; use strict; @@ -10,9 +10,9 @@ our $VERSION = 0.01; -use PS::IPP::IData::Server::SOAP; +use Nebulous::Server::SOAP; use SOAP::Transport::HTTP; my $server = SOAP::Transport::HTTP::Apache - ->dispatch_to( 'PS::IPP::IData::Server::SOAP' ) + ->dispatch_to( 'Nebulous::Server::SOAP' ) ->options({ compress_threshold => 10 * 1024 }); Index: /trunk/Nebulous-Server/lib/Nebulous/Server/Log.pm =================================================================== --- /trunk/Nebulous-Server/lib/Nebulous/Server/Log.pm (revision 4439) +++ /trunk/Nebulous-Server/lib/Nebulous/Server/Log.pm (revision 4440) @@ -1,7 +1,7 @@ # Copyright (c) 2004 Joshua Hoblitt # -# $Id: Log.pm,v 1.2 2005-01-05 02:44:54 jhoblitt Exp $ +# $Id: Log.pm,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $ -package PS::IPP::IData::Server::Log; +package Nebulous::Server::Log; use strict; @@ -13,8 +13,8 @@ my $conf = q( - log4perl.category.PS.IPP.IData.Server = DEBUG, SERVERLOGFILE + log4perl.category.Nebulous.Server = DEBUG, SERVERLOGFILE log4perl.appender.SERVERLOGFILE = Log::Log4perl::Appender::File - log4perl.appender.SERVERLOGFILE.filename = /tmp/idata_server.log + log4perl.appender.SERVERLOGFILE.filename = /tmp/nebulous_server.log log4perl.appender.SERVERLOGFILE.mode = append log4perl.appender.SERVERLOGFILE.layout = Log::Log4perl::Layout::PatternLayout Index: /trunk/Nebulous-Server/lib/Nebulous/Server/SOAP.pm =================================================================== --- /trunk/Nebulous-Server/lib/Nebulous/Server/SOAP.pm (revision 4439) +++ /trunk/Nebulous-Server/lib/Nebulous/Server/SOAP.pm (revision 4440) @@ -1,7 +1,7 @@ # Copyright (c) 2004 Joshua Hoblitt # -# $Id: SOAP.pm,v 1.1 2005-01-06 03:56:43 jhoblitt Exp $ +# $Id: SOAP.pm,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $ -package PS::IPP::IData::Server::SOAP; +package Nebulous::Server::SOAP; use strict; @@ -10,5 +10,5 @@ our $VERSION = '0.01'; -use PS::IPP::IData::Server; +use Nebulous::Server; use SOAP::Lite; import SOAP::Data 'name'; @@ -22,5 +22,5 @@ return undef if $method eq 'DESTROY'; - return name( result => PS::IPP::IData::Server->$method( @_ ) ); + return name( result => Nebulous::Server->$method( @_ ) ); } Index: /trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm =================================================================== --- /trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm (revision 4439) +++ /trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm (revision 4440) @@ -1,7 +1,7 @@ # Copyright (c) 2004 Joshua Hoblitt # -# $Id: SQL.pm,v 1.4 2005-01-15 04:02:12 jhoblitt Exp $ +# $Id: SQL.pm,v 1.5 2005-06-30 02:35:06 jhoblitt Exp $ -package PS::IPP::IData::Server::SQL; +package Nebulous::Server::SQL; use strict; Index: /trunk/Nebulous-Server/nebulous.wsdl =================================================================== --- /trunk/Nebulous-Server/nebulous.wsdl (revision 4439) +++ /trunk/Nebulous-Server/nebulous.wsdl (revision 4440) @@ -1,8 +1,8 @@ - + - @@ -53,11 +53,11 @@ - + - + Index: /trunk/Nebulous-Server/scripts/bench_test.pl =================================================================== --- /trunk/Nebulous-Server/scripts/bench_test.pl (revision 4439) +++ /trunk/Nebulous-Server/scripts/bench_test.pl (revision 4440) @@ -7,8 +7,8 @@ use Benchmark qw( timethese ); -use PS::IPP::IData::Client; +use Nebulous::Client; -my $idata = PS::IPP::IData::Client->new( - proxy => 'http://localhost:80/idata' +my $neb = Nebulous::Client->new( + proxy => 'http://localhost:80/nebulous' ); @@ -18,7 +18,7 @@ { 'create/delete' => sub { - my $fh = $idata->create( $key ); + my $fh = $neb->create( $key ); close $fh; - $idata->delete( $key ); + $neb->delete( $key ); }, } Index: /trunk/Nebulous-Server/scripts/imageserver.pl =================================================================== --- /trunk/Nebulous-Server/scripts/imageserver.pl (revision 4439) +++ /trunk/Nebulous-Server/scripts/imageserver.pl (revision 4440) @@ -8,7 +8,7 @@ use SOAP::Transport::HTTP; -use PS::IPP::IData::Server; +use Nebulous::Server; SOAP::Transport::HTTP::CGI - -> dispatch_to( 'PS::IPP::IData::Server' ) + -> dispatch_to( 'Nebulous::Server' ) -> handle; Index: /trunk/Nebulous-Server/scripts/ptest.pl =================================================================== --- /trunk/Nebulous-Server/scripts/ptest.pl (revision 4439) +++ /trunk/Nebulous-Server/scripts/ptest.pl (revision 4440) @@ -6,9 +6,8 @@ use lib "./lib"; -use PS::IPP::IData::Client; +use Nebulous::Client; -my $idata = PS::IPP::IData::Client->new( - uri => 'http://localhost:80/PS/IPP/IData/Server', - proxy => 'http://localhost:80/idata' +my $neb = Nebulous::Client->new( + proxy => 'http://localhost:80/nebulous' ); @@ -22,5 +21,5 @@ unless ( $pid ) { my $fname = "${key}_$id"; - my $fh = $idata->create( $fname ); + my $fh = $neb->create( $fname ); die "can't create file $fname" unless $fh; @@ -28,17 +27,17 @@ close $fh; - $idata->unlock( $fname, 'write' ); + $neb->unlock( $fname, 'write' ); - $fh = $idata->open( $fname, 'read' ) or die "can't open file"; + $fh = $neb->open( $fname, 'read' ) or die "can't open file"; close $fh; - $idata->unlock( $fname, 'read' ); + $neb->unlock( $fname, 'read' ); - $idata->replicate( $fname ); - $idata->cull( $fname ); - $idata->find( $fname ); - $idata->copy( $fname, $fname . "_copy" ); - $idata->move( $fname, $fname . "_move" ); - $idata->delete( $fname . "_copy" ); - $idata->delete( $fname . "_move" ); + $neb->replicate( $fname ); + $neb->cull( $fname ); + $neb->find( $fname ); + $neb->copy( $fname, $fname . "_copy" ); + $neb->move( $fname, $fname . "_move" ); + $neb->delete( $fname . "_copy" ); + $neb->delete( $fname . "_move" ); exit 0; Index: /trunk/Nebulous-Server/scripts/stest.pl =================================================================== --- /trunk/Nebulous-Server/scripts/stest.pl (revision 4439) +++ /trunk/Nebulous-Server/scripts/stest.pl (revision 4440) @@ -6,18 +6,18 @@ use lib "./lib"; -use PS::IPP::IData::Client; # trace => 'debug'; +use Nebulous::Client; # trace => 'debug'; -my $idata = PS::IPP::IData::Client->new( - proxy => 'http://localhost:80/idata' +my $neb = Nebulous::Client->new( + proxy => 'http://localhost:80/nebulous' ); my $fname = shift; -#my $fh = $idata->create( $fname ); -#$idata->unlock( $fname, 'write' ); +#my $fh = $neb->create( $fname ); +#$neb->unlock( $fname, 'write' ); -$idata->create( $fname, 1 ); -$idata->unlock( $fname, 'write' ); -$idata->delete( $fname ); +$neb->create( $fname, 1 ); +$neb->unlock( $fname, 'write' ); +$neb->delete( $fname ); __END__ @@ -28,5 +28,5 @@ print $fh "fooby\n"; close $fh; - #$idata->unlock( $fname, 'write' ); + #$neb->unlock( $fname, 'write' ); my $filesize = (stat( $key ))[7]; print "created file $key, ${filesize}bytes\n"; Index: /trunk/Nebulous-Server/t/01_load.t =================================================================== --- /trunk/Nebulous-Server/t/01_load.t (revision 4439) +++ /trunk/Nebulous-Server/t/01_load.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 01_load.t,v 1.6 2005-06-30 01:37:16 jhoblitt Exp $ +# $Id: 01_load.t,v 1.7 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,10 +12,10 @@ use Test::More tests => 8; -BEGIN { use_ok( 'PS::IPP::IData::Client' ); } -BEGIN { use_ok( 'PS::IPP::IData::Client::Log' ); } -BEGIN { use_ok( 'PS::IPP::IData::Client::HTTP' ); } -BEGIN { use_ok( 'PS::IPP::IData::Util' ); } -BEGIN { use_ok( 'PS::IPP::IData::Server' ); } -BEGIN { use_ok( 'PS::IPP::IData::Server::SQL' ); } -BEGIN { use_ok( 'PS::IPP::IData::Server::Log' ); } -BEGIN { use_ok( 'PS::IPP::IData::Server::SOAP' ); } +BEGIN { use_ok( 'Nebulous::Client' ); } +BEGIN { use_ok( 'Nebulous::Client::Log' ); } +BEGIN { use_ok( 'Nebulous::Client::HTTP' ); } +BEGIN { use_ok( 'Nebulous::Util' ); } +BEGIN { use_ok( 'Nebulous::Server' ); } +BEGIN { use_ok( 'Nebulous::Server::SQL' ); } +BEGIN { use_ok( 'Nebulous::Server::Log' ); } +BEGIN { use_ok( 'Nebulous::Server::SOAP' ); } Index: /trunk/Nebulous-Server/t/02_server_setup.t =================================================================== --- /trunk/Nebulous-Server/t/02_server_setup.t (revision 4439) +++ /trunk/Nebulous-Server/t/02_server_setup.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 02_server_setup.t,v 1.2 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 02_server_setup.t,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use Test::IData; +use Nebulous::Server; +use Test::Nebulous; -Test::IData->setup; +Test::Nebulous->setup; ok( - PS::IPP::IData::Server->setup( + Nebulous::Server->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -26,8 +26,8 @@ ); -Test::IData->setup; +Test::Nebulous->setup; eval { - PS::IPP::IData::Server->setup( + Nebulous::Server->setup( "DBI:mysql:database=foobar:host=localhost", "baz", @@ -37,3 +37,3 @@ like( $@, qr/DBI connect.*? failed/, "bad dsn/user/pass" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/03_server_create_object.t =================================================================== --- /trunk/Nebulous-Server/t/03_server_create_object.t (revision 4439) +++ /trunk/Nebulous-Server/t/03_server_create_object.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 03_server_create_object.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 03_server_create_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Server; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; -my $idata = "PS::IPP::IData::Server"; +my $neb = "Nebulous::Server"; -$idata->setup( +$neb->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -24,9 +24,9 @@ ); -Test::IData->setup; +Test::Nebulous->setup; { # key - my $uri = $idata->create_object( "foo" ); + my $uri = $neb->create_object( "foo" ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -34,9 +34,9 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, class - my $uri = $idata->create_object( "foo", 0 ); + my $uri = $neb->create_object( "foo", 0 ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -44,9 +44,9 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, class, volume - my $uri = $idata->create_object( "foo", 0, "node01" ); + my $uri = $neb->create_object( "foo", 0, "node01" ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -54,9 +54,9 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, class, volume, comment - my $uri = $idata->create_object( "foo", 0, "node01", "this is foo" ); + my $uri = $neb->create_object( "foo", 0, "node01", "this is foo" ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -64,25 +64,25 @@ } -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); + $neb->create_object( "foo" ); }; like( $@, qr/Duplicate entry/, "object already exists" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object(); + $neb->create_object(); }; like( $@, qr/2 - 4 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( 1, 2, 3, 4, 5 ); + $neb->create_object( 1, 2, 3, 4, 5 ); }; like( $@, qr/2 - 4 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/04_server_replicate_object.t =================================================================== --- /trunk/Nebulous-Server/t/04_server_replicate_object.t (revision 4439) +++ /trunk/Nebulous-Server/t/04_server_replicate_object.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 04_server_replicate_object.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 04_server_replicate_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Server; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; -my $idata = "PS::IPP::IData::Server"; +my $neb = "Nebulous::Server"; -$idata->setup( +$neb->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -24,10 +24,10 @@ ); -Test::IData->setup; +Test::Nebulous->setup; { # key - $idata->create_object( "foo" ); - my $uri = $idata->replicate_object( "foo" ); + $neb->create_object( "foo" ); + my $uri = $neb->replicate_object( "foo" ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -35,10 +35,10 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, $volume - $idata->create_object( "foo" ); - my $uri = $idata->replicate_object( "foo", "node01" ); + $neb->create_object( "foo" ); + my $uri = $neb->replicate_object( "foo", "node01" ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -46,11 +46,11 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, $volume - $idata->create_object( "foo" ); - my $uri1 = $idata->replicate_object( "foo", "node01" ); - my $uri2 = $idata->replicate_object( "foo", "node02" ); + $neb->create_object( "foo" ); + my $uri1 = $neb->replicate_object( "foo", "node01" ); + my $uri2 = $neb->replicate_object( "foo", "node02" ); ok( -e _get_file_path( $uri1 ), "file exists" ); @@ -60,24 +60,24 @@ } -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->replicate_object( "foo" ); + $neb->replicate_object( "foo" ); }; like( $@, qr/storage object does not exist/, "storage object does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->replicate_object(); + $neb->replicate_object(); }; like( $@, qr/1 - 2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->replicate_object( 1, 2, 3 ); + $neb->replicate_object( 1, 2, 3 ); }; like( $@, qr/1 - 2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/05_server_lock_object.t =================================================================== --- /trunk/Nebulous-Server/t/05_server_lock_object.t (revision 4439) +++ /trunk/Nebulous-Server/t/05_server_lock_object.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 05_server_lock_object.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 05_server_lock_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Server; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; -my $idata = "PS::IPP::IData::Server"; +my $neb = "Nebulous::Server"; -$idata->setup( +$neb->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -24,100 +24,100 @@ ); -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - ok( $idata->lock_object( "foo", "read" ), "read lock" ); + ok( $neb->lock_object( "foo", "read" ), "read lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - ok( $idata->lock_object( "foo", "read" ), "read lock" ); - ok( $idata->lock_object( "foo", "read" ), "read lock" ); + ok( $neb->lock_object( "foo", "read" ), "read lock" ); + ok( $neb->lock_object( "foo", "read" ), "read lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - ok( $idata->lock_object( "foo", "write" ), "write lock" ); + ok( $neb->lock_object( "foo", "write" ), "write lock" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->lock_object( "foo", "read" ); + $neb->lock_object( "foo", "read" ); }; like( $@, qr/storage object does not exist/, "storage object does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "write" ); }; like( $@, qr/storage object does not exist/, "storage object does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "write" ); - $idata->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "write" ); }; like( $@, qr/can not write lock twice/, "can not write lock twice" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "read" ); - $idata->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "read" ); + $neb->lock_object( "foo", "write" ); }; like( $@, qr/can not write lock after read lock/, "can not write lock after read lock" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "write" ); - $idata->lock_object( "foo", "read" ); + $neb->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "read" ); }; like( $@, qr/can not read lock after write lock/, "can not read lock after write lock" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->lock_object(); + $neb->lock_object(); }; like( $@, qr/2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->lock_object( "foo" ); + $neb->lock_object( "foo" ); }; like( $@, qr/2 were expected/, "not enough params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->lock_object( "foo", "both" ); + $neb->lock_object( "foo", "both" ); }; like( $@, qr/is read or write/, "not read or write" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->lock_object( "foo", 'read', 3 ); + $neb->lock_object( "foo", 'read', 3 ); }; like( $@, qr/2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/06_server_unlock_object.t =================================================================== --- /trunk/Nebulous-Server/t/06_server_unlock_object.t (revision 4439) +++ /trunk/Nebulous-Server/t/06_server_unlock_object.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 06_server_unlock_object.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 06_server_unlock_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Server; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; -my $idata = "PS::IPP::IData::Server"; +my $neb = "Nebulous::Server"; -$idata->setup( +$neb->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -24,115 +24,115 @@ ); -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "read" ); + $neb->lock_object( "foo", "read" ); - ok( $idata->unlock_object( "foo", "read" ), "read unlock" ); + ok( $neb->unlock_object( "foo", "read" ), "read unlock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "read" ); - $idata->lock_object( "foo", "read" ); + $neb->lock_object( "foo", "read" ); + $neb->lock_object( "foo", "read" ); - ok( $idata->unlock_object( "foo", "read" ), "read unlock" ); - ok( $idata->unlock_object( "foo", "read" ), "read unlock" ); + ok( $neb->unlock_object( "foo", "read" ), "read unlock" ); + ok( $neb->unlock_object( "foo", "read" ), "read unlock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "write" ); - ok( $idata->unlock_object( "foo", "write" ), "write unlock" ); + ok( $neb->unlock_object( "foo", "write" ), "write unlock" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->unlock_object( "foo", "read" ); + $neb->unlock_object( "foo", "read" ); }; like( $@, qr/storage object does not exist/, "storage object does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->unlock_object( "foo", "write" ); + $neb->unlock_object( "foo", "write" ); }; like( $@, qr/storage object does not exist/, "storage object does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->unlock_object( "foo", "read" ); + $neb->unlock_object( "foo", "read" ); }; like( $@, qr/can not remove non-existant read lock/, "no lock set" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->unlock_object( "foo", "write" ); + $neb->unlock_object( "foo", "write" ); }; like( $@, qr/can not remove non-existant write lock/, "no lock set" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); - $idata->lock_object( "foo", "write" ); + $neb->create_object( "foo" ); + $neb->lock_object( "foo", "write" ); - $idata->unlock_object( "foo", "read" ); + $neb->unlock_object( "foo", "read" ); }; like( $@, qr/can not have a read lock under a write lock/, "read unlock under write lock" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); - $idata->lock_object( "foo", "read" ); + $neb->create_object( "foo" ); + $neb->lock_object( "foo", "read" ); - $idata->unlock_object( "foo", "write" ); + $neb->unlock_object( "foo", "write" ); }; like( $@, qr/can not have a write lock under a read lock/, "write unlock under read lock" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->unlock_object(); + $neb->unlock_object(); }; like( $@, qr/2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->unlock_object( "foo" ); + $neb->unlock_object( "foo" ); }; like( $@, qr/2 were expected/, "not enough params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->unlock_object( "foo", "both" ); + $neb->unlock_object( "foo", "both" ); }; like( $@, qr/is read or write/, "not read or write" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->unlock_object( "foo", 'read', 3 ); + $neb->unlock_object( "foo", 'read', 3 ); }; like( $@, qr/2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/07_server_find_instances.t =================================================================== --- /trunk/Nebulous-Server/t/07_server_find_instances.t (revision 4439) +++ /trunk/Nebulous-Server/t/07_server_find_instances.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 07_server_find_instances.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 07_server_find_instances.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Server; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; -my $idata = "PS::IPP::IData::Server"; +my $neb = "Nebulous::Server"; -$idata->setup( +$neb->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -24,46 +24,46 @@ ); -Test::IData->setup; +Test::Nebulous->setup; { # key - my $uri = $idata->create_object( "foo" ); + my $uri = $neb->create_object( "foo" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); is( $uri, $locations->[0], "URIs match" ); } -Test::IData->setup; +Test::Nebulous->setup; { # key - my $uri1 = $idata->create_object( "foo" ); - my $uri2 = $idata->replicate_object( "foo" ); + my $uri1 = $neb->create_object( "foo" ); + my $uri2 = $neb->replicate_object( "foo" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); ok( eq_set( [$uri1, $uri2], $locations ), "URIs match" ); } -Test::IData->setup; +Test::Nebulous->setup; { # key, volume - my $uri = $idata->create_object( "foo" ); + my $uri = $neb->create_object( "foo" ); - my $locations = $idata->find_instances( "foo", "node01" ); + my $locations = $neb->find_instances( "foo", "node01" ); is( $uri, $locations->[0], "URIs match" ); } -Test::IData->setup; +Test::Nebulous->setup; { # key - my $uri1 = $idata->create_object( "foo" ); - my $uri2 = $idata->replicate_object( "foo" ); + my $uri1 = $neb->create_object( "foo" ); + my $uri2 = $neb->replicate_object( "foo" ); - my $locations = $idata->find_instances( "foo", "node01" ); + my $locations = $neb->find_instances( "foo", "node01" ); ok( eq_set( [$uri1, $uri2], $locations ), "URIs match" ); @@ -71,24 +71,24 @@ -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->find_instances( "foo" ); + $neb->find_instances( "foo" ); }; like( $@, qr/no instances found/, "storage object does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->find_instances(); + $neb->find_instances(); }; like( $@, qr/1 - 2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->find_instances( "foo", 'read', 3 ); + $neb->find_instances( "foo", 'read', 3 ); }; like( $@, qr/1 - 2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/08_server_delete_instance.t =================================================================== --- /trunk/Nebulous-Server/t/08_server_delete_instance.t (revision 4439) +++ /trunk/Nebulous-Server/t/08_server_delete_instance.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 08_server_delete_instance.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 08_server_delete_instance.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Server; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; -my $idata = "PS::IPP::IData::Server"; +my $neb = "Nebulous::Server"; -$idata->setup( +$neb->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -24,52 +24,52 @@ ); -Test::IData->setup; +Test::Nebulous->setup; { - my $uri = $idata->create_object( "foo" ); + my $uri = $neb->create_object( "foo" ); - ok( $idata->delete_instance( $uri ), "delete instance" ); + ok( $neb->delete_instance( $uri ), "delete instance" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $uri1 = $idata->create_object( "foo" ); - my $uri2 = $idata->replicate_object( "foo" ); + my $uri1 = $neb->create_object( "foo" ); + my $uri2 = $neb->replicate_object( "foo" ); - ok( $idata->delete_instance( $uri1 ), "delete instance" ); + ok( $neb->delete_instance( $uri1 ), "delete instance" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); is( $locations->[0], $uri2, "instance remains" ); - ok( $idata->delete_instance( $uri2 ), "delete instance" ); + ok( $neb->delete_instance( $uri2 ), "delete instance" ); eval { - $idata->find_instances( "foo" ); + $neb->find_instances( "foo" ); }; like( $@, qr/no instances found/, "storage object was deleted" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->delete_instance( "file:/foo" ); + $neb->delete_instance( "file:/foo" ); }; like( $@, qr/no instance is associated with uri/, "uri does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->delete_instance(); + $neb->delete_instance(); }; like( $@, qr/1 was expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->delete_instance( "foo", 2 ); + $neb->delete_instance( "foo", 2 ); }; like( $@, qr/1 was expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/09_server_stat_object.t =================================================================== --- /trunk/Nebulous-Server/t/09_server_stat_object.t (revision 4439) +++ /trunk/Nebulous-Server/t/09_server_stat_object.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 09_server_stat_object.t,v 1.4 2005-01-15 04:02:12 jhoblitt Exp $ +# $Id: 09_server_stat_object.t,v 1.5 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Server; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; -my $idata = "PS::IPP::IData::Server"; +my $neb = "Nebulous::Server"; -$idata->setup( +$neb->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -24,20 +24,20 @@ ); -Test::IData->setup; +Test::Nebulous->setup; { - my $uri = $idata->create_object( "foo" ); + my $uri = $neb->create_object( "foo" ); - my $info = $idata->stat_object( "foo" ); + my $info = $neb->stat_object( "foo" ); is( scalar @$info, 8, "number of columns" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $uri = $idata->create_object( "foo", 9, "node01", "foobar" ); + my $uri = $neb->create_object( "foo", 9, "node01", "foobar" ); - my $info = $idata->stat_object( "foo" ); + my $info = $neb->stat_object( "foo" ); is( scalar @$info, 8, "number of columns" ); @@ -52,24 +52,24 @@ } -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->stat_object( "foo" ); + $neb->stat_object( "foo" ); }; like( $@, qr/no storage object found/, "object does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->stat_object(); + $neb->stat_object(); }; like( $@, qr/1 was expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->stat_object( "foo", 2 ); + $neb->stat_object( "foo", 2 ); }; like( $@, qr/1 was expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/10_client_new.t =================================================================== --- /trunk/Nebulous-Server/t/10_client_new.t (revision 4439) +++ /trunk/Nebulous-Server/t/10_client_new.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 10_client_new.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 10_client_new.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,42 +14,42 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - isa_ok( $idata, "PS::IPP::IData::Client" ); + isa_ok( $neb, "Nebulous::Client" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - uri => "http://example.com/PS/IPP/IData/Client", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + uri => "http://example.com/PS/IPP/Nebulous/Client", ); - isa_ok( $idata, "PS::IPP::IData::Client" ); + isa_ok( $neb, "Nebulous::Client" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - PS::IPP::IData::Client->new; + Nebulous::Client->new; }; like( $@, qr/Mandatory parameter/, "no proxy" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - PS::IPP::IData::Client->new( + Nebulous::Client->new( proxy => "foo", dog => "do" @@ -58,3 +58,3 @@ like( $@, qr/not listed in the validation options/, "bad param" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/11_client_create.t =================================================================== --- /trunk/Nebulous-Server/t/11_client_create.t (revision 4439) +++ /trunk/Nebulous-Server/t/11_client_create.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 11_client_create.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 11_client_create.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,94 +14,94 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $fh = $idata->create( "foo" ); + my $fh = $neb->create( "foo" ); is( ref $fh, 'GLOB', "good filehandle" ); } -Test::IData->setup; +Test::Nebulous->setup; { # key, class - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $fh = $idata->create( "foo", 0 ); + my $fh = $neb->create( "foo", 0 ); is( ref $fh, 'GLOB', "good filehandle" ); } -Test::IData->setup; +Test::Nebulous->setup; { # key, class, volume - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $fh = $idata->create( "foo", 0, "node01" ); + my $fh = $neb->create( "foo", 0, "node01" ); is( ref $fh, 'GLOB', "good filehandle" ); } -Test::IData->setup; +Test::Nebulous->setup; { # key, class, volume, comment - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $fh = $idata->create( "foo", 0, "node01", "this is foo" ); + my $fh = $neb->create( "foo", 0, "node01", "this is foo" ); is( ref $fh, 'GLOB', "good filehandle" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - is( $idata->create( "foo" ), undef, "object already exists" ); + $neb->create( "foo" ); + is( $neb->create( "foo" ), undef, "object already exists" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create(); + $neb->create(); }; like( $@, qr/2 - 4 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( 1, 2, 3, 4, 5 ); + $neb->create( 1, 2, 3, 4, 5 ); }; like( $@, qr/2 - 4 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/12_client_replicate.t =================================================================== --- /trunk/Nebulous-Server/t/12_client_replicate.t (revision 4439) +++ /trunk/Nebulous-Server/t/12_client_replicate.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 12_client_replicate.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 12_client_replicate.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,20 +14,20 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - my $uri = $idata->replicate( "foo" ); + my $uri = $neb->replicate( "foo" ); ok( $uri, "good replication" ); @@ -35,14 +35,14 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, $volume - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - my $uri = $idata->replicate( "foo", "node01" ); + my $uri = $neb->replicate( "foo", "node01" ); ok( $uri, "good replication" ); @@ -50,15 +50,15 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, $volume - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - my $uri1 = $idata->replicate( "foo", "node01" ); - my $uri2 = $idata->replicate( "foo", "node02" ); + my $uri1 = $neb->replicate( "foo", "node01" ); + my $uri2 = $neb->replicate( "foo", "node02" ); ok( $uri1, "good replication" ); @@ -68,34 +68,34 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $uri = $idata->replicate( "foo" ); + my $uri = $neb->replicate( "foo" ); is( $uri, undef, "storage object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->replicate(); + $neb->replicate(); }; like( $@, qr/1 - 2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->replicate( 1, 2, 3 ); + $neb->replicate( 1, 2, 3 ); }; like( $@, qr/1 - 2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/13_client_cull.t =================================================================== --- /trunk/Nebulous-Server/t/13_client_cull.t (revision 4439) +++ /trunk/Nebulous-Server/t/13_client_cull.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 13_client_cull.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 13_client_cull.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,21 +14,21 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->replicate( "foo" ); + $neb->create( "foo" ); + $neb->replicate( "foo" ); - my $uri = $idata->cull( "foo" ); + my $uri = $neb->cull( "foo" ); ok( $uri, "good cull" ); @@ -36,5 +36,5 @@ } -Test::IData->setup; +Test::Nebulous->setup; SKIP: { @@ -42,11 +42,11 @@ # key, $volume - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->replicate( "foo", "node01" ); + $neb->create( "foo" ); + $neb->replicate( "foo", "node01" ); - my $uri = $idata->cull( "foo", "node01" ); + my $uri = $neb->cull( "foo", "node01" ); ok( $uri, "good cull" ); @@ -54,18 +54,18 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - $idata->replicate( "foo", "node01" ); - $idata->replicate( "foo", "node02" ); + $neb->replicate( "foo", "node01" ); + $neb->replicate( "foo", "node02" ); - my $uri1 = $idata->cull( "foo" ); - my $uri2 = $idata->cull( "foo" ); + my $uri1 = $neb->cull( "foo" ); + my $uri2 = $neb->cull( "foo" ); ok( $uri1, "good cull" ); @@ -75,5 +75,5 @@ } -Test::IData->setup; +Test::Nebulous->setup; SKIP: { @@ -81,14 +81,14 @@ # key, $volume - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - $idata->replicate( "foo", "node01" ); - $idata->replicate( "foo", "node02" ); + $neb->replicate( "foo", "node01" ); + $neb->replicate( "foo", "node02" ); - my $uri1 = $idata->cull( "foo", "node01" ); - my $uri2 = $idata->cull( "foo", "node02" ); + my $uri1 = $neb->cull( "foo", "node01" ); + my $uri2 = $neb->cull( "foo", "node02" ); ok( $uri1, "good cull" ); @@ -98,34 +98,34 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $uri = $idata->cull( "foo" ); + my $uri = $neb->cull( "foo" ); is( $uri, undef, "storage object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->cull(); + $neb->cull(); }; like( $@, qr/1 was expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->cull( 1, 2 ); + $neb->cull( 1, 2 ); }; like( $@, qr/1 was expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/14_client_lock.t =================================================================== --- /trunk/Nebulous-Server/t/14_client_lock.t (revision 4439) +++ /trunk/Nebulous-Server/t/14_client_lock.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 14_client_lock.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 14_client_lock.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,91 +14,91 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { # key, type - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - ok( $idata->lock( "foo", "read" ), "read lock" ); -} - -Test::IData->setup; - -{ - # key, type, timeout - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - ok( $idata->lock( "foo", "read", 10 ), "read lock" ); -} - -Test::IData->setup; - -{ - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - ok( $idata->lock( "foo", "read" ), "read lock" ); - ok( $idata->lock( "foo", "read" ), "read lock" ); -} - -Test::IData->setup; + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + ok( $neb->lock( "foo", "read" ), "read lock" ); +} + +Test::Nebulous->setup; + +{ + # key, type, timeout + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + ok( $neb->lock( "foo", "read", 10 ), "read lock" ); +} + +Test::Nebulous->setup; + +{ + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + ok( $neb->lock( "foo", "read" ), "read lock" ); + ok( $neb->lock( "foo", "read" ), "read lock" ); +} + +Test::Nebulous->setup; { # key, type - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - ok( $idata->lock( "foo", "write" ), "write lock" ); -} - -Test::IData->setup; - -{ - # key, type, timeout - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - ok( $idata->lock( "foo", "write", 10 ), "write lock" ); -} - -Test::IData->setup; - -{ - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - - is( $idata->lock( "foo", "read" ), undef, "storage object does not exist" ); -} - -Test::IData->setup; - -{ - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - - is( $idata->lock( "foo", "write" ), undef, "storage object does not exist" ); -} - -Test::IData->setup; + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + ok( $neb->lock( "foo", "write" ), "write lock" ); +} + +Test::Nebulous->setup; + +{ + # key, type, timeout + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + ok( $neb->lock( "foo", "write", 10 ), "write lock" ); +} + +Test::Nebulous->setup; + +{ + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + + is( $neb->lock( "foo", "read" ), undef, "storage object does not exist" ); +} + +Test::Nebulous->setup; + +{ + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + + is( $neb->lock( "foo", "write" ), undef, "storage object does not exist" ); +} + +Test::Nebulous->setup; diag "testing a spinlock, this will be a litle slow..."; @@ -109,11 +109,11 @@ # key, type, timeout - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - $idata->lock( "foo", "read" ); - $idata->lock( "foo", "write" ); + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + $neb->lock( "foo", "read" ); + $neb->lock( "foo", "write" ); alarm 0; @@ -121,5 +121,5 @@ like( $@, qr/timeout/, "default spinlock" ); -Test::IData->setup; +Test::Nebulous->setup; diag "testing a spinlock, this will be a litle slow..."; @@ -130,11 +130,11 @@ # key, type, timeout - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - $idata->lock( "foo", "read" ); - unless ( $idata->lock( "foo", "write" ) ) { + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + $neb->lock( "foo", "read" ); + unless ( $neb->lock( "foo", "write" ) ) { alarm 0; die "gaveup"; @@ -145,5 +145,5 @@ like( $@, qr/gaveup/, "default spinlock" ); -Test::IData->setup; +Test::Nebulous->setup; diag "testing a spinlock, this will be a litle slow..."; @@ -154,11 +154,11 @@ # key, type, timeout - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - $idata->lock( "foo", "read" ); - $idata->lock( "foo", "write", 5 ); + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + $neb->lock( "foo", "read" ); + $neb->lock( "foo", "write", 5 ); alarm 0; @@ -166,5 +166,5 @@ like( $@, qr/timeout/, "specified spinlock" ); -Test::IData->setup; +Test::Nebulous->setup; diag "testing a spinlock, this will be a litle slow..."; @@ -175,11 +175,11 @@ # key, type, timeout - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - $idata->lock( "foo", "read" ); - unless ( $idata->lock( "foo", "write", 5 ) ) { + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + $neb->lock( "foo", "read" ); + unless ( $neb->lock( "foo", "write", 5 ) ) { alarm 0; die "gaveup"; @@ -191,83 +191,83 @@ like( $@, qr/gaveup/, "specified spinlock" ); -Test::IData->setup; - -{ - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - $idata->lock( "foo", "write" ); - is( $idata->lock( "foo", "write", 1 ), undef, "can not write lock twice" ); -} - -Test::IData->setup; - -{ - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - $idata->lock( "foo", "read" ); - is( $idata->lock( "foo", "write", 1 ), undef, "can not write lock after read lock" ); -} - -Test::IData->setup; - -{ - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - $idata->lock( "foo", "write" ); - is( $idata->lock( "foo", "read", 1 ), undef, "can not read lock after write lock" ); -} - -Test::IData->setup; - -eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - - $idata->lock(); +Test::Nebulous->setup; + +{ + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + $neb->lock( "foo", "write" ); + is( $neb->lock( "foo", "write", 1 ), undef, "can not write lock twice" ); +} + +Test::Nebulous->setup; + +{ + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + $neb->lock( "foo", "read" ); + is( $neb->lock( "foo", "write", 1 ), undef, "can not write lock after read lock" ); +} + +Test::Nebulous->setup; + +{ + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + $neb->lock( "foo", "write" ); + is( $neb->lock( "foo", "read", 1 ), undef, "can not read lock after write lock" ); +} + +Test::Nebulous->setup; + +eval { + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + + $neb->lock(); }; like( $@, qr/2 - 3 were expected/, "no params" ); -Test::IData->setup; - -eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - - $idata->lock( "foo" ); +Test::Nebulous->setup; + +eval { + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + + $neb->lock( "foo" ); }; like( $@, qr/2 - 3 were expected/, "not enough params" ); -Test::IData->setup; - -eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - - $idata->lock( "foo", "both" ); +Test::Nebulous->setup; + +eval { + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + + $neb->lock( "foo", "both" ); }; like( $@, qr/is read or write/, "not read or write" ); -Test::IData->setup; - -eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - - $idata->lock( "foo", 'read', 3, "bar" ); +Test::Nebulous->setup; + +eval { + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + + $neb->lock( "foo", 'read', 3, "bar" ); }; like( $@, qr/2 - 3 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/15_client_unlock.t =================================================================== --- /trunk/Nebulous-Server/t/15_client_unlock.t (revision 4439) +++ /trunk/Nebulous-Server/t/15_client_unlock.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 15_client_unlock.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 15_client_unlock.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,157 +14,157 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->lock( "foo", "read" ); + $neb->create( "foo" ); + $neb->lock( "foo", "read" ); - ok( $idata->unlock( "foo", "read" ), "read unlock" ); + ok( $neb->unlock( "foo", "read" ), "read unlock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->lock( "foo", "read" ); - $idata->lock( "foo", "read" ); + $neb->create( "foo" ); + $neb->lock( "foo", "read" ); + $neb->lock( "foo", "read" ); - ok( $idata->unlock( "foo", "read" ), "read unlock" ); - ok( $idata->unlock( "foo", "read" ), "read unlock" ); + ok( $neb->unlock( "foo", "read" ), "read unlock" ); + ok( $neb->unlock( "foo", "read" ), "read unlock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->lock( "foo", "write" ); + $neb->create( "foo" ); + $neb->lock( "foo", "write" ); - ok( $idata->unlock( "foo", "write" ), "write unlock" ); + ok( $neb->unlock( "foo", "write" ), "write unlock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - is( $idata->unlock( "foo", "read" ), undef, "storage object does not exist" ); + is( $neb->unlock( "foo", "read" ), undef, "storage object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - is( $idata->unlock( "foo", "write" ), undef, "storage object does not exist" ); + is( $neb->unlock( "foo", "write" ), undef, "storage object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - is( $idata->unlock( "foo", "read" ), undef, "no lock set" ); + is( $neb->unlock( "foo", "read" ), undef, "no lock set" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - is( $idata->unlock( "foo", "write" ), undef, "no lock set" ); + is( $neb->unlock( "foo", "write" ), undef, "no lock set" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->lock( "foo", "write" ); + $neb->create( "foo" ); + $neb->lock( "foo", "write" ); - is( $idata->unlock( "foo", "read" ), undef, "read unlock under write lock" ); + is( $neb->unlock( "foo", "read" ), undef, "read unlock under write lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->lock( "foo", "read" ); + $neb->create( "foo" ); + $neb->lock( "foo", "read" ); - is( $idata->unlock( "foo", "write" ), undef, "write unlock under read lock" ); + is( $neb->unlock( "foo", "write" ), undef, "write unlock under read lock" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->unlock(); + $neb->unlock(); }; like( $@, qr/2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->unlock( "foo" ); + $neb->unlock( "foo" ); }; like( $@, qr/2 were expected/, "not enough params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->unlock( "foo", "both" ); + $neb->unlock( "foo", "both" ); }; like( $@, qr/is read or write/, "not read or write" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->unlock( "foo", 'read', 3 ); + $neb->unlock( "foo", 'read', 3 ); }; like( $@, qr/2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/16_client_find_instances.t =================================================================== --- /trunk/Nebulous-Server/t/16_client_find_instances.t (revision 4439) +++ /trunk/Nebulous-Server/t/16_client_find_instances.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 16_client_find_instances.t,v 1.5 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 16_client_find_instances.t,v 1.6 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,20 +14,20 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); is( scalar @$locations, 1, "found 1" ); @@ -36,15 +36,15 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->replicate( "foo" ); + $neb->create( "foo" ); + $neb->replicate( "foo" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); is( scalar @$locations, 2, "found 2" ); @@ -55,14 +55,14 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, volume - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - my $locations = $idata->find_instances( "foo", "node01" ); + my $locations = $neb->find_instances( "foo", "node01" ); is( scalar @$locations, 1, "found 1" ); @@ -71,15 +71,15 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->replicate( "foo" ); + $neb->create( "foo" ); + $neb->replicate( "foo" ); - my $locations = $idata->find_instances( "foo", "node01" ); + my $locations = $neb->find_instances( "foo", "node01" ); is( scalar @$locations, 2, "found 2" ); @@ -90,35 +90,35 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - is( $idata->find_instances( "foo" ), undef, "storage object does not exist" ); + is( $neb->find_instances( "foo" ), undef, "storage object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->find_instances(); + $neb->find_instances(); }; like( $@, qr/1 - 2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->find_instances( "foo", 'read', 3 ); + $neb->find_instances( "foo", 'read', 3 ); }; like( $@, qr/1 - 2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/17_client_find.t =================================================================== --- /trunk/Nebulous-Server/t/17_client_find.t (revision 4439) +++ /trunk/Nebulous-Server/t/17_client_find.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 17_client_find.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 17_client_find.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,57 +14,57 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $uri = $idata->create( "foo" ); + my $uri = $neb->create( "foo" ); - my $path = $idata->find( "foo" ); + my $path = $neb->find( "foo" ); ok( -e $path, "file exists" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $path = $idata->find( "foo" ); + my $path = $neb->find( "foo" ); ok( ! -e $path, "file doesn't exist" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->find(); + $neb->find(); }; like( $@, qr/1 was expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->find( "foo", "bar" ); + $neb->find( "foo", "bar" ); }; like( $@, qr/1 was expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/18_client_open.t =================================================================== --- /trunk/Nebulous-Server/t/18_client_open.t (revision 4439) +++ /trunk/Nebulous-Server/t/18_client_open.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 18_client_open.t,v 1.1 2005-01-05 01:41:05 jhoblitt Exp $ +# $Id: 18_client_open.t,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,85 +14,85 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - my $fh = $idata->open( "foo", 'read' ); + $neb->create( "foo" ); + my $fh = $neb->open( "foo", 'read' ); is( ref $fh, 'GLOB', "good filehandle" ); } -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - my $fh = $idata->open( "foo", 'write' ); + $neb->create( "foo" ); + my $fh = $neb->open( "foo", 'write' ); is( ref $fh, 'GLOB', "good filehandle" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - is( ref $idata->open( "foo", 'write' ), 'GLOB', "create new object" ); + is( ref $neb->open( "foo", 'write' ), 'GLOB', "create new object" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - is( $idata->open( "foo", 'read' ), undef, "can't create new object" ); + is( $neb->open( "foo", 'read' ), undef, "can't create new object" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->open( "foo", 'bar' ); + $neb->open( "foo", 'bar' ); }; like( $@, qr/is read or write/, "2nd params not read or write" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->open(); + $neb->open(); }; like( $@, qr/2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->open( 1, 'read', 3 ); + $neb->open( 1, 'read', 3 ); }; like( $@, qr/2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/19_client_delete.t =================================================================== --- /trunk/Nebulous-Server/t/19_client_delete.t (revision 4439) +++ /trunk/Nebulous-Server/t/19_client_delete.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 19_client_delete.t,v 1.2 2005-01-05 22:27:22 jhoblitt Exp $ +# $Id: 19_client_delete.t,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,70 +14,70 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - ok( $idata->delete( "foo" ), "delete object" ); + ok( $neb->delete( "foo" ), "delete object" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); is( $locations, undef, "no instances" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->replicate( "foo" ); + $neb->create( "foo" ); + $neb->replicate( "foo" ); - ok( $idata->delete( "foo" ), "delete object" ); + ok( $neb->delete( "foo" ), "delete object" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); is( $locations, undef, "no instances" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - is( $idata->delete( "foo" ), undef, "delete non-existant object" ); + is( $neb->delete( "foo" ), undef, "delete non-existant object" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->delete(); + $neb->delete(); }; like( $@, qr/1 was expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->delete( "foo", 2 ); + $neb->delete( "foo", 2 ); }; like( $@, qr/1 was expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/20_client_copy.t =================================================================== --- /trunk/Nebulous-Server/t/20_client_copy.t (revision 4439) +++ /trunk/Nebulous-Server/t/20_client_copy.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 20_client_copy.t,v 1.1 2005-01-04 02:13:21 jhoblitt Exp $ +# $Id: 20_client_copy.t,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,22 +14,22 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - ok( $idata->copy( "foo", "foobar" ), "copied object" ); + ok( $neb->copy( "foo", "foobar" ), "copied object" ); - my $locations1 = $idata->find_instances( "foobar" ); - my $locations2 = $idata->find_instances( "foobar" ); + my $locations1 = $neb->find_instances( "foobar" ); + my $locations2 = $neb->find_instances( "foobar" ); is( scalar @$locations1, 1, "old object has an instances" ); @@ -37,47 +37,47 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - ok( ! $idata->copy( "foo", "foobar" ), "copy non-existant object" ); + ok( ! $neb->copy( "foo", "foobar" ), "copy non-existant object" ); - my $locations = $idata->find_instances( "foobar" ); + my $locations = $neb->find_instances( "foobar" ); is( $locations, undef, "new object has no instances" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->copy(); + $neb->copy(); }; like( $@, qr/2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->copy( "foo" ); + $neb->copy( "foo" ); }; like( $@, qr/2 were expected/, "not enough params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->copy( "foo", "bar", "baz" ); + $neb->copy( "foo", "bar", "baz" ); }; like( $@, qr/2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/21_client_move.t =================================================================== --- /trunk/Nebulous-Server/t/21_client_move.t (revision 4439) +++ /trunk/Nebulous-Server/t/21_client_move.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 21_client_move.t,v 1.1 2005-01-04 02:48:31 jhoblitt Exp $ +# $Id: 21_client_move.t,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,22 +14,22 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - ok( $idata->move( "foo", "foobar" ), "move object" ); + ok( $neb->move( "foo", "foobar" ), "move object" ); - my $locations1 = $idata->find_instances( "foo" ); - my $locations2 = $idata->find_instances( "foobar" ); + my $locations1 = $neb->find_instances( "foo" ); + my $locations2 = $neb->find_instances( "foobar" ); is( $locations1, undef, "old object has no instances" ); @@ -37,47 +37,47 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - ok( ! $idata->move( "foo", "foobar" ), "move non-existant object" ); + ok( ! $neb->move( "foo", "foobar" ), "move non-existant object" ); - my $locations = $idata->find_instances( "foobar" ); + my $locations = $neb->find_instances( "foobar" ); is( $locations, undef, "new object has no instances" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->move(); + $neb->move(); }; like( $@, qr/2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->move( "foo" ); + $neb->move( "foo" ); }; like( $@, qr/2 were expected/, "not enough params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->move( "foo", "bar", "baz" ); + $neb->move( "foo", "bar", "baz" ); }; like( $@, qr/2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/22_client_delete_instance.t =================================================================== --- /trunk/Nebulous-Server/t/22_client_delete_instance.t (revision 4439) +++ /trunk/Nebulous-Server/t/22_client_delete_instance.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 22_client_delete_instance.t,v 1.1 2005-01-04 03:14:19 jhoblitt Exp $ +# $Id: 22_client_delete_instance.t,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,21 +14,21 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); - my $uri = $idata->delete_instance( @$locations[0] ); + my $uri = $neb->delete_instance( @$locations[0] ); is( $uri, @$locations[0], "delete instance" ); @@ -37,24 +37,24 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->replicate( "foo" ); + $neb->create( "foo" ); + $neb->replicate( "foo" ); - my $uri1 = $idata->find_instances( "foo" )->[0]; + my $uri1 = $neb->find_instances( "foo" )->[0]; - ok( $idata->delete_instance( $uri1 ), "delete instance" ); + ok( $neb->delete_instance( $uri1 ), "delete instance" ); - my $uri2 = $idata->find_instances( "foo" )->[0]; + my $uri2 = $neb->find_instances( "foo" )->[0]; isnt( $uri1, $uri2, "other instance remains" ); - ok( $idata->delete_instance( $uri2 ), "delete instance" ); + ok( $neb->delete_instance( $uri2 ), "delete instance" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); is( $locations, undef, "no remaning instances" ); @@ -62,31 +62,31 @@ { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $uri = $idata->delete_instance( "file:/foo" ); + my $uri = $neb->delete_instance( "file:/foo" ); is( $uri, undef, "uri does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->delete_instance(); + $neb->delete_instance(); }; like( $@, qr/1 was expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->delete_instance( "foo", 2 ); + $neb->delete_instance( "foo", 2 ); }; like( $@, qr/1 was expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/23_client_stat.t =================================================================== --- /trunk/Nebulous-Server/t/23_client_stat.t (revision 4439) +++ /trunk/Nebulous-Server/t/23_client_stat.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 23_client_stat.t,v 1.2 2005-01-15 04:02:12 jhoblitt Exp $ +# $Id: 23_client_stat.t,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,32 +14,32 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - my $info = $idata->stat( "foo" ); + my $info = $neb->stat( "foo" ); is( scalar @$info, 8, "number of columns" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo", 9, "node01", "foobar" ); + $neb->create( "foo", 9, "node01", "foobar" ); - my $info = $idata->stat( "foo" ); + my $info = $neb->stat( "foo" ); is( scalar @$info, 8, "number of columns" ); @@ -54,34 +54,34 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $info = $idata->stat( "foo" ); + my $info = $neb->stat( "foo" ); is( $info, undef, "object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->stat(); + $neb->stat(); }; like( $@, qr/1 was expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->stat( "foo", 2 ); + $neb->stat( "foo", 2 ); }; like( $@, qr/1 was expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/apache_03_server_create_object.x =================================================================== --- /trunk/Nebulous-Server/t/apache_03_server_create_object.x (revision 4439) +++ /trunk/Nebulous-Server/t/apache_03_server_create_object.x (revision 4440) @@ -11,19 +11,19 @@ use Apache::TestUtil; -use PS::IPP::IData::Util qw( :standard ); +use Nebulous::Util qw( :standard ); use SOAP::Lite; -use Test::IData; +use Test::Nebulous; my $hostport = Apache::Test::config()->{ 'hostport' }; -my $idata = SOAP::Lite->new( - proxy => "http://$hostport/idata", - uri => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/IData/Server", +my $neb = SOAP::Lite->new( + proxy => "http://$hostport/nebulous", + uri => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/Nebulous/Server", ); -Test::IData->setup; +Test::Nebulous->setup; { # key - my $uri = $idata->create_object( "foo" )->result; + my $uri = $neb->create_object( "foo" )->result; ok( -e _get_file_path( $uri ), "file exists" ); @@ -32,10 +32,10 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, class - my $uri = $idata->create_object( "foo", 0 )->result; - $idata->delete_instance( $uri ); + my $uri = $neb->create_object( "foo", 0 )->result; + $neb->delete_instance( $uri ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -44,10 +44,10 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, class, volume - my $uri = $idata->create_object( "foo", 0, "node01" )->result; - $idata->delete_instance( $uri ); + my $uri = $neb->create_object( "foo", 0, "node01" )->result; + $neb->delete_instance( $uri ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -56,10 +56,10 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, class, volume, comment - my $uri = $idata->create_object( "foo", 0, "node01", "this is foo" )->result; - $idata->delete_instance( $uri ); + my $uri = $neb->create_object( "foo", 0, "node01", "this is foo" )->result; + $neb->delete_instance( $uri ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -68,28 +68,28 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); - my $response = $idata->create_object( "foo" ); + $neb->create_object( "foo" ); + my $response = $neb->create_object( "foo" ); like( $response->faultstring, qr/Duplicate entry/, "object already exists" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $response = $idata->create_object(); + my $response = $neb->create_object(); like( $response->faultstring, qr/2 - 4 were expected/, "no params" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $response = $idata->create_object( 1, 2, 3, 4, 5 ); + my $response = $neb->create_object( 1, 2, 3, 4, 5 ); like( $response->faultstring, qr/2 - 4 were expected/, "too many params" ); } -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/apache_04_server_replicate_object.x =================================================================== --- /trunk/Nebulous-Server/t/apache_04_server_replicate_object.x (revision 4439) +++ /trunk/Nebulous-Server/t/apache_04_server_replicate_object.x (revision 4440) @@ -11,20 +11,20 @@ use Apache::TestUtil; -use PS::IPP::IData::Util qw( :standard ); +use Nebulous::Util qw( :standard ); use SOAP::Lite; -use Test::IData; +use Test::Nebulous; my $hostport = Apache::Test::config()->{ 'hostport' }; -my $idata = SOAP::Lite->new( - proxy => "http://$hostport/idata", - uri => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/IData/Server", +my $neb = SOAP::Lite->new( + proxy => "http://$hostport/nebulous", + uri => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/Nebulous/Server", ); -Test::IData->setup; +Test::Nebulous->setup; { # key - $idata->create_object( "foo" ); - my $uri = $idata->replicate_object( "foo" )->result; + $neb->create_object( "foo" ); + my $uri = $neb->replicate_object( "foo" )->result; ok( -e _get_file_path( $uri ), "file exists" ); @@ -33,10 +33,10 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, $volume - $idata->create_object( "foo" ); - my $uri = $idata->replicate_object( "foo", "node01" )->result; + $neb->create_object( "foo" ); + my $uri = $neb->replicate_object( "foo", "node01" )->result; ok( -e _get_file_path( $uri ), "file exists" ); @@ -45,11 +45,11 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, $volume - $idata->create_object( "foo" ); - my $uri1 = $idata->replicate_object( "foo", "node01" )->result; - my $uri2 = $idata->replicate_object( "foo", "node02" )->result; + $neb->create_object( "foo" ); + my $uri1 = $neb->replicate_object( "foo", "node01" )->result; + my $uri2 = $neb->replicate_object( "foo", "node02" )->result; ok( -e _get_file_path( $uri1 ), "file exists" ); @@ -60,27 +60,27 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $response = $idata->replicate_object(); + my $response = $neb->replicate_object(); like( $response->faultstring, qr/1 - 2 were expected/, "no params" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $response = $idata->replicate_object( 1, 2, 3 ); + my $response = $neb->replicate_object( 1, 2, 3 ); like( $response->faultstring, qr/1 - 2 were expected/, "too many params" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $response = $idata->replicate_object( "foo" ); + my $response = $neb->replicate_object( "foo" ); like( $response->faultstring, qr/storage object does not exist/, "storage object does not exist" ); } -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous-Server/t/apache_05_server_lock_object.x =================================================================== --- /trunk/Nebulous-Server/t/apache_05_server_lock_object.x (revision 4439) +++ /trunk/Nebulous-Server/t/apache_05_server_lock_object.x (revision 4440) @@ -11,119 +11,119 @@ use Apache::TestUtil; -use PS::IPP::IData::Util qw( :standard ); +use Nebulous::Util qw( :standard ); use SOAP::Lite; -use Test::IData; +use Test::Nebulous; my $hostport = Apache::Test::config()->{ 'hostport' }; -my $idata = SOAP::Lite->new( - proxy => "http://$hostport/idata", - uri => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/IData/Server", +my $neb = SOAP::Lite->new( + proxy => "http://$hostport/nebulous", + uri => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/Nebulous/Server", ); -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - ok( $idata->lock_object( "foo", "read" )->result, "read lock" ); + ok( $neb->lock_object( "foo", "read" )->result, "read lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - ok( $idata->lock_object( "foo", "read" )->result, "read lock" ); - ok( $idata->lock_object( "foo", "read" )->result, "read lock" ); + ok( $neb->lock_object( "foo", "read" )->result, "read lock" ); + ok( $neb->lock_object( "foo", "read" )->result, "read lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - ok( $idata->lock_object( "foo", "write" )->result, "write lock" ); + ok( $neb->lock_object( "foo", "write" )->result, "write lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $result = $idata->lock_object( "foo", "read" ); + my $result = $neb->lock_object( "foo", "read" ); like( $result->faultstring, qr/storage object does not exist/, "storage object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $result = $idata->lock_object( "foo", "write" ); + my $result = $neb->lock_object( "foo", "write" ); like( $result->faultstring, qr/storage object does not exist/, "storage object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "write" ); - my $result = $idata->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "write" ); + my $result = $neb->lock_object( "foo", "write" ); like( $result->faultstring, qr/can not write lock twice/, "can not write lock twice" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "read" ); - my $result = $idata->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "read" ); + my $result = $neb->lock_object( "foo", "write" ); like( $result->faultstring, qr/can not write lock after read lock/, "can not write lock after read lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "write" ); - my $result = $idata->lock_object( "foo", "read" ); + $neb->lock_object( "foo", "write" ); + my $result = $neb->lock_object( "foo", "read" ); like( $result->faultstring, qr/can not read lock after write lock/, "can not read lock after write lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $result = $idata->lock_object(); + my $result = $neb->lock_object(); like( $result->faultstring, qr/2 were expected/, "no params" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $result = $idata->lock_object( "foo" ); + my $result = $neb->lock_object( "foo" ); like( $result->faultstring, qr/2 were expected/, "not enough params" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $result = $idata->lock_object( "foo", "both" ); + my $result = $neb->lock_object( "foo", "both" ); like( $result->faultstring, qr/is read or write/, "not read or write" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $result = $idata->lock_object( "foo", 'read', 3 ); + my $result = $neb->lock_object( "foo", 'read', 3 ); like( $result->faultstring, qr/2 were expected/, "too many params" ); } -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/Build.PL =================================================================== --- /trunk/Nebulous/Build.PL (revision 4439) +++ /trunk/Nebulous/Build.PL (revision 4440) @@ -7,6 +7,6 @@ $build_pkg->new( - module_name => 'PS::IPP::IData', - dist_version_from => 'lib/PS/IPP/IData/Server.pm', + module_name => 'Nebulous', + dist_version_from => 'lib/Nebulous/Server.pm', author => 'Joshua Hoblitt ', license => 'gpl', Index: /trunk/Nebulous/MANIFEST =================================================================== --- /trunk/Nebulous/MANIFEST (revision 4439) +++ /trunk/Nebulous/MANIFEST (revision 4440) @@ -7,5 +7,4 @@ README Todo -bootstrap.sh docs/apache_setup.txt docs/c_api.h @@ -16,13 +15,13 @@ docs/setup.txt docs/tmp.txt -gsoap/idata.wsdl -lib/PS/IPP/IData/Client.pm -lib/PS/IPP/IData/Client/HTTP.pm -lib/PS/IPP/IData/Client/Log.pm -lib/PS/IPP/IData/Server.pm -lib/PS/IPP/IData/Server/Apache.pm -lib/PS/IPP/IData/Server/Log.pm -lib/PS/IPP/IData/Server/SQL.pm -lib/PS/IPP/IData/Util.pm +gsoap/nebulous.wsdl +lib/Nebulous/Client.pm +lib/Nebulous/Client/HTTP.pm +lib/Nebulous/Client/Log.pm +lib/Nebulous/Server.pm +lib/Nebulous/Server/Apache.pm +lib/Nebulous/Server/Log.pm +lib/Nebulous/Server/SQL.pm +lib/Nebulous/Util.pm scripts/bench_test.pl scripts/imageserver.pl @@ -45,8 +44,16 @@ t/15_client_unlock.t t/16_client_find_instances.t +t/17_client_find.t +t/18_client_open.t +t/19_client_delete.t +t/20_client_copy.t +t/21_client_move.t +t/22_client_delete_instance.t +t/23_client_stat.t t/TEST.PL -t/Test/IData.pm +t/Test/Nebulous.pm t/apache_03_server_create_object.x t/apache_04_server_replicate_object.x t/apache_05_server_lock_object.x t/conf/extra.conf.in +t/conf/startup.pl.in Index: /trunk/Nebulous/Todo =================================================================== --- /trunk/Nebulous/Todo (revision 4439) +++ /trunk/Nebulous/Todo (revision 4440) @@ -1,3 +1,3 @@ -TODO list for Perl module PS::IPP::IData +TODO list for Perl module Nebulous - redo database scheme with foreign keys Index: /trunk/Nebulous/docs/apache_setup.txt =================================================================== --- /trunk/Nebulous/docs/apache_setup.txt (revision 4439) +++ /trunk/Nebulous/docs/apache_setup.txt (revision 4440) @@ -1,5 +1,5 @@ # Copyright (C) 2004-2005 Joshua Hoblitt # -# $Id: apache_setup.txt,v 1.2 2005-01-14 21:23:35 jhoblitt Exp $ +# $Id: apache_setup.txt,v 1.3 2005-06-30 02:35:05 jhoblitt Exp $ - mod_perl-1.29 install @@ -8,6 +8,8 @@ #MP_TRACE = 1 MP_DEBUG = 1 MP_USE_DSO = 1 MP_INST_APACHE2 = 1 MP_APXS = /usr/sbin/apxs2 -- add the "idata" group to /etc/group -- configure Apache to run as the idata group. +- add the "nebulous" group to /etc/group +- configure Apache to run as the nebulous group. + +# out of data from here down... # @@ -15,5 +17,5 @@ # -ScriptAlias /idata /usr/local/apache/perl/imageserver.pl +ScriptAlias /nebulous /usr/local/apache/perl/imageserver.pl @@ -34,13 +36,13 @@ # -# PS::IPP::IData::Apache interface +# Nebulous::Apache interface # PerlModule Apache::DBI -PerlModule PS::IPP::IData::Apache +PerlModule Nebulous::Apache - + SetHandler perl-script - PerlHandler PS::IPP::IData::Apache + PerlHandler Nebulous::Apache Index: /trunk/Nebulous/docs/setup.txt =================================================================== --- /trunk/Nebulous/docs/setup.txt (revision 4439) +++ /trunk/Nebulous/docs/setup.txt (revision 4440) @@ -33,7 +33,7 @@ -mkdir /po01/idata -chown root:idata /po01/idata -chmod 0770 /po01/idata +mkdir /po01/nebulous +chown root:nebulous /po01/nebulous +chmod 0770 /po01/nebulous in /etc/mysql/my.cnf Index: /trunk/Nebulous/lib/Nebulous/Client.pm =================================================================== --- /trunk/Nebulous/lib/Nebulous/Client.pm (revision 4439) +++ /trunk/Nebulous/lib/Nebulous/Client.pm (revision 4440) @@ -1,7 +1,7 @@ # Copyright (c) 2004 Joshua Hoblitt # -# $Id: Client.pm,v 1.14 2005-01-06 04:11:02 jhoblitt Exp $ - -package PS::IPP::IData::Client; +# $Id: Client.pm,v 1.15 2005-06-30 02:35:06 jhoblitt Exp $ + +package Nebulous::Client; use strict; @@ -12,6 +12,6 @@ use File::Copy qw(); use Log::Log4perl qw(get_logger :levels); -use PS::IPP::IData::Client::Log; -use PS::IPP::IData::Util qw( :standard ); +use Nebulous::Client::Log; +use Nebulous::Util qw( :standard ); use Params::Validate qw( validate validate_pos SCALAR ); #use SOAP::Lite +trace => [qw( debug )]; @@ -23,5 +23,5 @@ use constant LOCK_DEFAULT => 10; # default to a 10s lock timeout -my $log = get_logger( "PS::IPP::IData::Client" ); +my $log = get_logger( "Nebulous::Client" ); $log->level( $WARN ); @@ -74,5 +74,5 @@ my $lite = SOAP::Lite->new( proxy => $args{ 'proxy' }, - uri => $args{ 'uri' } || "urn:PS/IPP/IData/Server/SOAP", + uri => $args{ 'uri' } || "urn:Nebulous/Server/SOAP", ); Index: /trunk/Nebulous/lib/Nebulous/Client.pod =================================================================== --- /trunk/Nebulous/lib/Nebulous/Client.pod (revision 4439) +++ /trunk/Nebulous/lib/Nebulous/Client.pod (revision 4440) @@ -3,32 +3,33 @@ =head1 NAME -PS::IPP::IData::Client - iData client component +Nebulous::Client - Nebulous client component =head1 SYNOPSIS - use PS::IPP::IData::Client; + use Nebulous::Client; - my $idata = PS::IPP::IData::Client->new( - proxy => 'http://localhost:80/idata' + my $neb = Nebulous::Client->new( + proxy => 'http://localhost:80/nebulous' ); - my $fh = $idata->create( "key", 0, "node01", "example" ); - $idata->replicate( "key", "node01" ); - $idata->cull( "key" ); - $idata->lock( "key", 'write' ); - $idata->unlock( "key", 'write' ); - my $uris = $idata->find_instances( "key", "node01" ); - my $path = $idata->find( "key" ); - my $fh = $idata->open( "key", 'read' ); + my $fh = $neb->create( "key", 0, "node01", "example" ); + $neb->replicate( "key", "node01" ); + $neb->cull( "key" ); + $neb->lock( "key", 'write' ); + $neb->unlock( "key", 'write' ); + my $uris = $neb->find_instances( "key", "node01" ); + my $path = $neb->find( "key" ); + my $fh = $neb->open( "key", 'read' ); $data->delete( "key" ); $data->copy( "key", "new_key" ); $data->move( "key", "new_key" ); $data->delete_instance( $uri ); - my $stats = $idata->stat( "key" ); + my $stats = $neb->stat( "key" ); =head1 DESCRIPTION -This component provides client access to the iData storage system. It provides -an interface for files to be added, managed, and removed from the system. +This component provides client access to the Nebulous storage system. It +provides an interface for files to be added, managed, and removed from the +system. =head1 USAGE @@ -39,5 +40,5 @@ I. - use PS::IPP::IData::Client trace => qw( debug ); + use Nebulous::Client trace => qw( debug ); The hash is allowed to have a single key, C. This controls the level of @@ -57,7 +58,7 @@ Accepts a mandatory hash. - my $idata = PS::IPP::IData::Client->new( - proxy => 'http://localhost:80/idata' - uri => 'urn:PS/IPP/IData/Server', + my $neb = Nebulous::Client->new( + proxy => 'http://localhost:80/nebulous' + uri => 'urn:Nebulous/Server', ); @@ -66,5 +67,5 @@ =item * proxy -The URL of the iData server to connect to. +The URL of the Nebulous server to connect to. =item * uri @@ -119,5 +120,5 @@ =item MogileFS -The iData system is similar in function to MogileFS but very different in +The Nebulous system is similar in function to MogileFS but very different in implementation and operation. @@ -160,5 +161,5 @@ =head1 SEE ALSO -L +L =cut Index: /trunk/Nebulous/lib/Nebulous/Client/HTTP.pm =================================================================== --- /trunk/Nebulous/lib/Nebulous/Client/HTTP.pm (revision 4439) +++ /trunk/Nebulous/lib/Nebulous/Client/HTTP.pm (revision 4440) @@ -1,7 +1,7 @@ # Copyright (c) 2004 Joshua Hoblitt # -# $Id: HTTP.pm,v 1.1.1.1 2004-12-22 02:16:24 jhoblitt Exp $ +# $Id: HTTP.pm,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $ -package PS::IPP::IData::Client::HTTP; +package Nebulous::Client::HTTP; use strict; Index: /trunk/Nebulous/lib/Nebulous/Client/Log.pm =================================================================== --- /trunk/Nebulous/lib/Nebulous/Client/Log.pm (revision 4439) +++ /trunk/Nebulous/lib/Nebulous/Client/Log.pm (revision 4440) @@ -1,7 +1,7 @@ # Copyright (c) 2004 Joshua Hoblitt # -# $Id: Log.pm,v 1.2 2005-01-05 02:44:54 jhoblitt Exp $ +# $Id: Log.pm,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $ -package PS::IPP::IData::Client::Log; +package Nebulous::Client::Log; use strict; @@ -13,6 +13,6 @@ my $conf = q( - log4perl.category.PS.IPP.IData.Client = DEBUG, Screen -#log4perl.category.PS.IPP.IData.Client = DEBUG, CLIENTLOGFILE, Screen + log4perl.category.Nebulous.Client = DEBUG, Screen +#log4perl.category.Nebulous.Client = DEBUG, CLIENTLOGFILE, Screen log4perl.appender.Screen = Log::Log4perl::Appender::Screen @@ -22,5 +22,5 @@ log4perl.appender.CLIENTLOGFILE = Log::Log4perl::Appender::File - log4perl.appender.CLIENTLOGFILE.filename = /tmp/idata_client.log + log4perl.appender.CLIENTLOGFILE.filename = /tmp/nebulous_client.log log4perl.appender.CLIENTLOGFILE.mode = append log4perl.appender.CLIENTLOGFILE.layout = Log::Log4perl::Layout::PatternLayout Index: /trunk/Nebulous/lib/Nebulous/Server.pm =================================================================== --- /trunk/Nebulous/lib/Nebulous/Server.pm (revision 4439) +++ /trunk/Nebulous/lib/Nebulous/Server.pm (revision 4440) @@ -1,7 +1,7 @@ # Copyright (c) 2004 Joshua Hoblitt # -# $Id: Server.pm,v 1.8 2005-01-05 04:31:59 jhoblitt Exp $ - -package PS::IPP::IData::Server; +# $Id: Server.pm,v 1.9 2005-06-30 02:35:06 jhoblitt Exp $ + +package Nebulous::Server; use strict; @@ -11,7 +11,7 @@ use DBI; -use PS::IPP::IData::Util qw( :standard ); -use PS::IPP::IData::Server::Log; -use PS::IPP::IData::Server::SQL; +use Nebulous::Util qw( :standard ); +use Nebulous::Server::Log; +use Nebulous::Server::SQL; use Log::Log4perl; use Params::Validate qw( validate_pos SCALAR ); @@ -40,6 +40,6 @@ ); - $log = Log::Log4perl::get_logger( "PS::IPP::IData::Server" ); - $sql = PS::IPP::IData::Server::SQL->new; + $log = Log::Log4perl::get_logger( "Nebulous::Server" ); + $sql = Nebulous::Server::SQL->new; $log->debug( "entered - @_" ); Index: /trunk/Nebulous/lib/Nebulous/Server.pod =================================================================== --- /trunk/Nebulous/lib/Nebulous/Server.pod (revision 4439) +++ /trunk/Nebulous/lib/Nebulous/Server.pod (revision 4440) @@ -3,22 +3,22 @@ =head1 NAME -PS::IPP::IData::Server - iData server component +Nebulous::Server - Nebulous server component =head1 SYNOPSIS - use PS::IPP::IData::Server; + use Nebulous::Server; - PS::IPP::IData::Server->setup( $dsn, $username, $passwd ); - PS::IPP::IData::Server->create_object( $key, $class, $volume, $comment ); - PS::IPP::IData::Server->replicate_object( $key, $volume ); - PS::IPP::IData::Server->lock_object( $key, $type ); - PS::IPP::IData::Server->unlock_object( $key, $type ); - PS::IPP::IData::Server->find_instance( $key, $volume ); - PS::IPP::IData::Server->delete_instance( $uri ); - PS::IPP::IData::Server->stat_object( $key ); + Nebulous::Server->setup( $dsn, $username, $passwd ); + Nebulous::Server->create_object( $key, $class, $volume, $comment ); + Nebulous::Server->replicate_object( $key, $volume ); + Nebulous::Server->lock_object( $key, $type ); + Nebulous::Server->unlock_object( $key, $type ); + Nebulous::Server->find_instance( $key, $volume ); + Nebulous::Server->delete_instance( $uri ); + Nebulous::Server->stat_object( $key ); =head1 DESCRIPTION -This is the server side component of the iData system. It is primarily a +This is the server side component of the Nebulous system. It is primarily a middle-ware abstraction of an SQL database. @@ -120,5 +120,5 @@ =head1 SEE ALSO -L +L =cut Index: /trunk/Nebulous/lib/Nebulous/Server/Apache.pm =================================================================== --- /trunk/Nebulous/lib/Nebulous/Server/Apache.pm (revision 4439) +++ /trunk/Nebulous/lib/Nebulous/Server/Apache.pm (revision 4440) @@ -3,5 +3,5 @@ # $Id -package PS::IPP::IData::Server::Apache; +package Nebulous::Server::Apache; use strict; @@ -10,9 +10,9 @@ our $VERSION = 0.01; -use PS::IPP::IData::Server::SOAP; +use Nebulous::Server::SOAP; use SOAP::Transport::HTTP; my $server = SOAP::Transport::HTTP::Apache - ->dispatch_to( 'PS::IPP::IData::Server::SOAP' ) + ->dispatch_to( 'Nebulous::Server::SOAP' ) ->options({ compress_threshold => 10 * 1024 }); Index: /trunk/Nebulous/lib/Nebulous/Server/Log.pm =================================================================== --- /trunk/Nebulous/lib/Nebulous/Server/Log.pm (revision 4439) +++ /trunk/Nebulous/lib/Nebulous/Server/Log.pm (revision 4440) @@ -1,7 +1,7 @@ # Copyright (c) 2004 Joshua Hoblitt # -# $Id: Log.pm,v 1.2 2005-01-05 02:44:54 jhoblitt Exp $ +# $Id: Log.pm,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $ -package PS::IPP::IData::Server::Log; +package Nebulous::Server::Log; use strict; @@ -13,8 +13,8 @@ my $conf = q( - log4perl.category.PS.IPP.IData.Server = DEBUG, SERVERLOGFILE + log4perl.category.Nebulous.Server = DEBUG, SERVERLOGFILE log4perl.appender.SERVERLOGFILE = Log::Log4perl::Appender::File - log4perl.appender.SERVERLOGFILE.filename = /tmp/idata_server.log + log4perl.appender.SERVERLOGFILE.filename = /tmp/nebulous_server.log log4perl.appender.SERVERLOGFILE.mode = append log4perl.appender.SERVERLOGFILE.layout = Log::Log4perl::Layout::PatternLayout Index: /trunk/Nebulous/lib/Nebulous/Server/SOAP.pm =================================================================== --- /trunk/Nebulous/lib/Nebulous/Server/SOAP.pm (revision 4439) +++ /trunk/Nebulous/lib/Nebulous/Server/SOAP.pm (revision 4440) @@ -1,7 +1,7 @@ # Copyright (c) 2004 Joshua Hoblitt # -# $Id: SOAP.pm,v 1.1 2005-01-06 03:56:43 jhoblitt Exp $ +# $Id: SOAP.pm,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $ -package PS::IPP::IData::Server::SOAP; +package Nebulous::Server::SOAP; use strict; @@ -10,5 +10,5 @@ our $VERSION = '0.01'; -use PS::IPP::IData::Server; +use Nebulous::Server; use SOAP::Lite; import SOAP::Data 'name'; @@ -22,5 +22,5 @@ return undef if $method eq 'DESTROY'; - return name( result => PS::IPP::IData::Server->$method( @_ ) ); + return name( result => Nebulous::Server->$method( @_ ) ); } Index: /trunk/Nebulous/lib/Nebulous/Server/SQL.pm =================================================================== --- /trunk/Nebulous/lib/Nebulous/Server/SQL.pm (revision 4439) +++ /trunk/Nebulous/lib/Nebulous/Server/SQL.pm (revision 4440) @@ -1,7 +1,7 @@ # Copyright (c) 2004 Joshua Hoblitt # -# $Id: SQL.pm,v 1.4 2005-01-15 04:02:12 jhoblitt Exp $ +# $Id: SQL.pm,v 1.5 2005-06-30 02:35:06 jhoblitt Exp $ -package PS::IPP::IData::Server::SQL; +package Nebulous::Server::SQL; use strict; Index: /trunk/Nebulous/lib/Nebulous/Util.pm =================================================================== --- /trunk/Nebulous/lib/Nebulous/Util.pm (revision 4439) +++ /trunk/Nebulous/lib/Nebulous/Util.pm (revision 4440) @@ -1,7 +1,7 @@ # Copyright (c) 2004 Joshua Hoblitt # -# $Id: Util.pm,v 1.2 2005-01-05 02:44:54 jhoblitt Exp $ +# $Id: Util.pm,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $ -package PS::IPP::IData::Util; +package Nebulous::Util; use strict; Index: /trunk/Nebulous/nebclient/bootstrap.sh =================================================================== --- /trunk/Nebulous/nebclient/bootstrap.sh (revision 4439) +++ /trunk/Nebulous/nebclient/bootstrap.sh (revision 4440) @@ -3,8 +3,8 @@ # Copyright (C) 2005 Joshua Hoblitt # -# $Id: bootstrap.sh,v 1.7 2005-01-27 01:08:05 jhoblitt Exp $ +# $Id: bootstrap.sh,v 1.8 2005-06-30 02:35:05 jhoblitt Exp $ -wsdl2h -o src/idata.h -c idata.wsdl \ -&& soapcpp2 -d src -c src/idata.h \ +wsdl2h -o src/nebulous.h -c nebulous.wsdl \ +&& soapcpp2 -d src -c src/nebulous.h \ && rm -f src/*.xml Index: /trunk/Nebulous/nebclient/configure.ac =================================================================== --- /trunk/Nebulous/nebclient/configure.ac (revision 4439) +++ /trunk/Nebulous/nebclient/configure.ac (revision 4440) @@ -1,10 +1,10 @@ dnl Copyright (C) 2005 Joshua Hoblitt dnl -dnl $Id: configure.ac,v 1.2 2005-01-16 10:37:59 jhoblitt Exp $ +dnl $Id: configure.ac,v 1.3 2005-06-30 02:35:05 jhoblitt Exp $ dnl Process this file with autoconf to produce a configure script. -AC_INIT([idataclient], [0.0.1], [jhoblitt@cpan.org]) +AC_INIT([nebulousclient], [0.0.1], [jhoblitt@cpan.org]) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -AC_REVISION([$Revision: 1.2 $]) +AC_REVISION([$Revision: 1.3 $]) dnl generate config.h Index: /trunk/Nebulous/nebclient/nebulous.wsdl =================================================================== --- /trunk/Nebulous/nebclient/nebulous.wsdl (revision 4439) +++ /trunk/Nebulous/nebclient/nebulous.wsdl (revision 4440) @@ -1,15 +1,15 @@ - + xmlns:ns="urn:Nebulous/Server/SOAP"> @@ -85,5 +85,5 @@ - + @@ -138,80 +138,80 @@ - + - - - - - - + + + + + - - - - - - + + + + + - - - - - - + + + + + - - - - - - + + + + + - - - - - - + + + + + - - - - - - + + + + + - - - - - - + + + + + @@ -220,7 +220,7 @@ - - - + + + Index: /trunk/Nebulous/nebclient/src/Makefile.am =================================================================== --- /trunk/Nebulous/nebclient/src/Makefile.am (revision 4439) +++ /trunk/Nebulous/nebclient/src/Makefile.am (revision 4440) @@ -1,12 +1,12 @@ # Copyright (C) 2005 Joshua Hoblitt # -# $Id: Makefile.am,v 1.3 2005-01-19 00:31:35 jhoblitt Exp $ +# $Id: Makefile.am,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ -include_HEADERS=idataclient.h -lib_LTLIBRARIES = libidataclient.la -libidataclient_la_LDFLAGS = -release @PACKAGE_VERSION@ -libidataclient_la_SOURCES =\ - idataclient.h\ - idataclient.c\ +include_HEADERS=nebclient.h +lib_LTLIBRARIES = libnebclient.la +libnebclient_la_LDFLAGS = -release @PACKAGE_VERSION@ +libnebclient_la_SOURCES =\ + nebclient.h\ + nebclient.c\ xmalloc.h\ xmalloc.c\ @@ -21,3 +21,3 @@ bin_PROGRAMS = test test_SOURCES = test.c -test_LDADD = libidataclient.la +test_LDADD = libnebclient.la Index: /trunk/Nebulous/nebclient/src/nebclient.c =================================================================== --- /trunk/Nebulous/nebclient/src/nebclient.c (revision 4439) +++ /trunk/Nebulous/nebclient/src/nebclient.c (revision 4440) @@ -1,8 +1,8 @@ /* - * idataclient.c - idata client + * nebclient.c - nebulous client * * Copyright (C) 2005 Joshua Hoblitt * - * $Id: nebclient.c,v 1.3 2005-06-06 21:21:05 jhoblitt Exp $ + * $Id: nebclient.c,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ */ @@ -18,17 +18,17 @@ #include "soapH.h" #include "SOAP.nsmap" -#include "idataclient.h" +#include "nebclient.h" #define ERRBUF_SIZE 255 -static off_t idataCopyFile(char *source, char *dest); -static off_t idataCopyFilehandle(int sourceFH, int destFH); - -void idataServerInit(idataServer *server) +static off_t nebCopyFile(char *source, char *dest); +static off_t nebCopyFilehandle(int sourceFH, int destFH); + +void nebServerInit(nebServer *server) { soap_init(server); } -char *idataServerErr(idataServer *server) +char *nebServerErr(nebServer *server) { char *fault; @@ -45,5 +45,5 @@ } -void idataServerCleanup(idataServer *server) +void nebServerCleanup(nebServer *server) { soap_end(server); // remove deserialized data and clean up @@ -51,5 +51,5 @@ } -int idataCreate(idataServer *server, char *key, unsigned int class, char *volume, char *comment, char **URI) +int nebCreate(nebServer *server, char *key, unsigned int class, char *volume, char *comment, char **URI) { struct ns1__create_USCOREobjectResponse response; @@ -61,5 +61,5 @@ strcpy(*URI, response.result); - if (!idataParseURI(*URI, &filename)) { + if (!nebParseURI(*URI, &filename)) { fprintf(stderr, "can not parse URI\n"); @@ -81,5 +81,5 @@ } -int idataReplicate(idataServer *server, char *key, char *volume, char **URI ) +int nebReplicate(nebServer *server, char *key, char *volume, char **URI ) { struct ns1__replicate_USCOREobjectResponse response; @@ -91,5 +91,5 @@ strcpy(*URI, response.result); - if (!idataParseURI(*URI, &filename)) { + if (!nebParseURI(*URI, &filename)) { fprintf(stderr, "can not parse URI\n"); @@ -97,5 +97,5 @@ } - sourceFH = idataOpen(server, key, IDATA_READ); + sourceFH = nebOpen(server, key, NEB_READ); if (sourceFH == -1) { fprintf(stderr, "can not open key %s\n", key ); @@ -111,5 +111,5 @@ } - idataCopyFilehandle(sourceFH, destFH); + nebCopyFilehandle(sourceFH, destFH); if (close(sourceFH) == -1) { @@ -130,23 +130,23 @@ } -int idataCull( idataServer *server,char *key ) -{ - - return 0; -} - -int idataLock(idataServer *server, char *key, rw flag ) -{ - - return 0; -} - -int idataUnlock(idataServer *server, char *key, rw flag ) -{ - - return 0; -} - -int idataFindInstances(idataServer *server, char *key, char *volume, char ***locations) +int nebCull( nebServer *server,char *key ) +{ + + return 0; +} + +int nebLock(nebServer *server, char *key, rw flag ) +{ + + return 0; +} + +int nebUnlock(nebServer *server, char *key, rw flag ) +{ + + return 0; +} + +int nebFindInstances(nebServer *server, char *key, char *volume, char ***locations) { struct ns1__find_USCOREinstancesResponse response; @@ -179,53 +179,53 @@ } -int idataFind(idataServer *server, char *key ) -{ - - return 0; -} - -int idataOpen(idataServer *server, char *key, rw flag ) -{ - - return 0; -} - -int idataDelete(idataServer *server, char *key ) -{ - - return 0; -} - -int idataCopy(idataServer *server, char *key, char *newKey ) -{ - - return 0; -} - -int idataMove(idataServer *server, char *key, char *newKey ) -{ - - return 0; -} - -int idataDelete_instance(idataServer *server, char *URI ) -{ - - return 0; -} - -int idataStat(idataServer *server, char *key ) -{ - - return 0; -} - -int idataErr(idataServer *server, char *errString ) -{ - - return 0; -} - -int idataParseURI(const char *URI, char **filename) +int nebFind(nebServer *server, char *key ) +{ + + return 0; +} + +int nebOpen(nebServer *server, char *key, rw flag ) +{ + + return 0; +} + +int nebDelete(nebServer *server, char *key ) +{ + + return 0; +} + +int nebCopy(nebServer *server, char *key, char *newKey ) +{ + + return 0; +} + +int nebMove(nebServer *server, char *key, char *newKey ) +{ + + return 0; +} + +int nebDelete_instance(nebServer *server, char *URI ) +{ + + return 0; +} + +int nebStat(nebServer *server, char *key ) +{ + + return 0; +} + +int nebErr(nebServer *server, char *errString ) +{ + + return 0; +} + +int nebParseURI(const char *URI, char **filename) { regex_t myregex; @@ -270,9 +270,9 @@ } -void idataFree(void *ptr) { +void nebFree(void *ptr) { xfree(ptr); } -static off_t idataCopyFile(char *source, char *dest) +static off_t nebCopyFile(char *source, char *dest) { int sourceFH; @@ -294,5 +294,5 @@ } - bytesCopied = idataCopyFilehandle(sourceFH, destFH); + bytesCopied = nebCopyFilehandle(sourceFH, destFH); if (bytesCopied < 0) { return -1; @@ -314,5 +314,5 @@ } -static off_t idataCopyFilehandle(int sourceFH, int destFH) +static off_t nebCopyFilehandle(int sourceFH, int destFH) { off_t bytesTotal; Index: /trunk/Nebulous/nebclient/src/nebclient.h =================================================================== --- /trunk/Nebulous/nebclient/src/nebclient.h (revision 4439) +++ /trunk/Nebulous/nebclient/src/nebclient.h (revision 4440) @@ -1,55 +1,55 @@ /* - * idataclient - idata client + * nebclient.h - nebulous client header * * Copyright (C) 2005 Joshua Hoblitt * - * $Id: nebclient.h,v 1.5 2005-06-06 21:21:05 jhoblitt Exp $ + * $Id: nebclient.h,v 1.6 2005-06-30 02:35:06 jhoblitt Exp $ */ -#ifndef IDATACLIENT_H -#define IDATACLIENT_H 1 +#ifndef NEBCLIENT_H +#define NEBCLIENT_H 1 #include "soapH.h" -typedef enum { IDATA_READ, IDATA_WRITE } rw; -typedef struct soap idataServer; +typedef enum { NEB_READ, NEB_WRITE } rw; +typedef struct soap nebServer; -void idataServerInit(idataServer *server); +void nebServerInit(nebServer *server); -char *idataServerErr(idataServer *server); +char *nebServerErr(nebServer *server); -void idataServerCleanup(idataServer *server); +void nebServerCleanup(nebServer *server); -int idataCreate(idataServer *server, char *key, unsigned int class, char *volume, char *comment, char **URI); +int nebCreate(nebServer *server, char *key, unsigned int class, char *volume, char *comment, char **URI); -int idataReplicate(idataServer *server, char *key, char *volume, char **URI); +int nebReplicate(nebServer *server, char *key, char *volume, char **URI); -int idataCull(idataServer *server, char *key); +int nebCull(nebServer *server, char *key); -int idataLock(idataServer *server, char *key, rw flag); +int nebLock(nebServer *server, char *key, rw flag); -int idataUnlock(idataServer *server, char *key, rw flag); +int nebUnlock(nebServer *server, char *key, rw flag); -int idataFindInstances(idataServer *server, char *key, char *volume, char ***locations); +int nebFindInstances(nebServer *server, char *key, char *volume, char ***locations); -int idataFind(idataServer *server, char *key); +int nebFind(nebServer *server, char *key); -int idataOpen(idataServer *server, char *key, rw flag); +int nebOpen(nebServer *server, char *key, rw flag); -int idataDelete(idataServer *server, char *key); +int nebDelete(nebServer *server, char *key); -int idataCopy(idataServer *server, char *key, char *newKey); +int nebCopy(nebServer *server, char *key, char *newKey); -int idataMove(idataServer *server, char *key, char *newKey); +int nebMove(nebServer *server, char *key, char *newKey); -int idataDelete_instance(idataServer *server, char *URI); +int nebDelete_instance(nebServer *server, char *URI); -int idataStat(idataServer *server, char *key); +int nebStat(nebServer *server, char *key); -int idataErr(idataServer *server, char *errString); +int nebErr(nebServer *server, char *errString); -int idataParseURI(const char *URI, char **filename); +int nebParseURI(const char *URI, char **filename); -void idataFree(void *ptr); +void nebFree(void *ptr); -#endif // IDATACLIENT_H +#endif // NEBLIENT_H Index: /trunk/Nebulous/nebclient/src/test.c =================================================================== --- /trunk/Nebulous/nebclient/src/test.c (revision 4439) +++ /trunk/Nebulous/nebclient/src/test.c (revision 4440) @@ -1,8 +1,8 @@ #include #include -#include "idataclient.h" +#include "nebclient.h" int main (int argc, char **argv) { - idataServer server; + nebServer server; char *URI; int fh; @@ -10,12 +10,12 @@ char **foo; - idataServerInit(&server); + nebServerInit(&server); - fh = idataCreate(&server, argv[1], 0, NULL, NULL, &URI); + fh = nebCreate(&server, argv[1], 0, NULL, NULL, &URI); if (fh > 0) { printf( "uri is %s\n", URI ); - idataFree(URI); + nebFree(URI); if(close(fh) != 0){ @@ -25,11 +25,11 @@ printf( "local error\n" ); } else { - printf( "server error: %s\n", idataServerErr(&server) ); + printf( "server error: %s\n", nebServerErr(&server) ); } - n = idataFindInstances(&server, argv[1], NULL, &foo); + n = nebFindInstances(&server, argv[1], NULL, &foo); printf( "found %d instances\n", n ); - idataServerCleanup(&server); + nebServerCleanup(&server); exit(0); Index: /trunk/Nebulous/nebulous.wsdl =================================================================== --- /trunk/Nebulous/nebulous.wsdl (revision 4439) +++ /trunk/Nebulous/nebulous.wsdl (revision 4440) @@ -1,8 +1,8 @@ - + - @@ -53,11 +53,11 @@ - + - + Index: /trunk/Nebulous/scripts/bench_test.pl =================================================================== --- /trunk/Nebulous/scripts/bench_test.pl (revision 4439) +++ /trunk/Nebulous/scripts/bench_test.pl (revision 4440) @@ -7,8 +7,8 @@ use Benchmark qw( timethese ); -use PS::IPP::IData::Client; +use Nebulous::Client; -my $idata = PS::IPP::IData::Client->new( - proxy => 'http://localhost:80/idata' +my $neb = Nebulous::Client->new( + proxy => 'http://localhost:80/nebulous' ); @@ -18,7 +18,7 @@ { 'create/delete' => sub { - my $fh = $idata->create( $key ); + my $fh = $neb->create( $key ); close $fh; - $idata->delete( $key ); + $neb->delete( $key ); }, } Index: /trunk/Nebulous/scripts/imageserver.pl =================================================================== --- /trunk/Nebulous/scripts/imageserver.pl (revision 4439) +++ /trunk/Nebulous/scripts/imageserver.pl (revision 4440) @@ -8,7 +8,7 @@ use SOAP::Transport::HTTP; -use PS::IPP::IData::Server; +use Nebulous::Server; SOAP::Transport::HTTP::CGI - -> dispatch_to( 'PS::IPP::IData::Server' ) + -> dispatch_to( 'Nebulous::Server' ) -> handle; Index: /trunk/Nebulous/scripts/ptest.pl =================================================================== --- /trunk/Nebulous/scripts/ptest.pl (revision 4439) +++ /trunk/Nebulous/scripts/ptest.pl (revision 4440) @@ -6,9 +6,8 @@ use lib "./lib"; -use PS::IPP::IData::Client; +use Nebulous::Client; -my $idata = PS::IPP::IData::Client->new( - uri => 'http://localhost:80/PS/IPP/IData/Server', - proxy => 'http://localhost:80/idata' +my $neb = Nebulous::Client->new( + proxy => 'http://localhost:80/nebulous' ); @@ -22,5 +21,5 @@ unless ( $pid ) { my $fname = "${key}_$id"; - my $fh = $idata->create( $fname ); + my $fh = $neb->create( $fname ); die "can't create file $fname" unless $fh; @@ -28,17 +27,17 @@ close $fh; - $idata->unlock( $fname, 'write' ); + $neb->unlock( $fname, 'write' ); - $fh = $idata->open( $fname, 'read' ) or die "can't open file"; + $fh = $neb->open( $fname, 'read' ) or die "can't open file"; close $fh; - $idata->unlock( $fname, 'read' ); + $neb->unlock( $fname, 'read' ); - $idata->replicate( $fname ); - $idata->cull( $fname ); - $idata->find( $fname ); - $idata->copy( $fname, $fname . "_copy" ); - $idata->move( $fname, $fname . "_move" ); - $idata->delete( $fname . "_copy" ); - $idata->delete( $fname . "_move" ); + $neb->replicate( $fname ); + $neb->cull( $fname ); + $neb->find( $fname ); + $neb->copy( $fname, $fname . "_copy" ); + $neb->move( $fname, $fname . "_move" ); + $neb->delete( $fname . "_copy" ); + $neb->delete( $fname . "_move" ); exit 0; Index: /trunk/Nebulous/scripts/stest.pl =================================================================== --- /trunk/Nebulous/scripts/stest.pl (revision 4439) +++ /trunk/Nebulous/scripts/stest.pl (revision 4440) @@ -6,18 +6,18 @@ use lib "./lib"; -use PS::IPP::IData::Client; # trace => 'debug'; +use Nebulous::Client; # trace => 'debug'; -my $idata = PS::IPP::IData::Client->new( - proxy => 'http://localhost:80/idata' +my $neb = Nebulous::Client->new( + proxy => 'http://localhost:80/nebulous' ); my $fname = shift; -#my $fh = $idata->create( $fname ); -#$idata->unlock( $fname, 'write' ); +#my $fh = $neb->create( $fname ); +#$neb->unlock( $fname, 'write' ); -$idata->create( $fname, 1 ); -$idata->unlock( $fname, 'write' ); -$idata->delete( $fname ); +$neb->create( $fname, 1 ); +$neb->unlock( $fname, 'write' ); +$neb->delete( $fname ); __END__ @@ -28,5 +28,5 @@ print $fh "fooby\n"; close $fh; - #$idata->unlock( $fname, 'write' ); + #$neb->unlock( $fname, 'write' ); my $filesize = (stat( $key ))[7]; print "created file $key, ${filesize}bytes\n"; Index: /trunk/Nebulous/t/01_load.t =================================================================== --- /trunk/Nebulous/t/01_load.t (revision 4439) +++ /trunk/Nebulous/t/01_load.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 01_load.t,v 1.6 2005-06-30 01:37:16 jhoblitt Exp $ +# $Id: 01_load.t,v 1.7 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,10 +12,10 @@ use Test::More tests => 8; -BEGIN { use_ok( 'PS::IPP::IData::Client' ); } -BEGIN { use_ok( 'PS::IPP::IData::Client::Log' ); } -BEGIN { use_ok( 'PS::IPP::IData::Client::HTTP' ); } -BEGIN { use_ok( 'PS::IPP::IData::Util' ); } -BEGIN { use_ok( 'PS::IPP::IData::Server' ); } -BEGIN { use_ok( 'PS::IPP::IData::Server::SQL' ); } -BEGIN { use_ok( 'PS::IPP::IData::Server::Log' ); } -BEGIN { use_ok( 'PS::IPP::IData::Server::SOAP' ); } +BEGIN { use_ok( 'Nebulous::Client' ); } +BEGIN { use_ok( 'Nebulous::Client::Log' ); } +BEGIN { use_ok( 'Nebulous::Client::HTTP' ); } +BEGIN { use_ok( 'Nebulous::Util' ); } +BEGIN { use_ok( 'Nebulous::Server' ); } +BEGIN { use_ok( 'Nebulous::Server::SQL' ); } +BEGIN { use_ok( 'Nebulous::Server::Log' ); } +BEGIN { use_ok( 'Nebulous::Server::SOAP' ); } Index: /trunk/Nebulous/t/02_server_setup.t =================================================================== --- /trunk/Nebulous/t/02_server_setup.t (revision 4439) +++ /trunk/Nebulous/t/02_server_setup.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 02_server_setup.t,v 1.2 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 02_server_setup.t,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use Test::IData; +use Nebulous::Server; +use Test::Nebulous; -Test::IData->setup; +Test::Nebulous->setup; ok( - PS::IPP::IData::Server->setup( + Nebulous::Server->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -26,8 +26,8 @@ ); -Test::IData->setup; +Test::Nebulous->setup; eval { - PS::IPP::IData::Server->setup( + Nebulous::Server->setup( "DBI:mysql:database=foobar:host=localhost", "baz", @@ -37,3 +37,3 @@ like( $@, qr/DBI connect.*? failed/, "bad dsn/user/pass" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/03_server_create_object.t =================================================================== --- /trunk/Nebulous/t/03_server_create_object.t (revision 4439) +++ /trunk/Nebulous/t/03_server_create_object.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 03_server_create_object.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 03_server_create_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Server; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; -my $idata = "PS::IPP::IData::Server"; +my $neb = "Nebulous::Server"; -$idata->setup( +$neb->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -24,9 +24,9 @@ ); -Test::IData->setup; +Test::Nebulous->setup; { # key - my $uri = $idata->create_object( "foo" ); + my $uri = $neb->create_object( "foo" ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -34,9 +34,9 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, class - my $uri = $idata->create_object( "foo", 0 ); + my $uri = $neb->create_object( "foo", 0 ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -44,9 +44,9 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, class, volume - my $uri = $idata->create_object( "foo", 0, "node01" ); + my $uri = $neb->create_object( "foo", 0, "node01" ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -54,9 +54,9 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, class, volume, comment - my $uri = $idata->create_object( "foo", 0, "node01", "this is foo" ); + my $uri = $neb->create_object( "foo", 0, "node01", "this is foo" ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -64,25 +64,25 @@ } -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); + $neb->create_object( "foo" ); }; like( $@, qr/Duplicate entry/, "object already exists" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object(); + $neb->create_object(); }; like( $@, qr/2 - 4 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( 1, 2, 3, 4, 5 ); + $neb->create_object( 1, 2, 3, 4, 5 ); }; like( $@, qr/2 - 4 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/04_server_replicate_object.t =================================================================== --- /trunk/Nebulous/t/04_server_replicate_object.t (revision 4439) +++ /trunk/Nebulous/t/04_server_replicate_object.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 04_server_replicate_object.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 04_server_replicate_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Server; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; -my $idata = "PS::IPP::IData::Server"; +my $neb = "Nebulous::Server"; -$idata->setup( +$neb->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -24,10 +24,10 @@ ); -Test::IData->setup; +Test::Nebulous->setup; { # key - $idata->create_object( "foo" ); - my $uri = $idata->replicate_object( "foo" ); + $neb->create_object( "foo" ); + my $uri = $neb->replicate_object( "foo" ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -35,10 +35,10 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, $volume - $idata->create_object( "foo" ); - my $uri = $idata->replicate_object( "foo", "node01" ); + $neb->create_object( "foo" ); + my $uri = $neb->replicate_object( "foo", "node01" ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -46,11 +46,11 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, $volume - $idata->create_object( "foo" ); - my $uri1 = $idata->replicate_object( "foo", "node01" ); - my $uri2 = $idata->replicate_object( "foo", "node02" ); + $neb->create_object( "foo" ); + my $uri1 = $neb->replicate_object( "foo", "node01" ); + my $uri2 = $neb->replicate_object( "foo", "node02" ); ok( -e _get_file_path( $uri1 ), "file exists" ); @@ -60,24 +60,24 @@ } -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->replicate_object( "foo" ); + $neb->replicate_object( "foo" ); }; like( $@, qr/storage object does not exist/, "storage object does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->replicate_object(); + $neb->replicate_object(); }; like( $@, qr/1 - 2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->replicate_object( 1, 2, 3 ); + $neb->replicate_object( 1, 2, 3 ); }; like( $@, qr/1 - 2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/05_server_lock_object.t =================================================================== --- /trunk/Nebulous/t/05_server_lock_object.t (revision 4439) +++ /trunk/Nebulous/t/05_server_lock_object.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 05_server_lock_object.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 05_server_lock_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Server; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; -my $idata = "PS::IPP::IData::Server"; +my $neb = "Nebulous::Server"; -$idata->setup( +$neb->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -24,100 +24,100 @@ ); -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - ok( $idata->lock_object( "foo", "read" ), "read lock" ); + ok( $neb->lock_object( "foo", "read" ), "read lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - ok( $idata->lock_object( "foo", "read" ), "read lock" ); - ok( $idata->lock_object( "foo", "read" ), "read lock" ); + ok( $neb->lock_object( "foo", "read" ), "read lock" ); + ok( $neb->lock_object( "foo", "read" ), "read lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - ok( $idata->lock_object( "foo", "write" ), "write lock" ); + ok( $neb->lock_object( "foo", "write" ), "write lock" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->lock_object( "foo", "read" ); + $neb->lock_object( "foo", "read" ); }; like( $@, qr/storage object does not exist/, "storage object does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "write" ); }; like( $@, qr/storage object does not exist/, "storage object does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "write" ); - $idata->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "write" ); }; like( $@, qr/can not write lock twice/, "can not write lock twice" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "read" ); - $idata->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "read" ); + $neb->lock_object( "foo", "write" ); }; like( $@, qr/can not write lock after read lock/, "can not write lock after read lock" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "write" ); - $idata->lock_object( "foo", "read" ); + $neb->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "read" ); }; like( $@, qr/can not read lock after write lock/, "can not read lock after write lock" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->lock_object(); + $neb->lock_object(); }; like( $@, qr/2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->lock_object( "foo" ); + $neb->lock_object( "foo" ); }; like( $@, qr/2 were expected/, "not enough params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->lock_object( "foo", "both" ); + $neb->lock_object( "foo", "both" ); }; like( $@, qr/is read or write/, "not read or write" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->lock_object( "foo", 'read', 3 ); + $neb->lock_object( "foo", 'read', 3 ); }; like( $@, qr/2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/06_server_unlock_object.t =================================================================== --- /trunk/Nebulous/t/06_server_unlock_object.t (revision 4439) +++ /trunk/Nebulous/t/06_server_unlock_object.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 06_server_unlock_object.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 06_server_unlock_object.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Server; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; -my $idata = "PS::IPP::IData::Server"; +my $neb = "Nebulous::Server"; -$idata->setup( +$neb->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -24,115 +24,115 @@ ); -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "read" ); + $neb->lock_object( "foo", "read" ); - ok( $idata->unlock_object( "foo", "read" ), "read unlock" ); + ok( $neb->unlock_object( "foo", "read" ), "read unlock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "read" ); - $idata->lock_object( "foo", "read" ); + $neb->lock_object( "foo", "read" ); + $neb->lock_object( "foo", "read" ); - ok( $idata->unlock_object( "foo", "read" ), "read unlock" ); - ok( $idata->unlock_object( "foo", "read" ), "read unlock" ); + ok( $neb->unlock_object( "foo", "read" ), "read unlock" ); + ok( $neb->unlock_object( "foo", "read" ), "read unlock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "write" ); - ok( $idata->unlock_object( "foo", "write" ), "write unlock" ); + ok( $neb->unlock_object( "foo", "write" ), "write unlock" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->unlock_object( "foo", "read" ); + $neb->unlock_object( "foo", "read" ); }; like( $@, qr/storage object does not exist/, "storage object does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->unlock_object( "foo", "write" ); + $neb->unlock_object( "foo", "write" ); }; like( $@, qr/storage object does not exist/, "storage object does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->unlock_object( "foo", "read" ); + $neb->unlock_object( "foo", "read" ); }; like( $@, qr/can not remove non-existant read lock/, "no lock set" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->unlock_object( "foo", "write" ); + $neb->unlock_object( "foo", "write" ); }; like( $@, qr/can not remove non-existant write lock/, "no lock set" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); - $idata->lock_object( "foo", "write" ); + $neb->create_object( "foo" ); + $neb->lock_object( "foo", "write" ); - $idata->unlock_object( "foo", "read" ); + $neb->unlock_object( "foo", "read" ); }; like( $@, qr/can not have a read lock under a write lock/, "read unlock under write lock" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->create_object( "foo" ); - $idata->lock_object( "foo", "read" ); + $neb->create_object( "foo" ); + $neb->lock_object( "foo", "read" ); - $idata->unlock_object( "foo", "write" ); + $neb->unlock_object( "foo", "write" ); }; like( $@, qr/can not have a write lock under a read lock/, "write unlock under read lock" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->unlock_object(); + $neb->unlock_object(); }; like( $@, qr/2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->unlock_object( "foo" ); + $neb->unlock_object( "foo" ); }; like( $@, qr/2 were expected/, "not enough params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->unlock_object( "foo", "both" ); + $neb->unlock_object( "foo", "both" ); }; like( $@, qr/is read or write/, "not read or write" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->unlock_object( "foo", 'read', 3 ); + $neb->unlock_object( "foo", 'read', 3 ); }; like( $@, qr/2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/07_server_find_instances.t =================================================================== --- /trunk/Nebulous/t/07_server_find_instances.t (revision 4439) +++ /trunk/Nebulous/t/07_server_find_instances.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 07_server_find_instances.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 07_server_find_instances.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Server; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; -my $idata = "PS::IPP::IData::Server"; +my $neb = "Nebulous::Server"; -$idata->setup( +$neb->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -24,46 +24,46 @@ ); -Test::IData->setup; +Test::Nebulous->setup; { # key - my $uri = $idata->create_object( "foo" ); + my $uri = $neb->create_object( "foo" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); is( $uri, $locations->[0], "URIs match" ); } -Test::IData->setup; +Test::Nebulous->setup; { # key - my $uri1 = $idata->create_object( "foo" ); - my $uri2 = $idata->replicate_object( "foo" ); + my $uri1 = $neb->create_object( "foo" ); + my $uri2 = $neb->replicate_object( "foo" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); ok( eq_set( [$uri1, $uri2], $locations ), "URIs match" ); } -Test::IData->setup; +Test::Nebulous->setup; { # key, volume - my $uri = $idata->create_object( "foo" ); + my $uri = $neb->create_object( "foo" ); - my $locations = $idata->find_instances( "foo", "node01" ); + my $locations = $neb->find_instances( "foo", "node01" ); is( $uri, $locations->[0], "URIs match" ); } -Test::IData->setup; +Test::Nebulous->setup; { # key - my $uri1 = $idata->create_object( "foo" ); - my $uri2 = $idata->replicate_object( "foo" ); + my $uri1 = $neb->create_object( "foo" ); + my $uri2 = $neb->replicate_object( "foo" ); - my $locations = $idata->find_instances( "foo", "node01" ); + my $locations = $neb->find_instances( "foo", "node01" ); ok( eq_set( [$uri1, $uri2], $locations ), "URIs match" ); @@ -71,24 +71,24 @@ -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->find_instances( "foo" ); + $neb->find_instances( "foo" ); }; like( $@, qr/no instances found/, "storage object does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->find_instances(); + $neb->find_instances(); }; like( $@, qr/1 - 2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->find_instances( "foo", 'read', 3 ); + $neb->find_instances( "foo", 'read', 3 ); }; like( $@, qr/1 - 2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/08_server_delete_instance.t =================================================================== --- /trunk/Nebulous/t/08_server_delete_instance.t (revision 4439) +++ /trunk/Nebulous/t/08_server_delete_instance.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 08_server_delete_instance.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 08_server_delete_instance.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Server; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; -my $idata = "PS::IPP::IData::Server"; +my $neb = "Nebulous::Server"; -$idata->setup( +$neb->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -24,52 +24,52 @@ ); -Test::IData->setup; +Test::Nebulous->setup; { - my $uri = $idata->create_object( "foo" ); + my $uri = $neb->create_object( "foo" ); - ok( $idata->delete_instance( $uri ), "delete instance" ); + ok( $neb->delete_instance( $uri ), "delete instance" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $uri1 = $idata->create_object( "foo" ); - my $uri2 = $idata->replicate_object( "foo" ); + my $uri1 = $neb->create_object( "foo" ); + my $uri2 = $neb->replicate_object( "foo" ); - ok( $idata->delete_instance( $uri1 ), "delete instance" ); + ok( $neb->delete_instance( $uri1 ), "delete instance" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); is( $locations->[0], $uri2, "instance remains" ); - ok( $idata->delete_instance( $uri2 ), "delete instance" ); + ok( $neb->delete_instance( $uri2 ), "delete instance" ); eval { - $idata->find_instances( "foo" ); + $neb->find_instances( "foo" ); }; like( $@, qr/no instances found/, "storage object was deleted" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->delete_instance( "file:/foo" ); + $neb->delete_instance( "file:/foo" ); }; like( $@, qr/no instance is associated with uri/, "uri does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->delete_instance(); + $neb->delete_instance(); }; like( $@, qr/1 was expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->delete_instance( "foo", 2 ); + $neb->delete_instance( "foo", 2 ); }; like( $@, qr/1 was expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/09_server_stat_object.t =================================================================== --- /trunk/Nebulous/t/09_server_stat_object.t (revision 4439) +++ /trunk/Nebulous/t/09_server_stat_object.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 09_server_stat_object.t,v 1.4 2005-01-15 04:02:12 jhoblitt Exp $ +# $Id: 09_server_stat_object.t,v 1.5 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -12,11 +12,11 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Server; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Server; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; -my $idata = "PS::IPP::IData::Server"; +my $neb = "Nebulous::Server"; -$idata->setup( +$neb->setup( "DBI:mysql:database=test:host=localhost", "test", @@ -24,20 +24,20 @@ ); -Test::IData->setup; +Test::Nebulous->setup; { - my $uri = $idata->create_object( "foo" ); + my $uri = $neb->create_object( "foo" ); - my $info = $idata->stat_object( "foo" ); + my $info = $neb->stat_object( "foo" ); is( scalar @$info, 8, "number of columns" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $uri = $idata->create_object( "foo", 9, "node01", "foobar" ); + my $uri = $neb->create_object( "foo", 9, "node01", "foobar" ); - my $info = $idata->stat_object( "foo" ); + my $info = $neb->stat_object( "foo" ); is( scalar @$info, 8, "number of columns" ); @@ -52,24 +52,24 @@ } -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->stat_object( "foo" ); + $neb->stat_object( "foo" ); }; like( $@, qr/no storage object found/, "object does not exist" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->stat_object(); + $neb->stat_object(); }; like( $@, qr/1 was expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - $idata->stat_object( "foo", 2 ); + $neb->stat_object( "foo", 2 ); }; like( $@, qr/1 was expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/10_client_new.t =================================================================== --- /trunk/Nebulous/t/10_client_new.t (revision 4439) +++ /trunk/Nebulous/t/10_client_new.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 10_client_new.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 10_client_new.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,42 +14,42 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - isa_ok( $idata, "PS::IPP::IData::Client" ); + isa_ok( $neb, "Nebulous::Client" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - uri => "http://example.com/PS/IPP/IData/Client", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + uri => "http://example.com/PS/IPP/Nebulous/Client", ); - isa_ok( $idata, "PS::IPP::IData::Client" ); + isa_ok( $neb, "Nebulous::Client" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - PS::IPP::IData::Client->new; + Nebulous::Client->new; }; like( $@, qr/Mandatory parameter/, "no proxy" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - PS::IPP::IData::Client->new( + Nebulous::Client->new( proxy => "foo", dog => "do" @@ -58,3 +58,3 @@ like( $@, qr/not listed in the validation options/, "bad param" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/11_client_create.t =================================================================== --- /trunk/Nebulous/t/11_client_create.t (revision 4439) +++ /trunk/Nebulous/t/11_client_create.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 11_client_create.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 11_client_create.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,94 +14,94 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $fh = $idata->create( "foo" ); + my $fh = $neb->create( "foo" ); is( ref $fh, 'GLOB', "good filehandle" ); } -Test::IData->setup; +Test::Nebulous->setup; { # key, class - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $fh = $idata->create( "foo", 0 ); + my $fh = $neb->create( "foo", 0 ); is( ref $fh, 'GLOB', "good filehandle" ); } -Test::IData->setup; +Test::Nebulous->setup; { # key, class, volume - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $fh = $idata->create( "foo", 0, "node01" ); + my $fh = $neb->create( "foo", 0, "node01" ); is( ref $fh, 'GLOB', "good filehandle" ); } -Test::IData->setup; +Test::Nebulous->setup; { # key, class, volume, comment - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $fh = $idata->create( "foo", 0, "node01", "this is foo" ); + my $fh = $neb->create( "foo", 0, "node01", "this is foo" ); is( ref $fh, 'GLOB', "good filehandle" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - is( $idata->create( "foo" ), undef, "object already exists" ); + $neb->create( "foo" ); + is( $neb->create( "foo" ), undef, "object already exists" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create(); + $neb->create(); }; like( $@, qr/2 - 4 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( 1, 2, 3, 4, 5 ); + $neb->create( 1, 2, 3, 4, 5 ); }; like( $@, qr/2 - 4 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/12_client_replicate.t =================================================================== --- /trunk/Nebulous/t/12_client_replicate.t (revision 4439) +++ /trunk/Nebulous/t/12_client_replicate.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 12_client_replicate.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 12_client_replicate.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,20 +14,20 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - my $uri = $idata->replicate( "foo" ); + my $uri = $neb->replicate( "foo" ); ok( $uri, "good replication" ); @@ -35,14 +35,14 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, $volume - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - my $uri = $idata->replicate( "foo", "node01" ); + my $uri = $neb->replicate( "foo", "node01" ); ok( $uri, "good replication" ); @@ -50,15 +50,15 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, $volume - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - my $uri1 = $idata->replicate( "foo", "node01" ); - my $uri2 = $idata->replicate( "foo", "node02" ); + my $uri1 = $neb->replicate( "foo", "node01" ); + my $uri2 = $neb->replicate( "foo", "node02" ); ok( $uri1, "good replication" ); @@ -68,34 +68,34 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $uri = $idata->replicate( "foo" ); + my $uri = $neb->replicate( "foo" ); is( $uri, undef, "storage object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->replicate(); + $neb->replicate(); }; like( $@, qr/1 - 2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->replicate( 1, 2, 3 ); + $neb->replicate( 1, 2, 3 ); }; like( $@, qr/1 - 2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/13_client_cull.t =================================================================== --- /trunk/Nebulous/t/13_client_cull.t (revision 4439) +++ /trunk/Nebulous/t/13_client_cull.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 13_client_cull.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 13_client_cull.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,21 +14,21 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->replicate( "foo" ); + $neb->create( "foo" ); + $neb->replicate( "foo" ); - my $uri = $idata->cull( "foo" ); + my $uri = $neb->cull( "foo" ); ok( $uri, "good cull" ); @@ -36,5 +36,5 @@ } -Test::IData->setup; +Test::Nebulous->setup; SKIP: { @@ -42,11 +42,11 @@ # key, $volume - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->replicate( "foo", "node01" ); + $neb->create( "foo" ); + $neb->replicate( "foo", "node01" ); - my $uri = $idata->cull( "foo", "node01" ); + my $uri = $neb->cull( "foo", "node01" ); ok( $uri, "good cull" ); @@ -54,18 +54,18 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - $idata->replicate( "foo", "node01" ); - $idata->replicate( "foo", "node02" ); + $neb->replicate( "foo", "node01" ); + $neb->replicate( "foo", "node02" ); - my $uri1 = $idata->cull( "foo" ); - my $uri2 = $idata->cull( "foo" ); + my $uri1 = $neb->cull( "foo" ); + my $uri2 = $neb->cull( "foo" ); ok( $uri1, "good cull" ); @@ -75,5 +75,5 @@ } -Test::IData->setup; +Test::Nebulous->setup; SKIP: { @@ -81,14 +81,14 @@ # key, $volume - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - $idata->replicate( "foo", "node01" ); - $idata->replicate( "foo", "node02" ); + $neb->replicate( "foo", "node01" ); + $neb->replicate( "foo", "node02" ); - my $uri1 = $idata->cull( "foo", "node01" ); - my $uri2 = $idata->cull( "foo", "node02" ); + my $uri1 = $neb->cull( "foo", "node01" ); + my $uri2 = $neb->cull( "foo", "node02" ); ok( $uri1, "good cull" ); @@ -98,34 +98,34 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $uri = $idata->cull( "foo" ); + my $uri = $neb->cull( "foo" ); is( $uri, undef, "storage object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->cull(); + $neb->cull(); }; like( $@, qr/1 was expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->cull( 1, 2 ); + $neb->cull( 1, 2 ); }; like( $@, qr/1 was expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/14_client_lock.t =================================================================== --- /trunk/Nebulous/t/14_client_lock.t (revision 4439) +++ /trunk/Nebulous/t/14_client_lock.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 14_client_lock.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 14_client_lock.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,91 +14,91 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { # key, type - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - ok( $idata->lock( "foo", "read" ), "read lock" ); -} - -Test::IData->setup; - -{ - # key, type, timeout - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - ok( $idata->lock( "foo", "read", 10 ), "read lock" ); -} - -Test::IData->setup; - -{ - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - ok( $idata->lock( "foo", "read" ), "read lock" ); - ok( $idata->lock( "foo", "read" ), "read lock" ); -} - -Test::IData->setup; + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + ok( $neb->lock( "foo", "read" ), "read lock" ); +} + +Test::Nebulous->setup; + +{ + # key, type, timeout + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + ok( $neb->lock( "foo", "read", 10 ), "read lock" ); +} + +Test::Nebulous->setup; + +{ + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + ok( $neb->lock( "foo", "read" ), "read lock" ); + ok( $neb->lock( "foo", "read" ), "read lock" ); +} + +Test::Nebulous->setup; { # key, type - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - ok( $idata->lock( "foo", "write" ), "write lock" ); -} - -Test::IData->setup; - -{ - # key, type, timeout - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - ok( $idata->lock( "foo", "write", 10 ), "write lock" ); -} - -Test::IData->setup; - -{ - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - - is( $idata->lock( "foo", "read" ), undef, "storage object does not exist" ); -} - -Test::IData->setup; - -{ - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - - is( $idata->lock( "foo", "write" ), undef, "storage object does not exist" ); -} - -Test::IData->setup; + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + ok( $neb->lock( "foo", "write" ), "write lock" ); +} + +Test::Nebulous->setup; + +{ + # key, type, timeout + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + ok( $neb->lock( "foo", "write", 10 ), "write lock" ); +} + +Test::Nebulous->setup; + +{ + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + + is( $neb->lock( "foo", "read" ), undef, "storage object does not exist" ); +} + +Test::Nebulous->setup; + +{ + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + + is( $neb->lock( "foo", "write" ), undef, "storage object does not exist" ); +} + +Test::Nebulous->setup; diag "testing a spinlock, this will be a litle slow..."; @@ -109,11 +109,11 @@ # key, type, timeout - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - $idata->lock( "foo", "read" ); - $idata->lock( "foo", "write" ); + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + $neb->lock( "foo", "read" ); + $neb->lock( "foo", "write" ); alarm 0; @@ -121,5 +121,5 @@ like( $@, qr/timeout/, "default spinlock" ); -Test::IData->setup; +Test::Nebulous->setup; diag "testing a spinlock, this will be a litle slow..."; @@ -130,11 +130,11 @@ # key, type, timeout - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - $idata->lock( "foo", "read" ); - unless ( $idata->lock( "foo", "write" ) ) { + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + $neb->lock( "foo", "read" ); + unless ( $neb->lock( "foo", "write" ) ) { alarm 0; die "gaveup"; @@ -145,5 +145,5 @@ like( $@, qr/gaveup/, "default spinlock" ); -Test::IData->setup; +Test::Nebulous->setup; diag "testing a spinlock, this will be a litle slow..."; @@ -154,11 +154,11 @@ # key, type, timeout - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - $idata->lock( "foo", "read" ); - $idata->lock( "foo", "write", 5 ); + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + $neb->lock( "foo", "read" ); + $neb->lock( "foo", "write", 5 ); alarm 0; @@ -166,5 +166,5 @@ like( $@, qr/timeout/, "specified spinlock" ); -Test::IData->setup; +Test::Nebulous->setup; diag "testing a spinlock, this will be a litle slow..."; @@ -175,11 +175,11 @@ # key, type, timeout - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - $idata->lock( "foo", "read" ); - unless ( $idata->lock( "foo", "write", 5 ) ) { + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + $neb->lock( "foo", "read" ); + unless ( $neb->lock( "foo", "write", 5 ) ) { alarm 0; die "gaveup"; @@ -191,83 +191,83 @@ like( $@, qr/gaveup/, "specified spinlock" ); -Test::IData->setup; - -{ - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - $idata->lock( "foo", "write" ); - is( $idata->lock( "foo", "write", 1 ), undef, "can not write lock twice" ); -} - -Test::IData->setup; - -{ - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - $idata->lock( "foo", "read" ); - is( $idata->lock( "foo", "write", 1 ), undef, "can not write lock after read lock" ); -} - -Test::IData->setup; - -{ - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - $idata->create( "foo" ); - - $idata->lock( "foo", "write" ); - is( $idata->lock( "foo", "read", 1 ), undef, "can not read lock after write lock" ); -} - -Test::IData->setup; - -eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - - $idata->lock(); +Test::Nebulous->setup; + +{ + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + $neb->lock( "foo", "write" ); + is( $neb->lock( "foo", "write", 1 ), undef, "can not write lock twice" ); +} + +Test::Nebulous->setup; + +{ + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + $neb->lock( "foo", "read" ); + is( $neb->lock( "foo", "write", 1 ), undef, "can not write lock after read lock" ); +} + +Test::Nebulous->setup; + +{ + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + $neb->create( "foo" ); + + $neb->lock( "foo", "write" ); + is( $neb->lock( "foo", "read", 1 ), undef, "can not read lock after write lock" ); +} + +Test::Nebulous->setup; + +eval { + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + + $neb->lock(); }; like( $@, qr/2 - 3 were expected/, "no params" ); -Test::IData->setup; - -eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - - $idata->lock( "foo" ); +Test::Nebulous->setup; + +eval { + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + + $neb->lock( "foo" ); }; like( $@, qr/2 - 3 were expected/, "not enough params" ); -Test::IData->setup; - -eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - - $idata->lock( "foo", "both" ); +Test::Nebulous->setup; + +eval { + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + + $neb->lock( "foo", "both" ); }; like( $@, qr/is read or write/, "not read or write" ); -Test::IData->setup; - -eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", - ); - - $idata->lock( "foo", 'read', 3, "bar" ); +Test::Nebulous->setup; + +eval { + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", + ); + + $neb->lock( "foo", 'read', 3, "bar" ); }; like( $@, qr/2 - 3 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/15_client_unlock.t =================================================================== --- /trunk/Nebulous/t/15_client_unlock.t (revision 4439) +++ /trunk/Nebulous/t/15_client_unlock.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 15_client_unlock.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 15_client_unlock.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,157 +14,157 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->lock( "foo", "read" ); + $neb->create( "foo" ); + $neb->lock( "foo", "read" ); - ok( $idata->unlock( "foo", "read" ), "read unlock" ); + ok( $neb->unlock( "foo", "read" ), "read unlock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->lock( "foo", "read" ); - $idata->lock( "foo", "read" ); + $neb->create( "foo" ); + $neb->lock( "foo", "read" ); + $neb->lock( "foo", "read" ); - ok( $idata->unlock( "foo", "read" ), "read unlock" ); - ok( $idata->unlock( "foo", "read" ), "read unlock" ); + ok( $neb->unlock( "foo", "read" ), "read unlock" ); + ok( $neb->unlock( "foo", "read" ), "read unlock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->lock( "foo", "write" ); + $neb->create( "foo" ); + $neb->lock( "foo", "write" ); - ok( $idata->unlock( "foo", "write" ), "write unlock" ); + ok( $neb->unlock( "foo", "write" ), "write unlock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - is( $idata->unlock( "foo", "read" ), undef, "storage object does not exist" ); + is( $neb->unlock( "foo", "read" ), undef, "storage object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - is( $idata->unlock( "foo", "write" ), undef, "storage object does not exist" ); + is( $neb->unlock( "foo", "write" ), undef, "storage object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - is( $idata->unlock( "foo", "read" ), undef, "no lock set" ); + is( $neb->unlock( "foo", "read" ), undef, "no lock set" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - is( $idata->unlock( "foo", "write" ), undef, "no lock set" ); + is( $neb->unlock( "foo", "write" ), undef, "no lock set" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->lock( "foo", "write" ); + $neb->create( "foo" ); + $neb->lock( "foo", "write" ); - is( $idata->unlock( "foo", "read" ), undef, "read unlock under write lock" ); + is( $neb->unlock( "foo", "read" ), undef, "read unlock under write lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->lock( "foo", "read" ); + $neb->create( "foo" ); + $neb->lock( "foo", "read" ); - is( $idata->unlock( "foo", "write" ), undef, "write unlock under read lock" ); + is( $neb->unlock( "foo", "write" ), undef, "write unlock under read lock" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->unlock(); + $neb->unlock(); }; like( $@, qr/2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->unlock( "foo" ); + $neb->unlock( "foo" ); }; like( $@, qr/2 were expected/, "not enough params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->unlock( "foo", "both" ); + $neb->unlock( "foo", "both" ); }; like( $@, qr/is read or write/, "not read or write" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->unlock( "foo", 'read', 3 ); + $neb->unlock( "foo", 'read', 3 ); }; like( $@, qr/2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/16_client_find_instances.t =================================================================== --- /trunk/Nebulous/t/16_client_find_instances.t (revision 4439) +++ /trunk/Nebulous/t/16_client_find_instances.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 16_client_find_instances.t,v 1.5 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 16_client_find_instances.t,v 1.6 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,20 +14,20 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); is( scalar @$locations, 1, "found 1" ); @@ -36,15 +36,15 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->replicate( "foo" ); + $neb->create( "foo" ); + $neb->replicate( "foo" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); is( scalar @$locations, 2, "found 2" ); @@ -55,14 +55,14 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, volume - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - my $locations = $idata->find_instances( "foo", "node01" ); + my $locations = $neb->find_instances( "foo", "node01" ); is( scalar @$locations, 1, "found 1" ); @@ -71,15 +71,15 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->replicate( "foo" ); + $neb->create( "foo" ); + $neb->replicate( "foo" ); - my $locations = $idata->find_instances( "foo", "node01" ); + my $locations = $neb->find_instances( "foo", "node01" ); is( scalar @$locations, 2, "found 2" ); @@ -90,35 +90,35 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - is( $idata->find_instances( "foo" ), undef, "storage object does not exist" ); + is( $neb->find_instances( "foo" ), undef, "storage object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->find_instances(); + $neb->find_instances(); }; like( $@, qr/1 - 2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->find_instances( "foo", 'read', 3 ); + $neb->find_instances( "foo", 'read', 3 ); }; like( $@, qr/1 - 2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/17_client_find.t =================================================================== --- /trunk/Nebulous/t/17_client_find.t (revision 4439) +++ /trunk/Nebulous/t/17_client_find.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 17_client_find.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $ +# $Id: 17_client_find.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,57 +14,57 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $uri = $idata->create( "foo" ); + my $uri = $neb->create( "foo" ); - my $path = $idata->find( "foo" ); + my $path = $neb->find( "foo" ); ok( -e $path, "file exists" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $path = $idata->find( "foo" ); + my $path = $neb->find( "foo" ); ok( ! -e $path, "file doesn't exist" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->find(); + $neb->find(); }; like( $@, qr/1 was expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->find( "foo", "bar" ); + $neb->find( "foo", "bar" ); }; like( $@, qr/1 was expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/18_client_open.t =================================================================== --- /trunk/Nebulous/t/18_client_open.t (revision 4439) +++ /trunk/Nebulous/t/18_client_open.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 18_client_open.t,v 1.1 2005-01-05 01:41:05 jhoblitt Exp $ +# $Id: 18_client_open.t,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,85 +14,85 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - my $fh = $idata->open( "foo", 'read' ); + $neb->create( "foo" ); + my $fh = $neb->open( "foo", 'read' ); is( ref $fh, 'GLOB', "good filehandle" ); } -Test::IData->setup; +Test::Nebulous->setup; { # key - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - my $fh = $idata->open( "foo", 'write' ); + $neb->create( "foo" ); + my $fh = $neb->open( "foo", 'write' ); is( ref $fh, 'GLOB', "good filehandle" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - is( ref $idata->open( "foo", 'write' ), 'GLOB', "create new object" ); + is( ref $neb->open( "foo", 'write' ), 'GLOB', "create new object" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - is( $idata->open( "foo", 'read' ), undef, "can't create new object" ); + is( $neb->open( "foo", 'read' ), undef, "can't create new object" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->open( "foo", 'bar' ); + $neb->open( "foo", 'bar' ); }; like( $@, qr/is read or write/, "2nd params not read or write" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->open(); + $neb->open(); }; like( $@, qr/2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->open( 1, 'read', 3 ); + $neb->open( 1, 'read', 3 ); }; like( $@, qr/2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/19_client_delete.t =================================================================== --- /trunk/Nebulous/t/19_client_delete.t (revision 4439) +++ /trunk/Nebulous/t/19_client_delete.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 19_client_delete.t,v 1.2 2005-01-05 22:27:22 jhoblitt Exp $ +# $Id: 19_client_delete.t,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,70 +14,70 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - ok( $idata->delete( "foo" ), "delete object" ); + ok( $neb->delete( "foo" ), "delete object" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); is( $locations, undef, "no instances" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->replicate( "foo" ); + $neb->create( "foo" ); + $neb->replicate( "foo" ); - ok( $idata->delete( "foo" ), "delete object" ); + ok( $neb->delete( "foo" ), "delete object" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); is( $locations, undef, "no instances" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - is( $idata->delete( "foo" ), undef, "delete non-existant object" ); + is( $neb->delete( "foo" ), undef, "delete non-existant object" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->delete(); + $neb->delete(); }; like( $@, qr/1 was expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->delete( "foo", 2 ); + $neb->delete( "foo", 2 ); }; like( $@, qr/1 was expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/20_client_copy.t =================================================================== --- /trunk/Nebulous/t/20_client_copy.t (revision 4439) +++ /trunk/Nebulous/t/20_client_copy.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 20_client_copy.t,v 1.1 2005-01-04 02:13:21 jhoblitt Exp $ +# $Id: 20_client_copy.t,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,22 +14,22 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - ok( $idata->copy( "foo", "foobar" ), "copied object" ); + ok( $neb->copy( "foo", "foobar" ), "copied object" ); - my $locations1 = $idata->find_instances( "foobar" ); - my $locations2 = $idata->find_instances( "foobar" ); + my $locations1 = $neb->find_instances( "foobar" ); + my $locations2 = $neb->find_instances( "foobar" ); is( scalar @$locations1, 1, "old object has an instances" ); @@ -37,47 +37,47 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - ok( ! $idata->copy( "foo", "foobar" ), "copy non-existant object" ); + ok( ! $neb->copy( "foo", "foobar" ), "copy non-existant object" ); - my $locations = $idata->find_instances( "foobar" ); + my $locations = $neb->find_instances( "foobar" ); is( $locations, undef, "new object has no instances" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->copy(); + $neb->copy(); }; like( $@, qr/2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->copy( "foo" ); + $neb->copy( "foo" ); }; like( $@, qr/2 were expected/, "not enough params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->copy( "foo", "bar", "baz" ); + $neb->copy( "foo", "bar", "baz" ); }; like( $@, qr/2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/21_client_move.t =================================================================== --- /trunk/Nebulous/t/21_client_move.t (revision 4439) +++ /trunk/Nebulous/t/21_client_move.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 21_client_move.t,v 1.1 2005-01-04 02:48:31 jhoblitt Exp $ +# $Id: 21_client_move.t,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,22 +14,22 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - ok( $idata->move( "foo", "foobar" ), "move object" ); + ok( $neb->move( "foo", "foobar" ), "move object" ); - my $locations1 = $idata->find_instances( "foo" ); - my $locations2 = $idata->find_instances( "foobar" ); + my $locations1 = $neb->find_instances( "foo" ); + my $locations2 = $neb->find_instances( "foobar" ); is( $locations1, undef, "old object has no instances" ); @@ -37,47 +37,47 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - ok( ! $idata->move( "foo", "foobar" ), "move non-existant object" ); + ok( ! $neb->move( "foo", "foobar" ), "move non-existant object" ); - my $locations = $idata->find_instances( "foobar" ); + my $locations = $neb->find_instances( "foobar" ); is( $locations, undef, "new object has no instances" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->move(); + $neb->move(); }; like( $@, qr/2 were expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->move( "foo" ); + $neb->move( "foo" ); }; like( $@, qr/2 were expected/, "not enough params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->move( "foo", "bar", "baz" ); + $neb->move( "foo", "bar", "baz" ); }; like( $@, qr/2 were expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/22_client_delete_instance.t =================================================================== --- /trunk/Nebulous/t/22_client_delete_instance.t (revision 4439) +++ /trunk/Nebulous/t/22_client_delete_instance.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 22_client_delete_instance.t,v 1.1 2005-01-04 03:14:19 jhoblitt Exp $ +# $Id: 22_client_delete_instance.t,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,21 +14,21 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); - my $uri = $idata->delete_instance( @$locations[0] ); + my $uri = $neb->delete_instance( @$locations[0] ); is( $uri, @$locations[0], "delete instance" ); @@ -37,24 +37,24 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); - $idata->replicate( "foo" ); + $neb->create( "foo" ); + $neb->replicate( "foo" ); - my $uri1 = $idata->find_instances( "foo" )->[0]; + my $uri1 = $neb->find_instances( "foo" )->[0]; - ok( $idata->delete_instance( $uri1 ), "delete instance" ); + ok( $neb->delete_instance( $uri1 ), "delete instance" ); - my $uri2 = $idata->find_instances( "foo" )->[0]; + my $uri2 = $neb->find_instances( "foo" )->[0]; isnt( $uri1, $uri2, "other instance remains" ); - ok( $idata->delete_instance( $uri2 ), "delete instance" ); + ok( $neb->delete_instance( $uri2 ), "delete instance" ); - my $locations = $idata->find_instances( "foo" ); + my $locations = $neb->find_instances( "foo" ); is( $locations, undef, "no remaning instances" ); @@ -62,31 +62,31 @@ { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $uri = $idata->delete_instance( "file:/foo" ); + my $uri = $neb->delete_instance( "file:/foo" ); is( $uri, undef, "uri does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->delete_instance(); + $neb->delete_instance(); }; like( $@, qr/1 was expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->delete_instance( "foo", 2 ); + $neb->delete_instance( "foo", 2 ); }; like( $@, qr/1 was expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/23_client_stat.t =================================================================== --- /trunk/Nebulous/t/23_client_stat.t (revision 4439) +++ /trunk/Nebulous/t/23_client_stat.t (revision 4440) @@ -3,5 +3,5 @@ # Copryight (C) 2004-2005 Joshua Hoblitt # -# $Id: 23_client_stat.t,v 1.2 2005-01-15 04:02:12 jhoblitt Exp $ +# $Id: 23_client_stat.t,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $ use strict; @@ -14,32 +14,32 @@ use lib qw( ./t ./lib ); -use PS::IPP::IData::Client; -use PS::IPP::IData::Util qw( :standard ); -use Test::IData; +use Nebulous::Client; +use Nebulous::Util qw( :standard ); +use Test::Nebulous; my $hostport = Apache::Test->config->{ 'hostport' }; -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo" ); + $neb->create( "foo" ); - my $info = $idata->stat( "foo" ); + my $info = $neb->stat( "foo" ); is( scalar @$info, 8, "number of columns" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->create( "foo", 9, "node01", "foobar" ); + $neb->create( "foo", 9, "node01", "foobar" ); - my $info = $idata->stat( "foo" ); + my $info = $neb->stat( "foo" ); is( scalar @$info, 8, "number of columns" ); @@ -54,34 +54,34 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - my $info = $idata->stat( "foo" ); + my $info = $neb->stat( "foo" ); is( $info, undef, "object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->stat(); + $neb->stat(); }; like( $@, qr/1 was expected/, "no params" ); -Test::IData->setup; +Test::Nebulous->setup; eval { - my $idata = PS::IPP::IData::Client->new( - proxy => "http://$hostport/idata", + my $neb = Nebulous::Client->new( + proxy => "http://$hostport/nebulous", ); - $idata->stat( "foo", 2 ); + $neb->stat( "foo", 2 ); }; like( $@, qr/1 was expected/, "too many params" ); -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/Test/Nebulous.pm =================================================================== --- /trunk/Nebulous/t/Test/Nebulous.pm (revision 4439) +++ /trunk/Nebulous/t/Test/Nebulous.pm (revision 4440) @@ -1,7 +1,7 @@ # Copyright (C) 2004 Joshua Hoblitt # -# $Id: Nebulous.pm,v 1.3 2005-06-30 01:41:40 jhoblitt Exp $ +# $Id: Nebulous.pm,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $ -package Test::IData; +package Test::Nebulous; use strict; Index: /trunk/Nebulous/t/apache_03_server_create_object.x =================================================================== --- /trunk/Nebulous/t/apache_03_server_create_object.x (revision 4439) +++ /trunk/Nebulous/t/apache_03_server_create_object.x (revision 4440) @@ -11,19 +11,19 @@ use Apache::TestUtil; -use PS::IPP::IData::Util qw( :standard ); +use Nebulous::Util qw( :standard ); use SOAP::Lite; -use Test::IData; +use Test::Nebulous; my $hostport = Apache::Test::config()->{ 'hostport' }; -my $idata = SOAP::Lite->new( - proxy => "http://$hostport/idata", - uri => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/IData/Server", +my $neb = SOAP::Lite->new( + proxy => "http://$hostport/nebulous", + uri => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/Nebulous/Server", ); -Test::IData->setup; +Test::Nebulous->setup; { # key - my $uri = $idata->create_object( "foo" )->result; + my $uri = $neb->create_object( "foo" )->result; ok( -e _get_file_path( $uri ), "file exists" ); @@ -32,10 +32,10 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, class - my $uri = $idata->create_object( "foo", 0 )->result; - $idata->delete_instance( $uri ); + my $uri = $neb->create_object( "foo", 0 )->result; + $neb->delete_instance( $uri ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -44,10 +44,10 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, class, volume - my $uri = $idata->create_object( "foo", 0, "node01" )->result; - $idata->delete_instance( $uri ); + my $uri = $neb->create_object( "foo", 0, "node01" )->result; + $neb->delete_instance( $uri ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -56,10 +56,10 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, class, volume, comment - my $uri = $idata->create_object( "foo", 0, "node01", "this is foo" )->result; - $idata->delete_instance( $uri ); + my $uri = $neb->create_object( "foo", 0, "node01", "this is foo" )->result; + $neb->delete_instance( $uri ); ok( -e _get_file_path( $uri ), "file exists" ); @@ -68,28 +68,28 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); - my $response = $idata->create_object( "foo" ); + $neb->create_object( "foo" ); + my $response = $neb->create_object( "foo" ); like( $response->faultstring, qr/Duplicate entry/, "object already exists" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $response = $idata->create_object(); + my $response = $neb->create_object(); like( $response->faultstring, qr/2 - 4 were expected/, "no params" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $response = $idata->create_object( 1, 2, 3, 4, 5 ); + my $response = $neb->create_object( 1, 2, 3, 4, 5 ); like( $response->faultstring, qr/2 - 4 were expected/, "too many params" ); } -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/apache_04_server_replicate_object.x =================================================================== --- /trunk/Nebulous/t/apache_04_server_replicate_object.x (revision 4439) +++ /trunk/Nebulous/t/apache_04_server_replicate_object.x (revision 4440) @@ -11,20 +11,20 @@ use Apache::TestUtil; -use PS::IPP::IData::Util qw( :standard ); +use Nebulous::Util qw( :standard ); use SOAP::Lite; -use Test::IData; +use Test::Nebulous; my $hostport = Apache::Test::config()->{ 'hostport' }; -my $idata = SOAP::Lite->new( - proxy => "http://$hostport/idata", - uri => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/IData/Server", +my $neb = SOAP::Lite->new( + proxy => "http://$hostport/nebulous", + uri => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/Nebulous/Server", ); -Test::IData->setup; +Test::Nebulous->setup; { # key - $idata->create_object( "foo" ); - my $uri = $idata->replicate_object( "foo" )->result; + $neb->create_object( "foo" ); + my $uri = $neb->replicate_object( "foo" )->result; ok( -e _get_file_path( $uri ), "file exists" ); @@ -33,10 +33,10 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, $volume - $idata->create_object( "foo" ); - my $uri = $idata->replicate_object( "foo", "node01" )->result; + $neb->create_object( "foo" ); + my $uri = $neb->replicate_object( "foo", "node01" )->result; ok( -e _get_file_path( $uri ), "file exists" ); @@ -45,11 +45,11 @@ } -Test::IData->setup; +Test::Nebulous->setup; { # key, $volume - $idata->create_object( "foo" ); - my $uri1 = $idata->replicate_object( "foo", "node01" )->result; - my $uri2 = $idata->replicate_object( "foo", "node02" )->result; + $neb->create_object( "foo" ); + my $uri1 = $neb->replicate_object( "foo", "node01" )->result; + my $uri2 = $neb->replicate_object( "foo", "node02" )->result; ok( -e _get_file_path( $uri1 ), "file exists" ); @@ -60,27 +60,27 @@ } -Test::IData->setup; +Test::Nebulous->setup; { - my $response = $idata->replicate_object(); + my $response = $neb->replicate_object(); like( $response->faultstring, qr/1 - 2 were expected/, "no params" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $response = $idata->replicate_object( 1, 2, 3 ); + my $response = $neb->replicate_object( 1, 2, 3 ); like( $response->faultstring, qr/1 - 2 were expected/, "too many params" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $response = $idata->replicate_object( "foo" ); + my $response = $neb->replicate_object( "foo" ); like( $response->faultstring, qr/storage object does not exist/, "storage object does not exist" ); } -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/apache_05_server_lock_object.x =================================================================== --- /trunk/Nebulous/t/apache_05_server_lock_object.x (revision 4439) +++ /trunk/Nebulous/t/apache_05_server_lock_object.x (revision 4440) @@ -11,119 +11,119 @@ use Apache::TestUtil; -use PS::IPP::IData::Util qw( :standard ); +use Nebulous::Util qw( :standard ); use SOAP::Lite; -use Test::IData; +use Test::Nebulous; my $hostport = Apache::Test::config()->{ 'hostport' }; -my $idata = SOAP::Lite->new( - proxy => "http://$hostport/idata", - uri => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/IData/Server", +my $neb = SOAP::Lite->new( + proxy => "http://$hostport/nebulous", + uri => "http://pan-starrs.ifa.hawaii.edu/PS/IPP/Nebulous/Server", ); -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - ok( $idata->lock_object( "foo", "read" )->result, "read lock" ); + ok( $neb->lock_object( "foo", "read" )->result, "read lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - ok( $idata->lock_object( "foo", "read" )->result, "read lock" ); - ok( $idata->lock_object( "foo", "read" )->result, "read lock" ); + ok( $neb->lock_object( "foo", "read" )->result, "read lock" ); + ok( $neb->lock_object( "foo", "read" )->result, "read lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - ok( $idata->lock_object( "foo", "write" )->result, "write lock" ); + ok( $neb->lock_object( "foo", "write" )->result, "write lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $result = $idata->lock_object( "foo", "read" ); + my $result = $neb->lock_object( "foo", "read" ); like( $result->faultstring, qr/storage object does not exist/, "storage object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $result = $idata->lock_object( "foo", "write" ); + my $result = $neb->lock_object( "foo", "write" ); like( $result->faultstring, qr/storage object does not exist/, "storage object does not exist" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "write" ); - my $result = $idata->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "write" ); + my $result = $neb->lock_object( "foo", "write" ); like( $result->faultstring, qr/can not write lock twice/, "can not write lock twice" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "read" ); - my $result = $idata->lock_object( "foo", "write" ); + $neb->lock_object( "foo", "read" ); + my $result = $neb->lock_object( "foo", "write" ); like( $result->faultstring, qr/can not write lock after read lock/, "can not write lock after read lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - $idata->create_object( "foo" ); + $neb->create_object( "foo" ); - $idata->lock_object( "foo", "write" ); - my $result = $idata->lock_object( "foo", "read" ); + $neb->lock_object( "foo", "write" ); + my $result = $neb->lock_object( "foo", "read" ); like( $result->faultstring, qr/can not read lock after write lock/, "can not read lock after write lock" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $result = $idata->lock_object(); + my $result = $neb->lock_object(); like( $result->faultstring, qr/2 were expected/, "no params" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $result = $idata->lock_object( "foo" ); + my $result = $neb->lock_object( "foo" ); like( $result->faultstring, qr/2 were expected/, "not enough params" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $result = $idata->lock_object( "foo", "both" ); + my $result = $neb->lock_object( "foo", "both" ); like( $result->faultstring, qr/is read or write/, "not read or write" ); } -Test::IData->setup; +Test::Nebulous->setup; { - my $result = $idata->lock_object( "foo", 'read', 3 ); + my $result = $neb->lock_object( "foo", 'read', 3 ); like( $result->faultstring, qr/2 were expected/, "too many params" ); } -Test::IData->cleanup; +Test::Nebulous->cleanup; Index: /trunk/Nebulous/t/conf/extra.conf.in =================================================================== --- /trunk/Nebulous/t/conf/extra.conf.in (revision 4439) +++ /trunk/Nebulous/t/conf/extra.conf.in (revision 4440) @@ -3,5 +3,5 @@ # this file will be Include-d by @ServerRoot@/httpd.conf -# where PS::IPP::IData::Server::Apache can be found +# where Nebulous::Server::Apache can be found # mp2 PerlSwitches -I@ServerRoot@/../lib @@ -14,9 +14,9 @@ #ScriptSock logs/cgisock - + SetHandler perl-script -# PerlHandler PS::IPP::IData::Server::Apache +# PerlHandler Nebulous::Server::Apache PerlResponseHandler Apache2::SOAP - PerlSetVar dispatch_to "PerlHandler PS::IPP::IData::Server::SOAP" + PerlSetVar dispatch_to "PerlHandler Nebulous::Server::SOAP" PerlSetVar options "compress_threshold => 10000" Index: /trunk/Nebulous/t/conf/startup.pl.in =================================================================== --- /trunk/Nebulous/t/conf/startup.pl.in (revision 4439) +++ /trunk/Nebulous/t/conf/startup.pl.in (revision 4440) @@ -3,6 +3,6 @@ use Apache::DBI; use DBI; -use PS::IPP::IData::Server::SOAP; -use PS::IPP::IData::Server; +use Nebulous::Server::SOAP; +use Nebulous::Server; my $dsn = "DBI:mysql:database=test:host=localhost"; @@ -11,5 +11,5 @@ Apache::DBI->connect_on_init( $dsn, $dbuser, $dbpass ); -PS::IPP::IData::Server->setup( $dsn, $dbuser, $dbpass ); +Nebulous::Server->setup( $dsn, $dbuser, $dbpass ); 1;