[asterisk-commits] oej: branch oej/multiparking r64244 - in /team/oej/multiparking: ./ apps/ bui...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Mon May 14 10:46:58 MST 2007 

Author: oej
Date: Mon May 14 12:46:53 2007
New Revision: 64244

URL: http://svn.digium.com/view/asterisk?view=rev&rev=64244
Log:
Reset automerge again!

Added:
    team/oej/multiparking/apps/app_minivm.c
      - copied unchanged from r64208, trunk/apps/app_minivm.c
    team/oej/multiparking/cdr/cdr_sqlite3_custom.c
      - copied unchanged from r64208, trunk/cdr/cdr_sqlite3_custom.c
    team/oej/multiparking/configs/cdr_sqlite3_custom.conf
      - copied unchanged from r64208, trunk/configs/cdr_sqlite3_custom.conf
    team/oej/multiparking/configs/extensions_minivm.conf.sample
      - copied unchanged from r64208, trunk/configs/extensions_minivm.conf.sample
    team/oej/multiparking/configs/minivm.conf.sample
      - copied unchanged from r64208, trunk/configs/minivm.conf.sample
    team/oej/multiparking/configs/res_config_sqlite.conf
      - copied unchanged from r64208, trunk/configs/res_config_sqlite.conf
    team/oej/multiparking/configs/res_pgsql.conf.sample
      - copied unchanged from r64208, trunk/configs/res_pgsql.conf.sample
    team/oej/multiparking/contrib/scripts/realtime_pgsql.sql
      - copied unchanged from r64208, trunk/contrib/scripts/realtime_pgsql.sql
    team/oej/multiparking/doc/ael.tex
      - copied unchanged from r64208, trunk/doc/ael.tex
    team/oej/multiparking/doc/ajam.tex
      - copied unchanged from r64208, trunk/doc/ajam.tex
    team/oej/multiparking/doc/app-sms.tex
      - copied unchanged from r64208, trunk/doc/app-sms.tex
    team/oej/multiparking/doc/ast_appdocs.tex
      - copied unchanged from r64208, trunk/doc/ast_appdocs.tex
    team/oej/multiparking/doc/asterisk-conf.tex
      - copied unchanged from r64208, trunk/doc/asterisk-conf.tex
    team/oej/multiparking/doc/asterisk.tex
      - copied unchanged from r64208, trunk/doc/asterisk.tex
    team/oej/multiparking/doc/billing.tex
      - copied unchanged from r64208, trunk/doc/billing.tex
    team/oej/multiparking/doc/cdrdriver.tex
      - copied unchanged from r64208, trunk/doc/cdrdriver.tex
    team/oej/multiparking/doc/chaniax.tex
      - copied unchanged from r64208, trunk/doc/chaniax.tex
    team/oej/multiparking/doc/channelvariables.tex
      - copied unchanged from r64208, trunk/doc/channelvariables.tex
    team/oej/multiparking/doc/cliprompt.tex
      - copied unchanged from r64208, trunk/doc/cliprompt.tex
    team/oej/multiparking/doc/configuration.tex
      - copied unchanged from r64208, trunk/doc/configuration.tex
    team/oej/multiparking/doc/dundi.tex
      - copied unchanged from r64208, trunk/doc/dundi.tex
    team/oej/multiparking/doc/enum.tex
      - copied unchanged from r64208, trunk/doc/enum.tex
    team/oej/multiparking/doc/extensions.tex
      - copied unchanged from r64208, trunk/doc/extensions.tex
    team/oej/multiparking/doc/freetds.tex
      - copied unchanged from r64208, trunk/doc/freetds.tex
    team/oej/multiparking/doc/hardware.tex
      - copied unchanged from r64208, trunk/doc/hardware.tex
    team/oej/multiparking/doc/ices.tex
      - copied unchanged from r64208, trunk/doc/ices.tex
    team/oej/multiparking/doc/imapstorage.tex
      - copied unchanged from r64208, trunk/doc/imapstorage.tex
    team/oej/multiparking/doc/jitterbuffer.tex
      - copied unchanged from r64208, trunk/doc/jitterbuffer.tex
    team/oej/multiparking/doc/localchannel.tex
      - copied unchanged from r64208, trunk/doc/localchannel.tex
    team/oej/multiparking/doc/manager.tex
      - copied unchanged from r64208, trunk/doc/manager.tex
    team/oej/multiparking/doc/misdn.tex
      - copied unchanged from r64208, trunk/doc/misdn.tex
    team/oej/multiparking/doc/mp3.tex
      - copied unchanged from r64208, trunk/doc/mp3.tex
    team/oej/multiparking/doc/odbcstorage.tex
      - copied unchanged from r64208, trunk/doc/odbcstorage.tex
    team/oej/multiparking/doc/privacy.tex
      - copied unchanged from r64208, trunk/doc/privacy.tex
    team/oej/multiparking/doc/qos.tex
      - copied unchanged from r64208, trunk/doc/qos.tex
    team/oej/multiparking/doc/queuelog.tex
      - copied unchanged from r64208, trunk/doc/queuelog.tex
    team/oej/multiparking/doc/queues-with-callback-members.tex
      - copied unchanged from r64208, trunk/doc/queues-with-callback-members.tex
    team/oej/multiparking/doc/realtime.tex
      - copied unchanged from r64208, trunk/doc/realtime.tex
    team/oej/multiparking/doc/res_config_sqlite.txt
      - copied unchanged from r64208, trunk/doc/res_config_sqlite.txt
    team/oej/multiparking/doc/security.tex
      - copied unchanged from r64208, trunk/doc/security.tex
    team/oej/multiparking/doc/sla.tex
      - copied unchanged from r64208, trunk/doc/sla.tex
    team/oej/multiparking/include/asterisk/event.h
      - copied unchanged from r64208, trunk/include/asterisk/event.h
    team/oej/multiparking/include/asterisk/event_defs.h
      - copied unchanged from r64208, trunk/include/asterisk/event_defs.h
    team/oej/multiparking/main/event.c
      - copied unchanged from r64208, trunk/main/event.c
    team/oej/multiparking/main/minimime/   (props changed)
      - copied from r64208, trunk/main/minimime/
    team/oej/multiparking/main/minimime/Make.conf
      - copied unchanged from r64208, trunk/main/minimime/Make.conf
    team/oej/multiparking/main/minimime/Makefile
      - copied unchanged from r64208, trunk/main/minimime/Makefile
    team/oej/multiparking/main/minimime/mimeparser.h
      - copied unchanged from r64208, trunk/main/minimime/mimeparser.h
    team/oej/multiparking/main/minimime/mimeparser.l
      - copied unchanged from r64208, trunk/main/minimime/mimeparser.l
    team/oej/multiparking/main/minimime/mimeparser.tab.c
      - copied unchanged from r64208, trunk/main/minimime/mimeparser.tab.c
    team/oej/multiparking/main/minimime/mimeparser.tab.h
      - copied unchanged from r64208, trunk/main/minimime/mimeparser.tab.h
    team/oej/multiparking/main/minimime/mimeparser.y
      - copied unchanged from r64208, trunk/main/minimime/mimeparser.y
    team/oej/multiparking/main/minimime/mimeparser.yy.c
      - copied unchanged from r64208, trunk/main/minimime/mimeparser.yy.c
    team/oej/multiparking/main/minimime/minimime.c
      - copied unchanged from r64208, trunk/main/minimime/minimime.c
    team/oej/multiparking/main/minimime/mm.h
      - copied unchanged from r64208, trunk/main/minimime/mm.h
    team/oej/multiparking/main/minimime/mm_base64.c
      - copied unchanged from r64208, trunk/main/minimime/mm_base64.c
    team/oej/multiparking/main/minimime/mm_codecs.c
      - copied unchanged from r64208, trunk/main/minimime/mm_codecs.c
    team/oej/multiparking/main/minimime/mm_contenttype.c
      - copied unchanged from r64208, trunk/main/minimime/mm_contenttype.c
    team/oej/multiparking/main/minimime/mm_context.c
      - copied unchanged from r64208, trunk/main/minimime/mm_context.c
    team/oej/multiparking/main/minimime/mm_envelope.c
      - copied unchanged from r64208, trunk/main/minimime/mm_envelope.c
    team/oej/multiparking/main/minimime/mm_error.c
      - copied unchanged from r64208, trunk/main/minimime/mm_error.c
    team/oej/multiparking/main/minimime/mm_header.c
      - copied unchanged from r64208, trunk/main/minimime/mm_header.c
    team/oej/multiparking/main/minimime/mm_init.c
      - copied unchanged from r64208, trunk/main/minimime/mm_init.c
    team/oej/multiparking/main/minimime/mm_internal.h
      - copied unchanged from r64208, trunk/main/minimime/mm_internal.h
    team/oej/multiparking/main/minimime/mm_mem.c
      - copied unchanged from r64208, trunk/main/minimime/mm_mem.c
    team/oej/multiparking/main/minimime/mm_mem.h
      - copied unchanged from r64208, trunk/main/minimime/mm_mem.h
    team/oej/multiparking/main/minimime/mm_mimepart.c
      - copied unchanged from r64208, trunk/main/minimime/mm_mimepart.c
    team/oej/multiparking/main/minimime/mm_mimeutil.c
      - copied unchanged from r64208, trunk/main/minimime/mm_mimeutil.c
    team/oej/multiparking/main/minimime/mm_param.c
      - copied unchanged from r64208, trunk/main/minimime/mm_param.c
    team/oej/multiparking/main/minimime/mm_parse.c
      - copied unchanged from r64208, trunk/main/minimime/mm_parse.c
    team/oej/multiparking/main/minimime/mm_queue.h
      - copied unchanged from r64208, trunk/main/minimime/mm_queue.h
    team/oej/multiparking/main/minimime/mm_util.c
      - copied unchanged from r64208, trunk/main/minimime/mm_util.c
    team/oej/multiparking/main/minimime/mm_util.h
      - copied unchanged from r64208, trunk/main/minimime/mm_util.h
    team/oej/multiparking/main/minimime/mm_warnings.c
      - copied unchanged from r64208, trunk/main/minimime/mm_warnings.c
    team/oej/multiparking/main/minimime/strlcat.c
      - copied unchanged from r64208, trunk/main/minimime/strlcat.c
    team/oej/multiparking/main/minimime/strlcpy.c
      - copied unchanged from r64208, trunk/main/minimime/strlcpy.c
    team/oej/multiparking/main/minimime/sys/
      - copied from r64208, trunk/main/minimime/sys/
    team/oej/multiparking/main/minimime/sys/mm_queue.h
      - copied unchanged from r64208, trunk/main/minimime/sys/mm_queue.h
    team/oej/multiparking/main/minimime/test.sh
      - copied unchanged from r64208, trunk/main/minimime/test.sh
    team/oej/multiparking/main/minimime/tests/
      - copied from r64208, trunk/main/minimime/tests/
    team/oej/multiparking/main/minimime/tests/Makefile
      - copied unchanged from r64208, trunk/main/minimime/tests/Makefile
    team/oej/multiparking/main/minimime/tests/create.c
      - copied unchanged from r64208, trunk/main/minimime/tests/create.c
    team/oej/multiparking/main/minimime/tests/messages/
      - copied from r64208, trunk/main/minimime/tests/messages/
    team/oej/multiparking/main/minimime/tests/messages/test1.txt
      - copied unchanged from r64208, trunk/main/minimime/tests/messages/test1.txt
    team/oej/multiparking/main/minimime/tests/messages/test2.txt
      - copied unchanged from r64208, trunk/main/minimime/tests/messages/test2.txt
    team/oej/multiparking/main/minimime/tests/messages/test3.txt
      - copied unchanged from r64208, trunk/main/minimime/tests/messages/test3.txt
    team/oej/multiparking/main/minimime/tests/messages/test4.txt
      - copied unchanged from r64208, trunk/main/minimime/tests/messages/test4.txt
    team/oej/multiparking/main/minimime/tests/messages/test5.txt
      - copied unchanged from r64208, trunk/main/minimime/tests/messages/test5.txt
    team/oej/multiparking/main/minimime/tests/messages/test6.txt
      - copied unchanged from r64208, trunk/main/minimime/tests/messages/test6.txt
    team/oej/multiparking/main/minimime/tests/messages/test7.txt
      - copied unchanged from r64208, trunk/main/minimime/tests/messages/test7.txt
    team/oej/multiparking/main/minimime/tests/parse.c
      - copied unchanged from r64208, trunk/main/minimime/tests/parse.c
    team/oej/multiparking/pbx/ael/ael-test/ael-test18/
      - copied from r64208, trunk/pbx/ael/ael-test/ael-test18/
    team/oej/multiparking/pbx/ael/ael-test/ael-test18/extensions.ael
      - copied unchanged from r64208, trunk/pbx/ael/ael-test/ael-test18/extensions.ael
    team/oej/multiparking/pbx/ael/ael-test/ael-test19/
      - copied from r64208, trunk/pbx/ael/ael-test/ael-test19/
    team/oej/multiparking/pbx/ael/ael-test/ael-test19/extensions.ael
      - copied unchanged from r64208, trunk/pbx/ael/ael-test/ael-test19/extensions.ael
    team/oej/multiparking/pbx/ael/ael-test/ael-test20/
      - copied from r64208, trunk/pbx/ael/ael-test/ael-test20/
    team/oej/multiparking/pbx/ael/ael-test/ael-test20/extensions.ael
      - copied unchanged from r64208, trunk/pbx/ael/ael-test/ael-test20/extensions.ael
    team/oej/multiparking/pbx/ael/ael-test/ref.ael-test18
      - copied unchanged from r64208, trunk/pbx/ael/ael-test/ref.ael-test18
    team/oej/multiparking/pbx/ael/ael-test/ref.ael-test19
      - copied unchanged from r64208, trunk/pbx/ael/ael-test/ref.ael-test19
    team/oej/multiparking/pbx/ael/ael-test/ref.ael-test20
      - copied unchanged from r64208, trunk/pbx/ael/ael-test/ref.ael-test20
    team/oej/multiparking/res/res_config_sqlite.c
      - copied unchanged from r64208, trunk/res/res_config_sqlite.c
    team/oej/multiparking/res/res_eventtest.c
      - copied unchanged from r64208, trunk/res/res_eventtest.c
