diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f7cd30a..da6663a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 3.3) project(NanoServicesRDK) -find_package(WPEFramework) +find_package(Thunder) option(PLUGIN_DEVICEIDENTIFICATION "Include DeviceIdentification plugin" OFF) option(PLUGIN_DEVICEINFO "Include DeviceInfo plugin" OFF) diff --git a/DeviceIdentification/CMakeLists.txt b/DeviceIdentification/CMakeLists.txt index a0ad2b68..746504c0 100644 --- a/DeviceIdentification/CMakeLists.txt +++ b/DeviceIdentification/CMakeLists.txt @@ -19,7 +19,7 @@ project(DeviceIdentification) cmake_minimum_required(VERSION 3.3) -find_package(WPEFramework) +find_package(Thunder) project_version(1.0.0) diff --git a/DeviceIdentification/DeviceIdentification.cpp b/DeviceIdentification/DeviceIdentification.cpp index c27dc799..31c5dd83 100644 --- a/DeviceIdentification/DeviceIdentification.cpp +++ b/DeviceIdentification/DeviceIdentification.cpp @@ -21,7 +21,7 @@ #include "IdentityProvider.h" #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { namespace { @@ -202,4 +202,4 @@ namespace Plugin { } } } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/DeviceIdentification/DeviceIdentification.h b/DeviceIdentification/DeviceIdentification.h index c3449b22..32146f7f 100644 --- a/DeviceIdentification/DeviceIdentification.h +++ b/DeviceIdentification/DeviceIdentification.h @@ -22,7 +22,7 @@ #include "Module.h" #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class DeviceIdentification : public PluginHost::IPlugin, public PluginHost::JSONRPC { @@ -108,4 +108,4 @@ namespace Plugin { }; } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/DeviceIdentification/DeviceIdentificationJsonRpc.cpp b/DeviceIdentification/DeviceIdentificationJsonRpc.cpp index 4d8b7bd8..4ef272af 100644 --- a/DeviceIdentification/DeviceIdentificationJsonRpc.cpp +++ b/DeviceIdentification/DeviceIdentificationJsonRpc.cpp @@ -19,7 +19,7 @@ #include "DeviceIdentification.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { diff --git a/DeviceIdentification/Implementation/Amlogic/Amlogic.cpp b/DeviceIdentification/Implementation/Amlogic/Amlogic.cpp index d4a128f8..08810402 100644 --- a/DeviceIdentification/Implementation/Amlogic/Amlogic.cpp +++ b/DeviceIdentification/Implementation/Amlogic/Amlogic.cpp @@ -2,7 +2,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class DeviceImplementation : public PluginHost::ISubSystem::IIdentifier { static constexpr const TCHAR* ChipsetInfo= _T("T962X3"); diff --git a/DeviceIdentification/Implementation/Broadcom/Broadcom.cpp b/DeviceIdentification/Implementation/Broadcom/Broadcom.cpp index d1426f23..90b2bd20 100644 --- a/DeviceIdentification/Implementation/Broadcom/Broadcom.cpp +++ b/DeviceIdentification/Implementation/Broadcom/Broadcom.cpp @@ -21,7 +21,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class DeviceImplementation : public PluginHost::ISubSystem::IIdentifier { diff --git a/DeviceIdentification/Implementation/Linux/Linux.cpp b/DeviceIdentification/Implementation/Linux/Linux.cpp index a78db49b..ef1cd044 100644 --- a/DeviceIdentification/Implementation/Linux/Linux.cpp +++ b/DeviceIdentification/Implementation/Linux/Linux.cpp @@ -23,7 +23,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class DeviceImplementation : public PluginHost::ISubSystem::IIdentifier, public Exchange::IConfiguration { private: @@ -51,7 +51,7 @@ namespace Plugin { }; private: - class AdapterObserver : public WPEFramework::Core::AdapterObserver::INotification { + class AdapterObserver : public Thunder::Core::AdapterObserver::INotification { public: static int32_t constexpr WaitTime = 5000; //Just wait for 5 seconds diff --git a/DeviceIdentification/Implementation/MFR/MFR.cpp b/DeviceIdentification/Implementation/MFR/MFR.cpp index 07d8cf46..d4c20bef 100644 --- a/DeviceIdentification/Implementation/MFR/MFR.cpp +++ b/DeviceIdentification/Implementation/MFR/MFR.cpp @@ -25,7 +25,7 @@ extern "C" { #include } -namespace WPEFramework { +namespace Thunder { namespace Plugin { class DeviceImplementation : public PluginHost::ISubSystem::IIdentifier { diff --git a/DeviceIdentification/Implementation/RPI/RPI.cpp b/DeviceIdentification/Implementation/RPI/RPI.cpp index cfcfb57a..7e101c56 100644 --- a/DeviceIdentification/Implementation/RPI/RPI.cpp +++ b/DeviceIdentification/Implementation/RPI/RPI.cpp @@ -22,7 +22,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class DeviceImplementation : public PluginHost::ISubSystem::IIdentifier { @@ -92,7 +92,7 @@ namespace Plugin { } inline void UpdateDeviceIdentifier(string& identifier) const { - WPEFramework::Core::File serialFile(SerialInfoPath); + Thunder::Core::File serialFile(SerialInfoPath); if (serialFile.Open(true) == true) { uint8_t* serialInfo = static_cast(ALLOCA(serialFile.Size())); uint32_t size = serialFile.Read(serialInfo, static_cast(serialFile.Size())); diff --git a/DeviceIdentification/Implementation/Realtek/Realtek.cpp b/DeviceIdentification/Implementation/Realtek/Realtek.cpp index 1aa1ae20..f01776e6 100644 --- a/DeviceIdentification/Implementation/Realtek/Realtek.cpp +++ b/DeviceIdentification/Implementation/Realtek/Realtek.cpp @@ -20,7 +20,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class DeviceImplementation : public PluginHost::ISubSystem::IIdentifier { diff --git a/DeviceIdentification/doc/DeviceIdentificationPlugin.md b/DeviceIdentification/doc/DeviceIdentificationPlugin.md index 92d00c40..3a3843a9 100644 --- a/DeviceIdentification/doc/DeviceIdentificationPlugin.md +++ b/DeviceIdentification/doc/DeviceIdentificationPlugin.md @@ -54,7 +54,7 @@ The table below provides and overview of terms and abbreviations used in this do | [HTTP](http://www.w3.org/Protocols) | HTTP specification | | [JSON-RPC](https://www.jsonrpc.org/specification) | JSON-RPC 2.0 specification | | [JSON](http://www.json.org/) | JSON specification | -| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20WPEFramework.docx) | Thunder API Reference | +| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20Thunder.docx) | Thunder API Reference | # Description diff --git a/DeviceInfo/CMakeLists.txt b/DeviceInfo/CMakeLists.txt index f851b538..93092b2b 100644 --- a/DeviceInfo/CMakeLists.txt +++ b/DeviceInfo/CMakeLists.txt @@ -19,7 +19,7 @@ project(DeviceInfo) cmake_minimum_required(VERSION 3.3) -find_package(WPEFramework) +find_package(Thunder) project_version(1.0.0) diff --git a/DeviceInfo/DeviceInfo.cpp b/DeviceInfo/DeviceInfo.cpp index cad1784d..61668081 100644 --- a/DeviceInfo/DeviceInfo.cpp +++ b/DeviceInfo/DeviceInfo.cpp @@ -19,7 +19,7 @@ #include "DeviceInfo.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { namespace { @@ -203,7 +203,7 @@ namespace Plugin { void DeviceInfo::AddressInfo(Core::JSON::ArrayType& addressInfo) const { - // Get the point of entry on WPEFramework.. + // Get the point of entry on Thunder.. Core::AdapterIterator interfaces; while (interfaces.Next() == true) { @@ -314,7 +314,7 @@ namespace Plugin { while (audioIt->Next(audioOutput)) { JsonData::DeviceInfo::DeviceaudiocapabilitiesData::AudiooutputcapabilitiesData audiocapabilities; audiocapabilities.AudioPort = - static_cast(audioOutput); + static_cast(audioOutput); AudioCapabilities(audioOutput, audiocapabilities.Audiocapabilities); Ms12Capabilities(audioOutput, audiocapabilities.Ms12capabilities); @@ -413,7 +413,7 @@ namespace Plugin { while (videoIt->Next(videoOutput) == true) { JsonData::DeviceInfo::DevicevideocapabilitiesData::VideooutputcapabilitiesData videocapabilities; videocapabilities.VideoDisplay = - static_cast(videoOutput); + static_cast(videoOutput); Hdcp(videoOutput, videocapabilities.Hdcp); @@ -500,4 +500,4 @@ namespace Plugin { } } } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/DeviceInfo/DeviceInfo.h b/DeviceInfo/DeviceInfo.h index a438e172..dd86247e 100644 --- a/DeviceInfo/DeviceInfo.h +++ b/DeviceInfo/DeviceInfo.h @@ -24,7 +24,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class DeviceInfo : public PluginHost::IPlugin, public PluginHost::IWeb, public PluginHost::JSONRPC { @@ -245,6 +245,6 @@ namespace Plugin { }; } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder #endif // DEVICEINFO_DEVICEINFO_H diff --git a/DeviceInfo/DeviceInfoImplementation.cpp b/DeviceInfo/DeviceInfoImplementation.cpp index 78e35762..4bf234ad 100644 --- a/DeviceInfo/DeviceInfoImplementation.cpp +++ b/DeviceInfo/DeviceInfoImplementation.cpp @@ -1,6 +1,6 @@ #include "DeviceInfoImplementation.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { SERVICE_REGISTRATION(DeviceInfoImplementation, 1, 0) diff --git a/DeviceInfo/DeviceInfoImplementation.h b/DeviceInfo/DeviceInfoImplementation.h index 03a697a7..a1de13f3 100644 --- a/DeviceInfo/DeviceInfoImplementation.h +++ b/DeviceInfo/DeviceInfoImplementation.h @@ -3,7 +3,7 @@ #include "Module.h" #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class DeviceInfoImplementation : public Exchange::IDeviceInfo, public Exchange::IDeviceAudioCapabilities, @@ -237,5 +237,5 @@ namespace Plugin { string _sku; string _platformName; }; -} //namespace WPEFramework +} //namespace Thunder } //namespace Plugin diff --git a/DeviceInfo/DeviceInfoJsonRpc.cpp b/DeviceInfo/DeviceInfoJsonRpc.cpp index fe1870d4..8e02d9e6 100644 --- a/DeviceInfo/DeviceInfoJsonRpc.cpp +++ b/DeviceInfo/DeviceInfoJsonRpc.cpp @@ -21,7 +21,7 @@ #include "DeviceInfo.h" #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { diff --git a/DeviceInfo/DeviceInfoPlugin.json b/DeviceInfo/DeviceInfoPlugin.json index d4f7b12c..080697c3 100644 --- a/DeviceInfo/DeviceInfoPlugin.json +++ b/DeviceInfo/DeviceInfoPlugin.json @@ -3,7 +3,7 @@ "info": { "title": "Device Info Plugin", "callsign": "DeviceInfo", - "locator": "libWPEFrameworkDeviceInfo.so", + "locator": "libThunderDeviceInfo.so", "status": "production", "description": "The DeviceInfo plugin allows retrieving of various device-related information.", "version": "1.0" diff --git a/DeviceInfo/doc/DeviceInfoPlugin.md b/DeviceInfo/doc/DeviceInfoPlugin.md index 775944a0..5db8e499 100644 --- a/DeviceInfo/doc/DeviceInfoPlugin.md +++ b/DeviceInfo/doc/DeviceInfoPlugin.md @@ -56,7 +56,7 @@ The table below provides and overview of terms and abbreviations used in this do | [HTTP](http://www.w3.org/Protocols) | HTTP specification | | [JSON-RPC](https://www.jsonrpc.org/specification) | JSON-RPC 2.0 specification | | [JSON](http://www.json.org/) | JSON specification | -| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20WPEFramework.docx) | Thunder API Reference | +| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20Thunder.docx) | Thunder API Reference | # Description @@ -74,7 +74,7 @@ The table below lists configuration options of the plugin. | :-------- | :-------- | :-------- | | callsign | string | Plugin instance name (default: *DeviceInfo*) | | classname | string | Class name: *DeviceInfo* | -| locator | string | Library name: *libWPEFrameworkDeviceInfo.so* | +| locator | string | Library name: *libThunderDeviceInfo.so* | | startmode | string | Determines if the plugin shall be started automatically along with the framework | | hdr | boolean | Does the device support HDR (true or false) | | atmos | boolean | Does the device support Dolby Atmos (true or false) | diff --git a/DisplayInfo/CMakeLists.txt b/DisplayInfo/CMakeLists.txt index 54163896..7da185a8 100644 --- a/DisplayInfo/CMakeLists.txt +++ b/DisplayInfo/CMakeLists.txt @@ -19,7 +19,7 @@ project(DisplayInfo) cmake_minimum_required(VERSION 3.3) -find_package(WPEFramework) +find_package(Thunder) project_version(1.0.0) diff --git a/DisplayInfo/DeviceSettings/Broadcom/SoC_abstraction.cpp b/DisplayInfo/DeviceSettings/Broadcom/SoC_abstraction.cpp index ca2e35a4..847f7b9c 100644 --- a/DisplayInfo/DeviceSettings/Broadcom/SoC_abstraction.cpp +++ b/DisplayInfo/DeviceSettings/Broadcom/SoC_abstraction.cpp @@ -35,7 +35,7 @@ #define PROC_BRCM_DISPLAY_PATH "/proc/brcm/display" using namespace std; -using namespace WPEFramework; +using namespace Thunder; /** * Sanitizeline diff --git a/DisplayInfo/DeviceSettings/PlatformImplementation.cpp b/DisplayInfo/DeviceSettings/PlatformImplementation.cpp index d14241cb..eebe80c6 100644 --- a/DisplayInfo/DeviceSettings/PlatformImplementation.cpp +++ b/DisplayInfo/DeviceSettings/PlatformImplementation.cpp @@ -42,7 +42,7 @@ #define EDID_MAX_HORIZONTAL_SIZE 21 #define EDID_MAX_VERTICAL_SIZE 22 -namespace WPEFramework { +namespace Thunder { namespace Plugin { class DisplayInfoImplementation : diff --git a/DisplayInfo/DisplayInfo.cpp b/DisplayInfo/DisplayInfo.cpp index ff8a256d..c81b813e 100644 --- a/DisplayInfo/DisplayInfo.cpp +++ b/DisplayInfo/DisplayInfo.cpp @@ -19,7 +19,7 @@ #include "DisplayInfo.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { namespace { @@ -246,4 +246,4 @@ namespace Plugin { } } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/DisplayInfo/DisplayInfo.h b/DisplayInfo/DisplayInfo.h index 7bab00e7..cc3ac37f 100644 --- a/DisplayInfo/DisplayInfo.h +++ b/DisplayInfo/DisplayInfo.h @@ -27,7 +27,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class DisplayInfo : public PluginHost::IPlugin, public PluginHost::IWeb, public PluginHost::JSONRPC { @@ -125,4 +125,4 @@ namespace Plugin { }; } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/DisplayInfo/DisplayInfoPlugin.json b/DisplayInfo/DisplayInfoPlugin.json index 8529ccf3..7658cbfb 100644 --- a/DisplayInfo/DisplayInfoPlugin.json +++ b/DisplayInfo/DisplayInfoPlugin.json @@ -3,7 +3,7 @@ "info": { "title": "Display Info Plugin", "callsign": "DisplayInfo", - "locator": "libWPEFrameworkDisplayInfo.so", + "locator": "libThunderDisplayInfo.so", "status": "production", "description": "The DisplayInfo plugin allows retrieving of various display-related information.", "version": "1.0" diff --git a/DisplayInfo/DisplayInfoTracing.h b/DisplayInfo/DisplayInfoTracing.h index edd44652..2a2d90e4 100644 --- a/DisplayInfo/DisplayInfoTracing.h +++ b/DisplayInfo/DisplayInfoTracing.h @@ -21,7 +21,7 @@ #include "Module.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { class HDCPDetailedInfo { @@ -66,4 +66,4 @@ namespace Plugin { }; } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/DisplayInfo/ExtendedDisplayIdentification.h b/DisplayInfo/ExtendedDisplayIdentification.h index acc452c4..e256be5d 100644 --- a/DisplayInfo/ExtendedDisplayIdentification.h +++ b/DisplayInfo/ExtendedDisplayIdentification.h @@ -20,7 +20,7 @@ #pragma once #include "Module.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { class ExtendedDisplayIdentification { diff --git a/DisplayInfo/Linux/DRMConnector.h b/DisplayInfo/Linux/DRMConnector.h index 3de8fb1a..81ec53b8 100644 --- a/DisplayInfo/Linux/DRMConnector.h +++ b/DisplayInfo/Linux/DRMConnector.h @@ -27,7 +27,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { namespace Linux { diff --git a/DisplayInfo/Linux/PlatformImplementation.cpp b/DisplayInfo/Linux/PlatformImplementation.cpp index ad2a4f6f..c2ca1240 100644 --- a/DisplayInfo/Linux/PlatformImplementation.cpp +++ b/DisplayInfo/Linux/PlatformImplementation.cpp @@ -32,7 +32,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { std::string getLine(const std::string& filepath) diff --git a/DisplayInfo/RPI/PlatformImplementation.cpp b/DisplayInfo/RPI/PlatformImplementation.cpp index da6e621b..84b46c3b 100644 --- a/DisplayInfo/RPI/PlatformImplementation.cpp +++ b/DisplayInfo/RPI/PlatformImplementation.cpp @@ -26,7 +26,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class DisplayInfoImplementation : public Exchange::IHDRProperties, @@ -344,7 +344,7 @@ class DisplayInfoImplementation : public Exchange::IHDRProperties, index++; } - result = WPEFramework::Core::NumberType(WPEFramework::Core::TextFragment(start, (index - start))).Value(); + result = Thunder::Core::NumberType(Thunder::Core::TextFragment(start, (index - start))).Value(); // Convert into bytes, if necessary. if ( (*index == 'M') && (index[1] == '\0') ) { diff --git a/DisplayInfo/doc/DisplayInfoPlugin.md b/DisplayInfo/doc/DisplayInfoPlugin.md index 6794687b..45534051 100644 --- a/DisplayInfo/doc/DisplayInfoPlugin.md +++ b/DisplayInfo/doc/DisplayInfoPlugin.md @@ -57,7 +57,7 @@ The table below provides and overview of terms and abbreviations used in this do | [HTTP](http://www.w3.org/Protocols) | HTTP specification | | [JSON-RPC](https://www.jsonrpc.org/specification) | JSON-RPC 2.0 specification | | [JSON](http://www.json.org/) | JSON specification | -| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20WPEFramework.docx) | Thunder API Reference | +| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20Thunder.docx) | Thunder API Reference | # Description @@ -75,7 +75,7 @@ The table below lists configuration options of the plugin. | :-------- | :-------- | :-------- | | callsign | string | Plugin instance name (default: *DisplayInfo*) | | classname | string | Class name: *DisplayInfo* | -| locator | string | Library name: *libWPEFrameworkDisplayInfo.so* | +| locator | string | Library name: *libThunderDisplayInfo.so* | | startmode | string | Determines if the plugin shall be started automatically along with the framework | diff --git a/LocationSync/CMakeLists.txt b/LocationSync/CMakeLists.txt index ae75481f..f4bf8252 100644 --- a/LocationSync/CMakeLists.txt +++ b/LocationSync/CMakeLists.txt @@ -19,7 +19,7 @@ project(LocationSync) cmake_minimum_required(VERSION 3.3) -find_package(WPEFramework) +find_package(Thunder) project_version(1.0.0) diff --git a/LocationSync/LocationService.cpp b/LocationSync/LocationService.cpp index fedea0c9..593efa71 100644 --- a/LocationSync/LocationService.cpp +++ b/LocationSync/LocationService.cpp @@ -19,7 +19,7 @@ #include "LocationService.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { struct IGeography { @@ -657,4 +657,4 @@ POP_WARNING() } } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/LocationSync/LocationService.h b/LocationSync/LocationService.h index 8c4fc9ed..99188ab3 100644 --- a/LocationSync/LocationService.h +++ b/LocationSync/LocationService.h @@ -22,7 +22,7 @@ #include "Module.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { @@ -147,6 +147,6 @@ namespace Plugin { Core::ProxyType _request; }; } -} // namespace WPEFramework:Plugin +} // namespace Thunder:Plugin #endif // LOCATIONSYNC_LOCATIONSERVICE_H diff --git a/LocationSync/LocationSync.cpp b/LocationSync/LocationSync.cpp index 21c4eba1..aa40d3d8 100644 --- a/LocationSync/LocationSync.cpp +++ b/LocationSync/LocationSync.cpp @@ -21,7 +21,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { namespace { @@ -354,4 +354,4 @@ POP_WARNING() } } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/LocationSync/LocationSync.h b/LocationSync/LocationSync.h index 1db8e96d..0901d297 100644 --- a/LocationSync/LocationSync.h +++ b/LocationSync/LocationSync.h @@ -27,7 +27,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class LocationSync : public PluginHost::IPlugin, public Exchange::ITimeZone, public PluginHost::IWeb, public PluginHost::JSONRPC { @@ -300,6 +300,6 @@ POP_WARNING() }; } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder #endif // LOCATIONSYNC_LOCATIONSYNC_H diff --git a/LocationSync/LocationSyncJsonRpc.cpp b/LocationSync/LocationSyncJsonRpc.cpp index f672716d..2c619794 100644 --- a/LocationSync/LocationSyncJsonRpc.cpp +++ b/LocationSync/LocationSyncJsonRpc.cpp @@ -21,7 +21,7 @@ #include #include "LocationSync.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { diff --git a/LocationSync/doc/LocationSyncPlugin.md b/LocationSync/doc/LocationSyncPlugin.md index 533ccba1..c60edf1a 100644 --- a/LocationSync/doc/LocationSyncPlugin.md +++ b/LocationSync/doc/LocationSyncPlugin.md @@ -57,7 +57,7 @@ The table below provides and overview of terms and abbreviations used in this do | [HTTP](http://www.w3.org/Protocols) | HTTP specification | | [JSON-RPC](https://www.jsonrpc.org/specification) | JSON-RPC 2.0 specification | | [JSON](http://www.json.org/) | JSON specification | -| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20WPEFramework.docx) | Thunder API Reference | +| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20Thunder.docx) | Thunder API Reference | # Description diff --git a/MessageControl/CMakeLists.txt b/MessageControl/CMakeLists.txt index 222d730f..881d5220 100644 --- a/MessageControl/CMakeLists.txt +++ b/MessageControl/CMakeLists.txt @@ -19,7 +19,7 @@ project(MessageControl) cmake_minimum_required(VERSION 3.3) -find_package(WPEFramework) +find_package(Thunder) project_version(1.0.0) diff --git a/MessageControl/MessageControl.cpp b/MessageControl/MessageControl.cpp index eef8ae6b..a9e39435 100644 --- a/MessageControl/MessageControl.cpp +++ b/MessageControl/MessageControl.cpp @@ -21,7 +21,7 @@ #include "MessageOutput.h" #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { diff --git a/MessageControl/MessageControl.h b/MessageControl/MessageControl.h index d5cbbaa8..87135ef4 100644 --- a/MessageControl/MessageControl.h +++ b/MessageControl/MessageControl.h @@ -23,7 +23,7 @@ #include "MessageOutput.h" #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { @@ -190,7 +190,7 @@ namespace Plugin { RPC::IMonitorableProcess* controlled (connection->QueryInterface()); if (controlled != nullptr) { - // This is a connection that is controleld by WPEFramework. For this we can wait till we + // This is a connection that is controleld by Thunder. For this we can wait till we // receive a terminated. controlled->Release(); } diff --git a/MessageControl/MessageControlPlugin.json b/MessageControl/MessageControlPlugin.json index 90913e94..20e0ad93 100644 --- a/MessageControl/MessageControlPlugin.json +++ b/MessageControl/MessageControlPlugin.json @@ -3,9 +3,9 @@ "info": { "title": "MessageControl Plugin", "callsign": "MessageControl", - "locator": "libWPEFrameworkMessageControl.so", + "locator": "libThunderMessageControl.so", "status": "alpha", - "description": "The MessageControl plugin allows reading of the traces from WPEFramework, and controlling them tracing and logging. Allows for outputting logging messages to the websocket", + "description": "The MessageControl plugin allows reading of the traces from Thunder, and controlling them tracing and logging. Allows for outputting logging messages to the websocket", "version": "1.0" }, "configuration": { diff --git a/MessageControl/MessageOutput.cpp b/MessageControl/MessageOutput.cpp index eaae8143..abd8fc93 100644 --- a/MessageControl/MessageOutput.cpp +++ b/MessageControl/MessageOutput.cpp @@ -19,7 +19,7 @@ #include "MessageOutput.h" -namespace WPEFramework { +namespace Thunder { namespace Publishers { diff --git a/MessageControl/MessageOutput.h b/MessageControl/MessageOutput.h index 466cc962..73c1d834 100644 --- a/MessageControl/MessageOutput.h +++ b/MessageControl/MessageOutput.h @@ -20,7 +20,7 @@ #pragma once #include "Module.h" -namespace WPEFramework { +namespace Thunder { namespace Publishers { diff --git a/MessageControl/doc/MessageControlPlugin.md b/MessageControl/doc/MessageControlPlugin.md index d6622467..1cdb522b 100644 --- a/MessageControl/doc/MessageControlPlugin.md +++ b/MessageControl/doc/MessageControlPlugin.md @@ -56,12 +56,12 @@ The table below provides and overview of terms and abbreviations used in this do | [HTTP](http://www.w3.org/Protocols) | HTTP specification | | [JSON-RPC](https://www.jsonrpc.org/specification) | JSON-RPC 2.0 specification | | [JSON](http://www.json.org/) | JSON specification | -| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20WPEFramework.docx) | Thunder API Reference | +| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20Thunder.docx) | Thunder API Reference | # Description -The MessageControl plugin allows reading of the traces from WPEFramework, and controlling them tracing and logging. Allows for outputting logging messages to the websocket. +The MessageControl plugin allows reading of the traces from Thunder, and controlling them tracing and logging. Allows for outputting logging messages to the websocket. The plugin is designed to be loaded and executed within the Thunder framework. For more information about the framework refer to [[Thunder](#ref.Thunder)]. @@ -74,7 +74,7 @@ The table below lists configuration options of the plugin. | :-------- | :-------- | :-------- | | callsign | string | Plugin instance name (default: *MessageControl*) | | classname | string | Class name: *MessageControl* | -| locator | string | Library name: *libWPEFrameworkMessageControl.so* | +| locator | string | Library name: *libThunderMessageControl.so* | | startmode | string | Determines if the plugin shall be started automatically along with the framework | | console | boolean | *(optional)* Enables message output messages to the console | | syslog | boolean | *(optional)* Enables message ouutput to syslog | diff --git a/Messenger/CMakeLists.txt b/Messenger/CMakeLists.txt index eefe5394..6e158225 100644 --- a/Messenger/CMakeLists.txt +++ b/Messenger/CMakeLists.txt @@ -19,7 +19,7 @@ project(Messenger) cmake_minimum_required(VERSION 3.3) -find_package(WPEFramework) +find_package(Thunder) project_version(1.0.0) diff --git a/Messenger/Messenger.cpp b/Messenger/Messenger.cpp index 71c82e4b..0c5028f3 100644 --- a/Messenger/Messenger.cpp +++ b/Messenger/Messenger.cpp @@ -21,7 +21,7 @@ #include "Messenger.h" #include "cryptalgo/Hash.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { diff --git a/Messenger/Messenger.h b/Messenger/Messenger.h index 46fad5ee..e27b4a81 100644 --- a/Messenger/Messenger.h +++ b/Messenger/Messenger.h @@ -26,7 +26,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace JMessenger = Exchange::JSONRPC::JMessenger; diff --git a/Messenger/MessengerPlugin.json b/Messenger/MessengerPlugin.json index a4b0065b..48b9b68f 100644 --- a/Messenger/MessengerPlugin.json +++ b/Messenger/MessengerPlugin.json @@ -4,7 +4,7 @@ "title": "Messenger Plugin", "version": "1.0", "callsign": "Messenger", - "locator": "libWPEFrameworkMessenger.so", + "locator": "libThunderMessenger.so", "status": "production", "description": "The Messenger allows exchanging text messages between users gathered in virtual rooms. The rooms are dynamically created and destroyed based on user attendance. Upon joining a room the client receives a unique token (room ID) to be used for sending and receiving the messages." }, diff --git a/Messenger/MessengerSecurity.cpp b/Messenger/MessengerSecurity.cpp index 68f8c32a..516f6400 100644 --- a/Messenger/MessengerSecurity.cpp +++ b/Messenger/MessengerSecurity.cpp @@ -28,21 +28,21 @@ // helper functions namespace { - bool IsAllowed(WPEFramework::PluginHost::IShell* service, const string& token, const string& designator) + bool IsAllowed(Thunder::PluginHost::IShell* service, const string& token, const string& designator) { bool result = false; ASSERT(service != nullptr); - auto auth = service->QueryInterfaceByCallsign("SecurityAgent"); + auto auth = service->QueryInterfaceByCallsign("SecurityAgent"); if (auth != nullptr) { string encoded; if (auth->CreateToken( static_cast(token.length()), reinterpret_cast(token.c_str()), - encoded) == WPEFramework::Core::ERROR_NONE) { - WPEFramework::PluginHost::ISecurity *officer = auth->Officer(encoded); + encoded) == Thunder::Core::ERROR_NONE) { + Thunder::PluginHost::ISecurity *officer = auth->Officer(encoded); if (officer != nullptr) { - WPEFramework::Core::JSONRPC::Message message; + Thunder::Core::JSONRPC::Message message; message.Designator = designator; result = officer->Allowed(message); @@ -81,7 +81,7 @@ namespace { } } // namespace -namespace WPEFramework { +namespace Thunder { namespace Plugin { @@ -180,4 +180,4 @@ namespace Plugin { } // namespace Plugin -} // WPEFramework +} // Thunder diff --git a/Messenger/RoomImpl.h b/Messenger/RoomImpl.h index 362cbf24..6e805273 100644 --- a/Messenger/RoomImpl.h +++ b/Messenger/RoomImpl.h @@ -23,7 +23,7 @@ #include #include "RoomMaintainer.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { @@ -161,4 +161,4 @@ namespace Plugin { } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/Messenger/RoomMaintainer.cpp b/Messenger/RoomMaintainer.cpp index 92e56a69..fe073f02 100644 --- a/Messenger/RoomMaintainer.cpp +++ b/Messenger/RoomMaintainer.cpp @@ -21,7 +21,7 @@ #include "RoomMaintainer.h" #include "RoomImpl.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { @@ -213,4 +213,4 @@ namespace Plugin { } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/Messenger/RoomMaintainer.h b/Messenger/RoomMaintainer.h index 26f77cec..6f23e41d 100644 --- a/Messenger/RoomMaintainer.h +++ b/Messenger/RoomMaintainer.h @@ -22,7 +22,7 @@ #include "Module.h" #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { @@ -62,4 +62,4 @@ namespace Plugin { } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/Messenger/doc/MessengerPlugin.md b/Messenger/doc/MessengerPlugin.md index 8022bf61..2ab24838 100644 --- a/Messenger/doc/MessengerPlugin.md +++ b/Messenger/doc/MessengerPlugin.md @@ -56,7 +56,7 @@ The table below provides and overview of terms and abbreviations used in this do | [HTTP](http://www.w3.org/Protocols) | HTTP specification | | [JSON-RPC](https://www.jsonrpc.org/specification) | JSON-RPC 2.0 specification | | [JSON](http://www.json.org/) | JSON specification | -| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20WPEFramework.docx) | Thunder API Reference | +| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20Thunder.docx) | Thunder API Reference | # Description @@ -74,7 +74,7 @@ The table below lists configuration options of the plugin. | :-------- | :-------- | :-------- | | callsign | string | Plugin instance name (default: *Messenger*) | | classname | string | Class name: *Messenger* | -| locator | string | Library name: *libWPEFrameworkMessenger.so* | +| locator | string | Library name: *libThunderMessenger.so* | | startmode | string | Determines in which state the plugin should be moved to at startup of the framework | diff --git a/Monitor/CMakeLists.txt b/Monitor/CMakeLists.txt index b4bc9aae..317e79ad 100644 --- a/Monitor/CMakeLists.txt +++ b/Monitor/CMakeLists.txt @@ -19,7 +19,7 @@ project(Monitor) cmake_minimum_required(VERSION 3.3) -find_package(WPEFramework) +find_package(Thunder) project_version(1.0.0) diff --git a/Monitor/Monitor.cpp b/Monitor/Monitor.cpp index ce04f58d..219b1e2b 100644 --- a/Monitor/Monitor.cpp +++ b/Monitor/Monitor.cpp @@ -19,7 +19,7 @@ #include "Monitor.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { namespace { diff --git a/Monitor/Monitor.h b/Monitor/Monitor.h index 2984e77f..64843e9d 100644 --- a/Monitor/Monitor.h +++ b/Monitor/Monitor.h @@ -31,7 +31,7 @@ static uint32_t gcd(uint32_t a, uint32_t b) return b == 0 ? a : gcd(b, a % b); } -namespace WPEFramework { +namespace Thunder { namespace Plugin { class Monitor : public PluginHost::IPlugin, public PluginHost::IWeb, public PluginHost::JSONRPC { @@ -1008,7 +1008,7 @@ POP_WARNING() // The lifetime of the Service object is guaranteed till the deinitialize method is called. const string Initialize(PluginHost::IShell* service) override; - // The plugin is unloaded from WPEFramework. This is call allows the module to notify clients + // The plugin is unloaded from Thunder. This is call allows the module to notify clients // or to persist information if needed. After this call the plugin will unlink from the service path // and be deactivated. The Service object is the same as passed in during the Initialize. // After theis call, the lifetime of the Service object ends. diff --git a/Monitor/MonitorJsonRpc.cpp b/Monitor/MonitorJsonRpc.cpp index 7ab40aa3..ea3fe560 100644 --- a/Monitor/MonitorJsonRpc.cpp +++ b/Monitor/MonitorJsonRpc.cpp @@ -21,7 +21,7 @@ #include "Monitor.h" #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { diff --git a/Monitor/MonitorPlugin.json b/Monitor/MonitorPlugin.json index c56067f4..138d1c21 100644 --- a/Monitor/MonitorPlugin.json +++ b/Monitor/MonitorPlugin.json @@ -3,7 +3,7 @@ "info": { "title": "Monitor Plugin", "callsign": "Monitor", - "locator": "libWPEFrameworkMonitor.so", + "locator": "libThunderMonitor.so", "status": "production", "description": "The Monitor plugin provides a watchdog-like functionality for framework processes.", "version": "1.0" diff --git a/Monitor/doc/MonitorPlugin.md b/Monitor/doc/MonitorPlugin.md index 50451cb6..47210d68 100644 --- a/Monitor/doc/MonitorPlugin.md +++ b/Monitor/doc/MonitorPlugin.md @@ -57,7 +57,7 @@ The table below provides and overview of terms and abbreviations used in this do | [HTTP](http://www.w3.org/Protocols) | HTTP specification | | [JSON-RPC](https://www.jsonrpc.org/specification) | JSON-RPC 2.0 specification | | [JSON](http://www.json.org/) | JSON specification | -| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20WPEFramework.docx) | Thunder API Reference | +| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20Thunder.docx) | Thunder API Reference | # Description @@ -75,7 +75,7 @@ The table below lists configuration options of the plugin. | :-------- | :-------- | :-------- | | callsign | string | Plugin instance name (default: *Monitor*) | | classname | string | Class name: *Monitor* | -| locator | string | Library name: *libWPEFrameworkMonitor.so* | +| locator | string | Library name: *libThunderMonitor.so* | | startmode | string | Determines in which state the plugin should be moved to at startup of the framework | | configuration | object | *(optional)* | | configuration?.observables | array | *(optional)* List of observable plugin details | diff --git a/OpenCDMi/CENCParser.cpp b/OpenCDMi/CENCParser.cpp index 14df72b1..2f1e2460 100644 --- a/OpenCDMi/CENCParser.cpp +++ b/OpenCDMi/CENCParser.cpp @@ -19,7 +19,7 @@ #include "CENCParser.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { @@ -30,4 +30,4 @@ namespace Plugin { /* static */ const uint8_t CommonEncryptionData::ClearKey[] = { 0x58, 0x14, 0x7e, 0xc8, 0x04, 0x23, 0x46, 0x59, 0x92, 0xe6, 0xf5, 0x2c, 0x5c, 0xe8, 0xc3, 0xcc }; /* static */ const char CommonEncryptionData::JSONKeyIds[] = "{\"kids\":"; } -} // namespace WPEFramework::Plugin +} // namespace Thunder::Plugin diff --git a/OpenCDMi/CENCParser.h b/OpenCDMi/CENCParser.h index 667a3f60..151a7766 100644 --- a/OpenCDMi/CENCParser.h +++ b/OpenCDMi/CENCParser.h @@ -24,7 +24,7 @@ #include #include "Protobuf.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { //This class is not Thread Safe. The user of this class must ensure thread saftey (single thread access) !!!! @@ -608,6 +608,6 @@ namespace Plugin { std::list _keyIds; }; } -} // namespace WPEFramework::Plugin +} // namespace Thunder::Plugin #endif // __CENCPARSER_H diff --git a/OpenCDMi/CMakeLists.txt b/OpenCDMi/CMakeLists.txt index d0a4dbfc..7a029719 100644 --- a/OpenCDMi/CMakeLists.txt +++ b/OpenCDMi/CMakeLists.txt @@ -19,7 +19,7 @@ project(OCDM) cmake_minimum_required(VERSION 3.3) -find_package(WPEFramework) +find_package(Thunder) project_version(1.0.0) diff --git a/OpenCDMi/FrameworkRPC.cpp b/OpenCDMi/FrameworkRPC.cpp index 5b46e483..e31c0e3c 100644 --- a/OpenCDMi/FrameworkRPC.cpp +++ b/OpenCDMi/FrameworkRPC.cpp @@ -35,7 +35,7 @@ extern "C" { typedef ::CDMi::ISystemFactory* (*GetDRMSystemFunction)(); } -namespace WPEFramework { +namespace Thunder { namespace Plugin { @@ -1587,4 +1587,4 @@ POP_WARNING() SERVICE_REGISTRATION(OCDMImplementation, 1, 0) } -} /* namespace WPEFramework::Plugin */ +} /* namespace Thunder::Plugin */ diff --git a/OpenCDMi/OCDM.cpp b/OpenCDMi/OCDM.cpp index 57580fcf..9040c8c5 100644 --- a/OpenCDMi/OCDM.cpp +++ b/OpenCDMi/OCDM.cpp @@ -20,7 +20,7 @@ #include "OCDM.h" #include -namespace WPEFramework { +namespace Thunder { namespace OCDM { @@ -131,7 +131,7 @@ namespace Plugin { if (connection != nullptr) { - _memory = WPEFramework::OCDM::MemoryObserver(connection); + _memory = Thunder::OCDM::MemoryObserver(connection); ASSERT(_memory != nullptr); connection->Release(); @@ -287,4 +287,4 @@ namespace Plugin { } } } -} //namespace WPEFramework::Plugin +} //namespace Thunder::Plugin diff --git a/OpenCDMi/OCDM.h b/OpenCDMi/OCDM.h index ca3bd104..14541f58 100644 --- a/OpenCDMi/OCDM.h +++ b/OpenCDMi/OCDM.h @@ -25,7 +25,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class OCDM : public PluginHost::IPlugin, public PluginHost::IWeb, public PluginHost::JSONRPC { diff --git a/OpenCDMi/OCDMJsonRpc.cpp b/OpenCDMi/OCDMJsonRpc.cpp index 31c32952..40f025bf 100644 --- a/OpenCDMi/OCDMJsonRpc.cpp +++ b/OpenCDMi/OCDMJsonRpc.cpp @@ -21,7 +21,7 @@ #include "OCDM.h" #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { diff --git a/OpenCDMi/OpenCDMiPlugin.json b/OpenCDMi/OpenCDMiPlugin.json index 51b3141d..369753ca 100644 --- a/OpenCDMi/OpenCDMiPlugin.json +++ b/OpenCDMi/OpenCDMiPlugin.json @@ -3,7 +3,7 @@ "info": { "title": "OpenCDMi Plugin", "callsign": "OCDM", - "locator": "libWPEFrameworkOCDM.so", + "locator": "libThunderOCDM.so", "status": "production", "version": "1.0" }, diff --git a/OpenCDMi/Protobuf.h b/OpenCDMi/Protobuf.h index acf499e4..65533151 100644 --- a/OpenCDMi/Protobuf.h +++ b/OpenCDMi/Protobuf.h @@ -20,7 +20,7 @@ #include "Module.h" -namespace WPEFramework { +namespace Thunder { namespace Protobuf { diff --git a/OpenCDMi/doc/OpenCDMiPlugin.md b/OpenCDMi/doc/OpenCDMiPlugin.md index e5ac8245..2ecebffe 100644 --- a/OpenCDMi/doc/OpenCDMiPlugin.md +++ b/OpenCDMi/doc/OpenCDMiPlugin.md @@ -53,7 +53,7 @@ The table below provides and overview of terms and abbreviations used in this do | [HTTP](http://www.w3.org/Protocols) | HTTP specification | | [JSON-RPC](https://www.jsonrpc.org/specification) | JSON-RPC 2.0 specification | | [JSON](http://www.json.org/) | JSON specification | -| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20WPEFramework.docx) | Thunder API Reference | +| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20Thunder.docx) | Thunder API Reference | # Configuration @@ -64,7 +64,7 @@ The table below lists configuration options of the plugin. | :-------- | :-------- | :-------- | | callsign | string | Plugin instance name (default: *OCDM*) | | classname | string | Class name: *OCDM* | -| locator | string | Library name: *libWPEFrameworkOCDM.so* | +| locator | string | Library name: *libThunderOCDM.so* | | startmode | string | Determines if the plugin shall be started automatically along with the framework | | configuration | object | *(optional)* | | configuration?.location | string | *(optional)* Location | diff --git a/Packager/CMakeLists.txt b/Packager/CMakeLists.txt index b3c1fb60..0a589052 100644 --- a/Packager/CMakeLists.txt +++ b/Packager/CMakeLists.txt @@ -19,7 +19,7 @@ project(Packager) cmake_minimum_required(VERSION 3.3) -find_package(WPEFramework) +find_package(Thunder) project_version(1.0.0) diff --git a/Packager/Packager.cpp b/Packager/Packager.cpp index 1f2e0d5e..c3774f30 100644 --- a/Packager/Packager.cpp +++ b/Packager/Packager.cpp @@ -19,7 +19,7 @@ #include "Packager.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { namespace { @@ -176,4 +176,4 @@ namespace { } } } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/Packager/Packager.h b/Packager/Packager.h index 6e118d64..6f57b919 100644 --- a/Packager/Packager.h +++ b/Packager/Packager.h @@ -22,7 +22,7 @@ #include "Module.h" #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { namespace { constexpr auto* kInstallMethodName = _T("install"); @@ -125,4 +125,4 @@ namespace { }; } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/Packager/PackagerImplementation.cpp b/Packager/PackagerImplementation.cpp index b4286177..97324fbe 100644 --- a/Packager/PackagerImplementation.cpp +++ b/Packager/PackagerImplementation.cpp @@ -27,7 +27,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { SERVICE_REGISTRATION(PackagerImplementation, 1, 0) @@ -438,4 +438,4 @@ ENUM_CONVERSION_BEGIN(Plugin::PackagerImplementation::PackageType) { Plugin::PackagerImplementation::PackageType::NONE, _TXT("none") }, { Plugin::PackagerImplementation::PackageType::PLUGIN, _TXT("plugin") }, ENUM_CONVERSION_END(Plugin::PackagerImplementation::PackageType) -} // namespace WPEFramework +} // namespace Thunder diff --git a/Packager/PackagerImplementation.h b/Packager/PackagerImplementation.h index 2f61938b..408b805f 100644 --- a/Packager/PackagerImplementation.h +++ b/Packager/PackagerImplementation.h @@ -29,7 +29,7 @@ struct opkg_conf; struct _opkg_progress_data_t; -namespace WPEFramework { +namespace Thunder { namespace Plugin { class PackagerImplementation : public Exchange::IPackager { @@ -358,4 +358,4 @@ namespace Plugin { }; } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/Packager/PackagerPlugin.json b/Packager/PackagerPlugin.json index e175718f..051b3d54 100644 --- a/Packager/PackagerPlugin.json +++ b/Packager/PackagerPlugin.json @@ -3,7 +3,7 @@ "info": { "title": "Packager Plugin", "callsign": "Packager", - "locator": "libWPEFrameworkPackager.so", + "locator": "libThunderPackager.so", "status": "alpha", "description": [ "The Packager plugin allows installation of OPKG, IPKG and DEB packages to the system from a remote repository." diff --git a/Packager/cmake/FindLibOPKG.cmake b/Packager/cmake/FindLibOPKG.cmake index ff884be5..4ee0f9d1 100644 --- a/Packager/cmake/FindLibOPKG.cmake +++ b/Packager/cmake/FindLibOPKG.cmake @@ -34,7 +34,7 @@ pkg_check_modules(PC_LIBOPKG ${_LIBOPKG_MODE} libopkg) if(PC_LIBOPKG_FOUND) if(LIBOPKG_FIND_VERSION AND PC_LIBOPKG_VERSION) if ("${LIBOPKG_FIND_VERSION}" VERSION_GREATER "${PC_LIBOPKG_VERSION}") - message(SEND_ERROR "Incorrect version, found ${PC_LIBOPKG_VERSION}, need at least ${WPEFRAMEWORK_FIND_VERSION}, please install correct version ${LIBOPKG_FIND_VERSION}") + message(SEND_ERROR "Incorrect version, found ${PC_LIBOPKG_VERSION}, need at least ${THUNDER_FIND_VERSION}, please install correct version ${LIBOPKG_FIND_VERSION}") set(LIBOPKG_FOUND_TEXT "Found incorrect version") unset(PC_LIBOPKG_FOUND) endif() @@ -64,4 +64,4 @@ if(NOT TARGET LibOPKG::LibOPKG) INTERFACE_COMPILE_OPTIONS "${PC_LIBOPKG_CFLAGS}" IMPORTED_LINK_INTERFACE_LIBRARIES "${LIBOPKG_LIBRARIES}" ) -endif() +endif() \ No newline at end of file diff --git a/Packager/doc/PackagerPlugin.md b/Packager/doc/PackagerPlugin.md index 4141df18..6d20f26c 100644 --- a/Packager/doc/PackagerPlugin.md +++ b/Packager/doc/PackagerPlugin.md @@ -54,7 +54,7 @@ The table below provides and overview of terms and abbreviations used in this do | [HTTP](http://www.w3.org/Protocols) | HTTP specification | | [JSON-RPC](https://www.jsonrpc.org/specification) | JSON-RPC 2.0 specification | | [JSON](http://www.json.org/) | JSON specification | -| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20WPEFramework.docx) | Thunder API Reference | +| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20Thunder.docx) | Thunder API Reference | # Description @@ -72,7 +72,7 @@ The table below lists configuration options of the plugin. | :-------- | :-------- | :-------- | | callsign | string | Plugin instance name (default: *Packager*) | | classname | string | Class name: *Packager* | -| locator | string | Library name: *libWPEFrameworkPackager.so* | +| locator | string | Library name: *libThunderPackager.so* | | startmode | string | Determines if the plugin shall be started automatically along with the framework | @@ -123,7 +123,7 @@ Installs a package given by a name, an URL or a file path. "id": 1234567890, "method": "Packager.1.install", "params": { - "package": "wpeframework-plugin-netflix", + "package": "thunder-plugin-netflix", "version": "1.0", "architecture": "arm" } diff --git a/PerformanceMetrics/CMakeLists.txt b/PerformanceMetrics/CMakeLists.txt index 2487598e..55f3e9e8 100644 --- a/PerformanceMetrics/CMakeLists.txt +++ b/PerformanceMetrics/CMakeLists.txt @@ -19,7 +19,7 @@ project(PerformanceMetrics) cmake_minimum_required(VERSION 3.3) -find_package(WPEFramework) +find_package(Thunder) project_version(1.0.0) diff --git a/PerformanceMetrics/PerformanceMetrics.cpp b/PerformanceMetrics/PerformanceMetrics.cpp index 9a0ff13d..3bf3a5c5 100644 --- a/PerformanceMetrics/PerformanceMetrics.cpp +++ b/PerformanceMetrics/PerformanceMetrics.cpp @@ -19,7 +19,7 @@ #include "PerformanceMetrics.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { namespace { diff --git a/PerformanceMetrics/PerformanceMetrics.h b/PerformanceMetrics/PerformanceMetrics.h index 5bf91780..fd2b80e3 100644 --- a/PerformanceMetrics/PerformanceMetrics.h +++ b/PerformanceMetrics/PerformanceMetrics.h @@ -25,7 +25,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class PerformanceMetrics : public PluginHost::IPlugin { @@ -666,7 +666,7 @@ POP_WARNING() // The lifetime of the Service object is guaranteed till the deinitialize method is called. virtual const string Initialize(PluginHost::IShell* service); - // The plugin is unloaded from WPEFramework. This is call allows the module to notify clients + // The plugin is unloaded from Thunder. This is call allows the module to notify clients // or to persist information if needed. After this call the plugin will unlink from the service path // and be deactivated. The Service object is the same as passed in during the Initialize. // After theis call, the lifetime of the Service object ends. diff --git a/PerformanceMetrics/PerformanceMetricsPlugin.json b/PerformanceMetrics/PerformanceMetricsPlugin.json index 17560687..bcde7760 100644 --- a/PerformanceMetrics/PerformanceMetricsPlugin.json +++ b/PerformanceMetrics/PerformanceMetricsPlugin.json @@ -3,7 +3,7 @@ "info": { "title": "PerformanceMetrics Plugin", "callsign": "PerformanceMetrics", - "locator": "libWPEFrameworkPerformanceMetrics.so", + "locator": "libThunderPerformanceMetrics.so", "status": "alpha", "description": "The Performance Metrics plugin can output metrics on a plugin (e.g. uptime, resource usage).", "version": "1.0" diff --git a/PerformanceMetrics/SyslogOutput.cpp b/PerformanceMetrics/SyslogOutput.cpp index ed558c2a..7e1da903 100644 --- a/PerformanceMetrics/SyslogOutput.cpp +++ b/PerformanceMetrics/SyslogOutput.cpp @@ -29,7 +29,7 @@ #include "UtilsTelemetry.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { class SysLogOuput : public PerformanceMetrics::IBrowserMetricsLogger { @@ -532,7 +532,7 @@ template std::unique_ptr PerformanceM } -ENUM_CONVERSION_BEGIN(WPEFramework::Plugin::SysLogOuput::ModeType) +ENUM_CONVERSION_BEGIN(Thunder::Plugin::SysLogOuput::ModeType) { Plugin::SysLogOuput::ModeType::COLD, _TXT("Cold") }, { Plugin::SysLogOuput::ModeType::WARM, _TXT("Warm") }, diff --git a/PerformanceMetrics/TraceOutput.cpp b/PerformanceMetrics/TraceOutput.cpp index 87b7d01d..785586bf 100644 --- a/PerformanceMetrics/TraceOutput.cpp +++ b/PerformanceMetrics/TraceOutput.cpp @@ -20,7 +20,7 @@ #include "Module.h" #include "PerformanceMetrics.h" -namespace WPEFramework { +namespace Thunder { namespace Trace { diff --git a/PlayerInfo/CMakeLists.txt b/PlayerInfo/CMakeLists.txt index 3561c344..f595157c 100644 --- a/PlayerInfo/CMakeLists.txt +++ b/PlayerInfo/CMakeLists.txt @@ -19,7 +19,7 @@ project(PlayerInfo) cmake_minimum_required(VERSION 3.3) -find_package(WPEFramework) +find_package(Thunder) project_version(1.0.0) diff --git a/PlayerInfo/DeviceSettings/PlatformImplementation.cpp b/PlayerInfo/DeviceSettings/PlatformImplementation.cpp index 7a697c6f..72993d95 100644 --- a/PlayerInfo/DeviceSettings/PlatformImplementation.cpp +++ b/PlayerInfo/DeviceSettings/PlatformImplementation.cpp @@ -35,7 +35,7 @@ #include "manager.hpp" -namespace WPEFramework { +namespace Thunder { namespace Plugin { class PlayerInfoImplementation : public Exchange::IPlayerProperties, public Exchange::Dolby::IOutput diff --git a/PlayerInfo/Dolby/DolbyOutput.cpp b/PlayerInfo/Dolby/DolbyOutput.cpp index 3904d4a7..33fc1c9c 100644 --- a/PlayerInfo/Dolby/DolbyOutput.cpp +++ b/PlayerInfo/Dolby/DolbyOutput.cpp @@ -20,7 +20,7 @@ #include "../../Module.h" #include "Dolby.h" -namespace WPEFramework +namespace Thunder { namespace Plugin { @@ -106,4 +106,4 @@ namespace WPEFramework SERVICE_REGISTRATION(DolbyOutputImplementation, 1, 0) } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/PlayerInfo/Dolby/include/Dolby.h b/PlayerInfo/Dolby/include/Dolby.h index 34b92d32..17df9cda 100644 --- a/PlayerInfo/Dolby/include/Dolby.h +++ b/PlayerInfo/Dolby/include/Dolby.h @@ -35,7 +35,7 @@ extern "C" { * - ERROR_GENERAL - Setting the parameter has failed. */ uint32_t -set_audio_output_type(const enum WPEFramework::Exchange::Dolby::IOutput::Type type); +set_audio_output_type(const enum Thunder::Exchange::Dolby::IOutput::Type type); /** @@ -49,7 +49,7 @@ set_audio_output_type(const enum WPEFramework::Exchange::Dolby::IOutput::Type ty * mapped to Dolby::IOutput::Type enumeration. */ EXTERNAL uint32_t -get_audio_output_type(enum WPEFramework::Exchange::Dolby::IOutput::Type* type); +get_audio_output_type(enum Thunder::Exchange::Dolby::IOutput::Type* type); #ifdef __cplusplus } diff --git a/PlayerInfo/GStreamer/PlatformImplementation.cpp b/PlayerInfo/GStreamer/PlatformImplementation.cpp index 055e6455..baedb311 100644 --- a/PlayerInfo/GStreamer/PlatformImplementation.cpp +++ b/PlayerInfo/GStreamer/PlatformImplementation.cpp @@ -23,7 +23,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class PlayerInfoImplementation : public Exchange::IPlayerProperties { diff --git a/PlayerInfo/PlayerInfo.cpp b/PlayerInfo/PlayerInfo.cpp index 73a219e3..5701a089 100644 --- a/PlayerInfo/PlayerInfo.cpp +++ b/PlayerInfo/PlayerInfo.cpp @@ -20,7 +20,7 @@ #include "PlayerInfo.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { namespace { @@ -203,4 +203,4 @@ namespace Plugin { } } } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/PlayerInfo/PlayerInfo.h b/PlayerInfo/PlayerInfo.h index 84139379..9199895d 100644 --- a/PlayerInfo/PlayerInfo.h +++ b/PlayerInfo/PlayerInfo.h @@ -24,7 +24,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class PlayerInfo : public PluginHost::IPlugin, public PluginHost::IWeb, public PluginHost::JSONRPC { @@ -160,4 +160,4 @@ namespace Plugin { }; } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/PlayerInfo/doc/PlayerInfoPlugin.md b/PlayerInfo/doc/PlayerInfoPlugin.md index a3eddacd..4e745097 100644 --- a/PlayerInfo/doc/PlayerInfoPlugin.md +++ b/PlayerInfo/doc/PlayerInfoPlugin.md @@ -57,7 +57,7 @@ The table below provides and overview of terms and abbreviations used in this do | [HTTP](http://www.w3.org/Protocols) | HTTP specification | | [JSON-RPC](https://www.jsonrpc.org/specification) | JSON-RPC 2.0 specification | | [JSON](http://www.json.org/) | JSON specification | -| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20WPEFramework.docx) | Thunder API Reference | +| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20Thunder.docx) | Thunder API Reference | # Description diff --git a/RustBridge/RustBridge.cpp b/RustBridge/RustBridge.cpp index 0e0ffb8a..bb86b578 100644 --- a/RustBridge/RustBridge.cpp +++ b/RustBridge/RustBridge.cpp @@ -19,7 +19,7 @@ #include "RustBridge.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { namespace { @@ -329,4 +329,4 @@ namespace WPEFramework { _adminLock.Unlock(); } } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/RustBridge/RustBridge.h b/RustBridge/RustBridge.h index c4d43c4b..57961ab6 100644 --- a/RustBridge/RustBridge.h +++ b/RustBridge/RustBridge.h @@ -22,7 +22,7 @@ #include "Module.h" #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class RustBridge : @@ -243,4 +243,4 @@ namespace WPEFramework { }; } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/RustBridge/RustBridgeImplementation.cpp b/RustBridge/RustBridgeImplementation.cpp index 6f837413..722efe6a 100644 --- a/RustBridge/RustBridgeImplementation.cpp +++ b/RustBridge/RustBridgeImplementation.cpp @@ -19,7 +19,7 @@ #include "RustBridge.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { @@ -36,9 +36,9 @@ namespace WPEFramework { } } -extern "C" void wpe_send_to(uint32_t id, const char* json, WPEFramework::Plugin::Rust::PluginContext* p_ctx); +extern "C" void wpe_send_to(uint32_t id, const char* json, Thunder::Plugin::Rust::PluginContext* p_ctx); -namespace WPEFramework { +namespace Thunder { namespace Plugin { @@ -342,9 +342,9 @@ namespace WPEFramework { SERVICE_REGISTRATION(RustBridgeImplementation, 1, 0) } -} // namespace WPEFramework +} // namespace Thunder -using namespace WPEFramework; +using namespace Thunder; // this function is passed into Rust as a pointer extern "C" void wpe_send_to(uint32_t id, const char* json, Plugin::Rust::PluginContext * plugin) diff --git a/RustBridge/rust/examples/calculator/calculator.json b/RustBridge/rust/examples/calculator/calculator.json index bf8876dc..ba7e68eb 100644 --- a/RustBridge/rust/examples/calculator/calculator.json +++ b/RustBridge/rust/examples/calculator/calculator.json @@ -1,5 +1,5 @@ { - "locator":"libWPEFrameworkRustAdapter.so", + "locator":"libThunderRustAdapter.so", "classname":"RustAdapter", "callsign":"calculator", "startmode":"Activated" diff --git a/RustBridge/rust/examples/hello_world/SampleRustPlugin.json b/RustBridge/rust/examples/hello_world/SampleRustPlugin.json index 94d1b509..2e2d7184 100644 --- a/RustBridge/rust/examples/hello_world/SampleRustPlugin.json +++ b/RustBridge/rust/examples/hello_world/SampleRustPlugin.json @@ -1,5 +1,5 @@ { - "locator":"libWPEFrameworkRustAdapter.so", + "locator":"libThunderRustAdapter.so", "classname":"RustAdapter", "callsign":"hello_world", "startmode":"Activated", diff --git a/SecurityAgent/AccessControlList.cpp b/SecurityAgent/AccessControlList.cpp index a011096e..486cb229 100644 --- a/SecurityAgent/AccessControlList.cpp +++ b/SecurityAgent/AccessControlList.cpp @@ -20,7 +20,7 @@ #include "Module.h" #include "AccessControlList.h" -namespace WPEFramework { +namespace Thunder { ENUM_CONVERSION_BEGIN(Plugin::AccessControlList::mode) { Plugin::AccessControlList::ALLOWED, _TXT("allowed") }, diff --git a/SecurityAgent/AccessControlList.h b/SecurityAgent/AccessControlList.h index 7607fffa..a299ce91 100644 --- a/SecurityAgent/AccessControlList.h +++ b/SecurityAgent/AccessControlList.h @@ -80,7 +80,7 @@ namespace { } } -namespace WPEFramework { +namespace Thunder { namespace Plugin { //Allow -> Check first diff --git a/SecurityAgent/CMakeLists.txt b/SecurityAgent/CMakeLists.txt index 3f189966..e7fb1646 100644 --- a/SecurityAgent/CMakeLists.txt +++ b/SecurityAgent/CMakeLists.txt @@ -19,7 +19,7 @@ project(SecurityAgent) cmake_minimum_required(VERSION 3.3) -find_package(WPEFramework) +find_package(Thunder) project_version(1.0.0) diff --git a/SecurityAgent/SecapiToken.cpp b/SecurityAgent/SecapiToken.cpp index 955f50a7..d6d31661 100644 --- a/SecurityAgent/SecapiToken.cpp +++ b/SecurityAgent/SecapiToken.cpp @@ -28,7 +28,7 @@ PRINT("%s:%d %s : %d\n", __FILE__, __LINE__, #x, result); \ } -using namespace WPEFramework; +using namespace Thunder; const char* JWTSecApi::MacGenerator::StorageDir = nullptr; diff --git a/SecurityAgent/SecapiToken.h b/SecurityAgent/SecapiToken.h index e7e695d9..b3304f94 100644 --- a/SecurityAgent/SecapiToken.h +++ b/SecurityAgent/SecapiToken.h @@ -72,5 +72,5 @@ class JWTSecApi { private: static MacGenerator generator; - WPEFramework::Web::JSONWebToken jwt; + Thunder::Web::JSONWebToken jwt; }; diff --git a/SecurityAgent/SecurityAgent.cpp b/SecurityAgent/SecurityAgent.cpp index 83efa9c2..b763a140 100644 --- a/SecurityAgent/SecurityAgent.cpp +++ b/SecurityAgent/SecurityAgent.cpp @@ -21,7 +21,7 @@ #include "SecurityContext.h" #include "TokenFactory.h" -namespace WPEFramework { +namespace Thunder { ENUM_CONVERSION_BEGIN(Plugin::SecurityAgent::tokentype) { Plugin::SecurityAgent::DAC, _TXT("dac") }, ENUM_CONVERSION_END(Plugin::SecurityAgent::tokentype) @@ -319,4 +319,4 @@ namespace Plugin { } } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/SecurityAgent/SecurityAgent.h b/SecurityAgent/SecurityAgent.h index c13825d9..d28afb3c 100644 --- a/SecurityAgent/SecurityAgent.h +++ b/SecurityAgent/SecurityAgent.h @@ -24,7 +24,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class SecurityAgent : public PluginHost::IAuthenticate, @@ -228,4 +228,4 @@ namespace Plugin { }; } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/SecurityAgent/SecurityAgentJsonRpc.cpp b/SecurityAgent/SecurityAgentJsonRpc.cpp index 008ddefb..a0b7bbf1 100644 --- a/SecurityAgent/SecurityAgentJsonRpc.cpp +++ b/SecurityAgent/SecurityAgentJsonRpc.cpp @@ -23,7 +23,7 @@ #include "TokenFactory.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { diff --git a/SecurityAgent/SecurityAgentPlugin.json b/SecurityAgent/SecurityAgentPlugin.json index 09636fed..eb2ecd3d 100644 --- a/SecurityAgent/SecurityAgentPlugin.json +++ b/SecurityAgent/SecurityAgentPlugin.json @@ -3,7 +3,7 @@ "info": { "title": "Security Agent Plugin", "callsign": "SecurityAgent", - "locator": "libWPEFrameworkSecurityAgent.so", + "locator": "libThunderSecurityAgent.so", "status": "production", "description": "Security Agent of thunder is responsible to allow or block access to the Thunder API.", "version": "1.0" diff --git a/SecurityAgent/SecurityContext.cpp b/SecurityAgent/SecurityContext.cpp index 7f80b354..eab1253b 100644 --- a/SecurityAgent/SecurityContext.cpp +++ b/SecurityAgent/SecurityContext.cpp @@ -19,7 +19,7 @@ #include "SecurityContext.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { SecurityContext::SecurityContext(const AccessControlList* acl, const uint16_t length, const uint8_t payload[], const string& servicePrefix) diff --git a/SecurityAgent/SecurityContext.h b/SecurityAgent/SecurityContext.h index d8839084..dc9a171e 100644 --- a/SecurityAgent/SecurityContext.h +++ b/SecurityAgent/SecurityContext.h @@ -22,7 +22,7 @@ #include "Module.h" #include "AccessControlList.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { class SecurityContext : public PluginHost::ISecurity { diff --git a/SecurityAgent/TokenFactory.h b/SecurityAgent/TokenFactory.h index 6331f910..21327cbb 100644 --- a/SecurityAgent/TokenFactory.h +++ b/SecurityAgent/TokenFactory.h @@ -33,9 +33,9 @@ class JWTFactory { JWTFactory &operator=(const JWTFactory &) = delete; JWTFactory() { #ifndef ENABLE_SECAPI - WPEFramework::Crypto::Reseed(); + Thunder::Crypto::Reseed(); for (uint8_t index = 0; index < sizeof(_secretKey); index++) { - WPEFramework::Crypto::Random(_secretKey[index]); + Thunder::Crypto::Random(_secretKey[index]); } #endif } @@ -49,19 +49,19 @@ class JWTFactory { #ifdef ENABLE_SECAPI typedef JWTSecApi ELEMENT; #else - typedef WPEFramework::Web::JSONWebToken ELEMENT; + typedef Thunder::Web::JSONWebToken ELEMENT; #endif inline std::unique_ptr Element() { return std::unique_ptr(new ELEMENT #ifndef ENABLE_SECAPI - (WPEFramework::Web::JSONWebToken::SHA256, sizeof(_secretKey), _secretKey) + (Thunder::Web::JSONWebToken::SHA256, sizeof(_secretKey), _secretKey) #endif ); } private: #ifndef ENABLE_SECAPI - uint8_t _secretKey[WPEFramework::Crypto::SHA256::Length]; + uint8_t _secretKey[Thunder::Crypto::SHA256::Length]; #endif }; diff --git a/SecurityAgent/Tracing.h b/SecurityAgent/Tracing.h index c654f31f..1fc714b6 100644 --- a/SecurityAgent/Tracing.h +++ b/SecurityAgent/Tracing.h @@ -1,6 +1,6 @@ #pragma once -namespace WPEFramework { +namespace Thunder { namespace Plugin { class Security { public: @@ -30,4 +30,4 @@ namespace Plugin { std::string _text; }; } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/SecurityAgent/doc/SecurityAgentPlugin.md b/SecurityAgent/doc/SecurityAgentPlugin.md index 09b5b454..886fbd79 100644 --- a/SecurityAgent/doc/SecurityAgentPlugin.md +++ b/SecurityAgent/doc/SecurityAgentPlugin.md @@ -54,7 +54,7 @@ The table below provides and overview of terms and abbreviations used in this do | [HTTP](http://www.w3.org/Protocols) | HTTP specification | | [JSON-RPC](https://www.jsonrpc.org/specification) | JSON-RPC 2.0 specification | | [JSON](http://www.json.org/) | JSON specification | -| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20WPEFramework.docx) | Thunder API Reference | +| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20Thunder.docx) | Thunder API Reference | # Description @@ -72,7 +72,7 @@ The table below lists configuration options of the plugin. | :-------- | :-------- | :-------- | | callsign | string | Plugin instance name (default: *SecurityAgent*) | | classname | string | Class name: *SecurityAgent* | -| locator | string | Library name: *libWPEFrameworkSecurityAgent.so* | +| locator | string | Library name: *libThunderSecurityAgent.so* | | startmode | string | Determines if the plugin shall be started automatically along with the framework | | configuration | object | *(optional)* | | configuration?.acl | string | *(optional)* ACL | diff --git a/WebBridge/CMakeLists.txt b/WebBridge/CMakeLists.txt index fb85b702..0e3ac8d5 100644 --- a/WebBridge/CMakeLists.txt +++ b/WebBridge/CMakeLists.txt @@ -19,7 +19,7 @@ project(WebBridge) cmake_minimum_required(VERSION 3.3) -find_package(WPEFramework) +find_package(Thunder) project_version(1.0.0) diff --git a/WebBridge/WebBridge.cpp b/WebBridge/WebBridge.cpp index 504146fb..ab15cd5a 100644 --- a/WebBridge/WebBridge.cpp +++ b/WebBridge/WebBridge.cpp @@ -19,7 +19,7 @@ #include "WebBridge.h" -namespace WPEFramework { +namespace Thunder { ENUM_CONVERSION_BEGIN(Plugin::WebBridge::context) @@ -406,4 +406,4 @@ namespace WPEFramework { } } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/WebBridge/WebBridge.h b/WebBridge/WebBridge.h index ff5a4a04..402ebf78 100644 --- a/WebBridge/WebBridge.h +++ b/WebBridge/WebBridge.h @@ -21,7 +21,7 @@ #include "Module.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { class WebBridge : @@ -176,4 +176,4 @@ namespace WPEFramework { }; } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/WebKitBrowser/BrowserConsoleLog.h b/WebKitBrowser/BrowserConsoleLog.h index 34257774..da47a99d 100644 --- a/WebKitBrowser/BrowserConsoleLog.h +++ b/WebKitBrowser/BrowserConsoleLog.h @@ -24,7 +24,7 @@ #ifndef WEBKIT_GLIB_API #include "InjectedBundle/Utils.h" #endif -using namespace WPEFramework; +using namespace Thunder; class BrowserConsoleLog { private: diff --git a/WebKitBrowser/CMakeLists.txt b/WebKitBrowser/CMakeLists.txt index 90443e1c..ddd487ce 100644 --- a/WebKitBrowser/CMakeLists.txt +++ b/WebKitBrowser/CMakeLists.txt @@ -19,7 +19,7 @@ project(WebKitBrowser) cmake_minimum_required(VERSION 3.3) -find_package(WPEFramework) +find_package(Thunder) project_version(1.0.0) set(MODULE_NAME ${NAMESPACE}${PROJECT_NAME}) diff --git a/WebKitBrowser/CookieJar.cpp b/WebKitBrowser/CookieJar.cpp index 19a0d33b..3db706b4 100644 --- a/WebKitBrowser/CookieJar.cpp +++ b/WebKitBrowser/CookieJar.cpp @@ -29,7 +29,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { namespace { @@ -467,7 +467,7 @@ uint32_t CookieJar::Unpack(const uint32_t version, const uint32_t checksum, cons ASSERT(_priv != nullptr); rc = _priv->Unpack(version, checksum, payload, cookies); - if (rc == WPEFramework::Core::ERROR_NONE) { + if (rc == Thunder::Core::ERROR_NONE) { _cookies = std::move(cookies); _refreshed.SetState( false ); } diff --git a/WebKitBrowser/CookieJar.h b/WebKitBrowser/CookieJar.h index fc08a9b7..ccb04c6d 100644 --- a/WebKitBrowser/CookieJar.h +++ b/WebKitBrowser/CookieJar.h @@ -26,7 +26,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { class CookieJar @@ -58,4 +58,4 @@ class CookieJar }; } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/WebKitBrowser/CookieJarCrypto/CookieJarCryptoExample.h b/WebKitBrowser/CookieJarCrypto/CookieJarCryptoExample.h index 1174a239..6582b102 100644 --- a/WebKitBrowser/CookieJarCrypto/CookieJarCryptoExample.h +++ b/WebKitBrowser/CookieJarCrypto/CookieJarCryptoExample.h @@ -23,7 +23,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { // Following implementation is for demonstration purposes only, not intended for a production. @@ -86,4 +86,4 @@ struct CookieJarCrypto }; } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/WebKitBrowser/Extension/AAMPJSBindings.cpp b/WebKitBrowser/Extension/AAMPJSBindings.cpp index ff9e77ae..733a1eeb 100644 --- a/WebKitBrowser/Extension/AAMPJSBindings.cpp +++ b/WebKitBrowser/Extension/AAMPJSBindings.cpp @@ -29,7 +29,7 @@ extern "C" { JSGlobalContextRef jscContextGetJSContext(JSCContext*); } -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace AAMP { @@ -111,4 +111,4 @@ void SetHttpHeaders(const char * headerJson) } // namespace AAMP } // namespace JavaScript -} // namespace WPEFramework +} // namespace Thunder diff --git a/WebKitBrowser/Extension/AAMPJSBindings.h b/WebKitBrowser/Extension/AAMPJSBindings.h index a4976929..60427c07 100644 --- a/WebKitBrowser/Extension/AAMPJSBindings.h +++ b/WebKitBrowser/Extension/AAMPJSBindings.h @@ -21,7 +21,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace AAMP { @@ -31,4 +31,4 @@ void SetHttpHeaders(const char * headerJson); } // namespace AAMP } // namespace JavaScript -} // namespace WPEFramework +} // namespace Thunder diff --git a/WebKitBrowser/Extension/BridgeObject.cpp b/WebKitBrowser/Extension/BridgeObject.cpp index 2b83c507..304dab27 100644 --- a/WebKitBrowser/Extension/BridgeObject.cpp +++ b/WebKitBrowser/Extension/BridgeObject.cpp @@ -21,7 +21,7 @@ #include "BridgeObject.h" #include "../Tags.h" -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace BridgeObject { @@ -150,4 +150,4 @@ bool HandleMessageToPage(WebKitWebPage* page, const char* messageName, WebKitUse } // namespace BridgeObject } // namespace JavaScript -} // namespace WPEFramework +} // namespace Thunder diff --git a/WebKitBrowser/Extension/BridgeObject.h b/WebKitBrowser/Extension/BridgeObject.h index 916b4aff..2c03e5be 100644 --- a/WebKitBrowser/Extension/BridgeObject.h +++ b/WebKitBrowser/Extension/BridgeObject.h @@ -21,7 +21,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace BridgeObject { @@ -30,4 +30,4 @@ void InjectJS(WebKitScriptWorld*, WebKitWebPage*, WebKitFrame*); } // BridgeObject } // JavaScript -} // WPEFramework +} // Thunder diff --git a/WebKitBrowser/Extension/CMakeLists.txt b/WebKitBrowser/Extension/CMakeLists.txt index f50a0f46..098c12cf 100644 --- a/WebKitBrowser/Extension/CMakeLists.txt +++ b/WebKitBrowser/Extension/CMakeLists.txt @@ -33,7 +33,7 @@ add_library(${MODULE_NAME} SHARED main.cpp WhiteListedOriginDomainsList.cpp Milestone.cpp - NotifyWPEFramework.cpp + NotifyThunder.cpp RequestHeaders.cpp ../Tags.cpp ) diff --git a/WebKitBrowser/Extension/IIdentifier.cpp b/WebKitBrowser/Extension/IIdentifier.cpp index b66966c8..f2b7bfa0 100644 --- a/WebKitBrowser/Extension/IIdentifier.cpp +++ b/WebKitBrowser/Extension/IIdentifier.cpp @@ -22,7 +22,7 @@ #include "IIdentifier.h" -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace IIdentifier { @@ -175,4 +175,4 @@ void InjectJS(WebKitScriptWorld* world, WebKitFrame* frame, Core::ProxyType -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace IIdentifier { @@ -29,4 +29,4 @@ void InjectJS(WebKitScriptWorld* world, WebKitFrame* frame, Core::ProxyType -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace Milestone { @@ -29,4 +29,4 @@ void InjectJS(WebKitScriptWorld* world, WebKitFrame* frame); } // Milestone } // JavaScript -} // WPEFramework +} // Thunder diff --git a/WebKitBrowser/Extension/NotifyWPEFramework.cpp b/WebKitBrowser/Extension/NotifyThunder.cpp similarity index 78% rename from WebKitBrowser/Extension/NotifyWPEFramework.cpp rename to WebKitBrowser/Extension/NotifyThunder.cpp index 4b45d09c..4fdab163 100644 --- a/WebKitBrowser/Extension/NotifyWPEFramework.cpp +++ b/WebKitBrowser/Extension/NotifyThunder.cpp @@ -18,11 +18,11 @@ */ #include "Module.h" -#include "NotifyWPEFramework.h" +#include "NotifyThunder.h" -namespace WPEFramework { +namespace Thunder { namespace JavaScript { -namespace NotifyWPEFramework { +namespace NotifyThunder { void InjectJS(WebKitScriptWorld* world, WebKitFrame* frame) { @@ -31,20 +31,20 @@ void InjectJS(WebKitScriptWorld* world, WebKitFrame* frame) JSCContext* jsContext = webkit_frame_get_js_context_for_script_world(frame, world); - static const char wpeNotifyWPEFramework[] = "var wpe = {};\n" - "wpe.NotifyWPEFramework = function() {\n" + static const char wpeNotifyThunder[] = "var wpe = {};\n" + "wpe.NotifyThunder = function() {\n" " let retval = new Array;\n" " for (let i = 0; i < arguments.length; i++) {\n" " retval[i] = arguments[i];\n" " }\n" - " window.webkit.messageHandlers.wpeNotifyWPEFramework.postMessage(retval);\n" + " window.webkit.messageHandlers.wpeNotifyThunder.postMessage(retval);\n" "}"; - JSCValue* result = jsc_context_evaluate(jsContext, wpeNotifyWPEFramework, -1); + JSCValue* result = jsc_context_evaluate(jsContext, wpeNotifyThunder, -1); g_object_unref(result); g_object_unref(jsContext); } -} // NotifyWPEFramework +} // NotifyThunder } // JavaScript -} // WPEFramework +} // Thunder diff --git a/WebKitBrowser/Extension/NotifyWPEFramework.h b/WebKitBrowser/Extension/NotifyThunder.h similarity index 89% rename from WebKitBrowser/Extension/NotifyWPEFramework.h rename to WebKitBrowser/Extension/NotifyThunder.h index a4d6f800..c58840cc 100644 --- a/WebKitBrowser/Extension/NotifyWPEFramework.h +++ b/WebKitBrowser/Extension/NotifyThunder.h @@ -21,12 +21,12 @@ #include -namespace WPEFramework { +namespace Thunder { namespace JavaScript { -namespace NotifyWPEFramework { +namespace NotifyThunder { void InjectJS(WebKitScriptWorld* world, WebKitFrame* frame); -} // NotifyWPEFramework +} // NotifyThunder } // JavaScript -} // WPEFramework +} // Thunder diff --git a/WebKitBrowser/Extension/RequestHeaders.cpp b/WebKitBrowser/Extension/RequestHeaders.cpp index 257d9d7f..201571cc 100644 --- a/WebKitBrowser/Extension/RequestHeaders.cpp +++ b/WebKitBrowser/Extension/RequestHeaders.cpp @@ -28,7 +28,7 @@ #include "AAMPJSBindings.h" #endif -namespace WPEFramework { +namespace Thunder { namespace WebKit { namespace @@ -116,4 +116,4 @@ void ApplyRequestHeaders(WebKitWebPage* page, WebKitURIRequest* request) } } // WebKit -} // WPEFramework +} // Thunder diff --git a/WebKitBrowser/Extension/RequestHeaders.h b/WebKitBrowser/Extension/RequestHeaders.h index cf6923e4..ae8ae689 100644 --- a/WebKitBrowser/Extension/RequestHeaders.h +++ b/WebKitBrowser/Extension/RequestHeaders.h @@ -20,7 +20,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace WebKit { void SetRequestHeaders(WebKitWebPage*, WebKitUserMessage*); @@ -28,4 +28,4 @@ void RemoveRequestHeaders(WebKitWebPage*); void ApplyRequestHeaders(WebKitWebPage*, WebKitURIRequest*); } // WebKit -} // WPEFramework +} // Thunder diff --git a/WebKitBrowser/Extension/SecurityAgent.cpp b/WebKitBrowser/Extension/SecurityAgent.cpp index 7e6e2a40..468833e2 100644 --- a/WebKitBrowser/Extension/SecurityAgent.cpp +++ b/WebKitBrowser/Extension/SecurityAgent.cpp @@ -22,7 +22,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace SecurityAgent { @@ -63,4 +63,4 @@ void InjectJS(WebKitScriptWorld* world, WebKitFrame* frame) } // SecurityAgent } // JavaScript -} // WPEFramework +} // Thunder diff --git a/WebKitBrowser/Extension/SecurityAgent.h b/WebKitBrowser/Extension/SecurityAgent.h index cebbdcd1..f9b43f39 100644 --- a/WebKitBrowser/Extension/SecurityAgent.h +++ b/WebKitBrowser/Extension/SecurityAgent.h @@ -20,7 +20,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace SecurityAgent { @@ -28,4 +28,4 @@ void InjectJS(WebKitScriptWorld* world, WebKitFrame* frame); } // SecurityAgent } // JavaScript -} // WPEFramework +} // Thunder diff --git a/WebKitBrowser/Extension/WhiteListedOriginDomainsList.cpp b/WebKitBrowser/Extension/WhiteListedOriginDomainsList.cpp index 6369dc6c..4c1623fc 100644 --- a/WebKitBrowser/Extension/WhiteListedOriginDomainsList.cpp +++ b/WebKitBrowser/Extension/WhiteListedOriginDomainsList.cpp @@ -22,7 +22,7 @@ using std::unique_ptr; using std::vector; -namespace WPEFramework { +namespace Thunder { namespace WebKit { // Parses JSON containing white listed CORS origin-domain pairs. diff --git a/WebKitBrowser/Extension/WhiteListedOriginDomainsList.h b/WebKitBrowser/Extension/WhiteListedOriginDomainsList.h index 9ee1f0ed..5bf107f1 100644 --- a/WebKitBrowser/Extension/WhiteListedOriginDomainsList.h +++ b/WebKitBrowser/Extension/WhiteListedOriginDomainsList.h @@ -27,7 +27,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace WebKit { class WhiteListedOriginDomainsList { diff --git a/WebKitBrowser/Extension/main.cpp b/WebKitBrowser/Extension/main.cpp index fb86ac06..e95525fc 100644 --- a/WebKitBrowser/Extension/main.cpp +++ b/WebKitBrowser/Extension/main.cpp @@ -29,7 +29,7 @@ #include "../Tags.h" #include "Milestone.h" -#include "NotifyWPEFramework.h" +#include "NotifyThunder.h" #include "RequestHeaders.h" #include "WhiteListedOriginDomainsList.h" @@ -57,7 +57,7 @@ #include #endif -using namespace WPEFramework; +using namespace Thunder; static Core::NodeId GetConnectionNode() { @@ -166,7 +166,7 @@ static class PluginHost { static void windowObjectClearedCallback(WebKitScriptWorld* world, WebKitWebPage* page VARIABLE_IS_NOT_USED, WebKitFrame* frame, VARIABLE_IS_NOT_USED PluginHost* host) { JavaScript::Milestone::InjectJS(world, frame); - JavaScript::NotifyWPEFramework::InjectJS(world, frame); + JavaScript::NotifyThunder::InjectJS(world, frame); #ifdef ENABLE_SECURITY_AGENT JavaScript::SecurityAgent::InjectJS(world, frame); @@ -268,13 +268,13 @@ POP_WARNING() gboolean _logToSystemConsoleEnabled; gboolean _enableTesting; WebKitWebExtension* _extension; -} _wpeFrameworkClient; +} _thunderClient; extern "C" { __attribute__((destructor)) static void unload() { - _wpeFrameworkClient.Deinitialize(); + _thunderClient.Deinitialize(); } // Declare module name for tracer. @@ -282,11 +282,11 @@ MODULE_NAME_DECLARATION(BUILD_REFERENCE) G_MODULE_EXPORT void webkit_web_extension_initialize_with_user_data(WebKitWebExtension* extension, GVariant* userData) { - _wpeFrameworkClient.Initialize(extension, userData); + _thunderClient.Initialize(extension, userData); } } // explicit instantiation so that -O1/2/3 flags do not introduce undefined symbols -template uint32_t WPEFramework::Core::IPCMessageType<2u, WPEFramework::RPC::Data::Input, WPEFramework::RPC::Data::Output>::RawSerializedType::AddRef() const; -template uint32_t WPEFramework::Core::IPCMessageType<2u, WPEFramework::RPC::Data::Input, WPEFramework::RPC::Data::Output>::RawSerializedType::AddRef() const; +template uint32_t Thunder::Core::IPCMessageType<2u, Thunder::RPC::Data::Input, Thunder::RPC::Data::Output>::RawSerializedType::AddRef() const; +template uint32_t Thunder::Core::IPCMessageType<2u, Thunder::RPC::Data::Input, Thunder::RPC::Data::Output>::RawSerializedType::AddRef() const; diff --git a/WebKitBrowser/HTML5Notification.h b/WebKitBrowser/HTML5Notification.h index ba5e91af..57cc2ac3 100644 --- a/WebKitBrowser/HTML5Notification.h +++ b/WebKitBrowser/HTML5Notification.h @@ -22,7 +22,7 @@ #include -using namespace WPEFramework; +using namespace Thunder; class HTML5Notification { private: diff --git a/WebKitBrowser/InjectedBundle/AAMPJSBindings.cpp b/WebKitBrowser/InjectedBundle/AAMPJSBindings.cpp index a790b3be..6bf51d1e 100644 --- a/WebKitBrowser/InjectedBundle/AAMPJSBindings.cpp +++ b/WebKitBrowser/InjectedBundle/AAMPJSBindings.cpp @@ -26,7 +26,7 @@ extern "C" { void aamp_SetPageHttpHeaders(const char* headers); } -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace AAMP { @@ -84,4 +84,4 @@ void SetHttpHeaders(const char * headerJson) } // namespace AAMP } // namespace JavaScript -} // namespace WPEFramework +} // namespace Thunder diff --git a/WebKitBrowser/InjectedBundle/AAMPJSBindings.h b/WebKitBrowser/InjectedBundle/AAMPJSBindings.h index 8a792168..6e2ed8eb 100644 --- a/WebKitBrowser/InjectedBundle/AAMPJSBindings.h +++ b/WebKitBrowser/InjectedBundle/AAMPJSBindings.h @@ -22,7 +22,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace AAMP { @@ -34,4 +34,4 @@ void SetHttpHeaders(const char * headerJson); } // namespace AAMP } // namespace JavaScript -} // namespace WPEFramework +} // namespace Thunder diff --git a/WebKitBrowser/InjectedBundle/BridgeObject.cpp b/WebKitBrowser/InjectedBundle/BridgeObject.cpp index c9dcc79a..44d6ed26 100644 --- a/WebKitBrowser/InjectedBundle/BridgeObject.cpp +++ b/WebKitBrowser/InjectedBundle/BridgeObject.cpp @@ -26,7 +26,7 @@ // Global handle to this bundle. extern WKBundleRef g_Bundle; -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace BridgeObject { @@ -237,4 +237,4 @@ bool HandleMessageToPage(WKBundlePageRef page, WKStringRef messageName, WKTypeRe } // namespace BridgeObject } // namespace JavaScript -} // namespace WPEFramework +} // namespace Thunder diff --git a/WebKitBrowser/InjectedBundle/BridgeObject.h b/WebKitBrowser/InjectedBundle/BridgeObject.h index fbbdd887..ccad55fc 100644 --- a/WebKitBrowser/InjectedBundle/BridgeObject.h +++ b/WebKitBrowser/InjectedBundle/BridgeObject.h @@ -22,7 +22,7 @@ #include "../Tags.h" #include "Utils.h" -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace BridgeObject { @@ -31,4 +31,4 @@ void InjectJS(WKBundleFrameRef frame); } // BridgeObject } // JavaScript -} // WPEFramework +} // Thunder diff --git a/WebKitBrowser/InjectedBundle/CMakeLists.txt b/WebKitBrowser/InjectedBundle/CMakeLists.txt index 0d7f6d1c..d0fa4b17 100644 --- a/WebKitBrowser/InjectedBundle/CMakeLists.txt +++ b/WebKitBrowser/InjectedBundle/CMakeLists.txt @@ -34,7 +34,7 @@ add_library(${MODULE_NAME} SHARED RequestHeaders.cpp Utils.cpp JavaScriptFunction.cpp - NotifyWPEFramework.cpp + NotifyThunder.cpp Milestone.cpp ClassDefinition.cpp ../Tags.cpp diff --git a/WebKitBrowser/InjectedBundle/ClassDefinition.cpp b/WebKitBrowser/InjectedBundle/ClassDefinition.cpp index 689abac1..198dae62 100644 --- a/WebKitBrowser/InjectedBundle/ClassDefinition.cpp +++ b/WebKitBrowser/InjectedBundle/ClassDefinition.cpp @@ -20,7 +20,7 @@ #include "ClassDefinition.h" #include -namespace WPEFramework { +namespace Thunder { namespace JavaScript { // Constructor: uses identifier to build class and extension name. diff --git a/WebKitBrowser/InjectedBundle/ClassDefinition.h b/WebKitBrowser/InjectedBundle/ClassDefinition.h index cfe9efa1..7530cfe1 100644 --- a/WebKitBrowser/InjectedBundle/ClassDefinition.h +++ b/WebKitBrowser/InjectedBundle/ClassDefinition.h @@ -27,7 +27,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace JavaScript { class ClassDefinition { diff --git a/WebKitBrowser/InjectedBundle/HawaiiMessage.cpp b/WebKitBrowser/InjectedBundle/HawaiiMessage.cpp index 886c5d3f..f7999cd5 100644 --- a/WebKitBrowser/InjectedBundle/HawaiiMessage.cpp +++ b/WebKitBrowser/InjectedBundle/HawaiiMessage.cpp @@ -23,7 +23,7 @@ unsigned int amazon_player_deinitialize(); -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace Amazon { @@ -215,4 +215,4 @@ namespace Amazon { } // namespace Amazon } // namespace JavaScript -} // namespace WPEFramework +} // namespace Thunder diff --git a/WebKitBrowser/InjectedBundle/JavaScriptFunction.cpp b/WebKitBrowser/InjectedBundle/JavaScriptFunction.cpp index b42ad676..8aaaa5f2 100644 --- a/WebKitBrowser/InjectedBundle/JavaScriptFunction.cpp +++ b/WebKitBrowser/InjectedBundle/JavaScriptFunction.cpp @@ -23,7 +23,7 @@ #include "ClassDefinition.h" -namespace WPEFramework { +namespace Thunder { namespace JavaScript { JavaScriptFunction::JavaScriptFunction(const string& name, const JSObjectCallAsFunctionCallback callback, @@ -55,4 +55,4 @@ namespace JavaScript { return staticFunction; } } // namespace JavaScript -} // namespace WPEFramework +} // namespace Thunder diff --git a/WebKitBrowser/InjectedBundle/JavaScriptFunction.h b/WebKitBrowser/InjectedBundle/JavaScriptFunction.h index 7531beb1..a5fb42b1 100644 --- a/WebKitBrowser/InjectedBundle/JavaScriptFunction.h +++ b/WebKitBrowser/InjectedBundle/JavaScriptFunction.h @@ -27,7 +27,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace JavaScript { class JavaScriptFunction { @@ -56,6 +56,6 @@ namespace JavaScript { std::string NameString; }; } // namespace JavaScript -} // namespace WPEFramework +} // namespace Thunder #endif // __JAVASCRIPTFUNCTION_H diff --git a/WebKitBrowser/InjectedBundle/JavaScriptFunctionType.h b/WebKitBrowser/InjectedBundle/JavaScriptFunctionType.h index 996086e7..a5cd2cce 100644 --- a/WebKitBrowser/InjectedBundle/JavaScriptFunctionType.h +++ b/WebKitBrowser/InjectedBundle/JavaScriptFunctionType.h @@ -23,7 +23,7 @@ #include "ClassDefinition.h" #include "JavaScriptFunction.h" -namespace WPEFramework { +namespace Thunder { namespace JavaScript { diff --git a/WebKitBrowser/InjectedBundle/Milestone.cpp b/WebKitBrowser/InjectedBundle/Milestone.cpp index 570736f9..93c05343 100644 --- a/WebKitBrowser/InjectedBundle/Milestone.cpp +++ b/WebKitBrowser/InjectedBundle/Milestone.cpp @@ -27,7 +27,7 @@ // Global handle to this bundle. extern WKBundleRef g_Bundle; -namespace WPEFramework { +namespace Thunder { namespace JavaScript { diff --git a/WebKitBrowser/InjectedBundle/Milestone.h b/WebKitBrowser/InjectedBundle/Milestone.h index 59230371..7e8bdd32 100644 --- a/WebKitBrowser/InjectedBundle/Milestone.h +++ b/WebKitBrowser/InjectedBundle/Milestone.h @@ -22,7 +22,7 @@ #include "JavaScriptFunctionType.h" -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace Functions { class Milestone { diff --git a/WebKitBrowser/InjectedBundle/NotifyWPEFramework.cpp b/WebKitBrowser/InjectedBundle/NotifyThunder.cpp similarity index 86% rename from WebKitBrowser/InjectedBundle/NotifyWPEFramework.cpp rename to WebKitBrowser/InjectedBundle/NotifyThunder.cpp index 01fa6824..51a87ab2 100644 --- a/WebKitBrowser/InjectedBundle/NotifyWPEFramework.cpp +++ b/WebKitBrowser/InjectedBundle/NotifyThunder.cpp @@ -17,25 +17,25 @@ * limitations under the License. */ -#include "NotifyWPEFramework.h" +#include "NotifyThunder.h" #include "Utils.h" // Global handle to this bundle. extern WKBundleRef g_Bundle; -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace Functions { - NotifyWPEFramework::NotifyWPEFramework() + NotifyThunder::NotifyThunder() { } - // Implementation of JS function: loops over arguments and passes all strings to WPEFramework. - JSValueRef NotifyWPEFramework::HandleMessage(JSContextRef context, JSObjectRef, + // Implementation of JS function: loops over arguments and passes all strings to Thunder. + JSValueRef NotifyThunder::HandleMessage(JSContextRef context, JSObjectRef, JSObjectRef, size_t argumentCount, const JSValueRef arguments[], JSValueRef*) { WKStringRef messageName = WKStringCreateWithUTF8CString(GetMessageName().c_str()); @@ -66,7 +66,7 @@ namespace JavaScript { return JSValueMakeNull(context); } - static JavaScriptFunctionType _instance(_T("wpe")); + static JavaScriptFunctionType _instance(_T("wpe")); } } } diff --git a/WebKitBrowser/InjectedBundle/NotifyWPEFramework.h b/WebKitBrowser/InjectedBundle/NotifyThunder.h similarity index 92% rename from WebKitBrowser/InjectedBundle/NotifyWPEFramework.h rename to WebKitBrowser/InjectedBundle/NotifyThunder.h index 00c1596e..d098f561 100644 --- a/WebKitBrowser/InjectedBundle/NotifyWPEFramework.h +++ b/WebKitBrowser/InjectedBundle/NotifyThunder.h @@ -23,13 +23,13 @@ #include "JavaScriptFunctionType.h" #include "../Tags.h" -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace Functions { - class NotifyWPEFramework { + class NotifyThunder { public: - NotifyWPEFramework(); + NotifyThunder(); JSValueRef HandleMessage(JSContextRef context, JSObjectRef, JSObjectRef, size_t argumentCount, const JSValueRef arguments[], JSValueRef*); diff --git a/WebKitBrowser/InjectedBundle/RequestHeaders.cpp b/WebKitBrowser/InjectedBundle/RequestHeaders.cpp index 7f1c7039..045efee8 100644 --- a/WebKitBrowser/InjectedBundle/RequestHeaders.cpp +++ b/WebKitBrowser/InjectedBundle/RequestHeaders.cpp @@ -35,7 +35,7 @@ #include "Utils.h" -namespace WPEFramework { +namespace Thunder { namespace WebKit { namespace @@ -80,7 +80,7 @@ void SetRequestHeaders(WKBundlePageRef page, WKTypeRef messageBody) if (WKGetTypeID(messageBody) != WKStringGetTypeID()) return; - string message = WPEFramework::WebKit::Utils::WKStringToString(static_cast(messageBody)); + string message = Thunder::WebKit::Utils::WKStringToString(static_cast(messageBody)); #if defined(ENABLE_AAMP_JSBINDINGS) // Pass on HTTP headers to AAMP , if empty, AAMP should clear previose headers set @@ -118,4 +118,4 @@ void ApplyRequestHeaders(WKBundlePageRef page, WKURLRequestRef requestRef) } } // WebKit -} // WPEFramework +} // Thunder diff --git a/WebKitBrowser/InjectedBundle/RequestHeaders.h b/WebKitBrowser/InjectedBundle/RequestHeaders.h index 90813352..b890c043 100644 --- a/WebKitBrowser/InjectedBundle/RequestHeaders.h +++ b/WebKitBrowser/InjectedBundle/RequestHeaders.h @@ -24,7 +24,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace WebKit { void SetRequestHeaders(WKBundlePageRef, WKTypeRef); @@ -32,4 +32,4 @@ void RemoveRequestHeaders(WKBundlePageRef); void ApplyRequestHeaders(WKBundlePageRef, WKURLRequestRef); } // WebKit -} // WPEFramework +} // Thunder diff --git a/WebKitBrowser/InjectedBundle/SecurityAgent.cpp b/WebKitBrowser/InjectedBundle/SecurityAgent.cpp index b501cb9b..4f237531 100644 --- a/WebKitBrowser/InjectedBundle/SecurityAgent.cpp +++ b/WebKitBrowser/InjectedBundle/SecurityAgent.cpp @@ -22,7 +22,7 @@ #include "../Tags.h" #include -namespace WPEFramework { +namespace Thunder { namespace JavaScript { namespace Functions { class token { diff --git a/WebKitBrowser/InjectedBundle/Utils.cpp b/WebKitBrowser/InjectedBundle/Utils.cpp index 080720a3..b9d13bfc 100644 --- a/WebKitBrowser/InjectedBundle/Utils.cpp +++ b/WebKitBrowser/InjectedBundle/Utils.cpp @@ -22,7 +22,7 @@ using std::unique_ptr; using std::vector; -namespace WPEFramework { +namespace Thunder { namespace WebKit { namespace Utils { diff --git a/WebKitBrowser/InjectedBundle/Utils.h b/WebKitBrowser/InjectedBundle/Utils.h index 900a73a0..4ff9288d 100644 --- a/WebKitBrowser/InjectedBundle/Utils.h +++ b/WebKitBrowser/InjectedBundle/Utils.h @@ -27,7 +27,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace WebKit { namespace Utils { void AppendStringToWKArray(const string& item, WKMutableArrayRef array); diff --git a/WebKitBrowser/InjectedBundle/WhiteListedOriginDomainsList.cpp b/WebKitBrowser/InjectedBundle/WhiteListedOriginDomainsList.cpp index b5847408..564ad649 100644 --- a/WebKitBrowser/InjectedBundle/WhiteListedOriginDomainsList.cpp +++ b/WebKitBrowser/InjectedBundle/WhiteListedOriginDomainsList.cpp @@ -31,7 +31,7 @@ using std::vector; using std::cerr; using std::endl; -namespace WPEFramework { +namespace Thunder { namespace WebKit { // Parses JSON containing white listed CORS origin-domain pairs. @@ -90,8 +90,8 @@ namespace WebKit { } } - // Gets white list from WPEFramework via synchronous message. - /* static */unique_ptr WhiteListedOriginDomainsList::RequestFromWPEFramework(const char* /* whitelist */) + // Gets white list from Thunder via synchronous message. + /* static */unique_ptr WhiteListedOriginDomainsList::RequestFromThunder(const char* /* whitelist */) { string messageName(string(Tags::Config) + "Whitelist"); std::string utf8MessageName = Core::ToString(messageName.c_str()); diff --git a/WebKitBrowser/InjectedBundle/WhiteListedOriginDomainsList.h b/WebKitBrowser/InjectedBundle/WhiteListedOriginDomainsList.h index d4104d50..8fcbe81b 100644 --- a/WebKitBrowser/InjectedBundle/WhiteListedOriginDomainsList.h +++ b/WebKitBrowser/InjectedBundle/WhiteListedOriginDomainsList.h @@ -26,7 +26,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace WebKit { class WhiteListedOriginDomainsList { @@ -40,7 +40,7 @@ namespace WebKit { typedef std::map WhiteMap; public: - static std::unique_ptr RequestFromWPEFramework(const char* whitelist = nullptr); + static std::unique_ptr RequestFromThunder(const char* whitelist = nullptr); ~WhiteListedOriginDomainsList() { } diff --git a/WebKitBrowser/InjectedBundle/main.cpp b/WebKitBrowser/InjectedBundle/main.cpp index ad4f302e..bd1f1e60 100644 --- a/WebKitBrowser/InjectedBundle/main.cpp +++ b/WebKitBrowser/InjectedBundle/main.cpp @@ -33,7 +33,7 @@ #include #include "ClassDefinition.h" -#include "NotifyWPEFramework.h" +#include "NotifyThunder.h" #include "Utils.h" #include "WhiteListedOriginDomainsList.h" #include "RequestHeaders.h" @@ -50,13 +50,13 @@ #include "TimeZoneSupport.h" #endif -using namespace WPEFramework; +using namespace Thunder; using JavaScript::ClassDefinition; WKBundleRef g_Bundle; std::string g_currentURL; -namespace WPEFramework { +namespace Thunder { namespace WebKit { namespace Utils { @@ -110,7 +110,7 @@ static class PluginHost { // Due to the LXC container support all ID's get mapped. For the TraceBuffer, use the host given ID. Messaging::MessageUnit::Instance().Open(_comClient->ConnectionId()); } - _whiteListedOriginDomainPairs = WhiteListedOriginDomainsList::RequestFromWPEFramework(); + _whiteListedOriginDomainPairs = WhiteListedOriginDomainsList::RequestFromThunder(); #if defined(UPDATE_TZ_FROM_FILE) _tzSupport.Initialize(); @@ -154,13 +154,13 @@ static class PluginHost { // White list for CORS. std::unique_ptr _whiteListedOriginDomainPairs; -} _wpeFrameworkClient; +} _thunderClient; extern "C" { __attribute__((destructor)) static void unload() { - _wpeFrameworkClient.Deinitialize(); + _thunderClient.Deinitialize(); } // Adds class to JS world. @@ -404,7 +404,7 @@ static WKBundleClientV1 s_bundleClient = { WKBundlePageSetResourceLoadClient(page, &s_resourceLoadClient.base); - _wpeFrameworkClient.WhiteList(bundle); + _thunderClient.WhiteList(bundle); }, willDestroyPage, // willDestroyPage nullptr, // didInitializePageGroup @@ -419,7 +419,7 @@ EXTERNAL void WKBundleInitialize(WKBundleRef bundle, WKTypeRef) { g_Bundle = bundle; - _wpeFrameworkClient.Initialize(bundle); + _thunderClient.Initialize(bundle); WKBundleSetClient(bundle, &s_bundleClient.base); } @@ -427,5 +427,5 @@ EXTERNAL void WKBundleInitialize(WKBundleRef bundle, WKTypeRef) } // explicit instantiation so that -O1/2/3 flags do not introduce undefined symbols -template uint32_t WPEFramework::Core::IPCMessageType<2u, WPEFramework::RPC::Data::Input, WPEFramework::RPC::Data::Output>::RawSerializedType::AddRef() const; -template uint32_t WPEFramework::Core::IPCMessageType<2u, WPEFramework::RPC::Data::Input, WPEFramework::RPC::Data::Output>::RawSerializedType::AddRef() const; +template uint32_t Thunder::Core::IPCMessageType<2u, Thunder::RPC::Data::Input, Thunder::RPC::Data::Output>::RawSerializedType::AddRef() const; +template uint32_t Thunder::Core::IPCMessageType<2u, Thunder::RPC::Data::Input, Thunder::RPC::Data::Output>::RawSerializedType::AddRef() const; diff --git a/WebKitBrowser/LoggingUtils.cpp b/WebKitBrowser/LoggingUtils.cpp index fddf76f2..eda097fe 100644 --- a/WebKitBrowser/LoggingUtils.cpp +++ b/WebKitBrowser/LoggingUtils.cpp @@ -29,7 +29,7 @@ #include "Module.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { bool RedirectAllLogsToService(const string& target_service) @@ -53,7 +53,7 @@ bool RedirectAllLogsToService(const string& target_service) } // Add all threads of current process to target systemd cgroup - WPEFramework::Core::Directory taskDir("/proc/self/task"); + Thunder::Core::Directory taskDir("/proc/self/task"); while (taskDir.Next() == true) { if (taskDir.Name() == "." || taskDir.Name() == "..") { continue; diff --git a/WebKitBrowser/LoggingUtils.h b/WebKitBrowser/LoggingUtils.h index b5597675..4d9ec12a 100644 --- a/WebKitBrowser/LoggingUtils.h +++ b/WebKitBrowser/LoggingUtils.h @@ -21,7 +21,7 @@ #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { bool RedirectAllLogsToService(const string& target_service); diff --git a/WebKitBrowser/Tags.cpp b/WebKitBrowser/Tags.cpp index 4569877f..2fbe568c 100644 --- a/WebKitBrowser/Tags.cpp +++ b/WebKitBrowser/Tags.cpp @@ -19,7 +19,7 @@ #include "Tags.h" -namespace WPEFramework { +namespace Thunder { namespace Tags { diff --git a/WebKitBrowser/Tags.h b/WebKitBrowser/Tags.h index 07711f06..c3426d31 100644 --- a/WebKitBrowser/Tags.h +++ b/WebKitBrowser/Tags.h @@ -19,7 +19,7 @@ #pragma once -namespace WPEFramework { +namespace Thunder { namespace Tags { diff --git a/WebKitBrowser/TimeZone/TimeZoneSupport.cpp b/WebKitBrowser/TimeZone/TimeZoneSupport.cpp index e5387c50..df60d612 100644 --- a/WebKitBrowser/TimeZone/TimeZoneSupport.cpp +++ b/WebKitBrowser/TimeZone/TimeZoneSupport.cpp @@ -27,7 +27,7 @@ const char *kTimeZoneFile = TZ_FILE; const char *kTimeZoneFile = "/opt/persistent/timeZoneDST"; #endif -namespace WPEFramework { +namespace Thunder { namespace TZ { diff --git a/WebKitBrowser/TimeZone/TimeZoneSupport.h b/WebKitBrowser/TimeZone/TimeZoneSupport.h index 4fccc24d..b359bd5d 100644 --- a/WebKitBrowser/TimeZone/TimeZoneSupport.h +++ b/WebKitBrowser/TimeZone/TimeZoneSupport.h @@ -23,7 +23,7 @@ #include "Module.h" #include -namespace WPEFramework { +namespace Thunder { namespace TZ { class TimeZoneSupport { public: diff --git a/WebKitBrowser/WebKitBrowser.cpp b/WebKitBrowser/WebKitBrowser.cpp index 56c9be0e..ec55326c 100644 --- a/WebKitBrowser/WebKitBrowser.cpp +++ b/WebKitBrowser/WebKitBrowser.cpp @@ -19,7 +19,7 @@ #include "WebKitBrowser.h" -namespace WPEFramework { +namespace Thunder { namespace Plugin { @@ -87,7 +87,7 @@ namespace Plugin { const RPC::IRemoteConnection *connection = _service->RemoteConnection(_connectionId); if (connection != nullptr) { - _memory = WPEFramework::WebKitBrowser::MemoryObserver(connection); + _memory = Thunder::WebKitBrowser::MemoryObserver(connection); ASSERT(_memory != nullptr); connection->Release(); } @@ -240,12 +240,12 @@ namespace Plugin { if (request.Verb == Web::Request::HTTP_GET) { bool visible = false; - static_cast(_application)->Visible(visible); + static_cast(_application)->Visible(visible); PluginHost::IStateControl::state currentState = stateControl->State(); Core::ProxyType> body(_jsonBodyDataFactory.Element()); ASSERT(body.IsValid() == true); string url; - static_cast(_browser)->URL(url); + static_cast(_browser)->URL(url); body->URL = url; uint8_t fps = 0; _browser->FPS(fps); @@ -658,4 +658,4 @@ namespace WebKitBrowser { -} // WPEFramework +} // Thunder diff --git a/WebKitBrowser/WebKitBrowser.h b/WebKitBrowser/WebKitBrowser.h index ab7c0099..dbe52579 100644 --- a/WebKitBrowser/WebKitBrowser.h +++ b/WebKitBrowser/WebKitBrowser.h @@ -32,7 +32,7 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace WebKitBrowser { // An implementation file needs to implement this method to return an operational browser, wherever that would be :-) @@ -200,7 +200,7 @@ namespace Plugin { // The lifetime of the Service object is guaranteed till the deinitialize method is called. const string Initialize(PluginHost::IShell* service) override; - // The plugin is unloaded from WPEFramework. This is call allows the module to notify clients + // The plugin is unloaded from Thunder. This is call allows the module to notify clients // or to persist information if needed. After this call the plugin will unlink from the service path // and be deactivated. The Service object is the same as passed in during the Initialize. // After theis call, the lifetime of the Service object ends. diff --git a/WebKitBrowser/WebKitBrowserJsonRpc.cpp b/WebKitBrowser/WebKitBrowserJsonRpc.cpp index 9cace46b..31b0972e 100644 --- a/WebKitBrowser/WebKitBrowserJsonRpc.cpp +++ b/WebKitBrowser/WebKitBrowserJsonRpc.cpp @@ -23,14 +23,14 @@ #include #include -namespace WPEFramework { +namespace Thunder { namespace Plugin { using namespace JsonData::Browser; using namespace JsonData::WebBrowser; using namespace JsonData::StateControl; - using namespace WPEFramework::Exchange; + using namespace Thunder::Exchange; // Registration // @@ -188,4 +188,4 @@ namespace Plugin { } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/WebKitBrowser/WebKitBrowserPlugin.json b/WebKitBrowser/WebKitBrowserPlugin.json index 3569e9aa..50943b52 100644 --- a/WebKitBrowser/WebKitBrowserPlugin.json +++ b/WebKitBrowser/WebKitBrowserPlugin.json @@ -3,7 +3,7 @@ "info": { "title": "WebKit Browser Plugin", "callsign": "WebKitBrowser", - "locator": "libWPEFrameworkWebKitBrowser.so", + "locator": "libThunderWebKitBrowser.so", "status": "production", "description": "The WebKitBrowser plugin provides web browsing functionality based on the WebKit engine.", "version": "1.0" diff --git a/WebKitBrowser/WebKitImplementation.cpp b/WebKitBrowser/WebKitImplementation.cpp index dd42fc5e..470443d3 100644 --- a/WebKitBrowser/WebKitImplementation.cpp +++ b/WebKitBrowser/WebKitImplementation.cpp @@ -92,7 +92,7 @@ WK_EXPORT void WKPreferencesSetPageCacheEnabled(WKPreferencesRef preferences, bo #include #endif // ENABLE_TESTING -namespace WPEFramework { +namespace Thunder { namespace Plugin { #ifndef WEBKIT_GLIB_API @@ -2761,7 +2761,7 @@ static GSourceFuncs _handlerIntervention = GVariant* data = g_variant_new("(smsb)", std::to_string(browser->_guid).c_str(), !browser->_config.Whitelist.Value().empty() ? browser->_config.Whitelist.Value().c_str() : nullptr, browser->_config.LogToSystemConsoleEnabled.Value()); webkit_web_context_set_web_extensions_initialization_user_data(context, data); } - static void wpeNotifyWPEFrameworkMessageReceivedCallback(WebKitUserContentManager*, WebKitJavascriptResult* message, WebKitImplementation* browser) + static void wpeNotifyThunderMessageReceivedCallback(WebKitUserContentManager*, WebKitJavascriptResult* message, WebKitImplementation* browser) { ASSERT(browser != nullptr); JSCValue* args = webkit_javascript_result_get_js_value(message); @@ -3176,10 +3176,10 @@ static GSourceFuncs _handlerIntervention = } auto* userContentManager = webkit_web_view_get_user_content_manager(_view); - // webkit_user_content_manager_register_script_message_handler_in_world(userContentManager, "wpeNotifyWPEFramework", std::to_string(_guid).c_str()); - g_signal_connect(userContentManager, "script-message-received::wpeNotifyWPEFramework", - reinterpret_cast(wpeNotifyWPEFrameworkMessageReceivedCallback), this); - webkit_user_content_manager_register_script_message_handler(userContentManager, "wpeNotifyWPEFramework"); + // webkit_user_content_manager_register_script_message_handler_in_world(userContentManager, "wpeNotifyThunder", std::to_string(_guid).c_str()); + g_signal_connect(userContentManager, "script-message-received::wpeNotifyThunder", + reinterpret_cast(wpeNotifyThunderMessageReceivedCallback), this); + webkit_user_content_manager_register_script_message_handler(userContentManager, "wpeNotifyThunder"); SetupUserContentFilter(); TryLoadingUserScripts(); @@ -3222,8 +3222,8 @@ static GSourceFuncs _handlerIntervention = if (frameDisplayedCallbackID) webkit_web_view_remove_frame_displayed_callback(_view, frameDisplayedCallbackID); - // webkit_user_content_manager_unregister_script_message_handler_in_world(userContentManager, "wpeNotifyWPEFramework", std::to_string(_guid).c_str()); - webkit_user_content_manager_unregister_script_message_handler(userContentManager, "wpeNotifyWPEFramework"); + // webkit_user_content_manager_unregister_script_message_handler_in_world(userContentManager, "wpeNotifyThunder", std::to_string(_guid).c_str()); + webkit_user_content_manager_unregister_script_message_handler(userContentManager, "wpeNotifyThunder"); g_clear_object(&_view); g_main_context_pop_thread_default(_context); @@ -3248,7 +3248,7 @@ static GSourceFuncs _handlerIntervention = std::unique_ptr bundlePath( g_build_filename(_dataPath.c_str(), _config.InjectedBundle.Value().c_str(), nullptr) ); if (g_file_test(bundlePath.get(), G_FILE_TEST_EXISTS) == false) { - bundlePath.reset( g_build_filename("/usr/share/WPEFramework/WebKitBrowser/", _config.InjectedBundle.Value().c_str(), nullptr) ); + bundlePath.reset( g_build_filename("/usr/share/Thunder/WebKitBrowser/", _config.InjectedBundle.Value().c_str(), nullptr) ); } WKStringRef injectedBundlePathString = WKStringCreateWithUTF8CString(bundlePath.get()); WKContextConfigurationSetInjectedBundlePath(contextConfiguration, injectedBundlePathString); @@ -3954,4 +3954,4 @@ static GSourceFuncs _handlerIntervention = #endif // !WEBKIT_GLIB_API } // namespace Plugin -} // namespace WPEFramework +} // namespace Thunder diff --git a/WebKitBrowser/cmake/FindWPEWebKit.cmake b/WebKitBrowser/cmake/FindWPEWebKit.cmake index 89a5467d..2efb0eed 100644 --- a/WebKitBrowser/cmake/FindWPEWebKit.cmake +++ b/WebKitBrowser/cmake/FindWPEWebKit.cmake @@ -17,12 +17,12 @@ # - Try to find WPEWebKit # Once done this will define -# WPE_WEBKIT_FOUND - System has WPEFrameworkPlugins -# WPE_WEBKIT_INCLUDE_DIRS - The WPEFrameworkPlugins include directories -# WPE_WEBKIT_LIBRARIES - The libraries needed to use WPEFrameworkPlugins +# WPE_WEBKIT_FOUND - System has ThunderPlugins +# WPE_WEBKIT_INCLUDE_DIRS - The ThunderPlugins include directories +# WPE_WEBKIT_LIBRARIES - The libraries needed to use ThunderPlugins # -# Be extremely careful! WPEFRAMEWORK_PLUGINS_INCLUDE_DIRS and WPE_WEBKIT_LIBRARIES is already defined in -# WPEFramework/Source/plugins!! +# Be extremely careful! THUNDER_PLUGINS_INCLUDE_DIRS and WPE_WEBKIT_LIBRARIES is already defined in +# Thunder/Source/plugins!! # So here we purposely left one underscore away find_package(PkgConfig) @@ -115,4 +115,4 @@ if(WPEWebKit_FOUND AND NOT TARGET WPEWebKit::WPEWebKit) INTERFACE_COMPILE_OPTIONS "${WPE_WEBKIT_CFLAGS}" INTERFACE_INCLUDE_DIRECTORIES "${WPE_WEBKIT_INCLUDE_DIRS}" ) -endif() +endif() \ No newline at end of file diff --git a/WebKitBrowser/doc/WebKitBrowserPlugin.md b/WebKitBrowser/doc/WebKitBrowserPlugin.md index ce2e640c..b9270646 100644 --- a/WebKitBrowser/doc/WebKitBrowserPlugin.md +++ b/WebKitBrowser/doc/WebKitBrowserPlugin.md @@ -57,7 +57,7 @@ The table below provides and overview of terms and abbreviations used in this do | [HTTP](http://www.w3.org/Protocols) | HTTP specification | | [JSON-RPC](https://www.jsonrpc.org/specification) | JSON-RPC 2.0 specification | | [JSON](http://www.json.org/) | JSON specification | -| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20WPEFramework.docx) | Thunder API Reference | +| [Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20Thunder.docx) | Thunder API Reference | # Description @@ -75,7 +75,7 @@ The table below lists configuration options of the plugin. | :-------- | :-------- | :-------- | | callsign | string | Plugin instance name (default: *WebKitBrowser*) | | classname | string | Class name: *WebKitBrowser* | -| locator | string | Library name: *libWPEFrameworkWebKitBrowser.so* | +| locator | string | Library name: *libThunderWebKitBrowser.so* | | startmode | string | Determines if the plugin shall be started automatically along with the framework | | configuration | object | *(optional)* | | configuration?.useragent | string | *(optional)* The UserAgent used during communication with the web server |