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

[Commits to the Hydra project code repositories]

branch "master" has been updated
       via  2886381a2c693563ed1a8955e32e4105d6da6fc0 (commit)
       via  c36e7dca2d4d5a403d304758a496c2d1a8afd2fa (commit)
      from  1d3ca2a8bbaa340bf32e327c0e9d6db2f5dd3c1b (commit)

Summary of changes:
 Core/Endpoint/EndpointIf.ice |    2 +-
 Core/Routing/RoutingIf.ice   |   25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit 2886381a2c693563ed1a8955e32e4105d6da6fc0
Merge: c36e7dc 1d3ca2a
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Wed Aug 11 09:59:06 2010 -0500

    Merge branch 'master' of gitdepot:hydra/slice


commit c36e7dca2d4d5a403d304758a496c2d1a8afd2fa
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Wed Aug 11 09:40:04 2010 -0500

    EndpointSeq is now a set of proxies as intended.

diff --git a/Core/Endpoint/EndpointIf.ice b/Core/Endpoint/EndpointIf.ice
index 200fde2..c869361 100644
--- a/Core/Endpoint/EndpointIf.ice
+++ b/Core/Endpoint/EndpointIf.ice
@@ -39,7 +39,7 @@ module V1
       EndpointId id; 
    };
 
-   sequence<BaseEndpoint> EndpointSeq;
+   sequence<BaseEndpoint *> EndpointSeq;
 
    interface EndpointManager 
    {
diff --git a/Core/Routing/RoutingIf.ice b/Core/Routing/RoutingIf.ice
index e3e1732..126aefa 100644
--- a/Core/Routing/RoutingIf.ice
+++ b/Core/Routing/RoutingIf.ice
@@ -13,9 +13,10 @@ module V1
 {
    const string Version = "V1";
    
-   exception DestinationNotFoundException {};
-
-   exception DestinationExistsException {};
+   exception DestinationNotFoundException 
+   {
+      string destination;
+   };
 
    exception InvalidParamsException {};
 
@@ -34,6 +35,15 @@ module V1
          throws DestinationNotFoundException, InvalidParamsException;
    };
 
+
+   /**
+    * Indicates an attempt was made to register a locator twice under the same name. 
+    */
+   exception LocatorAlreadyRegisteredException 
+   {
+       string locatorId;
+   };
+
    /**
     * A registry of Endpoints. In addition to providing the EndpointLocator interface, a registry
     * can be augmented with other EndpointLocators. A LocatorRegistry is expected to be able to return 
@@ -42,13 +52,13 @@ module V1
    interface LocatorRegistry extends EndpointLocator
    {
       /**
-       * Add an EndpointLocator.
+       * Register an EndpointLocator that can provide endpoints.
        *   @param id A unique identifier for the added EndpointLocator. 
        *   @param destinationIdRangeList A set of regular expressions that define the valid endpoint ids 
-       *     this locator supports. 
+       *     the locator being added supports. 
        */
-      void addEndpointLocator(string id, RegExSeq destinationIdRangeList) 
-         throws DestinationExistsException, InvalidParamsException;
+      void addEndpointLocator(string id, RegExSeq destinationIdRangeList, EndpointLocator *locator) 
+         throws LocatorAlreadyRegisteredException, InvalidParamsException;
 
       /**
        * Remove an EndpointLocator.
@@ -56,7 +66,6 @@ module V1
        */
       void removeEndpointLocator(string id) throws DestinationNotFoundException;
 
-      // 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. 

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


-- 
hydra/slice.git