]> git.evergreen-ils.org Git - OpenSRF.git/commit - src/jserver/Makefile
Merging changes from branches/new-json2
authorerickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Fri, 20 Jul 2007 12:58:59 +0000 (12:58 +0000)
committererickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Fri, 20 Jul 2007 12:58:59 +0000 (12:58 +0000)
commit2c4a565ff265f4b05345a2e13338f4faab84f256
tree80cb7246c42f91a7abeb9ddee68c2cdab914edbe
parentd84b11120b40891a9c84670f85873cbc59fff68e
Merging changes from branches/new-json2

svn merge -r1006:1012 svn://svn.open-ils.org/OpenSRF/branches/new-json2
svn merge -r1018:1019 svn://svn.open-ils.org/OpenSRF/branches/new-json2
svn merge -r1022:1025 svn://svn.open-ils.org/OpenSRF/branches/new-json2
svn merge -r1026:1028 svn://svn.open-ils.org/OpenSRF/branches/new-json2
svn merge -r1036:1037 svn://svn.open-ils.org/OpenSRF/branches/new-json2
svn merge -r1039:1040 svn://svn.open-ils.org/OpenSRF/branches/new-json2
svn merge -r1041:1043 svn://svn.open-ils.org/OpenSRF/branches/new-json2
svn merge -r1045:1048 svn://svn.open-ils.org/OpenSRF/branches/new-json2

This moves OpenSRF to the new JSON wire protocol,
including:
    a new C parser
    a new osrfList based string_array module
    a compatibility layer for mimicking libobjson and legacy JSON I/O in the HTTP gateway
    a small JSON test program for profiling, etc.

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1051 9efc2488-bf62-4759-914b-345cdb29e865
41 files changed:
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/osrf_json_gateway.c
src/jserver/Makefile
src/libopensrf/Makefile
src/libopensrf/Makefile.json [new file with mode: 0644]
src/libopensrf/osrf_application.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/string_array.c
src/perlmods/OpenSRF/Utils/JSON.pm
src/router/Makefile
src/srfsh/Makefile
src/srfsh/srfsh.c