diff --git a/.gitignore b/.gitignore index a43db92eeed..1eb42371bff 100644 --- a/.gitignore +++ b/.gitignore @@ -3,38 +3,208 @@ # 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/ +#/sipXgrandstream/nbproject/private/ + +* + +!/*/* +!/*/*/* +!/*/*/*/* + +/**/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/ -/sipXgrandstream/nbproject/private/ \ No newline at end of file +/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/ diff --git a/.gitmodules b/.gitmodules index caacc748cba..6b71af1e2c4 100644 --- a/.gitmodules +++ b/.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 diff --git a/README b/README index faafd1ad768..08341fde1ec 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -To install from source -======================= +To install sipxcom from source +=============================== Step 1. Build makefile. diff --git a/homer b/homer deleted file mode 160000 index 67d1152a312..00000000000 --- a/homer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 67d1152a3125bac9b1e5d6ad92253f408d3438fe diff --git a/sipXconfig/.gitignore b/sipXconfig/.gitignore new file mode 100644 index 00000000000..303994fd947 --- /dev/null +++ b/sipXconfig/.gitignore @@ -0,0 +1,5 @@ +.pub/ +bin/packages + +packages/* +!packages/sipxconfig diff --git a/sipXconfig/web/context/WEB-INF/admin/systemaudit/packages b/sipXconfig/web/context/WEB-INF/admin/systemaudit/packages new file mode 120000 index 00000000000..4abb23beeb6 --- /dev/null +++ b/sipXconfig/web/context/WEB-INF/admin/systemaudit/packages @@ -0,0 +1 @@ +../../../../../packages \ No newline at end of file diff --git a/sipXconfig/web/context/WEB-INF/callback/packages b/sipXconfig/web/context/WEB-INF/callback/packages new file mode 120000 index 00000000000..2d36e408648 --- /dev/null +++ b/sipXconfig/web/context/WEB-INF/callback/packages @@ -0,0 +1 @@ +../../../../packages \ No newline at end of file diff --git a/sipXconfig/web/context/WEB-INF/tcpdumplog/packages b/sipXconfig/web/context/WEB-INF/tcpdumplog/packages new file mode 120000 index 00000000000..2d36e408648 --- /dev/null +++ b/sipXconfig/web/context/WEB-INF/tcpdumplog/packages @@ -0,0 +1 @@ +../../../../packages \ No newline at end of file diff --git a/sipXconfig/web/unitelite/views/settings.html b/sipXconfig/web/unitelite/views/settings.html index c790ee5cac9..6f753757cc3 100644 --- a/sipXconfig/web/unitelite/views/settings.html +++ b/sipXconfig/web/unitelite/views/settings.html @@ -648,7 +648,7 @@
-

Invalid Speed Dial value entered.

+

Invalid Speed Dial value entered.

