etch-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vei...@apache.org
Subject svn commit: r1548398 [1/2] - in /etch/trunk/binding-cpp: compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/ runtime/ runtime/include/support/ runtime/include/util/ runtime/src/main/serialization/ runtime/src/main/support/ runtime/src/ma...
Date Fri, 06 Dec 2013 08:06:01 GMT
Author: veithm
Date: Fri Dec  6 08:06:01 2013
New Revision: 1548398

URL: http://svn.apache.org/r1548398
Log:
ETCH-280 Updating CAPU and adapting logger interface

This patch upgrades to CMake dependency to capu 0.13.0.
Due to this upgrade the logger interface needs to be changed
to use the new logging mechanism provided by CAPU 0.13.0.
In order to achieve this the EtchLogger has been extended by
a new macro called ETCH_LOG_<LOGLEVEL> in order to add an
abstraction from the CAPU logger.

Change-Id: I118008422c63d9406d006afe1193ba9d49c3213b

Modified:
    etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
    etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
    etch/trunk/binding-cpp/runtime/FindCapu.cmake
    etch/trunk/binding-cpp/runtime/include/support/EtchRuntime.h
    etch/trunk/binding-cpp/runtime/include/util/EtchLogger.h
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp
    etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp
    etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp
    etch/trunk/binding-cpp/runtime/src/main/support/EtchRuntime.cpp
    etch/trunk/binding-cpp/runtime/src/main/support/EtchTransportHelper.cpp
    etch/trunk/binding-cpp/runtime/src/main/transport/EtchDefaultDeliveryService.cpp
    etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessagizer.cpp
    etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp
    etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp
    etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp
    etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp
    etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp

Modified: etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm (original)
+++ etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/stub_h.vm Fri Dec  6 08:06:01 2013
@@ -60,12 +60,12 @@ public:
   status_t run(EtchStubBase<$i$suffix>* _ref, EtchDeliveryService *_svc, $i$suffix *_obj, capu::SmartPointer<EtchWho> _sender, capu::SmartPointer<EtchMessage> _msg )
   {
     status_t status = ETCH_OK;
-    CAPU_LOG_TRACE(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: Called ${mthd.vname($helper)} Run-Method.");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getDeliveryServiceContext(), "Stub$i$suffix ${namespace}: Called ${mthd.vname($helper)} Run-Method.");
 #if (!$mthd.isOneway())
     capu::SmartPointer<EtchMessage> _rmsg;
     status = _msg->createReplyMessage(_rmsg);
     if(status != ETCH_OK) {
-      CAPU_LOG_ERROR(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: Coudn't create reply-message.");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getDeliveryServiceContext(), "Stub$i$suffix ${namespace}: Coudn't create reply-message.");
       // TODO set exception
       return ETCH_ERROR;
     }
@@ -84,18 +84,18 @@ public:
     $intfname::$mthd.name()AsyncResultPtr ar;
 #set($sep = "")
 #set($count = 0)
-    CAPU_LOG_TRACE(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: Calling implementation of \"$mthd.name()\" function.");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getDeliveryServiceContext(), "Stub$i$suffix ${namespace}: Calling implementation of \"$mthd.name()\" function.");
     ar = _obj->$mthd.name()(#foreach($param in $mthd.iterator())#set($count = $count + 1)${sep}val$count#set($sep = ", ")#end);
 
     // create result message
 #if($mthd.hasReturn())
     if(ar->hasResult()) {
-    CAPU_LOG_TRACE(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: $mthd.name() - returned an Result, generating Answer Message.");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getDeliveryServiceContext(), "Stub$i$suffix ${namespace}: $mthd.name() - returned an Result, generating Answer Message.");
         _rmsg->put(ValueFactory$i::_mf_result(), ar->getResult());
     } else
 #end
     if(ar->hasException()) {
-         CAPU_LOG_DEBUG(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: $mthd.name()  - returned an Exception - notify Session.");
+         ETCH_LOG_DEBUG(mRuntime->getLogger(), mRuntime->getLogger().getDeliveryServiceContext(), "Stub$i$suffix ${namespace}: $mthd.name()  - returned an Exception - notify Session.");
         _ref->sessionNotify(ar->getException());
 #if ($mthd.isOneway())
         EtchMessagePtr _rmsg;
@@ -104,14 +104,14 @@ public:
         _rmsg->put( ValueFactory$i::_mf_result(), ar->getException() );
 #if ($mthd.isOneway())
         // transport result message
-        CAPU_LOG_TRACE(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: $mthd.name() - (One-Way) Transport Message back! Because an Exception occurred!.");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getDeliveryServiceContext(), "Stub$i$suffix ${namespace}: $mthd.name() - (One-Way) Transport Message back! Because an Exception occurred!.");
         status = _svc->transportMessage( _sender, _rmsg);
 #end
     }
 
 #if (!$mthd.isOneway())
     // transport result message
-    CAPU_LOG_TRACE(mRuntime->getLogger(), "Stub$i$suffix", "${namespace}: $mthd.name() - Transport answer-message back!.");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getDeliveryServiceContext(), "Stub$i$suffix ${namespace}: $mthd.name() - Transport answer-message back!.");
     status = _svc->transportMessage( _sender, _rmsg);
 #end
     return status;

Modified: etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm (original)
+++ etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/vf_cpp.vm Fri Dec  6 08:06:01 2013
@@ -80,7 +80,7 @@ public:
     _struct->put($vf::$p.vname($helper)(), val$CountParams );
 #end
     result = _struct;
-    CAPU_LOG_TRACE(mRuntime->getLogger(), "$vf", "${namespace}: exported $n.vname($helper) Value.");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getDeliveryServiceContext(), "Valuefactory ${namespace}: exported $n.vname($helper) Value.");
     return ETCH_OK;
   }
   status_t importValue(EtchStructValue* value, EtchObjectPtr &result)
@@ -96,7 +96,7 @@ public:
     v->$helper.getSetterName($p.name())(tmp$CountParams);
 #end
     result = v;
-    CAPU_LOG_TRACE(mRuntime->getLogger(), "$vf", "${namespace}: imported $n.vname($helper) Value.");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getDeliveryServiceContext(), "Valuefactory ${namespace}: imported $n.vname($helper) Value.");
     return ETCH_OK;
   }
 };

