OSS clean-up:

- rename ARIA SDK to MAT / 1DS
- add MIT license to public headers

Solutions/net40/dllmain.cpp

@@ -23,8 +23,8 @@ HRESULT __stdcall DllCanUnloadNow(void)
 void LockInMemory()
 {
 #ifndef _WINRT_DLL
-    HMODULE ariaModule;
-    ::GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_PIN, L"ClientTelemetry.dll", &ariaModule);
+    HMODULE mstelModule;
+    ::GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_PIN, L"ClientTelemetry.dll", &mstelModule);
 #endif
 }
 

azure-pipelines.yml

@@ -1,7 +1,7 @@
 resources:
 - repo: self
 queue:
-  name: aria-sdk-cpp
+  name: mstel-sdk-cpp
 steps:
 
 - task: CmdLine@1

docs/PAL.md

@@ -11,7 +11,7 @@ Platform Abstraction Layer
 
 #### Lifetime
 
--   The whole ARIA client library must be initialized by the application
+-   The whole 1DS client library must be initialized by the application
     before the first call to any of its other API methods, and shut down
     after no more API calls can be performed.
 -   The PAL has similar lifetime scope -- `PAL::initialize()` will be

docs/cpp-start-macosx.md

@@ -87,5 +87,5 @@ logging system by adding the following statements to your main() function.
 *You're done! You can now compile and run your app, and it will send a telemetry event.*
 
 
- _**Note:** If you need a deeper look into how to use the 1DS C++ SDK there is a couple of folders with examples under Aria.SDK.Cpp/examples_
+ _**Note:** If you need a deeper look into how to use the 1DS C++ SDK there is a couple of folders with examples under `examples`_
 

docs/cppDoxygenConfig

@@ -2060,10 +2060,9 @@ INCLUDE_FILE_PATTERNS  =
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             = _WIN32														\
-                        ARIASDK_LIBABI=													\
-			ARIASDK_NS_BEGIN=Microsoft { namespace Applications { namespace Events						\
-			ARIASDK_NS_END=}}												\
-			ARIASDK_NS=Microsoft::Applications::Events									\
+                        MATSDK_LIBABI=													\
+			MAT_NS_BEGIN=Microsoft { namespace Applications { namespace Events						\
+			MAT_NS_END=}}													\
 			MAT=Microsoft::Applications::Events										\
 			PAL_NS_BEGIN=Microsoft { namespace Applications { namespace Events { namespace PlatformAbstraction		\
 			PAL_NS_END=}}}													\

examples/c/SampleC-Guest/CMakeLists.txt

@@ -23,7 +23,7 @@ find_package (Threads)
 
 set(MATSDK_INCLUDE	/usr/local/include/mat)
 
-# Aria SDK to include dirs
+# 1DS SDK to include dirs
 include_directories( . ${MATSDK_INCLUDE} )
 
 # Link main.cpp to executable

examples/c/SampleC-Guest/demo.c

@@ -25,12 +25,12 @@ void test_c_api_guest()
         "\"maxTeardownUploadTimeInSec\":5,"           // Allow up to 5 seconds for upload
         "\"hostMode\":false,"                         // Explicitly declare yourself as guest
         "\"minimumTraceLevel\":0,"                    // Debug printout level
-        "\"sdkmode\":0"                               // Aria direct-upload mode
+        "\"sdkmode\":0"                               // 1DS direct-upload mode
     "}";
 
     // Attemppt to load an alternate impl if available
 #ifdef _WIN32
-    evt_load((evt_handle_t)LoadLibrary(L"MsoAriaNext.dll"));
+    evt_load((evt_handle_t)LoadLibrary(L"ClientTelemetry2.dll"));
 #endif
 
     evt_handle_t handle = evt_open(config);

examples/cpp/EventSender/CMakeLists.txt

@@ -23,7 +23,7 @@ find_package (Threads)
 
 set(MAT_SDK_INCLUDE	/usr/local/include/mat)
 
-# Aria SDK to include dirs
+# 1DS SDK to include dirs
 include_directories( . ${MAT_SDK_INCLUDE} )
 
 # Link main.cpp to executable

examples/cpp/MacProxy/CMakeLists.txt

@@ -23,7 +23,7 @@ find_package (Threads)
 
 set(MAT_SDK_INCLUDE	/usr/local/include/mat)
 
-# Aria SDK to include dirs
+# 1DS SDK to include dirs
 include_directories( . ${MAT_SDK_INCLUDE} )
 
 # Link main.cpp to executable

examples/cpp/SampleCpp/CMakeLists.txt

@@ -23,7 +23,7 @@ find_package (Threads)
 
 set(MAT_SDK_INCLUDE	/usr/local/include/mat)
 
-# Aria SDK to include dirs
+# 1DS SDK to include dirs
 include_directories( . ${MAT_SDK_INCLUDE} )
 
 # Link main.cpp to executable