Removed:
    team/oej/multiparking/doc/00README.1st
    team/oej/multiparking/doc/ael.txt
    team/oej/multiparking/doc/ajam.txt
    team/oej/multiparking/doc/app-sms.txt
    team/oej/multiparking/doc/apps.txt
    team/oej/multiparking/doc/asterisk-conf.txt
    team/oej/multiparking/doc/billing.txt
    team/oej/multiparking/doc/callingpres.txt
    team/oej/multiparking/doc/cdrdriver.txt
    team/oej/multiparking/doc/chaniax.txt
    team/oej/multiparking/doc/channels.txt
    team/oej/multiparking/doc/channelvariables.txt
    team/oej/multiparking/doc/cliprompt.txt
    team/oej/multiparking/doc/configuration.txt
    team/oej/multiparking/doc/cygwin.txt
    team/oej/multiparking/doc/dundi.txt
    team/oej/multiparking/doc/enum.txt
    team/oej/multiparking/doc/extconfig.txt
    team/oej/multiparking/doc/extensions.txt
    team/oej/multiparking/doc/freetds.txt
    team/oej/multiparking/doc/h323.txt
    team/oej/multiparking/doc/hardware.txt
    team/oej/multiparking/doc/iax.txt
    team/oej/multiparking/doc/ices.txt
    team/oej/multiparking/doc/imapstorage.txt
    team/oej/multiparking/doc/ip-tos.txt
    team/oej/multiparking/doc/jitterbuffer.txt
    team/oej/multiparking/doc/localchannel.txt
    team/oej/multiparking/doc/manager.txt
    team/oej/multiparking/doc/math.txt
    team/oej/multiparking/doc/misdn.txt
    team/oej/multiparking/doc/model.txt
    team/oej/multiparking/doc/mp3.txt
    team/oej/multiparking/doc/musiconhold-fpm.txt
    team/oej/multiparking/doc/mysql.txt
    team/oej/multiparking/doc/odbcstorage.txt
    team/oej/multiparking/doc/privacy.txt
    team/oej/multiparking/doc/queuelog.txt
    team/oej/multiparking/doc/queues-with-callback-members.txt
    team/oej/multiparking/doc/radius.txt
    team/oej/multiparking/doc/realtime.txt
    team/oej/multiparking/doc/security.txt
    team/oej/multiparking/doc/sla.txt
