Move system-server under server/system.

Change-Id: I2bfdf2a7d49b626161c37d6ebc062c0cf9fff39c
Signed-off-by: Hokwon Song <hokwon.song@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ab8193..99bad42 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,4 +78,4 @@ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/security/inc/ DESTINATION include/osp/
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/system/inc/ DESTINATION include/osp/system FILES_MATCHING PATTERN "*.h")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/text/inc/ DESTINATION include/osp/text FILES_MATCHING PATTERN "*.h")
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/server/appfw/inc/ DESTINATION include/osp/server/appfw/ FILES_MATCHING PATTERN "*.h")
-INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/system-server/inc/ DESTINATION include/osp/server/ FILES_MATCHING PATTERN "*.h")
+INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/server/system/inc/ DESTINATION include/osp/server/system/ FILES_MATCHING PATTERN "*.h")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5ae838e..2013365 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -60,4 +60,4 @@ ADD_SUBDIRECTORY(text)
 ADD_SUBDIRECTORY(appfw)
 ADD_SUBDIRECTORY(osp-string)
 ADD_SUBDIRECTORY(server)
-ADD_SUBDIRECTORY(system-server osp-system-server)
+ADD_SUBDIRECTORY(server/system osp-system-server)

diff --git a/src/system-server/CMakeLists.txt b/src/server/system/CMakeLists.txt
similarity index 98%
rename from src/system-server/CMakeLists.txt
rename to src/server/system/CMakeLists.txt
index feadf23..59f1039 100644 (file)
--- a/src/system-server/CMakeLists.txt
+++ b/src/server/system/CMakeLists.txt
@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES (
        ${CMAKE_SOURCE_DIR}/inc
        ${CMAKE_SOURCE_DIR}/src/app/inc
        ${CMAKE_SOURCE_DIR}/src/base/inc
-       ${CMAKE_SOURCE_DIR}/src/system-server/inc
+       ${CMAKE_SOURCE_DIR}/src/server/system/inc
        ${CMAKE_SOURCE_DIR}/src/io/inc
        ${CMAKE_SOURCE_DIR}/src/server/inc
        ${CMAKE_SOURCE_DIR}/src/system/inc

diff --git a/src/system-server/device/FSys_DeviceManager.cpp b/src/server/system/device/FSys_DeviceManager.cpp
similarity index 100%
rename from src/system-server/device/FSys_DeviceManager.cpp
rename to src/server/system/device/FSys_DeviceManager.cpp

diff --git a/src/system-server/inc/FSys_DeviceManager.h b/src/server/system/inc/FSys_DeviceManager.h
similarity index 100%
rename from src/system-server/inc/FSys_DeviceManager.h
rename to src/server/system/inc/FSys_DeviceManager.h

diff --git a/src/system-server/inc/FSys_PowerManager.h b/src/server/system/inc/FSys_PowerManager.h
similarity index 100%
rename from src/system-server/inc/FSys_PowerManager.h
rename to src/server/system/inc/FSys_PowerManager.h

diff --git a/src/system-server/inc/FSys_RuntimeInfo.h b/src/server/system/inc/FSys_RuntimeInfo.h
similarity index 100%
rename from src/system-server/inc/FSys_RuntimeInfo.h
rename to src/server/system/inc/FSys_RuntimeInfo.h

diff --git a/src/system-server/inc/FSys_SettingInfo.h b/src/server/system/inc/FSys_SettingInfo.h
similarity index 100%
rename from src/system-server/inc/FSys_SettingInfo.h
rename to src/server/system/inc/FSys_SettingInfo.h

diff --git a/src/system-server/inc/FSys_SystemInfo.h b/src/server/system/inc/FSys_SystemInfo.h
similarity index 100%
rename from src/system-server/inc/FSys_SystemInfo.h
rename to src/server/system/inc/FSys_SystemInfo.h

diff --git a/src/system-server/power/FSys_PowerManager.cpp b/src/server/system/power/FSys_PowerManager.cpp
similarity index 100%
rename from src/system-server/power/FSys_PowerManager.cpp
rename to src/server/system/power/FSys_PowerManager.cpp

diff --git a/src/system-server/runtime/FSys_RuntimeInfo.cpp b/src/server/system/runtime/FSys_RuntimeInfo.cpp
similarity index 100%
rename from src/system-server/runtime/FSys_RuntimeInfo.cpp
rename to src/server/system/runtime/FSys_RuntimeInfo.cpp

diff --git a/src/system-server/setting/FSys_SettingInfo.cpp b/src/server/system/setting/FSys_SettingInfo.cpp
similarity index 100%
rename from src/system-server/setting/FSys_SettingInfo.cpp
rename to src/server/system/setting/FSys_SettingInfo.cpp

diff --git a/src/system-server/setting/providers/FSys_ISettingProvider.h b/src/server/system/setting/providers/FSys_ISettingProvider.h
similarity index 100%
rename from src/system-server/setting/providers/FSys_ISettingProvider.h
rename to src/server/system/setting/providers/FSys_ISettingProvider.h

diff --git a/src/system-server/setting/providers/FSys_Icu.cpp b/src/server/system/setting/providers/FSys_Icu.cpp
similarity index 100%
rename from src/system-server/setting/providers/FSys_Icu.cpp
rename to src/server/system/setting/providers/FSys_Icu.cpp

diff --git a/src/system-server/setting/providers/FSys_Icu.h b/src/server/system/setting/providers/FSys_Icu.h
similarity index 100%
rename from src/system-server/setting/providers/FSys_Icu.h
rename to src/server/system/setting/providers/FSys_Icu.h

diff --git a/src/system-server/setting/providers/FSys_SettingApplicationProvider.cpp b/src/server/system/setting/providers/FSys_SettingApplicationProvider.cpp
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingApplicationProvider.cpp
rename to src/server/system/setting/providers/FSys_SettingApplicationProvider.cpp

diff --git a/src/system-server/setting/providers/FSys_SettingApplicationProvider.h b/src/server/system/setting/providers/FSys_SettingApplicationProvider.h
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingApplicationProvider.h
rename to src/server/system/setting/providers/FSys_SettingApplicationProvider.h

diff --git a/src/system-server/setting/providers/FSys_SettingFontProvider.cpp b/src/server/system/setting/providers/FSys_SettingFontProvider.cpp
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingFontProvider.cpp
rename to src/server/system/setting/providers/FSys_SettingFontProvider.cpp

diff --git a/src/system-server/setting/providers/FSys_SettingFontProvider.h b/src/server/system/setting/providers/FSys_SettingFontProvider.h
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingFontProvider.h
rename to src/server/system/setting/providers/FSys_SettingFontProvider.h

diff --git a/src/system-server/setting/providers/FSys_SettingGeneralProvider.cpp b/src/server/system/setting/providers/FSys_SettingGeneralProvider.cpp
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingGeneralProvider.cpp
rename to src/server/system/setting/providers/FSys_SettingGeneralProvider.cpp

diff --git a/src/system-server/setting/providers/FSys_SettingGeneralProvider.h b/src/server/system/setting/providers/FSys_SettingGeneralProvider.h
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingGeneralProvider.h
rename to src/server/system/setting/providers/FSys_SettingGeneralProvider.h

diff --git a/src/system-server/setting/providers/FSys_SettingLocaleProvider.cpp b/src/server/system/setting/providers/FSys_SettingLocaleProvider.cpp
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingLocaleProvider.cpp
rename to src/server/system/setting/providers/FSys_SettingLocaleProvider.cpp

diff --git a/src/system-server/setting/providers/FSys_SettingLocaleProvider.h b/src/server/system/setting/providers/FSys_SettingLocaleProvider.h
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingLocaleProvider.h
rename to src/server/system/setting/providers/FSys_SettingLocaleProvider.h

diff --git a/src/system-server/setting/providers/FSys_SettingLocationProvider.cpp b/src/server/system/setting/providers/FSys_SettingLocationProvider.cpp
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingLocationProvider.cpp
rename to src/server/system/setting/providers/FSys_SettingLocationProvider.cpp

diff --git a/src/system-server/setting/providers/FSys_SettingLocationProvider.h b/src/server/system/setting/providers/FSys_SettingLocationProvider.h
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingLocationProvider.h
rename to src/server/system/setting/providers/FSys_SettingLocationProvider.h

diff --git a/src/system-server/setting/providers/FSys_SettingNetworkProvider.cpp b/src/server/system/setting/providers/FSys_SettingNetworkProvider.cpp
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingNetworkProvider.cpp
rename to src/server/system/setting/providers/FSys_SettingNetworkProvider.cpp

diff --git a/src/system-server/setting/providers/FSys_SettingNetworkProvider.h b/src/server/system/setting/providers/FSys_SettingNetworkProvider.h
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingNetworkProvider.h
rename to src/server/system/setting/providers/FSys_SettingNetworkProvider.h

diff --git a/src/system-server/setting/providers/FSys_SettingScreenProvider.cpp b/src/server/system/setting/providers/FSys_SettingScreenProvider.cpp
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingScreenProvider.cpp
rename to src/server/system/setting/providers/FSys_SettingScreenProvider.cpp

diff --git a/src/system-server/setting/providers/FSys_SettingScreenProvider.h b/src/server/system/setting/providers/FSys_SettingScreenProvider.h
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingScreenProvider.h
rename to src/server/system/setting/providers/FSys_SettingScreenProvider.h

diff --git a/src/system-server/setting/providers/FSys_SettingSoundProvider.cpp b/src/server/system/setting/providers/FSys_SettingSoundProvider.cpp
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingSoundProvider.cpp
rename to src/server/system/setting/providers/FSys_SettingSoundProvider.cpp

diff --git a/src/system-server/setting/providers/FSys_SettingSoundProvider.h b/src/server/system/setting/providers/FSys_SettingSoundProvider.h
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingSoundProvider.h
rename to src/server/system/setting/providers/FSys_SettingSoundProvider.h

diff --git a/src/system-server/setting/providers/FSys_SettingSpeechProvider.cpp b/src/server/system/setting/providers/FSys_SettingSpeechProvider.cpp
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingSpeechProvider.cpp
rename to src/server/system/setting/providers/FSys_SettingSpeechProvider.cpp

diff --git a/src/system-server/setting/providers/FSys_SettingSpeechProvider.h b/src/server/system/setting/providers/FSys_SettingSpeechProvider.h
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingSpeechProvider.h
rename to src/server/system/setting/providers/FSys_SettingSpeechProvider.h

diff --git a/src/system-server/setting/providers/FSys_SettingStorageProvider.cpp b/src/server/system/setting/providers/FSys_SettingStorageProvider.cpp
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingStorageProvider.cpp
rename to src/server/system/setting/providers/FSys_SettingStorageProvider.cpp

diff --git a/src/system-server/setting/providers/FSys_SettingStorageProvider.h b/src/server/system/setting/providers/FSys_SettingStorageProvider.h
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingStorageProvider.h
rename to src/server/system/setting/providers/FSys_SettingStorageProvider.h

diff --git a/src/system-server/setting/providers/FSys_SettingVibrationProvider.cpp b/src/server/system/setting/providers/FSys_SettingVibrationProvider.cpp
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingVibrationProvider.cpp
rename to src/server/system/setting/providers/FSys_SettingVibrationProvider.cpp

diff --git a/src/system-server/setting/providers/FSys_SettingVibrationProvider.h b/src/server/system/setting/providers/FSys_SettingVibrationProvider.h
similarity index 100%
rename from src/system-server/setting/providers/FSys_SettingVibrationProvider.h
rename to src/server/system/setting/providers/FSys_SettingVibrationProvider.h

diff --git a/src/system-server/system/FSys_SystemInfo.cpp b/src/server/system/system/FSys_SystemInfo.cpp
similarity index 100%
rename from src/system-server/system/FSys_SystemInfo.cpp
rename to src/server/system/system/FSys_SystemInfo.cpp