From 73a91b27abecdc3d069170a8cbe1439a690c3995 Mon Sep 17 00:00:00 2001 From: miker Date: Fri, 29 Jun 2007 15:36:58 +0000 Subject: [PATCH] cleaning up XML indentation via xmllint; removing bootstrap.conf, which is no longer needed (yay Dan!) git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@986 9efc2488-bf62-4759-914b-345cdb29e865 --- examples/bootstrap.conf.example | 44 ---- examples/opensrf.xml.example | 381 +++++++++++++++--------------- examples/opensrf_core.xml.example | 236 +++++++++--------- examples/srfsh.xml.example | 21 +- 4 files changed, 318 insertions(+), 364 deletions(-) delete mode 100644 examples/bootstrap.conf.example diff --git a/examples/bootstrap.conf.example b/examples/bootstrap.conf.example deleted file mode 100644 index ce445f7..0000000 --- a/examples/bootstrap.conf.example +++ /dev/null @@ -1,44 +0,0 @@ -# ---------------------------------------------------------- -# bootstrap config file -# ---------------------------------------------------------- -[bootstrap] - -# location of the opensrf.xml config file -settings_config = /path/to/opensrf.xml - -# log files directory -log_dir = /path/to/log - -## Log file is either a file name or syslog: -#logfile = osrfysys.log -logfile = syslog:local0 - -# defines the syslog facility for the activity log -#actlog = activity.log -actlog = syslog:local1 - -# log level -debug = ERROR -#debug = INFO -#debug = DEBUG -#debug = INTERNAL - -# the jabber login of the router (changing this will likely cause problems) -router_name = router - -# all jabber domains we want our app to connect to -list:domains = router1.domain.com, router2.domain.com - -# jabber login -username = jabber_username - -# jabber password -passwd = jabber_password - -# if port is non-numeric (e.g. /tmp/mysock.sock) then we will attempt to -# connect to the specified string as a unix socket file -# This works with Chop Chop jabber only (opensrf custom jabber server) -port = 5222 - -# -------------------------------------- - diff --git a/examples/opensrf.xml.example b/examples/opensrf.xml.example index 437570a..fa2bc44 100644 --- a/examples/opensrf.xml.example +++ b/examples/opensrf.xml.example @@ -1,208 +1,207 @@ - + + + - Any valid XML may be added to the block and server components will have - acces to it. + + - --> + + /path/to/log - - - + + /path/to/sock - - /path/to/log + + /path/to/pid - - /path/to/sock + + /path/to/conf + - - /path/to/pid + + prefork - - /path/to/conf + + + + + - + + 127.0.0.1:10101 - - prefork + - - + + 86400 - - - - - 127.0.0.1:10101 - - - 86400 - - - - - - - - - - - 1 - - - 1 - - - perl - - - OpenSRF::Application::Persist - - - 97 - - - - - - opensrf.persist_unix.sock - - - opensrf.persist_unix.pid - - - 1000 - - - opensrf.persist_unix.log - - - 5 - - - 25 - - - 2 - - - 5 - - - - - - - - /path/to/dbfile/persist.db - - - - - - 3 - 1 - perl - OpenSRF::Application::Demo::Math - 97 - - opensrf.math_unix.sock - opensrf.math_unix.pid - 1000 - opensrf.math_unix.log - 5 - 15 - 2 - 5 - - - - - 3 - 1 - perl - OpenSRF::Application::Demo::MathDB - 99 - - 1000 - opensrf.dbmath_unix.log - opensrf.dbmath_unix.sock - opensrf.dbmath_unix.pid - 5 - 15 - 2 5 - - - - - 1 - 0 - perl - OpenSRF::Application::Settings - 17 - - opensrf.settings_unix.sock - opoensrf.settings_unix.pid - 1000 - opensrf.settings_unix.log - 5 - 15 - 3 - 5 - - - - - - - - - - - - - - - - opensrf.persist - opensrf.settings - opensrf.math - opensrf.dbmath - - - - - - /different/path/to/dbfile/persist.db - - - - - - - + + + + + + + + + + 1 + + + 1 + + + perl + + + OpenSRF::Application::Persist + + + 97 + + + + + + opensrf.persist_unix.sock + + + opensrf.persist_unix.pid + + + 1000 + + + opensrf.persist_unix.log + + + 5 + + + 25 + + + 2 + + + 5 + + + + + + + + /path/to/dbfile/persist.db + + + + + + 3 + 1 + perl + OpenSRF::Application::Demo::Math + 97 + + opensrf.math_unix.sock + opensrf.math_unix.pid + 1000 + opensrf.math_unix.log + 5 + 15 + 2 + 5 + + + + + 3 + 1 + perl + OpenSRF::Application::Demo::MathDB + 99 + + 1000 + opensrf.dbmath_unix.log + opensrf.dbmath_unix.sock + opensrf.dbmath_unix.pid + 5 + 15 + 2 + 5 + + + + + 1 + 0 + perl + OpenSRF::Application::Settings + 17 + + opensrf.settings_unix.sock + opoensrf.settings_unix.pid + 1000 + opensrf.settings_unix.log + 5 + 15 + 3 + 5 + + + + + + + + + + + + + opensrf.persist + opensrf.settings + opensrf.math + opensrf.dbmath + + + + + + + + /different/path/to/dbfile/persist.db + + + + + + + + diff --git a/examples/opensrf_core.xml.example b/examples/opensrf_core.xml.example index 708d4a6..d24121d 100644 --- a/examples/opensrf_core.xml.example +++ b/examples/opensrf_core.xml.example @@ -1,143 +1,141 @@ - - + - - - - - router - - - - localhost - - - - - localhost - + + - client - mypass - 5222 + + + router + + - - /openils/var/log/osrfsys.log + + localhost + + + + + + localhost - + + client + mypass + 5222 - + + /openils/var/log/osrfsys.log - - 3 + + + + + 3 /openils/conf/opensrf.xml + - - - localhost - 5222 + + - - 5269 - secret + + localhost + 5222 - 10.0.0.3 - 3 - /openils/var/log/osrfsys.log - + + 5269 + secret + 10.0.0.3 + 3 + /openils/var/log/osrfsys.log + - - + + - - true - - - router - - - - localhost - - - - - opensrf.math - open-ils.cat - open-ils.search - open-ils.circ - open-ils.actor - open-ils.auth - - - - - mylogin - mypassword - 5222 - - /openils/var/log/gateway.log - 3 - - - - - - - - - - 0 - - - - localhost - - localhost - - - - - localhost - 5222 - - + router + + + + localhost + + + + + opensrf.math + open-ils.cat + open-ils.search + open-ils.circ + open-ils.actor + open-ils.auth + + + + mylogin + mypassword + 5222 + /openils/var/log/gateway.log + 3 + + + + + + + + + 0 + + + + + localhost + + + localhost + + + + + + + localhost + 5222 + + - router + router + mypassword - mypassword + + + router + 10 + 5 - - - router + + /openils/var/log/router.log + 3 - 10 - 5 - - - /openils/var/log/router.log - 3 - - + - + diff --git a/examples/srfsh.xml.example b/examples/srfsh.xml.example index 5bc1e2d..e88ae6b 100644 --- a/examples/srfsh.xml.example +++ b/examples/srfsh.xml.example @@ -1,12 +1,13 @@ - + + - router - - 127.0.0.1 - - myusername - mypassword - 5222 - /path/to/log/srfsh.log - 4 + router + + 127.0.0.1 + + myusername + mypassword + 5222 + /path/to/log/srfsh.log + 4 -- 2.43.2