Modified:
    team/oej/multiparking/   (props changed)
    team/oej/multiparking/CHANGES
    team/oej/multiparking/CREDITS
    team/oej/multiparking/Makefile
    team/oej/multiparking/Makefile.moddir_rules
    team/oej/multiparking/UPGRADE.txt
    team/oej/multiparking/acinclude.m4
    team/oej/multiparking/apps/Makefile
    team/oej/multiparking/apps/app_cdr.c
    team/oej/multiparking/apps/app_dial.c
    team/oej/multiparking/apps/app_directory.c
    team/oej/multiparking/apps/app_followme.c
    team/oej/multiparking/apps/app_ices.c
    team/oej/multiparking/apps/app_macro.c
    team/oej/multiparking/apps/app_meetme.c
    team/oej/multiparking/apps/app_page.c
    team/oej/multiparking/apps/app_queue.c
    team/oej/multiparking/apps/app_speech_utils.c
    team/oej/multiparking/apps/app_stack.c
    team/oej/multiparking/apps/app_voicemail.c
    team/oej/multiparking/build_tools/cflags.xml
    team/oej/multiparking/build_tools/make_buildopts_h
    team/oej/multiparking/build_tools/menuselect-deps.in
    team/oej/multiparking/build_tools/prep_tarball
    team/oej/multiparking/cdr/cdr_odbc.c
    team/oej/multiparking/cdr/cdr_radius.c
    team/oej/multiparking/cdr/cdr_sqlite.c
    team/oej/multiparking/channels/chan_agent.c
    team/oej/multiparking/channels/chan_alsa.c
    team/oej/multiparking/channels/chan_features.c
    team/oej/multiparking/channels/chan_gtalk.c
    team/oej/multiparking/channels/chan_h323.c
    team/oej/multiparking/channels/chan_iax2.c
    team/oej/multiparking/channels/chan_jingle.c
    team/oej/multiparking/channels/chan_local.c
    team/oej/multiparking/channels/chan_mgcp.c
    team/oej/multiparking/channels/chan_misdn.c
    team/oej/multiparking/channels/chan_nbs.c
    team/oej/multiparking/channels/chan_oss.c
    team/oej/multiparking/channels/chan_phone.c
    team/oej/multiparking/channels/chan_sip.c
    team/oej/multiparking/channels/chan_skinny.c
    team/oej/multiparking/channels/chan_vpb.cc
    team/oej/multiparking/channels/chan_zap.c
    team/oej/multiparking/channels/iax2-parser.c
    team/oej/multiparking/channels/iax2-parser.h
    team/oej/multiparking/channels/iax2-provision.c
    team/oej/multiparking/channels/iax2.h
    team/oej/multiparking/channels/misdn/Makefile
    team/oej/multiparking/channels/misdn/chan_misdn_config.h
    team/oej/multiparking/channels/misdn/isdn_lib.c
    team/oej/multiparking/channels/misdn/isdn_lib.h
    team/oej/multiparking/channels/misdn_config.c
    team/oej/multiparking/codecs/codec_zap.c
    team/oej/multiparking/configs/cdr.conf.sample
    team/oej/multiparking/configs/cdr_custom.conf.sample
    team/oej/multiparking/configs/dundi.conf.sample
    team/oej/multiparking/configs/extconfig.conf.sample
    team/oej/multiparking/configs/extensions.conf.sample
    team/oej/multiparking/configs/features.conf.sample
    team/oej/multiparking/configs/h323.conf.sample
    team/oej/multiparking/configs/http.conf.sample
    team/oej/multiparking/configs/iax.conf.sample
    team/oej/multiparking/configs/iaxprov.conf.sample
    team/oej/multiparking/configs/indications.conf.sample
    team/oej/multiparking/configs/manager.conf.sample
    team/oej/multiparking/configs/mgcp.conf.sample
    team/oej/multiparking/configs/queues.conf.sample
    team/oej/multiparking/configs/say.conf.sample
    team/oej/multiparking/configs/sip.conf.sample
    team/oej/multiparking/configs/sip_notify.conf.sample
    team/oej/multiparking/configs/skinny.conf.sample
    team/oej/multiparking/configs/sla.conf.sample
    team/oej/multiparking/configs/voicemail.conf.sample
    team/oej/multiparking/configure
    team/oej/multiparking/configure.ac
    team/oej/multiparking/contrib/scripts/safe_asterisk
    team/oej/multiparking/doc/CODING-GUIDELINES
    team/oej/multiparking/doc/PEERING
    team/oej/multiparking/doc/modules.txt
    team/oej/multiparking/doc/rtp-packetization.txt
    team/oej/multiparking/formats/format_wav.c
    team/oej/multiparking/funcs/func_callerid.c
    team/oej/multiparking/funcs/func_cdr.c
    team/oej/multiparking/funcs/func_channel.c
    team/oej/multiparking/funcs/func_devstate.c
    team/oej/multiparking/funcs/func_enum.c
    team/oej/multiparking/funcs/func_groupcount.c
    team/oej/multiparking/funcs/func_realtime.c
    team/oej/multiparking/funcs/func_strings.c
    team/oej/multiparking/funcs/func_timeout.c
    team/oej/multiparking/include/asterisk.h
    team/oej/multiparking/include/asterisk/acl.h
    team/oej/multiparking/include/asterisk/ael_structs.h
    team/oej/multiparking/include/asterisk/app.h
    team/oej/multiparking/include/asterisk/autoconfig.h.in
    team/oej/multiparking/include/asterisk/cdr.h
    team/oej/multiparking/include/asterisk/channel.h
    team/oej/multiparking/include/asterisk/compat.h
    team/oej/multiparking/include/asterisk/config.h
    team/oej/multiparking/include/asterisk/dial.h
    team/oej/multiparking/include/asterisk/features.h
    team/oej/multiparking/include/asterisk/http.h
    team/oej/multiparking/include/asterisk/lock.h
    team/oej/multiparking/include/asterisk/manager.h
    team/oej/multiparking/include/asterisk/module.h
    team/oej/multiparking/include/asterisk/netsock.h
    team/oej/multiparking/include/asterisk/options.h
    team/oej/multiparking/include/asterisk/rtp.h
    team/oej/multiparking/include/asterisk/speech.h
    team/oej/multiparking/include/asterisk/udptl.h
    team/oej/multiparking/include/asterisk/utils.h
    team/oej/multiparking/main/Makefile
    team/oej/multiparking/main/acl.c
    team/oej/multiparking/main/app.c
    team/oej/multiparking/main/ast_expr2.fl
    team/oej/multiparking/main/ast_expr2f.c
    team/oej/multiparking/main/asterisk.c
    team/oej/multiparking/main/callerid.c
    team/oej/multiparking/main/cdr.c
    team/oej/multiparking/main/channel.c
    team/oej/multiparking/main/cli.c
    team/oej/multiparking/main/config.c
    team/oej/multiparking/main/db.c
    team/oej/multiparking/main/dial.c
    team/oej/multiparking/main/dsp.c
    team/oej/multiparking/main/file.c
    team/oej/multiparking/main/http.c
    team/oej/multiparking/main/loader.c
    team/oej/multiparking/main/logger.c
    team/oej/multiparking/main/manager.c
    team/oej/multiparking/main/netsock.c
    team/oej/multiparking/main/pbx.c
    team/oej/multiparking/main/rtp.c
    team/oej/multiparking/main/say.c
    team/oej/multiparking/main/strcompat.c
    team/oej/multiparking/main/udptl.c
    team/oej/multiparking/makeopts.in
    team/oej/multiparking/pbx/ael/ael-test/ref.ael-test7
    team/oej/multiparking/pbx/ael/ael-test/ref.ael-vtest13
    team/oej/multiparking/pbx/ael/ael-test/ref.ael-vtest17
    team/oej/multiparking/pbx/ael/ael.flex
    team/oej/multiparking/pbx/ael/ael.tab.c
    team/oej/multiparking/pbx/ael/ael.tab.h
    team/oej/multiparking/pbx/ael/ael.y
    team/oej/multiparking/pbx/ael/ael_lex.c
    team/oej/multiparking/pbx/pbx_ael.c
    team/oej/multiparking/pbx/pbx_dundi.c
    team/oej/multiparking/res/res_agi.c
    team/oej/multiparking/res/res_config_odbc.c
    team/oej/multiparking/res/res_config_pgsql.c
    team/oej/multiparking/res/res_features.c
    team/oej/multiparking/res/res_jabber.c
    team/oej/multiparking/res/res_monitor.c
    team/oej/multiparking/res/res_odbc.c
    team/oej/multiparking/res/res_speech.c
    team/oej/multiparking/sounds/Makefile
    team/oej/multiparking/utils/Makefile

Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
    svnmerge-blocked = /branches/1.4:61042,61044

Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon May 14 12:46:53 2007
@@ -1,1 +1,1 @@
-/trunk:1-57996
+/trunk:1-64208

