Patch from Dan Scott to finish up the removal of bootstrap.conf:

Attached are patches that complete the work that I should have done in
my first patch. I also modify the Makefile in OpenSRF to prevent
bootstrap.conf.example from being copied from the OpenSRF/examples
directory into /openils/conf/.

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@988 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/doc/dokuwiki-doc-stubber.pl b/doc/dokuwiki-doc-stubber.pl
index fcdd03d..0182745 100755 (executable)
--- a/doc/dokuwiki-doc-stubber.pl
+++ b/doc/dokuwiki-doc-stubber.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-use OpenSRF::System qw(/pines/conf/bootstrap.conf);
+use OpenSRF::System qw(/openils/conf/opensrf_core.xml);
 use Getopt::Long
 
 $| = 1;

diff --git a/examples/math_bench.pl b/examples/math_bench.pl
index c3a504c..f83e0fc 100755 (executable)
--- a/examples/math_bench.pl
+++ b/examples/math_bench.pl
@@ -13,7 +13,7 @@ my $count = $ARGV[0];
 print "usage: $0 <num_requests>\n" and exit unless $count;
 
 # * connect to the Jabber network
-OpenSRF::System->bootstrap_client( config_file => "/openils/conf/bootstrap.conf" );
+OpenSRF::System->bootstrap_client( config_file => "/openils/conf/opensrf_core.xml" );
 $log->set_service('math_bench');
 
 # * create a new application session for the opensrf.math service

diff --git a/src/Makefile b/src/Makefile
index 0cf5657..14823ab 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -86,7 +86,6 @@ opensrf-install:      objson-install
        cp -r ../include/opensrf $(INCLUDEDIR)
        cp libopensrf/opensrf $(BINDIR)/opensrf-c
        make -C c-apps install
-       cp ../examples/bootstrap.conf.example $(ETCDIR)
        cp ../bin/osrf_ctl.sh $(BINDIR)
        cp ../examples/opensrf.xml.example $(ETCDIR)
        cp ../examples/opensrf_core.xml.example $(ETCDIR)