Modified: etch/trunk/binding-cpp/runtime/FindCapu.cmake
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/FindCapu.cmake?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/FindCapu.cmake (original)
+++ etch/trunk/binding-cpp/runtime/FindCapu.cmake Fri Dec  6 08:06:01 2013
@@ -38,7 +38,7 @@ IF ("${CAPU_INCLUDE_DIR}" STREQUAL "" AN
         
         ExternalProject_Add(
             Capu
-            URL https://github.com/bmwcarit/capu/archive/v0.9.0.zip
+            URL https://github.com/bmwcarit/capu/archive/v0.13.0.zip
             SOURCE_DIR "${CAPU_PROJECT_DIR}"
             BINARY_DIR "${CAPU_CMAKE_BUILD_DIR}"
             INSTALL_DIR "${CAPU_PROJECT_DIR}/deliverable"

Modified: etch/trunk/binding-cpp/runtime/include/support/EtchRuntime.h
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/support/EtchRuntime.h?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/support/EtchRuntime.h (original)
+++ etch/trunk/binding-cpp/runtime/include/support/EtchRuntime.h Fri Dec  6 08:06:01 2013
@@ -94,6 +94,7 @@ public:
 private:
   capu::bool_t mIsClosed;
   EtchLogger mLogger;
+  EtchConsoleLogAppender mLogAppender;
   static capu::uint64_t sId;
   capu::uint64_t mId;
   capu::Mutex mMutex;

Modified: etch/trunk/binding-cpp/runtime/include/util/EtchLogger.h
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/util/EtchLogger.h?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/util/EtchLogger.h (original)
+++ etch/trunk/binding-cpp/runtime/include/util/EtchLogger.h Fri Dec  6 08:06:01 2013
@@ -19,12 +19,78 @@
 #ifndef __ETCHLOGGER_H__
 #define __ETCHLOGGER_H__
 
-#include "capu/util/Appender.h"
 #include "capu/util/Logger.h"
-#include "capu/util/ConsoleAppender.h"
+#include "capu/util/ConsoleLogAppender.h"
+#include "capu/util/LogContext.h"
+#include "capu/util/ILogAppender.h"
 
-typedef capu::Appender EtchAppender;
-typedef capu::ConsoleAppender EtchConsoleAppender;
-typedef capu::Logger EtchLogger;
+typedef capu::ILogAppender IEtchLogAppender;
+typedef capu::ConsoleLogAppender EtchConsoleLogAppender;
+typedef capu::LogContext EtchLogContext;
+
+#define ETCH_LOG_TRACE(logger, context, message) \
+  LOG_TRACE_EXT(logger, (context), message);
+
+#define ETCH_LOG_DEBUG(logger, context, message) \
+  LOG_DEBUG_EXT(logger, (context), message);
+
+#define ETCH_LOG_INFO(logger, context, message) \
+  LOG_INFO_EXT(logger, (context), message);
+
+#define ETCH_LOG_WARN(logger, context, message) \
+  LOG_WARN_EXT(logger, (context), message);
+
+#define ETCH_LOG_ERROR(logger, context, message) \
+  LOG_ERROR_EXT(logger, (context), message);
+
+class EtchLogger: public capu::Logger {
+public:
+  EtchLogger(IEtchLogAppender& logAppender) : capu::Logger(logAppender)
+    , mSerializerContext("etch.runtime.messagizer.serializer")
+    , mDeliveryServiceContext("etch.runtime.deliveryservice")
+    , mTransportContext("etch.runtime.transport")
+    , mPacketizerContext("etch.runtime.packetizer")
+    , mMessagizerContext("etch.runtime.messagizer")
+    , mValidatorContext("etch.runtime.messagizer.validator")
+    , mMailboxContext("etch.runtime.mailbox")
+    , mRuntimeContext("etch.runtime")
+  {
+
+  }
+  EtchLogContext& getSerializerContext() {
+    return mSerializerContext;
+  }
+  EtchLogContext& getDeliveryServiceContext() {
+    return mDeliveryServiceContext;
+  }
+  EtchLogContext& getTransportContext() {
+    return mTransportContext;
+  }
+  EtchLogContext& getPacketizerContext() {
+    return mPacketizerContext;
+  }
+  EtchLogContext& getMessagizerContext() {
+    return mMessagizerContext;
+  }
+  EtchLogContext& getValidatorContext() {
+    return mValidatorContext;
+  }
+  EtchLogContext& getMailboxContext() {
+    return mMailboxContext;
+  }
+  EtchLogContext& getRuntimeContext() {
+    return mRuntimeContext;
+  }
+private:
+  EtchLogContext mSerializerContext;
+  EtchLogContext mDeliveryServiceContext;
+  EtchLogContext mTransportContext;
+  EtchLogContext mPacketizerContext;
+  EtchLogContext mMessagizerContext;
+  EtchLogContext mValidatorContext;
+  EtchLogContext mMailboxContext;
+  EtchLogContext mRuntimeContext;
+
+};
 
 #endif /* ETCHLOGGER_H */

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchAuthenticationExceptionSerializer.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchAuthenticationExceptionSerializer.h"
 #include "support/EtchRuntime.h"
 
-static const char* TAG = "EtchAuthenticationExceptionSerializer";
-
 const EtchString& EtchAuthenticationExceptionSerializer::FIELD_NAME() {
   static const EtchString name("msg");
   return name;
@@ -42,12 +40,12 @@ status_t EtchAuthenticationExceptionSeri
 
   capu::SmartPointer<EtchObject> tmp;
   if (value->get(mField, &tmp) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Msg Field could not be found");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Msg Field could not be found");
     return ETCH_ERROR;
   }
   EtchString str = *((EtchString*) tmp.get());
   result = new EtchAuthenticationException(str);
-  CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Exception has been deserialized");
+  ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Exception has been deserialized");
   return ETCH_OK;
 }
 
@@ -60,7 +58,8 @@ status_t EtchAuthenticationExceptionSeri
   EtchString *str = new EtchString(((EtchAuthenticationException*) value.get())->getErrorMessage());
   if (result->put(mField, str) != ETCH_OK)
     return ETCH_ERROR;
-  CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Exception has been serialized");
+
+  ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Exception has been serialized");
   return ETCH_OK;
 }
 
@@ -95,6 +94,6 @@ status_t EtchAuthenticationExceptionSeri
   }
 
   type->lock();
-  CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchAuthenticationExceptionSerializer has been initialized");
+  ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getSerializerContext(), "EtchAuthenticationExceptionSerializer has been initialized");
   return ETCH_OK;
 }

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataInput.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchBinaryTaggedDataInput.h"
 #include "support/EtchRuntime.h"
 
-static const char* TAG = "EtchBinaryTaggedDataInput";
-
 EtchBinaryTaggedDataInput::EtchBinaryTaggedDataInput(EtchRuntime* runtime, EtchValueFactory* vf)
 : EtchBinaryTaggedData(vf), mRuntime(runtime), mBuffer(NULL), mLengthBudget(0) {
   //get int validator
@@ -57,7 +55,7 @@ status_t EtchBinaryTaggedDataInput::read
   if (ret != ETCH_OK) {
     mBuffer = NULL;
     mLengthBudget = 0;
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Deserialization of Message header has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Deserialization of Message header has failed");
     return ret;
   }
 
@@ -65,7 +63,7 @@ status_t EtchBinaryTaggedDataInput::read
   if (ret != ETCH_OK) {
     mBuffer = NULL;
     mLengthBudget = 0;
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Deserialization of Message body has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Deserialization of Message body has failed");
     return ret;
   }
 
@@ -73,7 +71,7 @@ status_t EtchBinaryTaggedDataInput::read
   if (ret != ETCH_OK) {
     mBuffer = NULL;
     mLengthBudget = 0;
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Deserialization of Message end has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(),  "Deserialization of Message end has failed");
     return ret;
   }
 
@@ -85,19 +83,19 @@ status_t EtchBinaryTaggedDataInput::read
 
   ret = startStruct(result);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Reading header of struct has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Reading header of struct has failed");
     return ret;
   }
 
   ret = readKeysAndValues(result);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Reading body of struct has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Reading body of struct has failed");
     return ret;
   }
 
   ret = endStruct(result);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Reading end of struct has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Reading end of struct has failed");
     return ret;
   }
 
@@ -109,19 +107,19 @@ status_t EtchBinaryTaggedDataInput::read
 
   ret = startArray(result);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Reading header of array has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Reading header of array has failed");
     return ret;
   }
 
   ret = readValues(result, v);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Reading body of array has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Reading body of array has failed");
     return ret;
   }
 
   ret = endArray(result);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Reading end of array has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Reading end of array has failed");
     return ret;
   }
   return ETCH_OK;
@@ -179,19 +177,19 @@ status_t EtchBinaryTaggedDataInput::star
   mBuffer->getByte(version);
 
   if (version != VERSION()) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Incorrect serializer version");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Incorrect serializer version");
     return ETCH_EIO;
   }
 
   EtchType *type = NULL;
   if (readType(type) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Type information is not read correctly");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Type information is not read correctly");
     return ETCH_EIO;
   }
 
   capu::int32_t length = 0;
   if (readLength(length) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Length of message is not read correctly");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Length of message is not read correctly");
     return ETCH_EIO;
   }
 
