Merged revisions 1045-1120 via svnmerge. autotools
authorasmodai <asmodai@9efc2488-bf62-4759-914b-345cdb29e865>
Mon, 5 Nov 2007 13:40:16 +0000 (13:40 +0000)
committerasmodai <asmodai@9efc2488-bf62-4759-914b-345cdb29e865>
Mon, 5 Nov 2007 13:40:16 +0000 (13:40 +0000)
commitb29be8223af70b2e6e3c1aa42a3fe756a7c4caa7
treed3ef00505a6107c38913c0fcb389b2f964486e52
parent1845a1af58a27ee275b8c790f17777d4456d7716
Merged revisions 1045-1120 via svnmerge.

git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/autotools@1121 9efc2488-bf62-4759-914b-345cdb29e865
102 files changed:
Makefile
bin/osrf_ctl.sh
examples/math_xul_client/math/content/math.xul
examples/opensrf.xml.example
examples/opensrf_core.xml.example
examples/srfsh.xml.example
include/objson/json2xml.h
include/objson/json_parser.h
include/objson/object.h
include/objson/xml2json.h
include/opensrf/osrfConfig.h
include/opensrf/osrf_app_session.h
include/opensrf/osrf_application.h
include/opensrf/osrf_cache.h
include/opensrf/osrf_json.h [new file with mode: 0644]
include/opensrf/osrf_json_utils.h [new file with mode: 0644]
include/opensrf/osrf_json_xml.h [new file with mode: 0644]
include/opensrf/osrf_legacy_json.h [new file with mode: 0644]
include/opensrf/osrf_message.h
include/opensrf/osrf_settings.h
include/opensrf/string_array.h
include/opensrf/utils.h
include/opensrf/xml_utils.h
install.conf
src/Makefile
src/c-apps/Makefile
src/c-apps/osrf_dbmath.c
src/c-apps/osrf_math.c
src/c-apps/osrf_version.c
src/gateway/Makefile
src/gateway/apachetools.c
src/gateway/osrf_json_gateway.c
src/java/Makefile
src/java/org/opensrf/ClientSession.java
src/java/org/opensrf/MethodException.java
src/java/org/opensrf/Request.java
src/java/org/opensrf/Session.java
src/java/org/opensrf/Sys.java
src/java/org/opensrf/net/xmpp/XMPPReader.java
src/java/org/opensrf/net/xmpp/XMPPSession.java
src/java/org/opensrf/test/TestClient.java
src/java/org/opensrf/test/TestLog.java [new file with mode: 0644]
src/java/org/opensrf/test/TestThread.java [new file with mode: 0644]
src/java/org/opensrf/util/FileLogger.java [new file with mode: 0644]
src/java/org/opensrf/util/Logger.java [new file with mode: 0644]
src/java/org/opensrf/util/OSRFObject.java
src/javascript/JSON.js [deleted file]
src/javascript/JSON_v0.js [new file with mode: 0644]
src/javascript/JSON_v1.js [new file with mode: 0644]
src/jserver/Makefile
src/jserver/osrf_chat.c
src/libopensrf/Makefile
src/libopensrf/Makefile.json [new file with mode: 0644]
src/libopensrf/basic_client.c
src/libopensrf/log.c
src/libopensrf/opensrf.c
src/libopensrf/osrf_app_session.c
src/libopensrf/osrf_application.c
src/libopensrf/osrf_cache.c
src/libopensrf/osrf_hash.c
src/libopensrf/osrf_json_object.c [new file with mode: 0644]
src/libopensrf/osrf_json_parser.c [new file with mode: 0644]
src/libopensrf/osrf_json_test.c [new file with mode: 0644]
src/libopensrf/osrf_json_tools.c [new file with mode: 0644]
src/libopensrf/osrf_json_xml.c [new file with mode: 0644]
src/libopensrf/osrf_legacy_json.c [new file with mode: 0644]
src/libopensrf/osrf_message.c
src/libopensrf/osrf_prefork.c
src/libopensrf/osrf_settings.c
src/libopensrf/osrf_stack.c
src/libopensrf/osrf_system.c
src/libopensrf/osrf_transgroup.c
src/libopensrf/sha.c
src/libopensrf/socket_bundle.c
src/libopensrf/string_array.c
src/libopensrf/transport_client.c
src/libopensrf/transport_message.c
src/libopensrf/transport_session.c
src/libopensrf/utils.c
src/objson/json_parser.c
src/objson/objson_test.c
src/perlmods/OpenSRF/AppSession.pm
src/perlmods/OpenSRF/Application.pm
src/perlmods/OpenSRF/DomainObject/oilsMessage.pm
src/perlmods/OpenSRF/DomainObject/oilsResponse.pm
src/perlmods/OpenSRF/Transport.pm
src/perlmods/OpenSRF/UnixServer.pm
src/perlmods/OpenSRF/Utils/JSON.pm
src/perlmods/OpenSRF/Utils/Logger.pm
src/python/osrf/gateway.py
src/python/osrf/json.py
src/python/osrf/log.py
src/python/osrf/net.py
src/python/osrf/net_obj.py
src/python/osrf/ses.py
src/python/osrf/stack.py
src/python/osrf/system.py
src/python/srfsh.py
src/router/Makefile
src/router/osrf_router.c
src/srfsh/Makefile
src/srfsh/srfsh.c