From 73ccd356f998cbe62d0c42ec0212dc8384cbb835 Mon Sep 17 00:00:00 2001 From: erickson Date: Sun, 27 Jul 2008 13:06:45 +0000 Subject: [PATCH] * remove the objson API compat layer. * Set the default JSON gateway protocol to non-legacy json git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1373 9efc2488-bf62-4759-914b-345cdb29e865 --- Makefile.am | 5 +---- include/objson/json2xml.h | 10 ---------- include/objson/json_parser.h | 9 --------- include/objson/object.h | 8 -------- include/objson/xml2json.h | 11 ----------- include/opensrf/osrfConfig.h | 4 ++-- src/Makefile.am | 5 ----- src/c-apps/Makefile.am | 8 ++++---- src/gateway/Makefile.am | 4 ++-- src/gateway/osrf_json_gateway.c | 15 +++------------ src/libopensrf/Makefile.am | 13 ++----------- src/libopensrf/Makefile.json | 3 --- 12 files changed, 14 insertions(+), 81 deletions(-) delete mode 100644 include/objson/json2xml.h delete mode 100644 include/objson/json_parser.h delete mode 100644 include/objson/object.h delete mode 100644 include/objson/xml2json.h diff --git a/Makefile.am b/Makefile.am index 6cea90a..b2b1f35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ export ETCDIR = @sysconfdir@ export APXS2 = @APXS2@ export APACHE2_HEADERS = @APACHE2_HEADERS@ export DEF_CFLAGS = -D_LARGEFILE64_SOURCE $(MAYBE_DEBUG) -pipe -g -Wall -O2 -fPIC -I@abs_top_srcdir@/include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) @INCLUDES@ -export DEF_LDLIBS = -lobjson -lopensrf +export DEF_LDLIBS = -lopensrf export VAR = @localstatedir@ export PID = @localstatedir@/run/opensrf export SOCK = @localstatedir@/lock/opensrf @@ -72,10 +72,8 @@ libosrf_FILES = src/libopensrf/basic_client.c \ EXTRA_DIST = $(DOC_FILES) $(EXAMPLES_FILES) $(libosrf_FILES) $(strn_compat_FILES) $(python_FILES) $(java_FILES) autogen.sh src/extras src/gateway/fieldmapper-c-xml-out.pl DCO-1.1.txt LICENSE.txt src/perlmods src/javascript -objsonincludedir = @includedir@/objson opensrfincludedir = @includedir@/opensrf -OBJINC=@srcdir@/include/objson OSRFINC=@srcdir@/include/opensrf opensrfinclude_HEADERS = $(OSRFINC)/log.h \ @@ -107,7 +105,6 @@ opensrfinclude_HEADERS = $(OSRFINC)/log.h \ $(OSRFINC)/utils.h \ $(OSRFINC)/xml_utils.h -objsoninclude_HEADERS = $(OBJINC)/json2xml.h $(OBJINC)/json_parser.h $(OBJINC)/object.h $(OBJINC)/xml2json.h SUBDIRS = src diff --git a/include/objson/json2xml.h b/include/objson/json2xml.h deleted file mode 100644 index 6539adf..0000000 --- a/include/objson/json2xml.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Header to support legacy objson library - */ -#ifndef OBJSON_JSON2XML_H -#define OBJSON_JSON2XML_H -#include -#include -#include -#endif - diff --git a/include/objson/json_parser.h b/include/objson/json_parser.h deleted file mode 100644 index 2c982ee..0000000 --- a/include/objson/json_parser.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Header to support legacy objson library - */ -#ifndef OBJSON_XML2JSON_H -#define OBJSON_XML2JSON_H -#include -#include -#include -#endif diff --git a/include/objson/object.h b/include/objson/object.h deleted file mode 100644 index e54f8ed..0000000 --- a/include/objson/object.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Header to support legacy objson library - */ -#ifndef OBJSON_OBJECT_H -#define OBJSON_OBJECT_H -#include -#include -#endif diff --git a/include/objson/xml2json.h b/include/objson/xml2json.h deleted file mode 100644 index 037fc75..0000000 --- a/include/objson/xml2json.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Header to support legacy objson library - */ -#ifndef OBJSON_XML2JSON_H -#define OBJSON_XML2JSON_H -#include -#include -#include -#endif - - diff --git a/include/opensrf/osrfConfig.h b/include/opensrf/osrfConfig.h index 9c0f913..b3fd60c 100644 --- a/include/opensrf/osrfConfig.h +++ b/include/opensrf/osrfConfig.h @@ -45,11 +45,11 @@ osrfConfig* osrfConfigInit(const char* configFile, const char* configContext); int osrfConfigHasDefaultConfig(); /** - Replaces the config object's objson object. This is useful + Replaces the config object's json object. This is useful if you have an ojbson object already and not an XML config file to parse. @param cfg The config object to alter - @param obj The objson objet to use when searching values + @param obj The json objet to use when searching values */ void osrfConfigReplaceConfig(osrfConfig* cfg, const jsonObject* obj); diff --git a/src/Makefile.am b/src/Makefile.am index 95e7c53..12fb2b9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,11 +28,6 @@ etcdir = $(ETCDIR) AM_LDFLAGS = $(DEF_LDFLAGS) AM_CFLAGS = $(DEF_CFLAGS) -if BUILDJSON -LDADD = -lobjson -BJSON=1 -endif - if BUILDPYTHON MAYBE_PY = python endif diff --git a/src/c-apps/Makefile.am b/src/c-apps/Makefile.am index 9cd583e..b3d9574 100644 --- a/src/c-apps/Makefile.am +++ b/src/c-apps/Makefile.am @@ -19,10 +19,10 @@ noinst_PROGRAMS = timejson lib_LTLIBRARIES = libosrf_dbmath.la libosrf_math.la libosrf_version.la timejson_SOURCES = timejson.c -timejson_LDADD = -lobjson -lopensrf +timejson_LDADD = -lopensrf libosrf_dbmath_la_SOURCES = osrf_dbmath.c -libosrf_dbmath_la_LIBADD = -lobjson -lopensrf +libosrf_dbmath_la_LIBADD = -lopensrf libosrf_math_la_SOURCES = osrf_math.c -libosrf_math_la_LIBADD = -lobjson -lopensrf +libosrf_math_la_LIBADD = -lopensrf libosrf_version_la_SOURCES = osrf_version.c -libosrf_version_la_LIBADD = -lobjson -lopensrf +libosrf_version_la_LIBADD = -lopensrf diff --git a/src/gateway/Makefile.am b/src/gateway/Makefile.am index df09469..163061b 100644 --- a/src/gateway/Makefile.am +++ b/src/gateway/Makefile.am @@ -19,9 +19,9 @@ curdir = @abs_top_builddir@/src/gateway/ cur_LTLIBRARIES = libosrf_json_gateway.la libosrf_http_translator.la libosrf_json_gateway_la_SOURCES = apachetools.c apachetools.h osrf_json_gateway.c -libosrf_json_gateway_la_LIBADD = -lobjson -lopensrf +libosrf_json_gateway_la_LIBADD = -lopensrf libosrf_http_translator_la_SOURCES = apachetools.c apachetools.h osrf_http_translator.c -libosrf_http_translator_la_LIBADD = -lobjson -lopensrf +libosrf_http_translator_la_LIBADD = -lopensrf include_HEADERS = apachetools.h diff --git a/src/gateway/osrf_json_gateway.c b/src/gateway/osrf_json_gateway.c index 81099d1..c1b3c39 100644 --- a/src/gateway/osrf_json_gateway.c +++ b/src/gateway/osrf_json_gateway.c @@ -16,12 +16,7 @@ #define DEFAULT_LOCALE "OSRFDefaultLocale" #define CONFIG_CONTEXT "gateway" #define JSON_PROTOCOL "OSRFGatewayLegacyJSON" -#define GATEWAY_USE_LEGACY_JSON 1 - -/* our config structure */ -typedef struct { - char* configfile; /* our bootstrap config file */ -} osrf_json_gateway_config; +#define GATEWAY_USE_LEGACY_JSON 0 typedef struct { int legacyJSON; @@ -43,16 +38,13 @@ static const char* osrf_json_gateway_set_default_locale(cmd_parms *parms, void * } static const char* osrf_json_gateway_set_config(cmd_parms *parms, void *config, const char *arg) { - osrf_json_gateway_config *cfg; - cfg = ap_get_module_config(parms->server->module_config, &osrf_json_gateway_module); - cfg->configfile = (char*) arg; osrf_json_gateway_config_file = (char*) arg; return NULL; } static const char* osrf_json_gateway_set_json_proto(cmd_parms *parms, void *config, const char *arg) { osrf_json_gateway_dir_config* cfg = (osrf_json_gateway_dir_config*) config; - cfg->legacyJSON = (!strcasecmp((char*) arg, "false")) ? 0 : 1; + cfg->legacyJSON = (!strcasecmp((char*) arg, "true")) ? 1 : 0; return NULL; } @@ -125,10 +117,9 @@ static int osrf_json_gateway_method_handler (request_rec *r) { char* (*jsonToStringFunc) (const jsonObject*) = legacy_jsonObjectToJSON; if(dir_conf->legacyJSON) { - ap_log_rerror( APLOG_MARK, APLOG_INFO, 0, r, "Using legacy JSON"); + ap_log_rerror( APLOG_MARK, APLOG_DEBUG, 0, r, "Using legacy JSON"); } else { - ap_log_rerror( APLOG_MARK, APLOG_INFO, 0, r, "Not using legacy JSON"); parseJSONFunc = jsonParseString; jsonToStringFunc = jsonObjectToJSON; } diff --git a/src/libopensrf/Makefile.am b/src/libopensrf/Makefile.am index 68b46e7..40aac2c 100644 --- a/src/libopensrf/Makefile.am +++ b/src/libopensrf/Makefile.am @@ -14,7 +14,7 @@ AM_CFLAGS = $(DEF_CFLAGS) -DASSUME_STATELESS -DOSRF_STRICT_PARAMS -rdynamic -fno-strict-aliasing -DOSRF_JSON_ENABLE_XML_UTILS AM_LDFLAGS = $(DEF_LDFLAGS) -LDADD = -lxml2 -ldl -lmemcache -lopensrf -lobjson +LDADD = -lxml2 -ldl -lmemcache -lopensrf OSRF_INC = @top_srcdir@/include/opensrf @@ -97,20 +97,11 @@ opensrf_DEPENDENCIES = libopensrf.la osrf_json_test_SOURCES = osrf_json_test.c $(JSON_TARGS) $(JSON_DEP) $(JSON_TARGS_HEADS) $(JSON_DEP_HEADS) noinst_LTLIBRARIES = libosrf_json.la -lib_LTLIBRARIES = libobjson.la libopensrf.la - -if BUILDJSON -libobjson_la_SOURCES = $(JSON_TARGS) $(JSON_DEP) $(JSON_TARGS_HEADS) $(JSON_DEP_HEADS) -libobjson_la_CFLAGS = $(AM_CFLAGS) -endif +lib_LTLIBRARIES = libopensrf.la libosrf_json_la_SOURCES = $(JSON_TARGS) $(JSON_DEP) $(JSON_TARGS_HEADS) $(JSON_DEP_HEADS) libosrf_json_la_CFLAGS = $(AM_CFLAGS) -if BUILDJSON -libosrf_json_la_DEPENDENCIES = libobjson.la -endif - libopensrf_la_CFLAGS = $(AM_CFLAGS) libopensrf_la_DEPENDENCIES = libosrf_json.la diff --git a/src/libopensrf/Makefile.json b/src/libopensrf/Makefile.json index 8de20a6..8cbc312 100644 --- a/src/libopensrf/Makefile.json +++ b/src/libopensrf/Makefile.json @@ -13,9 +13,6 @@ TARGETS = osrf_json_object.o osrf_json_parser.o osrf_json_tools.o osrf_legacy_js EXT_TARGETS = osrf_list.o osrf_hash.o utils.o log.o md5.o string_array.o all: $(TARGETS) - if [ ! -z "$(OSRF_LEGACY_JSON)" ]; then \ - $(CC) -shared -W1 $(LDFLAGS) $(TARGETS) -o $(TMPDIR)/libobjson.so;\ - fi; standalone: $(TARGETS) $(EXT_TARGETS) $(CC) -shared -W1 $(CFLAGS) $(LDFLAGS) $(LDLIBS) $(TARGETS) $(EXT_TARGETS) -o libosrf_json.so -- 2.43.2