examples/cpp/SampleCpp/LogManagerA.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "LogManager.hpp"
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
     class ModuleA : public ILogConfiguration {};
     class LogManagerA : public LogManagerBase<ModuleA> {};
     DEFINE_LOGMANAGER(LogManagerA, ModuleA);
-} ARIASDK_NS_END
+} MAT_NS_END

examples/cpp/SampleCpp/LogManagerB.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "LogManager.hpp"
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
     class ModuleB : public ILogConfiguration {};
     class LogManagerB : public LogManagerBase<ModuleB> {};
     DEFINE_LOGMANAGER(LogManagerB, ModuleB);
-} ARIASDK_NS_END
+} MAT_NS_END

examples/cpp/SampleCppLogManagers/LogManagerA.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include "LogManager.hpp"
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
     class ModuleA : public ILogConfiguration {};
     class LogManagerA : public LogManagerBase<ModuleA> {};
-} ARIASDK_NS_END
+} MAT_NS_END

examples/cpp/SampleCppLogManagers/LogManagerB.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include "LogManager.hpp"
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
     class ModuleB : public ILogConfiguration {};
     class LogManagerB : public LogManagerBase<ModuleB> {};
-} ARIASDK_NS_END
+} MAT_NS_END

examples/cpp/SampleCppLogManagers/main.cpp

@@ -10,10 +10,10 @@ using namespace MAT;
 // Define two instances for different LogManagers: A and B
 // This is how it's done with LOGMANAGER_INSTANCE macro to define the
 // default LogManager instance
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
     DEFINE_LOGMANAGER(LogManagerB, ModuleB);
     DEFINE_LOGMANAGER(LogManagerA, ModuleA);
-} ARIASDK_NS_END
+} MAT_NS_END
 
 void twoModules_LogManagerTest() 
 {

examples/cpp/SampleCppMini/CMakeLists.txt

@@ -23,7 +23,7 @@ find_package (Threads)
 
 set(MAT_SDK_INCLUDE	/usr/local/include/aria)
 
-# Aria SDK to include dirs
+# 1DS SDK to include dirs
 include_directories( . ${MAT_SDK_INCLUDE} )
 
 # Link main.cpp to executable

examples/objc/cocoa-app/CMakeLists.txt

@@ -17,7 +17,7 @@ find_package (Threads)
 
 set(MATSDK_INCLUDE	/usr/local/include/mat)
 
-# Aria SDK to include dirs
+# 1DS SDK to include dirs
 include_directories( . ${MATSDK_INCLUDE} )
 
 # Prefer linking to more recent local sqlite3

lib/CMakeLists.txt

@@ -138,7 +138,7 @@ elseif(PAL_IMPLEMENTATION STREQUAL "WIN32")
 # Win32 Desktop for now.
 # TODO: define a separate PAL for Win10 cmake build
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../zlib ${CMAKE_CURRENT_SOURCE_DIR}/../sqlite)
-add_definitions(-D_UNICODE -DUNICODE -DZLIB_WINAPI -DWIN32 -DARIASDK_PLATFORM_WINDOWS=1 -DARIASDK_SHARED_LIB=1 -D_ARIA_UTC_SDK -D_CRT_SECURE_NO_WARNINGS -DUSE_BOND -D_WINDOWS -D_USRDLL -DWINVER=_WIN32_WINNT_WIN7)
+add_definitions(-D_UNICODE -DUNICODE -DZLIB_WINAPI -DWIN32 -DMATSDK_PLATFORM_WINDOWS=1 -DMATSDK_SHARED_LIB=1 -D_UTC_SDK -D_CRT_SECURE_NO_WARNINGS -DUSE_BOND -D_WINDOWS -D_USRDLL -DWINVER=_WIN32_WINNT_WIN7)
 remove_definitions(-D_MBCS)
   list(APPEND SRCS
     http/HttpClient_WinInet.cpp

lib/api/AllowedLevelsCollection.cpp

@@ -2,7 +2,7 @@
 
 #include "AllowedLevelsCollection.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     AllowedLevelsCollection::AllowedLevelsCollection(std::initializer_list<uint8_t>&& allowedLevels) noexcept
         : m_allowedLevels(allowedLevels)
@@ -32,4 +32,4 @@ namespace ARIASDK_NS_BEGIN
         m_allowedLevels = levels;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/AllowedLevelsCollection.hpp

@@ -10,7 +10,7 @@
 #include "Version.hpp"
 #include "ctmacros.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
 
     class AllowedLevelsCollection
@@ -30,6 +30,6 @@ namespace ARIASDK_NS_BEGIN
         std::vector<uint8_t> m_allowedLevels;
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif // ALLOWEDLEVELSCOLLECTION_HPP

lib/api/AuthTokensController.cpp

@@ -4,7 +4,7 @@
 #include "ILogManager.hpp"
 #include "utils/Utils.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     MATSDK_LOG_INST_COMPONENT_CLASS(AuthTokensController, "EventsSDK.AuthTokensController", "Events telemetry client - AuthTokensController class");
 
@@ -73,4 +73,4 @@ namespace ARIASDK_NS_BEGIN {
         return m_userTokens;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/AuthTokensController.hpp

@@ -11,7 +11,7 @@
 #include <vector>
 
 // *INDENT-OFF*
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     /// <summary>
     /// This class is used to manage the Auth Tokens
@@ -78,6 +78,6 @@ namespace ARIASDK_NS_BEGIN
     };
 
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/api/ContextFieldsProvider.cpp

@@ -6,7 +6,7 @@
 
 #include "utils/Utils.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
 
     ContextFieldsProvider::ContextFieldsProvider()
@@ -463,4 +463,4 @@ namespace ARIASDK_NS_BEGIN
         return m_customContextFields;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/ContextFieldsProvider.hpp

@@ -12,7 +12,7 @@
 #include <string>
 #include <cassert>
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     // TODO: [MG] - A/B EXP code has to be refactored into separate module
 
@@ -53,5 +53,5 @@ namespace ARIASDK_NS_BEGIN
     };
 
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/api/CorrelationVector.cpp