Modified: team/oej/multiparking/CHANGES
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/CHANGES?view=diff&rev=64244&r1=64243&r2=64244
==============================================================================
--- team/oej/multiparking/CHANGES (original)
+++ team/oej/multiparking/CHANGES Mon May 14 12:46:53 2007
@@ -1,15 +1,137 @@
 -------------------------------------------------------------------------------
 --- Functionality changes since Asterisk 1.4-beta was branched ----------------
 -------------------------------------------------------------------------------
+
+AMI - The manager (TCP/TLS/HTTP)
+--------------------------------
+  * Added the URI redirect option for the built-in HTTP server
+  * The output of CallerID in Manager events is now more consistent.
+     CallerIDNum is used for number and CallerIDName for name.
+  * enable https support for builtin web server.
+     See configs/http.conf.sample for details.
+  * Added a new action, GetConfigJSON, which can return the contents of an
+     Asterisk configuration file in JSON format.  This is intended to help
+     improve the performance of AJAX applications using the manager interface
+     over HTTP.
+  * SIP and IAX manager events now use "ChannelType" in all cases where we 
+     indicate channel driver. Previously, we used a mixture of "Channel"
+     and "ChannelDriver" headers.
+  * Added a "Bridge" action which allows you to bridge any two channels that
+     are currently active on the system.
+
+Dialplan functions
+------------------
+  * Added the DEVSTATE() dialplan function which allows retrieving any device
+    state in the dialplan, as well as creating custom device states that are
+    controllable from the dialplan.
+  * Extend CALLERID() function with "pres" and "ton" parameters to
+     fetch string representation of calling number presentation indicator
+     and numeric representation of type of calling number value.
+  * MailboxExists converted to dialplan function
+
+CLI Changes
+-----------
+  * New CLI command "core show settings"
+  * Added 'core show channels count' CLI command.
+
+SIP changes
+-----------
+  * The default SIP useragent= identifier now includes the Asterisk version
+  * A new option, match_auth_username in sip.conf changes the matching of incoming requests.
+     If set, and the incoming request carries authentication info,
+     the username to match in the users list is taken from the Digest header
+     rather than from the From: field. This feature is considered experimental.
+  * The "musiconhold" and "musicclass" settings in sip.conf are now removed,
+     since they where replaced by "mohsuggest" and "mohinterpret" in version 1.4
+  * The "localmask" setting was removed in version 1.2 and the reminder about it
+     being removed is now also removed.
+  * A new option "busy-level" for setting a level of calls where asterisk reports
+     a device as busy, to separate it from call-limit
+  * A new realtime family called "sipregs" is now supported to store SIP registration
+     data. If this family is defined, "sippeers" will be used for configuration and
+     "sipregs" for registrations. If it's not defined, "sippeers" will be used for
+     registration data, as before.
+  * The SIPPEER function have new options for port address, call and pickup groups
+  * Added support for T.140 realtime text in SIP/RTP
+  * The "checkmwi" option has been removed from sip.conf, as it is no longer
+     required due to the restructuring of how MWI is handled.  See the descriptions 
+     in this file of the "pollmailboxes" and "pollfreq" options to voicemail.conf 
+     for more information.
+
+IAX2 changes
+------------
+  * Added the trunkmaxsize configuration option to chan_iax2.
+  * Added the srvlookup option to iax.conf
+  * Added support for OSP.  The token is set and retrieved through the CHANNEL()
+     dialplan function.
+
+DUNDi changes
+-------------
+  * Added the ability to specify arguments to the Dial application when using
+     the DUNDi switch in the dialplan.
+  * Added the ability to set weights for responses dynamically.  This can be
+     done using a global variable or a dialplan function.  Using the SHELL()
+     function would allow you to have an external script set the weight for
+     each response.
+  * Added two new dialplan functions, DUNDIQUERY and DUNDIRESULT.  These
+     functions will allow you to initiate a DUNDi query from the dialplan,
+     find out how many results there are, and access each one.
+
+Voicemail Changes
+-----------------
+  * Added the ability to customize which sound files are used for some of the
+     prompts within the Voicemail application by changing them in voicemail.conf
+  * Added the ability for the "voicemail show users" CLI command to show users
+     configured by the dynamic realtime configuration method.
+  * MWI (Message Waiting Indication) handling has been significantly
+     restructured internally to Asterisk.  It is now totally event based
+     instead of polling based.  The voicemail application will notify other
+     modules that have subscribed to MWI events when something in the mailbox
+     changes.
+    This also means that if any other entity outside of Asterisk is changing
+     the contents of mailboxes, then the voicemail application still needs to
+     poll for changes.  Examples of situations that would require this option
+     are web interfaces to voicemail or an email client in the case of using
+     IMAP storage.  So, two new options have been added to voicemail.conf
+     to account for this: "pollmailboxes" and "pollfreq".  See the sample
+     configuration file for details.
+
+Queue changes
+-------------
+  * Added QUEUE_VARIABLES function to set queue variables added setqueuevar and 
+     setqueueentryvar options for each queue, see queues.conf.sample for details.
+  * Added keepstats option to queues.conf which will keep queue
+     statistics during a reload.
+  * setinterfacevar option in queues.conf also now sets a variable
+     called MEMBERNAME which contains the member's name.
+  * Added 'Strategy' field to manager event QueueParams which represents
+     the queue strategy in use. 
+  * Added option to run macro when a queue member is connected to a caller, 
+     see queues.conf.sample for details.
+  * app_queue now has a 'loose' option which is almost exactly like 'strict' except it
+     does not count paused queue members as unavailable.
+  * Added min-announce-frequency option to queues.conf which allows you to control the
+     minimum amount of time between queue announcements for use when the caller's queue
+     position changes frequently.
+  * Added additional information to EXITWITHTIMEOUT and EXITWITHKEY events in the
+     queue log.
+
+MeetMe Changes
+--------------
+  * The 'o' option to provide an optimization has been removed and its functionality 
+     has been enabled by default.
+  * When a conference is created, the UNIQUEID of the channel that caused it to be
+     created is stored.  Then, every channel that joins the conference will have the
+     MEETMEUNIQUEID channel variable set with this ID.  This can be used to relate
+     callers that come and go from long standing conferences.
+  * Added a new application, MeetMeChannelAdmin, which is similar to MeetMeAdmin,
+     except it does operations on a channel by name, instead of number in a conference.
+     This is a very useful feature in combination with the 'X' option to ChanSpy.
 
 Miscellaneous 
 -------------
 
   * Added the bindaddr option to gtalk.conf.
