update esl swig to swig 2.0 and reswig

2025-06-07 13:35:00 +00:00 · 2015-06-16 12:43:53 -05:00 · 2015-06-16 12:43:53 -05:00 · 54762dd197
commit 54762dd197
parent 6a903e2397
29 changed files with 2455 additions and 2599 deletions
--- a/libs/esl/java/Makefile
+++ b/libs/esl/java/Makefile
@ -5,7 +5,7 @@ CLASSES=org/freeswitch/esl/*
 all: esl.jar
 esl_wrap.cpp:
-	swig -module esl -java -c++ $(LOCAL_CFLAGS) -package org.freeswitch.esl -outdir org/freeswitch/esl -o esl_wrap.cpp ../ESL.i
+	swig2.0 -module esl -java -c++ $(LOCAL_CFLAGS) -package org.freeswitch.esl -outdir org/freeswitch/esl -o esl_wrap.cpp ../ESL.i
 esl_wrap.o: esl_wrap.cpp
 	$(CXX) $(CXX_CFLAGS) $(LOCAL_CFLAGS) $(CXXFLAGS) $(GCC_WARNING_JUNK) $(PERL_INC) -c esl_wrap.cpp -o esl_wrap.o
--- a/libs/esl/java/esl_wrap.cpp
+++ b/libs/esl/java/esl_wrap.cpp
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
 *
 * This file is not intended to be easily readable and contains a number of
 * coding conventions designed to improve portability and efficiency. Do not make
@ -8,20 +8,25 @@
 * interface file instead.
 * ----------------------------------------------------------------------------- */
 #define SWIGJAVA
 #ifdef __cplusplus
 /* SwigValueWrapper is described in swig.swg */
 template<typename T> class SwigValueWrapper {
-    T *tt;
+  struct SwigMovePointer {
-public:
+    T *ptr;
-    SwigValueWrapper() : tt(0) { }
+    SwigMovePointer(T *p) : ptr(p) { }
-    SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
+    ~SwigMovePointer() { delete ptr; }
-    SwigValueWrapper(const T& t) : tt(new T(t)) { }
+    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
-    ~SwigValueWrapper() { delete tt; } 
+  } pointer;
    SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; }
    operator T&() const { return *tt; }
    T *operator&() { return tt; }
 private:
  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
 public:
  SwigValueWrapper() : pointer(0) { }
  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
  operator T&() const { return *pointer.ptr; }
  T *operator&() { return pointer.ptr; }
 };
 template <typename T> T SwigValueInit() {
@ -71,6 +76,12 @@ template <typename T> T SwigValueInit() {
 # endif
 #endif
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
 # endif
 #endif
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@ -134,7 +145,7 @@ template <typename T> T SwigValueInit() {
 /* Fix for jlong on some versions of gcc on Windows */
-#if defined(__GNUC__) && !defined(__INTELC__)
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
  typedef long long __int64;
 #endif
@ -181,7 +192,8 @@ static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionC
    { SWIG_JavaNullPointerException, "java/lang/NullPointerException" },
    { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" },
    { SWIG_JavaUnknownError,  "java/lang/UnknownError" },
-    { (SWIG_JavaExceptionCodes)0,  "java/lang/UnknownError" } };
+    { (SWIG_JavaExceptionCodes)0,  "java/lang/UnknownError" }
  };
  const SWIG_JavaExceptions_t *except_ptr = java_exceptions;
  while (except_ptr->code != code && except_ptr->code)
@ -217,7 +229,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1event_1set(JNIE
  arg1 = *(ESLevent **)&jarg1; 
  arg2 = *(esl_event_t **)&jarg2; 
  if (arg1) (arg1)->event = arg2;
 }
@ -250,7 +261,7 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1serialized_1str
    if (!arg2) return ;
  }
  {
-    if (arg1->serialized_string) delete [] arg1->serialized_string;
+    delete [] arg1->serialized_string;
    if (arg2) {
      arg1->serialized_string = (char *) (new char[strlen((const char *)arg2)+1]);
      strcpy((char *)arg1->serialized_string, (const char *)arg2);
@ -272,7 +283,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1serialized_1
  (void)jarg1_;
  arg1 = *(ESLevent **)&jarg1; 
  result = (char *) ((arg1)->serialized_string);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }
@ -287,7 +298,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1mine_1set(JNIEn
  arg1 = *(ESLevent **)&jarg1; 
  arg2 = (int)jarg2; 
  if (arg1) (arg1)->mine = arg2;
 }
@ -370,7 +380,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_esl_eslJNI_delete_1ESLevent(JNIEnv *
  (void)jcls;
  arg1 = *(ESLevent **)&jarg1; 
  delete arg1;
 }
@ -390,7 +399,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1serialize(JN
    if (!arg2) return 0;
  }
  result = (char *)(arg1)->serialize((char const *)arg2);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
  return jresult;
 }
@ -400,8 +409,8 @@ SWIGEXPORT jboolean JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1setPriority
  jboolean jresult = 0 ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  esl_priority_t arg2 = (esl_priority_t) ESL_PRIORITY_NORMAL ;
  bool result;
  esl_priority_t *argp2 ;
  bool result;
  (void)jenv;
  (void)jcls;
@ -437,7 +446,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1getHeader(JN
  }
  arg3 = (int)jarg3; 
  result = (char *)(arg1)->getHeader((char const *)arg2,arg3);
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  if (arg2) jenv->ReleaseStringUTFChars(jarg2, (const char *)arg2);
  return jresult;
 }
@ -453,7 +462,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1getBody(JNIE
  (void)jarg1_;
  arg1 = *(ESLevent **)&jarg1; 
  result = (char *)(arg1)->getBody();
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }
@ -468,7 +477,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1getType(JNIE
  (void)jarg1_;
  arg1 = *(ESLevent **)&jarg1; 
  result = (char *)(arg1)->getType();
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }
@ -614,7 +623,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1firstHeader(
  (void)jarg1_;
  arg1 = *(ESLevent **)&jarg1; 
  result = (char *)(arg1)->firstHeader();
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }
@ -629,7 +638,7 @@ SWIGEXPORT jstring JNICALL Java_org_freeswitch_esl_eslJNI_ESLevent_1nextHeader(J
  (void)jarg1_;
  arg1 = *(ESLevent **)&jarg1; 
  result = (char *)(arg1)->nextHeader();
-  if(result) jresult = jenv->NewStringUTF((const char *)result);
+  if (result) jresult = jenv->NewStringUTF((const char *)result);
  return jresult;
 }
@ -791,7 +800,6 @@ SWIGEXPORT void JNICALL Java_org_freeswitch_esl_eslJNI_delete_1ESLconnection(JNI
  (void)jcls;
  arg1 = *(ESLconnection **)&jarg1; 
  delete arg1;
 }
--- a/libs/esl/java/org/freeswitch/esl/ESLconnection.java
+++ b/libs/esl/java/org/freeswitch/esl/ESLconnection.java
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
 *
 * Do not make changes to this file unless you know what you are doing--modify
 * the SWIG interface file instead.
@ -26,12 +26,14 @@ public class ESLconnection {
  }
  public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
