Merging and cleaning up previous branches

.gitignore

@@ -3,37 +3,207 @@
 # For a project mostly in C, the following would be a good set of
 # exclude patterns (uncomment them if you want to use them):
 # *.[oa]
-*~
-Makefile.in
-aclocal.m4
-config.h.in
-autom4te.cache
-config/compile
-config/config.guess
-config/config.sub
-config/depcomp
-config/install-sh
-config/ltmain.sh
-config/missing
-configure
-sipXconfig/top.build.dir
-spy.log
-velocity.log
-bin.eclipse
+
+#*~
+#Makefile.in
+#aclocal.m4
+#config.h.in
+#autom4te.cache
+#config/compile
+#config/config.guess
+#config/config.sub
+#config/depcomp
+#config/install-sh
+#config/ltmain.sh
+#config/missing
+#configure
+#sipXconfig/top.build.dir
+#spy.log
+#velocity.log
+#bin.eclipse
 # exclude files created when building 3rd party deps
-lib/*/build
-lib/cache-file
-lib/dist
-sipXtackLib/src/test/net/SipXauthIdentityTest.cpp
-custom
-sipXconfig/packages/analyzer
-sipXconfig/packages/args
-sipXconfig/packages/browser
-sipXconfig/packages/collection
-sipXconfig/packages/intl
-sipXconfig/packages/logging
-sipXconfig/packages/path
-sipXconfig/packages/unmodifiable_collection
+#lib/*/build
+#lib/cache-file
+#lib/dist
+#sipXtackLib/src/test/net/SipXauthIdentityTest.cpp
+#custom
+#sipXconfig/packages/analyzer
+#sipXconfig/packages/args
+#sipXconfig/packages/browser
+#sipXconfig/packages/collection
+#sipXconfig/packages/intl
+#sipXconfig/packages/logging
+#sipXconfig/packages/path
+#sipXconfig/packages/unmodifiable_collection
+#pubspec.lock
+#/sipXyealink/nbproject/private/
+#/sipXyealink/build/
+
+*
+
+!/*/*
+!/*/*/*
+!/*/*/*/*
+
+/**/Makefile.in
+/**/config.h.in
+/**/configure
+/**/aclocal.m4
+
+/**/autom4te.cache/
+/**/build/
+
+/*/*/Makefile.in
+/*/*/config.h.in
+/*/*/*/Makefile.in
+/*/*/*/config.h.in
+
 pubspec.lock
-/sipXyealink/nbproject/private/
-/sipXyealink/build/
+/autom4te.cache/
+
+/config/config.guess
+/config/config.sub
+/config/depcomp
+/config/compile
+/config/install-sh
+/config/ltmain.sh
+/config/missing
+
+!/addons/
+!build_docker_rpm.sh
+!cfengine/
+!config/
+!configure.ac
+!dart-sdk/
+!doc/
+!epel/
+!erlang/
+!erlang-cowboy/
+!erlang-ej/
+!erlang-ejrpc2/
+!erlang-gen_server_mock/
+!erlang-mimetypes/
+!erlmongo/
+!extras/
+!freeswitch
+!freeswitch_edge
+!freeswitch-sounds-en-us-callie/
+!hiredis/
+!homer
+!jasperserver/
+!libevent2/
+!libjsonrpccpp/
+!mak/
+!meta/
+!mongo-cxx-driver/
+!mongodb/
+!net-snmp/
+!nsis/
+!nsis-data/
+!oacd_dialplan
+!oacd_freeswitch
+!oacd_web
+!openacd
+!openfire
+!oss_core
+!README
+!rrdtool/
+!ruby-dbi/
+!rubygem-file-tail/
+!rubygem-net-sftp/
+!rubygem-net-ssh/
+!rubygem-rake/
+!ruby-postgres/
+!sipXaastra/
+!sipXacccode/
+!sipXAocBilling
+!sipXaudiocodes/
+!sipXbridge/
+!sipXcallback/
+!sipXcallController/
+!sipXcallLib/
+!sipXcallQueue
+!sipXcdr/
+!sipXcdrLog/
+!sipXcisco/
+!sipXclearone/
+!sipXcom/
+!sipXcommons/
+!sipXcommserverLib/
+!sipXconfig/
+!sipXcounterpath/
+!sipXcustomCallerId
+!sipXdashboard/
+!sipXdns/
+!sipXecs/
+!sipXeslLib/
+!sipXevent/
+!sipXexample/
+!sipXgrandstream/
+!sipXgtek/
+!sipXhitachi/
+!sipXhomer
+!sipXimbot/
+!sipXinterop/
+!sipXipdialog/
+!sipXisphone/
+!sipXivr/
+!sipXjitsi/
+!sipXlang-abitibi-fr_CA
+!sipXlang-ch
+!sipXlang-cs
+!sipXlang-de
+!sipXlang-en_GB
+!sipXlang-es
+!sipXlang-es_MX
+!sipXlang-fr
+!sipXlang-fr_CA
+!sipXlang-it
+!sipXlang-ja
+!sipXlang-nl
+!sipXlang-pl
+!sipXlang-pt/
+!sipXlang-pt_BR
+!sipXlang-zh
+!sipXlg-nortel/
+!sipXmediaAdapterLib/
+!sipXmediaLib/
+!sipXmitel/
+!sipXmongo/
+!sipXnortel/
+!sipxopenacd
+!sipXopenfire/
+!sipXpage/
+!sipXpbx/
+!sipXpolycom/
+!sipXportLib/
+!sipXpostgres/
+!sipXpreflight/
+!sipXpresence/
+!sipXprompts/
+!sipXprovision/
+!sipXproxy/
+!sipXpublisher/
+!sipXrecording/
+!sipXregistry/
+!sipXrelay/
+!sipXrelease/
+!sipXresiprocate
+!sipXrest/
+!sipXrls/
+!sipXsaa/
+!sipXsbc
+!sipXsnom/
+!sipXsqa/
+!sipXstap/
+!sipXsupervisor/
+!sipXtackLib/
+!sipXtcpdumplog/
+!sipXtools/
+!sipXunidata/
+!sipXverify/
+!sipXviewer/
+!sipXyard/
+!sipXyealink/
+!sipXzmqLib/
+!tools/

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "sipXcustomCallerId"]
 	path = sipXcustomCallerId
 	url = git://github.com/ezuce/sipXcustomCallerId.git
