[PATCH 2.1 1/1] Introduce support for Solace Systems as a middleware provider in required enumerations


Mark Spielman
 

Add Solace Systems to the list of middleware providers in the middleware enumeration and string conversion methods. The goal of this submission is to allow Solace Systems to provide OpenMAMA middleware bridge libraries in the near future.

Signed-off-by: Mark Spielman <mark.spielman@solacesystems.com>

---

diff --git a/mama/c_cpp/src/c/mama/middleware.h b/mama/c_cpp/src/c/mama/middleware.h
index 38ff9be..990de83 100644
--- a/mama/c_cpp/src/c/mama/middleware.h
+++ b/mama/c_cpp/src/c/mama/middleware.h
@@ -37,7 +37,8 @@ typedef enum mamaMiddleware_
MAMA_MIDDLEWARE_LBM = 1,
MAMA_MIDDLEWARE_TIBRV = 2,
MAMA_MIDDLEWARE_AVIS = 3,
- MAMA_MIDDLEWARE_MAX = 4,
+ MAMA_MIDDLEWARE_SOLACE = 4,
+ MAMA_MIDDLEWARE_MAX = 5,
MAMA_MIDDLEWARE_UNKNOWN = 99
} mamaMiddleware;

diff --git a/mama/c_cpp/src/c/middleware.c b/mama/c_cpp/src/c/middleware.c
index ad288ad..7acc66e 100644
--- a/mama/c_cpp/src/c/middleware.c
+++ b/mama/c_cpp/src/c/middleware.c
@@ -41,6 +41,9 @@ mamaMiddleware_convertFromString (const char* str)
if (strcasecmp (str, "avis") == 0)
return MAMA_MIDDLEWARE_AVIS;

+ if (strcasecmp (str, "solace") == 0)
+ return MAMA_MIDDLEWARE_SOLACE;
+

return MAMA_MIDDLEWARE_UNKNOWN;
}
@@ -59,6 +62,8 @@ mamaMiddleware_convertToString (mamaMiddleware middleware)
return "tibrv";
case MAMA_MIDDLEWARE_AVIS:
return "AVIS";
+ case MAMA_MIDDLEWARE_SOLACE:
+ return "SOLACE";
default:
return "unknown";
}





---------------------------------------------------------------------------------------

Mark Spielman
Development Lead, Solace Systems Professional Services
+1-613-271-1010 x1021
mark.spielman@solacesystems.com
www.solacesystems.com

Join Openmama-dev@lists.openmama.org to automatically receive all group messages.