+    if (swigCPtr != 0) {
      if (swigCMemOwn) {
        swigCMemOwn = false;
        eslJNI.delete_ESLconnection(swigCPtr);
      }
      swigCPtr = 0;
    }
  }
  public ESLconnection(String host, int port, String user, String password) {
    this(eslJNI.new_ESLconnection__SWIG_0(host, port, user, password), true);
--- a/libs/esl/java/org/freeswitch/esl/ESLevent.java
+++ b/libs/esl/java/org/freeswitch/esl/ESLevent.java
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
 *
 * Do not make changes to this file unless you know what you are doing--modify
 * the SWIG interface file instead.
@ -26,12 +26,14 @@ public class ESLevent {
  }
  public synchronized void delete() {
-    if(swigCPtr != 0 && swigCMemOwn) {
+    if (swigCPtr != 0) {
      if (swigCMemOwn) {
        swigCMemOwn = false;
        eslJNI.delete_ESLevent(swigCPtr);
      }
      swigCPtr = 0;
    }
  }
  public void setEvent(SWIGTYPE_p_esl_event_t value) {
    eslJNI.ESLevent_event_set(swigCPtr, this, SWIGTYPE_p_esl_event_t.getCPtr(value));
--- a/libs/esl/java/org/freeswitch/esl/SWIGTYPE_p_esl_event_t.java
+++ b/libs/esl/java/org/freeswitch/esl/SWIGTYPE_p_esl_event_t.java
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
 *
 * Do not make changes to this file unless you know what you are doing--modify
 * the SWIG interface file instead.
--- a/libs/esl/java/org/freeswitch/esl/SWIGTYPE_p_esl_priority_t.java
+++ b/libs/esl/java/org/freeswitch/esl/SWIGTYPE_p_esl_priority_t.java
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
 *
 * Do not make changes to this file unless you know what you are doing--modify
 * the SWIG interface file instead.
--- a/libs/esl/java/org/freeswitch/esl/esl.java
+++ b/libs/esl/java/org/freeswitch/esl/esl.java
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
 *
 * Do not make changes to this file unless you know what you are doing--modify
 * the SWIG interface file instead.
--- a/libs/esl/java/org/freeswitch/esl/eslJNI.java
+++ b/libs/esl/java/org/freeswitch/esl/eslJNI.java
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
 *
 * Do not make changes to this file unless you know what you are doing--modify
 * the SWIG interface file instead.
@ -8,7 +8,7 @@
 package org.freeswitch.esl;
-class eslJNI {
+public class eslJNI {
  public final static native void ESLevent_event_set(long jarg1, ESLevent jarg1_, long jarg2);
  public final static native long ESLevent_event_get(long jarg1, ESLevent jarg1_);
  public final static native void ESLevent_serialized_string_set(long jarg1, ESLevent jarg1_, String jarg2);
--- a/libs/esl/lua/esl_wrap.cpp
+++ b/libs/esl/lua/esl_wrap.cpp
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
 *
 * This file is not intended to be easily readable and contains a number of
 * coding conventions designed to improve portability and efficiency. Do not make
@ -315,7 +315,7 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
@ -379,18 +379,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 /*
  Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
+SWIG_TypeCmp(const char *nb, const char *tb) {
-  int equiv = 0;
+  int equiv = 1;
  const char* te = tb + strlen(tb);
  const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
    for (nb = ne; *ne; ++ne) {
      if (*ne == '|') break;
    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
    if (*ne) ++ne;
  }
  return equiv;
@ -398,24 +398,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 /*
  Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
+SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
  const char* te = tb + strlen(tb);
  const char* ne = nb;
  while (!equiv && *ne) {
    for (nb = ne; *ne; ++ne) {
      if (*ne == '|') break;
    }
    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
    if (*ne) ++ne;
  }
  return equiv;
 }
 /*
  Check the typename
 */
@ -802,6 +791,36 @@ extern "C" {
 #endif
 /* --------------------------------------------------------------------------
 * Helper functions for error handling
 * -------------------------------------------------------------------------- */
 /* Push the string STR on the Lua stack, like lua_pushstring, but
   prefixed with the the location of the innermost Lua call-point
   (as formated by luaL_where).  */
 SWIGRUNTIME void
 SWIG_Lua_pusherrstring (lua_State *L, const char *str)
 {
  luaL_where (L, 1);
  lua_pushstring (L, str);
  lua_concat (L, 2);
 }
 /* Push a formatted string generated from FMT and following args on
   the Lua stack, like lua_pushfstring, but prefixed with the the
   location of the innermost Lua call-point (as formated by luaL_where).  */
 SWIGRUNTIME void
 SWIG_Lua_pushferrstring (lua_State *L, const char *fmt, ...)
 {
  va_list argp;
  va_start(argp, fmt);
  luaL_where(L, 1);
  lua_pushvfstring(L, fmt, argp);
  va_end(argp);
  lua_concat(L, 2);
 }
 /* -----------------------------------------------------------------------------
 * global swig types
 * ----------------------------------------------------------------------------- */
@ -841,6 +860,15 @@ typedef struct {
  lua_CFunction   setmethod;
 } swig_lua_attribute;
 // Can be used to create namespaces. Currently used to
 // wrap class static methods/variables/constants
 typedef struct {
  const char            *name;
  swig_lua_method       *ns_methods;
  swig_lua_attribute    *ns_attributes;
  swig_lua_const_info   *ns_constants;
 } swig_lua_namespace;
 typedef struct swig_lua_class {
  const char    *name;
  swig_type_info   **type;
@ -848,11 +876,12 @@ typedef struct swig_lua_class {
  void    (*destructor)(void *);
  swig_lua_method   *methods;
  swig_lua_attribute     *attributes;
  swig_lua_namespace    cls_static;
  struct swig_lua_class **bases;
  const char **base_names;
 } swig_lua_class;
-/* this is the struct for wrappering all pointers in SwigLua
+/* this is the struct for wrapping all pointers in SwigLua
 */
 typedef struct {
  swig_type_info   *type;
@ -860,7 +889,7 @@ typedef struct {
  void        *ptr;
 } swig_lua_userdata;
-/* this is the struct for wrapping arbitary packed binary data
+/* this is the struct for wrapping arbitrary packed binary data
 (currently it is only used for member function pointers)
 the data ordering is similar to swig_lua_userdata, but it is currently not possible
 to tell the two structures apart within SWIG, other than by looking at the type
@ -886,19 +915,20 @@ typedef struct {
 /* Contract support */
 #define SWIG_contract_assert(expr, msg)  \
-  if (!(expr)) { lua_pushstring(L, (char *) msg); goto fail; } else
+  if (!(expr)) { SWIG_Lua_pusherrstring(L, (char *) msg); goto fail; } else
 /* helper #defines */
 #define SWIG_fail {goto fail;}
 #define SWIG_fail_arg(func_name,argnum,type) \
-  {lua_pushfstring(L,"Error in %s (arg %d), expected '%s' got '%s'",\
+  {SWIG_Lua_pushferrstring(L,"Error in %s (arg %d), expected '%s' got '%s'",\
  func_name,argnum,type,SWIG_Lua_typename(L,argnum));\
  goto fail;}
 #define SWIG_fail_ptr(func_name,argnum,type) \
  SWIG_fail_arg(func_name,argnum,(type && type->str)?type->str:"void*")
 #define SWIG_check_num_args(func_name,a,b) \
  if (lua_gettop(L)<a || lua_gettop(L)>b) \
-  {lua_pushfstring(L,"Error in %s expected %d..%d args, got %d",func_name,a,b,lua_gettop(L));\
+  {SWIG_Lua_pushferrstring(L,"Error in %s expected %d..%d args, got %d",func_name,a,b,lua_gettop(L));\
  goto fail;}
@ -944,15 +974,14 @@ SWIG_Lua_SetModule(lua_State* L, swig_module_info *module) {
 * ----------------------------------------------------------------------------- */
 /* this function is called when trying to set an immutable.
-default value is to print an error.
+default action is to print an error.
 This can removed with a compile flag SWIGLUA_IGNORE_SET_IMMUTABLE */
 SWIGINTERN int SWIG_Lua_set_immutable(lua_State* L)
 {
 /*  there should be 1 param passed in: the new value */
 #ifndef SWIGLUA_IGNORE_SET_IMMUTABLE
  lua_pop(L,1);  /* remove it */
-  lua_pushstring(L,"This variable is immutable");
+  luaL_error(L,"This variable is immutable");
  lua_error(L);
 #endif
    return 0;   /* should not return anything */
 }
@ -1116,6 +1145,138 @@ SWIGINTERN void  SWIG_Lua_module_add_function(lua_State* L,const char* name,lua_
  SWIG_Lua_add_function(L,name,fn);
 }
 /* -----------------------------------------------------------------------------
 * global variable support code: namespaces
 * ----------------------------------------------------------------------------- */
 SWIGINTERN int SWIG_Lua_namespace_get(lua_State* L)
 {
 /*  there should be 2 params passed in
  (1) table (not the meta table)
  (2) string name of the attribute
 */
  assert(lua_istable(L,-2));  /* just in case */
  lua_getmetatable(L,-2);
  assert(lua_istable(L,-1));
  SWIG_Lua_get_table(L,".get"); /* find the .get table */
  assert(lua_istable(L,-1));
  /* look for the key in the .get table */
  lua_pushvalue(L,2);  /* key */
  lua_rawget(L,-2);
  lua_remove(L,-2); /* stack tidy, remove .get table */
  if (lua_iscfunction(L,-1))
  {  /* found it so call the fn & return its value */
    lua_call(L,0,1);  /* 1 value in (userdata),1 out (result) */
    lua_remove(L,-2); /* stack tidy, remove metatable */
    return 1;
  }
  lua_pop(L,1);  /* remove whatever was there */
  /* ok, so try the .fn table */
  SWIG_Lua_get_table(L,".fn"); /* find the .get table */
  assert(lua_istable(L,-1));  /* just in case */
  lua_pushvalue(L,2);  /* key */
  lua_rawget(L,-2);  /* look for the fn */
  lua_remove(L,-2); /* stack tidy, remove .fn table */
  if (lua_isfunction(L,-1)) /* note: whether it's a C function or lua function */
  {  /* found it so return the fn & let lua call it */
    lua_remove(L,-2); /* stack tidy, remove metatable */
    return 1;
  }
  lua_pop(L,1);  /* remove whatever was there */
  return 0;
 }
 SWIGINTERN int SWIG_Lua_namespace_set(lua_State* L)
 {
 /*  there should be 3 params passed in
  (1) table (not the meta table)
  (2) string name of the attribute
  (3) any for the new value
 */
  assert(lua_istable(L,1));
  lua_getmetatable(L,1);    /* get the meta table */
  assert(lua_istable(L,-1));
  SWIG_Lua_get_table(L,".set"); /* find the .set table */
  if (lua_istable(L,-1))
  {
    /* look for the key in the .set table */
    lua_pushvalue(L,2);  /* key */
    lua_rawget(L,-2);
    if (lua_iscfunction(L,-1))
    {  /* found it so call the fn & return its value */
      lua_pushvalue(L,3);  /* value */
      lua_call(L,1,0);
      return 0;
    }
    lua_pop(L,1);  /* remove the value */
  }
  lua_pop(L,1);  /* remove the value .set table */
  return 0;
 }
 SWIGINTERN void SWIG_Lua_InstallConstants(lua_State* L, swig_lua_const_info constants[]); // forward declaration
 SWIGINTERN void  SWIG_Lua_add_class_variable(lua_State* L,const char* name,lua_CFunction getFn,lua_CFunction setFn); // forward declaration
 /* helper function - register namespace methods and attributes into namespace */
 SWIGINTERN int SWIG_Lua_add_namespace_details(lua_State* L, swig_lua_namespace* ns)
 {
  int i = 0;
  assert(lua_istable(L,-1));
  /* There must be table at the top of the stack */
  SWIG_Lua_InstallConstants(L, ns->ns_constants);
  lua_getmetatable(L,-1);
  /* add fns */
  for(i=0;ns->ns_attributes[i].name;i++){
    SWIG_Lua_add_class_variable(L,ns->ns_attributes[i].name,ns->ns_attributes[i].getmethod,ns->ns_attributes[i].setmethod);
  }
  /* add methods to the metatable */
  SWIG_Lua_get_table(L,".fn"); /* find the .fn table */
  assert(lua_istable(L,-1));  /* just in case */
  for(i=0;ns->ns_methods[i].name;i++){
    SWIG_Lua_add_function(L,ns->ns_methods[i].name,ns->ns_methods[i].method);
  }
  lua_pop(L,1);
  /* clear stack - remove metatble */
  lua_pop(L,1);
  return 0;
 }
 /* helper function. creates namespace table and add it to module table */
 SWIGINTERN int SWIG_Lua_namespace_register(lua_State* L, swig_lua_namespace* ns)
 {
  assert(lua_istable(L,-1)); /* just in case. This is supposed to be module table */
  lua_checkstack(L,5);
  lua_pushstring(L, ns->name);
  lua_newtable(L); /* namespace itself */
  lua_newtable(L); /* metatable for namespace */
  /* add a table called ".get" */
  lua_pushstring(L,".get");
  lua_newtable(L);
  lua_rawset(L,-3);
  /* add a table called ".set" */
  lua_pushstring(L,".set");
  lua_newtable(L);
  lua_rawset(L,-3);
  /* add a table called ".fn" */
  lua_pushstring(L,".fn");
  lua_newtable(L);
  lua_rawset(L,-3);
  /* add accessor fns for using the .get,.set&.fn */
  SWIG_Lua_add_function(L,"__index",SWIG_Lua_namespace_get);
  SWIG_Lua_add_function(L,"__newindex",SWIG_Lua_namespace_set);
  lua_setmetatable(L,-2); /* set metatable */
  lua_rawset(L,-3); /* add namespace to module table */
  return 0;
 }
 /* -----------------------------------------------------------------------------
 * global variable support code: classes
 * ----------------------------------------------------------------------------- */
@ -1271,6 +1432,23 @@ SWIGINTERN int  SWIG_Lua_class_disown(lua_State* L)
  return 0;
 }
 /* Constructor proxy. Used when class name entry in module is not class constructor,
 but special table instead. */
 SWIGINTERN int SWIG_Lua_constructor_proxy(lua_State* L)
 {
  /* unlimited number of parameters
     First one is our proxy table and we should remove it
     Other we should pass to real constructor
   */
   assert(lua_istable(L,1));
   lua_pushstring(L,".constructor");
   lua_rawget(L,1);
   assert(!lua_isnil(L,-1));
   lua_replace(L,1); /* replace our table with real constructor */
   lua_call(L,lua_gettop(L)-1,1);
   return 1;
 }
 /* gets the swig class registry (or creates it) */
 SWIGINTERN void  SWIG_Lua_get_class_registry(lua_State* L)
 {
@ -1315,6 +1493,21 @@ SWIGINTERN void  SWIG_Lua_add_class_variable(lua_State* L,const char* name,lua_C
  }
 }
 /* helper to recursively add class static details (static attributes, operations and constants) */
 SWIGINTERN void SWIG_Lua_add_class_static_details(lua_State* L, swig_lua_class* clss)
 {
  int i = 0;
  /* The class namespace table must be on the top of the stack */
  assert(lua_istable(L,-1));
  /* call all the base classes first: we can then override these later: */
  for(i=0;clss->bases[i];i++)
  {
    SWIG_Lua_add_class_static_details(L,clss->bases[i]);
  }
  SWIG_Lua_add_namespace_details(L, &clss->cls_static);
 }
 /* helper to recursively add class details (attributes & operations) */
 SWIGINTERN void  SWIG_Lua_add_class_details(lua_State* L,swig_lua_class* clss)
 {
@ -1368,15 +1561,42 @@ SWIGINTERN void SWIG_Lua_init_base_class(lua_State* L,swig_lua_class* clss)
  }
 }
-/* performs the entire class registration process */
+/* Register class static methods,attributes etc as well as constructor proxy */
-SWIGINTERN void  SWIG_Lua_class_register(lua_State* L,swig_lua_class* clss)
+SWIGINTERN void SWIG_Lua_class_register_static(lua_State* L, swig_lua_class* clss)
 {
  lua_checkstack(L,5); /* just in case */
  assert(lua_istable(L,-1));  /* just in case */
  assert(strcmp(clss->name, clss->cls_static.name) == 0); /* in class those 2 must be equal */
  SWIG_Lua_namespace_register(L,&clss->cls_static);
  SWIG_Lua_get_table(L,clss->name); // Get namespace table back
  assert(lua_istable(L,-1)); /* just in case */
  /*  add its constructor to module with the name of the class
  so you can do MyClass(...) as well as new_MyClass(...)
  BUT only if a constructor is defined
  (this overcomes the problem of pure virtual classes without constructors)*/
  if (clss->constructor)
-    SWIG_Lua_add_function(L,clss->name,clss->constructor);
+  {
    SWIG_Lua_add_function(L,".constructor", clss->constructor);
    lua_getmetatable(L,-1);
    assert(lua_istable(L,-1)); /* just in case */
    SWIG_Lua_add_function(L,"__call", SWIG_Lua_constructor_proxy);
    lua_pop(L,1);
  }
  assert(lua_istable(L,-1)); /* just in case */
  SWIG_Lua_add_class_static_details(L, clss);
  /* clear stack */
  lua_pop(L,1);
 }
 /* performs the entire class registration process */
 SWIGINTERN void  SWIG_Lua_class_register(lua_State* L,swig_lua_class* clss)
 {
  SWIG_Lua_class_register_static(L,clss);
  SWIG_Lua_get_class_registry(L);  /* get the registry */
  lua_pushstring(L,clss->name);  /* get the name */
@ -1487,9 +1707,8 @@ SWIGRUNTIME void* SWIG_Lua_MustGetPtr(lua_State* L,int index,swig_type_info *typ
       int argnum,const char* func_name){
  void* result;
  if (!SWIG_IsOK(SWIG_ConvertPtr(L,index,&result,type,flags))){
-    lua_pushfstring(L,"Error in %s, expected a %s at argument number %d\n",
+    luaL_error (L,"Error in %s, expected a %s at argument number %d\n",
 		func_name,(type && type->str)?type->str:"void*",argnum);
    lua_error(L);
  }
  return result;
 }
@ -1613,8 +1832,8 @@ SWIG_Lua_InstallConstants(lua_State* L, swig_lua_const_info constants[]) {
 #ifndef SWIG_DOSTRING_FAIL /* Allows redefining of error function */
 #define SWIG_DOSTRING_FAIL(S) fprintf(stderr,"%s\n",S)
 #endif
-/* Executes a C string in Lua a really simple way of calling lua from C
+/* Executes a C string in Lua which is a really simple way of calling lua from C
-Unfortunately lua keeps changing its API's, so we need a conditional compile
+Unfortunately lua keeps changing its APIs, so we need a conditional compile
 In lua 5.0.X its lua_dostring()
 In lua 5.1.X its luaL_dostring()
 */
@ -1981,7 +2200,7 @@ static int _wrap_new_ESLevent(lua_State* L) {
    }
  }
-  lua_pushstring(L,"Wrong arguments for overloaded function 'new_ESLevent'\n"
+  SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_ESLevent'\n"
    "  Possible C/C++ prototypes are:\n"
    "    ESLevent::ESLevent(char const *,char const *)\n"
    "    ESLevent::ESLevent(esl_event_t *,int)\n"
@ -2349,9 +2568,18 @@ static swig_lua_attribute swig_ESLevent_attributes[] = {
    { "mine", _wrap_ESLevent_mine_get, _wrap_ESLevent_mine_set},
    {0,0,0}
 };
 static swig_lua_attribute swig_ESLevent_cls_attributes[] = {
    {0,0,0}
 };
 static swig_lua_method swig_ESLevent_cls_methods[] = {
    {0,0}
 };
 static swig_lua_const_info swig_ESLevent_cls_constants[] = {
    {0,0,0,0,0,0}
 };
 static swig_lua_class *swig_ESLevent_bases[] = {0};
 static const char *swig_ESLevent_base_names[] = {0};
-static swig_lua_class _wrap_class_ESLevent = { "ESLevent", &SWIGTYPE_p_ESLevent,_wrap_new_ESLevent, swig_delete_ESLevent, swig_ESLevent_methods, swig_ESLevent_attributes, swig_ESLevent_bases, swig_ESLevent_base_names };
+static swig_lua_class _wrap_class_ESLevent = { "ESLevent", &SWIGTYPE_p_ESLevent,_wrap_new_ESLevent, swig_delete_ESLevent, swig_ESLevent_methods, swig_ESLevent_attributes, { "ESLevent", swig_ESLevent_cls_methods, swig_ESLevent_cls_attributes, swig_ESLevent_cls_constants }, swig_ESLevent_bases, swig_ESLevent_base_names };
 static int _wrap_new_ESLconnection__SWIG_0(lua_State* L) {
  int SWIG_arg = 0;
@ -2586,7 +2814,7 @@ static int _wrap_new_ESLconnection(lua_State* L) {
    }
  }
-  lua_pushstring(L,"Wrong arguments for overloaded function 'new_ESLconnection'\n"
+  SWIG_Lua_pusherrstring(L,"Wrong arguments for overloaded function 'new_ESLconnection'\n"
    "  Possible C/C++ prototypes are:\n"
    "    ESLconnection::ESLconnection(char const *,int const,char const *,char const *)\n"
    "    ESLconnection::ESLconnection(char const *,int const,char const *)\n"
@ -3150,9 +3378,18 @@ static swig_lua_method swig_ESLconnection_methods[] = {
 static swig_lua_attribute swig_ESLconnection_attributes[] = {
    {0,0,0}
 };
 static swig_lua_attribute swig_ESLconnection_cls_attributes[] = {
    {0,0,0}
 };
 static swig_lua_method swig_ESLconnection_cls_methods[] = {
    {0,0}
 };
 static swig_lua_const_info swig_ESLconnection_cls_constants[] = {
    {0,0,0,0,0,0}
 };
 static swig_lua_class *swig_ESLconnection_bases[] = {0};
 static const char *swig_ESLconnection_base_names[] = {0};
-static swig_lua_class _wrap_class_ESLconnection = { "ESLconnection", &SWIGTYPE_p_ESLconnection,_wrap_new_ESLconnection, swig_delete_ESLconnection, swig_ESLconnection_methods, swig_ESLconnection_attributes, swig_ESLconnection_bases, swig_ESLconnection_base_names };
+static swig_lua_class _wrap_class_ESLconnection = { "ESLconnection", &SWIGTYPE_p_ESLconnection,_wrap_new_ESLconnection, swig_delete_ESLconnection, swig_ESLconnection_methods, swig_ESLconnection_attributes, { "ESLconnection", swig_ESLconnection_cls_methods, swig_ESLconnection_cls_attributes, swig_ESLconnection_cls_constants }, swig_ESLconnection_bases, swig_ESLconnection_base_names };
 static int _wrap_eslSetLogLevel(lua_State* L) {
  int SWIG_arg = 0;
@ -3278,8 +3515,6 @@ SWIG_InitializeModule(void *clientdata) {
  swig_module_info *module_head, *iter;
  int found, init;
  clientdata = clientdata;
  /* check to see if the circular list has been setup, if not, set it up */
  if (swig_module.next==0) {
    /* Initialize the swig_module */
@ -3317,7 +3552,7 @@ SWIG_InitializeModule(void *clientdata) {
    module_head->next = &swig_module;
  }
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
     a different interpreter, but not yet have a pointer in this interpreter.
     In this case, we do not want to continue adding types... everything should be
     set up already */
--- a/libs/esl/managed/ESL.cs
+++ b/libs/esl/managed/ESL.cs
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
 *
 * Do not make changes to this file unless you know what you are doing--modify
 * the SWIG interface file instead.
--- a/libs/esl/managed/ESLPINVOKE.cs
+++ b/libs/esl/managed/ESLPINVOKE.cs
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
 *
 * Do not make changes to this file unless you know what you are doing--modify
 * the SWIG interface file instead.
@ -184,6 +184,10 @@ class ESLPINVOKE {
  static protected SWIGStringHelper swigStringHelper = new SWIGStringHelper();
  static ESLPINVOKE() {
  }
  [DllImport("ESL", EntryPoint="CSharp_ESLevent_Event_set")]
  public static extern void ESLevent_Event_set(HandleRef jarg1, HandleRef jarg2);
--- a/libs/esl/managed/ESLconnection.cs
+++ b/libs/esl/managed/ESLconnection.cs
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
 *
 * Do not make changes to this file unless you know what you are doing--modify
 * the SWIG interface file instead.
@ -29,11 +29,13 @@ public class ESLconnection : IDisposable {
  public virtual void Dispose() {
    lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+      if (swigCPtr.Handle != IntPtr.Zero) {
        if (swigCMemOwn) {
          swigCMemOwn = false;
          ESLPINVOKE.delete_ESLconnection(swigCPtr);
        }
        swigCPtr = new HandleRef(null, IntPtr.Zero);
      }
      GC.SuppressFinalize(this);
    }
  }
--- a/libs/esl/managed/ESLevent.cs
+++ b/libs/esl/managed/ESLevent.cs
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
 *
 * Do not make changes to this file unless you know what you are doing--modify
 * the SWIG interface file instead.
@ -29,11 +29,13 @@ public class ESLevent : IDisposable {
  public virtual void Dispose() {
    lock(this) {
-      if(swigCPtr.Handle != IntPtr.Zero && swigCMemOwn) {
+      if (swigCPtr.Handle != IntPtr.Zero) {
        if (swigCMemOwn) {
          swigCMemOwn = false;
          ESLPINVOKE.delete_ESLevent(swigCPtr);
        }
        swigCPtr = new HandleRef(null, IntPtr.Zero);
      }
      GC.SuppressFinalize(this);
    }
  }
--- a/libs/esl/managed/Makefile
+++ b/libs/esl/managed/Makefile
@ -5,7 +5,7 @@ WRAP_GCC_WARNING_SILENCE=-Wno-unused-function
 all: ESL.so
 esl_wrap.cpp:
-	swig -module ESL -csharp -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+	swig2.0 -module ESL -csharp -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 esl_wrap.o: esl_wrap.cpp
 	$(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) $(WRAP_GCC_WARNING_SILENCE) -c esl_wrap.cpp -o esl_wrap.o
--- a/libs/esl/managed/SWIGTYPE_p_esl_event_t.cs
+++ b/libs/esl/managed/SWIGTYPE_p_esl_event_t.cs
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
 *
 * Do not make changes to this file unless you know what you are doing--modify
 * the SWIG interface file instead.
--- a/libs/esl/managed/SWIGTYPE_p_esl_priority_t.cs
+++ b/libs/esl/managed/SWIGTYPE_p_esl_priority_t.cs
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
 *
 * Do not make changes to this file unless you know what you are doing--modify
 * the SWIG interface file instead.
--- a/libs/esl/managed/esl_wrap.2010.cpp
+++ b/libs/esl/managed/esl_wrap.2010.cpp
@ -1,947 +0,0 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
 * Version 2.0.1
 *
 * This file is not intended to be easily readable and contains a number of
 * coding conventions designed to improve portability and efficiency. Do not make
 * changes to this file unless you know what you are doing--modify the SWIG
 * interface file instead.
 * ----------------------------------------------------------------------------- */
 #define SWIGCSHARP
 #ifdef __cplusplus
 /* SwigValueWrapper is described in swig.swg */
 template<typename T> class SwigValueWrapper {
  struct SwigMovePointer {
    T *ptr;
    SwigMovePointer(T *p) : ptr(p) { }
    ~SwigMovePointer() { delete ptr; }
    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
  } pointer;
  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
 public:
  SwigValueWrapper() : pointer(0) { }
  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
  operator T&() const { return *pointer.ptr; }
  T *operator&() { return pointer.ptr; }
 };
 template <typename T> T SwigValueInit() {
  return T();
 }
 #endif
 /* -----------------------------------------------------------------------------
 *  This section contains generic SWIG labels for method/variable
 *  declarations/attributes, and other compiler dependent labels.
 * ----------------------------------------------------------------------------- */
 /* template workaround for compilers that cannot correctly implement the C++ standard */
 #ifndef SWIGTEMPLATEDISAMBIGUATOR
 # if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
 #  define SWIGTEMPLATEDISAMBIGUATOR template
 # elif defined(__HP_aCC)
 /* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
 /* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
 #  define SWIGTEMPLATEDISAMBIGUATOR template
 # else
 #  define SWIGTEMPLATEDISAMBIGUATOR
 # endif
 #endif
 /* inline attribute */
 #ifndef SWIGINLINE
 # if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
 #   define SWIGINLINE inline
 # else
 #   define SWIGINLINE
 # endif
 #endif
 /* attribute recognised by some compilers to avoid 'unused' warnings */
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
 #     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
 #   define SWIGUNUSED __attribute__ ((__unused__))
 # else
 #   define SWIGUNUSED
 # endif
 #endif
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
 # endif
 #endif
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
 #   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 /* internal SWIG method */
 #ifndef SWIGINTERN
 # define SWIGINTERN static SWIGUNUSED
 #endif
 /* internal inline SWIG method */
 #ifndef SWIGINTERNINLINE
 # define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
 #endif
 /* exporting methods */
 #if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
 #  ifndef GCC_HASCLASSVISIBILITY
 #    define GCC_HASCLASSVISIBILITY
 #  endif
 #endif
 #ifndef SWIGEXPORT
 # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 #   if defined(STATIC_LINKED)
 #     define SWIGEXPORT
 #   else
 #     define SWIGEXPORT __declspec(dllexport)
 #   endif
 # else
 #   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
 #     define SWIGEXPORT __attribute__ ((visibility("default")))
 #   else
 #     define SWIGEXPORT
 #   endif
 # endif
 #endif
 /* calling conventions for Windows */
 #ifndef SWIGSTDCALL
 # if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
 # endif
 #endif
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
 #if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
 # define _CRT_SECURE_NO_DEPRECATE
 #endif
 /* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
 #if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
 # define _SCL_SECURE_NO_DEPRECATE
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 /* Support for throwing C# exceptions from C/C++. There are two types:
 * Exceptions that take a message and ArgumentExceptions that take a message and a parameter name. */
 typedef enum {
  SWIG_CSharpApplicationException,
  SWIG_CSharpArithmeticException,
  SWIG_CSharpDivideByZeroException,
  SWIG_CSharpIndexOutOfRangeException,
  SWIG_CSharpInvalidCastException,
  SWIG_CSharpInvalidOperationException,
  SWIG_CSharpIOException,
  SWIG_CSharpNullReferenceException,
  SWIG_CSharpOutOfMemoryException,
  SWIG_CSharpOverflowException,
  SWIG_CSharpSystemException
 } SWIG_CSharpExceptionCodes;
 typedef enum {
  SWIG_CSharpArgumentException,
  SWIG_CSharpArgumentNullException,
  SWIG_CSharpArgumentOutOfRangeException
 } SWIG_CSharpExceptionArgumentCodes;
 typedef void (SWIGSTDCALL* SWIG_CSharpExceptionCallback_t)(const char *);
 typedef void (SWIGSTDCALL* SWIG_CSharpExceptionArgumentCallback_t)(const char *, const char *);
 typedef struct {
  SWIG_CSharpExceptionCodes code;
  SWIG_CSharpExceptionCallback_t callback;
 } SWIG_CSharpException_t;
 typedef struct {
  SWIG_CSharpExceptionArgumentCodes code;
  SWIG_CSharpExceptionArgumentCallback_t callback;
 } SWIG_CSharpExceptionArgument_t;
 static SWIG_CSharpException_t SWIG_csharp_exceptions[] = {
  { SWIG_CSharpApplicationException, NULL },
  { SWIG_CSharpArithmeticException, NULL },
  { SWIG_CSharpDivideByZeroException, NULL },
  { SWIG_CSharpIndexOutOfRangeException, NULL },
  { SWIG_CSharpInvalidCastException, NULL },
  { SWIG_CSharpInvalidOperationException, NULL },
  { SWIG_CSharpIOException, NULL },
  { SWIG_CSharpNullReferenceException, NULL },
  { SWIG_CSharpOutOfMemoryException, NULL },
  { SWIG_CSharpOverflowException, NULL },
  { SWIG_CSharpSystemException, NULL }
 };
 static SWIG_CSharpExceptionArgument_t SWIG_csharp_exceptions_argument[] = {
  { SWIG_CSharpArgumentException, NULL },
  { SWIG_CSharpArgumentNullException, NULL },
  { SWIG_CSharpArgumentOutOfRangeException, NULL }
 };
 static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes code, const char *msg) {
  SWIG_CSharpExceptionCallback_t callback = SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback;
  if ((size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) {
    callback = SWIG_csharp_exceptions[code].callback;
  }
  callback(msg);
 }
 static void SWIGUNUSED SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpExceptionArgumentCodes code, const char *msg, const char *param_name) {
  SWIG_CSharpExceptionArgumentCallback_t callback = SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback;
  if ((size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) {
    callback = SWIG_csharp_exceptions_argument[code].callback;
  }
  callback(msg, param_name);
 }
 #ifdef __cplusplus
 extern "C"
 #endif
 SWIGEXPORT void SWIGSTDCALL SWIGRegisterExceptionCallbacks_ESL(
                                                SWIG_CSharpExceptionCallback_t applicationCallback,
                                                SWIG_CSharpExceptionCallback_t arithmeticCallback,
                                                SWIG_CSharpExceptionCallback_t divideByZeroCallback,
                                                SWIG_CSharpExceptionCallback_t indexOutOfRangeCallback,
                                                SWIG_CSharpExceptionCallback_t invalidCastCallback,
                                                SWIG_CSharpExceptionCallback_t invalidOperationCallback,
                                                SWIG_CSharpExceptionCallback_t ioCallback,
                                                SWIG_CSharpExceptionCallback_t nullReferenceCallback,
                                                SWIG_CSharpExceptionCallback_t outOfMemoryCallback,
                                                SWIG_CSharpExceptionCallback_t overflowCallback,
                                                SWIG_CSharpExceptionCallback_t systemCallback) {
  SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback = applicationCallback;
  SWIG_csharp_exceptions[SWIG_CSharpArithmeticException].callback = arithmeticCallback;
  SWIG_csharp_exceptions[SWIG_CSharpDivideByZeroException].callback = divideByZeroCallback;
  SWIG_csharp_exceptions[SWIG_CSharpIndexOutOfRangeException].callback = indexOutOfRangeCallback;
  SWIG_csharp_exceptions[SWIG_CSharpInvalidCastException].callback = invalidCastCallback;
  SWIG_csharp_exceptions[SWIG_CSharpInvalidOperationException].callback = invalidOperationCallback;
  SWIG_csharp_exceptions[SWIG_CSharpIOException].callback = ioCallback;
  SWIG_csharp_exceptions[SWIG_CSharpNullReferenceException].callback = nullReferenceCallback;
  SWIG_csharp_exceptions[SWIG_CSharpOutOfMemoryException].callback = outOfMemoryCallback;
  SWIG_csharp_exceptions[SWIG_CSharpOverflowException].callback = overflowCallback;
  SWIG_csharp_exceptions[SWIG_CSharpSystemException].callback = systemCallback;
 }
 #ifdef __cplusplus
 extern "C"
 #endif
 SWIGEXPORT void SWIGSTDCALL SWIGRegisterExceptionArgumentCallbacks_ESL(
                                                SWIG_CSharpExceptionArgumentCallback_t argumentCallback,
                                                SWIG_CSharpExceptionArgumentCallback_t argumentNullCallback,
                                                SWIG_CSharpExceptionArgumentCallback_t argumentOutOfRangeCallback) {
  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback = argumentCallback;
  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentNullException].callback = argumentNullCallback;
  SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentOutOfRangeException].callback = argumentOutOfRangeCallback;
 }
 /* Callback for returning strings to C# without leaking memory */
 typedef char * (SWIGSTDCALL* SWIG_CSharpStringHelperCallback)(const char *);
 static SWIG_CSharpStringHelperCallback SWIG_csharp_string_callback = NULL;
 #ifdef __cplusplus
 extern "C"
 #endif
 SWIGEXPORT void SWIGSTDCALL SWIGRegisterStringCallback_ESL(SWIG_CSharpStringHelperCallback callback) {
  SWIG_csharp_string_callback = callback;
 }
 /* Contract support */
 #define SWIG_contract_assert(nullreturn, expr, msg) if (!(expr)) {SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentOutOfRangeException, msg, ""); return nullreturn; } else
 #include "esl.h"
 #include "esl_oop.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
 SWIGEXPORT void SWIGSTDCALL CSharp_ESLevent_Event_set(void * jarg1, void * jarg2) {
  ESLevent *arg1 = (ESLevent *) 0 ;
  esl_event_t *arg2 = (esl_event_t *) 0 ;
  arg1 = (ESLevent *)jarg1;
  arg2 = (esl_event_t *)jarg2;
  if (arg1) (arg1)->event = arg2;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_ESLevent_Event_get(void * jarg1) {
  void * jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  esl_event_t *result = 0 ;
  arg1 = (ESLevent *)jarg1;
  result = (esl_event_t *) ((arg1)->event);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void SWIGSTDCALL CSharp_ESLevent_SerializedString_set(void * jarg1, char * jarg2) {
  ESLevent *arg1 = (ESLevent *) 0 ;
  char *arg2 = (char *) 0 ;
  arg1 = (ESLevent *)jarg1;
  arg2 = (char *)jarg2;
  {
    if (arg1->serialized_string) delete [] arg1->serialized_string;
    if (arg2) {
      arg1->serialized_string = (char *) (new char[strlen((const char *)arg2)+1]);
      strcpy((char *)arg1->serialized_string, (const char *)arg2);
    } else {
      arg1->serialized_string = 0;
    }
  }
 }
 SWIGEXPORT char * SWIGSTDCALL CSharp_ESLevent_SerializedString_get(void * jarg1) {
  char * jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  char *result = 0 ;
  arg1 = (ESLevent *)jarg1;
  result = (char *) ((arg1)->serialized_string);
  jresult = SWIG_csharp_string_callback((const char *)result);
  return jresult;
 }
 SWIGEXPORT void SWIGSTDCALL CSharp_ESLevent_Mine_set(void * jarg1, int jarg2) {
  ESLevent *arg1 = (ESLevent *) 0 ;
  int arg2 ;
  arg1 = (ESLevent *)jarg1;
  arg2 = (int)jarg2;
  if (arg1) (arg1)->mine = arg2;
 }
 SWIGEXPORT int SWIGSTDCALL CSharp_ESLevent_Mine_get(void * jarg1) {
  int jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  int result;
  arg1 = (ESLevent *)jarg1;
  result = (int) ((arg1)->mine);
  jresult = result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_ESLevent__SWIG_0(char * jarg1, char * jarg2) {
  void * jresult ;
  char *arg1 = (char *) 0 ;
  char *arg2 = (char *) NULL ;
  ESLevent *result = 0 ;
  arg1 = (char *)jarg1;
  arg2 = (char *)jarg2;
  result = (ESLevent *)new ESLevent((char const *)arg1,(char const *)arg2);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_ESLevent__SWIG_1(void * jarg1, int jarg2) {
  void * jresult ;
  esl_event_t *arg1 = (esl_event_t *) 0 ;
  int arg2 = (int) 0 ;
  ESLevent *result = 0 ;
  arg1 = (esl_event_t *)jarg1;
  arg2 = (int)jarg2;
  result = (ESLevent *)new ESLevent(arg1,arg2);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_ESLevent__SWIG_2(void * jarg1) {
  void * jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  ESLevent *result = 0 ;
  arg1 = (ESLevent *)jarg1;
  result = (ESLevent *)new ESLevent(arg1);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_ESLevent(void * jarg1) {
  ESLevent *arg1 = (ESLevent *) 0 ;
  arg1 = (ESLevent *)jarg1;
  delete arg1;
 }
 SWIGEXPORT char * SWIGSTDCALL CSharp_ESLevent_Serialize(void * jarg1, char * jarg2) {
  char * jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  char *arg2 = (char *) NULL ;
  char *result = 0 ;
  arg1 = (ESLevent *)jarg1;
  arg2 = (char *)jarg2;
  result = (char *)(arg1)->serialize((char const *)arg2);
  jresult = SWIG_csharp_string_callback((const char *)result);
  return jresult;
 }
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_ESLevent_SetPriority(void * jarg1, void * jarg2) {
  unsigned int jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  esl_priority_t arg2 = (esl_priority_t) ESL_PRIORITY_NORMAL ;
  esl_priority_t *argp2 ;
  bool result;
  arg1 = (ESLevent *)jarg1;
  argp2 = (esl_priority_t *)jarg2;
  if (!argp2) {
    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null esl_priority_t", 0);
    return 0;
  }
  arg2 = *argp2;
  result = (bool)(arg1)->setPriority(arg2);
  jresult = result;
  return jresult;
 }
 SWIGEXPORT char * SWIGSTDCALL CSharp_ESLevent_GetHeader(void * jarg1, char * jarg2, int jarg3) {
  char * jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  char *arg2 = (char *) 0 ;
  int arg3 = (int) -1 ;
  char *result = 0 ;
  arg1 = (ESLevent *)jarg1;
  arg2 = (char *)jarg2;
  arg3 = (int)jarg3;
  result = (char *)(arg1)->getHeader((char const *)arg2,arg3);
  jresult = SWIG_csharp_string_callback((const char *)result);
  return jresult;
 }
 SWIGEXPORT char * SWIGSTDCALL CSharp_ESLevent_GetBody(void * jarg1) {
  char * jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  char *result = 0 ;
  arg1 = (ESLevent *)jarg1;
  result = (char *)(arg1)->getBody();
  jresult = SWIG_csharp_string_callback((const char *)result);
  return jresult;
 }
 SWIGEXPORT char * SWIGSTDCALL CSharp_ESLevent_getType(void * jarg1) {
  char * jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  char *result = 0 ;
  arg1 = (ESLevent *)jarg1;
  result = (char *)(arg1)->getType();
  jresult = SWIG_csharp_string_callback((const char *)result);
  return jresult;
 }
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_ESLevent_AddBody(void * jarg1, char * jarg2) {
  unsigned int jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  char *arg2 = (char *) 0 ;
  bool result;
  arg1 = (ESLevent *)jarg1;
  arg2 = (char *)jarg2;
  result = (bool)(arg1)->addBody((char const *)arg2);
  jresult = result;
  return jresult;
 }
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_ESLevent_AddHeader(void * jarg1, char * jarg2, char * jarg3) {
  unsigned int jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  char *arg2 = (char *) 0 ;
  char *arg3 = (char *) 0 ;
  bool result;
  arg1 = (ESLevent *)jarg1;
  arg2 = (char *)jarg2;
  arg3 = (char *)jarg3;
  result = (bool)(arg1)->addHeader((char const *)arg2,(char const *)arg3);
  jresult = result;
  return jresult;
 }
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_ESLevent_pushHeader(void * jarg1, char * jarg2, char * jarg3) {
  unsigned int jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  char *arg2 = (char *) 0 ;
  char *arg3 = (char *) 0 ;
  bool result;
  arg1 = (ESLevent *)jarg1;
  arg2 = (char *)jarg2;
  arg3 = (char *)jarg3;
  result = (bool)(arg1)->pushHeader((char const *)arg2,(char const *)arg3);
  jresult = result;
  return jresult;
 }
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_ESLevent_unshiftHeader(void * jarg1, char * jarg2, char * jarg3) {
  unsigned int jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  char *arg2 = (char *) 0 ;
  char *arg3 = (char *) 0 ;
  bool result;
  arg1 = (ESLevent *)jarg1;
  arg2 = (char *)jarg2;
  arg3 = (char *)jarg3;
  result = (bool)(arg1)->unshiftHeader((char const *)arg2,(char const *)arg3);
  jresult = result;
  return jresult;
 }
 SWIGEXPORT unsigned int SWIGSTDCALL CSharp_ESLevent_DelHeader(void * jarg1, char * jarg2) {
  unsigned int jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  char *arg2 = (char *) 0 ;
  bool result;
  arg1 = (ESLevent *)jarg1;
  arg2 = (char *)jarg2;
  result = (bool)(arg1)->delHeader((char const *)arg2);
  jresult = result;
  return jresult;
 }
 SWIGEXPORT char * SWIGSTDCALL CSharp_ESLevent_FirstHeader(void * jarg1) {
  char * jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  char *result = 0 ;
  arg1 = (ESLevent *)jarg1;
  result = (char *)(arg1)->firstHeader();
  jresult = SWIG_csharp_string_callback((const char *)result);
  return jresult;
 }
 SWIGEXPORT char * SWIGSTDCALL CSharp_ESLevent_NextHeader(void * jarg1) {
  char * jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  char *result = 0 ;
  arg1 = (ESLevent *)jarg1;
  result = (char *)(arg1)->nextHeader();
  jresult = SWIG_csharp_string_callback((const char *)result);
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_ESLconnection__SWIG_0(char * jarg1, int jarg2, char * jarg3, char * jarg4) {
  void * jresult ;
  char *arg1 = (char *) 0 ;
  int arg2 ;
  char *arg3 = (char *) 0 ;
  char *arg4 = (char *) 0 ;
  ESLconnection *result = 0 ;
  arg1 = (char *)jarg1;
  arg2 = (int)jarg2;
  arg3 = (char *)jarg3;
  arg4 = (char *)jarg4;
  result = (ESLconnection *)new ESLconnection((char const *)arg1,arg2,(char const *)arg3,(char const *)arg4);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_ESLconnection__SWIG_1(char * jarg1, int jarg2, char * jarg3) {
  void * jresult ;
  char *arg1 = (char *) 0 ;
  int arg2 ;
  char *arg3 = (char *) 0 ;
  ESLconnection *result = 0 ;
  arg1 = (char *)jarg1;
  arg2 = (int)jarg2;
  arg3 = (char *)jarg3;
  result = (ESLconnection *)new ESLconnection((char const *)arg1,arg2,(char const *)arg3);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_ESLconnection__SWIG_2(char * jarg1, char * jarg2, char * jarg3, char * jarg4) {
  void * jresult ;
  char *arg1 = (char *) 0 ;
  char *arg2 = (char *) 0 ;
  char *arg3 = (char *) 0 ;
  char *arg4 = (char *) 0 ;
  ESLconnection *result = 0 ;
  arg1 = (char *)jarg1;
  arg2 = (char *)jarg2;
  arg3 = (char *)jarg3;
  arg4 = (char *)jarg4;
  result = (ESLconnection *)new ESLconnection((char const *)arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_ESLconnection__SWIG_3(char * jarg1, char * jarg2, char * jarg3) {
  void * jresult ;
  char *arg1 = (char *) 0 ;
  char *arg2 = (char *) 0 ;
  char *arg3 = (char *) 0 ;
  ESLconnection *result = 0 ;
  arg1 = (char *)jarg1;
  arg2 = (char *)jarg2;
  arg3 = (char *)jarg3;
  result = (ESLconnection *)new ESLconnection((char const *)arg1,(char const *)arg2,(char const *)arg3);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_new_ESLconnection__SWIG_4(int jarg1) {
  void * jresult ;
  int arg1 ;
  ESLconnection *result = 0 ;
  arg1 = (int)jarg1;
  result = (ESLconnection *)new ESLconnection(arg1);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void SWIGSTDCALL CSharp_delete_ESLconnection(void * jarg1) {
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  arg1 = (ESLconnection *)jarg1;
  delete arg1;
 }
 SWIGEXPORT int SWIGSTDCALL CSharp_ESLconnection_SocketDescriptor(void * jarg1) {
  int jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  int result;
  arg1 = (ESLconnection *)jarg1;
  result = (int)(arg1)->socketDescriptor();
  jresult = result;
  return jresult;
 }
 SWIGEXPORT int SWIGSTDCALL CSharp_ESLconnection_Connected(void * jarg1) {
  int jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  int result;
  arg1 = (ESLconnection *)jarg1;
  result = (int)(arg1)->connected();
  jresult = result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_GetInfo(void * jarg1) {
  void * jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  ESLevent *result = 0 ;
  arg1 = (ESLconnection *)jarg1;
  result = (ESLevent *)(arg1)->getInfo();
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT int SWIGSTDCALL CSharp_ESLconnection_Send(void * jarg1, char * jarg2) {
  int jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  char *arg2 = (char *) 0 ;
  int result;
  arg1 = (ESLconnection *)jarg1;
  arg2 = (char *)jarg2;
  result = (int)(arg1)->send((char const *)arg2);
  jresult = result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_SendRecv(void * jarg1, char * jarg2) {
  void * jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  char *arg2 = (char *) 0 ;
  ESLevent *result = 0 ;
  arg1 = (ESLconnection *)jarg1;
  arg2 = (char *)jarg2;
  result = (ESLevent *)(arg1)->sendRecv((char const *)arg2);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_Api(void * jarg1, char * jarg2, char * jarg3) {
  void * jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  char *arg2 = (char *) 0 ;
  char *arg3 = (char *) NULL ;
  ESLevent *result = 0 ;
  arg1 = (ESLconnection *)jarg1;
  arg2 = (char *)jarg2;
  arg3 = (char *)jarg3;
  result = (ESLevent *)(arg1)->api((char const *)arg2,(char const *)arg3);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_Bgapi(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
  void * jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  char *arg2 = (char *) 0 ;
  char *arg3 = (char *) NULL ;
  char *arg4 = (char *) NULL ;
  ESLevent *result = 0 ;
  arg1 = (ESLconnection *)jarg1;
  arg2 = (char *)jarg2;
  arg3 = (char *)jarg3;
  arg4 = (char *)jarg4;
  result = (ESLevent *)(arg1)->bgapi((char const *)arg2,(char const *)arg3,(char const *)arg4);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_SendEvent(void * jarg1, void * jarg2) {
  void * jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  ESLevent *arg2 = (ESLevent *) 0 ;
  ESLevent *result = 0 ;
  arg1 = (ESLconnection *)jarg1;
  arg2 = (ESLevent *)jarg2;
  result = (ESLevent *)(arg1)->sendEvent(arg2);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT int SWIGSTDCALL CSharp_ESLconnection_sendMSG(void * jarg1, void * jarg2, char * jarg3) {
  int jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  ESLevent *arg2 = (ESLevent *) 0 ;
  char *arg3 = (char *) NULL ;
  int result;
  arg1 = (ESLconnection *)jarg1;
  arg2 = (ESLevent *)jarg2;
  arg3 = (char *)jarg3;
  result = (int)(arg1)->sendMSG(arg2,(char const *)arg3);
  jresult = result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_RecvEvent(void * jarg1) {
  void * jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  ESLevent *result = 0 ;
  arg1 = (ESLconnection *)jarg1;
  result = (ESLevent *)(arg1)->recvEvent();
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_RecvEventTimed(void * jarg1, int jarg2) {
  void * jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  int arg2 ;
  ESLevent *result = 0 ;
  arg1 = (ESLconnection *)jarg1;
  arg2 = (int)jarg2;
  result = (ESLevent *)(arg1)->recvEventTimed(arg2);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_Filter(void * jarg1, char * jarg2, char * jarg3) {
  void * jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  char *arg2 = (char *) 0 ;
  char *arg3 = (char *) 0 ;
  ESLevent *result = 0 ;
  arg1 = (ESLconnection *)jarg1;
  arg2 = (char *)jarg2;
  arg3 = (char *)jarg3;
  result = (ESLevent *)(arg1)->filter((char const *)arg2,(char const *)arg3);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT int SWIGSTDCALL CSharp_ESLconnection_Events(void * jarg1, char * jarg2, char * jarg3) {
  int jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  char *arg2 = (char *) 0 ;
  char *arg3 = (char *) 0 ;
  int result;
  arg1 = (ESLconnection *)jarg1;
  arg2 = (char *)jarg2;
  arg3 = (char *)jarg3;
  result = (int)(arg1)->events((char const *)arg2,(char const *)arg3);
  jresult = result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_Execute(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
  void * jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  char *arg2 = (char *) 0 ;
  char *arg3 = (char *) NULL ;
  char *arg4 = (char *) NULL ;
  ESLevent *result = 0 ;
  arg1 = (ESLconnection *)jarg1;
  arg2 = (char *)jarg2;
  arg3 = (char *)jarg3;
  arg4 = (char *)jarg4;
  result = (ESLevent *)(arg1)->execute((char const *)arg2,(char const *)arg3,(char const *)arg4);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT void * SWIGSTDCALL CSharp_ESLconnection_ExecuteAsync(void * jarg1, char * jarg2, char * jarg3, char * jarg4) {
  void * jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  char *arg2 = (char *) 0 ;
  char *arg3 = (char *) NULL ;
  char *arg4 = (char *) NULL ;
  ESLevent *result = 0 ;
  arg1 = (ESLconnection *)jarg1;
  arg2 = (char *)jarg2;
  arg3 = (char *)jarg3;
  arg4 = (char *)jarg4;
  result = (ESLevent *)(arg1)->executeAsync((char const *)arg2,(char const *)arg3,(char const *)arg4);
  jresult = (void *)result;
  return jresult;
 }
 SWIGEXPORT int SWIGSTDCALL CSharp_ESLconnection_SetAsyncExecute(void * jarg1, char * jarg2) {
  int jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  char *arg2 = (char *) 0 ;
  int result;
  arg1 = (ESLconnection *)jarg1;
  arg2 = (char *)jarg2;
  result = (int)(arg1)->setAsyncExecute((char const *)arg2);
  jresult = result;
  return jresult;
 }
 SWIGEXPORT int SWIGSTDCALL CSharp_ESLconnection_SetEventLock(void * jarg1, char * jarg2) {
  int jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  char *arg2 = (char *) 0 ;
  int result;
  arg1 = (ESLconnection *)jarg1;
  arg2 = (char *)jarg2;
  result = (int)(arg1)->setEventLock((char const *)arg2);
  jresult = result;
  return jresult;
 }
 SWIGEXPORT int SWIGSTDCALL CSharp_ESLconnection_Disconnect(void * jarg1) {
  int jresult ;
  ESLconnection *arg1 = (ESLconnection *) 0 ;
  int result;
  arg1 = (ESLconnection *)jarg1;
  result = (int)(arg1)->disconnect();
  jresult = result;
  return jresult;
 }
 SWIGEXPORT void SWIGSTDCALL CSharp_eslSetLogLevel(int jarg1) {
  int arg1 ;
  arg1 = (int)jarg1;
  eslSetLogLevel(arg1);
 }
 #ifdef __cplusplus
 }
 #endif
--- a/libs/esl/managed/esl_wrap.cpp
+++ b/libs/esl/managed/esl_wrap.cpp
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 2.0.12
 *
 * This file is not intended to be easily readable and contains a number of
 * coding conventions designed to improve portability and efficiency. Do not make
@ -8,20 +8,25 @@
 * interface file instead.
 * ----------------------------------------------------------------------------- */
 #define SWIGCSHARP
 #ifdef __cplusplus
 /* SwigValueWrapper is described in swig.swg */
 template<typename T> class SwigValueWrapper {
-    T *tt;
+  struct SwigMovePointer {
-public:
+    T *ptr;
-    SwigValueWrapper() : tt(0) { }
+    SwigMovePointer(T *p) : ptr(p) { }
-    SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
+    ~SwigMovePointer() { delete ptr; }
-    SwigValueWrapper(const T& t) : tt(new T(t)) { }
+    SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
-    ~SwigValueWrapper() { delete tt; } 
+  } pointer;
    SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; }
    operator T&() const { return *tt; }
    T *operator&() { return tt; }
 private:
  SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
  SwigValueWrapper(const SwigValueWrapper<T>& rhs);
 public:
  SwigValueWrapper() : pointer(0) { }
  SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
  operator T&() const { return *pointer.ptr; }
  T *operator&() { return pointer.ptr; }
 };
 template <typename T> T SwigValueInit() {
@ -71,6 +76,12 @@ template <typename T> T SwigValueInit() {
 # endif
 #endif
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
 # endif
 #endif
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
@ -190,12 +201,12 @@ static SWIG_CSharpException_t SWIG_csharp_exceptions[] = {
 static SWIG_CSharpExceptionArgument_t SWIG_csharp_exceptions_argument[] = {
  { SWIG_CSharpArgumentException, NULL },
  { SWIG_CSharpArgumentNullException, NULL },
-  { SWIG_CSharpArgumentOutOfRangeException, NULL },
+  { SWIG_CSharpArgumentOutOfRangeException, NULL }
 };
 static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes code, const char *msg) {
  SWIG_CSharpExceptionCallback_t callback = SWIG_csharp_exceptions[SWIG_CSharpApplicationException].callback;
-  if (code >=0 && (size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) {
+  if ((size_t)code < sizeof(SWIG_csharp_exceptions)/sizeof(SWIG_CSharpException_t)) {
    callback = SWIG_csharp_exceptions[code].callback;
  }
  callback(msg);
@ -203,7 +214,7 @@ static void SWIGUNUSED SWIG_CSharpSetPendingException(SWIG_CSharpExceptionCodes
 static void SWIGUNUSED SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpExceptionArgumentCodes code, const char *msg, const char *param_name) {
  SWIG_CSharpExceptionArgumentCallback_t callback = SWIG_csharp_exceptions_argument[SWIG_CSharpArgumentException].callback;
-  if (code >=0 && (size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) {
+  if ((size_t)code < sizeof(SWIG_csharp_exceptions_argument)/sizeof(SWIG_CSharpExceptionArgument_t)) {
    callback = SWIG_csharp_exceptions_argument[code].callback;
  }
  callback(msg, param_name);
@ -284,7 +295,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_ESLevent_Event_set(void * jarg1, void * jarg2
  arg1 = (ESLevent *)jarg1; 
  arg2 = (esl_event_t *)jarg2; 
  if (arg1) (arg1)->event = arg2;
 }
@ -307,7 +317,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_ESLevent_SerializedString_set(void * jarg1, c
  arg1 = (ESLevent *)jarg1; 
  arg2 = (char *)jarg2; 
  {
-    if (arg1->serialized_string) delete [] arg1->serialized_string;
+    delete [] arg1->serialized_string;
    if (arg2) {
      arg1->serialized_string = (char *) (new char[strlen((const char *)arg2)+1]);
      strcpy((char *)arg1->serialized_string, (const char *)arg2);
@ -337,7 +347,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_ESLevent_Mine_set(void * jarg1, int jarg2) {
  arg1 = (ESLevent *)jarg1; 
  arg2 = (int)jarg2; 
  if (arg1) (arg1)->mine = arg2;
 }
@ -398,7 +407,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_ESLevent(void * jarg1) {
  arg1 = (ESLevent *)jarg1; 
  delete arg1;
 }
@ -420,8 +428,8 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_ESLevent_SetPriority(void * jarg1, vo
  unsigned int jresult ;
  ESLevent *arg1 = (ESLevent *) 0 ;
  esl_priority_t arg2 = (esl_priority_t) ESL_PRIORITY_NORMAL ;
  bool result;
  esl_priority_t *argp2 ;
  bool result;
  arg1 = (ESLevent *)jarg1; 
  argp2 = (esl_priority_t *)jarg2; 
@ -661,7 +669,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_ESLconnection(void * jarg1) {
  arg1 = (ESLconnection *)jarg1; 
  delete arg1;
 }
--- a/libs/esl/perl/ESL.pm
+++ b/libs/esl/perl/ESL.pm
@ -1,16 +1,16 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
+# Version 2.0.12
 #
-# Don't modify this file, modify the SWIG interface instead.
+# Do not make changes to this file unless you know what you are doing--modify
 # the SWIG interface file instead.
 package ESL;
-require Exporter;
+use base qw(Exporter);
-require DynaLoader;
+use base qw(DynaLoader);
@ISA = qw(Exporter DynaLoader);
 package ESLc;
 bootstrap ESL;
 package ESL;
-@EXPORT = qw( );
+@EXPORT = qw();
 # ---------- BASE METHODS -------------
--- a/libs/esl/perl/Makefile.am
+++ b/libs/esl/perl/Makefile.am
@ -18,7 +18,7 @@ perlmod-install: install-perlLTLIBRARIES
 endif
 esl_wrap.cpp:
-	swig -module ESL -shadow -perl5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+	swig2.0 -module ESL -shadow -perl5 -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
 perlxsi.c:
 	$(PERL) -MExtUtils::Embed -e xsinit -- -o perlxsi.c
--- a/libs/esl/perl/esl_wrap.cpp
+++ b/libs/esl/perl/esl_wrap.cpp
--- a/libs/esl/perl/perlxsi.c
+++ b/libs/esl/perl/perlxsi.c
@ -1,5 +1,6 @@
-#include <EXTERN.h>
+#include "EXTERN.h"
-#include <perl.h>
+#include "perl.h"
 #include "XSUB.h"
 EXTERN_C void xs_init (pTHX);
@ -8,8 +9,9 @@ EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
 EXTERN_C void
 xs_init(pTHX)
 {
-	char *file = __FILE__;
+    static const char file[] = __FILE__;
    dXSUB_SYS;
    PERL_UNUSED_CONTEXT;
    /* DynaLoader is a special case */
    newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
--- a/libs/esl/php/ESL.php
+++ b/libs/esl/php/ESL.php
@ -2,7 +2,7 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
 *
 * This file is not intended to be easily readable and contains a number of
 * coding conventions designed to improve portability and efficiency. Do not make
--- a/libs/esl/php/esl_wrap.cpp
+++ b/libs/esl/php/esl_wrap.cpp
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
 *
 * This file is not intended to be easily readable and contains a number of
 * coding conventions designed to improve portability and efficiency. Do not make
@ -315,7 +315,7 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
@ -379,18 +379,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 /*
  Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
+SWIG_TypeCmp(const char *nb, const char *tb) {
-  int equiv = 0;
+  int equiv = 1;
  const char* te = tb + strlen(tb);
  const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
    for (nb = ne; *ne; ++ne) {
      if (*ne == '|') break;
    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
    if (*ne) ++ne;
  }
  return equiv;
@ -398,24 +398,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 /*
  Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
+SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
  const char* te = tb + strlen(tb);
  const char* ne = nb;
  while (!equiv && *ne) {
    for (nb = ne; *ne; ++ne) {
      if (*ne == '|') break;
    }
    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
    if (*ne) ++ne;
  }
  return equiv;
 }
 /*
  Check the typename
 */
@ -810,7 +799,7 @@ static int default_error_code = E_ERROR;
  if (!(expr) ) { zend_printf("Contract Assert Failed %s\n",msg ); } else
 /* Standard SWIG API */
-#define SWIG_GetModule(clientdata) SWIG_Php_GetModule()
+#define SWIG_GetModule(clientdata) SWIG_Php_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) SWIG_Php_SetModule(pointer)
 /* used to wrap returned objects in so we know whether they are newobject
@ -940,11 +929,11 @@ SWIG_ZTS_ConvertResourcePtr(zval *z, swig_type_info *ty, int flags TSRMLS_DC) {
  const char *type_name;
  value = (swig_object_wrapper *) zend_list_find(z->value.lval, &type);
-  if ( flags & SWIG_POINTER_DISOWN ) {
+  if (type==-1) return NULL;
  if (flags & SWIG_POINTER_DISOWN) {
    value->newobject = 0;
  }
  p = value->ptr;
  if (type==-1) return NULL;
  type_name=zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC);
@ -983,14 +972,13 @@ SWIG_ZTS_ConvertPtr(zval *z, void **ptr, swig_type_info *ty, int flags TSRMLS_DC
 }
 static char const_name[] = "swig_runtime_data_type_pointer";
-static swig_module_info *SWIG_Php_GetModule() {
+static swig_module_info *SWIG_Php_GetModule(void *SWIGUNUSEDPARM(clientdata)) {
  zval *pointer;
  swig_module_info *ret = 0;
  TSRMLS_FETCH();
  MAKE_STD_ZVAL(pointer);
  TSRMLS_FETCH();
  if (zend_get_constant(const_name, sizeof(const_name) - 1, pointer TSRMLS_CC)) {
    if (pointer->type == IS_LONG) {
      ret = (swig_module_info *) pointer->value.lval;
@ -1038,6 +1026,7 @@ static void SWIG_FAIL() __attribute__ ((__noreturn__));
 #endif
 static void SWIG_FAIL() {
    TSRMLS_FETCH();
    zend_error(SWIG_ErrorCode(), "%s", SWIG_ErrorMsg());
    abort();
 }
@ -3213,8 +3202,6 @@ SWIG_InitializeModule(void *clientdata) {
  swig_module_info *module_head, *iter;
  int found, init;
  clientdata = clientdata;
  /* check to see if the circular list has been setup, if not, set it up */
  if (swig_module.next==0) {
    /* Initialize the swig_module */
@ -3252,7 +3239,7 @@ SWIG_InitializeModule(void *clientdata) {
    module_head->next = &swig_module;
  }
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
     a different interpreter, but not yet have a pointer in this interpreter.
     In this case, we do not want to continue adding types... everything should be
     set up already */
--- a/libs/esl/php/php_ESL.h
+++ b/libs/esl/php/php_ESL.h
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
 *
 * This file is not intended to be easily readable and contains a number of
 * coding conventions designed to improve portability and efficiency. Do not make
--- a/libs/esl/python/ESL.py
+++ b/libs/esl/python/ESL.py
@ -1,21 +1,44 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
+# Version 2.0.12
 #
-# Don't modify this file, modify the SWIG interface instead.
+# Do not make changes to this file unless you know what you are doing--modify
-# This file is compatible with both classic and new-style classes.
+# the SWIG interface file instead.
-import _ESL
+
-import new
+
-new_instancemethod = new.instancemethod
+
 from sys import version_info
 if version_info >= (2,6,0):
    def swig_import_helper():
        from os.path import dirname
        import imp
        fp = None
        try:
            fp, pathname, description = imp.find_module('_ESL', [dirname(__file__)])
        except ImportError:
            import _ESL
            return _ESL
        if fp is not None:
            try:
                _mod = imp.load_module('_ESL', fp, pathname, description)
            finally:
                fp.close()
            return _mod
    _ESL = swig_import_helper()
    del swig_import_helper
 else:
    import _ESL
 del version_info
 def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
    if (name == "thisown"): return self.this.own(value)
    if (name == "this"):
-        if type(value).__name__ == 'PySwigObject':
+        if type(value).__name__ == 'SwigPyObject':
            self.__dict__[name] = value
            return
    method = class_type.__swig_setmethods__.get(name,None)
    if method: return method(self,value)
-    if (not static) or hasattr(self,name):
+    if (not static):
        self.__dict__[name] = value
    else:
        raise AttributeError("You cannot add attributes to %s" % self)
@ -27,7 +50,7 @@ def _swig_getattr(self,class_type,name):
    if (name == "thisown"): return self.this.own()
    method = class_type.__swig_getmethods__.get(name,None)
    if method: return method(self)
-    raise AttributeError,name
+    raise AttributeError(name)
 def _swig_repr(self):
    try: strthis = "proxy of " + self.this.__repr__()
@ -47,23 +70,23 @@ class ESLevent:
    __swig_setmethods__["mine"] = _ESL.ESLevent_mine_set
    __swig_getmethods__["mine"] = _ESL.ESLevent_mine_get
    def __init__(self, *args): 
-        this = apply(_ESL.new_ESLevent, args)
+        this = _ESL.new_ESLevent(*args)
        try: self.this.append(this)
        except: self.this = this
    __swig_destroy__ = _ESL.delete_ESLevent
    __del__ = lambda self : None;
-    def serialize(*args): return apply(_ESL.ESLevent_serialize, args)
+    def serialize(self, format=None): return _ESL.ESLevent_serialize(self, format)
-    def setPriority(*args): return apply(_ESL.ESLevent_setPriority, args)
+    def setPriority(self, *args): return _ESL.ESLevent_setPriority(self, *args)
-    def getHeader(*args): return apply(_ESL.ESLevent_getHeader, args)
+    def getHeader(self, *args): return _ESL.ESLevent_getHeader(self, *args)
-    def getBody(*args): return apply(_ESL.ESLevent_getBody, args)
+    def getBody(self): return _ESL.ESLevent_getBody(self)
-    def getType(*args): return apply(_ESL.ESLevent_getType, args)
+    def getType(self): return _ESL.ESLevent_getType(self)
-    def addBody(*args): return apply(_ESL.ESLevent_addBody, args)
+    def addBody(self, *args): return _ESL.ESLevent_addBody(self, *args)
-    def addHeader(*args): return apply(_ESL.ESLevent_addHeader, args)
+    def addHeader(self, *args): return _ESL.ESLevent_addHeader(self, *args)
-    def pushHeader(*args): return apply(_ESL.ESLevent_pushHeader, args)
+    def pushHeader(self, *args): return _ESL.ESLevent_pushHeader(self, *args)
-    def unshiftHeader(*args): return apply(_ESL.ESLevent_unshiftHeader, args)
+    def unshiftHeader(self, *args): return _ESL.ESLevent_unshiftHeader(self, *args)
-    def delHeader(*args): return apply(_ESL.ESLevent_delHeader, args)
+    def delHeader(self, *args): return _ESL.ESLevent_delHeader(self, *args)
-    def firstHeader(*args): return apply(_ESL.ESLevent_firstHeader, args)
+    def firstHeader(self): return _ESL.ESLevent_firstHeader(self)
-    def nextHeader(*args): return apply(_ESL.ESLevent_nextHeader, args)
+    def nextHeader(self): return _ESL.ESLevent_nextHeader(self)
 ESLevent_swigregister = _ESL.ESLevent_swigregister
 ESLevent_swigregister(ESLevent)
@ -74,32 +97,36 @@ class ESLconnection:
    __getattr__ = lambda self, name: _swig_getattr(self, ESLconnection, name)
    __repr__ = _swig_repr
    def __init__(self, *args): 
-        this = apply(_ESL.new_ESLconnection, args)
+        this = _ESL.new_ESLconnection(*args)
        try: self.this.append(this)
        except: self.this = this
    __swig_destroy__ = _ESL.delete_ESLconnection
    __del__ = lambda self : None;
-    def socketDescriptor(*args): return apply(_ESL.ESLconnection_socketDescriptor, args)
+    def socketDescriptor(self): return _ESL.ESLconnection_socketDescriptor(self)
-    def connected(*args): return apply(_ESL.ESLconnection_connected, args)
+    def connected(self): return _ESL.ESLconnection_connected(self)
-    def getInfo(*args): return apply(_ESL.ESLconnection_getInfo, args)
+    def getInfo(self): return _ESL.ESLconnection_getInfo(self)
-    def send(*args): return apply(_ESL.ESLconnection_send, args)
+    def send(self, *args): return _ESL.ESLconnection_send(self, *args)
-    def sendRecv(*args): return apply(_ESL.ESLconnection_sendRecv, args)
+    def sendRecv(self, *args): return _ESL.ESLconnection_sendRecv(self, *args)
-    def api(*args): return apply(_ESL.ESLconnection_api, args)
+    def api(self, *args): return _ESL.ESLconnection_api(self, *args)
-    def bgapi(*args): return apply(_ESL.ESLconnection_bgapi, args)
+    def bgapi(self, *args): return _ESL.ESLconnection_bgapi(self, *args)
-    def sendEvent(*args): return apply(_ESL.ESLconnection_sendEvent, args)
+    def sendEvent(self, *args): return _ESL.ESLconnection_sendEvent(self, *args)
-    def sendMSG(*args): return apply(_ESL.ESLconnection_sendMSG, args)
+    def sendMSG(self, *args): return _ESL.ESLconnection_sendMSG(self, *args)
-    def recvEvent(*args): return apply(_ESL.ESLconnection_recvEvent, args)
+    def recvEvent(self): return _ESL.ESLconnection_recvEvent(self)
-    def recvEventTimed(*args): return apply(_ESL.ESLconnection_recvEventTimed, args)
+    def recvEventTimed(self, *args): return _ESL.ESLconnection_recvEventTimed(self, *args)
-    def filter(*args): return apply(_ESL.ESLconnection_filter, args)
+    def filter(self, *args): return _ESL.ESLconnection_filter(self, *args)
-    def events(*args): return apply(_ESL.ESLconnection_events, args)
+    def events(self, *args): return _ESL.ESLconnection_events(self, *args)
-    def execute(*args): return apply(_ESL.ESLconnection_execute, args)
+    def execute(self, *args): return _ESL.ESLconnection_execute(self, *args)
-    def executeAsync(*args): return apply(_ESL.ESLconnection_executeAsync, args)
+    def executeAsync(self, *args): return _ESL.ESLconnection_executeAsync(self, *args)
-    def setAsyncExecute(*args): return apply(_ESL.ESLconnection_setAsyncExecute, args)
+    def setAsyncExecute(self, *args): return _ESL.ESLconnection_setAsyncExecute(self, *args)
-    def setEventLock(*args): return apply(_ESL.ESLconnection_setEventLock, args)
+    def setEventLock(self, *args): return _ESL.ESLconnection_setEventLock(self, *args)
-    def disconnect(*args): return apply(_ESL.ESLconnection_disconnect, args)
+    def disconnect(self): return _ESL.ESLconnection_disconnect(self)
 ESLconnection_swigregister = _ESL.ESLconnection_swigregister
 ESLconnection_swigregister(ESLconnection)
 def eslSetLogLevel(*args):
  return _ESL.eslSetLogLevel(*args)
 eslSetLogLevel = _ESL.eslSetLogLevel
 # This file is compatible with both classic and new-style classes.
--- a/libs/esl/python/Makefile
+++ b/libs/esl/python/Makefile
@ -5,7 +5,7 @@ SITE_DIR=$(DESTDIR)/`python -c "from distutils.sysconfig import get_python_lib;
 all: _ESL.so
 esl_wrap.cpp:
-	swig -module ESL -classic -python -c++ -DMULTIPLICITY -threads -I../src/include -o esl_wrap.cpp ../ESL.i
+	swig2.0 -module ESL -classic -python -c++ -DMULTIPLICITY -threads -I../src/include -o esl_wrap.cpp ../ESL.i
 esl_wrap.o: esl_wrap.cpp
 	$(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o
--- a/libs/esl/python/esl_wrap.cpp
+++ b/libs/esl/python/esl_wrap.cpp
--- a/libs/esl/ruby/esl_wrap.cpp
+++ b/libs/esl/ruby/esl_wrap.cpp
@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
 * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.12
 *
 * This file is not intended to be easily readable and contains a number of
 * coding conventions designed to improve portability and efficiency. Do not make
@ -422,7 +422,7 @@ SWIGINTERNINLINE int SWIG_CheckState(int r) {
  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
@ -486,18 +486,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 /*
  Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
+SWIG_TypeCmp(const char *nb, const char *tb) {
-  int equiv = 0;
+  int equiv = 1;
  const char* te = tb + strlen(tb);
  const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
    for (nb = ne; *ne; ++ne) {
      if (*ne == '|') break;
    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
    if (*ne) ++ne;
  }
  return equiv;
@ -505,24 +505,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 /*
  Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
+SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
  const char* te = tb + strlen(tb);
  const char* ne = nb;
  while (!equiv && *ne) {
    for (nb = ne; *ne; ++ne) {
      if (*ne == '|') break;
    }
    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
    if (*ne) ++ne;
  }
  return equiv;
 }
 /*
  Check the typename
 */
@ -1398,7 +1387,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 /* Runtime API */
-#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule()	
+#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) 		SWIG_Ruby_SetModule(pointer)
@ -1734,7 +1723,7 @@ SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
 }
 SWIGRUNTIME swig_module_info *
-SWIG_Ruby_GetModule(void)
+SWIG_Ruby_GetModule(void *SWIGUNUSEDPARM(clientdata))
 {
  VALUE pointer;
  swig_module_info *ret = 0;
@ -1774,7 +1763,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
    return 1;
  return 0;
 }
@ -1787,7 +1776,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
    {
      VALUE num = rb_funcall( proc, swig_arity_id, 0 );
      int arity = NUM2INT(num);
@ -1834,7 +1823,7 @@ static VALUE mESL;
 #define SWIG_RUBY_THREAD_END_BLOCK
-#define SWIGVERSION 0x020007 
+#define SWIGVERSION 0x020012 
 #define SWIG_VERSION SWIGVERSION
@ -1866,11 +1855,7 @@ SWIGINTERN int
 SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 {
  if (TYPE(obj) == T_STRING) {
    #if defined(StringValuePtr)
    char *cstr = StringValuePtr(obj); 
    #else
    char *cstr = STR2CSTR(obj);
    #endif
    size_t size = RSTRING_LEN(obj) + 1;
    if (cptr)  {
      if (alloc) {
@ -3951,8 +3936,6 @@ SWIG_InitializeModule(void *clientdata) {
  swig_module_info *module_head, *iter;
  int found, init;
  clientdata = clientdata;
  /* check to see if the circular list has been setup, if not, set it up */
  if (swig_module.next==0) {
    /* Initialize the swig_module */
@ -3990,7 +3973,7 @@ SWIG_InitializeModule(void *clientdata) {
    module_head->next = &swig_module;
  }
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
     a different interpreter, but not yet have a pointer in this interpreter.
     In this case, we do not want to continue adding types... everything should be
     set up already */