Move files to separated directories

Creates directories:
 - aul/app_manager
 - aul/common
 - aul/socket

Change-Id: I86a89dccad8bddf0c13082467e5f5c52eec6371f
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bde5d3e..0284f51 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,9 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/feature)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/aul)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/aul/api)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/aul/app_manager)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/aul/common)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/aul/socket)
 
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Wl,-zdefs" )
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
@@ -66,10 +69,16 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed")
 AUX_SOURCE_DIRECTORY(src SOURCES)
 AUX_SOURCE_DIRECTORY(aul AUL_SOURCES)
 AUX_SOURCE_DIRECTORY(aul/api AUL_API_SOURCES)
+AUX_SOURCE_DIRECTORY(aul/app_manager AUL_APP_MANAGER_SOURCES)
+AUX_SOURCE_DIRECTORY(aul/common AUL_COMMON_SOURCES)
+AUX_SOURCE_DIRECTORY(aul/socket AUL_SOCKET_SOURCES)
 add_library(aul SHARED
        ${SOURCES}
        ${AUL_SOURCES}
-       ${AUL_API_SOURCES})
+       ${AUL_API_SOURCES}
+       ${AUL_APP_MANAGER_SOURCES}
+       ${AUL_COMMON_SOURCES}
+       ${AUL_SOCKET_SOURCES})
 TARGET_LINK_LIBRARIES(aul ${libpkgs_LDFLAGS})
 SET_TARGET_PROPERTIES(aul PROPERTIES SOVERSION ${MAJORVER})
 SET_TARGET_PROPERTIES(aul PROPERTIES VERSION ${FULLVER})

diff --git a/aul/api/aul_app_context.cc b/aul/api/aul_app_context.cc
index 99788c6..6238865 100644 (file)
--- a/aul/api/aul_app_context.cc
+++ b/aul/api/aul_app_context.cc
@@ -19,10 +19,10 @@
 #include <tizen.h>
 #include <unistd.h>
 
-#include "aul/api.hh"
 #include "aul/api/aul_app_context.h"
-#include "aul/app_manager.hh"
-#include "aul/log_private.hh"
+#include "aul/app_manager/app_manager.hh"
+#include "aul/common/api.hh"
+#include "aul/common/log_private.hh"
 
 using namespace aul;
 

diff --git a/aul/api/aul_app_event.cc b/aul/api/aul_app_event.cc
index 0f3f7b2..77fce7c 100644 (file)
--- a/aul/api/aul_app_event.cc
+++ b/aul/api/aul_app_event.cc
@@ -15,10 +15,10 @@
  */
 
 #include "aul/api/aul_app_event.h"
