[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  4661d2f0493e6ed628231cf8f978207dc4ee99a6 (commit)
       via  a803c2b6dc16b72afdf4c9b62dfe53d14521d4cf (commit)
       via  34edb9504794badb8d7da5ac07d9c5a4df40d6b6 (commit)
      from  4c37ced142d56129a54a1e3dc49cd378fcad8244 (commit)

Summary of changes:
 config/{Sip.config => SIP.config}                 |    0
 config/{SipConfigurator.py => SIPConfigurator.py} |    6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename config/{Sip.config => SIP.config} (100%)
 rename config/{SipConfigurator.py => SIPConfigurator.py} (98%)


- Log -----------------------------------------------------------------
commit 4661d2f0493e6ed628231cf8f978207dc4ee99a6
Merge: 4c37ced a803c2b
Author: David M. Lee <dlee at digium.com>
Date:   Thu Apr 12 11:46:44 2012 -0500

    Merge remote-tracking branch 'origin/master' into retry_deux


commit a803c2b6dc16b72afdf4c9b62dfe53d14521d4cf
Author: David M. Lee <dlee at digium.com>
Date:   Thu Apr 12 11:43:04 2012 -0500

    Sip -> SIP configurator fixes

diff --git a/config/Sip.config b/config/SIP.config
similarity index 100%
rename from config/Sip.config
rename to config/SIP.config
diff --git a/config/SipConfigurator.py b/config/SIPConfigurator.py
similarity index 100%
rename from config/SipConfigurator.py
rename to config/SIPConfigurator.py

commit 34edb9504794badb8d7da5ac07d9c5a4df40d6b6
Author: David M. Lee <dlee at digium.com>
Date:   Thu Apr 12 11:39:36 2012 -0500

    Ice.loadSlice -> astscfLoadSlice
    
    Also fixed a Sip -> SIP issue.

diff --git a/config/SipConfigurator.py b/config/SipConfigurator.py
index f90a005..f66891e 100755
--- a/config/SipConfigurator.py
+++ b/config/SipConfigurator.py
@@ -3,7 +3,7 @@
 #
 # Asterisk SCF -- An open-source communications framework.
 #
-# Copyright (C) 2011, Digium, Inc.
+# Copyright (C) 2011-2012, Digium, Inc.
 #
 # See http://www.asterisk.org for more information about
 # the Asterisk SCF project. Please do not directly contact
@@ -27,7 +27,7 @@ sys.path.append("/opt/Ice-3.4/python")
 import ConfigParser, Ice, Configurator, traceback, uuid
 
 # Load our component specific configuration definitions
-Ice.loadSlice("--underscore -I\"" + os.environ["ASTSCF_HOME"] + "/slice/slice\"" + " -I" + Ice.getSliceDir() + " --all " + os.environ["ASTSCF_HOME"] + "/sip/slice/AsteriskSCF/Configuration/SIPSessionManager/SIPConfigurationIf.ice")
+Configurator.astscfLoadSlice("sip", "AsteriskSCF/Configuration/SIPSessionManager/SIPConfigurationIf.ice")
 
 import AsteriskSCF.Configuration.SIPSessionManager.V1
 
@@ -38,7 +38,7 @@ class SIPSectionVisitors(Configurator.SectionVisitors):
         group = AsteriskSCF.Configuration.SIPSessionManager.V1.SIPGeneralGroup()
         group.configurationItems = { }
         mapper = Configurator.OptionMapper()
-        item = AsteriskSCF.Configuration.SipSessionManager.V1.SipUserAgentItem()
+        item = AsteriskSCF.Configuration.SIPSessionManager.V1.SIPUserAgentItem()
         mapper.map('useragent', item, 'userAgent', 'userAgent', config.get, None)
         for option in config.options(section):
             mapper.execute(group, section, option)

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


-- 
asterisk-scf/integration/sip.git