@@ -206,13 +204,13 @@ status_t EtchBinaryTaggedDataInput::endM
 status_t EtchBinaryTaggedDataInput::startStruct(capu::SmartPointer<EtchStructValue> &result) {
   EtchType* t = NULL;
   if (readType(t) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "type of struct is not read correctly");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "type of struct is not read correctly");
     return ETCH_ERROR;
   }
 
   capu::int32_t length;
   if (readLength(length) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Length of struct is not read correctly");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Length of struct is not read correctly");
     return ETCH_ERROR;
   }
 
@@ -231,7 +229,7 @@ status_t EtchBinaryTaggedDataInput::star
   EtchType* customStructType = NULL;
   if (type == EtchTypeCode::CUSTOM || type == EtchTypeCode::STRUCT) {
     if (readType(customStructType) != ETCH_OK) {
-      CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "type of array is not read correctly");
+      ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "type of array is not read correctly");
       return ETCH_ERROR;
     }
   } else {
@@ -240,24 +238,24 @@ status_t EtchBinaryTaggedDataInput::star
 
   capu::int32_t dim;
   if (readIntegerValue(dim) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "dimension of array is not read correctly");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "dimension of array is not read correctly");
     return ETCH_EINVAL;
   }
 
   if (dim <= 0 || dim > (capu::int32_t)EtchValidator::MAX_NDIMS) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "dimension of array is not within predefined limits");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "dimension of array is not within predefined limits");
     return ETCH_EINVAL;
   }
 
   capu::int32_t length;
   if (readLength(length) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "length of array is not read correctly");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "length of array is not read correctly");
     return ETCH_ERROR;
   }
 
   capu::SmartPointer<EtchNativeArrayBase> array;
   if (allocNativeArray(type, customStructType, dim, length, array) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Allocation of array with specified type has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Allocation of array with specified type has failed");
     return ETCH_ERROR;
   }
 
@@ -337,7 +335,7 @@ status_t EtchBinaryTaggedDataInput::read
 status_t EtchBinaryTaggedDataInput::readLength(capu::int32_t& result) {
   capu::int32_t length = 0;
   if (readIntegerValue(length) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "length information is not read correctly");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "length information is not read correctly");
     return ETCH_ERROR;
   }
 
@@ -428,7 +426,7 @@ status_t EtchBinaryTaggedDataInput::read
       if (validateValue(v, boolean, result) != ETCH_OK) {
         return ETCH_ERROR;
       } else {
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Boolean false value has been received");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Boolean false value has been received");
         return ETCH_OK;
       }
     }
@@ -439,7 +437,7 @@ status_t EtchBinaryTaggedDataInput::read
       if (validateValue(v, boolean, result) != ETCH_OK) {
         return ETCH_ERROR;
       } else {
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Boolean true value has been received");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Boolean true value has been received");
 
         return ETCH_OK;
       }
@@ -454,7 +452,7 @@ status_t EtchBinaryTaggedDataInput::read
       if (validateValue(v, byte, result) != ETCH_OK) {
         return ETCH_ERROR;
       } else {
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Byte value has been received");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Byte value has been received");
         return ETCH_OK;
       }
     }
@@ -468,7 +466,7 @@ status_t EtchBinaryTaggedDataInput::read
       if (validateValue(v, shortNum, result) != ETCH_OK) {
         return ETCH_ERROR;
       } else {
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Short value has been received");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Short value has been received");
         return ETCH_OK;
       }
     }
@@ -482,7 +480,7 @@ status_t EtchBinaryTaggedDataInput::read
       if (validateValue(v, intNum, result) != ETCH_OK) {
         return ETCH_ERROR;
       } else {
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Int value has been received");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Int value has been received");
         return ETCH_OK;
       }
     }
@@ -496,7 +494,7 @@ status_t EtchBinaryTaggedDataInput::read
       if (validateValue(v, longNum, result) != ETCH_OK) {
         return ETCH_ERROR;
       } else {
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Long value has been received");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Long value has been received");
         return ETCH_OK;
       }
     }
@@ -510,7 +508,7 @@ status_t EtchBinaryTaggedDataInput::read
       if (validateValue(v, floatNum, result) != ETCH_OK) {
         return ETCH_ERROR;
       } else {
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Float value has been received");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Float value has been received");
         return ETCH_OK;
       }
     }
@@ -524,7 +522,7 @@ status_t EtchBinaryTaggedDataInput::read
       if (validateValue(v, doubleNum, result) != ETCH_OK) {
         return ETCH_ERROR;
       } else {
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Double value has been received");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Double value has been received");
         return ETCH_OK;
       }
     }
@@ -547,7 +545,7 @@ status_t EtchBinaryTaggedDataInput::read
 
       ret = validateValue(v, narray, result);
 
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Byte Array has been received");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Byte Array has been received");
 
       return ret;
     }
@@ -583,7 +581,7 @@ status_t EtchBinaryTaggedDataInput::read
         return ETCH_ERROR;
       } else {
         result = array;
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Array has been received");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Array has been received");
         return ETCH_OK;
       }
     }
@@ -595,7 +593,7 @@ status_t EtchBinaryTaggedDataInput::read
         return ETCH_ERROR;
       } else {
         result = str;
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Empty String value has been received");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Empty String value has been received");
         return ETCH_OK;
       }
     }
@@ -617,7 +615,7 @@ status_t EtchBinaryTaggedDataInput::read
         return ETCH_ERROR;
       } else {
         result = str;
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "String value has been received");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "String value has been received");
         return ETCH_OK;
       }
     }
@@ -637,7 +635,7 @@ status_t EtchBinaryTaggedDataInput::read
       if (validateValue(v, obj, result) != ETCH_OK) {
         return ETCH_ERROR;
       } else {
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Custom value has been received");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Custom value has been received");
         return ETCH_OK;
       }
     }
@@ -649,7 +647,7 @@ status_t EtchBinaryTaggedDataInput::read
         if (validateValue(v, tmp, result) != ETCH_OK) {
           return ETCH_ERROR;
         } else {
-          CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Tiny Int value has been received");
+          ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Tiny Int value has been received");
           return ETCH_OK;
         }
       }

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp Fri Dec  6 08:06:01 2013
@@ -18,8 +18,6 @@
 #include "serialization/EtchBinaryTaggedDataOutput.h"
 #include "support/EtchRuntime.h"
 
-static char* TAG = "EtchBinaryTaggedDataOutput";
-
 const EtchString& EtchBinaryTaggedDataOutput::STRING_TYPE_AND_FIELD() {
   static const EtchString name("BinaryTaggedDataOutput.stringTypeAndField");
   return name;
@@ -51,19 +49,19 @@ status_t EtchBinaryTaggedDataOutput::wri
 
   ret = startMessage(msg);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Serialization of Message header has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Serialization of Message header has failed");
     return ETCH_ERROR;
   }
 
   ret = writeKeysAndValues(msg);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Serialization of Message body has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Serialization of Message body has failed");
     return ETCH_ERROR;
   }
 
   ret = endMessage(msg);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Serialization of Message end has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Serialization of Message end has failed");
     return ETCH_ERROR;
   }
 
@@ -75,19 +73,19 @@ status_t EtchBinaryTaggedDataOutput::wri
 
   ret = startStruct(sv);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Serialization of struct header has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Serialization of struct header has failed");
     return ETCH_ERROR;
   }
 
   ret = writeKeysAndValues(sv);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Serialization of struct body has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Serialization of struct body has failed");
     return ETCH_ERROR;
   }
 
   ret = endStruct(sv);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Serialization of struct end has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Serialization of struct end has failed");
     return ETCH_ERROR;
   }
 