@@ -9,7 +9,7 @@ using std::string;
 using std::mutex;
 using std::vector;
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     // Note: CV spec reserves the last character for the "!" suffix identifying sealed values.
     // This effectively means we have one less character to use.
@@ -313,4 +313,4 @@ namespace ARIASDK_NS_BEGIN
         return true;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/DataViewerCollection.cpp

@@ -2,7 +2,7 @@
 #include <algorithm>
 #include <mutex>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     MATSDK_LOG_INST_COMPONENT_CLASS(DataViewerCollection, "EventsSDK.DataViewerCollection", "Microsoft Telemetry Client - DataViewerCollection class");
 
@@ -108,4 +108,4 @@ namespace ARIASDK_NS_BEGIN {
 
         return nullptr;
     }
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/DataViewerCollection.hpp

@@ -9,7 +9,7 @@
 #include <mutex>
 #include <vector>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     class DataViewerCollection : public IDataViewerCollection
     {
@@ -39,6 +39,6 @@ namespace ARIASDK_NS_BEGIN {
         std::vector<std::shared_ptr<IDataViewer>> m_dataViewerCollection;
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/api/ILogConfiguration.cpp

@@ -1,6 +1,6 @@
 #include "ILogConfiguration.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     ILogConfiguration::ILogConfiguration(const std::initializer_list<std::pair<const std::string, Variant>>& initList)
         : m_configs(initList) { }
@@ -35,4 +35,4 @@ namespace ARIASDK_NS_BEGIN
         return m_configs;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/IRuntimeConfig.hpp

@@ -10,7 +10,7 @@
 #include <string>
 #include <map>
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     ///@cond INTERNAL_DOCS
 
@@ -188,5 +188,5 @@ namespace ARIASDK_NS_BEGIN
 
     /// @endcond
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/api/LogConfiguration.cpp

@@ -6,7 +6,7 @@
 using json = nlohmann::json;
 #endif
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     static ILogConfiguration currentConfig {
         { CFG_INT_TRACE_LEVEL_MIN,          ACTTraceLevel::ACTTraceLevel_Error },
@@ -118,4 +118,4 @@ namespace ARIASDK_NS_BEGIN {
         return result;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/LogManager.cpp

@@ -8,7 +8,7 @@
 
 using namespace std;
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     class ModuleConfig : ILogConfiguration
     {
@@ -20,6 +20,6 @@ namespace ARIASDK_NS_BEGIN {
     
 DEFINE_LOGMANAGER(LogManager, ModuleConfig);
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/api/LogManagerFactory.cpp

@@ -13,7 +13,7 @@
 
 #include <ctime>
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     // This mutex has to be recursive because we allow both
     // Destroy and destrutor to lock it. destructor could be
@@ -250,4 +250,4 @@ namespace ARIASDK_NS_BEGIN
     }
 
 }
-ARIASDK_NS_END
+MAT_NS_END

lib/api/LogManagerFactory.hpp

@@ -12,7 +12,7 @@
 #include <string>
 #include <vector>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     constexpr const char* ANYHOST = "*";
 
@@ -129,6 +129,6 @@ namespace ARIASDK_NS_BEGIN {
 
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/api/LogManagerImpl.cpp

@@ -42,7 +42,7 @@
 #endif
 #endif  // HAVE_MAT_DEFAULT_FILTER
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     void DeadLoggers::AddMap(LoggerMap&& source)
     {
@@ -726,4 +726,4 @@ namespace ARIASDK_NS_BEGIN
     }
 
 }
-ARIASDK_NS_END
+MAT_NS_END

lib/api/LogManagerImpl.hpp

@@ -31,7 +31,7 @@
 #include <mutex>
 #include <set>
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     class ITelemetrySystem;
 
@@ -325,6 +325,6 @@ namespace ARIASDK_NS_BEGIN
     };
 
 }
-ARIASDK_NS_END
+MAT_NS_END
 
 #endif

lib/api/LogManagerProvider.cpp

@@ -2,7 +2,7 @@
 
 #include "LogManagerFactory.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     ILogManager * LogManagerProvider::Get(
         ILogConfiguration & config,
@@ -40,4 +40,4 @@ namespace ARIASDK_NS_BEGIN {
         return LogManagerFactory::Release(config);
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/api/LogSessionData.cpp

@@ -14,7 +14,7 @@
 
 using namespace std;
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     inline void remove_eol(string& result)
     {
@@ -97,5 +97,5 @@ namespace ARIASDK_NS_BEGIN {
        return false;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END
 

lib/api/Logger.cpp

@@ -11,7 +11,7 @@
 
 using namespace MAT;
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     class ActiveLoggerCall
     {
@@ -929,4 +929,4 @@ namespace ARIASDK_NS_BEGIN
         }
     }
 }
-ARIASDK_NS_END
+MAT_NS_END

lib/api/Logger.hpp

@@ -21,7 +21,7 @@
 
 #include "filter/EventFilterCollection.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     class BaseDecorator;
     class ILogManagerInternal;
@@ -284,6 +284,6 @@ namespace ARIASDK_NS_BEGIN
         friend class ActiveLoggerCall;
     };
 }
-ARIASDK_NS_END
+MAT_NS_END
 
 #endif

lib/backoff/Backoff_ExponentialWithJitter.hpp

@@ -9,7 +9,7 @@
 #include <assert.h>
 #include <math.h>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 
 /// <summary>
@@ -99,5 +99,5 @@ private:
 };
 
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/backoff/IBackoff.cpp