-#include "aul/api.hh"
-#include "aul/app_event.hh"
-#include "aul/exception.hh"
-#include "aul/log_private.hh"
+#include "aul/app_manager/app_event.hh"
+#include "aul/common/api.hh"
+#include "aul/common/exception.hh"
+#include "aul/common/log_private.hh"
 
 namespace {
 using namespace aul;

diff --git a/aul/api/aul_app_manager.cc b/aul/api/aul_app_manager.cc
index c9387fb..07b71ec 100644 (file)
--- a/aul/api/aul_app_manager.cc
+++ b/aul/api/aul_app_manager.cc
@@ -16,10 +16,10 @@
 
 #include <tizen.h>
 
-#include "aul/api.hh"
 #include "aul/api/aul_app_manager.h"
-#include "aul/app_manager.hh"
-#include "aul/log_private.hh"
+#include "aul/app_manager/app_manager.hh"
+#include "aul/common/api.hh"
+#include "aul/common/log_private.hh"
 
 using namespace aul;
 

diff --git a/aul/app_context.cc b/aul/app_manager/app_context.cc
similarity index 98%
rename from aul/app_context.cc
rename to aul/app_manager/app_context.cc
index ab017ba..7bd494f 100644 (file)
--- a/aul/app_context.cc
+++ b/aul/app_manager/app_context.cc
@@ -16,8 +16,8 @@
 
 #include <memory>
 
+#include "aul/app_manager/app_context.hh"
 #include "include/aul.h"
-#include "aul/app_context.hh"
 
 namespace aul {
 

diff --git a/aul/app_context.hh b/aul/app_manager/app_context.hh
similarity index 94%
rename from aul/app_context.hh
rename to aul/app_manager/app_context.hh
index 0b28e39..d997b37 100644 (file)
--- a/aul/app_context.hh
+++ b/aul/app_manager/app_context.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef AUL_APP_CONTEXT_HH_
-#define AUL_APP_CONTEXT_HH_
+#ifndef AUL_APP_MANAGER_APP_CONTEXT_HH_
+#define AUL_APP_MANAGER_APP_CONTEXT_HH_
 
 #include <bundle_cpp.h>
 
@@ -82,4 +82,4 @@ class AppContext {
 
 }  // namespace aul
 
-#endif  // AUL_APP_CONTEXT_HH_
+#endif  // AUL_APP_MANAGER_APP_CONTEXT_HH_

diff --git a/aul/app_event.cc b/aul/app_manager/app_event.cc
similarity index 93%
rename from aul/app_event.cc
rename to aul/app_manager/app_event.cc
index 1ae4a94..d5c0eb7 100644 (file)
--- a/aul/app_event.cc
+++ b/aul/app_manager/app_event.cc
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "aul/app_event.hh"
-#include "aul/exception.hh"
-#include "aul/log_private.hh"
+#include "aul/app_manager/app_event.hh"
+#include "aul/common/exception.hh"
+#include "aul/common/log_private.hh"
 
 namespace aul {
 

diff --git a/aul/app_event.hh b/aul/app_manager/app_event.hh
similarity index 87%
rename from aul/app_event.hh
rename to aul/app_manager/app_event.hh
index f1cd75b..cfc19ca 100644 (file)
--- a/aul/app_event.hh
+++ b/aul/app_manager/app_event.hh
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#ifndef AUL_APP_EVENT_HH_
-#define AUL_APP_EVENT_HH_
+#ifndef AUL_APP_MANAGER__APP_EVENT_HH_
+#define AUL_APP_MANAGER_APP_EVENT_HH_
 
 #include <string>
 
-#include "aul/app_context.hh"
+#include "aul/app_manager/app_context.hh"
 #include "include/aul.h"
 
 namespace aul {
@@ -46,4 +46,4 @@ class AppEvent {
 
 }  // namespace aul
 
-#endif  // AUL_APP_EVENT_HH_
+#endif  // AUL_APP_MANAGER_APP_EVENT_HH_

diff --git a/aul/app_manager.cc b/aul/app_manager/app_manager.cc
similarity index 96%
rename from aul/app_manager.cc
rename to aul/app_manager/app_manager.cc
index a883351..2832999 100644 (file)
--- a/aul/app_manager.cc
+++ b/aul/app_manager/app_manager.cc
@@ -16,10 +16,10 @@
 
 #include <tizen.h>
 
-#include "aul/app_manager.hh"
-#include "aul/client.hh"
-#include "aul/exception.hh"
-#include "aul/log_private.hh"
+#include "aul/app_manager/app_manager.hh"
+#include "aul/common/exception.hh"
+#include "aul/common/log_private.hh"
+#include "aul/socket/client.hh"
 #include "include/aul.h"
 #include "include/aul_cmd.h"
 #include "include/aul_error.h"

diff --git a/aul/app_manager.hh b/aul/app_manager/app_manager.hh
similarity index 87%
rename from aul/app_manager.hh
rename to aul/app_manager/app_manager.hh
index 7eaba70..136c849 100644 (file)
--- a/aul/app_manager.hh
+++ b/aul/app_manager/app_manager.hh
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#ifndef AUL_APP_MANAGER_HH_
-#define AUL_APP_MANAGER_HH_
+#ifndef AUL_APP_MANAGER_APP_MANAGER_HH_
+#define AUL_APP_MANAGER_APP_MANAGER_HH_
 
 #include <memory>
 #include <string>
 #include <list>
 
-#include "aul/app_context.hh"
-#include "aul/packet.hh"
+#include "aul/app_manager/app_context.hh"
+#include "aul/socket/packet.hh"
 #include "include/aul.h"
 
 namespace aul {
@@ -50,4 +50,4 @@ class AppManager {
 
 }  // namespace aul
 
-#endif  // AUL_APP_MANAGER_HH_
+#endif  // AUL_APP_MANAGER_APP_MANAGER_HH_

diff --git a/aul/api.hh b/aul/common/api.hh
similarity index 89%
rename from aul/api.hh
rename to aul/common/api.hh
index bb3d002..b763d59 100644 (file)
--- a/aul/api.hh
+++ b/aul/common/api.hh
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#ifndef AUL_API_HH_
-#define AUL_API_HH_
+#ifndef AUL_COMMON_API_HH_
+#define AUL_COMMON_API_HH_
 
 #ifdef API
 #undef API
 #endif
 #define API __attribute__ ((visibility("default")))
 
-#endif  // AUL_API_HH_
+#endif  // AUL_COMMON_API_HH_

diff --git a/aul/exception.hh b/aul/common/exception.hh
similarity index 90%
rename from aul/exception.hh
rename to aul/common/exception.hh
index 8f6b38d..37f54c9 100644 (file)
--- a/aul/exception.hh
+++ b/aul/common/exception.hh
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#ifndef AUL_EXCEPTION_HH_
-#define AUL_EXCEPTION_HH_
+#ifndef AUL_COMMON_EXCEPTION_HH_
+#define AUL_COMMON_EXCEPTION_HH_
 
 #include <string>
 #include <exception>
 
-#include "aul/log_private.hh"
+#include "aul/common/log_private.hh"
 
 #define THROW(error_code) throw Exception(error_code)
 
@@ -53,4 +53,4 @@ class Exception : public std::exception {
 
 }  // namespace aul
 
-#endif  // AUL_EXCEPTION_HH_
+#endif  // AUL_COMMON_EXCEPTION_HH_

diff --git a/aul/log_private.hh b/aul/common/log_private.hh
similarity index 88%
rename from aul/log_private.hh
rename to aul/common/log_private.hh
index eec2b9c..ba6f565 100644 (file)
--- a/aul/log_private.hh
+++ b/aul/common/log_private.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef AUL_LOG_PRIVATE_HH_
-#define AUL_LOG_PRIVATE_HH_
+#ifndef AUL_COMMON_LOG_PRIVATE_HH_
+#define AUL_COMMON_LOG_PRIVATE_HH_
 
 #include <dlog.h>
 
@@ -34,4 +34,4 @@
 #undef _D
 #define _D LOGD
 
-#endif  // AUL_LOG_PRIVATE_HH_
+#endif  // AUL_COMMON_LOG_PRIVATE_HH_

diff --git a/aul/client.cc b/aul/socket/client.cc
similarity index 94%
rename from aul/client.cc
rename to aul/socket/client.cc
index 20a83bb..4949dba 100644 (file)
--- a/aul/client.cc
+++ b/aul/socket/client.cc
@@ -16,10 +16,10 @@
 
 #include <unistd.h>
 
-#include "aul/client.hh"
-#include "aul/exception.hh"
-#include "aul/log_private.hh"
-#include "aul/parcel.hh"
+#include "aul/common/exception.hh"
+#include "aul/common/log_private.hh"
+#include "aul/socket/client.hh"
+#include "aul/socket/parcel.hh"
 
 namespace aul {
 

diff --git a/aul/client.hh b/aul/socket/client.hh
similarity index 83%
rename from aul/client.hh
rename to aul/socket/client.hh
index 7bac6b9..27a3eb4 100644 (file)
--- a/aul/client.hh
+++ b/aul/socket/client.hh
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef AUL_CLIENT_HH_
-#define AUL_CLIENT_HH_
+#ifndef AUL_SOCKET_CLIENT_HH_
+#define AUL_SOCKET_CLIENT_HH_
 
-#include "aul/packet.hh"
-#include "aul/socket.hh"
+#include "aul/socket/packet.hh"
+#include "aul/socket/socket.hh"
 
 namespace aul {
 
@@ -32,4 +32,4 @@ class Client : public Socket {
 
 }  // namespace aul
 
-#endif  // AUL_CLIENT_HH_
+#endif  // AUL_SOCKET_CLIENT_HH_

diff --git a/aul/packet.cc b/aul/socket/packet.cc
similarity index 97%
rename from aul/packet.cc
rename to aul/socket/packet.cc
index 7a7e331..d312441 100644 (file)
--- a/aul/packet.cc
+++ b/aul/socket/packet.cc
@@ -16,8 +16,8 @@
 
 #include <memory>
 
-#include "aul/packet.hh"
-#include "aul/parcel.hh"
+#include "aul/socket/packet.hh"
+#include "aul/socket/parcel.hh"
 
 namespace aul {
 

diff --git a/aul/packet.hh b/aul/socket/packet.hh
similarity index 91%
rename from aul/packet.hh
rename to aul/socket/packet.hh
index da68553..0cc3245 100644 (file)
--- a/aul/packet.hh
+++ b/aul/socket/packet.hh
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#ifndef AUL_PACKET_HH_
-#define AUL_PACKET_HH_
+#ifndef AUL_SOCKET_PACKET_HH_
+#define AUL_SOCKET_PACKET_HH_
 
 #include <bundle_cpp.h>
 
 #include <vector>
 
-#include "aul/parcel.hh"
+#include "aul/socket/parcel.hh"
 
 namespace aul {
 
@@ -54,4 +54,4 @@ class Packet {
 
 }  // namespace aul
 
-#endif  // AUL_PACKET_HH_
+#endif  // AUL_SOCKET_PACKET_HH_

diff --git a/aul/parcel.cc b/aul/socket/parcel.cc
similarity index 97%
rename from aul/parcel.cc
rename to aul/socket/parcel.cc
index 02f0f7c..a860339 100644 (file)
--- a/aul/parcel.cc
+++ b/aul/socket/parcel.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "aul/parcel.hh"
+#include "aul/socket/parcel.hh"
 
 namespace aul {
 

diff --git a/aul/parcel.hh b/aul/socket/parcel.hh
similarity index 94%
rename from aul/parcel.hh
rename to aul/socket/parcel.hh
index 2a52fe0..3358353 100644 (file)
--- a/aul/parcel.hh
+++ b/aul/socket/parcel.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef AUL_PARCEL_HH_
-#define AUL_PARCEL_HH_
+#ifndef AUL_SOCKET_PARCEL_HH_
+#define AUL_SOCKET_PARCEL_HH_
 
 #include <vector>
 
@@ -58,4 +58,4 @@ class Parcel {
 
 }  // namespace aul
 
-#endif  // AUL_PARCEL_HH_
+#endif  // AUL_SOCKET_PARCEL_HH_

diff --git a/aul/socket.cc b/aul/socket/socket.cc
similarity index 98%
rename from aul/socket.cc
rename to aul/socket/socket.cc
index a693cab..6307a2a 100644 (file)
--- a/aul/socket.cc
+++ b/aul/socket/socket.cc
@@ -18,8 +18,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "aul/log_private.hh"
-#include "aul/socket.hh"
+#include "aul/common/log_private.hh"
+#include "aul/socket/socket.hh"
 
 namespace aul {
 

diff --git a/aul/socket.hh b/aul/socket/socket.hh
similarity index 93%
rename from aul/socket.hh
rename to aul/socket/socket.hh
index d774304..00d9e07 100644 (file)
--- a/aul/socket.hh
+++ b/aul/socket/socket.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef AUL_SOCKET_HH_
-#define AUL_SOCKET_HH_
+#ifndef AUL_SOCKET_SOCKET_HH_
+#define AUL_SOCKET_SOCKET_HH_
 
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -56,4 +56,4 @@ class Socket {
 
 }  // namespace aul
 
-#endif  // AUL_SOCKET_HH_
+#endif  // AUL_SOCKET_SOCKET_HH_