asterisk-java-cvs Mailing List for Asterisk-Java Library (Page 80)
Brought to you by:
srt
You can subscribe to this list here.
2005 |
Jan
(4) |
Feb
(75) |
Mar
(211) |
Apr
(70) |
May
(12) |
Jun
(7) |
Jul
(96) |
Aug
(90) |
Sep
(11) |
Oct
(42) |
Nov
(45) |
Dec
(4) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(20) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(32) |
Aug
|
Sep
(4) |
Oct
(2) |
Nov
(10) |
Dec
|
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
(3) |
Aug
(73) |
Sep
(13) |
Oct
(4) |
Nov
(1) |
Dec
(7) |
2009 |
Jan
(1) |
Feb
(2) |
Mar
(48) |
Apr
(21) |
May
(14) |
Jun
(11) |
Jul
(9) |
Aug
(2) |
Sep
(11) |
Oct
(14) |
Nov
(6) |
Dec
(4) |
2010 |
Jan
(3) |
Feb
(2) |
Mar
|
Apr
|
May
(3) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
(9) |
Nov
|
Dec
(12) |
2011 |
Jan
(1) |
Feb
(5) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
|
Jul
|
Aug
(10) |
Sep
|
Oct
(5) |
Nov
|
Dec
|
2012 |
Jan
(3) |
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
(2) |
Dec
(2) |
2013 |
Jan
|
Feb
(2) |
Mar
(1) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
(2) |
Nov
|
Dec
(1) |
2014 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(5) |
2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
(25) |
May
(10) |
Jun
(4) |
Jul
(7) |
Aug
(4) |
Sep
(1) |
Oct
(1) |
Nov
(3) |
Dec
(1) |
2016 |
Jan
|
Feb
(42) |
Mar
(6) |
Apr
(15) |
May
(3) |
Jun
(1) |
Jul
(11) |
Aug
|
Sep
|
Oct
(17) |
Nov
(2) |
Dec
|
2017 |
Jan
|
Feb
(4) |
Mar
(1) |
Apr
(3) |
May
(2) |
Jun
(3) |
Jul
(7) |
Aug
(11) |
Sep
(5) |
Oct
(7) |
Nov
(4) |
Dec
(4) |
2018 |
Jan
(11) |
Feb
(11) |
Mar
(3) |
Apr
|
May
(9) |
Jun
(6) |
Jul
(17) |
Aug
(9) |
Sep
(2) |
Oct
(4) |
Nov
(3) |
Dec
(3) |
2019 |
Jan
(13) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(5) |
Jun
|
Jul
(1) |
Aug
(6) |
Sep
|
Oct
|
Nov
(3) |
Dec
|
2020 |
Jan
(2) |
Feb
(72) |
Mar
(8) |
Apr
(11) |
May
(12) |
Jun
(3) |
Jul
(12) |
Aug
(3) |
Sep
(5) |
Oct
(4) |
Nov
|
Dec
(9) |
2021 |
Jan
|
Feb
(31) |
Mar
(6) |
Apr
(3) |
May
|
Jun
(2) |
Jul
|
Aug
(2) |
Sep
|
Oct
(9) |
Nov
|
Dec
(32) |
2022 |
Jan
(5) |
Feb
(7) |
Mar
(2) |
Apr
(3) |
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
(2) |
Oct
(111) |
Nov
(105) |
Dec
(26) |
2023 |
Jan
(25) |
Feb
(6) |
Mar
(10) |
Apr
(54) |
May
(41) |
Jun
(24) |
Jul
(6) |
Aug
(11) |
Sep
(9) |
Oct
(8) |
Nov
(55) |
Dec
(34) |
2024 |
Jan
(6) |
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(89) |
Sep
(48) |
Oct
(31) |
Nov
(9) |
Dec
(19) |
2025 |
Jan
(12) |
Feb
(18) |
Mar
(9) |
Apr
(7) |
May
|
Jun
(7) |
Jul
(7) |
Aug
(3) |
Sep
(22) |
Oct
(2) |
Nov
|
Dec
|
From: Stefan R. <sr...@us...> - 2005-08-05 05:03:54
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7848/src/java/net/sf/asterisk/manager Modified Files: ManagerConnectionFactory.java Log Message: Made default values customizable Index: ManagerConnectionFactory.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/ManagerConnectionFactory.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -p -r1.2 -r1.3 --- ManagerConnectionFactory.java 23 Feb 2005 22:50:57 -0000 1.2 +++ ManagerConnectionFactory.java 5 Aug 2005 05:03:14 -0000 1.3 @@ -22,7 +22,6 @@ import java.io.IOException; * This factory is used to obtain new ManagerConnections. * * @see net.sf.asterisk.manager.ManagerConnection - * * @author srt * @version $Id$ */ @@ -30,63 +29,146 @@ public class ManagerConnectionFactory { private static final String DEFAULT_HOSTNAME = "localhost"; private static final int DEFAULT_PORT = 5038; + private static final String DEFAULT_USERNAME = "admin"; + private static final String DEFAULT_PASSWORD = "admin"; + + private String hostname; + private int port; + private String username; + private String password; /** * Creates a new ManagerConnectionFactory. */ public ManagerConnectionFactory() { + this.hostname = DEFAULT_HOSTNAME; + this.port = DEFAULT_PORT; + this.username = DEFAULT_USERNAME; + this.password = DEFAULT_PASSWORD; + } + /** + * Sets the default hostname.<br> + * Default is "localhost". + * + * @param hostname the default hostname + * @since 0.2 + */ + public void setHostname(String hostname) + { + this.hostname = hostname; } /** - * Returns a new ManagerConnection to an asterisk server running on localhost with the call - * manager interface listening on its default port 5038. + * Sets the default port.<br> + * Default is 5038. * - * @param username the username as specified in asterisk's <code>manager.conf</code> - * @param password the password as specified in asterisk's <code>manager.conf</code> + * @param port the default port + * @since 0.2 + */ + public void setPort(int port) + { + this.port = port; + } + + /** + * Sets the default username.<br> + * Default is "admin". * - * @return the created connection to the asterisk call manager + * @param username the default username + * @since 0.2 + */ + public void setUsername(String username) + { + this.username = username; + } + + /** + * Sets the default password.<br> + * Default is "admin". * - * @throws IOException if the connection cannot be established. + * @param username the default password + * @since 0.2 */ - public ManagerConnection getManagerConnection(String username, String password) throws IOException + public void setPassword(String password) { - return new DefaultManagerConnection(DEFAULT_HOSTNAME, DEFAULT_PORT, username, password); + this.password = password; } /** - * Returns a new ManagerConnection to an asterisk server running on given host with the call - * manager interface listening on its default port 5038. + * Returns a new ManagerConnection with the default values for hostname, + * port, username and password. It uses either the built-in defaults + * ("localhost", 5038, "admin", "admin") or the custom default values you + * set via {@link #setHostname(String)}, {@link #setPort(int)}, + * {@link #setUsername(String)} and {@link #setPassword(String)}. * - * @param hostname the name of the host the asterisk server is running on - * @param username the username as specified in asterisk's <code>manager.conf</code> - * @param password the password as specified in asterisk's <code>manager.conf</code> + * @return the created connection to the Asterisk call manager + * @throws IOException if the connection cannot be established. + * @since 0.2 + */ + public ManagerConnection getManagerConnection() throws IOException + { + return new DefaultManagerConnection(this.hostname, this.port, + this.username, this.password); + } + + /** + * Returns a new ManagerConnection to an Asterisk server running on default + * host ("localhost" if you didn't change that via + * {@link #setHostname(String)}) with the call manager interface listening + * on the default port (5038 if you didn't change that via + * {@link #setPort(int)}). * - * @return the created connection to the asterisk call manager + * @param username the username as specified in Asterisk's + * <code>manager.conf</code> + * @param password the password as specified in Asterisk's + * <code>manager.conf</code> + * @return the created connection to the Asterisk call manager + * @throws IOException if the connection cannot be established. + */ + public ManagerConnection getManagerConnection(String username, + String password) throws IOException + { + return new DefaultManagerConnection(this.hostname, this.port, username, + password); + } + + /** + * Returns a new ManagerConnection to an Asterisk server running on given + * host with the call manager interface listening on the default port (5038 + * if you didn't change that via {@link #setPort(int)}). * + * @param hostname the name of the host the Asterisk server is running on + * @param username the username as specified in Asterisk's + * <code>manager.conf</code> + * @param password the password as specified in Asterisk's + * <code>manager.conf</code> + * @return the created connection to the Asterisk call manager * @throws IOException if the connection cannot be established. */ - public ManagerConnection getManagerConnection(String hostname, String username, String password) throws IOException + public ManagerConnection getManagerConnection(String hostname, + String username, String password) throws IOException { - return new DefaultManagerConnection(hostname, DEFAULT_PORT, username, password); + return new DefaultManagerConnection(hostname, this.port, username, + password); } /** - * Returns a new ManagerConnection to an asterisk server running on given host with the call - * manager interface listening on the given port. + * Returns a new ManagerConnection to an Asterisk server running on given + * host with the call manager interface listening on the given port. * - * @param hostname the name of the host the asterisk server is running on + * @param hostname the name of the host the Asterisk server is running on * @param port the port the call manager interface is listening on - * @param username the username as specified in asterisk's <code>manager.conf</code> - * @param password the password as specified in asterisk's <code>manager.conf</code> - * - * @return the created connection to the asterisk call manager - * + * @param username the username as specified in Asterisk's + * <code>manager.conf</code> + * @param password the password as specified in Asterisk's + * <code>manager.conf</code> + * @return the created connection to the Asterisk call manager * @throws IOException if the connection cannot be established. */ - public ManagerConnection getManagerConnection(String hostname, int port, String username, String password) - throws IOException + public ManagerConnection getManagerConnection(String hostname, int port, + String username, String password) throws IOException { return new DefaultManagerConnection(hostname, port, username, password); } |
From: Stefan R. <sr...@us...> - 2005-08-04 06:07:47
|
Update of /cvsroot/asterisk-java/asterisk-java/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3656/xdocs Modified Files: index.xml Log Message: fixed grammar Index: index.xml =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/xdocs/index.xml,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -p -r1.25 -r1.26 --- index.xml 3 Aug 2005 22:47:31 -0000 1.25 +++ index.xml 4 Aug 2005 06:07:38 -0000 1.26 @@ -53,7 +53,7 @@ License, Version 2.0</a>.</p> </subsection> <subsection name="Status"> - <p>Asterisk-Java 0.1 has been in late april realeased and is + <p>Asterisk-Java 0.1 has been realeased in late april and is available from the <a href="http://sourceforge.net/projects/asterisk-java/">sourceforge project page</a>.</p> |
From: Stefan R. <sr...@us...> - 2005-08-03 22:47:41
|
Update of /cvsroot/asterisk-java/asterisk-java/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9194/xdocs Modified Files: index.xml Log Message: Added link to Asterisk-IM Index: index.xml =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/xdocs/index.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -p -r1.24 -r1.25 --- index.xml 3 Aug 2005 22:23:59 -0000 1.24 +++ index.xml 3 Aug 2005 22:47:31 -0000 1.25 @@ -107,8 +107,13 @@ cvs -z3 -d:pserver:ano...@cv... ADM for short, brings the power of Asterisk to the user's desktop. It is written in Java, uses the Eclipse SWT library for its GUI and Asterisk-Java to provide Asterisk connectivity.<br/> - Available under the GNU General Public License (GPL). - </p> + Available under the GNU General Public License (GPL).</p> + <p><a href="http://jivesoftware.org/asterisk-im/">Asterisk-IM</a> is a plugin + for the Jive Messenger XMPP (jabber) server. It provides integrated + presence between your IM client and phone, notification of incoming calls by IM + and originate calls from the IM client - and of course it is based on + Asterisk-Java.<br/> + Available under the GNU General Public License (GPL).</p> <p><a href="http://www3.mb.sympatico.ca/~chadk/">Asterisk-Java for Mono/.NET</a> is a port of Asterisk-Java to C# for Mono, Microsoft's .NET Framework and anything else that implements the basic |
From: Stefan R. <sr...@us...> - 2005-08-03 22:24:15
|
Update of /cvsroot/asterisk-java/asterisk-java/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2363/xdocs Modified Files: index.xml Log Message: Added link to IntelliJ Idea Index: index.xml =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/xdocs/index.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -p -r1.23 -r1.24 --- index.xml 26 Jul 2005 14:46:36 -0000 1.23 +++ index.xml 3 Aug 2005 22:23:59 -0000 1.24 @@ -153,6 +153,8 @@ cvs -z3 -d:pserver:ano...@cv... <p>ej-technologies for providing free licenses of <a href="http://www.ej-technologies.com/products/jprofiler/overview.html">JProfiler</a> and <a href="http://www.ej-technologies.com/products/install4j/overview.html">install4j</a>.</p> + <p>JetBrains for providing a free license of + <a href="http://www.jetbrains.com/idea/">IntelliJ Idea</a>.</p> </subsection> <subsection name="Contact"> <p>You can reach me at <code>srt</code> at <code>reucon</code> dot <code>net</code></p>. </subsection> |
From: Stefan R. <sr...@us...> - 2005-08-02 10:14:30
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29636/src/java/net/sf/asterisk/manager Modified Files: DefaultManagerConnection.java Log Message: Added catch for RuntimeExceptions thrown by event or reponse handlers. Index: DefaultManagerConnection.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultManagerConnection.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -p -r1.23 -r1.24 --- DefaultManagerConnection.java 17 Jul 2005 00:10:30 -0000 1.23 +++ DefaultManagerConnection.java 2 Aug 2005 10:14:21 -0000 1.24 @@ -845,9 +845,9 @@ public class DefaultManagerConnection im { responseHandler.handleResponse(response); } - catch (Exception e) + catch (RuntimeException e) { - logger.warn("Exception calling responseHandler " + logger.warn("Unexpected exception in responseHandler " + responseHandler.getClass().getName(), e); } } @@ -895,9 +895,9 @@ public class DefaultManagerConnection im { eventHandler.handleEvent(event); } - catch (Exception e) + catch (RuntimeException e) { - logger.warn("Exception calling eventHandler " + logger.warn("Unexpected exception in eventHandler " + eventHandler.getClass().getName(), e); } } @@ -923,9 +923,9 @@ public class DefaultManagerConnection im { eventHandler.handleEvent(event); } - catch (Exception e) + catch (RuntimeException e) { - logger.warn("Exception calling eventHandler " + logger.warn("Unexpected exception in eventHandler " + eventHandler.getClass().getName(), e); } } |
From: Stefan R. <sr...@us...> - 2005-08-02 10:07:18
|
Update of /cvsroot/asterisk-java/asterisk-java/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28590/lib Added Files: easymock-1.1.jar Log Message: --- NEW FILE: easymock-1.1.jar --- PK J9© Îù¹¥%©E: yÉzJ¼\¼\ E)ôjk²lÒÍÆ±½îh/Úét¦ÞpÑÞ¦ÓéßðØ>g³Ét:}Ï{ÞÏçýØì_o_u ,W³ð úý¨è®X ̽3çÞsîå¼½?¿¨c;@kÖ8iÞð°éa!w&´çJµËà6ô`(¶¥ñ¨'Ì ïÅÛ:âqþç k2a Ü1àRJõ;C*+âqØúj"ZpÇ&MÎ.-ÖüçáÁgØÿ]§#£ y;¯GÊ©ZsÕ¯zCY£kòÈj3Á\ò\%Óº´ýèR&§MÁfåbnV±L1ÿÙ@¹ÔÓVæäêNkþÛ)2?øµ¾?ç;(Ïâ* ª¹HÿPK ѱRÔ.v²KèåR7Բ˨¥IôµfQk!»¬ÕÒÚxóÿ» ¿«Em¨µZ¨].jkESÔÖ©N±®q¯P_-ìJ*º©è¡b=WQq1MT¬¢¢*z©Ø@ÅF*ú¨è§âj*®¡âZ*®£b©XI -Npà G,8ö#7i(×ÙwEâ¡]ÁÖ}à pv¢·î`|(éõÐÐæí§±ö=Ê+맦jbTmãÕ6ª¶ðj:÷¦ª§¾j]s{"¬lOz¥6o;Ç£`Y;cI·_}¶¨Ï6õÙÁ TxÇÙF¡¬{î#FUçã§_ííÏÀ¦%¶l:ÒÚ,5EÚA(7ÄHâÌh nó &àlC7´ÖùäÆvu3dPãM³]ç®)s»·ç.kW(ÒÅUBUÿ>µZ*&|çZ骴MUZJÑ\á=yÁ}fpß îCj´îò§®Pø2Ü-5m ïõï×L¿B¦5ÓXÌ¿_X~,s·¤Zþ±D{RÂ~~+d¼AÁ×eFxFcfûR¯4#ɤx%P8®¿¢Ôz¥ûîw¹i6á4d¸Cb>¶ Âáö¾v®ùAºÓÖnÓ¸cÒ×*îÑ~úÄIü`¥ïýÈöIrjk]/Tn|âÆ5mrü;â~ÏrÚDùóêóþ,¥ %´¡ðçêó.õ³?¿¢>¿ÊÁÿ _Ã]ò|»ìX9>ßa°ÛØ¿Ï Ü¥wwÁ}XzS¸¾O|ÃÌÃÀ͵n¾iæÆiàf§:ªÑÎϹ¾1ÈòÕ/WVÝc0ã8x¬p²} G!Ç7 3¾ÆÚà ÷f¨OB-ܱ|?øwø6 L@tâÊQæ¼B0{T8ßÎIö<tÅC!ުǡHu\ J&ãn¡§¡>Ú¡èïaûÃØóFðû´Pq¬C¶?ÆqXÀ_O²*Tà˨xåéOáÍâ<m'±u `RU¨beë°FmȪ°CÅq¨´LÁUippÿmÏaëó(ñE\ «Ã#R c(¥·ãͱ^gý(TkxÙ8>ïl{[í¿æxsObâÂ(áè<Ùu<çUä¹Ë8r !çvCm¢ÏyRô°í/ØúW/ëÐ+z%<ãÝ£CBè¶q?\wGo#ÝëFan6²rY6°Ýcò5ÝV|Ò(âµÙ+"^g\ÈU<k¤È)?e¤yGö ÍÍ òRD^ÈçI'S4?)eõBsC"rmòjD^Èí|¹yX ÿk§Ä,³i³lõAãÔ"ôÅzä'éî<v5ä³k ]'e?áè]Äñî©¢À"^Åu|9W }?$Ââ.6l¯îl¨ðU꣱à¢×'à´2H ²ÔÈ0¹ |Ü.!¢¬63*xÐf\Íç ©àDøD̹ÈVb efTîE*÷!ûaûJµ RNEª+áNLTlÊ3F1©Õbâ1YnFä0A"G0&£ÒLÄä¬QLª´Ì×Åä<3*O#ÓHåÆä¬4&'Lbòl [/br¾×ÈHäMÉ[ÒKc_ª*öÐJ+âDôö7n> J,-:©ÇÕ7|ý<|Ñ( µõúE¹ÂÁFdÐú1 ×H£0a E¡ª!q5®4ã0v#F!. (üD6µex±Ï!ÛÁç1 wH¢ð_ê24ÂOe7ßKÄÍ÷R¯åpYî÷iË×ÓÜ|_WÑä%XòM&KÞrÜüȲB¡ådÉ+KO¿ä_÷ÐØ²ã°JÀ6ÁFØ3ûÂ>+UÖ["ìVÉ-:-"µf°¯ ì«û¾! =¡µrØFjkCP»Úö=ý¾°Ha'RÔ2R»à8¬jÛM`6p[ímu@¡5K ;¢öIÉêj/7-CØr@Ø*)ìpÚÁÏ%°kl§ìBGØmÀþ7Ü;¯Þü®÷º©³Ýerx[`uX¡ÒÚ*9¼_å]ª½rx×U"Ãê ¦F»ETp&ü4U÷Ð+4.³ÑO"M0ÛºÃàjksY®x\jÄyZÃYYxí5~·)NØMß0bU¦cU£cu¥«ýÈêdu V.X^]°zÌõ0ëÖ£¬Ç¤ÁÈ(Xok>X>]°ÖëiÖiÖÖYi°&3 ÖÛéæ{½.XWëmÖ;¬w1X¿k8`½#Ý zÅ.´Ád²ÛVÙ¶b(´f¼½¿Taר°_ù(lÔ~ñseÛ<°Ûæë¼:WüJ]:¾¯¿^< _õ(ô%{]^H½^Oðê]øM ×¹£Ðìuz])õ:!¼N¨\µn®Nöº½®z^'U®ÿÂ3xM²×ôº^êuXxV¹þNõÚ£ÌN_9×&»ÝÛfÝYàn"]N5]TSn³ð¿*ÀzGK6ËWMkóºdà´ uY!K¤.KMÕÁÎ~"a.Jذ%ìJ&R$¼"¡$lNFøJ¸U*aRHLð õ(ÁpJø¢T°0"áýÔ4WÂd¯!À=ÓHóù¶C i&Òþ"KÛfwB=K*mXHJ;ÇÿT%å '#Í»}vÚãnÞîé¼Ú¸×¯èµ2íñL^Ü«%#®^ôZöxÖ¸Z3⺽.O{<k\mq½½^öxÖ¸Ú ]Én;Àa¿<í¾¸ÕçClzÊ]%Ë×@Ô^pÚ7¤Ý·pLmÊsf&aJ¤Ý·$de(!¢i÷m# ®Ì$ܤݷ$¸ H2À§à3ÓHóÔÁpÍHí0)_ÂFÿ(öOfîC ÷O#Íì%|%<44kr20ƦfMÂLÉFMønôO¥=§ 7ú\q)×7Å.4)hÏËþBÚãy*bÊf©3ÌÎÑò2ö*J{-íñl.mVÆÒ~Ò~öx66;Si¢´ÒÏriY,`_òßà°ä¿Á©Ôÿ +$V¤LqV,~³+Ã@ßìç8İ6wäqcmhlã°k{GÀJ?XØÆ q*xuÖ¾1X7ûéŪ¾Ü0ÐüÆ887aíæøä8ܵOQHgêà ù°9¯¯õw°Ìú>\fý: 6ømô$KH!+e @¿fØ ê©ϸòü?PK B 9¡ T\Ìé 2AdÈ_óBþBêº|âû±2°´ÁÃE±] bÁÙqµ×°(6ßñ÷e| ãC M)f%Ý3;å¦Ýqf-æäØ)åyÁ¶<A ÍËU¦¹-Aº !w7, &çÙì³â ïç,·h$úùBÎ>*¡6Ò5'!0b¤¸PÌø©R>ÁÍÐi'<i$>ÇÌøö6v6G6"˱æ 67L %,ÛdI{gÙBÎp@[Ü>þT¨{"ëÄ*Éù'â ¨è¸!ê¬<ó¤s;k¤7`µ>ïJh{¶ }ÐnÞ$nØo%®ªëÖôÌìZ[VBK¥vég×ïÓõÁ®õ*ù0e~}Ä):èÎÉùÑ$6Y_5LJ§eqÓÎ 1ÓyjÔ4ó_àf.½H9ˬÈÙÀ9[w¦êÔ×Ê~׺ LsÊÆ1ä'X6Jfå··=ÍÞ^áRÅ!¼D4öëê³²T[*àEÅаp\×yéÓ6³ùèµ$/¼IòjQó¨%YA3 ú¢àQÖI®¥r&EG,m3¡®iÍÎr-NAÛ4tí#=Ø/ãcàS×ñÊ´mæ áR:-òØ6LÍ%¦âs|!ãK_ázDÅ×øF¨5ôööJèèêÑXkYÓ LJÀåXÅ·¸¡â;|¯âÆ$ìÝk¨øM-ðkE § SÂþÏm@Å/ÂÑiq¤<꨺yIåÉ)yËÅ íkKƯ*~Ã~ vì\>T ëuT~Ö§ó8±ºî¸¯´Ùîa9#´¬ÓÉ%éÌY®`Mðŧ´\g]tÔfĥйÚß[T¼¬Xäê=«¡X±å²ôZUÔ¶ Á):} [#+-N3AJÆÌb[èÅ*ÙY¨[ÛpÕ(°bë[%° ª×ø¨õã Ѿüâк7Øj¡;-[ËPzZ¨ªjº³GÏÌMN_Í=è çCʲzâP¹Ó»§F4g¦6äÌY!9êX4¾L_qÔÒ Ø½)ºó÷Q{Yw×Q~ Æ&6-Øx¾TW}èèT1éË$]Cs{ôoÔßDh òùpð>E»ïAî¡Þ·Ý:·Ó;¬Íô4j!;Ðîøhqíx>Äê0 He#8êyûP t òè~ÆÜÄ÷¡RRþÀ` !«)¼©ÍÝe4Ó»ë-o!Þzuámb» 2¶; hÅ9s|» §YìCÄÁ«¹H*x8×<%ä5´Â°|¤ |Ôt¢8ÁwC´qßx¨b<T1Ât3F1æ¿zG¾?J>w'¾¶J v°Å~{;ËØ%bÞMCOÚÐ;9¦ëÈLÛ2@hç` þ ~¼¤%Óÿqt Yg0ÆKjå¦5â÷Ür¹7°®z#a«úTõÁwä>CiFà¶ ¸ËPàr §:~[IÇ0VþJÍp$b~sÃQ<nû´Å¹-cn²ZÏ"C²Á½)msÿaØC5{%i¸=èô³Â£ òtYdÙäÑ+Ø9LºSQr> ; YFñrL>%«ÄÓf&bîΪ13ôrÈGu ò4jiÅXí¬6XÔÿÈå"¹ò¬ü#§£Õ¨ÿµ_þPK \VÞ2¦BEX:¸¥J¸ªÌ5×RܯµÂ-±ç}þîÖJ»û¢*ËC÷l×÷&Í>÷ mø·'²ÛÛ]á?á»ä*^;ÛÜ·Õ><˺Mdsϯo4¼êíJá»Ü)èQÔâe;<aöaÞa`"é#:áɺðuÞªwäÅÌÂ#:Þôm·Æ°lþ-!bÞà²JÙåBr'õFçav@zK¬Ë$ÊMoym¿*ÖmÕÇá(dIÉ4ŲS6°&q4`ÕqSEÞbXøSëS·Õn6=_½Í¦ð¹´=÷áëªh*a椧f!o·ò®'óv£é(öÛ:îÁ]s {¤÷ × ÉIÖ\sxK ÙÝîà°|Ù¶Òìó ,ôÃ~¹Ó37á*ÞÿöÑwÔÿÅ¢òôj=y ò³!;J»u:×è?]<+Z ½£ÙaÄÈSfvc´ìDc@à)Ttõ!¦G1*sÞúÑâb#Äß ;´¾#±Q|mÖGFt9"äè7Ndgä;`å<¦èÑ2pÎ4òÏa:$_¡h¦}þ,<Fê[Ä0ÜL¨F'*D¥ã|ð lIÆR2?!ámÄtW/2°fI¬êÅ.`$GÉÏ.*0+ Zù< MÁQ6´+8ÆÒçí²ãB>qaAe¸Äpá Ã(ÃUç))¸&×í9îÚ![Gì.à£z_rfLjcc!-2¤ÅÃìA[b2<'PÅ'|º67?MûÂÑjßx\ïÕ¡I=Þ*P¤Å'3z41HÄÃÑ wpJ»¡ù"ZtÂwflJ%Zkßãh®}y.ßÉ¿¦äj|-©Ðâú\2²b¨%%ÂttóP?CC'C!Kô0ª«]+?õǵд[±ó«®À¹¼#!4uï*_%´ »~klJ$µÝÅ@,é0?â7SÝÀì [ g°3eô)R¨4ªÑf8TF¡²v¥.Á! \ìNCªÈ`OÊSç]BuÊZsmBP1(ôUIÚvaz+NѪ§©$"ÈJuQ ÎÒÈëÓsø ¹¼Rz{&97 {_Ív\ö¶Ô¿Wa·l¯! ãûþ$XVI¸"8Õo?e òù.LèÞ9$SÃreÂÅßa1¼e{x4@h <VÓ´ =U©£J[hWÚÁq¥'èáÔÜ ô~ J)(H*öÊé@Ü:ë`8fÊía1]c=êq}Gµ3`@źªo3:¼HçÙ¾R}ï =2¾C 3Et®)çô3¥?®ÐL Êí}8¬¡èa äÛTqaÝéÚìYþ2Ò&6-¦=%:{hT¶º¢²Õ\ ¦¾@M-²æüçÅîÌÑÑ·*ïò{° pãÇðvæÏwÚ ¿Æ°ºþvÂjNQ¢hæ´<z[zÊau×?³Ø¸Ã毥ÐJò¶¦U}ÓùûWN`ãï)NÂb=9»!ÆÒ¡Úâ'ÎT `_jÅí8¢xGw¥zG»îaUÅZïia]êïkäV¢¬áÜ»KøI±)|¬â Ó¸¢¢b!Îf¯#,ÏeXªØN³(¸û¤c׿*'·ë§.%µÃ½zK8g½N[}òÕL·"\·ÚâÃdå1ÿ{Ù.VL×£óè]Ó2½UröÂÊËí2ËvC0$+¦%ô:û©òý6YR»ÎÛ»Ü1¥Ã^ˤ;çTöKÏÑËGÅ×=Þ¦¨Ùlÿ6mn5ÛûEÝ+åö-«=wı=´X»>ÎP6·É 7 ·>lÁlîóìÏ1&Ãëõä¯Û.wDÕ>,:Âíµ=BMÊáØiWê4ïhô»çÔÅ) L?OÑÐÁi\Ö1ulãS¯c!û¢\«øLÇçØa¸6þÐr{Ý®íx¢±Ý÷LÛºÿm]tå!sJm6·hºí-n[È¢!QUu¼R¬¨ØÕQÄ#×qCÅ:jXÖ±'Å<^a^~ÝqøÉ a IÄ1I»)*:óÃð® ²2äQ2igø±à¥àÈ þ ø<ÁU/çXÉ¡rñfãòTÔú,¡HRä R&XÍ%sHN~Ƥ§/bJ"8RðhèD+ÄyxÈùU vRHj:ÃâØ*²ddà#ÊðÒ¡öL3<ñÀG1ìs¬È®k×LF[ç²Ï^kí³¬üóï³? >Q1-±ü©ÝIà3±óye1¯(Øe1½z§É¿Í°^v½zíníÛåøÜsL»°sRd7¹ßpVÊÌïÍm:õÇm^ó¹'²¶,Çò·®êÓmí>¢bö!Zr8C²l9|·Ó<äÞ=óЦTÙöéYb,FýEÔ7&PïCLÛ&Vóc¶_BqjCáDÃl7ú¤#zö©çßuLX-êc$~ÍÀ\¡fë7¸G·Rç~%hôE=û²Vkº3¸ÃeO¿Åúô~=®~8Jj3LgPýµ)G©e¾»ï{Sg¸¦ORß?DÔ}·ãÕømKx 9`}Eä)-а=.pW븨áV6h÷v§Õr=íµ¸gúëÜú¡Æ[bÀ°zzïz6mµÓë§fËæÂ_høûtdÒÓ:®àû G-*¾Ñ9>æ¯ð@CÂBº·ñ ²bðavÔOTGð#Ø3h44Yªdm²ÓüsæÔýåI~]@GK<60âÿ°B\vÍ&Ýò>Ö q³Õâ!çÇ©ya©ßÉ"ÖéSºLÛ3ôG÷.Gdz'è¹K×hv1Dè}ÎÈUó=é!òÌOSTé Ìá,RT´&³± G¢*£x²EõËAõ*ÍE~Òè!jä"fä">(BâÅEÌ`I0É&)å×±À\§l±§@©¦=Ìü"Äåάªõ³ªLø6¨ðS@´ûs¹.T.^ù±ÈÜ_Ð*Æïåééâìc,Ò,N³xçCþhäɨKô^#iëDxcHT1UûyZ¢Þ }Jzº1üëÍ!=±POWÇÎ=¬ãÍà°I<Ó@Îj^¥rBwÉE÷KfB¡¼E£kt[B(ý¸¸o([Ì8Álµ9C"¦ºO-P°],ù .Î º.QúUBTCb>¼+óßûPK éuå¹ÒfW fÈf&iÉ8£mNúÒ§ÐR$ðÖoÉsÄ2éNcöÉvu´[ Þ¤4-ëVzQ`y²{¤3ÒÊ/m;òààgcÕÁul8xáa[ww(ðêߤDE¿µI ÌvÈ6Aú\ê¢_kk?iÊݬOIȹ¬´y$õúvÐücè[þ-¹ñÚg\ gXùßÔù?8ËPýƹãßVºãùxÌÓü=óUÈíFÁ8ýúâ[qí²ÎTÙzCã,c÷17 ~ÏXb¬¾¹@é SW(ýK¢ZH, i#|÷ çDqAB2|ÄXx%W%Z_â¢qV¸|",_sA0¾æEDP%t`.I¸MĤ0t·3%á L ëPZ °D%lÂU×$D1Ä4_g8öuþvSyû}?®óÇ["nx[Ä;dv¥¬h¥!fu«J¦è >å5µúÝ-E¥T<fäØºÅ2Ò©ê A0Ç4VP,&`«¥~ÕÈ*jè'=§1ve5¥Têæànî>3q°Ú]qÒ3ºUd8¨êªuH@,öD®zÎ ðsöZU ''9¢Lh$ Z;§*ß×~«¨$ ³ÐÇÒ̤½Ü§ê3uEës:¡N¨eÇ#ÐÁ¨Ð°.gj`:˦8'ÂTbxÀi7}Çæoal9¸g¹H@ãiLÏðÀ<ÉÚ}ù³@vxXÐéMãÏ É¥ztTæ9©mÁ¸ù982ÒÊϱ\'3¯d)ºðNfCc·pJ j+¶ÜdÇé3Pwß0Ý/`óÒ#ÃuÂ(ëîIJe3Ëè~cØãÎ{¹ïâÈã Øè. tåi¦÷ð¾}¸É·dìÆmüP/?Ôë01Ìýî¥t.q,ã|(Ó|꣦\h[;íýB×ÊèçûM)V g˺¥N2²ûqHE²d²è`<-*cñøzûÁ£¡1EçÑ~²HÁK£À(!)ñ©,>ã¨ÏeÆ*ZêñnÓLYzãGËù<34PQå-3"ãK|%ã4NÉ`<ë_ãopWÆ·¸# çû¾vCî²°å ¦ ¬JJ6«cmÓéUù4Ø|1þl²-8}ع¼©zþoÞWÒ-á±Ðç£4Pb£HÛR×6Ã×§l}^Õ´¶¦Ýþkì7ejéä4ù¶wß5R6ì(©Vb^ã¡ ÞGSæ³$$ùÿÀªÏS®@¾æN¶øè¤h]ÑVG´Ï¢ehÐê*:Æ÷Ðõ±ôÓP»E³xn&¾@IC8ÕG'黯m¬§¾Ù8Qá ³£¾kçBÀ-Htîy²ÖÎV ¿)+´ÇEs²5ßcÍ<ÂÄß®!úgá÷U±vÔºcë2ñDë+ØPÅS\Õî¨l1t%;~ÃF?æöû×ú+<$§qèß;ýlâè&ù6`;!ãLÚñìvøÕãÇQ#küí8Ývý6üã£$õ{£V»óAÂp|xÑLC[*èæ¤·ÒZÁ¶9»v8»í¡ßfÐå©3×4ðÑU³¥Ï{4QÁö bCÉ?@NúvUÐ3fG§Í#mv¥a¯ëâ¢u7Ñ Öñ!BùW§vqõPBñûæçáËmê~»=ÜÁt¸ áE¼dkdEºÞ"Fl~/ÿPK Ï@)3EàÂPfø IÿàÜݵ¤øgüí½w¿ç9ßý¼ùÇþø1£X c* ±¤ð¼/ñbb|tL¨ÈFÐ1±É am^¬&ULEÐSiar^¬ BaF¢8³TÌç FI Á Qc®jx1K*æ#ØËB\àë¸*Ô^òuð²×ªÛo¨¸®â¶ÍÎë× æÁi}NO³4KN7l£T.8bG ð¬U2Ó*JNJ=iM§WB0Þ1"Aî·r¦A³h*ÏLöY}¢ÀA+«FtÛ{ÿPv¦Lº<2hÙiC/ÍÏXÙói³èvQ/¤OÛ9Ã6rÇ)}δlË \5²0ßÀp¨ZQ÷ÃnI¾ÕF·¨'RGÂþÍÃ- Ý?´Åa$´Ý7æPÃã«:´ôSËjàBY/µ$Ú`ÏJh¼×¸ç¬¾\®/ëÐc[q³YõÚîd§¾kñ·Ãõ½ÖêXÖ^wu®öfø-à%×3ò:VúvYÛÐãnʶ1dJº $'}ƱÍâ$i̯ Õ²d²å³nÎrÁeSÉZå"á5bØf~Å͹»èqtDÎXe;k0Åi]u+@ÇvÔí³m}^d¬q`¥5<"Ä£xLÃq¨¸¡á¼*¡}³nÒð^×ð-|[X|GÃxsC³ÞÂ«ÞÆw5¼ïí÷5ü ?XT;ÙG¨à0¹yµ{>«y¥ü¼³\¸þ"¾äå ý ©õ©OÈÿ<èñKh%âª")ÉDL©`{-ìXÀ£±P5¦~PLý0S<ð;c!oòk1íèBصVsmQÇÙ%"n÷þk$nÔ%¦PÊËxp4LuFå%ìZBìOU¸&H!ÐÁbì¨)=JrÓ³3ìÜAvíúa#x9Â7Ã7Ùg Ûuú É|D¾K*oÑþ#ú1Áüáü_váó³ ÿ§>üaü'/Àè§n4íÀ_ñÆ ÍzØR»b6GÜFR#!®ZóϯOÝuÚEánËî·Ñ¿=$o¯`£å!¤Ñô³}ËØ?ª,á\ÁÁæÇ©àO+8Q]dáJ*Zã[íÖ¨¯ñS1Õp¤.ë+® EåÛPI³ïj¨· £ t¬¨ßIÑPÊgö©¬2wÛ(ϱÚgXï(±{OãE<O¤¦ù¿·äê7Èão<ÿ7¦\ò2UîV/ç]±òX+ÿ¢ç¯ç!~b ó,Ä(SdB\àiöÅY2f´=øß6ÐãÈʬZi/FÆë-»=¢W{ýÚV S\&¥ ¨â¬â)'b²g¢OWÒjP¬½Û¢È=7R[Ý ¸¹w¸IÑúµQÖ (¬uµYÜÍr]@%Öw æYåVh±×¯â%þ{ ×\${½|$¸á"Äo;Þsd$@¤¯ºXéóLÏO¹X)ÔuóxöPK ,TÛfI:ÝïZíú×%×dÇw¼ÒßeT½ÝóÒ *2ùÈé±ú ů¦nx«¹Äõ }7è¸~S`¦°X}ì|ã<ªP ½TgZìËz [~c«ôO`ú«×Û~à¸~7lêÄjw_ú)ãn»×©Ë5T+Ëcâ,.±¨ ?®xl:ÞV§ÙkI?¸yPûÛöæ¢ÑÛ^7°kÒ^ß°£ù3Ìmjg4csþÌî0kؽb¼o£ mîFïáCÙ;Øeñ¹%¼kâ çgÀöèPÁ·RútLÙß mf¸ÆÆí¨9²aýÏ#LÓØ=&õ{ü ìRö#%H°æÁäK$îçHýeýYi¶æ?G¦ÆfÑz½8ÿcE¢ Áeêë*QX£¾ UßB¸s¦O{Q-ͱéâ3ªü %E2ñ[L lnÉ1ø"ÑJj@AF/_º/¿3ö²>z¹0æ²àý.?ZxPìÃx¹8qÿfn²7¯lS¿Stz(ûotà>yìÎÍçLÓÊ (¥íÄ+C4Ä4UoLóÚAä Ô,Ã÷';E¶¿:´vv<;;Z;Ðû¯DnEòÜõYÙ?}Í® áæcÜ|{%Þkѳ;ýº Ù@6À{*ëýPK íF ÒRKGK»ÁÂh)©ÛX ¦åÖ :`vé.lm0×± ÷ÿÏÑÑ,ÙÝóÄ::ßùÿï}¿ëÿå¯~òy TsUùÞp4ºA`CÓ¢:O¸zb£TS#Fâ>¡Äßéz",ï-¡+5&lcÕGP,1:ÒS¤NÇî஡&fDw9mR]IÂPdyëÔüÅÍóEeñDìì9I´ÀÃòI¥L`Mq £'ÆiNUHªHñNÒ&é¨òi#ãmeÒHí7Æô©Hj@O &Ư!ÏÙÝñ©I#JZ+«Ýåu¬ðÄÖ¾7'ba>fÅ{& ,¦Ö-¸R@£òcØSóg¬ly×¢pÞTVGuA¬B9òißtóâvLkÅÍôJBí>v.NA¥¥5$Âx"<N §<âT&;§Â k£ ±¢iéÚ~þ¼TÛ·¨ZÑ'×í_|Ý~m êd±UÙttquá0Ê +³rª:û Ç{®¦U§h:i^úÌË~y©.@YÊý¡Á.`vS.°áçÏB¥·,% ÉnÀ*c!£èXz(1Æõj5½gCF<E¹³*¿IöÉöº±@áºRffY©àlõ9¥áè¸2´bLGdR7r{µ(«®;GM_W$ÖÌ;cÔL»jkGAÍ(r:feöt9t>`×:){° ,ç<uÅrÛ|FƧlþS*m©]ïJ ùw§ÚÞPÄ:|C±©DÈèK´åá]êÓpç5ÂÐ0q k*°ØÊmbÜ¢VëÄz ñQ6ÕE²C ¹ÌV'ÑX*@aì1G Å1%¿'Ý¢NÃ]xáIMD½{DÀiº5²GÃλE£&6Ø$6³#Ú.ÕðÑDh¶CP]MÃâÜ"¨< á!¼W¢Míò£ClXbq=¦¢ssÀLÖeY³û"1=%iîÎ÷ǦÓx\ÃÓx4jy KQlÛy9Ö±fäNL,ȾsÊc¢3ÑÐD,!í,MGMè =ÄÐÊG;ÈÇ:F|Ü|°3 ?6<ê»4±÷jø-ü6 ¿âöMÉS³k2Ìc´3cVFÈÌd.Æx0qFÜ0Få2sbPF4qØ£.ܽâzùq[ܨð Ý¢[ûdÖdñòÀ O:3®©<ÀLLïa¶åFpÜ ¦Úh½&zä Ðî$A¢,@$¢#6꤬áY<ÇÆ¨¢eoʤ¶pt+ÑD/ëgÑfTðàT$r$¦ÌAº:JqFÏóL&ITÃ,ÒtæUYfzq-Ó¡¤Nk%^¥~>(Ø(:X)ÒÃH·l44ëM$b Â-\RñA=9Á©Xýb^Ztf̡ͩµ¹È-£Ú¦±µyKÓÿo¨å鱺Ø6ñ̰d UMÍÚpÝ"3>ÛõdtÖæè7ï]À×0ßÖspà L2ÂB#OsÑ·¹<+ôÑÑÞ³q®¯R· oak\|64©«na^dP^¼£×íÅ"Îzq>Ò+/GóRÕ?o|ÝéëîâÓrÎ ²ì@ØM~Ý`@ÝÜ4¨Oæ·æTWÉGvß}"©ì,4°Æ§Èt÷¯âŹ£·ávèp¡D_ +hj±±Ö#1ä·)L+&ëqgQJé9·ð; LâgMò© mTÚ®Ôkæ"K½ÀmÛBîoØ_vÍÖR®luhðÙ8Zz,ÿVCiËU,)A>¼îrø´Â¶³oÅÝÊ{l ÇHI®Zô/M3lTË?÷,S{e©CûR®öhVa¯aµ°ÚFà¼f!©$~Z%FUE\Á ÂT» R%µîn$ÖM´¦µ4¼û 6fÞ{æÛñ;æÄlþ³%UÐ+XÝZô -l[Ø<²NÛjÜJæ¦ÓJä{EæõV&ÖfÝÕ2ºG°DUK@VK~6X×£4n̵6^-¦ñBü>å<ùʶÉõçÐ0ÜFãÂÖiíiZ{{KÇÖ¶Úè´öýÊÚVGüÍ£\u¡, 9<6oNcS±Ô0y$¨#I)ò8CgòøG©âñûó+¥ÆªÍJYÈ o&ü]¬·°Rîf¥ÜS¤Rî·k¶R.°BLø°ôAS~¡ÊÄZ½æÒÂÞF÷ÀÛy½XÙ,ØhØhªÀØøMV#ÞôózQe[*z?QßÅ®ônï¡Q:Zö»eZXÒÃef3hÉiÁº6Ù \èWl³<ÌÏ÷1çßfR;£ØIgfÏ´ùÍ - ;Ö¨àRì³Ø±Ði±Ëmdß;æ$÷(Óñ1 cp£Ó&Öi5IâC]®j·IÔçpÔeqüÿ#Äÿcõ%?qà·ÛøíVYJüÇmürµYü ùøv=ÇZ>Nü§øÏÅÿ ÿÄü*hÉ/B³ }°Yì¸Â¼Z¤ Ì2,?CY°_g.Ȭ·ÍÃSÝ,CÛpÝ}¥Ñ~Âp §±U ·e¾7íR¸C Ù©wRÆ.)ÛdÚ®®KcÏ¥l·-h'oàS¬¦O£ÏÓkÌä½/òôÿáÏbÃñyöø &n[·½¸é%òçEËÆû¬ÔÚM_\àØÆàvÍbïE4õKBs¸~8ü7Îâ&éîtÏbofÑc8ä9úÕtÄ/ÁùäË|ö>ý*g®¯9<¿ÛâWÅ|))ÿ#ó"ÓÒd²úOspûA¸4ÞàUô@wýÓ8tÍÞ\KyAÿá¿ ù¸Õx nû£ 53óPë?'-ÀÛ¬!¬QÚøÖ;M¿ Ö¶8-Î=c¿M¨ï°|×a³½?Ťyõ´Îqܹ}µÿu~HÝ-/ÉØp ¸³8\äo ïÀØÈ~H[D?áTóSf?ã¨ûsGJì²IíÂ'T²×sÇ%úBÏØgÎ]/v aûoMãè5YuC2CæpÌöÍqÓ7äx"ã¡×]ËÅ/¨ïtÖ¯xÿ*V1óÓ@~3¡ùó±Åd¿òêÏøàõ Ê9,»Q)|8û-Ý%òAKã)ÞI_TgÜß2aâõµOå)] ±UbÃÕÒ uÂÉé©{.³eK'Î"mÍñNßÝò"\@ë)~9©¾ØÐ§¤ëKwº.¢ªµÚµ¡VKîujWëóOüú{¥YRª*Zº^±çð*øE Ö5hkÑ$jÑ)Öa¿ß(ê3p·íånËËëXvWØ KCuø¤j9αٸU¶cðcUÎÀ³sxCþÆgÑ;#ÿ «xS)^§nÖòìsܶÊ6YÊ&éuÈ.IÙVllmwÈvÈIÙ.l·ì^öH¬^y|EltÈ6Ès¯iLLáè£UÙJ¾â<¸oj5d·á|<MÓßI§<ÆeF½²?¯Ü~í7PK GwÊNWIÔò»"?r Ûª&±KÈcîd°%#×êÈ`)uUîæm£´¨¦%Mú-2ÀeÚE»f¹ýJ2¤ ¾sèØ?yä©`&ëë3M͵» Fw(á ÚânͱòºY#ÁÁÌ^ó8=Y¶'äWʳU!k.rKÍå&ÃÊ«bE»ÄôyæðºÄßO¼ u7N¥/ÉÉÙó«ÞcIê¸,ÖSÄZ×Ýâ!§ë>t¦ærÂ-·êKHdå?ñ&Ò OëFzee¬&/림¹õ²'w¶íSä9C¤àZàvïÓèÀpWqJ><ßÞMÉÂ{I¼Jã{¼Nb?ðcCÃ0¹ßHÂÊ»QÕ¼UjUW³lW+púÉKaiÞÔªÒGaR§2jÚ«(¶³§ÁpOÑ=×iºh[®c¾rWHe0Ldþ_£³hÒ°éë¥Ò|Ñé&êË4NS|JâÖEû´íÈö|Ütdx¹ í̧ª{Ûu«Lña^rA~1Q6ôrì¦q:é¿f9ZÑ35úlôþoýB³®Óÿzm´â¤×N:Ý4ëñ¤éù GJ]7pös Ò!ÙÑ_ûÝcïÿD¿£õç:¿´?;êiÔ¹=èEÜïÁ-ôK«=¸òI£qöéGÕìGòDz!"!«dhDú7)^i-íIúÖèÍ]§<ò) ÊGÛY@?½ ` ÷=8Xvaã¾V¬zlo;¸ãà.aæX$ $Ì Å±îãCåëg/Û>PÙíêOâ4ÎúÿïFûY¶Ç\aÊÅÑXªm1N{d$T¬ãé£ÄÂò0Sû¡wGYô*Ó\ªT$áî¢))ri:) /¶`2s}pÕºÜl©·%óB¥g+f¾T§GY¾©Èó·|ÇYJèôU[÷ÎKx;ÞˬPÜuÇyM|ø¸çã \,ö¿ftõUÂ|ÅÄÙ¿ XýÁ«üQþE5>¬c<bk³Ç 49ÚáÈbÛ NAÁÔÞ ¬Ðâ{` Í aM>³ü²RÂÐæ OËñ´P£yt¦2¯sÞØ;}ç uiV¿¬Bl]\ÃõJ«¡ûC94aK\¥68Ò¹Nð Ö{4ØÔ¾£þMÛß\M3×"/oãÞÎÎtÖfdT{wóPK ÂT®ÔL[UÐfiæ²^U°7w_{¨¥k¶QJçó^ÌU;£ déÕZɦËî-.±mÔ0 {\?9<¯ 0])ê º ÏÔÊKºuK[*q'«0ð¼fòímì°rk9kÕµr¥ð m¶nZ)=ëÄõùµbQÁxrGßÌÛ¬cF¶¹É(èßHAÐ)¾1YÐVµg]ß©×H¿½«P³,Ý´oVªmTLAqÚÇZ°Ëº=ëqLfß Ø½¢UçµQnéKMî*éº^jÂp©9"È8=g[¹ÌÓ½á ûÁÔ%afüÞ£WÙ0eÔê TßJ«Ô¬~Õ^èj©}\¨F|ßÔ*ÞÃ=-Û¤eik®é}$UÜÇ%@±Hª(ãSi%-ôe4gk¶~¥^ÐW]mÆDãDY·W*Å\ ½¨ Lh%K×k Ö?¡%Ì9rϨÓîT.QÕíã©â*!¬ªø ª<!£Sa#«¢%¾Î*.ãkâý_«Àºk²7Gì¾wÝ&^äVÆ7îën êòª½ÆµÊiâ¶µY\O »©^=5{¯·Üµ-ûÞiiÈίÛ_ëÁf8án¬ê¦Íignke^¸ªñÍÓ^¨6ÛI(Ñ×Wy\/NÅÉ]uNò¹rNÙìð<_ËA>Öo*åàÊ'ÍåÌì$Îa(Òòë:=αÔ:ÔKøòëð?GË mÏúÕ9|c'¸êâÿ¿T÷8&Ò¿8éAÿ@ï ¿Bdf¤ÇØõj>ºkíX]\¾ÀnZ¡ûâåËß^ìAãìcÐý¸®I%S8íÐËàΩÝ8ǤqxDÿõæý£þ±'¸&Lâ t{4£ß£'Àâs®âëØó4ÆýÞÅÑ]{~~ÝüO»¹îýiã7åi3S¬HÞ>&ÔÏdp 5HúY»!\ `ÓL.KJÕJ-ï¥ÆÊÐkô¸Íô¸ÓÃÄ2Nj>¹^jSüòrRÔØìóáö·ø´9åqbìu=åëtÅ>KÞ9úÈÊv9jà`±_¶¡ÜÔjmÆi#râÛéÝÞ0åyI D¬¾í ~äð>ã2jj}vWë|èhÝ£8CêÚùzY¥9KÒÛåÙTÝ DahñúøPK 7ÆWÃ%ê3dÈfÒèÎõÖv½7ÁÊÎT\OìÐ-S>g'{ÐL, l&mÃJêÈ#ù<0ÈR½¯oÝaFd0ý¡"ÛrµÞ·è*37düFÎÙÂi}C·nóoíWÀOe4wËf8uv¹ ±íºn i¦%V:!«íq;£'Ú§ç´aºä|z,Û¥dOìn®CTÅ-C·õºÈXFNëLqM1ïrÜÝ×§=¶e&è{îMþ~ç$¤*ï(m"¸n§äØÄ°ÙTÀµÕCp üiî&Ì3ÐÊXqc½étüö]&wk¸=Al·«±LÃ=¸WCwn ù^Æ+uÓ\ëxMÃëxCÃxKÃÛ8%°ø`Ç?ÒoéCÆ);6,ÛL%ÝÔÖYVÊÒÐ.éïêÂ<³µuüÓð.Þ++'Q=Ðð>>§5ÁYV©¥NàÎ[ i<¢áCSññóøTÅg>Ç*¾)}¥a_kø¯høßiøç4ü çÎàGÈ^ëoCyÊ'³ÝÚ{ ý¿êSP.gNQv*\<´u3Þb°çäk±ë¸µGÉ3aX-`ó,-_Ð !°ºXÆ·+§JÒ8B·u¡i%dJâÙÃ&|úð°d,M }ù¶OÊO}Ñò5tõm¿ ©¤|}Ø)7ûBÓ5C!uQB$NÅõ×P{2'Ôs¸ThKùsaËNèq*Ru(-¸ËwÈ8Ú#[¢"Ô§jÒ£ßÌ §l(,¨7ÏR|C»«bPOïЦ#Q÷ÅH fûÇlÚßÔU v9uV Òí´×T/Ù±_tMüHôðËRË»)´ÎªË«,îç¸O´ôðZO $6ÏE(áÆð.Â÷³³wÇjî?T¢sQ ÿk°³u. Às'½ çNú/á}Z³^ÇáãuÃÔXcøøÆáoQx£KQT»O0¤ÒKÐ<ØyÝ`f ~G Åô65aÖd5ì<ÌÂ~£ÖÑu=Ö`1Öcæj×m.Ì X 6'Ì \[Cy·íLg:e¨køEûÖ9ÔçºÄe>K´O[~Ý2Èæ\÷ ª¶ 22ñøÞ( kÇQ1Êßrñ/Å!>5â0æ³õ,ä²ÙÜC*ïçÿd.¹\:°ÑÉ¥ñoÂf^ËXè-ÌÀCÅN QüN¦^®ó5çæ"ÎóÙOkMº«ºkG°®¹rΪw6Oàò6aî82Ï1Ô8Kwf-jcåê8æ1Éùå+Ëïù ©¸¾é.a!ë¯â¸,ß"AjÔ¯SNo*_¸õgQ®À7rn;q*Ï꡽Ecúæ¨cX*ï¥ï»Fþ=Æ® ]ȱ¾ ²ègjìÙäq9ZN&»ÉNîÈÞ1ÖþM²|¬»¹zãlôûÛÊ<âr«Ì5î:]v-[?þbºYǸ =Ów8Æ_U²Z>zYÁ¶±ÿQ{²Õí¼S ¶©$w¢¿9G±róq(&³k¶l±ÉmµÃgMåF6.åÞ0¯ä®³9ËäéÚ³Ðd37Ê><+0ã.&c°{¨{±û¨ û©Hp/ ó·á ÉÏCy}*KoÖGº¯aC_vHósCBä¹CºÓc×PK ÈÞª nlëJmPª5`+ ¶êÜ0C'îû¾·ü~ÅsZ8sÚ~i{NÿP¿µ}îdà´_nî}ç]w¹Oîÿô3|AÃÀÁJ´âjÃóa\ð0A×¥dD.£ÜÀòÃÜ˯/Êå¥0^âr¹A nËE«À´KU! Q ²aLJ=©0(i× 9©3©`ç°'ÍtÔætÓÊSÒæ´hÁÖsÑAm6® tN7tûIþöQ~3-¤n¡Â̰®k9JêfJËj.Ï®0`OêôÚ4lThùù35Õ [X¦ð0^mVØk`)H´aå4#µD&'Rv´¨/çûÈrvRÏÛnÅ\ì+ïKAN_¼;K êíö2ÎúýZ.ß4|Ù¯.âN=Y´¶%ìej¹k»óÈ ¢ eS *'Jý?¼Íjî]eÀ´Fá-ö%SLt:²«Ò·úoé22ã)+¨ðJai$§ îhÆÒfÄÓ&òyaÙºihzN¤/Z3;Ó"£Ñ_i&UCOÒ±"m KÏÌ+¨Îд`AÏkYçj 2l[º¥GuÎQ/!q>ÝVP¿ê^f.í âC|ÆÇ*>Á§a|¦âs|Á)+7H*¾6<Z×¾B&#ä+|âéÿ[|§àè6é±±fb"o[ZjUûw¬áInÊ4lM7òWG`÷ê;pubÈãìpDf§&]Ä·QV¶0#;ïs Îmb½ ±äÿlÃֻΠ¯ÑSa½6Jt#õ[]dòÇü Û;6£iª^Zèör,à)ÑèV96))ýO2¯ÔJÜØ:ÚÔUÃ4/§(s'è!±Ô¯©G-k¦ÏJx¡i1?,»VûÐÎ_âkÚÑ©Ð]òá5[£¾êÖKùÆÿûQlÞæ\i³³Â`«»7B»NT¼ÙtPaEð¤rñm2ÎQ+ßZ .xóõTªnwÒ^ö| ±GÁÐ}ô[Æ^ Ðt6ô"öÝGk,8¿&c3óli.b?ñXò>ü4: àÞ?¿5ßã¤Ê¼»Ü¤eJ=^Òg8EpºÖKX1ìaÛBÁ÷þ B¿LÐIöqÃ3Ç¥UEH¹Eðã6.RHܤÖ%F¨ÇUZ?ËomÔý°,ÍNad®8}NþPK ÈÞª |
From: Stefan R. <sr...@us...> - 2005-08-01 18:38:52
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25425/src/java/net/sf/asterisk/fastagi Modified Files: AbstractAGIScript.java Log Message: Deprecated execCommand(..) methods in favor of exec(...) in AbractAGIScript Added GetOptionCommand Index: AbstractAGIScript.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/AbstractAGIScript.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -p -r1.14 -r1.15 --- AbstractAGIScript.java 30 Jul 2005 20:37:29 -0000 1.14 +++ AbstractAGIScript.java 1 Aug 2005 18:38:43 -0000 1.15 @@ -20,6 +20,7 @@ import net.sf.asterisk.fastagi.command.A import net.sf.asterisk.fastagi.command.ChannelStatusCommand; import net.sf.asterisk.fastagi.command.ExecCommand; import net.sf.asterisk.fastagi.command.GetDataCommand; +import net.sf.asterisk.fastagi.command.GetOptionCommand; import net.sf.asterisk.fastagi.command.GetVariableCommand; import net.sf.asterisk.fastagi.command.HangupCommand; import net.sf.asterisk.fastagi.command.SayAlphaCommand; @@ -206,6 +207,51 @@ public abstract class AbstractAGIScript return reply.getResult(); } + // TODO add getOption() methods + + /** + * Plays the given file, and waits for the user to press one of the given + * digits. If none of the esacpe digits is pressed while streaming the file + * it waits for the default timeout of 5 seconds still waiting for the user + * to press a digit. + * + * @param file the name of the file to stream, must not include extension. + * @param escapeDigits contains the digits that the user is expected to + * press. + * @return the DTMF digit pressed or 0x0 if none was pressed. + */ + protected char getOption(AGIChannel channel, String file, + String escapeDigits) throws AGIException + { + AGIReply reply; + + reply = channel.sendCommand(new GetOptionCommand(file, escapeDigits)); + return reply.getResultCodeAsChar(); + } + + /** + * Plays the given file, and waits for the user to press one of the given + * digits. If none of the esacpe digits is pressed while streaming the file + * it waits for the specified timeout still waiting for the user to press a + * digit. + * + * @param file the name of the file to stream, must not include extension. + * @param escapeDigits contains the digits that the user is expected to + * press. + * @param timeout the timeout in seconds to wait if none of the defined + * esacpe digits was presses while streaming. + * @return the DTMF digit pressed or 0x0 if none was pressed. + */ + protected char getOption(AGIChannel channel, String file, + String escapeDigits, int timeout) throws AGIException + { + AGIReply reply; + + reply = channel.sendCommand(new GetOptionCommand(file, escapeDigits, + timeout)); + return reply.getResultCodeAsChar(); + } + /** * Executes the given command. * @@ -213,6 +259,45 @@ public abstract class AbstractAGIScript * "Dial". * @return the return code of the application of -2 if the application was * not found. + * @since 0.2 + */ + protected int exec(AGIChannel channel, String application) + throws AGIException + { + AGIReply reply; + + reply = channel.sendCommand(new ExecCommand(application)); + return reply.getResultCode(); + } + + /** + * Executes the given command. + * + * @param application the name of the application to execute, for example + * "Dial". + * @param options the parameters to pass to the application, for example + * "SIP/123". + * @return the return code of the application of -2 if the application was + * not found. + * @since 0.2 + */ + protected int exec(AGIChannel channel, String application, String options) + throws AGIException + { + AGIReply reply; + + reply = channel.sendCommand(new ExecCommand(application, options)); + return reply.getResultCode(); + } + + /** + * Executes the given command. + * + * @param application the name of the application to execute, for example + * "Dial". + * @return the return code of the application of -2 if the application was + * not found. + * @deprecated use {@see #exec(AGIChannel, String)} instead */ protected int execCommand(AGIChannel channel, String application) throws AGIException @@ -232,6 +317,7 @@ public abstract class AbstractAGIScript * "SIP/123". * @return the return code of the application of -2 if the application was * not found. + * @deprecated use {@see #exec(AGIChannel, String, String)} instead */ protected int execCommand(AGIChannel channel, String application, String options) throws AGIException |
From: Stefan R. <sr...@us...> - 2005-08-01 18:38:51
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25425/src/java/net/sf/asterisk/fastagi/command Added Files: GetOptionCommand.java Log Message: Deprecated execCommand(..) methods in favor of exec(...) in AbractAGIScript Added GetOptionCommand --- NEW FILE: GetOptionCommand.java --- /* * Copyright 2004-2005 Stefan Reuter * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * */ package net.sf.asterisk.fastagi.command; /** * Plays the given file, and waits for the user to press one of the given * digits. If none of the esacpe digits is pressed while streaming the file this * command waits for the specified timeout still waiting for the user to press a * digit. Streaming always begins at the beginning.<br> * Returns 0 if no digit being pressed, or the ASCII numerical value of the * digit if one was pressed, or -1 on error or if the channel was disconnected. * <br> * Remember, the file extension must not be included in the filename. * * @see net.sf.asterisk.fastagi.command.StreamFileCommand * @author srt * @version $Id: GetOptionCommand.java,v 1.1 2005/08/01 18:38:43 srt Exp $ */ public class GetOptionCommand extends AGICommand { /** * Serial version identifier. */ private static final long serialVersionUID = 3978141041352128820L; /** * The name of the file to stream. */ private String file; /** * When one of these digits is pressed while streaming the command returns. */ private String escapeDigits; /** * The timeout in seconds. */ private int timeout; /** * Creates a new GetOptionCommand with a default timeout of 5 seconds. * * @param file the name of the file to stream, must not include extension. * @param escapeDigits contains the digits that the user is expected to * press. */ public GetOptionCommand(String file, String escapeDigits) { this.file = file; this.escapeDigits = escapeDigits; this.timeout = -1; } /** * Creates a new GetOptionCommand with the given timeout. * * @param file the name of the file to stream, must not include extension. * @param escapeDigits contains the digits that the user is expected to * press. * @param timeout the timeout in seconds to wait if none of the defined * esacpe digits was presses while streaming. */ public GetOptionCommand(String file, String escapeDigits, int timeout) { this.file = file; this.escapeDigits = escapeDigits; this.timeout = timeout; } /** * Returns the name of the file to stream. * * @return the name of the file to stream. */ public String getFile() { return file; } /** * Sets the name of the file to stream. * * @param file the name of the file to stream, must not include extension. */ public void setFile(String file) { this.file = file; } /** * Returns the digits that the user is expected to press. * * @return the digits that the user is expected to press. */ public String getEscapeDigits() { return escapeDigits; } /** * Sets the digits that the user is expected to press. * * @param escapeDigits the digits that the user is expected to press. */ public void setEscapeDigits(String escapeDigits) { this.escapeDigits = escapeDigits; } /** * Returns the timeout to wait if none of the defined esacpe digits was * presses while streaming. * * @return the timeout in seconds. */ public int getTimeout() { return timeout; } /** * Sets the timeout to wait if none of the defined esacpe digits was presses * while streaming. * * @param timeout the timeout in seconds. */ public void setTimeout(int timeout) { this.timeout = timeout; } public String buildCommand() { return "GET OPTION " + escapeAndQuote(file) + " " + escapeAndQuote(escapeDigits) + (timeout < 0 ? "" : " " + timeout); } } |
From: Stefan R. <sr...@us...> - 2005-08-01 18:38:00
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25274/src/java/net/sf/asterisk/fastagi/command Modified Files: StreamFileCommand.java Log Message: Fixed constructor StreamFileCommand(String file, String escapeDigits, int offset) that ignored the file parameter Index: StreamFileCommand.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/command/StreamFileCommand.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -p -r1.2 -r1.3 --- StreamFileCommand.java 8 Mar 2005 16:48:34 -0000 1.2 +++ StreamFileCommand.java 1 Aug 2005 18:37:49 -0000 1.3 @@ -88,7 +88,7 @@ public class StreamFileCommand extends A */ public StreamFileCommand(String file, String escapeDigits, int offset) { - this.offset = offset; + this.file = file; this.escapeDigits = escapeDigits; this.offset = offset; } |
From: Stefan R. <sr...@us...> - 2005-07-30 22:56:42
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1152/src/java/net/sf/asterisk/fastagi/command Modified Files: GetDataCommand.java Log Message: Added note that file attribute is mandatory Index: GetDataCommand.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/command/GetDataCommand.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -p -r1.5 -r1.6 --- GetDataCommand.java 30 Jul 2005 20:37:28 -0000 1.5 +++ GetDataCommand.java 30 Jul 2005 22:56:30 -0000 1.6 @@ -120,7 +120,8 @@ public class GetDataCommand extends AGIC } /** - * Sets the name of the file to stream. + * Sets the name of the file to stream.<br> + * This attribute is mandatory. * * @param file the name of the file to stream, must not include extension. */ |
From: Stefan R. <sr...@us...> - 2005-07-30 20:37:37
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6568/src/java/net/sf/asterisk/fastagi/command Modified Files: GetDataCommand.java Log Message: Enhanced javadoc for getData Index: GetDataCommand.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/command/GetDataCommand.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -p -r1.4 -r1.5 --- GetDataCommand.java 8 May 2005 12:39:29 -0000 1.4 +++ GetDataCommand.java 30 Jul 2005 20:37:28 -0000 1.5 @@ -17,7 +17,8 @@ package net.sf.asterisk.fastagi.command; /** - * Stream the given file, and recieve DTMF data.<br> + * Stream the given file, and recieve DTMF data. The user may interrupt the streaming + * by starting to enter digits.<br> * Returns the digits recieved from the channel at the other end.<br> * Input ends when the timeout is reached, the maximum number of digits is read * or the user presses #. |
From: Stefan R. <sr...@us...> - 2005-07-30 20:37:37
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6568/src/java/net/sf/asterisk/fastagi Modified Files: AbstractAGIScript.java Log Message: Enhanced javadoc for getData Index: AbstractAGIScript.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/AbstractAGIScript.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -p -r1.13 -r1.14 --- AbstractAGIScript.java 27 Jul 2005 09:59:44 -0000 1.13 +++ AbstractAGIScript.java 30 Jul 2005 20:37:29 -0000 1.14 @@ -144,7 +144,8 @@ public abstract class AbstractAGIScript /** * Plays the given file and waits for the user to enter DTMF digits until he - * presses '#'. + * presses '#'. The user may interrupt the streaming by starting to enter + * digits. * * @param file the name of the file to play * @return a String containing the DTMF the user entered @@ -161,7 +162,8 @@ public abstract class AbstractAGIScript /** * Plays the given file and waits for the user to enter DTMF digits until he - * presses '#' or the timeout occurs. + * presses '#' or the timeout occurs. The user may interrupt the streaming + * by starting to enter digits. * * @param file the name of the file to play * @param timeout the timeout to wait for user input.<br> @@ -182,7 +184,8 @@ public abstract class AbstractAGIScript /** * Plays the given file and waits for the user to enter DTMF digits until he * presses '#' or the timeout occurs or the maximum number of digits has - * been entered. + * been entered. The user may interrupt the streaming by starting to enter + * digits. * * @param file the name of the file to play * @param timeout the timeout to wait for user input.<br> |
From: Stefan R. <sr...@us...> - 2005-07-30 19:57:52
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32421/src/java/net/sf/asterisk/fastagi Modified Files: AGIHangupException.java Log Message: Fixed spelling. Thanks rick ;) Index: AGIHangupException.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/AGIHangupException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -p -r1.1 -r1.2 --- AGIHangupException.java 11 Mar 2005 00:23:25 -0000 1.1 +++ AGIHangupException.java 30 Jul 2005 19:57:16 -0000 1.2 @@ -32,6 +32,6 @@ public class AGIHangupException extends public AGIHangupException() { - super("Channel was hang up."); + super("Channel was hung up."); } } |
From: Stefan R. <sr...@us...> - 2005-07-30 07:12:35
|
Update of /cvsroot/asterisk-java/asterisk-java/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31515/lib Added Files: log4j-1.2.8.jar Log Message: Added log4 that is needed at compile time --- NEW FILE: log4j-1.2.8.jar --- PK 1à>w×'ñDAÒ`¡b¿½3#·"¾½1XZÃÌì!º'gÌKÑVÍ8ÛdB+×O#º.W]¤bKÕrÆÙò ¡ªöiXÜ4g»0z ¨´É#_Uðkr®V8Úh>©§dÛt¶f÷PK3`W øÅ½qéÛW´»Ê~¡¥U£lÕ¶½¼iâU×ây6Ñ"Ê©ß{ÊXÍ´+¨u¥=H,:K¡ùrû0n\d`È!9Õ<Ù#(Z(¬`Ó°a Ã&¶·±cØBÛp{ûèPÃÝ9t?PKr«¯K ßâ8qRfñ§r3üîó"fE\ñ²*ÏêeKÀº¬n2rIÎYFÕÛ'3Yûj·°&O3ì¤<#gTY+d-CÑ t³3ºÐ¾RÇ1CÑ Å%Inµ¼ÊW %%3P%D xÉùjqHG0ĹæÂ¬¨Kª¼Æèe¢)Ö^uÝ=') zjÊ*;ZgÆ y\µCÔs²zR6þî¢b:Ü_*1-Ïá)¦2K×È&9g)3²ÅJ¢kÉy/d÷]Cà¾Å4vÎA¶ ØZÕªÃÀÓ,-åT&lG'MV<سU`KwÏ=Õ FÈ%6ÕÂxEh´¥ ÓpxÖeY{ÜãHGmª%¹ ¹,å¼!V¤ÔÔm@ºãò¢¹»î©³©a.KÞÝ@òña½lä+õS½Ûh el[¡¨ÈÔ03¤©³CZU'átKèÅ6 =HIH#%â ¯"% ÕïûþòÄÏ\ûAÊt]g|0å§$ìÄE q?%îLKñ×1"á d$t¢KÂlñ¦·pD@_¿e±éE ,ÝUɹ`ãmxG»xOÂapïsÓ»¤Gõr²(ϰ$9íh¤t'å¤VVÕ¤=ù¶øÉ½0" óÇæJ6Æ'Yê0]Ür&GÁö»ô/õì<Yé "Ñ#§6Dö¨¥;'4!jþ©òl¼Ìw;ÓAóÚ¯Y1Æ©1d-Ë*oCÍ üù»üâ³Ú`ëG¿#ÿ#ySø'áÞ-±'|N6´p'}Y7Ò|æ,£¯|3ÑÞpöN·w⻽§ÝöÞH´>HoPGO@KêÔ F¯¡ná-õótÂC´6°ÁVÒxÞ$G°vzJÓö;ý* "öÁ¾* à# phïJ]Eä&S©ôØÄDæèå*Äô¢)ZÄæVÔÓz2ò4Ö"KNRflK6×zr!ülÛ»=§wmîWC*%¸F+Fâ¶¢íùª¼öxjIò»4¹[áùQNãEHt¶¶D#-hºNA-bµ?b)! êi¿VÉ´gò ìuMrÓü®Ô?÷¥üb¸ÞïÃà|9 'tüZf¿8ïKNe¶ Np¼¸aÇË¡Ïϰ"ñyÃòXýxÚqãÞ_ëkqϧÙò3ôø[¼§cÃ:Nâk:Na\ÇøDRñüN*ó¦{ÖMù=ú¤5=ÉÕ²àæj(s_Êõû[µDÕøFq½r7¶!v9Ò}¸7©açj7YÙå:͸¦V!Æç¡ÞdÒÉ]Ôи¡¸sF#÷´i/EçkÚ´¾}ÍãÉ©YsBRL wn âç¿Rt骽L(Y!vg^R¬2¶òý l·:'}&:oäûærC Ûg¥e¢ú-;XhÖ±liê®ë°Üaö'ÕTÒÐÊONh80ùáàü|Wà>JÞpÈ/ªyÕÈK¯Æ#jÜÆ3lóé%Tq<Ò¾ýϨØ+˨¼P;E0×#Ë^G5§±öO¸»ëÐ9ÕP»¨@§¼Qå2D`õÒDwÐáº|.ó÷5ô¢[<nô Ò,- 8î¡íê¡¿ÊбºÎD;W}¶Hv`'µvÒÃÎÀ{½:ÙÃÝ$íeú·FîÓ¢ïMf½ÜáKý8Qô«í£N÷.ÓÙ¶ÓÛEì ûª«rZZ'¢tÈl hæ4|z!fª~סh$Îú¦Ø½Ê¢^óµÿþCf4²§¸Òr±âì+v$Ô¹ÒbdØÏ"w1¦VG<¿½ ÂíWô1~%¡ÃØÅ³_ç>Åóã´p?ÃÌO0ÖÇ1o²ÉpÇÀ·0 ¤à KȨÅ!_]ÆWxï 쥷Ǹ«Iôkô9Ñ~²}bP ´÷*Â+}R§¡ÎÏ丳8ÄP;TßÚywI^4!Eh%¡»i®¡È¸-j\ME1ô©115p©í¡¼Dͧ©ûµ%û#'ÐH KôÃK ZUÁpØ ý ÎøA5*⩸ªpwÇÊÇ*Eºí¤õv%©S§^æî+\}µÞ½ùð½LûônZOïý++rûÜ®WlÞ¥ÆR7¯ÉW?W_/ «)¨ZY0¢x=1ßaB=wLþ(0Vo ÐòUå~Úâ¢ÚyÏFïà¨pT}Åûu&ÀÑé㨨ÜhãýmgýÂ4¯+̽kD[ôkÓ@¥iØÐ>àîLàGdÕïK5Î&oÕ~Ü~ûYäîØ~þHûlÒ~VÓïý¶Ý¾ßeîÞ ß?Ñï§ø]¥Ç7Ø~û··°ß¯5òZý¬ø[p`+Ì6rXÙ:'|[Ý%l µ,áàFsÿäÛá_0Æð:Å+R4w¿Ïh±S¶oäÍ¿KJ JRZæÿ ÍÓªµqë°F¸%p)ïJ °³Ñ8GîoÒynÏãT[¹Wô"Ô'LãO»¡hìb_sv*qå_PKÍõð [...1280 lines suppressed...] Æ (q 1² ö |
From: Stefan R. <sr...@us...> - 2005-07-29 03:30:22
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4610/src/java/net/sf/asterisk/manager Modified Files: ManagerEventHandler.java Log Message: Tagged as EventListener Index: ManagerEventHandler.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/ManagerEventHandler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -p -r1.2 -r1.3 --- ManagerEventHandler.java 23 Feb 2005 22:50:57 -0000 1.2 +++ ManagerEventHandler.java 29 Jul 2005 03:30:14 -0000 1.3 @@ -16,6 +16,8 @@ */ package net.sf.asterisk.manager; +import java.util.EventListener; + import net.sf.asterisk.manager.event.ManagerEvent; /** @@ -25,7 +27,7 @@ import net.sf.asterisk.manager.event.Man * @author srt * @version $Id$ */ -public interface ManagerEventHandler +public interface ManagerEventHandler extends EventListener { /** * This method is called when an event is received. |
From: Stefan R. <sr...@us...> - 2005-07-28 23:05:31
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28259/src/java/net/sf/asterisk/manager Modified Files: DefaultAsteriskManager.java Log Message: Changed skipQueues to be an attribute rather than a parameter to initialize to work when reconnecting as well Index: DefaultAsteriskManager.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultAsteriskManager.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -p -r1.13 -r1.14 --- DefaultAsteriskManager.java 28 Jul 2005 00:10:12 -0000 1.13 +++ DefaultAsteriskManager.java 28 Jul 2005 23:05:21 -0000 1.14 @@ -98,6 +98,12 @@ public class DefaultAsteriskManager private Map versions; /** + * Flag to skip initializing queues as that results in a timeout on Asterisk + * 1.0.x. + */ + private boolean skipQueues; + + /** * Creates a new instance. */ public DefaultAsteriskManager() @@ -117,6 +123,11 @@ public class DefaultAsteriskManager this.connection = connection; } + public void setSkipQueues(boolean skipQueues) + { + this.skipQueues = skipQueues; + } + public void setManagerConnection(ManagerConnection connection) { this.connection = connection; @@ -125,19 +136,10 @@ public class DefaultAsteriskManager public void initialize() throws TimeoutException, IOException, AuthenticationFailedException { - initialize(false); - } - - public void initialize(boolean skipQueues) throws TimeoutException, - IOException, AuthenticationFailedException - { connection.login(); initializeChannels(); - if (!skipQueues) - { - initializeQueues(); - } + initializeQueues(); connection.addEventHandler(this); } @@ -166,6 +168,11 @@ public class DefaultAsteriskManager ResponseEvents re; Iterator i; + if (skipQueues) + { + return; + } + try { re = connection.sendEventGeneratingAction(new QueueStatusAction()); |
From: Stefan R. <sr...@us...> - 2005-07-28 00:10:36
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21435/src/java/net/sf/asterisk/manager Modified Files: DefaultAsteriskManager.java Log Message: moved nulling version and versions to the DisconnectEvent Index: DefaultAsteriskManager.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultAsteriskManager.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -p -r1.12 -r1.13 --- DefaultAsteriskManager.java 27 Jul 2005 23:38:13 -0000 1.12 +++ DefaultAsteriskManager.java 28 Jul 2005 00:10:12 -0000 1.13 @@ -479,6 +479,11 @@ public class DefaultAsteriskManager */ protected void handleDisconnectEvent(DisconnectEvent disconnectEvent) { + // reset version information as it might have changed while Asterisk + // restarted + this.version = null; + this.versions = null; + this.channels.clear(); this.queues.clear(); } @@ -489,11 +494,6 @@ public class DefaultAsteriskManager */ protected void handleConnectEvent(ConnectEvent connectEvent) { - // reset version information as it might have changed while Asterisk - // restarted - this.version = null; - this.versions = null; - try { initializeChannels(); |
From: Stefan R. <sr...@us...> - 2005-07-27 23:38:23
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11933/src/java/net/sf/asterisk/manager Modified Files: DefaultAsteriskManager.java AsteriskManager.java MultiAsterisksManager.java Log Message: Changed signature of getVersion(String) to return an int[] Index: DefaultAsteriskManager.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultAsteriskManager.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -p -r1.11 -r1.12 --- DefaultAsteriskManager.java 27 Jul 2005 21:06:08 -0000 1.11 +++ DefaultAsteriskManager.java 27 Jul 2005 23:38:13 -0000 1.12 @@ -281,9 +281,11 @@ public class DefaultAsteriskManager return version; } - public String getVersion(String file) + public int[] getVersion(String file) { String fileVersion = null; + String[] parts; + int[] intParts; if (versions == null) { @@ -333,7 +335,27 @@ public class DefaultAsteriskManager } } - return fileVersion; + if (fileVersion == null) + { + return null; + } + + parts = fileVersion.split("\\."); + intParts = new int[parts.length]; + + for (int i = 0; i < parts.length; i++) + { + try + { + intParts[i] = Integer.parseInt(parts[i]); + } + catch (NumberFormatException e) + { + intParts[i] = 0; + } + } + + return intParts; } /* Implementation of the ManagerEventHandler interface */ Index: AsteriskManager.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/AsteriskManager.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -p -r1.8 -r1.9 --- AsteriskManager.java 27 Jul 2005 21:06:08 -0000 1.8 +++ AsteriskManager.java 27 Jul 2005 23:38:14 -0000 1.9 @@ -75,7 +75,8 @@ public interface AsteriskManager /** * Returns the CVS revision of a given source file of the Asterisk server * you are connected to.<br> - * For example getVersion("app_meetme.c") may return "1.102".<br> + * For example getVersion("app_meetme.c") may return {1, 102} for CVS + * revision "1.102".<br> * Note that this feature is not available with Asterisk 1.0.x.<br> * You can use this feature if you need to write applications that behave * different depending on specific modules being available in a specific @@ -88,5 +89,5 @@ public interface AsteriskManager * are connected to an Astersion 1.0.x * @since 0.2 */ - String getVersion(String file); + int[] getVersion(String file); } Index: MultiAsterisksManager.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/MultiAsterisksManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -p -r1.5 -r1.6 --- MultiAsterisksManager.java 27 Jul 2005 21:06:08 -0000 1.5 +++ MultiAsterisksManager.java 27 Jul 2005 23:38:14 -0000 1.6 @@ -462,7 +462,7 @@ public class MultiAsterisksManager imple return null; } - public String getVersion(String file) + public int[] getVersion(String file) { throw new UnsupportedOperationException(); } |
From: Stefan R. <sr...@us...> - 2005-07-27 22:32:32
|
Update of /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28392/src/test/net/sf/asterisk/util Modified Files: ThreadPoolTest.java Log Message: it's ok to wake the thread... so catch the InterruptedException Index: ThreadPoolTest.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/util/ThreadPoolTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -p -r1.1 -r1.2 --- ThreadPoolTest.java 10 Mar 2005 13:45:23 -0000 1.1 +++ ThreadPoolTest.java 27 Jul 2005 22:32:22 -0000 1.2 @@ -52,7 +52,14 @@ public class ThreadPoolTest extends Test { break; } - Thread.sleep(sleepTime / 10); + try + { + Thread.sleep(sleepTime / 10); + } + catch(InterruptedException e) + { + // ok... + } } assertTrue("Job3 started before Job 1 or Job 2 ended.", job3.start >= job1.end || job3.start >= job2.end); |
From: Stefan R. <sr...@us...> - 2005-07-27 21:06:17
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7575/src/java/net/sf/asterisk/manager Modified Files: DefaultAsteriskManager.java AsteriskManager.java MultiAsterisksManager.java Log Message: Added getVersion() and getVersion(String) methods to AsteriskManager Index: DefaultAsteriskManager.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultAsteriskManager.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -p -r1.10 -r1.11 --- DefaultAsteriskManager.java 26 Jul 2005 11:37:49 -0000 1.10 +++ DefaultAsteriskManager.java 27 Jul 2005 21:06:08 -0000 1.11 @@ -21,8 +21,12 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import net.sf.asterisk.manager.action.CommandAction; import net.sf.asterisk.manager.action.OriginateAction; import net.sf.asterisk.manager.action.QueueStatusAction; import net.sf.asterisk.manager.action.StatusAction; @@ -42,6 +46,8 @@ import net.sf.asterisk.manager.event.Que import net.sf.asterisk.manager.event.RenameEvent; import net.sf.asterisk.manager.event.StatusEvent; import net.sf.asterisk.manager.event.UnlinkEvent; +import net.sf.asterisk.manager.response.CommandResponse; +import net.sf.asterisk.manager.response.ManagerResponse; import net.sf.asterisk.util.Log; import net.sf.asterisk.util.LogFactory; @@ -57,7 +63,14 @@ public class DefaultAsteriskManager AsteriskManager, ManagerEventHandler { + private static final Pattern SHOW_VERSION_FILES_PATTERN = Pattern + .compile("^([\\S]+)\\s+Revision: ([0-9\\.]+)"); + private final Log logger = LogFactory.getLog(this.getClass()); + + /** + * The underlying manager connection used to talk to Asterisk. + */ private ManagerConnection connection; /** @@ -71,6 +84,20 @@ public class DefaultAsteriskManager private final Map queues; /** + * The version of the Asterisk server we are connected to.<br> + * Contains <code>null</code> until lazily initialized. + */ + private String version; + + /** + * Holds the version of Asterisk's source files.<br> + * That corresponds to the output of the CLI command + * <code>show version files</code>.<br> + * Contains <code>null</code> until lazily initialized. + */ + private Map versions; + + /** * Creates a new instance. */ public DefaultAsteriskManager() @@ -81,6 +108,8 @@ public class DefaultAsteriskManager /** * Creates a new instance. + * + * @param connection the manager connection to use */ public DefaultAsteriskManager(ManagerConnection connection) { @@ -223,6 +252,90 @@ public class DefaultAsteriskManager return queues; } + public String getVersion() + { + if (version == null) + { + ManagerResponse response; + try + { + response = connection.sendAction(new CommandAction( + "show version")); + if (response instanceof CommandResponse) + { + List result; + + result = ((CommandResponse) response).getResult(); + if (result.size() > 0) + { + version = (String) result.get(0); + } + } + } + catch (Exception e) + { + logger.warn("Unable to send 'show version' command.", e); + } + } + + return version; + } + + public String getVersion(String file) + { + String fileVersion = null; + + if (versions == null) + { + Map map; + ManagerResponse response; + + map = new HashMap(); + try + { + response = connection.sendAction(new CommandAction( + "show version files")); + if (response instanceof CommandResponse) + { + List result; + + result = ((CommandResponse) response).getResult(); + for (int i = 2; i < result.size(); i++) + { + String line; + Matcher matcher; + + line = (String) result.get(i); + matcher = SHOW_VERSION_FILES_PATTERN.matcher(line); + if (matcher.find()) + { + String key = matcher.group(1); + String value = matcher.group(2); + + map.put(key, value); + } + } + + fileVersion = (String) map.get(file); + versions = map; + } + } + catch (Exception e) + { + logger.warn("Unable to send 'show version files' command.", e); + } + } + else + { + synchronized (versions) + { + fileVersion = (String) versions.get(file); + } + } + + return fileVersion; + } + /* Implementation of the ManagerEventHandler interface */ /** @@ -354,6 +467,11 @@ public class DefaultAsteriskManager */ protected void handleConnectEvent(ConnectEvent connectEvent) { + // reset version information as it might have changed while Asterisk + // restarted + this.version = null; + this.versions = null; + try { initializeChannels(); Index: AsteriskManager.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/AsteriskManager.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -p -r1.7 -r1.8 --- AsteriskManager.java 16 Jul 2005 23:26:59 -0000 1.7 +++ AsteriskManager.java 27 Jul 2005 21:06:08 -0000 1.8 @@ -41,7 +41,8 @@ public interface AsteriskManager * @throws TimeoutException if the originated call is not answered in time * @throws IOException if the action cannot be sent to the asterisk server */ - public Call originateCall(Originate originate) throws TimeoutException, IOException; + public Call originateCall(Originate originate) throws TimeoutException, + IOException; /** * Returns a Map of active channels.<br> @@ -60,4 +61,32 @@ public interface AsteriskManager * @return a Map of queues. */ Map getQueues(); + + /** + * Returns the version of the Asterisk server you are connected to.<br> + * This typically looks like "Asterisk 1.0.9 built by root@host on a i686 + * running Linux". + * + * @return the version of the Asterisk server you are connected to + * @since 0.2 + */ + String getVersion(); + + /** + * Returns the CVS revision of a given source file of the Asterisk server + * you are connected to.<br> + * For example getVersion("app_meetme.c") may return "1.102".<br> + * Note that this feature is not available with Asterisk 1.0.x.<br> + * You can use this feature if you need to write applications that behave + * different depending on specific modules being available in a specific + * version or not. + * + * @param file the file for which to get the version like "app_meetme.c" + * @return the CVS revision of the file, or <code>null</code> if that file + * is not part of the Asterisk instance you are connected to (maybe + * due to a module that provides it has not been loaded) or if you + * are connected to an Astersion 1.0.x + * @since 0.2 + */ + String getVersion(String file); } Index: MultiAsterisksManager.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/MultiAsterisksManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -p -r1.4 -r1.5 --- MultiAsterisksManager.java 22 Jun 2005 18:27:12 -0000 1.4 +++ MultiAsterisksManager.java 27 Jul 2005 21:06:08 -0000 1.5 @@ -1,5 +1,5 @@ /* - * Created on 1 févr. 2005 by Pierre-Yves ROGER. + * Created on 1 f�vr. 2005 by Pierre-Yves ROGER. * */ package net.sf.asterisk.manager; @@ -461,4 +461,14 @@ public class MultiAsterisksManager imple // TODO Auto-generated method stub return null; } + + public String getVersion(String file) + { + throw new UnsupportedOperationException(); + } + + public String getVersion() + { + throw new UnsupportedOperationException(); + } } |
From: Stefan R. <sr...@us...> - 2005-07-27 20:54:09
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4631/src/java/net/sf/asterisk/manager/action Modified Files: CommandAction.java Log Message: Added convenience constructor Index: CommandAction.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/CommandAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -p -r1.3 -r1.4 --- CommandAction.java 16 Jul 2005 13:19:34 -0000 1.3 +++ CommandAction.java 27 Jul 2005 20:54:01 -0000 1.4 @@ -17,8 +17,10 @@ package net.sf.asterisk.manager.action; /** - * The CommandAction sends a command line interface (CLI) command to the asterisk server.<br> - * For a list of supported commands type <code>help</code> on asterisk's command line. + * The CommandAction sends a command line interface (CLI) command to the + * asterisk server.<br> + * For a list of supported commands type <code>help</code> on asterisk's + * command line. * * @author srt * @version $Id$ @@ -33,6 +35,24 @@ public class CommandAction extends Abstr protected String command; /** + * Creates a new CommandAction. + */ + public CommandAction() + { + + } + + /** + * Creates a new CommandAction with the given command. + * + * @param command the CLI command to execute. + */ + public CommandAction(String command) + { + this.command = command; + } + + /** * Returns the name of this action, i.e. "Command". */ public String getAction() |
From: Stefan R. <sr...@us...> - 2005-07-27 20:53:37
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4432/src/java/net/sf/asterisk/manager/impl Modified Files: ManagerReaderImpl.java Log Message: Removed warning when processing the result of a CommandAction Index: ManagerReaderImpl.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/ManagerReaderImpl.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -p -r1.7 -r1.8 --- ManagerReaderImpl.java 27 Jul 2005 19:06:18 -0000 1.7 +++ ManagerReaderImpl.java 27 Jul 2005 20:53:28 -0000 1.8 @@ -241,7 +241,10 @@ public class ManagerReaderImpl implement } else { - logger.warn("buffer contains neither response nor event"); + if (buffer.size() > 0) + { + logger.warn("buffer contains neither response nor event"); + } } buffer.clear(); |
From: Stefan R. <sr...@us...> - 2005-07-27 19:06:38
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8381/src/java/net/sf/asterisk/manager/impl Modified Files: ManagerReaderImpl.java Log Message: Fixed detection of END COMMAND when sending a CommandAction that contains an error. Index: ManagerReaderImpl.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/ManagerReaderImpl.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -p -r1.6 -r1.7 --- ManagerReaderImpl.java 7 Jun 2005 23:36:15 -0000 1.6 +++ ManagerReaderImpl.java 27 Jul 2005 19:06:18 -0000 1.7 @@ -142,7 +142,9 @@ public class ManagerReaderImpl implement // enhanced. if (processingCommandResult) { - if ("--END COMMAND--".equals(line)) + // in case of an error Asterisk sends a Usage: and an END COMMAND + // that is prepended by a space :( + if ("--END COMMAND--".equals(line) || " --END COMMAND--".equals(line)) { CommandResponse commandResponse = new CommandResponse(); @@ -150,7 +152,7 @@ public class ManagerReaderImpl implement { String[] crNVPair = ((String) commandResult.get(crIdx)).split(" *: *", 2); - if (crNVPair[0].equals("ActionID")) + if (crNVPair[0].equalsIgnoreCase("ActionID")) { // Remove the command response nvpair from the // command result array and decrement index so we @@ -160,7 +162,7 @@ public class ManagerReaderImpl implement // Register the action id with the command result commandResponse.setActionId(crNVPair[1]); } - else if (crNVPair[0].equals("Privilege")) + else if (crNVPair[0].equalsIgnoreCase("Privilege")) { // Remove the command response nvpair from the // command result array and decrement index so we |
From: Stefan R. <sr...@us...> - 2005-07-27 09:59:56
|
Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31403/src/java/net/sf/asterisk/fastagi Modified Files: AbstractAGIScript.java Log Message: Added @since java doc tag to getData() methods Index: AbstractAGIScript.java =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/fastagi/AbstractAGIScript.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -p -r1.12 -r1.13 --- AbstractAGIScript.java 14 Jul 2005 19:26:57 -0000 1.12 +++ AbstractAGIScript.java 27 Jul 2005 09:59:44 -0000 1.13 @@ -148,6 +148,7 @@ public abstract class AbstractAGIScript * * @param file the name of the file to play * @return a String containing the DTMF the user entered + * @since 0.2 */ protected String getData(AGIChannel channel, String file) throws AGIException @@ -167,6 +168,7 @@ public abstract class AbstractAGIScript * 0 means standard timeout value, -1 means "ludicrous time" * (essentially never times out). * @return a String containing the DTMF the user entered + * @since 0.2 */ protected String getData(AGIChannel channel, String file, int timeout) throws AGIException @@ -189,6 +191,7 @@ public abstract class AbstractAGIScript * @param maxDigits the maximum number of digits the user is allowed to * enter * @return a String containing the DTMF the user entered + * @since 0.2 */ protected String getData(AGIChannel channel, String file, int timeout, int maxDigits) throws AGIException |
From: Stefan R. <sr...@us...> - 2005-07-26 14:46:45
|
Update of /cvsroot/asterisk-java/asterisk-java/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13430/xdocs Modified Files: index.xml Log Message: Fixed spelling / wording Index: index.xml =================================================================== RCS file: /cvsroot/asterisk-java/asterisk-java/xdocs/index.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -p -r1.22 -r1.23 --- index.xml 26 Jul 2005 14:16:51 -0000 1.22 +++ index.xml 26 Jul 2005 14:46:36 -0000 1.23 @@ -103,7 +103,7 @@ cvs -z3 -d:pserver:ano...@cv... <a href="http://www.easymock.org/">EasyMock</a> in addition.</p> </subsection> <subsection name="Related Projects"> - <p><a href="http://adm.hamnett.org/">Asterisk Desktop Manageer</a>, or + <p><a href="http://adm.hamnett.org/">Asterisk Desktop Manager</a>, or ADM for short, brings the power of Asterisk to the user's desktop. It is written in Java, uses the Eclipse SWT library for its GUI and Asterisk-Java to provide Asterisk connectivity.<br/> |