@@ -99,19 +97,19 @@ status_t EtchBinaryTaggedDataOutput::wri
 
   ret = startArray(av);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Serialization of array header has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Serialization of array header has failed");
     return ETCH_ERROR;
   }
 
   ret = writeValues(av, v);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Serialization of array body has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Serialization of array body has failed");
     return ETCH_ERROR;
   }
 
   ret = endArray(av);
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Serialization of array end has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Serialization of array end has failed");
     return ETCH_ERROR;
   }
 
@@ -192,10 +190,10 @@ status_t EtchBinaryTaggedDataOutput::sta
   // the caller has already written a type code to indicate a
   // struct is starting. this code is shared by startMessage().
   if (writeType(_struct->getType()) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Serialization of struct type information has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Serialization of struct type information has failed");
     return ETCH_ERROR;
   } else if (writeIntValue(_struct->count()) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Serialization of field number on struct has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Serialization of field number on struct has failed");
     return ETCH_ERROR;
   }
   return ETCH_OK;
@@ -221,20 +219,20 @@ status_t EtchBinaryTaggedDataOutput::sta
   if (type == EtchTypeCode::CUSTOM) {
     ret = writeType(array->getCustomStructType());
     if (ret != ETCH_OK) {
-      CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Serialization of array type information has failed");
+      ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Serialization of array type information has failed");
       return ETCH_ERROR;
     }
   }
 
   ret = writeIntValue(array->getDim());
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Serialization of array dimension information has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Serialization of array dimension information has failed");
     return ETCH_ERROR;
   }
 
   ret = writeIntValue(array->getSize());
   if (ret != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Serialization of array size information has failed");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Serialization of array size information has failed");
     return ETCH_ERROR;
   }
 
@@ -296,38 +294,38 @@ status_t EtchBinaryTaggedDataOutput::wri
     case EtchTypeCode::NONE:
       return ETCH_OK;
     case EtchTypeCode::BOOLEAN_FALSE:
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Boolean False has been serialized. (No Data send - encoded via TypeId)");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Boolean False has been serialized. (No Data send - encoded via TypeId)");
       return ETCH_OK;
     case EtchTypeCode::BOOLEAN_TRUE:
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Boolean True has been serialized. (No Data send - encoded via TypeId)");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Boolean True has been serialized. (No Data send - encoded via TypeId)");
       return ETCH_OK;
     case EtchTypeCode::EMPTY_STRING:
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Empty String has been serialized. (No Data send - encoded via TypeId)");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Empty String has been serialized. (No Data send - encoded via TypeId)");
       return ETCH_OK;
 
     case EtchTypeCode::BYTE:
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Byte has been serialized");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Byte has been serialized");
       return mBuffer->putByte(((EtchNumber*) value.get())->getByteValue());
 
     case EtchTypeCode::SHORT:
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Short has been serialized");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Short has been serialized");
       return mBuffer->putShort(((EtchNumber*) value.get())->getShortValue());
 
     case EtchTypeCode::INT:
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Int has been serialized");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Int has been serialized");
       return mBuffer->putInt(((EtchNumber*) value.get())->getInt32Value());
 
     case EtchTypeCode::LONG:
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Long has been serialized");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Long has been serialized");
       return mBuffer->putLong(((EtchNumber*) value.get())->getLongValue());
 
     case EtchTypeCode::FLOAT:
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Float has been serialized");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Float has been serialized");
 
       return mBuffer->putFloat(((EtchFloat*) value.get())->get());
 
     case EtchTypeCode::DOUBLE:
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Double has been serialized");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Double has been serialized");
       return mBuffer->putDouble(((EtchDouble*) value.get())->get());
 
 
@@ -338,7 +336,7 @@ status_t EtchBinaryTaggedDataOutput::wri
       na->get(Pos(0), data, na->getLength(), 0, na->getLength());
       status_t ret = writeBytes(data, na->getLength());
       delete[] data;
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Byte Array has been serialized");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Byte Array has been serialized");
       return ret;
     }
 
@@ -355,37 +353,37 @@ status_t EtchBinaryTaggedDataOutput::wri
     {
       EtchArrayValue *val = NULL;
       if (toArrayValue(value, v.get(), val) != ETCH_OK) {
-        CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Array couldn't be serialized");
+        ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Array couldn't be serialized");
         return ETCH_ERROR;
       }
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Array has been serialized");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Array has been serialized");
       return writeArray(val, v.get());
     }
     case EtchTypeCode::STRING:
     {
       capu::SmartPointer<EtchString> str = capu::smartpointer_cast<EtchString > (value);
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "String has been serialized");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "String has been serialized");
       return writeBytes((capu::int8_t*)str->c_str(), str->getNumBytes());
     }
     case EtchTypeCode::CUSTOM:
     {
       EtchStructValue* _struct;
       if (mVf->exportCustomValue(value, _struct) != ETCH_OK) {
-        CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Custom Data Type couldn't be serialized");
+        ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Custom Data Type couldn't be serialized");
         return ETCH_ERROR;
       }
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Custom Data Type has been serialized");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Custom Data Type has been serialized");
       return writeStruct(_struct);
     }
 
     default:
       // type is either "tiny" integer or unused
       if (typeCode >= EtchTypeCode::MIN_TINY_INT && typeCode <= EtchTypeCode::MAX_TINY_INT) {
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Tiny Int has been serialized");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Tiny Int has been serialized");
         return ETCH_OK;
       }
       //invalid type
-      CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Attempted serialization of an invalid Data Type");
+      ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Attempted serialization of an invalid Data Type");
       return ETCH_EINVAL;
   }
   return ETCH_ERROR;

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchDateSerializer.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchDateSerializer.h"
 #include "support/EtchRuntime.h"
 
-static char* TAG = "EtchDateSerializer";
-
 const EtchString& EtchDateSerializer::FIELD_NAME() {
   static const EtchString name("dateTime");
   return name;
@@ -42,13 +40,13 @@ status_t EtchDateSerializer::importValue
 
   capu::SmartPointer<EtchObject> tmp;
   if (value->get(mField, &tmp) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "DateTime Field could not be found");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "DateTime Field could not be found");
     return ETCH_ERROR;
   }
 
   EtchLong date = *((EtchLong*) tmp.get());
   result = new EtchDate((capu::time_t)date.get());
-  CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Date has been deserialized");
+  ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Date has been deserialized");
   return ETCH_OK;
 }
 
@@ -61,7 +59,7 @@ status_t EtchDateSerializer::exportValue
   EtchLong *date = new EtchLong(((EtchDate*) value.get())->get());
   if (result->put(mField, date) != ETCH_OK)
     return ETCH_ERROR;
-  CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Date has been serialized");
+  ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Date has been serialized");
   return ETCH_OK;
 }
 
@@ -97,6 +95,6 @@ status_t EtchDateSerializer::Init(EtchRu
   }
 
   type->lock();
-  CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchDateSerializer has been initialized");
+  ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getSerializerContext(), "EtchDateSerializer has been initialized");
   return ETCH_OK;
 }

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchHashTableSerializer.cpp Fri Dec  6 08:06:01 2013
@@ -20,8 +20,6 @@
 #include "serialization/EtchHashTableSerializer.h"
 #include "support/EtchRuntime.h"
 
-static char* TAG = "EtchHashTableSerializer";
-
 const EtchString& EtchHashTableSerializer::FIELD_NAME() {
   static const EtchString name("keysAndValues");
   return name;
@@ -59,7 +57,7 @@ status_t EtchHashTableSerializer::export
   if (result->put(mField, keysAndValuesArray) != ETCH_OK) {
     return ETCH_ERROR;
   }
-  CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "HashTable has been serialized");
+  ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "HashTable has been serialized");
   return ETCH_OK;
 }
 
@@ -71,7 +69,7 @@ status_t EtchHashTableSerializer::import
   }
   capu::SmartPointer<EtchObject> tmp;
   if (value->get(mField, &tmp) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "KeysAndValues Field could not be found");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "KeysAndValues Field could not be found");
     return ETCH_ERROR;
   }
 