-[submodule "homer"]
-	path = homer
-	url = http://code.google.com/p/homer/
 [submodule "sipXhomer"]
 	path = sipXhomer
 	url = git://github.com/sipXcom/sipXhomer.git

README

@@ -1,5 +1,5 @@
-To install from source
-=======================
+To install sipxcom from source
+===============================
 
 Step 1. Build makefile.
 

sipXconfig/.gitignore

@@ -0,0 +1,5 @@
+.pub/
+bin/packages
+
+packages/*
+!packages/sipxconfig

sipXconfig/web/context/WEB-INF/admin/systemaudit/packages

@@ -0,0 +1 @@
+../../../../../packages

sipXconfig/web/context/WEB-INF/callback/packages

@@ -0,0 +1 @@
+../../../../packages

sipXconfig/web/context/WEB-INF/tcpdumplog/packages

@@ -0,0 +1 @@
+../../../../packages

sipXconfig/web/unitelite/views/settings.html

@@ -644,7 +644,7 @@
                     </table>
                     <div class="settings-details-wrapper animated fade" data-ng-if="userSettings.errors.speedDials">
                       <div class="alert alert-warning">
-                      <p><strong>Invalid Speed Dial value entered.</strong></p>
+                        <p><strong>Invalid Speed Dial value entered.</strong></p>
                         You can not subscribe to presence with this speed dial value.
                       </div>
                     </div>

sipXcounterpath/README

@@ -0,0 +1 @@
+#counterpath support

sipXnortel/README

@@ -0,0 +1 @@
+*Nortel phone plugin

sipXrelease/.gitignore

@@ -0,0 +1,2 @@
+install-sh
+missing

sipXsupervisor/etc/sipx.cf.in

@@ -43,6 +43,7 @@ bundle common sipx {
   vars:
     any::
       "location_id" string => readfile("@SIPX_CFDATA@/defaults/location_id", "100");
+      "sipx_environment" string => readfile("@SIPX_CFDATA@/defaults/sipx_environment", "32");
       "iface"
         string => "$(sys.interface)",
         policy => "overridable";
@@ -79,6 +80,8 @@ bundle common sipx {
       # comparing where the service directory is seems like a solid test if src based install
       "src" not => strcmp("@SIPX_SERVICEDIR@", "/etc/init.d");
 
+      "centos_dev" expression => strcmp("$(sipx_environment)", "CENTOS_DEV");
+
       # established assumption
       "primary" expression => strcmp("$(location_id)", "1");