[asterisk-scf-commits] asterisk-scf/integration/file_session_gateway.git branch "first_crack_for_review" updated.

[Commits to the Asterisk SCF project code repositories]

branch "first_crack_for_review" has been updated
       via  3efd700fe5d9130828969c147c76567981d31172 (commit)
      from  60eac847e0f64d000381357c0572d69810f01d8b (commit)

Summary of changes:
 config/FileSessionGatewayConfigurator.py           |    2 +-
 config/test_file_session_gateway.icebox            |    2 +-
 .../FileSessionReplicationIf.ice                   |    1 -
 src/Configuration.cpp                              |    1 +
 src/RemoteServices.cpp                             |    2 +-
 src/ReplicationListener.h                          |    1 -
 6 files changed, 4 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 3efd700fe5d9130828969c147c76567981d31172
Author: Brent Eagles <beagles at digium.com>
Date:   Mon Dec 5 11:32:49 2011 -0330

    Fixes:
     - cut and paste (or undo?) error
     - fix missing field in configuration
     - remove unnecessary header.

diff --git a/config/FileSessionGatewayConfigurator.py b/config/FileSessionGatewayConfigurator.py
index 766cce8..bddcc13 100755
--- a/config/FileSessionGatewayConfigurator.py
+++ b/config/FileSessionGatewayConfigurator.py
@@ -89,7 +89,7 @@ class SectionVisitors(Configurator.SectionVisitors):
             
 # In order to do service locator based lookup we need to pass in a params object
 serviceLocatorParams = AsteriskSCF.Core.Discovery.V1.ServiceLocatorParams()
-serviceLocatorParams.category = AsteriskSCF.Configuration.SipSessionManager.V1.ConfigurationDiscoveryCategory
+serviceLocatorParams.category = AsteriskSCF.Configuration.FileSessionGateway.V1.ConfigurationDiscoveryCategory
 serviceLocatorParams.service = 'default' 
 
 # Make a configurator application and let it run
diff --git a/config/test_file_session_gateway.icebox b/config/test_file_session_gateway.icebox
index fbdf501..89e92f5 100644
--- a/config/test_file_session_gateway.icebox
+++ b/config/test_file_session_gateway.icebox
@@ -77,7 +77,7 @@ IceBox.Service.ServiceDiscovery=service_locator:create
 IceBox.Service.FileSessionGateway=FileSessionGateway:create
 IceBox.Service.GatewayTester=FileSessionGatewayTest:create
 
-IceBox.LoadOrder=ServiceDiscovery Logger RoutingService Replicator FileSessionGateway GatewayTester
+IceBox.LoadOrder=ServiceDiscovery Logger BridgeService RoutingService  FileSessionGateway GatewayTester
 
 IceBox.ServiceManager.Endpoints=default -p 56000
 IceBox.ServiceManager.ThreadPool.Size=4
diff --git a/slice/AsteriskSCF/Replication/FileSessionGateway/FileSessionReplicationIf.ice b/slice/AsteriskSCF/Replication/FileSessionGateway/FileSessionReplicationIf.ice
index bb38551..21706ab 100644
--- a/slice/AsteriskSCF/Replication/FileSessionGateway/FileSessionReplicationIf.ice
+++ b/slice/AsteriskSCF/Replication/FileSessionGateway/FileSessionReplicationIf.ice
@@ -21,7 +21,6 @@
 #include <AsteriskSCF/Media/File/FileMediaIf.ice>
 #include <AsteriskSCF/Media/RTP/MediaRTPIf.ice>
 #include <AsteriskSCF/SessionCommunications/SessionCommunicationsIf.ice>
-#include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice>
 #include <AsteriskSCF/System/Component/ConfigurationIf.ice>
 
 module AsteriskSCF
diff --git a/src/Configuration.cpp b/src/Configuration.cpp
index a81f95f..f4fe56c 100644
--- a/src/Configuration.cpp
+++ b/src/Configuration.cpp
@@ -59,6 +59,7 @@ EndpointSpecificationPtr createSpecificationFromGroup(const EndpointGroupPtr& gr
         return EndpointSpecificationPtr();
     }
     EndpointSpecificationPtr newSpec(new EndpointSpecification);
+    newSpec->id = group->name;
     newSpec->name = group->name;
 
     ConfigurationItemDict::iterator propertyIter = group->configurationItems.find(EndpointDestinationItem);
diff --git a/src/RemoteServices.cpp b/src/RemoteServices.cpp
index d27fec7..5cb7708 100644
--- a/src/RemoteServices.cpp
+++ b/src/RemoteServices.cpp
@@ -118,7 +118,7 @@ RemoteServicesPtr RemoteServices::create(const AsteriskSCF::Core::Discovery::V1:
 {
     AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr routerParams =
         new AsteriskSCF::Core::Discovery::V1::ServiceLocatorParams;
-    routerParams->category = AsteriskSCF::Core::Routing::V1::ComponentServiceDiscoveryCategory;
+    routerParams->category = AsteriskSCF::Core::Routing::V1::SessionRouterDiscoveryCategory;
     routerParams->service = routingServiceName;
     AsteriskSCF::Core::Discovery::V1::ServiceLocatorParamsPtr mediaServiceParams =
         new AsteriskSCF::Core::Discovery::V1::ServiceLocatorParams;
diff --git a/src/ReplicationListener.h b/src/ReplicationListener.h
index b893555..78a068a 100644
--- a/src/ReplicationListener.h
+++ b/src/ReplicationListener.h
@@ -36,7 +36,6 @@ public:
      * - userAdapter : the object adapter instantiated by this component for "external" (ie. non-infrastructure)
      *   tasks.
      * - factory : the factory object for creating new endpoints, typically that which would be replicated
-     *   (XXX: this doesn't seem right, the endpoints should be created via configuration, not replication)
      **/
     static IceUtil::Handle<ReplicationListener> create(const EndpointLocatorImplPtr& locator, 
         const Ice::ObjectAdapterPtr& userAdapter, const AsteriskSCF::System::Logging::Logger& logger);

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


-- 
asterisk-scf/integration/file_session_gateway.git