-  * Added the ability to specify arguments to the Dial application when using
-    the DUNDi switch in the dialplan.
-  * Added the ability to customize which sound files are used for some of the
-    prompts within the Voicemail application by changing them in voicemail.conf
   * Argument support for Gosub application
   * Ability to set process limits without restarting Asterisk
   * SS7 support in chan_zap (via libss7 library)
@@ -26,16 +148,10 @@
      can use --with-cap to specify the path.
   * H323 remote hold notification support added (by NOTIFY message
      and/or H.450 supplementary service)
-  * Added keepstats option to queues.conf which will keep queue
-     statistics during a reload.
   * Added rotatetimestamp option to logger.conf which will use
      the time to name the logger files instead of sequence number.
-  * setinterfacevar option in queues.conf also now sets a variable
-     called MEMBERNAME which contains the member's name.
   * Added Masquerade manager event for when a masquerade happens between
      two channels.
-  * Added 'Strategy' field to manager event QueueParams which represents
-     the queue strategy in use. 
   * From the to-do lists: straighten out the app timeout args:
      Wait() app now really does 0.3 seconds- was truncating arg to an int.
      WaitExten() same as Wait().
@@ -46,72 +162,34 @@
      SpeechBackground() -- clarified in the docstrings that the timeout is an integer seconds.
   * Added 'C' option to Meetme which causes a caller to continue in the dialplan
      when kicked out.
