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

[Commits to the Hydra project code repositories]

branch "master" has been updated
       via  6fb9b5778d4d006cddd0c9426ab0a6ed4c8d97f7 (commit)
      from  e5e47a301864f573c3f0ce5422982dc7182d0534 (commit)

Summary of changes:
 Core/CMakeLists.txt                                |    5 ++++-
 .../RoutingI.ice => Endpoint/EndpointI.ice~}       |    0
 Core/Routing/RoutingI.ice                          |   11 +++++++----
 Media/MediaI.ice                                   |    2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)
 copy Core/{Routing/RoutingI.ice => Endpoint/EndpointI.ice~} (100%)


- Log -----------------------------------------------------------------
commit 6fb9b5778d4d006cddd0c9426ab0a6ed4c8d97f7
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu Aug 5 18:47:01 2010 -0500

    Added Endpoint slice definitions.

diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index 4cd5a18..2692c3d 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -5,4 +5,7 @@ hydra_compile_slice(ServiceLocatorI.ice lib "Slice Defined API" Core)
 hydra_compile_slice(ServiceLocatorEventsI.ice lib "Slice Defined API" Core)
 
 # Slice definitions for Routing functionality
-add_subdirectory(Routing)
\ No newline at end of file
+add_subdirectory(Routing)
+
+# Slice definitions for Endpoint functionality
+add_subdirectory(Endpoint)
\ No newline at end of file
diff --git a/Core/Routing/RoutingI.ice b/Core/Endpoint/EndpointI.ice~
similarity index 100%
copy from Core/Routing/RoutingI.ice
copy to Core/Endpoint/EndpointI.ice~
diff --git a/Core/Routing/RoutingI.ice b/Core/Routing/RoutingI.ice
index 27b013f..c9f6082 100644
--- a/Core/Routing/RoutingI.ice
+++ b/Core/Routing/RoutingI.ice
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "Core/Endpoint/EndpointI.ice"
+
 module Hydra
 {
 module Core
@@ -28,7 +30,7 @@ module V1
        * Returns the endpoints that match the specified destination id. 
        *   @param id String identifier of the the destination. 
        */
-      idempotent Channel::EndpointSeq lookup(string destination) 
+      idempotent EndpointSeq lookup(string destination) 
          throws DestinationNotFoundException, InvalidParamsException;
    };
 
@@ -54,13 +56,14 @@ module V1
        */
       void removeEndpointLocator(string id) throws DestinationNotFoundException;
 
-      // Changes the range of device ids managed by a given channel. 
+      // Changes the range of device ids accessible via given EndpointLocator. 
       /**
        * Modify the range of device ids managed by a previously added EndpointLocator. 
+       *   @param id A unique identifier for the added EndpointLocator. 
        *   @param A list of reqular expressions that define the the valid endpoint ids. This 
        *     set of regular expressions completely replaces the current set. 
        */
-      void setEndpointLocatorDeviceIds(string channelId, RegExSeq deviceIdRangeList) 
+      void setEndpointLocatorDeviceIds(string id, RegExSeq deviceIdRangeList) 
          throws DestinationNotFoundException, InvalidParamsException;
    };
 
@@ -119,7 +122,7 @@ module V1
           *  @param id The identifier of the EndpointLocator being removed. 
           *  @param result Indicates whether or not the attempt was successful.
           */
-         void removeEndpointLocatorEvent(string channelId, OperationResult result);
+         void removeEndpointLocatorEvent(string id, OperationResult result);
 
          /**
           * Notification that an attempt was made to modify the range of destinationIds 
diff --git a/Media/MediaI.ice b/Media/MediaI.ice
index e86cd10..e6a0c0e 100644
--- a/Media/MediaI.ice
+++ b/Media/MediaI.ice
@@ -1,5 +1,5 @@
 #include <Ice/BuiltinSequences.ice>
-#include "core/ServiceLocatorI.ice"
+#include "Core/ServiceLocatorI.ice"
 
 module Hydra
 {

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


-- 
hydra/slice.git