@@ -92,7 +90,7 @@ status_t EtchHashTableSerializer::import
       return res;
   }
   result = (EtchObject*) table;
-  CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "HashTable has been deserialized");
+  ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "HashTable has been deserialized");
   return ETCH_OK;
 }
 
@@ -127,6 +125,6 @@ status_t EtchHashTableSerializer::Init(E
   }
 
   type->lock();
-  CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchHashTableSerializer has been initialized");
+  ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getSerializerContext(), "EtchHashTableSerializer has been initialized");
   return ETCH_OK;
 }

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchListSerializer.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchListSerializer.h"
 #include "support/EtchRuntime.h"
 
-static char* TAG = "EtchListSerializer";
-
 const EtchString& EtchListSerializer::FIELD_NAME() {
   static const EtchString name("values");
   return name;
@@ -56,7 +54,7 @@ status_t EtchListSerializer::exportValue
   result = new EtchStructValue(mType, vf);
   if (result->put(mField, values) != ETCH_OK)
     return ETCH_ERROR;
-  CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "List has been serialized");
+  ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "List has been serialized");
   return ETCH_OK;
 }
 
@@ -70,7 +68,7 @@ status_t EtchListSerializer::importValue
 
   capu::SmartPointer<EtchObject> tmp = NULL;
   if (value->get(mField, &tmp) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Values Field could not be found");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Values Field could not be found");
     return ETCH_ERROR;
   }
 
@@ -86,7 +84,7 @@ status_t EtchListSerializer::importValue
       return res;
   }
   result = (EtchObject*) list;
-  CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "List has been deserialized");
+  ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "List has been deserialized");
   return ETCH_OK;
 }
 
@@ -122,6 +120,6 @@ status_t EtchListSerializer::Init(EtchRu
   }
   type->lock();
 
-  CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchListSerializer has been initialized");
+  ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getSerializerContext(), "EtchListSerializer has been initialized");
   return ETCH_OK;
 }

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchRuntimeExceptionSerializer.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchRuntimeExceptionSerializer.h"
 #include "support/EtchRuntime.h"
 
-static char* TAG = "EtchRuntimeExceptionSerializer";
-
 const EtchString& EtchRuntimeExceptionSerializer::FIELD_NAME() {
   static const EtchString name("msg");
   return name;
@@ -45,13 +43,13 @@ status_t EtchRuntimeExceptionSerializer:
 
   capu::SmartPointer<EtchObject> tmp;
   if (value->get(mField, &tmp) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Msg Field could not be found");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Msg Field could not be found");
     return ETCH_ERROR;
   }
 
   EtchString str = *((EtchString*) tmp.get());
   result = new EtchRuntimeException(str, ETCH_ERROR);
-  CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Exception has been deserialized");
+  ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Exception has been deserialized");
   return ETCH_OK;
 }
 
@@ -65,7 +63,7 @@ status_t EtchRuntimeExceptionSerializer:
 
   if (result->put(mField, str) != ETCH_OK)
     return ETCH_ERROR;
-  CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Exception has been serialized");
+  ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Exception has been serialized");
   return ETCH_OK;
 }
 
@@ -101,6 +99,6 @@ status_t EtchRuntimeExceptionSerializer:
 
   //lock type
   type->lock();
-  CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchRuntimeExceptionSerializer has been initialized");
+  ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getSerializerContext(), "EtchRuntimeExceptionSerializer has been initialized");
   return ETCH_OK;
 }

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchSetSerializer.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchSetSerializer.h"
 #include "support/EtchRuntime.h"
 
-static const char* TAG = "EtchSetSerializer";
-
 const EtchString& EtchSetSerializer::FIELD_NAME() {
   static const EtchString name("keys");
   return name;
@@ -55,7 +53,7 @@ status_t EtchSetSerializer::exportValue(
   result = new EtchStructValue(mType, vf);
   if (result->put(mField, array) != ETCH_OK)
     return ETCH_ERROR;
-  CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Set has been serialized");
+  ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Set has been serialized");
   return ETCH_OK;
 }
 
@@ -67,7 +65,7 @@ status_t EtchSetSerializer::importValue(
   }
   capu::SmartPointer<EtchObject> tmp;
   if (value->get(mField, &tmp) != ETCH_OK) {
-    CAPU_LOG_ERROR(mRuntime->getLogger(), TAG, "Keys Field could not be found");
+    ETCH_LOG_ERROR(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Keys Field could not be found");
     return ETCH_ERROR;
   }
 
@@ -83,7 +81,7 @@ status_t EtchSetSerializer::importValue(
       return res;
   }
   result = (capu::SmartPointer<EtchObject>) set;
-  CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Set has been deserialized");
+  ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getSerializerContext(), "Set has been deserialized");
   return ETCH_OK;
 }
 
@@ -118,6 +116,6 @@ status_t EtchSetSerializer::Init(EtchRun
   }
 
   type->lock();
-  CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchSetSerializer has been initialized");
+  ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getSerializerContext(), "EtchSetSerializer has been initialized");
   return ETCH_OK;
 }

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchValidatorBoolean.h"
 #include "support/EtchRuntime.h"
 
-static const char* TAG = "EtchValidatorBoolean";
-
 capu::SmartPointer<EtchValidator>* EtchValidatorBoolean::Validators(EtchRuntime* runtime) {
   static EtchValidatorCaches validators;
   return validators.get(runtime);
@@ -68,11 +66,11 @@ capu::bool_t EtchValidatorBoolean::valid
 
 status_t EtchValidatorBoolean::validateValue(capu::SmartPointer<EtchObject> value, capu::SmartPointer<EtchObject>& result) {
   if (validate(value)) {
-    CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Object has been validated");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Boolean object validation successful");
     result = value;
     return ETCH_OK;
   } else {
-    CAPU_LOG_WARN(mRuntime->getLogger(), TAG, "Object has not been validated");
+    ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Boolean object validation failed");
     return ETCH_ERROR;
   }
 }
@@ -87,7 +85,7 @@ status_t EtchValidatorBoolean::Get(EtchR
   }
   if (Validators(runtime)[ndim].get() == NULL) {
     Validators(runtime)[ndim] = new EtchValidatorBoolean(runtime, ndim);
-    CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorBoolean has been created");
+    ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getValidatorContext(), "EtchValidatorBoolean has been created");
   }
   val = Validators(runtime)[ndim];
   return ETCH_OK;

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchValidatorByte.h"
 #include "support/EtchRuntime.h"
 
-static const char* TAG = "EtchValidatorByte";
-
 capu::SmartPointer<EtchValidator>* EtchValidatorByte::Validators(EtchRuntime* runtime) {
   static EtchValidatorCaches validators;
   return validators.get(runtime);
@@ -87,13 +85,13 @@ status_t EtchValidatorByte::validateValu
   if (validate(value)) {
     if ((value->getObjectType()->equals(EtchByte::TYPE())) || (mNDims > 0)) {
       result = value;
-      CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorByte", "Object has been validated");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Byte object validation successful");
       return ETCH_OK;
     } else {
       if (value->getObjectType()->equals(EtchShort::TYPE())) {
         EtchShort *v = (EtchShort *) value.get();
         result = new EtchByte((capu::int8_t)v->get());
-        CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorByte", "Short has been validated by EtchValidatorByte and converted to EtchByte");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Short has been validated by EtchValidatorByte and converted to EtchByte");
 
         return ETCH_OK;
       }
@@ -101,7 +99,7 @@ status_t EtchValidatorByte::validateValu
       if (value->getObjectType()->equals(EtchLong::TYPE())) {
         EtchLong *v = (EtchLong *) value.get();
         result = new EtchByte((capu::int8_t)v->get());
-        CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorByte", "EtchLong has been validated by EtchValidatorByte and converted to EtchByte");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "EtchLong has been validated by EtchValidatorByte and converted to EtchByte");
 
         return ETCH_OK;
       }
@@ -109,14 +107,14 @@ status_t EtchValidatorByte::validateValu
       if (value->getObjectType()->equals(EtchInt32::TYPE())) {
         EtchInt32 *v = (EtchInt32 *) value.get();
         result = new EtchByte((capu::int8_t)v->get());
-        CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorByte", "EtchInt32 has been validated by EtchValidatorByte and converted to EtchByte");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "EtchInt32 has been validated by EtchValidatorByte and converted to EtchByte");
         return ETCH_OK;
       }
-      CAPU_LOG_WARN(mRuntime->getLogger(), "EtchValidatorByte", "Object has not been validated");
+      ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Byte object validation failed due to unknown type");
       return ETCH_ERROR;
     }
   } else {
-    CAPU_LOG_WARN(mRuntime->getLogger(), "EtchValidatorByte", "Object has not been validated");
+    ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Byte object validation failed");
     return ETCH_ERROR;
   }
 }
