[hydra-commits] hydra/slice.git branch "master" updated.

[Commits to the Hydra project code repositories]

branch "master" has been updated
       via  93f20faf759f9a4aadb1956d2e00cf3bad268617 (commit)
       via  c2a3985066785aaf9ac7e1e5e28328948c82cde1 (commit)
      from  2772a4e1c825354dc3a6aea1461d55de175ebc5d (commit)

Summary of changes:
 CMakeLists.txt                                     |    3 +++
 Core/Bridging/BridgeServiceIf.ice                  |    8 +++-----
 Core/CMakeLists.txt                                |    2 --
 Core/Channel/ChannelServiceIf.ice                  |    4 ++--
 System/CMakeLists.txt                              |    3 +++
 System/Component/CMakeLists.txt                    |    2 ++
 .../Component/ComponentServiceIf.ice               |    9 ++++++---
 7 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 System/CMakeLists.txt
 create mode 100644 System/Component/CMakeLists.txt
 rename Core/ServiceIf.ice => System/Component/ComponentServiceIf.ice (94%)


- Log -----------------------------------------------------------------
commit 93f20faf759f9a4aadb1956d2e00cf3bad268617
Merge: c2a3985 2772a4e
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Aug 6 16:50:39 2010 -0230

    Merge branch 'master' of ssh://git.asterisk.org/hydra/slice


commit c2a3985066785aaf9ac7e1e5e28328948c82cde1
Author: Brent Eagles <beagles at digium.com>
Date:   Fri Aug 6 16:49:51 2010 -0230

    Moved ServiceIf.ice to System/Component/ComponentServiceIf.ice and
    updated dependent and related files.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a1fd90..63aa4ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,3 +6,6 @@ add_subdirectory(Core)
 
 # Slice definitions for media functionality
 add_subdirectory(Media)
+
+# Slice definitions for system infrastructure
+add_subdirectory(System)
diff --git a/Core/Bridging/BridgeServiceIf.ice b/Core/Bridging/BridgeServiceIf.ice
index b1f4da2..1ae02d8 100644
--- a/Core/Bridging/BridgeServiceIf.ice
+++ b/Core/Bridging/BridgeServiceIf.ice
@@ -1,7 +1,6 @@
-#ifndef __HYDRA_BRIDGING_SERVICE_ICE
-#define __HYDRA_BRIDGING_SERVICE_ICE
+#pragma once 
 
-#include <Core/ServiceIf.ice>
+#include <System/Component/ComponentServiceIf.ice>
 #include <Core/Channel/ChannelServiceIf.ice>
 
 module Hydra
@@ -81,7 +80,7 @@ module V1
       bool onShutdownCompleted();
    };
 
-   interface BridgeFactory extends V1::Service
+   interface BridgeFactory extends System::Component::V1::ComponentService
    {
       Bridge* createBridge(Channel::V1::SessionEndpoint adminEndpoint, Channel::V1::SessionEndpointSeq eps, 
 	CallManager* manager);
@@ -90,4 +89,3 @@ module V1
 };
 };
 };
-#endif
diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index 10def36..80b1a22 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -1,8 +1,6 @@
 # Slice definitions for Discovery functionality
 add_subdirectory(Discovery)
 
-hydra_compile_slice(ServiceIf.ice lib "Slice Defined API" Core)
-
 # Slice definitions for Endpoint functionality
 add_subdirectory(Endpoint)
 
diff --git a/Core/Channel/ChannelServiceIf.ice b/Core/Channel/ChannelServiceIf.ice
index 01f0297..913427c 100644
--- a/Core/Channel/ChannelServiceIf.ice
+++ b/Core/Channel/ChannelServiceIf.ice
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Core/Endpoint/EndpointI.ice>
-#include <Core/ServiceIf.ice>
+#include <System/Component/ComponentServiceIf.ice>
 #include <Media/MediaI.ice>
 
 module Hydra
@@ -63,7 +63,7 @@ module V1
     * A ChannelService is a session-oriented ep manager. 
     *
     */
-   interface ChannelService extends V1::Service
+   interface ChannelService extends System::Component::V1::ComponentService
    {
       SessionInfoSeq listCurrentSessions();
       SessionEndpoint getEndpoint(Endpoint::V1::EndpointId id);
diff --git a/System/CMakeLists.txt b/System/CMakeLists.txt
new file mode 100644
index 0000000..b688aa9
--- /dev/null
+++ b/System/CMakeLists.txt
@@ -0,0 +1,3 @@
+# Slice definitions for Component functionality 
+add_subdirectory(Component)
+
diff --git a/System/Component/CMakeLists.txt b/System/Component/CMakeLists.txt
new file mode 100644
index 0000000..fafe3e9
--- /dev/null
+++ b/System/Component/CMakeLists.txt
@@ -0,0 +1,2 @@
+# Compile Component API 
+hydra_compile_slice(ComponentServiceIf.ice lib "ComponentService API" System)
diff --git a/Core/ServiceIf.ice b/System/Component/ComponentServiceIf.ice
similarity index 94%
rename from Core/ServiceIf.ice
rename to System/Component/ComponentServiceIf.ice
index 11b5593..0cd1a12 100644
--- a/Core/ServiceIf.ice
+++ b/System/Component/ComponentServiceIf.ice
@@ -1,7 +1,9 @@
 #pragma once
 module Hydra
 {
-module Core
+module System
+{
+module Component
 {
 module V1
 {
@@ -23,7 +25,7 @@ module V1
     * Service is the base interface for all Hydra services. Most components will include an implementation
     * of this or a derived interface.
     */
-   interface Service
+   interface ComponentService
    {
       /**
        * Suspends activity in the service. In general this means that the primary activity of a service
@@ -55,6 +57,7 @@ module V1
    };
 
 }; // End of module V1
-}; // End of module Core
+}; // End of module Component
+}; // End of module System
 }; // End of module Hydra
 

-----------------------------------------------------------------------


-- 
hydra/slice.git