[asterisk-scf-commits] asterisk-scf/examples.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Wed Dec 28 15:44:10 CST 2011
branch "master" has been updated
via d5234495dcefc121ea0f9027b9cf3c7ad3a2e156 (commit)
from ac2e185320ee115c8c4f94b907a47a499ffa6268 (commit)
Summary of changes:
configs/BridgeManager.conf | 1 +
configs/BridgeStateReplicator.conf | 2 +-
configs/Logger.conf | 2 +-
configs/MediaFormatGeneric.conf | 2 +-
configs/MediaOperationCoreStateReplicator.conf | 2 +-
configs/MediaOperationsCore.conf | 2 +-
configs/MediaServiceRTP.conf | 2 +-
configs/MediaServiceRTPStateReplicator.conf | 2 +-
configs/RoutingService.conf | 2 +-
configs/RoutingStateReplicator.conf | 2 +-
configs/ServiceDiscovery.conf | 2 +-
configs/ServiceDiscoveryStateReplicator.conf | 2 +-
configs/SipService.conf | 2 +-
configs/SipStateReplicator.conf | 2 +-
14 files changed, 14 insertions(+), 13 deletions(-)
- Log -----------------------------------------------------------------
commit d5234495dcefc121ea0f9027b9cf3c7ad3a2e156
Author: Joshua Colp <jcolp at digium.com>
Date: Wed Dec 28 17:48:49 2011 -0400
Use up to date property name for colocation optimization and also disable it in the bridge service.
diff --git a/configs/BridgeManager.conf b/configs/BridgeManager.conf
index 57c5257..9c816fe 100644
--- a/configs/BridgeManager.conf
+++ b/configs/BridgeManager.conf
@@ -1,5 +1,6 @@
IceBox.InheritProperties=1
# this value was empirically determined... it may need to be different on different systems
+Ice.Default.CollocationOptimized=0
Ice.ThreadPool.Client.Size=10
IceBox.Service.BridgeManager=bridgeservice:create
diff --git a/configs/BridgeStateReplicator.conf b/configs/BridgeStateReplicator.conf
index 02a73aa..e9ab3e9 100644
--- a/configs/BridgeStateReplicator.conf
+++ b/configs/BridgeStateReplicator.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.BridgeReplicator=BridgeReplicator:create
diff --git a/configs/Logger.conf b/configs/Logger.conf
index 2d25a25..ca9e773 100644
--- a/configs/Logger.conf
+++ b/configs/Logger.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
IceBox.Service.Logger=logging-service:createLoggingService
Logger.ServiceAdapter.Endpoints=tcp -p 4431
diff --git a/configs/MediaFormatGeneric.conf b/configs/MediaFormatGeneric.conf
index 220c004..9b097a9 100644
--- a/configs/MediaFormatGeneric.conf
+++ b/configs/MediaFormatGeneric.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.MediaFormatGeneric=mediaformatgeneric:create
diff --git a/configs/MediaOperationCoreStateReplicator.conf b/configs/MediaOperationCoreStateReplicator.conf
index de8ec45..eb0718d 100644
--- a/configs/MediaOperationCoreStateReplicator.conf
+++ b/configs/MediaOperationCoreStateReplicator.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.MediaOperationsCoreReplicator=MediaOperationStateReplicator:create
diff --git a/configs/MediaOperationsCore.conf b/configs/MediaOperationsCore.conf
index c5ffa64..6064809 100644
--- a/configs/MediaOperationsCore.conf
+++ b/configs/MediaOperationsCore.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.MediaOperationsCore=MediaOperationsCore:create
diff --git a/configs/MediaServiceRTP.conf b/configs/MediaServiceRTP.conf
index df95a11..d4d6021 100644
--- a/configs/MediaServiceRTP.conf
+++ b/configs/MediaServiceRTP.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.MediaServiceRTP=media_rtp_pjmedia:create
diff --git a/configs/MediaServiceRTPStateReplicator.conf b/configs/MediaServiceRTPStateReplicator.conf
index 626f0a8..2937471 100644
--- a/configs/MediaServiceRTPStateReplicator.conf
+++ b/configs/MediaServiceRTPStateReplicator.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.RtpStateReplicator=RtpStateReplicator:create
diff --git a/configs/RoutingService.conf b/configs/RoutingService.conf
index 151f788..2d3330f 100644
--- a/configs/RoutingService.conf
+++ b/configs/RoutingService.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.RoutingService=BasicRoutingService:create
diff --git a/configs/RoutingStateReplicator.conf b/configs/RoutingStateReplicator.conf
index 8a09a9b..fc35ccd 100644
--- a/configs/RoutingStateReplicator.conf
+++ b/configs/RoutingStateReplicator.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.RoutingStateReplicator=RoutingStateReplicator:create
diff --git a/configs/ServiceDiscovery.conf b/configs/ServiceDiscovery.conf
index b892382..0792580 100644
--- a/configs/ServiceDiscovery.conf
+++ b/configs/ServiceDiscovery.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
IceBox.Service.ServiceDiscovery=service_locator:create
ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -p 4410
diff --git a/configs/ServiceDiscoveryStateReplicator.conf b/configs/ServiceDiscoveryStateReplicator.conf
index d4e86d9..7984ab9 100644
--- a/configs/ServiceDiscoveryStateReplicator.conf
+++ b/configs/ServiceDiscoveryStateReplicator.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.ServiceLocatorStateReplicator=ServiceLocatorStateReplicator:create
diff --git a/configs/SipService.conf b/configs/SipService.conf
index d58a678..b6f727e 100644
--- a/configs/SipService.conf
+++ b/configs/SipService.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.SipService=SipSessionManager:create
diff --git a/configs/SipStateReplicator.conf b/configs/SipStateReplicator.conf
index 2e0f42f..94d974c 100644
--- a/configs/SipStateReplicator.conf
+++ b/configs/SipStateReplicator.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.SipStateReplicator=SipStateReplicator:create
-----------------------------------------------------------------------
--
asterisk-scf/examples.git
More information about the asterisk-scf-commits
mailing list