From d9702cb684b7d2ed79c6f1b535f771990d0831f8 Mon Sep 17 00:00:00 2001 From: miker Date: Fri, 6 Jul 2007 12:29:52 +0000 Subject: [PATCH] a little bit more cleanup from previous DOM/DomianObject removal git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1002 9efc2488-bf62-4759-914b-345cdb29e865 --- src/perlmods/OpenSRF/AppSession.pm | 2 -- src/perlmods/OpenSRF/Application/Demo/Math.pm | 1 - src/perlmods/OpenSRF/Application/Demo/MathDB.pm | 1 - src/perlmods/OpenSRF/DomainObject/oilsResponse.pm | 29 +++++++++-------------- src/perlmods/OpenSRF/EX.pm | 28 ---------------------- src/perlmods/OpenSRF/System.pm | 1 - 6 files changed, 11 insertions(+), 51 deletions(-) diff --git a/src/perlmods/OpenSRF/AppSession.pm b/src/perlmods/OpenSRF/AppSession.pm index 6d663bf..9b2017a 100644 --- a/src/perlmods/OpenSRF/AppSession.pm +++ b/src/perlmods/OpenSRF/AppSession.pm @@ -1,6 +1,4 @@ package OpenSRF::AppSession; -#use OpenSRF::DOM; -#use OpenSRF::DOM::Element::userAuth; use OpenSRF::DomainObject::oilsMessage; use OpenSRF::DomainObject::oilsMethod; use OpenSRF::DomainObject::oilsResponse qw/:status/; diff --git a/src/perlmods/OpenSRF/Application/Demo/Math.pm b/src/perlmods/OpenSRF/Application/Demo/Math.pm index eed993a..1bc99ef 100644 --- a/src/perlmods/OpenSRF/Application/Demo/Math.pm +++ b/src/perlmods/OpenSRF/Application/Demo/Math.pm @@ -3,7 +3,6 @@ use base qw/OpenSRF::Application/; use OpenSRF::Application; use OpenSRF::Utils::Logger qw/:level/; use OpenSRF::DomainObject::oilsResponse; -#use OpenSRF::DomainObject::oilsPrimitive; use OpenSRF::EX qw/:try/; use strict; use warnings; diff --git a/src/perlmods/OpenSRF/Application/Demo/MathDB.pm b/src/perlmods/OpenSRF/Application/Demo/MathDB.pm index 69985a6..6cdc78c 100644 --- a/src/perlmods/OpenSRF/Application/Demo/MathDB.pm +++ b/src/perlmods/OpenSRF/Application/Demo/MathDB.pm @@ -3,7 +3,6 @@ use OpenSRF::Utils::JSON; use base qw/OpenSRF::Application/; use OpenSRF::Application; use OpenSRF::DomainObject::oilsResponse qw/:status/; -#use OpenSRF::DomainObject::oilsPrimitive; use OpenSRF::Utils::Logger qw/:level/; use strict; use warnings; diff --git a/src/perlmods/OpenSRF/DomainObject/oilsResponse.pm b/src/perlmods/OpenSRF/DomainObject/oilsResponse.pm index 0469b79..bcaf96f 100644 --- a/src/perlmods/OpenSRF/DomainObject/oilsResponse.pm +++ b/src/perlmods/OpenSRF/DomainObject/oilsResponse.pm @@ -106,11 +106,8 @@ sub statusCode { return $self->{statusCode}; } - #------------------------------------------------------------------------------- - - package OpenSRF::DomainObject::oilsStatus; use OpenSRF::DomainObject::oilsResponse qw/:status/; use base 'OpenSRF::DomainObject::oilsResponse'; @@ -142,6 +139,8 @@ sets the default B to C and B to C. $status = 'Status'; $statusCode = STATUS_OK; +#------------------------------------------------------------------------------- + package OpenSRF::DomainObject::oilsConnectStatus; use OpenSRF::DomainObject::oilsResponse qw/:status/; use base 'OpenSRF::DomainObject::oilsStatus'; @@ -177,8 +176,7 @@ B $status = 'Connection Successful'; $statusCode = STATUS_OK; - - +#------------------------------------------------------------------------------- package OpenSRF::DomainObject::oilsContinueStatus; use OpenSRF::DomainObject::oilsResponse qw/:status/; @@ -216,15 +214,10 @@ $statusCode = STATUS_CONTINUE; 1; - - #------------------------------------------------------------------------------- - - package OpenSRF::DomainObject::oilsResult; use OpenSRF::DomainObject::oilsResponse qw/:status/; -use OpenSRF::DomainObject::oilsPrimitive; use base 'OpenSRF::DomainObject::oilsResponse'; use vars qw/$status $statusCode/; OpenSRF::Utils::JSON->register_class_hint( hint => 'osrfResult', name => 'OpenSRF::DomainObject::oilsResult', type => 'hash' ); @@ -284,12 +277,8 @@ B 1; - - #------------------------------------------------------------------------------- - - package OpenSRF::DomainObject::oilsException; use OpenSRF::DomainObject::oilsResponse qw/:status/; use OpenSRF::EX; @@ -334,6 +323,8 @@ sets the default B to C and B to C $status = 'Connect Request Failed'; $statusCode = STATUS_FORBIDDEN; +#------------------------------------------------------------------------------- + package OpenSRF::DomainObject::oilsMethodException; use OpenSRF::DomainObject::oilsResponse qw/:status/; use base 'OpenSRF::DomainObject::oilsException'; @@ -421,10 +414,6 @@ $statusCode = STATUS_INTERNALSERVERERROR; # ------------------------------------------- - - - - package OpenSRF::DomainObject::oilsBrokenSession; use OpenSRF::DomainObject::oilsResponse qw/:status/; use OpenSRF::EX; @@ -434,6 +423,8 @@ OpenSRF::Utils::JSON->register_class_hint( hint => 'osrfBrokenSession', name => $status = "Request on Disconnected Session"; $statusCode = STATUS_EXPFAILED; +#------------------------------------------------------------------------------- + package OpenSRF::DomainObject::oilsXMLParseError; use OpenSRF::DomainObject::oilsResponse qw/:status/; use OpenSRF::EX; @@ -443,6 +434,8 @@ OpenSRF::Utils::JSON->register_class_hint( hint => 'osrfXMLParseError', name => $status = "XML Parse Error"; $statusCode = STATUS_EXPFAILED; +#------------------------------------------------------------------------------- + package OpenSRF::DomainObject::oilsAuthException; use OpenSRF::DomainObject::oilsResponse qw/:status/; use OpenSRF::EX; diff --git a/src/perlmods/OpenSRF/EX.pm b/src/perlmods/OpenSRF/EX.pm index 7b2cfb0..8aff411 100644 --- a/src/perlmods/OpenSRF/EX.pm +++ b/src/perlmods/OpenSRF/EX.pm @@ -179,34 +179,6 @@ Thrown where an argument to a method was invalid or not provided # ------------------------------------------------------------------- -package OpenSRF::EX::NotADomainObject; -use base 'OpenSRF::EX::ERROR'; -our $ex_msg_header = "Must be a Domain Object"; - -=head2 OpenSRF::EX::NotADomainObject - -Thrown where a OpenSRF::DomainObject::oilsScalar or -OpenSRF::DomainObject::oilsPair was passed a value that -is not a perl scalar or a OpenSRF::DomainObject. - -=cut - - -# ------------------------------------------------------------------- -package OpenSRF::EX::ArrayOutOfBounds; -use base 'OpenSRF::EX::ERROR'; -our $ex_msg_header = "Tied array access on a nonexistant index"; - -=head2 OpenSRF::EX::ArrayOutOfBounds - -Thrown where a TIEd array (OpenSRF::DomainObject::oilsArray) was accessed at -a nonexistant index - -=cut - - - -# ------------------------------------------------------------------- package OpenSRF::EX::Socket; use base 'OpenSRF::EX::ERROR'; our $ex_msg_header = "Socket Exception"; diff --git a/src/perlmods/OpenSRF/System.pm b/src/perlmods/OpenSRF/System.pm index 115e7c6..ba86243 100644 --- a/src/perlmods/OpenSRF/System.pm +++ b/src/perlmods/OpenSRF/System.pm @@ -8,7 +8,6 @@ use OpenSRF::Transport; use OpenSRF::UnixServer; use OpenSRF::Utils; use OpenSRF::Utils::LogServer; -#use OpenSRF::DOM; use OpenSRF::EX qw/:try/; use POSIX qw/setsid :sys_wait_h/; use OpenSRF::Utils::Config; -- 2.11.0