projects / OpenSRF.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 47af5b4) | patch
Merging trunk into new-json branch to keep the branch in sync with trunk new-json
authorerickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Wed, 13 Jun 2007 14:03:35 +0000 (14:03 +0000)
committererickson <erickson@9efc2488-bf62-4759-914b-345cdb29e865>
Wed, 13 Jun 2007 14:03:35 +0000 (14:03 +0000)
commit03645863db38dca03f503da83ca58e4ff973d358
treeb63dc39474529f8eaa385b6cd09bcb3f45b24108tree
parent47af5b4dc262987d61603dfe97abd774efe8e879commit | diff
Merging trunk into new-json branch to keep the branch in sync with trunk
$ svn merge -r 887:HEAD svn://svn.open-ils.org/OpenSRF/trunk
revision 887 is the changeset for the creation of the new-json branch
this is the first sync merge

git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/new-json@946 9efc2488-bf62-4759-914b-345cdb29e865
58 files changed:
Makefile [new file with mode: 0644] blob
examples/srfsh_config.xsd [new file with mode: 0644] blob
install.conf [new file with mode: 0644] blob
src/Makefile diff | blob | history
src/java/Makefile diff | blob | history
src/java/ext/stax-api-1.0.1.jar [deleted file] blob | history
src/java/ext/wstx-asl-3.2.1.jar [deleted file] blob | history
src/java/org/opensrf/ClientSession.java diff | blob | history
src/java/org/opensrf/Request.java diff | blob | history
src/java/org/opensrf/Session.java diff | blob | history
src/java/org/opensrf/SessionException.java [new file with mode: 0644] blob
src/java/org/opensrf/Stack.java diff | blob | history
src/java/org/opensrf/Status.java [new file with mode: 0644] blob
src/java/org/opensrf/Sys.java [new file with mode: 0644] blob
src/java/org/opensrf/net/xmpp/XMPPSession.java diff | blob | history
src/java/org/opensrf/test/MathBench.java [new file with mode: 0644] blob
src/java/org/opensrf/test/TestCache.java [new file with mode: 0644] blob
src/java/org/opensrf/test/TestClient.java diff | blob | history
src/java/org/opensrf/test/TestConfig.java diff | blob | history
src/java/org/opensrf/test/TestSettings.java [new file with mode: 0644] blob
src/java/org/opensrf/util/Cache.java [new file with mode: 0644] blob
src/java/org/opensrf/util/Config.java diff | blob | history
src/java/org/opensrf/util/ConfigException.java diff | blob | history
src/java/org/opensrf/util/SettingsClient.java [new file with mode: 0644] blob
src/jserver/osrf_chat.c diff | blob | history
src/jserver/osrf_chat_main.c diff | blob | history
src/libstack/opensrf.c diff | blob | history
src/libstack/osrfConfig.c diff | blob | history
src/libstack/osrf_app_session.c diff | blob | history
src/libstack/osrf_prefork.c diff | blob | history
src/libstack/osrf_settings.c diff | blob | history
src/libstack/osrf_system.c diff | blob | history
src/libstack/osrf_system.h diff | blob | history
src/libtransport/basic_client.c diff | blob | history
src/libtransport/transport_client.c diff | blob | history
src/libtransport/transport_client.h diff | blob | history
src/libtransport/transport_session.c diff | blob | history
src/libtransport/transport_session.h diff | blob | history
src/objson/json2xml.h diff | blob | history
src/objson/json_parser.h diff | blob | history
src/objson/object.h diff | blob | history
src/perlmods/OpenSRF/Utils/Config.pm diff | blob | history
src/ports/strn_compat/Makefile [new file with mode: 0644] blob
src/ports/strn_compat/strndup.c [new file with mode: 0644] blob
src/ports/strn_compat/strndup.h [new file with mode: 0644] blob
src/ports/strn_compat/strnlen.c [new file with mode: 0644] blob
src/ports/strn_compat/strnlen.h [new file with mode: 0644] blob
src/python/osrf/gateway.py [new file with mode: 0644] blob
src/python/osrf/json.py diff | blob | history
src/python/osrf/net_obj.py [new file with mode: 0644] blob
src/python/osrf/ses.py diff | blob | history
src/python/osrf/utils.py diff | blob | history
src/utils/log.c diff | blob | history
src/utils/socket_bundle.c diff | blob | history
src/utils/socket_bundle.h diff | blob | history
src/utils/utils.c diff | blob | history
src/utils/utils.h diff | blob | history
src/utils/xml_utils.c diff | blob | history
OpenSRF