@@ -131,7 +129,7 @@ status_t EtchValidatorByte::Get(EtchRunt
   }
   if (Validators(runtime)[ndim].get() == NULL) {
     Validators(runtime)[ndim] = new EtchValidatorByte(runtime, ndim);
-    CAPU_LOG_TRACE(runtime->getLogger(), "EtchValidatorByte", "EtchValidatorByte has been created");
+    ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getValidatorContext(), "EtchValidatorByte has been created");
 
   }
   val = Validators(runtime)[ndim];

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchValidatorDouble.h"
 #include "support/EtchRuntime.h"
 
-static const char* TAG = "EtchValidatorDouble";
-
 capu::SmartPointer<EtchValidator>* EtchValidatorDouble::Validators(EtchRuntime* runtime) {
   static EtchValidatorCaches validators;
   return validators.get(runtime);
@@ -68,10 +66,10 @@ capu::bool_t EtchValidatorDouble::valida
 status_t EtchValidatorDouble::validateValue(capu::SmartPointer<EtchObject> value, capu::SmartPointer<EtchObject>& result) {
   if (validate(value)) {
     result = value;
-    CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Object has been validated");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Double object validated");
     return ETCH_OK;
   } else {
-    CAPU_LOG_WARN(mRuntime->getLogger(), TAG, "Object has not been validated");
+    ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Double object validation failed");
     return ETCH_ERROR;
   }
 }
@@ -86,7 +84,7 @@ status_t EtchValidatorDouble::Get(EtchRu
   }
   if (Validators(runtime)[ndim].get() == NULL) {
     Validators(runtime)[ndim] = new EtchValidatorDouble(runtime, ndim);
-    CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorDouble has been created");
+    ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getValidatorContext(), "EtchValidatorDouble has been created");
   }
   val = Validators(runtime)[ndim];
   return ETCH_OK;

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchValidatorFloat.h"
 #include "support/EtchRuntime.h"
 
-static const char* TAG = "EtchValidatorFloat";
-
 capu::SmartPointer<EtchValidator>* EtchValidatorFloat::Validators(EtchRuntime* runtime) {
   static EtchValidatorCaches validators;
   return validators.get(runtime);
@@ -68,10 +66,10 @@ capu::bool_t EtchValidatorFloat::validat
 status_t EtchValidatorFloat::validateValue(capu::SmartPointer<EtchObject> value, capu::SmartPointer<EtchObject>& result) {
   if (validate(value)) {
     result = value;
-    CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Object has been validated");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Float object validated");
     return ETCH_OK;
   } else {
-    CAPU_LOG_WARN(mRuntime->getLogger(), TAG, "Object has not been validated");
+    ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Float object validation failed");
     return ETCH_ERROR;
   }
 }
@@ -86,7 +84,7 @@ status_t EtchValidatorFloat::Get(EtchRun
   }
   if (Validators(runtime)[ndim].get() == NULL) {
     Validators(runtime)[ndim] = new EtchValidatorFloat(runtime, ndim);
-    CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorFloat has been created");
+    ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getValidatorContext(), "EtchValidatorFloat has been created");
   }
   val = Validators(runtime)[ndim];
   return ETCH_OK;

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchValidatorInt.h"
 #include "support/EtchRuntime.h"
 
-static const char* TAG = "EtchValidatorInt";
-
 capu::SmartPointer<EtchValidator>* EtchValidatorInt::Validators(EtchRuntime* runtime) {
   static EtchValidatorCaches validators;
   return validators.get(runtime);
@@ -81,34 +79,34 @@ status_t EtchValidatorInt::validateValue
   if (validate(value)) {
     if ((value->getObjectType()->equals(EtchInt32::TYPE())) || (mNDims > 0)) {
       result = value;
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Object has been validated");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Int has been validated");
       return ETCH_OK;
     } else {
       if (value->getObjectType()->equals(EtchShort::TYPE())) {
         EtchShort *v = (EtchShort *) value.get();
         result = new EtchInt32((capu::int32_t)v->get());
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "EtchShort has been validated by EtchValidatorInt and converted to EtchInt32");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "EtchShort has been validated by EtchValidatorInt and converted to EtchInt32");
         return ETCH_OK;
       }
 
       if (value->getObjectType()->equals(EtchByte::TYPE())) {
         EtchByte *v = (EtchByte *) value.get();
         result = new EtchInt32((capu::int32_t)v->get());
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "EtchByte has been validated by EtchValidatorInt and converted to EtchInt32");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "EtchByte has been validated by EtchValidatorInt and converted to EtchInt32");
         return ETCH_OK;
       }
 
       if (value->getObjectType()->equals(EtchLong::TYPE())) {
         EtchLong *v = (EtchLong *) value.get();
         result = new EtchInt32((capu::int32_t)v->get());
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "EtchLong has been validated by EtchValidatorInt and converted to EtchInt32");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "EtchLong has been validated by EtchValidatorInt and converted to EtchInt32");
         return ETCH_OK;
       }
-      CAPU_LOG_WARN(mRuntime->getLogger(), TAG, "Object has not been validated");
+      ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Int object validation failed due to unknown type");
       return ETCH_ERROR;
     }
   } else {
-    CAPU_LOG_WARN(mRuntime->getLogger(), TAG, "Object has not been validated");
+    ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Int object validation failed");
     return ETCH_ERROR;
   }
 }
@@ -123,7 +121,7 @@ status_t EtchValidatorInt::Get(EtchRunti
   }
   if (Validators(runtime)[ndim].get() == NULL) {
     Validators(runtime)[ndim] = new EtchValidatorInt(runtime, ndim);
-    CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorInt has been created");
+    ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getValidatorContext(), "EtchValidatorInt has been created");
   }
   val = Validators(runtime)[ndim];
   return ETCH_OK;

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchValidatorLong.h"
 #include "support/EtchRuntime.h"
 
