Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renaming WPEFramework to Thunder #1598

Merged
merged 3 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
38 changes: 19 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,38 @@ Makefile
*/Makefile
*/*/Makefile
*/*/*/Makefile
*/*/WPEFramework*Config.cmake
*/*/WPEFramework*ConfigVersion.cmake
*/*/Thunder*Config.cmake
*/*/Thunder*ConfigVersion.cmake
*/*/CompileSettingsDebugConfig.cmake
*/*/CompileSettingsDebugConfigVersion.cmake
*/*/*/WPEFramework*Config.cmake
*/*/*/WPEFramework*ConfigVersion.cmake
*/*/*/Thunder*Config.cmake
*/*/*/Thunder*ConfigVersion.cmake
*.pc
*.so.*
*.so
/cppcheck_report.txt
/cppcheck_log.txt
clion-environment/
/clion-environment/WPEFrameworkPlugins/RemoteControl/RemoteControl.json
/clion-environment/WPEFrameworkPlugins/Commander/Commander.json
/clion-environment/WPEFrameworkPlugins/DeviceInfo/DeviceInfo.json
/clion-environment/WPEFrameworkPlugins/LocationSync/LocationSync.json
/clion-environment/WPEFrameworkPlugins/Monitor/Monitor.json
/clion-environment/WPEFrameworkPlugins/TimeSync/TimeSync.json
/clion-environment/WPEFrameworkPlugins/TraceControl/Tracing.json
/clion-environment/WPEFrameworkPlugins/WebProxy/WebProxy.json
/clion-environment/WPEFrameworkPlugins/WebServer/WebServer.json
/clion-environment/WPEFrameworkPlugins/WebShell/WebShell.json
/clion-environment/ThunderPlugins/RemoteControl/RemoteControl.json
/clion-environment/ThunderPlugins/Commander/Commander.json
/clion-environment/ThunderPlugins/DeviceInfo/DeviceInfo.json
/clion-environment/ThunderPlugins/LocationSync/LocationSync.json
/clion-environment/ThunderPlugins/Monitor/Monitor.json
/clion-environment/ThunderPlugins/TimeSync/TimeSync.json
/clion-environment/ThunderPlugins/TraceControl/Tracing.json
/clion-environment/ThunderPlugins/WebProxy/WebProxy.json
/clion-environment/ThunderPlugins/WebServer/WebServer.json
/clion-environment/ThunderPlugins/WebShell/WebShell.json
workspace/
/.vs
/artifacts/Debug
*.user
/artifacts/Release
*.pyc
Source/WPEFramework/WPEFramework
Source/WPEFramework/WPEFramework-1.0.0
Source/WPEProcess/WPEProcess
Source/WPEProcess/WPEProcess-1.0.0
Source/WPEFramework/scripts/wpeframework
Source/Thunder/Thunder
Source/Thunder/Thunder-1.0.0
Source/ThunderPlugin/ThunderPlugin
Source/ThunderPlugin/ThunderPlugin-1.0.0
Source/Thunder/scripts/wpeframework
*/*/generated/
site/
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

cmake_minimum_required(VERSION 3.3)

project(WPEFramework)
project(Thunder)

