[OpenSRF-GIT] OpenSRF branch rel_2_1 updated. osrf_rel_2_1_0-14-gc9b7bcf
Evergreen Git
git at git.evergreen-ils.org
Sun Nov 18 08:00:23 EST 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".
The branch, rel_2_1 has been updated
via c9b7bcf334cc2b6418f9c8d6e4579f6e4e7b49ee (commit)
via bcbf73bf1379699bfb49908f1ed4171468372a4b (commit)
via 583898087349ff1d35dd481ddc1ebd95fa096ae8 (commit)
via a769201157545c9bc311634777217249f86bf428 (commit)
from 724bc6d80e805b580b8340f6d205597e2423ed07 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c9b7bcf334cc2b6418f9c8d6e4579f6e4e7b49ee
Author: Dan Scott <dscott at laurentian.ca>
Date: Sun Nov 18 07:55:32 2012 -0500
Add ChangeLog for 2.1.2
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/ChangeLog b/ChangeLog
index 870dcfe..8243b43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,94 @@
ChangeLog
=========
+OpenSRF 2.1.2
+-------------
+
+commit bcbf73bf1379699bfb49908f1ed4171468372a4b
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Sun Nov 18 07:41:46 2012 -0500
+
+ Bump version numbers for 2.1.2
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+2 2 src/perl/lib/OpenSRF.pm
+1 1 version.m4
+
+commit 583898087349ff1d35dd481ddc1ebd95fa096ae8
+Author: Dan Scott <dscott at laurentian.ca>
+Date: Fri Nov 16 10:36:28 2012 -0500
+
+ Whitespace in OpenSRF/System.pm
+
+ Spaces not tabs.
+
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+21 21 src/perl/lib/OpenSRF/System.pm
+
+commit a769201157545c9bc311634777217249f86bf428
+Author: Jason Stephenson <jstephenson at mvlc.org>
+Date: Thu Nov 15 12:20:11 2012 -0500
+
+ Move setting of OpenSRF::Application::shared_conf to load_bootstrap_config.
+
+ shared_conf was not available and broke clients that were not in a
+ service, such as the Evergreen CStoreEditor.
+
+ Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+8 9 src/perl/lib/OpenSRF/System.pm
+
+commit 724bc6d80e805b580b8340f6d205597e2423ed07
+Author: Dan Scott <dan at coffeecode.net>
+Date: Tue Oct 30 23:39:25 2012 -0400
+
+ Bump release numbers, create 2.1.1 change log
+
+ Signed-off-by: Dan Scott <dan at coffeecode.net>
+
+182 2 ChangeLog
+2 2 src/perl/lib/OpenSRF.pm
+1 1 version.m4
+
+commit 7c3727761dd359adde04f7ff0584ad98f25baf67
+Author: Dan Scott <dan at coffeecode.net>
+Date: Tue Oct 30 23:34:04 2012 -0400
+
+ Release notes for 2.1.1: input log redaction
+
+ Signed-off-by: Dan Scott <dan at coffeecode.net>
+
+12 3 doc/RELEASE_NOTES.txt
+
+commit c49f3d1c5c65e7313d631df20ec38c459a8cd404
+Author: Bill Erickson <berick at esilibrary.com>
+Date: Mon May 21 16:42:12 2012 -0400
+
+ ChopChop is dead, long live ChopChop.
+
+ It was never fully baked, nor was it secure, nor does it compile cleanly
+ with -Wall, nor does it provide any useful examples for working with
+ opensrf, etc. Time to clear out. So long, chopchop.
+
+ Signed-off-by: Bill Erickson <berick at esilibrary.com>
+ Signed-off-by: Dan Scott <dscott at laurentian.ca>
+
+0 6 Makefile.am
+0 21 configure.ac
+0 13 examples/opensrf_core.xml.example
+0 4 src/Makefile.am
+0 23 src/jserver/Makefile.am
+0 1082 src/jserver/osrf_chat.c
+0 45 src/jserver/osrf_chat.h
+0 92 src/jserver/osrf_chat_main.c
+ delete mode 100644 src/jserver/Makefile.am
+ delete mode 100644 src/jserver/osrf_chat.c
+ delete mode 100644 src/jserver/osrf_chat.h
+ delete mode 100644 src/jserver/osrf_chat_main.c
+
OpenSRF 2.1.1
-------------
commit bcbf73bf1379699bfb49908f1ed4171468372a4b
Author: Dan Scott <dscott at laurentian.ca>
Date: Sun Nov 18 07:41:46 2012 -0500
Bump version numbers for 2.1.2
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/src/perl/lib/OpenSRF.pm b/src/perl/lib/OpenSRF.pm
index 4b1bab3..3959bd0 100644
--- a/src/perl/lib/OpenSRF.pm
+++ b/src/perl/lib/OpenSRF.pm
@@ -14,11 +14,11 @@ OpenSRF - Top level class for OpenSRF perl modules.
=head1 VERSION
-Version 2.1.1
+Version 2.1.2
=cut
-our $VERSION = "2.11";
+our $VERSION = "2.12";
=head1 METHODS
diff --git a/version.m4 b/version.m4
index 0771fec..450ed42 100644
--- a/version.m4
+++ b/version.m4
@@ -1 +1 @@
-m4_define([VERSION_NUMBER],[2.1.1])
+m4_define([VERSION_NUMBER],[2.1.2])
commit 583898087349ff1d35dd481ddc1ebd95fa096ae8
Author: Dan Scott <dscott at laurentian.ca>
Date: Fri Nov 16 10:36:28 2012 -0500
Whitespace in OpenSRF/System.pm
Spaces not tabs.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/src/perl/lib/OpenSRF/System.pm b/src/perl/lib/OpenSRF/System.pm
index e26579b..7eb7120 100644
--- a/src/perl/lib/OpenSRF/System.pm
+++ b/src/perl/lib/OpenSRF/System.pm
@@ -16,8 +16,8 @@ use OpenSRF::Server;
my $bootstrap_config_file;
sub import {
- my( $self, $config ) = @_;
- $bootstrap_config_file = $config;
+ my( $self, $config ) = @_;
+ $bootstrap_config_file = $config;
}
$| = 1;
@@ -25,16 +25,16 @@ $| = 1;
sub DESTROY {}
sub load_bootstrap_config {
- return if OpenSRF::Utils::Config->current;
+ return if OpenSRF::Utils::Config->current;
die "Please provide a bootstrap config file to OpenSRF::System\n"
unless $bootstrap_config_file;
- OpenSRF::Utils::Config->load(config_file => $bootstrap_config_file);
- 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::Application->server_class('client');
+ OpenSRF::Utils::Config->load(config_file => $bootstrap_config_file);
+ 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::Application->server_class('client');
# Read in a shared portion of the config file
# for later use in log parameter redaction
$OpenSRF::Application::shared_conf = OpenSRF::Utils::Config->load(
@@ -49,28 +49,28 @@ sub load_bootstrap_config {
# Bootstraps a single client connection.
# named params are 'config_file' and 'client_name'
sub bootstrap_client {
- my $self = shift;
+ my $self = shift;
- my $con = OpenSRF::Transport::PeerHandle->retrieve;
+ my $con = OpenSRF::Transport::PeerHandle->retrieve;
return if $con and $con->tcp_connected;
- my %params = @_;
+ my %params = @_;
- $bootstrap_config_file =
- $params{config_file} || $bootstrap_config_file;
+ $bootstrap_config_file =
+ $params{config_file} || $bootstrap_config_file;
- my $app = $params{client_name} || "client";
+ my $app = $params{client_name} || "client";
- load_bootstrap_config();
- OpenSRF::Utils::Logger::set_config();
- OpenSRF::Transport::PeerHandle->construct($app);
+ load_bootstrap_config();
+ OpenSRF::Utils::Logger::set_config();
+ OpenSRF::Transport::PeerHandle->construct($app);
}
sub connected {
- if (my $con = OpenSRF::Transport::PeerHandle->retrieve) {
- return 1 if $con->tcp_connected;
- }
- return 0;
+ if (my $con = OpenSRF::Transport::PeerHandle->retrieve) {
+ return 1 if $con->tcp_connected;
+ }
+ return 0;
}
sub run_service {
commit a769201157545c9bc311634777217249f86bf428
Author: Jason Stephenson <jstephenson at mvlc.org>
Date: Thu Nov 15 12:20:11 2012 -0500
Move setting of OpenSRF::Application::shared_conf to load_bootstrap_config.
shared_conf was not available and broke clients that were not in a
service, such as the Evergreen CStoreEditor.
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/src/perl/lib/OpenSRF/System.pm b/src/perl/lib/OpenSRF/System.pm
index 62a17a8..e26579b 100644
--- a/src/perl/lib/OpenSRF/System.pm
+++ b/src/perl/lib/OpenSRF/System.pm
@@ -35,6 +35,14 @@ sub load_bootstrap_config {
OpenSRF::Transport->message_envelope("OpenSRF::Transport::SlimJabber::MessageWrapper");
OpenSRF::Transport::PeerHandle->set_peer_client("OpenSRF::Transport::SlimJabber::PeerConnection");
OpenSRF::Application->server_class('client');
+ # Read in a shared portion of the config file
+ # for later use in log parameter redaction
+ $OpenSRF::Application::shared_conf = OpenSRF::Utils::Config->load(
+ 'config_file' => OpenSRF::Utils::Config->current->FILE,
+ 'nocache' => 1,
+ 'force' => 1,
+ 'base_path' => '/config/shared'
+ );
}
# ----------------------------------------------
@@ -84,15 +92,6 @@ sub run_service {
OpenSRF::Application->application_implementation->initialize()
if (OpenSRF::Application->application_implementation->can('initialize'));
- # Read in a shared portion of the config file
- # for later use in log parameter redaction
- $OpenSRF::Application::shared_conf = OpenSRF::Utils::Config->load(
- 'config_file' => OpenSRF::Utils::Config->current->FILE,
- 'nocache' => 1,
- 'force' => 1,
- 'base_path' => '/config/shared'
- );
-
# kill the temp connection
OpenSRF::Transport::PeerHandle->retrieve->disconnect;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 88 ++++++++++++++++++++++++++++++++++++++++
src/perl/lib/OpenSRF.pm | 4 +-
src/perl/lib/OpenSRF/System.pm | 59 +++++++++++++--------------
version.m4 | 2 +-
4 files changed, 120 insertions(+), 33 deletions(-)
hooks/post-receive
--
OpenSRF
More information about the opensrf-commits
mailing list