-static const char* TAG = "EtchValidatorLong";
-
 capu::SmartPointer<EtchValidator>* EtchValidatorLong::Validators(EtchRuntime* runtime) {
   static EtchValidatorCaches validators;
   return validators.get(runtime);
@@ -75,34 +73,34 @@ status_t EtchValidatorLong::validateValu
   if (validate(value)) {
     if ((value->getObjectType()->equals(EtchLong::TYPE())) || (mNDims > 0)) {
       result = value;
-      CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Object has been validated");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Long object has been validated");
       return ETCH_OK;
     } else {
       if (value->getObjectType()->equals(EtchShort::TYPE())) {
         EtchShort *v = (EtchShort *) value.get();
         result = new EtchLong((capu::int64_t)v->get());
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "EtchShort has been validated by EtchValidatorInt and converted to EtchLong");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "EtchShort has been validated by EtchValidatorInt and converted to EtchLong");
         return ETCH_OK;
       }
 
       if (value->getObjectType()->equals(EtchByte::TYPE())) {
         EtchByte *v = (EtchByte *) value.get();
         result = new EtchLong((capu::int64_t)v->get());
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "EtchByte has been validated by EtchValidatorInt and converted to EtchLong");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "EtchByte has been validated by EtchValidatorInt and converted to EtchLong");
         return ETCH_OK;
       }
 
       if (value->getObjectType()->equals(EtchInt32::TYPE())) {
         EtchInt32 *v = (EtchInt32 *) value.get();
         result = new EtchLong((capu::int64_t)v->get());
-        CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "EtchInt32 has been validated by EtchValidatorInt and converted to EtchLong");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "EtchInt32 has been validated by EtchValidatorInt and converted to EtchLong");
         return ETCH_OK;
       }
-      CAPU_LOG_WARN(mRuntime->getLogger(), TAG, "Object has not been validated");
+      ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Long object validation failed due to unknown type");
       return ETCH_ERROR;
     }
   } else {
-    CAPU_LOG_WARN(mRuntime->getLogger(), TAG, "Object has not been validated");
+    ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Long object validation failed");
     return ETCH_ERROR;
   }
 }
@@ -117,7 +115,7 @@ status_t EtchValidatorLong::Get(EtchRunt
   }
   if (Validators(runtime)[ndim].get() == NULL) {
     Validators(runtime)[ndim] = new EtchValidatorLong(runtime, ndim);
-    CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorLong has been created");
+    ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getValidatorContext(), "EtchValidatorLong has been created");
   }
   val = Validators(runtime)[ndim];
   return ETCH_OK;

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp Fri Dec  6 08:06:01 2013
@@ -48,10 +48,10 @@ capu::bool_t EtchValidatorNone::validate
 status_t EtchValidatorNone::validateValue(capu::SmartPointer<EtchObject> value, capu::SmartPointer<EtchObject>& result) {
   if (validate(value)) {
     result = value;
-    CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorNone", "NONE has been validated");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "NONE type object has been validated");
     return ETCH_OK;
   } else {
-    CAPU_LOG_WARN(mRuntime->getLogger(), "EtchValidatorNone", "NONE has not been validated");
+    ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "NONE type object validation failed");
     return ETCH_ERROR;
   }
 }
@@ -59,7 +59,7 @@ status_t EtchValidatorNone::validateValu
 status_t EtchValidatorNone::Get(EtchRuntime* runtime, capu::SmartPointer<EtchValidator> &val) {
   if (Validators(runtime)[0].get() == NULL) {
     Validators(runtime)[0] = new EtchValidatorNone(runtime);
-    CAPU_LOG_TRACE(runtime->getLogger(), "EtchValidatorNone", "EtchValidatorNone has been created");
+    ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getValidatorContext(), "EtchValidatorNone has been created");
   }
   val = Validators(runtime)[0];
   return ETCH_OK;

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp Fri Dec  6 08:06:01 2013
@@ -55,10 +55,10 @@ capu::bool_t EtchValidatorObject::valida
 status_t EtchValidatorObject::validateValue(capu::SmartPointer<EtchObject> value, capu::SmartPointer<EtchObject>& result) {
   if (validate(value)) {
     result = value;
-    CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorObject", "Object has been validated");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Object validated");
     return ETCH_OK;
   } else {
-    CAPU_LOG_WARN(mRuntime->getLogger(), "EtchValidatorObject", "Object has not been validated");
+    ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Object validation failed");
     return ETCH_ERROR;
   }
 }
@@ -72,7 +72,7 @@ status_t EtchValidatorObject::Get(EtchRu
   }
   //TODO thread safety
   if (Validators(runtime)[ndim].get() == NULL) {
-    CAPU_LOG_TRACE(runtime->getLogger(), "EtchValidatorObject", "EtchValidatorObject has been created");
+    ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getValidatorContext(), "EtchValidatorObject has been created");
     Validators(runtime)[ndim] = new EtchValidatorObject(runtime, ndim);
   }
   val = Validators(runtime)[ndim];

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchValidatorRuntimeException.h"
 #include "support/EtchRuntime.h"
 
-static const char* TAG = "EtchValidatorRuntimeException";
-
 capu::SmartPointer<EtchValidator>* EtchValidatorRuntimeException::Validators(EtchRuntime* runtime) {
   static EtchValidatorCaches validators;
   return validators.get(runtime);
@@ -52,10 +50,10 @@ capu::bool_t EtchValidatorRuntimeExcepti
 status_t EtchValidatorRuntimeException::validateValue(capu::SmartPointer<EtchObject> value, capu::SmartPointer<EtchObject>& result) {
   if (validate(value)) {
     result = value;
-    CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorRuntimeException", "EtchRuntimeException has been validated");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "EtchRuntimeException validated");
     return ETCH_OK;
   } else {
-    CAPU_LOG_WARN(mRuntime->getLogger(), "EtchValidatorRuntimeException", "EtchRuntimeException has not been validated");
+    ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "EtchRuntimeException object validation failed");
     return ETCH_ERROR;
   }
 }
@@ -63,7 +61,7 @@ status_t EtchValidatorRuntimeException::
 status_t EtchValidatorRuntimeException::Get(EtchRuntime* runtime, capu::SmartPointer<EtchValidator> &val) {
   if (Validators(runtime)[0].get() == NULL) {
     Validators(runtime)[0] = new EtchValidatorRuntimeException(runtime);
-    CAPU_LOG_TRACE(runtime->getLogger(), "EtchValidatorRuntimeException", "EtchValidatorRuntimeException has been created");
+    ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getValidatorContext(),"EtchValidatorRuntimeException has been created");
   }
   val = Validators(runtime)[0];
   return ETCH_OK;

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchValidatorShort.h"
 #include "support/EtchRuntime.h"
 
-static const char* TAG = "EtchValidatorShort";
-
 capu::SmartPointer<EtchValidator>* EtchValidatorShort::Validators(EtchRuntime* runtime) {
   static EtchValidatorCaches validators;
   return validators.get(runtime);
@@ -83,35 +81,35 @@ status_t EtchValidatorShort::validateVal
   if (validate(value)) {
     if ((value->getObjectType()->equals(EtchShort::TYPE())) || (mNDims > 0)) {
       result = value;
-      CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorShort", "Object has been validated");
+      ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Short Object has been validated");
       return ETCH_OK;
     } else {
       if (value->getObjectType()->equals(EtchInt32::TYPE())) {
         EtchInt32 *v = (EtchInt32 *) value.get();
         result = new EtchShort((capu::int16_t)v->get());
-        CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorShort", "EtchInt32 has been validated by EtchValidatorInt and converted to EtchShort");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "EtchInt32 has been validated by EtchValidatorInt and converted to EtchShort");
         return ETCH_OK;
       }
 
       if (value->getObjectType()->equals(EtchByte::TYPE())) {
         EtchByte *v = (EtchByte *) value.get();
         result = new EtchShort((capu::int16_t)v->get());
-        CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorShort", "EtchByte has been validated by EtchValidatorInt and converted to EtchShort");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "EtchByte has been validated by EtchValidatorInt and converted to EtchShort");
         return ETCH_OK;
       }
 
       if (value->getObjectType()->equals(EtchLong::TYPE())) {
         EtchLong *v = (EtchLong *) value.get();
         result = new EtchShort((capu::int16_t)v->get());
-        CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchValidatorShort", "EtchLong has been validated by EtchValidatorInt and converted to EtchShort");
+        ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "EtchLong has been validated by EtchValidatorInt and converted to EtchShort");
         return ETCH_OK;
       }
 
-      CAPU_LOG_WARN(mRuntime->getLogger(), "EtchValidatorShort", "Object has not been validated");
+      ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Short object validation failed due to unknown type");
       return ETCH_ERROR;
     }
   } else {
-    CAPU_LOG_WARN(mRuntime->getLogger(), "EtchValidatorShort", "Object has not been validated");
+    ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Short object validation failed");
     return ETCH_ERROR;
   }
 }
