From 621362e77cd614d68a47327810f9d6c8d161dcc5 Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 13 Sep 2010 15:44:11 +0000 Subject: [PATCH] removing vestigial references to Inbound.pm, which no longer exists in the repository. this also removes get/set_listener, which were never taken advantage of and are no longer of use since the listener is thoroughly hard-coded into the opensrf stack now git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@2024 9efc2488-bf62-4759-914b-345cdb29e865 --- src/perl/lib/OpenSRF/System.pm | 1 - src/perl/lib/OpenSRF/Transport.pm | 9 --------- src/perl/lib/OpenSRF/Transport/Listener.pm | 24 ------------------------ src/perl/lib/OpenSRF/Transport/SlimJabber.pm | 2 -- src/perl/t/07-Transport.t | 1 - 5 files changed, 37 deletions(-) diff --git a/src/perl/lib/OpenSRF/System.pm b/src/perl/lib/OpenSRF/System.pm index 6329a10..f7e78ef 100644 --- a/src/perl/lib/OpenSRF/System.pm +++ b/src/perl/lib/OpenSRF/System.pm @@ -34,7 +34,6 @@ sub load_bootstrap_config { OpenSRF::Utils::JSON->register_class_hint(name => "OpenSRF::Application", hint => "method", type => "hash"); OpenSRF::Transport->message_envelope("OpenSRF::Transport::SlimJabber::MessageWrapper"); OpenSRF::Transport::PeerHandle->set_peer_client("OpenSRF::Transport::SlimJabber::PeerConnection"); - OpenSRF::Transport::Listener->set_listener("OpenSRF::Transport::SlimJabber::Inbound"); OpenSRF::Application->server_class('client'); } diff --git a/src/perl/lib/OpenSRF/Transport.pm b/src/perl/lib/OpenSRF/Transport.pm index c6dd031..6a3afef 100644 --- a/src/perl/lib/OpenSRF/Transport.pm +++ b/src/perl/lib/OpenSRF/Transport.pm @@ -13,15 +13,6 @@ use OpenSRF::Transport::SlimJabber::MessageWrapper; # --- These must be implemented by all Transport subclasses # ------------------------------------------- -=head2 get_listener - -Returns the package name of the package the system will use to -gather incoming requests - -=cut - -sub get_listener { shift()->alert_abstract(); } - =head2 get_peer_client Returns the name of the package responsible for client communication diff --git a/src/perl/lib/OpenSRF/Transport/Listener.pm b/src/perl/lib/OpenSRF/Transport/Listener.pm index afa9fb7..900fb56 100644 --- a/src/perl/lib/OpenSRF/Transport/Listener.pm +++ b/src/perl/lib/OpenSRF/Transport/Listener.pm @@ -1,8 +1,6 @@ package OpenSRF::Transport::Listener; use base 'OpenSRF'; use OpenSRF::Utils::Logger qw(:level); -use OpenSRF::Transport::SlimJabber::Inbound; -use base 'OpenSRF::Transport::SlimJabber::Inbound'; =head1 Description @@ -20,26 +18,4 @@ listen() =cut -=head2 set_listener() - -Sets my superclass. Pass in a string representing the perl module -(e.g. OpenSRF::Transport::Jabber::JInbound) to be used as the -superclass and it will be pushed onto @ISA. - -=cut - -sub set_listener { - my( $class, $listener ) = @_; - OpenSRF::Utils::Logger->debug("Loading Listener $listener"); - if( $listener ) { - $listener->use; - if( $@ ) { - OpenSRF::Utils::Logger->error( - "Unable to set transport listener: $@", ERROR ); - } - unshift @ISA, $listener; - } -} - - 1; diff --git a/src/perl/lib/OpenSRF/Transport/SlimJabber.pm b/src/perl/lib/OpenSRF/Transport/SlimJabber.pm index 7963b93..a1742e8 100644 --- a/src/perl/lib/OpenSRF/Transport/SlimJabber.pm +++ b/src/perl/lib/OpenSRF/Transport/SlimJabber.pm @@ -9,8 +9,6 @@ classes for handling transport layer messaging =cut -sub get_listener { return "OpenSRF::Transport::SlimJabber::Inbound"; } - sub get_peer_client { return "OpenSRF::Transport::SlimJabber::PeerConnection"; } sub get_msg_envelope { return "OpenSRF::Transport::SlimJabber::MessageWrapper"; } diff --git a/src/perl/t/07-Transport.t b/src/perl/t/07-Transport.t index 64d4069..aa8d6a8 100644 --- a/src/perl/t/07-Transport.t +++ b/src/perl/t/07-Transport.t @@ -10,7 +10,6 @@ use_ok( 'OpenSRF::Transport::Listener' ); use_ok( 'OpenSRF::Transport::PeerHandle' ); use_ok( 'OpenSRF::Transport::SlimJabber' ); use_ok( 'OpenSRF::Transport::SlimJabber::Client' ); -use_ok( 'OpenSRF::Transport::SlimJabber::Inbound' ); use_ok( 'OpenSRF::Transport::SlimJabber::MessageWrapper' ); use_ok( 'OpenSRF::Transport::SlimJabber::PeerConnection' ); use_ok( 'OpenSRF::Transport::SlimJabber::XMPPMessage' ); -- 2.11.0