You can not subscribe to presence with this speed dial value.
diff --git a/sipXcounterpath/README b/sipXcounterpath/README index e69de29bb2d..9d5c79d62b1 100644 --- a/sipXcounterpath/README +++ b/sipXcounterpath/README @@ -0,0 +1 @@ +#counterpath support diff --git a/sipXnortel/README b/sipXnortel/README index e69de29bb2d..736e6d5e5b5 100644 --- a/sipXnortel/README +++ b/sipXnortel/README @@ -0,0 +1 @@ +*Nortel phone plugin diff --git a/sipXrelease/.gitignore b/sipXrelease/.gitignore new file mode 100644 index 00000000000..022060c7267 --- /dev/null +++ b/sipXrelease/.gitignore @@ -0,0 +1,2 @@ +install-sh +missing diff --git a/sipXsupervisor/etc/sipx.cf.in b/sipXsupervisor/etc/sipx.cf.in index 6ac0352185c..66e2aca76ef 100644 --- a/sipXsupervisor/etc/sipx.cf.in +++ b/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"); diff --git a/sipXyealink/etc/yealink/config_v7x.vm b/sipXyealink/etc/yealink/config_v7x.vm index aa45edc076c..80b0c3452f8 100644 --- a/sipXyealink/etc/yealink/config_v7x.vm +++ b/sipXyealink/etc/yealink/config_v7x.vm @@ -93,6 +93,8 @@ account.${account}.codec.${i}.payload_type = $!{pt} #linesSetting($s,"") #elseif(${s.name} == "_RemotePhonebooks") #phonebooksSettings($s) +#elseif(${s.name.matches("iant_custom_configs")}) +$!{s.Value} #else #if(${s.Value}) ${s.ProfileName} = $!{s.Value} @@ -131,6 +133,7 @@ account.${lastLineID}.user_name = $!{setting.Value} #else #if (${setting.Value} && ${setting.Value} != "") account.${lastLineID}.${setting.ProfileName} = $!{setting.Value} +#end #else account.${lastLineID}.${setting.ProfileName} = %NULL% #end diff --git a/sipXyealink/etc/yealink/config_v8x.vm b/sipXyealink/etc/yealink/config_v8x.vm index 29c379b823b..f98ff3ebfaf 100644 --- a/sipXyealink/etc/yealink/config_v8x.vm +++ b/sipXyealink/etc/yealink/config_v8x.vm @@ -93,6 +93,8 @@ account.${account}.codec.${i}.payload_type = $!{pt} #linesSetting($s,"") #elseif(${s.name} == "_RemotePhonebooks") #phonebooksSettings($s) +#elseif(${s.name.matches("iant_custom_configs")}) +$!{s.Value} #else #if(${s.Value}) ${s.ProfileName} = $!{s.Value} diff --git a/sipXyealink/etc/yealink/phone-7X.properties b/sipXyealink/etc/yealink/phone-7X.properties index 3b54b73bd20..901630873d3 100644 --- a/sipXyealink/etc/yealink/phone-7X.properties +++ b/sipXyealink/etc/yealink/phone-7X.properties @@ -691,6 +691,8 @@ iant.sip.notify_reboot_enable.label=Check-Sync Reboot iant.sip.notify_reboot_enable.description=Should the phone reboot if it receives SIP-NOTIFY with check-sync iant.phone_setting.backgrounds.label=Preselect Phone Background iant.phone_setting.backgrounds.description=Preselect Phone Background (depends on uploaded Wallpapers for LCD) e.g. "Config:yealinkLogoIANT_INVERT_COLOR.png" +iant.iant_custom_configs.label=Custom settings +iant.iant_custom_configs.description=Allows to add custom configurations to add missing settings. DSSKeys.memory-keys.label=Memory Keys DSSKeys.memory-keys.memorykey.type.label=Type diff --git a/sipXyealink/etc/yealink/phone-7X.xml b/sipXyealink/etc/yealink/phone-7X.xml index e9c0fe1ea88..db6d04270a0 100644 --- a/sipXyealink/etc/yealink/phone-7X.xml +++ b/sipXyealink/etc/yealink/phone-7X.xml @@ -960,6 +960,7 @@ 0 0 Default:Default.png + diff --git a/sipXyealink/etc/yealink/phone-8X.properties b/sipXyealink/etc/yealink/phone-8X.properties index 81bb9fe11cd..bd9a7a695dc 100644 --- a/sipXyealink/etc/yealink/phone-8X.properties +++ b/sipXyealink/etc/yealink/phone-8X.properties @@ -849,6 +849,8 @@ iant.sip.notify_reboot_enable.label=Check-Sync Reboot iant.sip.notify_reboot_enable.description=Should the phone reboot if it receives SIP-NOTIFY with check-sync iant.phone_setting.backgrounds.label=Preselect Phone Background iant.phone_setting.backgrounds.description=Preselect Phone Background (depends on uploaded Wallpapers for LCD) e.g. "Config:yealinkLogoIANT_INVERT_COLOR.png" +iant.iant_custom_configs.label=Custom settings +iant.iant_custom_configs.description=Allows to add custom configurations to add missing settings. DSSKeys.memory-keys.label=Memory Keys DSSKeys.memory-keys.memorykey.type.label=Type diff --git a/sipXyealink/etc/yealink/phone-8X.xml b/sipXyealink/etc/yealink/phone-8X.xml index 007d122705e..23387c0534c 100644 --- a/sipXyealink/etc/yealink/phone-8X.xml +++ b/sipXyealink/etc/yealink/phone-8X.xml @@ -1065,6 +1065,7 @@ 0 0 Default:Default.png +