[Opensrf-commits] r988 - in trunk: doc examples src

[svn at svn.open-ils.org]

Author: miker
Date: 2007-07-02 10:24:04 -0400 (Mon, 02 Jul 2007)
New Revision: 988

Modified:
   trunk/doc/dokuwiki-doc-stubber.pl
   trunk/examples/math_bench.pl
   trunk/src/Makefile
Log:
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/.



Modified: trunk/doc/dokuwiki-doc-stubber.pl
===================================================================
--- trunk/doc/dokuwiki-doc-stubber.pl	2007-06-30 03:14:36 UTC (rev 987)
+++ trunk/doc/dokuwiki-doc-stubber.pl	2007-07-02 14:24:04 UTC (rev 988)
@@ -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;

Modified: trunk/examples/math_bench.pl
===================================================================
--- trunk/examples/math_bench.pl	2007-06-30 03:14:36 UTC (rev 987)
+++ trunk/examples/math_bench.pl	2007-07-02 14:24:04 UTC (rev 988)
@@ -13,7 +13,7 @@
 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

Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2007-06-30 03:14:36 UTC (rev 987)
+++ trunk/src/Makefile	2007-07-02 14:24:04 UTC (rev 988)
@@ -86,7 +86,6 @@
 	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)