@@ -4,7 +4,7 @@
 #include "Backoff_ExponentialWithJitter.hpp"
 #include <sstream>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 
 std::unique_ptr<IBackoff> IBackoff::createFromConfig(std::string const& config)
@@ -38,4 +38,4 @@ std::unique_ptr<IBackoff> IBackoff::createFromConfig(std::string const& config)
 }
 
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/backoff/IBackoff.hpp

@@ -7,7 +7,7 @@
 #include <memory>
 #include <string>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 
 /// <summary>
@@ -43,5 +43,5 @@ class IBackoff {
 };
 
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/bond/BondSerializer.cpp

@@ -7,7 +7,7 @@
 #include "bond/generated/CsProtocol_readers.hpp"
 #include "oacr.h"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     bool BondSerializer::handleSerialize(IncomingEventContextPtr const& ctx)
     {
@@ -25,4 +25,4 @@ namespace ARIASDK_NS_BEGIN {
         return true;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/bond/BondSerializer.hpp

@@ -4,7 +4,7 @@
 #include "system/Contexts.hpp"
 #include "system/Route.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 
 class BondSerializer {
@@ -16,4 +16,4 @@ class BondSerializer {
 };
 
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/bwcontrol/BandwidthController_ResourceManager.cpp

@@ -3,7 +3,7 @@
 #include "BandwidthController_ResourceManager.hpp"
 #include "ResourceManager/RMPublic_BitStream.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 
 BandwidthController_ResourceManager::BandwidthController_ResourceManager(::resource_manager2::ResourceManagerPtr const& rm)
@@ -55,4 +55,4 @@ unsigned BandwidthController_ResourceManager::GetProposedBandwidthBps()
 }
 
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/bwcontrol/BandwidthController_ResourceManager.hpp

@@ -4,7 +4,7 @@
 #include "aria/IBandwidthController.hpp"
 #include "ResourceManager/ResourceManagerPublic.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 
 class BandwidthController_ResourceManager : public IBandwidthController
@@ -21,4 +21,4 @@ class BandwidthController_ResourceManager : public IBandwidthController
 };
 
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/callbacks/DebugSource.cpp

@@ -5,7 +5,7 @@
 
 #include <atomic>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     /// <summary>Add event listener for specific debug event type.</summary>
     void DebugEventSource::AddEventListener(DebugEventType type, DebugEventListener &listener)
@@ -79,4 +79,4 @@ namespace ARIASDK_NS_BEGIN {
         return (cascaded.erase(&other)!=0);
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/compression/HttpDeflateCompression.cpp

@@ -8,7 +8,7 @@
 #include <zlib.h>
 #endif
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 
     HttpDeflateCompression::HttpDeflateCompression(IRuntimeConfig& runtimeConfig)
@@ -87,4 +87,4 @@ namespace ARIASDK_NS_BEGIN {
     }
 
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/compression/HttpDeflateCompression.hpp

@@ -6,7 +6,7 @@
 #include "system/Route.hpp"
 #include "system/Contexts.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 
     class HttpDeflateCompression {
@@ -25,4 +25,4 @@ namespace ARIASDK_NS_BEGIN {
         RoutePassThrough<HttpDeflateCompression, EventsUploadContextPtr const&> compress{ this, &HttpDeflateCompression::handleCompress };
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/config/RuntimeConfig_Default.hpp

@@ -4,7 +4,7 @@
 #pragma once
 #include "api/IRuntimeConfig.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     static ILogConfiguration defaultRuntimeConfig{
         {CFG_INT_TRACE_LEVEL_MIN, ACTTraceLevel::ACTTraceLevel_Error},
@@ -191,4 +191,4 @@ namespace ARIASDK_NS_BEGIN
     };
 
 }
-ARIASDK_NS_END
+MAT_NS_END

lib/decoder/PayloadDecoder.cpp

@@ -534,7 +534,7 @@ namespace clienttelemetry {
 
 using namespace clienttelemetry::data::v3;
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     namespace exporters {
 
@@ -593,4 +593,4 @@ namespace ARIASDK_NS_BEGIN {
 
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/decorators/BaseDecorator.cpp

@@ -1,7 +1,7 @@
 #include "mat/config.h"
 #include "BaseDecorator.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     BaseDecorator::BaseDecorator(ILogManager& owner)
         :
@@ -68,4 +68,4 @@ namespace ARIASDK_NS_BEGIN {
         return true;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/decorators/BaseDecorator.hpp

@@ -13,7 +13,7 @@
 #include "system/ITelemetrySystem.hpp"
 #include "utils/Utils.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
 
     class BaseDecorator : public IDecorator
@@ -126,6 +126,6 @@ namespace ARIASDK_NS_BEGIN
 
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/decorators/EventPropertiesDecorator.hpp

@@ -11,7 +11,7 @@
 #include <map>
 #include <string>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 // Bit remapping has to happen on bits passed via API surface.
 // Ref CS2.1+ : https://osgwiki.com/wiki/CommonSchema/flags
@@ -450,5 +450,5 @@ namespace ARIASDK_NS_BEGIN {
 
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/decorators/SemanticApiDecorators.hpp

@@ -5,7 +5,7 @@
 #include "BaseDecorator.hpp"
 #include "ILogger.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 #define RECORD_EXT      record.data[0].properties
 
@@ -290,5 +290,5 @@ namespace ARIASDK_NS_BEGIN {
 
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/decorators/SemanticContextDecorator.hpp

@@ -5,7 +5,7 @@
 #include "IDecorator.hpp"
 #include "api/ContextFieldsProvider.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
 
     class SemanticContextDecorator : public IDecorator
@@ -42,5 +42,5 @@ namespace ARIASDK_NS_BEGIN
     };
 
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/filter/EventFilterCollection.cpp

@@ -7,7 +7,7 @@
 #include <exception>
 #endif
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     void EventFilterCollection::RegisterEventFilter(std::unique_ptr<IEventFilter>&& filter)
     {
@@ -66,4 +66,4 @@ namespace ARIASDK_NS_BEGIN
         return (Size() == 0);
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/filter/EventFilterCollection.hpp

@@ -10,7 +10,7 @@
 #include <vector>
 #include <atomic>
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     class EventFilterCollection : public IEventFilterCollection
     {
@@ -28,6 +28,6 @@ namespace ARIASDK_NS_BEGIN
         std::vector<std::unique_ptr<IEventFilter>> m_filters;
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif // EVENTFILTERCOLLECTION_HPP

lib/http/HttpClientFactory.cpp

@@ -28,7 +28,7 @@
   #error The library cannot work without an HTTP client implementation.
 #endif
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     MATSDK_LOG_INST_COMPONENT_CLASS(HttpClientFactory, "EventsSDK.HttpClientFactory", "Events telemetry client - HttpClientFactory class");
 
@@ -73,7 +73,7 @@ namespace ARIASDK_NS_BEGIN {
 #error The library cannot work without an HTTP client implementation.
 #endif
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 
 #endif

lib/http/HttpClientFactory.hpp

@@ -7,7 +7,7 @@
 #include "IHttpClient.hpp"
 #include "pal/PAL.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 class HttpClientFactory
 {
@@ -18,7 +18,7 @@ private:
     MATSDK_LOG_DECL_COMPONENT_CLASS();
 };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 // TODO: [maxgolov] - remove this once there is a better way to pass HTTP client configuration
 #if defined(MATSDK_PAL_WIN32) && !defined(_WINRT_DLL)

lib/http/HttpClientManager.cpp

@@ -22,7 +22,7 @@
 // Linux and Mac OS X with libcurl require an async handler for now
 #endif
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 
     class HttpClientManager::HttpCallback : public IHttpResponseCallback
@@ -152,4 +152,4 @@ namespace ARIASDK_NS_BEGIN {
 
     // start async cancellation
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/http/HttpClientManager.hpp

@@ -10,7 +10,7 @@
 #include <list>
 #include <mutex>
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
 
 class HttpClientManager
@@ -55,4 +55,4 @@ class HttpClientManager
         std::list<HttpCallback*>  m_httpCallbacks;
 };
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/http/HttpClient_Android.cpp

@@ -5,7 +5,7 @@
 #include <sstream>
 #include <vector>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 constexpr static auto Tag = "HttpClient_Android";
 
@@ -419,7 +419,7 @@ HttpClient_Android::GetClientInstance()
 std::shared_ptr<HttpClient_Android> HttpClient_Android::s_client;
 std::string HttpClient_Android::s_cache_file_path;
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 extern "C"
 JNIEXPORT void

lib/http/HttpClient_Android.hpp

@@ -7,7 +7,7 @@
 #include <mutex>
 #include <string>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 class HttpClient_Android : public IHttpClient
 {
@@ -199,4 +199,4 @@ protected:
 
 };
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/http/HttpClient_Apple.hpp

@@ -8,7 +8,7 @@
 
 #include <string>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     class HttpClient_Apple : public IHttpClient {
     public:
@@ -28,7 +28,7 @@ namespace ARIASDK_NS_BEGIN {
         std::map<std::string, IHttpRequest*> m_requests;
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif // HTTPCLIENT_APPLE_HPP
 

lib/http/HttpClient_Apple.mm

@@ -11,7 +11,7 @@
 #include "HttpClient_Apple.hpp"
 #include "utils/Utils.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 static std::string NextReqId()
 {
@@ -220,6 +220,6 @@ void HttpClient_Apple::Add(IHttpRequest* req)
     m_requests[req->GetId()] = req;
 }
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/http/HttpClient_CAPI.cpp

@@ -6,7 +6,7 @@
 
 #include "utils/Utils.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     // Represents a single in-flight, cancellable HTTP operation
     class HttpClient_Operation
@@ -219,4 +219,4 @@ namespace ARIASDK_NS_BEGIN {
         }
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/http/HttpClient_CAPI.hpp

@@ -8,7 +8,7 @@
 
 #include <string>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     class HttpClient_CAPI : public IHttpClient {
     public:
@@ -25,6 +25,6 @@ namespace ARIASDK_NS_BEGIN {
         std::mutex        m_requestsMutex;
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif // HTTPCLIENT_CAPI_HPP

lib/http/HttpClient_Curl.cpp

@@ -12,7 +12,7 @@
 #include "utils/Utils.hpp"
 #include "HttpClient_Curl.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     static std::string NextReqId() {
         static std::atomic<uint64_t> seq(0);
@@ -134,6 +134,6 @@ namespace ARIASDK_NS_BEGIN {
         m_requests[request->GetId()] = request;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/http/HttpClient_Curl.hpp

@@ -33,7 +33,7 @@
 #undef TRACE
 #define TRACE(...)	// printf
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 /**
  * Curl-based HTTP client
@@ -520,7 +520,7 @@ protected:
 
 };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif // HAVE_MAT_DEFAULT_HTTP_CLIENT
 

lib/http/HttpClient_WinInet.cpp

@@ -17,7 +17,7 @@
 #include <vector>
 #include <oacr.h>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 class WinInetRequestWrapper
 {
@@ -557,7 +557,7 @@ bool HttpClient_WinInet::IsMsRootCheckRequired()
     return m_msRootCheck;
 }
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #pragma warning(pop)
 #endif // HAVE_MAT_DEFAULT_HTTP_CLIENT
 // clang-format on

lib/http/HttpClient_WinInet.hpp

@@ -9,7 +9,7 @@
 
 #include "ILogManager.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 #ifndef _WININET_
 typedef void* HINTERNET;
@@ -43,7 +43,7 @@ class HttpClient_WinInet : public IHttpClient {
     friend class WinInetRequestWrapper;
 };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif // HAVE_MAT_DEFAULT_HTTP_CLIENT
 

lib/http/HttpClient_WinRt.cpp

@@ -27,7 +27,7 @@ using namespace concurrency;
 using namespace Platform;
 
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     class WinRtRequestWrapper
     {
@@ -356,6 +356,6 @@ namespace ARIASDK_NS_BEGIN {
         }
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif //HAVE_MAT_DEFAULT_HTTP_CLIENT

lib/http/HttpClient_WinRt.hpp

@@ -21,7 +21,7 @@ using namespace ::Windows::Web::Http;
 using namespace ::Windows::Web::Http::Filters;
 using namespace ::Windows::Web::Http::Headers;
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 class WinRtRequestWrapper;
 
@@ -47,7 +47,7 @@ class HttpClient_WinRt : public IHttpClient {
     friend class WinRtRequestWrapper;
 };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif // HAVE_MAT_DEFAULT_HTTP_CLIENT
 

lib/http/HttpRequestEncoder.cpp

@@ -12,7 +12,7 @@
 #include "bond/generated/CsProtocol_writers.hpp"
 #include "bond/generated/CsProtocol_readers.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
 
     HttpRequestEncoder::HttpRequestEncoder(ITelemetrySystem& system, IHttpClient& httpClient)
@@ -160,4 +160,4 @@ namespace ARIASDK_NS_BEGIN {
         return true;
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/http/HttpRequestEncoder.hpp

@@ -11,7 +11,7 @@
 
 #include "IAuthTokensController.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     class HttpRequestEncoder {
     public:
@@ -36,4 +36,4 @@ namespace ARIASDK_NS_BEGIN {
     };
 
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/http/HttpResponseDecoder.cpp

@@ -11,7 +11,7 @@
 #include "json.hpp"
 #endif
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     HttpResponseDecoder::HttpResponseDecoder(ITelemetrySystem& system)
         :
@@ -231,4 +231,4 @@ namespace ARIASDK_NS_BEGIN {
 #endif
     }
 
-} ARIASDK_NS_END
+} MAT_NS_END

lib/http/HttpResponseDecoder.hpp

@@ -8,7 +8,7 @@
 #include "system/Contexts.hpp"
 #include "system/ITelemetrySystem.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     typedef enum
     {
@@ -41,5 +41,5 @@ namespace ARIASDK_NS_BEGIN {
         virtual bool DispatchEvent(DebugEvent evt) override;
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/include/mat/IBandwidthController.hpp

@@ -4,7 +4,7 @@
 
 #include "Version.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
 
     ///@cond INTERNAL_DOCS
@@ -27,5 +27,5 @@ namespace ARIASDK_NS_BEGIN
 
     /// @endcond
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/include/mat/IOfflineStorage.hpp

@@ -12,7 +12,7 @@
 #include <vector>
 #include <map>
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
     constexpr unsigned int DB_FULL_NOTIFICATION_DEFAULT_PERCENTAGE = 75;
     constexpr uint64_t     DB_FULL_CHECK_INTERVAL_DEFAULT_MS = 5000;
@@ -319,5 +319,5 @@ namespace ARIASDK_NS_BEGIN {
     };
 
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/include/public/AggregatedMetric.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef AGGREGATEDMETRIC_HPP
 #define AGGREGATEDMETRIC_HPP
 
@@ -6,7 +20,7 @@
 
 #include "ILogger.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
 
     namespace Models {
@@ -72,5 +86,5 @@ namespace ARIASDK_NS_BEGIN
 
     } // Models
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/include/public/CAPIClient.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef EVENTSCLIENT_HPP
 #define EVENTSCLIENT_HPP
 //
@@ -14,7 +28,7 @@
 #undef evt_log
 #endif
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
 
     class CAPIClient
@@ -89,6 +103,6 @@ namespace ARIASDK_NS_BEGIN
 
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/include/public/CommonFields.h

@@ -1,4 +1,18 @@
-/* Copyright (c) Microsoft. All rights reserved. */
+/*
+
+ Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+
+ This code is licensed under the MIT License (MIT).
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+*/
 #ifndef MAT_COMMONFIELDS_H
 #define MAT_COMMONFIELDS_H
 

lib/include/public/CompliantByDefaultFilterApi.hpp

@@ -1,3 +1,18 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef COMPLIANTBYDEFAULTEVENTFILTERAPI_HPP
 #define COMPLIANTBYDEFAULTEVENTFILTERAPI_HPP
 
@@ -6,11 +21,11 @@
 
 #include <vector>
 
-namespace ARIASDK_NS_BEGIN { namespace Modules { namespace Filtering
+namespace MAT_NS_BEGIN { namespace Modules { namespace Filtering
 {
 
     MATSDK_LIBABI void UpdateAllowedLevels(const std::vector<uint8_t>& allowedLevels) noexcept;
 
-}}} ARIASDK_NS_END
+}}} MAT_NS_END
 
 #endif // !COMPLIANTBYDEFAULTEVENTFILTERAPI_HPP

lib/include/public/CorrelationVector.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef CORRELATIONVECTOR_HPP
 #define CORRELATIONVECTOR_HPP
 
@@ -8,7 +22,7 @@
 #include <mutex>
 #include <string>
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     // Implementation of the Common Schema standard vector clock type.
     // Class methods are thread-safe.
@@ -142,5 +156,5 @@ namespace ARIASDK_NS_BEGIN
         size_t GetDigitCount(size_t value);
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/include/public/CsProtocol_types.hpp

@@ -1,3 +1,18 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 //------------------------------------------------------------------------------
 // This code was generated by a tool.
 //

lib/include/public/DebugEvents.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef DEBUGEVENTS_HPP
 #define DEBUGEVENTS_HPP
 
@@ -35,7 +49,7 @@ public:
 #include <cstdio>
 #include <cstdlib>
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
 
     /// <summary>
@@ -243,6 +257,6 @@ namespace ARIASDK_NS_BEGIN
 #pragma warning( pop )
 #endif
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/include/public/Enums.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef MAT_ENUMS_HPP
 #define MAT_ENUMS_HPP
 
@@ -12,7 +26,7 @@
 #include <sys/errno.h>
 #endif
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
 
     /// <summary>
@@ -563,6 +577,6 @@ namespace ARIASDK_NS_BEGIN
 
     constexpr const static unsigned gc_NumDroppedReasons = DROPPED_REASON_COUNT;
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif //EVENTPRIORITY_H

lib/include/public/EventProperties.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef EVENTPROPERTIES_HPP
 #define EVENTPROPERTIES_HPP
 
@@ -19,7 +33,7 @@
 #include "mat.h"
 #endif
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
 
     struct EventPropertiesStorage; 
@@ -349,6 +363,6 @@ namespace ARIASDK_NS_BEGIN
         EventPropertiesStorage* m_storage;
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/include/public/EventProperty.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef MAT_EVENTPROPERTY_HPP
 #define MAT_EVENTPROPERTY_HPP
 
@@ -26,7 +40,7 @@
 #endif
 #endif
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
 
     /// <summary>
@@ -518,6 +532,6 @@ namespace ARIASDK_NS_BEGIN
 
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/include/public/IAFDClient.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef IAFGCLIENT_HPP
 #define IAFGCLIENT_HPP
 

lib/include/public/IAuthTokensController.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef MAT_IAUTHTOKENS_HPP
 #define MAT_IAUTHTOKENS_HPP
 
@@ -6,7 +20,7 @@
 #include "ctmacros.hpp"
 #include "Enums.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     const char* const TICKETS_PREPEND_STRING = "1000";
 
@@ -66,6 +80,6 @@ namespace ARIASDK_NS_BEGIN
 
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif //MAT_IAUTHTOKENS_HPP

lib/include/public/IBandwidthController.hpp

@@ -1,10 +1,24 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef IBANDWIDTHCONTROLLER_HPP
 #define IBANDWIDTHCONTROLLER_HPP
 
 #include "Version.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     class IBandwidthController {
     public:
@@ -23,6 +37,6 @@ namespace ARIASDK_NS_BEGIN
         /// <returns>Proposed bandwidth in bytes per second</returns>
         virtual unsigned GetProposedBandwidthBps() = 0;
     };
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/include/public/IDataViewer.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef IDATAVIEWER_HPP
 #define IDATAVIEWER_HPP
 
@@ -9,7 +23,7 @@
 #include <string>
 #include <vector>
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     /// <summary>
     /// This interface allows SDK users to register a data viewer
@@ -42,6 +56,6 @@ namespace ARIASDK_NS_BEGIN
         virtual const std::string& GetCurrentEndpoint() const noexcept = 0;
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/include/public/IDataViewerCollection.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef IDATAVIEWERCOLLECTION_HPP
 #define IDATAVIEWERCOLLECTION_HPP
 
@@ -7,7 +21,7 @@
 
 #include <memory>
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     /// <summary>
     /// This interface allows SDK users to register a data viewer
@@ -63,6 +77,6 @@ namespace ARIASDK_NS_BEGIN
         virtual bool IsViewerRegistered(const char* viewerName) const = 0;
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif

lib/include/public/IDecorator.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef IDECORATOR_HPP
 #define IDECORATOR_HPP
 
@@ -8,7 +22,7 @@
 #include "CsProtocol_types.hpp"
 #include "ILogManager.hpp"
 
-namespace ARIASDK_NS_BEGIN {
+namespace MAT_NS_BEGIN {
 
      /// <summary>
      /// Interface that allows to decorate outgoing Common Schema protocol Record.
@@ -58,5 +72,5 @@ namespace ARIASDK_NS_BEGIN {
         }
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 #endif

lib/include/public/IECSClient.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef IECSCLIENT_HPP
 #define IECSCLIENT_HPP
 

lib/include/public/IEventFilter.hpp

@@ -1,11 +1,25 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef IEVENTFILTER_HPP
 #define IEVENTFILTER_HPP
 
 #include "Version.hpp"
 #include "EventProperties.hpp"
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     /// <summary>
     /// Interface describing a generic filter for events.
@@ -30,6 +44,6 @@ namespace ARIASDK_NS_BEGIN
         virtual bool CanEventPropertiesBeSent(const EventProperties& properties) const noexcept = 0;
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif // IEVENTFILTER_HPP

lib/include/public/IEventFilterCollection.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef IEVENTFILTERCOLLECTION_HPP
 #define IEVENTFILTERCOLLECTION_HPP
 
@@ -7,7 +21,7 @@
 
 #include <memory>
 
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     /// <summary>
     /// Inerface providing registration and unregistration functions for IEventFilters
@@ -61,6 +75,6 @@ namespace ARIASDK_NS_BEGIN
         virtual bool Empty() const noexcept = 0;
     };
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif // IEVENTFILTERCOLLECTION_HPP

lib/include/public/IHttpClient.hpp

@@ -1,4 +1,18 @@
-// Copyright (c) Microsoft. All rights reserved.
+///////////////////////////////////////////////////////////////////////////////
+//
+// Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+//
+// This code is licensed under the MIT License (MIT).
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////
 #ifndef IHTTPCLIENT_HPP
 #define IHTTPCLIENT_HPP
 
@@ -13,7 +27,7 @@
 #include <vector>
 
 ///@cond INTERNAL_DOCS
-namespace ARIASDK_NS_BEGIN
+namespace MAT_NS_BEGIN
 {
     /// <summary>
     /// The HttpHeaders class contains a set of HTTP headers.
@@ -544,6 +558,6 @@ namespace ARIASDK_NS_BEGIN
 
     /// @endcond
 
-} ARIASDK_NS_END
+} MAT_NS_END
 
 #endif