[asterisk-scf-commits] asterisk-scf/integration/routing.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  84db63139cb52ad0f33bc9d275b754c3b3e7ec73 (commit)
       via  f31dedb88754b9991e31d578cf50d076fd678bbc (commit)
       via  925922d224d7b3e7ca4503c9a5a11af3453a3782 (commit)
      from  4b61bdf902a8ec6f62872b0e397b1c5ef01bb630 (commit)

Summary of changes:
 config/basicrouting.config     |    7 ++++++-
 slice                          |    2 +-
 src/BasicRoutingServiceApp.cpp |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 84db63139cb52ad0f33bc9d275b754c3b3e7ec73
Author: Joshua Colp <jcolp at digium.com>
Date:   Sat Sep 11 21:59:43 2010 -0300

    Update to latest slice and update configuration. Now builds (minus test app) and starts happily.

diff --git a/config/basicrouting.config b/config/basicrouting.config
index dc3b116..ca98677 100644
--- a/config/basicrouting.config
+++ b/config/basicrouting.config
@@ -3,9 +3,14 @@
 # Endpoints for the adapter
 BasicRoutingServiceAdapter.Endpoints=tcp -p 10050
 
-# Where to find the Service Locator. We need the Service Locator in order to be able to plug in to the Asterisk SCF system Discovery mechanisms.
+# Where to find the Service Locator manager. We need the Service Locator in order to be able to plug in to the Asterisk SCF system Discovery mechanisms.
 LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
 
+# Where to find the Service Locator.
+LocatorService.Proxy=LocatorService:tcp -p 4411
+
 # Endpoints for Icestorm events
 TopicManager.Proxy=HydraIceStorm/TopicManager:default -p 10000
 
+# Category for the bridge service
+BridgeManager.ServiceLocatorId=BridgeService
diff --git a/slice b/slice
index dcb271b..200c642 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit dcb271baaca90fa89ed6b7d4846ea458fb303943
+Subproject commit 200c642ce49b3daabeabe2d8ad105bfa980fec02

commit f31dedb88754b9991e31d578cf50d076fd678bbc
Merge: 925922d 4b61bdf
Author: Joshua Colp <jcolp at digium.com>
Date:   Sat Sep 11 21:23:19 2010 -0300

    Merge branch 'master' of git.asterisk.org:asterisk-scf/integration/routing

diff --cc src/BasicRoutingServiceApp.cpp
index 3c79c4b,1538bc0..d88ed4a
--- a/src/BasicRoutingServiceApp.cpp
+++ b/src/BasicRoutingServiceApp.cpp
@@@ -205,13 -227,12 +227,12 @@@ void BasicRoutingServiceApp::registerWi
        setCategory(mRegistryLocatorManagement, Routing::V1::RoutingServiceLocatorRegistryDiscoveryCategory);
  
        // Get a proxy to our ComponentService interface and add it to the Service Locator. 
-       Ice::ObjectPrx componentServiceObjectPrx = mAdapter->createDirectProxy(communicator()->stringToIdentity(ComponentServiceId));
+       Ice::ObjectPrx componentServiceObjectPrx = adapter->createDirectProxy(communicator()->stringToIdentity(ComponentServiceId));
        ComponentServicePrx componentServicePrx = ComponentServicePrx::checkedCast(componentServiceObjectPrx);
-       // The GUID passed in to add service needs to be unique for reporting. 
-       string componentServiceGuid("BasicRoutingService");  
+       string componentServiceGuid("BasicRoutingService");   // Should be unique for reporting.
        mComponentServiceManagement = ServiceManagementPrx::uncheckedCast(mServiceLocatorManagement->addService(componentServicePrx, componentServiceGuid));
  	   
 -      setCategory(mRegistryLocatorManagement, Routing::V1::ComponentServiceDiscoveryCategory);
 +      setCategory(mComponentServiceManagement, Routing::V1::ComponentServiceDiscoveryCategory);
     }
     catch(...)
     {

commit 925922d224d7b3e7ca4503c9a5a11af3453a3782
Author: Joshua Colp <jcolp at digium.com>
Date:   Mon Aug 30 10:38:52 2010 -0300

    Pass the correct proxy to setCategory. Someone got bit by the copy/paste bug.

diff --git a/src/BasicRoutingServiceApp.cpp b/src/BasicRoutingServiceApp.cpp
index c4a7356..3c79c4b 100644
--- a/src/BasicRoutingServiceApp.cpp
+++ b/src/BasicRoutingServiceApp.cpp
@@ -211,7 +211,7 @@ void BasicRoutingServiceApp::registerWithServiceLocator()
       string componentServiceGuid("BasicRoutingService");  
       mComponentServiceManagement = ServiceManagementPrx::uncheckedCast(mServiceLocatorManagement->addService(componentServicePrx, componentServiceGuid));
 	   
-      setCategory(mRegistryLocatorManagement, Routing::V1::ComponentServiceDiscoveryCategory);
+      setCategory(mComponentServiceManagement, Routing::V1::ComponentServiceDiscoveryCategory);
    }
    catch(...)
    {

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


-- 
asterisk-scf/integration/routing.git