-  * Added option to run macro when a queue member is connected to a caller, 
-     see queues.conf.sample for details.
-  * Added QUEUE_VARIABLES function to set queue variables added setqueuevar and 
-    setqueueentryvar options for each queue, see queues.conf.sample for details.
   * Brazilian Portuguese (pt-BR) in VM, and say.c was added via patch from cfassoni.
   * CID matching information is now shown when doing 'dialplan show'.
-  * app_queue now has a 'loose' option which is almost exactly like 'strict' except it
-     does not count paused queue members as unavailable.
   * Added maxfiles option to options section of asterisk.conf which allows you to specify
      what Asterisk should set as the maximum number of open files when it loads.
   * Added the jittertargetextra configuration option.
-  * Added the trunkmaxsize configuration option to chan_iax2.
   * Added G729 passthrough support to chan_phone for Sigma Designs boards.
   * Added the parkedcalltransfers option to features.conf
   * Added 's' option to Page application.
-  * Added the srvlookup option to iax.conf
   * Added 'E' and 'V' commands to ExternalIVR.
   * Added 'DBDel' and 'DBDelTree' manager commands.
   * Added 'o' and 'X' options to Chanspy.
   * Added the parkedcallreparking option to features.conf
   * SMDI is now enabled in voicemail using the smdienable option.
   * Added zap show version CLI command to chan_zap.