set(VERSION_MAJOR 1)
set(VERSION_MINOR 0)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
![Linux Build](https://github.com/rdkcentral/Thunder/actions/workflows/Build%20Thunder%20on%20Linux.yml/badge.svg) ![Windows Build](https://github.com/rdkcentral/Thunder/actions/workflows/Build%20Thunder%20on%20Windows.yml/badge.svg) ![Unit Test](https://github.com/rdkcentral/Thunder/actions/workflows/Test%20Thunder.yml/badge.svg)


Thunder (also known as WPEFramework) is an open-source plugin-based device abstraction layer, where business functionality can be implemented as plugins and applications can query and control those plugins. Using Thunder provides a consistent interface-driven development model for both plugins and client applications, with an RPC engine that is suited to both web-based and native apps.
Thunder (also known as Thunder) is an open-source plugin-based device abstraction layer, where business functionality can be implemented as plugins and applications can query and control those plugins. Using Thunder provides a consistent interface-driven development model for both plugins and client applications, with an RPC engine that is suited to both web-based and native apps.

Designed from the ground up for embedded platforms and written in C++11, Thunder can be run on even the most low-power of devices (including ARM and MIPS-based platforms).

Expand Down
4 changes: 2 additions & 2 deletions Source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ if(PLUGINS)
endif()

if(PROCESS)
add_subdirectory(WPEProcess)
add_subdirectory(ThunderPlugin)
endif()

if(EXECUTABLE)
add_subdirectory(WPEFramework)
add_subdirectory(Thunder)
endif()
10 changes: 5 additions & 5 deletions Source/WPEFramework.sln → Source/Thunder.sln
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interfaces", "interfaces\in
{B63FDAE4-53A4-4B19-BFEC-6E6A2EF841F5} = {B63FDAE4-53A4-4B19-BFEC-6E6A2EF841F5}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comprocess", "WPEProcess\comprocess.vcxproj", "{B88DE14D-3E0D-440E-A753-CE7ADD5DF3CA}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comprocess", "ThunderPlugin\comprocess.vcxproj", "{B88DE14D-3E0D-440E-A753-CE7ADD5DF3CA}"
ProjectSection(ProjectDependencies) = postProject
{0936A7B8-E995-452D-8062-CA9311854018} = {0936A7B8-E995-452D-8062-CA9311854018}
{B63FDAE4-53A4-4B19-BFEC-6E6A2EF841F5} = {B63FDAE4-53A4-4B19-BFEC-6E6A2EF841F5}
{0CA4C3EA-2DD4-4BB3-804C-331D09CC3402} = {0CA4C3EA-2DD4-4BB3-804C-331D09CC3402}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bridge", "WPEFramework\bridge.vcxproj", "{F3DF5408-637E-49DB-BF6B-0B7D17509AC0}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bridge", "Thunder\bridge.vcxproj", "{F3DF5408-637E-49DB-BF6B-0B7D17509AC0}"
ProjectSection(ProjectDependencies) = postProject
{B88DE14D-3E0D-440E-A753-CE7ADD5DF3CA} = {B88DE14D-3E0D-440E-A753-CE7ADD5DF3CA}
{6A3B427D-D8AF-4D2A-B400-924D2596DCF7} = {6A3B427D-D8AF-4D2A-B400-924D2596DCF7}
Expand Down Expand Up @@ -107,9 +107,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSONRPCClient", "..\..\Thun
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Configurations", "Configurations", "{008FC636-F920-4BA2-B90F-F100E723FA51}"
ProjectSection(SolutionItems) = preProject
WPEFramework\ExampleConfigAll.json = WPEFramework\ExampleConfigAll.json
WPEFramework\ExampleConfigLinux.json = WPEFramework\ExampleConfigLinux.json
WPEFramework\ExampleConfigWindows.json = WPEFramework\ExampleConfigWindows.json
Thunder\ExampleConfigAll.json = Thunder\ExampleConfigAll.json
Thunder\ExampleConfigLinux.json = Thunder\ExampleConfigLinux.json
Thunder\ExampleConfigWindows.json = Thunder\ExampleConfigWindows.json
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Thunder", "Thunder", "{D7AD4AF2-B32F-44C6-9F19-90484D586346}"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion Source/WPEFramework/Config.h → Source/Thunder/Config.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "Module.h"


namespace WPEFramework {
namespace Thunder {

namespace PluginHost {
/**
Expand Down
13 changes: 13 additions & 0 deletions Source/Thunder/ConfigBuildroot.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"port":9888,
"binding":"0.0.0.0",
"idletime":180,
"persistentpath":"/tmp",
"datapath":"/opt/thunder/Plugins/",
"plugins":
[
{"callsign":"Tracing","locator":"/opt/thunder/libtracecontrol.so", "classname":"TraceControl", "configuration":{"console":true,"remote":{"port":4444,"binding":"0.0.0.0"}}},
{"callsign":"FanControl", "locator":"/opt/thunder/libfancontrol.so", "classname":"FanControl", "configuration":{"deviceid":"/dev/ttyACM0"}},
{"callsign":"DelayedResponse", "locator":"/opt/thunder/libdelayedresponse.so", "classname":"DelayedResponse", "configuration":{"minimum":0,"maximum":30}}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include <plugins/json/json_IController.h>

namespace WPEFramework {
namespace Thunder {

namespace {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <plugins/json/JsonData_Events.h>
#include <plugins/json/JEvents.h>

namespace WPEFramework {
namespace Thunder {
namespace Plugin {

PUSH_WARNING(DISABLE_WARNING_DEPRECATED_USE) // for now we must support the deprecated interface for backwards compatibility reasons
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"binding":"0.0.0.0",
"idletime":180,
"persistentpath":"/tmp",
"datapath":"/usr/share/wpeframework/",
"systempath":"/usr/lib/wpeframework/",
"datapath":"/usr/share/thunder/",
"systempath":"/usr/lib/thunder/",
"webserver":"/boot/www",
"plugins":
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"binding":"0.0.0.0",
"idletime":180,
"persistentpath":"/tmp",
"datapath":"/usr/share/wpeframework/",
"systempath":"/usr/lib/wpeframework/",
"datapath":"/usr/share/thunder/",
"systempath":"/usr/lib/thunder/",
"webserver":"/boot/www",
"plugins":
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ else()
CUSTOM_PARAMS_WHITELIST "${CMAKE_CURRENT_LIST_DIR}/params.config"
INSTALL_PATH "../${CMAKE_INSTALL_SYSCONFDIR}/${NAMESPACE}/"
INSTALL_NAME "config.json"
PLUGINS "WPEFramework"
PLUGINS "Thunder"
)

endif(CMAKE_VERSION VERSION_LESS 3.20.0 AND LEGACY_CONFIG_GENERATOR)
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "Module.h"

namespace WPEFramework {
namespace Thunder {
namespace PluginHost {

struct IRemoteInstantiation : virtual public Core::IUnknown {
Expand Down
2 changes: 1 addition & 1 deletion Source/WPEFramework/Module.h → Source/Thunder/Module.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#define TREE_REFERENCE engineering_build_for_debug_purpose_only
#endif

namespace WPEFramework {
namespace Thunder {
namespace PluginHost {
static constexpr uint8_t Major = 4;
static constexpr uint8_t Minor = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

MODULE_NAME_DECLARATION(BUILD_REFERENCE)

namespace WPEFramework {
namespace Thunder {
static PluginHost::Config* _config = nullptr;
static PluginHost::Server* _dispatcher = nullptr;
static bool _background = false;
Expand Down Expand Up @@ -79,7 +79,7 @@ namespace PluginHost {
}
};

class AdapterObserver : public WPEFramework::Core::AdapterObserver::INotification {
class AdapterObserver : public Thunder::Core::AdapterObserver::INotification {
public:
static int32_t constexpr WaitTime = 3000; //Just wait for 3 seconds

Expand Down Expand Up @@ -165,7 +165,7 @@ POP_WARNING()
static void StartShutdown() {
_adminLock.Lock();
if ((_dispatcher != nullptr) && (_instance == nullptr)) {
_instance = new WPEFramework::PluginHost::ExitHandler(_dispatcher);
_instance = new Thunder::PluginHost::ExitHandler(_dispatcher);
_dispatcher = nullptr;
_instance->Run();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "../extensions/hibernate/hibernate.h"
#endif

namespace WPEFramework {
namespace Thunder {

ENUM_CONVERSION_BEGIN(Core::ProcessInfo::scheduler)

Expand Down Expand Up @@ -369,7 +369,7 @@ namespace PluginHost {
_reason = why;
State(PRECONDITION);

if (WPEFramework::Messaging::LocalLifetimeType<Activity, &WPEFramework::Core::System::MODULE_NAME, WPEFramework::Core::Messaging::Metadata::type::TRACING>::IsEnabled() == true) {
if (Thunder::Messaging::LocalLifetimeType<Activity, &Thunder::Core::System::MODULE_NAME, Thunder::Core::Messaging::Metadata::type::TRACING>::IsEnabled() == true) {
string feedback;
uint8_t index = 1;
uint32_t delta(_precondition.Delta(_administrator.SubSystemInfo().Value()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

#define MAX_EXTERNAL_WAITS 2000 /* Wait for 2 Seconds */

namespace WPEFramework {
namespace Thunder {

namespace Core {
namespace System {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include "PluginServer.h"

namespace WPEFramework {
namespace Thunder {

namespace PluginHost {

Expand All @@ -43,4 +43,4 @@ namespace PluginHost {
}
}

} } // WPEFramework::PluginHost
} } // Thunder::PluginHost
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "Module.h"

namespace WPEFramework {
namespace Thunder {
namespace PluginHost {

class CallstackData : public Core::JSON::Container {
Expand Down
2 changes: 1 addition & 1 deletion Source/WPEFramework/Probe.cpp → Source/Thunder/Probe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include "Probe.h"

namespace WPEFramework {
namespace Thunder {
namespace Plugin {

/* static */ const string Probe::SearchTarget(_T("urn:metrological-com:service:wpe:1"));
Expand Down
2 changes: 1 addition & 1 deletion Source/WPEFramework/Probe.h → Source/Thunder/Probe.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <provision/Signature.h>
#endif

namespace WPEFramework {
namespace Thunder {
namespace Plugin {

class Probe {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

#include "SystemInfo.h"
namespace WPEFramework {
namespace Thunder {
namespace PluginHost {

PUSH_WARNING(DISABLE_WARNING_THIS_IN_MEMBER_INITIALIZER_LIST)
Expand Down Expand Up @@ -275,4 +275,4 @@ POP_WARNING()
}

} //namspace Plugin
} // namespace WPEFramework
} // namespace Thunder
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "Module.h"
#include "Config.h"

namespace WPEFramework {
namespace Thunder {
namespace PluginHost {

class SystemInfo : public PluginHost::ISubSystem {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "Module.h"
#include "WarningReportingCategories.h"

namespace WPEFramework {
namespace Thunder {

namespace WarningReporting {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "Module.h"

namespace WPEFramework {
namespace Thunder {
namespace WarningReporting {

class EXTERNAL TooLongPluginState {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ The table below provides and overview of terms and abbreviations used in this do
| <a name="ref.HTTP">[HTTP](http://www.w3.org/Protocols)</a> | HTTP specification |
| <a name="ref.JSON-RPC">[JSON-RPC](https://www.jsonrpc.org/specification)</a> | JSON-RPC 2.0 specification |
| <a name="ref.JSON">[JSON](http://www.json.org/)</a> | JSON specification |
| <a name="ref.Thunder">[Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20WPEFramework.docx)</a> | Thunder API Reference |
| <a name="ref.Thunder">[Thunder](https://github.com/WebPlatformForEmbedded/Thunder/blob/master/doc/WPE%20-%20API%20-%20Thunder.docx)</a> | Thunder API Reference |

<a name="head.Configuration"></a>
# Configuration
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,29 @@ set(SYSTEMD_SERVICE "false" CACHE STRING "Select systemd service scripts, by def
set(SYSTEM_ROOT_PATH "root" CACHE STRING "System root directory location")

if (SYSTEMD_SERVICE)
file(READ wpeframework.service.in WPEFRAMEWORK_SYSTEMD_SERVICE)
file(READ thunder.service.in THUNDER_SYSTEMD_SERVICE)
string(
REGEX REPLACE "EXTRA_DEPENDS" "${SYSTEMD_EXTRA_DEPENDS}"
MOD_WPEFRAMEWORK_SYSTEMD_SERVICE "${WPEFRAMEWORK_SYSTEMD_SERVICE}"
MOD_THUNDER_SYSTEMD_SERVICE "${THUNDER_SYSTEMD_SERVICE}"
)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/wpeframework.service "${MOD_WPEFRAMEWORK_SYSTEMD_SERVICE}")
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/thunder.service "${MOD_THUNDER_SYSTEMD_SERVICE}")

install(DIRECTORY DESTINATION ${CMAKE_INSTALL_PREFIX}/../${CMAKE_INSTALL_LIBDIR})
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/wpeframework.service
FILES ${CMAKE_CURRENT_BINARY_DIR}/thunder.service
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
DESTINATION ${CMAKE_INSTALL_PREFIX}/../${SYSTEMD_INSTALL_PATH}/system/
)
else()
file(READ wpeframework.in WPEFRAMEWORK_INITD)
file(READ thunder.in THUNDER_INITD)
string(
REGEX REPLACE "ROOT_PATH" "${SYSTEM_ROOT_PATH}/${NAMESPACE}"
MOD_WPEFRAMEWORK_INITD "${WPEFRAMEWORK_INITD}"
MOD_THUNDER_INITD "${THUNDER_INITD}"
)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/wpeframework "${MOD_WPEFRAMEWORK_INITD}")
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/thunder "${MOD_THUNDER_INITD}")

install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/wpeframework
FILES ${CMAKE_CURRENT_BINARY_DIR}/thunder
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
DESTINATION ../${CMAKE_INSTALL_SYSCONFDIR}/init.d/
)
Expand Down
Loading
Loading