From 241c500417be2095b516114c7bdfa892bdbc7c4d Mon Sep 17 00:00:00 2001
From: George Niculae <george@ezuce.com>
Date: Wed, 13 Oct 2010 02:30:31 +0300
Subject: [PATCH] Fix precommit issues:

- sofia configuration
- modules config
- don't test isphone's phone.xml
---
 .../service/freeswitch/modules.conf.test.xml       |   14 ++++++++------
 .../service/freeswitch/modules_g729.conf.test.xml  |   14 ++++++++------
 .../service/freeswitch/sofia.conf.test.xml         |    3 ++-
 .../service/freeswitch/sofia_G729.conf.test.xml    |    3 ++-
 sipXconfig/plugins/isphone/build.xml               |    9 +++++++++
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/modules.conf.test.xml b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/modules.conf.test.xml
index c0241ed..d68066c 100644
--- a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/modules.conf.test.xml
+++ b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/modules.conf.test.xml
@@ -10,7 +10,7 @@
 
     <!-- Multi-Faceted -->
     <!-- mod_enum is a dialplan interface, an application interface and an api command interface -->
-    <load module="mod_enum"/>
+    <!-- <load module="mod_enum"/> -->
 
     <!-- XML Interfaces -->
     <load module="mod_xml_rpc"/> 
@@ -44,9 +44,10 @@
     <load module="mod_dptools"/>
     <load module="mod_expr"/>
     <load module="mod_fifo"/>
-    <load module="mod_voicemail"/>
+    <!-- <load module="mod_voicemail"/> -->
     <!-- <load module="mod_directory"/> -->
-    <load module="mod_fax"/>
+    <!-- <load module="mod_fax"/> -->
+    <load module="mod_spandsp"/>
     <!-- <load module="mod_lcr"/> -->
     <load module="mod_limit"/>
     <load module="mod_esf"/>
@@ -61,13 +62,14 @@
     <!-- Dialplan Interfaces -->
     <!-- <load module="mod_dialplan_directory"/> -->
     <load module="mod_dialplan_xml"/>
-    <load module="mod_dialplan_asterisk"/>
+    <!-- <load module="mod_dialplan_asterisk"/> -->
 
     <!-- Codec Interfaces -->
     <load module="mod_voipcodecs"/>
     <load module="mod_g723_1"/>
     <load module="mod_g729"/>
     <load module="mod_amr"/>
+    <load module="mod_amrwb"/>
     <load module="mod_ilbc"/>
     <load module="mod_speex"/>
     <load module="mod_h26x"/>
@@ -103,10 +105,10 @@
     
     <!-- Say -->
     <load module="mod_say_en"/>
-    <!-- <load module="mod_say_zh"/> -->
+    <load module="mod_say_de"/>
 
     <!-- Third party modules -->
     <!--<load module="mod_nibblebill"/>-->
 
   </modules>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/modules_g729.conf.test.xml b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/modules_g729.conf.test.xml
index 03aeb1d..7b7e733 100644
--- a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/modules_g729.conf.test.xml
+++ b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/modules_g729.conf.test.xml
@@ -10,7 +10,7 @@
 
     <!-- Multi-Faceted -->
     <!-- mod_enum is a dialplan interface, an application interface and an api command interface -->
-    <load module="mod_enum"/>
+    <!-- <load module="mod_enum"/> -->
 
     <!-- XML Interfaces -->
     <load module="mod_xml_rpc"/> 
@@ -44,9 +44,10 @@
     <load module="mod_dptools"/>
     <load module="mod_expr"/>
     <load module="mod_fifo"/>
-    <load module="mod_voicemail"/>
+    <!-- <load module="mod_voicemail"/> -->
     <!-- <load module="mod_directory"/> -->
-    <load module="mod_fax"/>
+    <!-- <load module="mod_fax"/> -->
+    <load module="mod_spandsp"/>
     <!-- <load module="mod_lcr"/> -->
     <load module="mod_limit"/>
     <load module="mod_esf"/>
@@ -61,13 +62,14 @@
     <!-- Dialplan Interfaces -->
     <!-- <load module="mod_dialplan_directory"/> -->
     <load module="mod_dialplan_xml"/>
-    <load module="mod_dialplan_asterisk"/>
+    <!-- <load module="mod_dialplan_asterisk"/> -->
 
     <!-- Codec Interfaces -->
     <load module="mod_voipcodecs"/>
     <load module="mod_g723_1"/>
     <load module="mod_com_g729"/>
     <load module="mod_amr"/>
+    <load module="mod_amrwb"/>
     <load module="mod_ilbc"/>
     <load module="mod_speex"/>
     <load module="mod_h26x"/>
@@ -103,10 +105,10 @@
     
     <!-- Say -->
     <load module="mod_say_en"/>
-    <!-- <load module="mod_say_zh"/> -->
+    <load module="mod_say_de"/>
 
     <!-- Third party modules -->
     <!--<load module="mod_nibblebill"/>-->
 
   </modules>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/sofia.conf.test.xml b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/sofia.conf.test.xml
index 8136429..713699c 100644
--- a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/sofia.conf.test.xml
+++ b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/sofia.conf.test.xml
@@ -20,6 +20,7 @@
     <param name="codec-prefs" value="G722,PCMU@20i,PCMA@20i,speex,L16"/>
     <param name="hold-music" value="$${hold_music}"/>
     <param name="rtp-timer-name" value="soft"/>
+    <param name="inbound-late-negotiation" value="true"/>
     <!--<param name="enable-100rel" value="true"/>-->
     <!-- This could be set to "passive" -->
     <param name="local-network-acl" value="localnet.auto"/>
@@ -75,4 +76,4 @@
           <param name="register" value="false"/>
         </gateway>
       </gateways>
-</profile>
\ No newline at end of file
+</profile>
diff --git a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/sofia_G729.conf.test.xml b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/sofia_G729.conf.test.xml
index 2b7a2ed..2e213e0 100644
--- a/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/sofia_G729.conf.test.xml
+++ b/sipXconfig/neoconf/test/org/sipfoundry/sipxconfig/service/freeswitch/sofia_G729.conf.test.xml
@@ -20,6 +20,7 @@
     <param name="codec-prefs" value="G722,PCMU@20i,PCMA@20i,speex,L16,G729"/>
     <param name="hold-music" value="$${hold_music}"/>
     <param name="rtp-timer-name" value="soft"/>
+    <param name="inbound-late-negotiation" value="true"/>
     <!--<param name="enable-100rel" value="true"/>-->
     <!-- This could be set to "passive" -->
     <param name="local-network-acl" value="localnet.auto"/>
@@ -75,4 +76,4 @@
           <param name="register" value="false"/>
         </gateway>
       </gateways>
-</profile>
\ No newline at end of file
+</profile>
diff --git a/sipXconfig/plugins/isphone/build.xml b/sipXconfig/plugins/isphone/build.xml
index d3e9332..94dbe96 100644
--- a/sipXconfig/plugins/isphone/build.xml
+++ b/sipXconfig/plugins/isphone/build.xml
@@ -6,4 +6,13 @@
 
   <import file="../plugins.build.xml" />
 
+  <target name="test-models">
+    <echo>empty phone.xml - won't be tested</echo>
+    <xmlvalidate description="validate setting description files">
+      <fileset dir="${plugin.models.dir}" includes="**/*.xml" excludes="**/phone.xml">
+      </fileset>
+      <dtd publicid="-//SIPFoundry//sipXconfig//Model specification 2.0//EN" location="etc/setting.dtd" />
+    </xmlvalidate>
+  </target>
+
 </project>
-- 
1.6.0.6