@@ -125,7 +123,7 @@ status_t EtchValidatorShort::Get(EtchRun
     return ETCH_OK;
   }
   if (Validators(runtime)[ndim].get() == NULL) {
-    CAPU_LOG_TRACE(runtime->getLogger(), "EtchValidatorShort", "EtchValidatorShort has been created");
+    ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getValidatorContext(), "EtchValidatorShort has been created");
     Validators(runtime)[ndim] = new EtchValidatorShort(runtime, ndim);
   }
   val = Validators(runtime)[ndim];

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchValidatorString.h"
 #include "support/EtchRuntime.h"
 
-static const char* TAG = "EtchValidatorString";
-
 capu::SmartPointer<EtchValidator>* EtchValidatorString::Validators(EtchRuntime* runtime) {
   static EtchValidatorCaches validators;
   return validators.get(runtime);
@@ -66,10 +64,10 @@ capu::bool_t EtchValidatorString::valida
 status_t EtchValidatorString::validateValue(capu::SmartPointer<EtchObject> value, capu::SmartPointer<EtchObject>& result) {
   if (validate(value)) {
     result = value;
-    CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "String has been validated");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "String object validated");
     return ETCH_OK;
   } else {
-    CAPU_LOG_WARN(mRuntime->getLogger(), TAG, "String has not been validated");
+    ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "String object validation failed");
     return ETCH_ERROR;
   }
 }
@@ -84,7 +82,7 @@ status_t EtchValidatorString::Get(EtchRu
   }
   if (Validators(runtime)[ndim].get() == NULL) {
     Validators(runtime)[ndim] = new EtchValidatorString(runtime, ndim);
-    CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorString has been created");
+    ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getValidatorContext(), "EtchValidatorString has been created");
   }
   val = Validators(runtime)[ndim];
   return ETCH_OK;

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp Fri Dec  6 08:06:01 2013
@@ -19,8 +19,6 @@
 #include "serialization/EtchValidatorStructValue.h"
 #include "support/EtchRuntime.h"
 
-static char* TAG = "EtchValidatorStructValue";
-
 const EtchObjectType* EtchValidatorStructValue::TYPE() {
   const static EtchObjectType TYPE(EOTID_VALIDATOR_STRUCT_VALUE, NULL);
   return &TYPE;
@@ -42,10 +40,10 @@ EtchValidatorStructValue::~EtchValidator
 status_t EtchValidatorStructValue::validateValue(capu::SmartPointer<EtchObject> value, capu::SmartPointer<EtchObject>& result) {
   if (validate(value)) {
     result = value;
-    CAPU_LOG_TRACE(mRuntime->getLogger(), TAG, "Object has been validated");
+    ETCH_LOG_TRACE(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Struct object has been validated");
     return ETCH_OK;
   } else {
-    CAPU_LOG_WARN(mRuntime->getLogger(), TAG, "Object has not been validated");
+    ETCH_LOG_WARN(mRuntime->getLogger(), mRuntime->getLogger().getValidatorContext(), "Struct object validation failed");
     return ETCH_ERROR;
   }
 }
@@ -79,7 +77,7 @@ status_t EtchValidatorStructValue::Get(E
   if (ndim > MAX_NDIMS) {
     return ETCH_EINVAL;
   }
-  CAPU_LOG_TRACE(runtime->getLogger(), TAG, "EtchValidatorShort has been created");
+  ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getValidatorContext(), "EtchValidatorShort has been created");
   val = capu::SmartPointer <EtchValidator > (new EtchValidatorStructValue(runtime, type, ndim));
   return ETCH_OK;
 }

Modified: etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/support/EtchRemoteBase.cpp Fri Dec  6 08:06:01 2013
@@ -22,8 +22,6 @@
 #include "util/EtchLogger.h"
 #include "support/EtchStackClient.h"
 
-static char* TAG = "EtchRemoteBase";
-
 EtchRemoteBase::EtchRemoteBase(EtchRuntime* runtime, EtchDeliveryService* svc, EtchValueFactory* vf, EtchStack* stack)
   : mRuntime(runtime), mSvc(svc), mVf(vf), mStack(stack) {
 }
@@ -49,12 +47,12 @@ status_t EtchRemoteBase::send(capu::Smar
 }
 
 status_t EtchRemoteBase::begincall(capu::SmartPointer<EtchMessage> msg, EtchMailbox *&result) {
-  CAPU_LOG_DEBUG(mRuntime->getLogger(), TAG, "Begin call for the message is initiated");
+  ETCH_LOG_DEBUG(mRuntime->getLogger(), mRuntime->getLogger().getDeliveryServiceContext(), "Begin call for the message is initiated");
   return mSvc->begincall(msg, result);
 }
 
 status_t EtchRemoteBase::endcall(EtchMailbox* mb, EtchType* responseType, capu::SmartPointer<EtchObject> &result) {
-  CAPU_LOG_DEBUG(mRuntime->getLogger(), TAG, "End call for the message is initiated");
+  ETCH_LOG_DEBUG(mRuntime->getLogger(), mRuntime->getLogger().getDeliveryServiceContext(), "End call for the message is initiated");
   return mSvc->endcall(mb, responseType, result);
 }
 

Modified: etch/trunk/binding-cpp/runtime/src/main/support/EtchRuntime.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/support/EtchRuntime.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/support/EtchRuntime.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/support/EtchRuntime.cpp Fri Dec  6 08:06:01 2013
@@ -19,13 +19,17 @@
 #include "common/EtchRuntimeException.h"
 #include "support/EtchRuntime.h"
 #include "support/EtchTransportHelper.h"
-#include "util/EtchLogger.h"
+#include "capu/util/LogLevel.h"
 
 EtchRuntime::EtchRuntime()
-  : mIsClosed(false) {
+  :   mIsClosed(false)
+    , mLogger(mLogAppender)
+{
   mMutex.lock();
   mId = getNextId();
   mMutex.unlock();
+
+  mLogger.setLogLevel(capu::ELogLevel::LL_ALL);
 }
 
 EtchRuntime::~EtchRuntime() {
@@ -97,4 +101,4 @@ capu::uint64_t EtchRuntime::getNextId() 
 
 EtchLogger& EtchRuntime::getLogger() {
   return mLogger;
-}
+}
\ No newline at end of file

Modified: etch/trunk/binding-cpp/runtime/src/main/support/EtchTransportHelper.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/support/EtchTransportHelper.cpp?rev=1548398&r1=1548397&r2=1548398&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/support/EtchTransportHelper.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/support/EtchTransportHelper.cpp Fri Dec  6 08:06:01 2013
@@ -64,7 +64,7 @@ status_t EtchTransportHelper::InitResour
     resources->put( EtchTransportHelper::FREE_POOL(), obj, objOld);
   }
   result = resources;
-  CAPU_LOG_TRACE(runtime->getLogger(), "EtchTransportHelper", "Resources and pools have been allocated initialized");
+  ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getRuntimeContext(), "Resources and pools have been allocated initialized");
 
   return ETCH_OK;
 }
@@ -98,7 +98,7 @@ status_t EtchTransportHelper::DestroyRes
 
     //delete resource
     delete resources;
-    CAPU_LOG_TRACE(runtime->getLogger(), "EtchTransportHelper", "Resources and pools have been deallocated");
+    ETCH_LOG_TRACE(runtime->getLogger(), runtime->getLogger().getRuntimeContext(), "Resources and pools have been deallocated");
     return ETCH_OK;
   }
 }



Mime
View raw message