-
-AMI - The manager (TCP/TLS/HTTP)
---------------------------------
-  * Added the URI redirect option for the built-in HTTP server
-  * The output of CallerID in Manager events is now more consistent.
-     CallerIDNum is used for number and CallerIDName for name.
-  * enable https support for builtin web server.
-     See configs/http.conf.sample for details.
-  * Added a new action, GetConfigJSON, which can return the contents of an
-    Asterisk configuration file in JSON format.  This is intended to help
-    improve the performance of AJAX applications using the manager interface
-    over HTTP.
-
-Dialplan functions
-------------------
-  * Added the DEVSTATE() dialplan function which allows retrieving any device
-    state in the dialplan, as well as creating custom device states that are
-	controllable from the dialplan.
-  * Extend CALLERID() function with "pres" and "ton" parameters to
-     fetch string representation of calling number presentation indicator
-     and numeric representation of type of calling number value.
-  * MailboxExists converted to dialplan function
-
-CLI Changes
------------
-  * New CLI command "core show settings"
-  * Added 'core show channels count' CLI command.
-
-SIP changes
------------
-  * The default SIP useragent= identifier now includes the Asterisk version
-  * A new option, match_auth_username in sip.conf changes the matching of incoming requests.
-    If set, and the incoming request carries authentication info,
-    the username to match in the users list is taken from the Digest header
-    rather than from the From: field. This feature is considered experimental.
-  * The "musiconhold" and "musicclass" settings in sip.conf are now removed,
-    since they where replaced by "mohsuggest" and "mohinterpret" in version 1.4
-  * The "localmask" setting was removed in version 1.2 and the reminder about it
-    being removed is now also removed.
-  * A new option "busy-level" for setting a level of calls where asterisk reports
-    a device as busy, to separate it from call-limit
-  * A new realtime family called "sipregs" is now supported to store SIP registration
-    data. If this family is defined, "sippeers" will be used for configuration and
-    "sipregs" for registrations. If it's not defined, "sippeers" will be used for
-    registration data, as before.
-  * The SIPPEER function have new options for port address, call and pickup groups
-  * Added support for T.140 realtime text in SIP/RTP
+  * Added a new CDR module, cdr_sqlite3_custom.
+  * Added a new realtime configuration module, res_config_sqlite
+  * Added a new dialplan application, Bridge, which allows you to bridge the
+     calling channel to any other active channel on the system.
+  * Added support for setting the CoS for VLAN traffic (802.1p).  See the sample
+     configuration files for the IP channel drivers.  The new option is "cos".
+     This information is also documented in doc/qos.tex, or the IP Quality of Service
+     section of asterisk.pdf.
+  * The built-in method for doing attended transfers has been updated to
+     include some new options that allow you to have the transferee sent
+     back to the person that did the transfer if the transfer is not successful.
+     See the options "atxferdropcall", "atxferloopdelay", and "atxfercallbackretries"
+     in features.conf.sample.
+  * The device state functionality in the Local channel driver has been updated
+     to indicate INUSE or NOT_INUSE when a Local channel is being used as opposed
+     to just UNKNOWN if the extension exists.
+  * Added support for the Hungarian language for saying numbers, dates, and times.

Modified: team/oej/multiparking/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/CREDITS?view=diff&rev=64244&r1=64243&r2=64244
==============================================================================
--- team/oej/multiparking/CREDITS (original)
+++ team/oej/multiparking/CREDITS Mon May 14 12:46:53 2007
@@ -109,7 +109,9 @@
 Simon Lockhart - Porting to Solaris (based on work of Logan ???)	
 	simon at slimey.org
 
-Olle E. Johansson - SIP RFC compliance, documentation and testing, testing, testing
+Olle E. Johansson - SIP RFC compliance, documentation and testing, testing, testing,
+	- MiniVM - the small voicemail system, many documentation updates/corrections
+	and many bug fixes.
 	oej at edvina.net, http://edvina.net
 
 Steve Kann - new jitter buffer for IAX2

Modified: team/oej/multiparking/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/Makefile?view=diff&rev=64244&r1=64243&r2=64244
==============================================================================
--- team/oej/multiparking/Makefile (original)
+++ team/oej/multiparking/Makefile Mon May 14 12:46:53 2007
@@ -46,6 +46,7 @@
 export ASTCONFPATH
 export NOISY_BUILD
 export MENUSELECT_CFLAGS
+export AST_DEVMODE
 export CC
 export CXX
 export AR
@@ -63,6 +64,8 @@
 export NCURSES_DIR
 export TERMCAP_DIR
 export TINFO_DIR
+export GTK2_LIB
+export GTK2_INCLUDE
 
 # even though we could use '-include makeopts' here, use a wildcard
 # lookup anyway, so that make won't try to build makeopts if it doesn't
@@ -284,7 +287,8 @@
 
 makeopts: configure
 	@echo "****"
-	@echo "**** The configure script must be executed before running '$(MAKE)'."
+	@echo "**** The configure script must be executed before running '$(MAKE)'." 
+	@echo "****               Please run \"./configure\"."
 	@echo "****"
 	@exit 1
 
@@ -423,7 +427,7 @@
 	$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
 	$(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
-		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
+		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
 		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
 	fi
 	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
@@ -541,6 +545,7 @@
 		echo ";[options]" ; \
 		echo ";internal_timing = yes" ; \
 		echo ";systemname = my_system_name ; prefix uniqueid with a system name for global uniqueness issues" ; \
+		echo ";autosystemname = yes ; automatically set systemname to hostname - uses 'localhost' on failure, or systemname if set" ; \
 		echo "; Changing the following lines may compromise your security." ; \
 		echo ";[files]" ; \
 		echo ";astctlpermissions = 0660" ; \
@@ -673,14 +678,42 @@
 
 menuconfig: menuselect
 
+gmenuconfig: gmenuselect
+
 menuselect: menuselect/menuselect menuselect-tree

[... 35764 lines stripped ...]

More information about the asterisk-commits mailing list