asterisk-java-cvs — Asterisk-Java Commit Logs

[Asterisk-java-cvs] CVS: asterisk-java project.xml,1.7,1.8

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv549

Modified Files:
	project.xml 
Log Message:
Added John

Index: project.xml
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -p -r1.7 -r1.8
--- project.xml	2 Mar 2005 23:15:50 -0000	1.7
+++ project.xml	2 Mar 2005 23:28:17 -0000	1.8
@@ -93,6 +93,13 @@
       <email>partoutatis at users.sourceforge.net</email>

       <timezone>+1</timezone>

     </developer>

+    <developer>

+      <name>John Hood</name>

+      <id>squinky86</id>

+      <email>john at asteriasgi.com</email>

+      <organization>Asteria Soulutions Group, Inc.</organization>

+      <timezone>-6</timezone>

+    </developer>

   </developers>

   <dependencies>

     <dependency>

[Asterisk-java-cvs] CVS: asterisk-java project.xml,1.6,1.7

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29560

Modified Files:
	project.xml 
Log Message:
Added unit tests for ManagerReader and ManagerWriter (and did some refactoring to make this work)

Index: project.xml
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- project.xml	27 Feb 2005 23:49:36 -0000	1.6
+++ project.xml	2 Mar 2005 23:15:50 -0000	1.7
@@ -110,6 +110,13 @@
       <type>jar</type>

       <url>http://jakarta.apache.org/commons/lang/</url>

     </dependency>

+    <dependency>

+      <groupId>easymock</groupId>

+      <artifactId>easymock</artifactId>

+      <version>1.1</version>

+      <type>jar</type>

+      <url>http://www.easymock.org/</url>

+    </dependency>

   </dependencies>

   <build>

     <nagEmailAddress>sr...@re...</nagEmailAddress>

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/util DateUtil.java,NONE,1.1

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29560/src/java/net/sf/asterisk/manager/util

Added Files:
	DateUtil.java 
Log Message:
Added unit tests for ManagerReader and ManagerWriter (and did some refactoring to make this work)

--- NEW FILE: DateUtil.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.manager.util;

import java.util.Date;

/**
 * Utility class to obtain the current date and allows to override with a fixed value for testing.
 * 
 * @author srt
 * @version $Id: DateUtil.java,v 1.1 2005/03/02 23:15:51 srt Exp $
 */
public class DateUtil
{
    private static Date currentDate;

    private DateUtil()
    {
    }

    /**
     * If set to a non null value uses the date given as current date on calls to getDate(). Set to
     * null to restore the normal behavior.
     * 
     * @param currentDate the date to return on calls to getDate() or <code>null</code> to return
     * the real current date.
     */
    public static void overrideCurrentDate(Date currentDate)
    {
        DateUtil.currentDate = currentDate;
    }

    /**
     * Returns the real current date or the date set with overrideCurrentDate().
     * 
     * @return the real current date or the date set with overrideCurrentDate().
     */
    public static Date getDate()
    {
        if (currentDate != null)
        {
            return currentDate;
        }
        else
        {
            return new Date();
        }
    }
}

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager Dispatcher.java,NONE,1.1 ManagerWriterImpl.java,NONE,1.1 ManagerWriter.java,NONE,1.1 ManagerReaderImpl.java,NONE,1.1 ManagerReader.java,1.5,1.6 DefaultManagerConnection.java,1.3,1.4

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29560/src/java/net/sf/asterisk/manager

Modified Files:
	ManagerReader.java DefaultManagerConnection.java 
Added Files:
	Dispatcher.java ManagerWriterImpl.java ManagerWriter.java 
	ManagerReaderImpl.java 
Log Message:
Added unit tests for ManagerReader and ManagerWriter (and did some refactoring to make this work)

--- NEW FILE: Dispatcher.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.manager;

import net.sf.asterisk.manager.event.ManagerEvent;
import net.sf.asterisk.manager.response.ManagerResponse;

public interface Dispatcher
{

    /**
     * This method is called by the reader whenever a {@link ManagerResponse} is received. The
     * response is dispatched to the associated {@link ManagerResponseHandler}.
     * 
     * @param response the resonse received by the reader
     * 
     * @see ManagerReader
     */
    void dispatchResponse(ManagerResponse response);

    /**
     * This method is called by the reader whenever a ManagerEvent is received. The event is
     * dispatched to all registered ManagerEventHandlers.
     * 
     * @param event the event received by the reader
     * 
     * @see ManagerReader
     */
    void dispatchEvent(ManagerEvent event);
}

--- NEW FILE: ManagerWriterImpl.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.manager;

import java.io.IOException;

import net.sf.asterisk.manager.action.ManagerAction;
import net.sf.asterisk.manager.io.SocketConnectionFacade;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

/**
 * Default implementation of ManagerWriter interface.
 * 
 * @author srt
 * @version $Id: ManagerWriterImpl.java,v 1.1 2005/03/02 23:15:49 srt Exp $
 */
class ManagerWriterImpl implements ManagerWriter
{
    /**
     * Instance logger.
     */
    private final Log logger = LogFactory.getLog(getClass());

    /**
     * The action builder utility to convert ManagerAction to a String suitable to be sent to the
     * asterisk server.
     */
    private final ActionBuilder actionBuilder;

    private SocketConnectionFacade socket;

    /**
     * Creates a new ManagerWriterImpl.
     */
    ManagerWriterImpl()
    {
        this.actionBuilder = new ActionBuilder();
    }

    public synchronized void setSocket(final SocketConnectionFacade socket)
    {
        this.socket = socket;
    }

    public synchronized void sendAction(final ManagerAction action) throws IOException
    {
        final String actionString;

        if (socket == null)
        {
            throw new IllegalStateException("Unable to send action: socket is null");
        }

        actionString = actionBuilder.buildAction(action);

        socket.print(actionString);
        socket.flush();

        logger.debug("Sent " + action.getAction() + " action with actionId '" + action.getActionId() + "':\n"
                + actionString);
    }
}

--- NEW FILE: ManagerWriter.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.manager;

import java.io.IOException;

import net.sf.asterisk.manager.action.ManagerAction;
import net.sf.asterisk.manager.io.SocketConnectionFacade;

/**
 * The ManagerWriter transforms actions using the ActionBuilder and sends them to the asterisk
 * server.<br>
 * This class is intended to be used only by the DefaultManagerConnection.
 * 
 * @see net.sf.asterisk.manager.ActionBuilder
 * @see net.sf.asterisk.manager.DefaultManagerConnection
 * 
 * @author srt
 * @version $Id: ManagerWriter.java,v 1.1 2005/03/02 23:15:49 srt Exp $
 */
interface ManagerWriter
{

    void setSocket(final SocketConnectionFacade socket);

    /**
     * Sends the given action to the asterisk server.
     * 
     * @param action the action to send to the asterisk server.
     * @throws IOException if there is a problem sending the action.
     */
    void sendAction(final ManagerAction action) throws IOException;

}

--- NEW FILE: ManagerReaderImpl.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.manager;

import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import net.sf.asterisk.manager.event.ConnectEvent;
import net.sf.asterisk.manager.event.DisconnectEvent;
import net.sf.asterisk.manager.event.ManagerEvent;
import net.sf.asterisk.manager.io.SocketConnectionFacade;
import net.sf.asterisk.manager.response.CommandResponse;
import net.sf.asterisk.manager.response.ManagerResponse;
import net.sf.asterisk.manager.util.DateUtil;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

/**
 * Default implementation of the ManagerReader interface.
 * 
 * @author srt
 * @version $Id: ManagerReaderImpl.java,v 1.1 2005/03/02 23:15:50 srt Exp $
 */
class ManagerReaderImpl implements ManagerReader
{
    /**
     * Instance logger.
     */
    private final Log logger = LogFactory.getLog(getClass());

    /**
     * The event builder utility to convert a map of attributes reveived from asterisk to instances
     * of registered event classes.
     */
    private final EventBuilder eventBuilder;

    /**
     * The response builder utility to convert a map of attributes reveived from asterisk to
     * instances of well known response classes.
     */
    private final ResponseBuilder responseBuilder;

    /**
     * The dispatcher to use for dispatching events and responses.
     */
    private final Dispatcher dispatcher;

    /**
     * The asterisk server we are reading from.
     */
    private final AsteriskServer asteriskServer;

    /**
     * The socket to use for reading from the asterisk server.
     */
    private SocketConnectionFacade socket;

    /**
     * If set to <code>true</code>, terminates and closes the reader.
     */
    private boolean die = false;

    /**
     * Creates a new ManagerReaderImpl.
     * @param dispatcher the dispatcher to use for dispatching events and responses.
     */
    ManagerReaderImpl(final Dispatcher dispatcher, AsteriskServer asteriskServer)
    {
        this.dispatcher = dispatcher;
        this.asteriskServer = asteriskServer;

        this.eventBuilder = new EventBuilder();
        this.responseBuilder = new ResponseBuilder();
    }

    /**
     * Sets the socket to use for reading from the asterisk server.
     * @param socket the socket to use for reading from the asterisk server.
     */
    public void setSocket(final SocketConnectionFacade socket)
    {
        this.socket = socket;
    }

    /**
     * Reads line by line from the asterisk server, sets the protocol identifier as soon as it is
     * received and dispatches the received events and responses via the associated dispatcher.
     * 
     * @see DefaultManagerConnection#dispatchEvent(ManagerEvent)
     * @see DefaultManagerConnection#dispatchResponse(ManagerResponse)
     * @see DefaultManagerConnection#setProtocolIdentifier(String)
     */
    public void run()
    {
        final Map buffer = new HashMap();
        final List commandResult = new ArrayList();
        String line;
        boolean processingCommandResult = false;

        if (socket == null)
        {
            throw new IllegalStateException("Unable to run: socket is null.");
        }

        this.die = false;

        try
        {
            while ((line = socket.readLine()) != null && !this.die)
            {
                // dirty hack for handling the CommandAction. Needs fix when manager protocol is
                // enhanced.
                if (processingCommandResult)
                {
                    if ("--END COMMAND--".equals(line))
                    {
                        CommandResponse commandResponse = new CommandResponse();

                        if (!commandResult.isEmpty() && ((String) commandResult.get(0)).startsWith("ActionID"))
                        {
                            String tmp = (String) commandResult.get(0);
                            int delimiterIndex = tmp.indexOf(":");
                            if (delimiterIndex > 0 && tmp.length() > delimiterIndex + 2)
                            {
                                commandResult.remove(0);
                                commandResponse.setActionId(tmp.substring(delimiterIndex + 2));
                            }
                        }
                        commandResponse.setResponse("Follows");
                        commandResponse.setDateReceived(DateUtil.getDate());
                        commandResponse.setResult(commandResult);
                        dispatcher.dispatchResponse(commandResponse);
                        processingCommandResult = false;
                    }
                    else
                    {
                        commandResult.add(line);
                    }
                    continue;
                }

                // Reponse: Follows indicates that the output starting on the next line until
                // --END COMMAND-- must be treated as raw output of a command executed by a
                // CommandAction.
                if ("Response: Follows".equalsIgnoreCase(line))
                {
                    processingCommandResult = true;
                    commandResult.clear();
                    continue;
                }

                // maybe we will find a better way to identify the protocol identifier but for now
                // this works quite well.
                if (line.startsWith("Asterisk Call Manager/"))
                {
                    ConnectEvent connectEvent = new ConnectEvent(asteriskServer);
                    connectEvent.setProtocolIdentifier(line);
                    connectEvent.setDateReceived(DateUtil.getDate());
                    dispatcher.dispatchEvent(connectEvent);
                    continue;
                }

                // an empty line indicates a normal response's or event's end so we build
                // the corresponding value object and dispatch it through the ManagerConnection.
                if (line.length() == 0)
                {
                    if (buffer.containsKey("response"))
                    {
                        ManagerResponse response = buildResponse(buffer);
                        if (response != null)
                        {
                            dispatcher.dispatchResponse(response);
                        }
                    }
                    else if (buffer.containsKey("event"))
                    {
                        ManagerEvent event = buildEvent(asteriskServer, buffer);
                        if (event != null)
                        {
                            dispatcher.dispatchEvent(event);
                        }
                    }

                    buffer.clear();
                }
                else
                {
                    int delimiterIndex;

                    delimiterIndex = line.indexOf(":");
                    if (delimiterIndex > 0 && line.length() > delimiterIndex + 2)
                    {
                        String name;
                        String value;

                        name = line.substring(0, delimiterIndex).toLowerCase();
                        value = line.substring(delimiterIndex + 2);

                        buffer.put(name, value);
                    }
                }
            }
            logger.info("Reached end of stream, terminating reader.");
        }
        catch (IOException e)
        {
            logger.info("IOException while reading from asterisk server, terminating reader thread: " + e.getMessage());
        }
        finally
        {
            // cleans resources and reconnects if needed
            DisconnectEvent disconnectEvent = new DisconnectEvent(asteriskServer);
            disconnectEvent.setDateReceived(DateUtil.getDate());
            dispatcher.dispatchEvent(disconnectEvent);
        }
    }

    public void die()
    {
        this.die = true;
    }

    private ManagerResponse buildResponse(Map buffer)
    {
        ManagerResponse response;

        response = responseBuilder.buildResponse(buffer);

        if (response != null)
        {
            response.setDateReceived(DateUtil.getDate());
        }

        return response;
    }

    private ManagerEvent buildEvent(Object source, Map buffer)
    {
        ManagerEvent event;

        event = eventBuilder.buildEvent(source, buffer);

        if (event != null)
        {
            event.setDateReceived(DateUtil.getDate());
        }

        return event;
    }
}

Index: ManagerReader.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/ManagerReader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- ManagerReader.java	2 Mar 2005 00:37:03 -0000	1.5
+++ ManagerReader.java	2 Mar 2005 23:15:38 -0000	1.6
@@ -16,231 +16,31 @@
  */
 package net.sf.asterisk.manager;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import net.sf.asterisk.manager.event.ManagerEvent;
-import net.sf.asterisk.manager.response.CommandResponse;
-import net.sf.asterisk.manager.response.ManagerResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import net.sf.asterisk.manager.io.SocketConnectionFacade;
 
 /**
- * The ManagerReader is a Thread that reads events and responses from an asterisk server, parses
- * them to the corresponding ManagerEvent and ManagerResponse objects and dispatches them via the
- * associated DefaultManagerConnection. <br>
+ * The ManagerReader reads events and responses from the asterisk server, parses them using
+ * EventBuilder and ResponseBuilder and dispatches them to the associated ManagerConnection.<br>
  * This class is intended to be used only by the DefaultManagerConnection.
  * 
- * @see net.sf.asterisk.manager.event.ManagerEvent
- * @see net.sf.asterisk.manager.response.ManagerResponse
+ * @see net.sf.asterisk.manager.EventBuilder
+ * @see net.sf.asterisk.manager.ResponseBuilder
  * @see net.sf.asterisk.manager.DefaultManagerConnection
  * 
  * @author srt
  * @version $Id$
  */
-class ManagerReader extends Thread
-{
-    private Log log = LogFactory.getLog(getClass());
-
-    private static int threadCount = 0;
-
-    /**
-     * The event builder utility to convert a map of attributes reveived from asterisk to instances
-     * of registered event classes.
-     */
-    private EventBuilder eventBuilder;
-
-    /**
-     * The response builder utility to convert a map of attributes reveived from asterisk to
-     * instances of well known response classes.
-     */
-    private ResponseBuilder responseBuilder;
-
-    /**
-     * If set to <code>true</code>, terminates and closes the reader.
-     */
-    private boolean die = false;
-    private BufferedReader reader;
-    private DefaultManagerConnection connection;
-
-    ManagerReader(DefaultManagerConnection connection, BufferedReader reader)
-    {
-        int i = threadCount++;
-        setName("ManagerReader-" + i);
-
-        this.connection = connection;
-        this.reader = reader;
 
-        this.eventBuilder = new EventBuilder();
-        this.responseBuilder = new ResponseBuilder();
-    }
+interface ManagerReader extends Runnable
+{
 
     /**
-     * Reads line by line from the asterisk server, sets the protocol identifier as soon as it is
-     * received and dispatches the received events and responses via the associated connection.
+     * Sets the socket to use for reading from the asterisk server.
      * 
-     * @see DefaultManagerConnection#dispatchEvent(ManagerEvent)
-     * @see DefaultManagerConnection#dispatchResponse(ManagerResponse)
-     * @see DefaultManagerConnection#setProtocolIdentifier(String)
+     * @param socket the socket to use for reading from the asterisk server.
      */
-    public void run()
-    {
-        String line;
-        List commandResult = new ArrayList();
-        boolean processingCommandResult = false;
-        Map buffer = new HashMap();
-
-        try
-        {
-            while ((line = reader.readLine()) != null && !die)
-            {
-                // dirty hack for handling the CommandAction. Needs fix when manager protocol is
-                // enhanced.
-                if (processingCommandResult)
-                {
-                    if ("--END COMMAND--".equals(line))
-                    {
-                        CommandResponse commandResponse = new CommandResponse();
-
-                        if (!commandResult.isEmpty() && ((String) commandResult.get(0)).startsWith("ActionID"))
-                        {
-                            String tmp = (String) commandResult.get(0);
-                            int delimiterIndex = tmp.indexOf(":");
-                            if (delimiterIndex > 0 && tmp.length() > delimiterIndex + 2)
-                            {
-                                commandResult.remove(0);
-                                commandResponse.setActionId(tmp.substring(delimiterIndex + 2));
-                            }
-                        }
-                        commandResponse.setResponse("Follows");
-                        commandResponse.setDateReceived(new Date());
-                        commandResponse.setResult(commandResult);
-                        connection.dispatchResponse(commandResponse);
-                        processingCommandResult = false;
-                    }
-                    else
-                    {
-                        commandResult.add(line);
-                    }
-                    continue;
-                }
-
-                // Reponse: Follows indicates that the output starting on the next line until
-                // --END COMMAND-- must be treated as raw output of a command executed by a
-                // CommandAction.
-                if ("Response: Follows".equalsIgnoreCase(line))
-                {
-                    processingCommandResult = true;
-                    commandResult.clear();
-                    continue;
-                }
-
-                // maybe we will find a better way to identify the protocol identifier but for now
-                // this works quite well.
-                if (line.startsWith("Asterisk Call Manager/") && connection.getProtocolIdentifier() == null)
-                {
-                    connection.setProtocolIdentifier(line);
-                    continue;
-                }
-
-                // an empty line indicates a normal response's or event's end so we build
-                // the corresponding value object and dispatch it through the ManagerConnection.
-                if (line.length() == 0)
-                {
-                    if (buffer.containsKey("response"))
-                    {
-                        ManagerResponse response = buildResponse(buffer);
-                        if (response != null)
-                        {
-                            connection.dispatchResponse(response);
-                        }
-                    }
-                    else if (buffer.containsKey("event"))
-                    {
-                        ManagerEvent event = buildEvent(connection.getAsteriskServer(), buffer);
-                        if (event != null)
-                        {
-                            connection.dispatchEvent(event);
-                        }
-                    }
-
-                    buffer.clear();
-                }
-                else
-                {
-                    int delimiterIndex;
-
-                    delimiterIndex = line.indexOf(":");
-                    if (delimiterIndex > 0 && line.length() > delimiterIndex + 2)
-                    {
-                        String name;
-                        String value;
-
-                        name = line.substring(0, delimiterIndex).toLowerCase();
-                        value = line.substring(delimiterIndex + 2);
-
-                        buffer.put(name, value);
-                    }
-                }
-            }
-        }
-        catch (IOException e)
-        {
-            log.warn("IOException while reading from asterisk server, terminating thread.", e);
-        }
-        finally
-        {
-            log.info("Disconnected, closing reader.");
-            try
-            {
-                reader.close();
-            }
-            catch (IOException ex)
-            {
-                log.warn("Unable to close reader", ex);
-            }
-
-            // cleans resources and reconnects if needed
-            connection.handleDisconnection();
-        }
-    }
-
-    public void die()
-    {
-        this.die = true;
-    }
-
-    private ManagerResponse buildResponse(Map buffer)
-    {
-        ManagerResponse response;
-
-        response = responseBuilder.buildResponse(buffer);
-
-        if (response != null)
-        {
-            response.setDateReceived(new Date());
-        }
-
-        return response;
-    }
-
-    private ManagerEvent buildEvent(Object source, Map buffer)
-    {
-        ManagerEvent event;
-
-        event = eventBuilder.buildEvent(source, buffer);
+    void setSocket(final SocketConnectionFacade socket);
 
-        if (event != null)
-        {
-            event.setDateReceived(new Date());
-        }
+    void die();
 
-        return event;
-    }
 }

Index: DefaultManagerConnection.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultManagerConnection.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- DefaultManagerConnection.java	2 Mar 2005 00:37:38 -0000	1.3
+++ DefaultManagerConnection.java	2 Mar 2005 23:15:49 -0000	1.4
@@ -16,13 +16,8 @@
  */
 package net.sf.asterisk.manager;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
 import java.io.Serializable;
-import java.net.Socket;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Collection;
@@ -38,6 +33,8 @@ import net.sf.asterisk.manager.action.Ma
 import net.sf.asterisk.manager.event.ConnectEvent;
 import net.sf.asterisk.manager.event.DisconnectEvent;
 import net.sf.asterisk.manager.event.ManagerEvent;
+import net.sf.asterisk.manager.io.SocketConnectionFacade;
+import net.sf.asterisk.manager.io.SocketConnectionFacadeImpl;
 import net.sf.asterisk.manager.response.ChallengeResponse;
 import net.sf.asterisk.manager.response.ManagerError;
 import net.sf.asterisk.manager.response.ManagerResponse;
@@ -51,7 +48,7 @@ import org.apache.commons.logging.LogFac
  * @author srt
  * @version $Id$
  */
-public class DefaultManagerConnection implements ManagerConnection
+public class DefaultManagerConnection implements ManagerConnection, Dispatcher
 {
     /**
      * Instance logger.
@@ -68,23 +65,40 @@ public class DefaultManagerConnection im
     private long sleepTime = 50;
     private boolean keepAliveAfterAuthenticationFailure = false;
 
-    private Socket socket;
-    private ManagerReader reader;
-    private PrintWriter writer;
-    private ActionBuilder actionBuilder = new ActionBuilder();
+    private SocketConnectionFacade socket;
+    private Thread readerThread;
+
+    /**
+     * The reader to use to receive events and responses from asterisk.
+     */
+    private final ManagerReader reader;
+
+    /**
+     * The writer to use to send actions to asterisk.
+     */
+    private final ManagerWriter writer;
+
     private String protocolIdentifier;
-    private Map responseHandlers = new HashMap();
-    private Collection eventHandlers = new HashSet();
+    private final Map responseHandlers;
+    private final Collection eventHandlers;
     private boolean keepAlive = false;
 
     public DefaultManagerConnection()
     {
         this.asteriskServer = new AsteriskServer();
+
+        this.reader = new ManagerReaderImpl(this, asteriskServer);
+        this.writer = new ManagerWriterImpl();
+        this.responseHandlers = new HashMap();
+        this.eventHandlers = new HashSet();
     }
 
     public DefaultManagerConnection(String hostname, int port, String username, String password)
     {
-        this.asteriskServer = new AsteriskServer(hostname, port);
+        this();
+
+        setHostname(hostname);
+        setPort(port);
         setUsername(username);
         setPassword(password);
     }
@@ -273,24 +287,24 @@ public class DefaultManagerConnection im
         this.keepAlive = true;
 
         logger.info("Successfully logged in");
-
-        // notify event listeners
-        dispatchEvent(new ConnectEvent(this.asteriskServer));
     }
 
     private synchronized void connect() throws IOException
     {
-        BufferedReader bufferedReader;
-
         logger.info("Connecting to " + asteriskServer.getHostname() + " port " + asteriskServer.getPort());
 
-        this.socket = new Socket(asteriskServer.getHostname(), asteriskServer.getPort());
+        this.socket = createSocket();
 
-        bufferedReader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+        this.reader.setSocket(socket);
+        this.readerThread = new Thread(reader);
+        this.readerThread.start();
 
-        this.reader = new ManagerReader(this, bufferedReader);
-        this.reader.start();
-        this.writer = new PrintWriter(new OutputStreamWriter(socket.getOutputStream()));
+        this.writer.setSocket(socket);
+    }
+
+    protected SocketConnectionFacade createSocket() throws IOException
+    {
+        return new SocketConnectionFacadeImpl(asteriskServer.getHostname(), asteriskServer.getPort());
     }
 
     /**
@@ -300,7 +314,7 @@ public class DefaultManagerConnection im
      * @return <code>true</code> if there is a socket connection to the asterisk server,
      * <code>false</code> otherwise.
      */
-    protected synchronized boolean isConnected()
+    private synchronized boolean isConnected()
     {
         // return socket != null && socket.isConnected(); // JDK 1.4
         return socket != null;
@@ -317,7 +331,7 @@ public class DefaultManagerConnection im
         this.keepAlive = false;
 
         logoffAction = new LogoffAction();
-        
+
         if (isConnected())
         {
             sendAction(logoffAction);
@@ -327,23 +341,16 @@ public class DefaultManagerConnection im
 
     private synchronized void disconnect()
     {
-        if (this.writer != null)
-        {
-            logger.info("Closing writer");
-            this.writer.close();
-            this.writer = null;
-        }
-
         if (this.socket != null)
         {
-            logger.info("Closing socket");
+            logger.info("Closing socket.");
             try
             {
                 this.socket.close();
             }
             catch (IOException ex)
             {
-                logger.warn("Unable to close socket", ex);
+                logger.warn("Unable to close socket: " + ex.getMessage());
             }
             this.socket = null;
         }
@@ -389,12 +396,15 @@ public class DefaultManagerConnection im
     public void sendAction(ManagerAction action, ManagerResponseHandler callbackHandler) throws IOException
     {
         String internalActionId;
-        String actionString;
 
         if (action == null)
         {
-            logger.error("Unable to send null action");
-            throw new IllegalArgumentException("Unable to send null action");
+            throw new IllegalArgumentException("Unable to send action: action is null.");
+        }
+
+        if (!isConnected())
+        {
+            throw new IllegalStateException("Unable to send " + action.getAction() + " action: not connected.");
         }
 
         internalActionId = createInternalActionId();
@@ -416,21 +426,7 @@ public class DefaultManagerConnection im
             }
         }
 
-        actionString = actionBuilder.buildAction(action);
-
-        synchronized (this)
-        {
-            if (!isConnected())
-            {
-                throw new IllegalStateException("Unable to send " + action.getAction() + " action: not connected.");
-            }
-
-            this.writer.print(actionString);
-            this.writer.flush();
-        }
-
-        logger.debug("Sent " + action.getAction() + " action with internalActionId '" + internalActionId + "':\n"
-                + actionString);
+        writer.sendAction(action);
     }
 
     /**
@@ -439,7 +435,7 @@ public class DefaultManagerConnection im
      */
     private String createInternalActionId()
     {
-        StringBuffer sb;
+        final StringBuffer sb;
 
         sb = new StringBuffer();
         sb.append(this.hashCode());
@@ -449,7 +445,7 @@ public class DefaultManagerConnection im
         return sb.toString();
     }
 
-    public void addEventHandler(ManagerEventHandler eventHandler)
+    public void addEventHandler(final ManagerEventHandler eventHandler)
     {
         synchronized (this.eventHandlers)
         {
@@ -457,7 +453,7 @@ public class DefaultManagerConnection im
         }
     }
 
-    public void removeEventHandler(ManagerEventHandler eventHandler)
+    public void removeEventHandler(final ManagerEventHandler eventHandler)
     {
         synchronized (this.eventHandlers)
         {
@@ -473,7 +469,7 @@ public class DefaultManagerConnection im
         return this.protocolIdentifier;
     }
 
-    /* Callbacks for ManagerReader */
+    /* Callbacks for ManagerReaderImpl */
 
     /**
      * This method is called by the reader whenever a {@link ManagerResponse} is received. The
@@ -481,11 +477,11 @@ public class DefaultManagerConnection im
      * 
      * @param response the resonse received by the reader
      * 
-     * @see ManagerReader
+     * @see ManagerReaderImpl
      */
-    void dispatchResponse(ManagerResponse response)
+    public void dispatchResponse(ManagerResponse response)
     {
-        String actionId;
+        final String actionId;
         String internalActionId;
         ManagerResponseHandler responseHandler;
 
@@ -545,9 +541,9 @@ public class DefaultManagerConnection im
      * 
      * @see #addEventHandler(ManagerEventHandler)
      * @see #removeEventHandler(ManagerEventHandler)
-     * @see ManagerReader
+     * @see ManagerReaderImpl
      */
-    void dispatchEvent(ManagerEvent event)
+    public void dispatchEvent(ManagerEvent event)
     {
         if (event == null)
         {
@@ -578,6 +574,15 @@ public class DefaultManagerConnection im
                 }
             }
         }
+        
+        if (event instanceof ConnectEvent)
+        {
+            setProtocolIdentifier(((ConnectEvent) event).getProtocolIdentifier());
+        }
+        if (event instanceof DisconnectEvent)
+        {
+            handleDisconnection();
+        }
     }
 
     /**
@@ -587,7 +592,7 @@ public class DefaultManagerConnection im
      * 
      * @param protocolIdentifier the protocol version received by the reader
      * 
-     * @see ManagerReader
+     * @see ManagerReaderImpl
      */
     void setProtocolIdentifier(String protocolIdentifier)
     {
@@ -617,9 +622,6 @@ public class DefaultManagerConnection im
         // clean up at first
         disconnect();
 
-        // notify event listeners
-        dispatchEvent(new DisconnectEvent(this.asteriskServer));
-
         // try to reconnect
         numTries = 0;
         while (this.keepAlive)
@@ -671,7 +673,10 @@ public class DefaultManagerConnection im
                 {
                     // shouldn't happen
                     logger.error("TimeoutException while trying to log in after reconnect.");
-                    socket.close();
+                    synchronized (this)
+                    {
+                        socket.close();
+                    }
                 }
             }
             catch (IOException e)

[Asterisk-java-cvs] CVS: asterisk-java/src/test/net/sf/asterisk/manager ManagerWriterImplTest.java,NONE,1.1 ManagerReaderImplTest.java,NONE,1.1

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29560/src/test/net/sf/asterisk/manager

Added Files:
	ManagerWriterImplTest.java ManagerReaderImplTest.java 
Log Message:
Added unit tests for ManagerReader and ManagerWriter (and did some refactoring to make this work)

--- NEW FILE: ManagerWriterImplTest.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.manager;

import org.easymock.MockControl;

import net.sf.asterisk.manager.action.StatusAction;
import net.sf.asterisk.manager.io.SocketConnectionFacade;
import junit.framework.TestCase;

public class ManagerWriterImplTest extends TestCase
{
    private ManagerWriter managerWriter;
    
    public void setUp()
    {
        managerWriter = new ManagerWriterImpl();
    }
    
    public void testSendActionWithoutSocket() throws Exception
    {
        try
        {
            managerWriter.sendAction(new StatusAction());
            fail("Must throw IllegalStateException");
        }
        catch (IllegalStateException e)
        {
            assertTrue("Exception must be of type IllegalStateException", e instanceof IllegalStateException);
        }
    }

    public void testSendAction() throws Exception
    {
        MockControl socketMC;
        SocketConnectionFacade socketConnectionFacade;

        socketMC = MockControl.createControl(SocketConnectionFacade.class);
        socketConnectionFacade = (SocketConnectionFacade) socketMC.getMock();
        socketConnectionFacade.print("action: Status\r\n\r\n");
        socketConnectionFacade.flush();
        socketMC.replay();

        managerWriter.setSocket(socketConnectionFacade);
        managerWriter.sendAction(new StatusAction());
        socketMC.verify();
    }
}

--- NEW FILE: ManagerReaderImplTest.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.manager;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import junit.framework.TestCase;
import net.sf.asterisk.manager.event.ConnectEvent;
import net.sf.asterisk.manager.event.DisconnectEvent;
import net.sf.asterisk.manager.event.StatusCompleteEvent;
import net.sf.asterisk.manager.io.SocketConnectionFacade;
import net.sf.asterisk.manager.response.CommandResponse;
import net.sf.asterisk.manager.response.ManagerResponse;
import net.sf.asterisk.manager.util.DateUtil;

import org.easymock.MockControl;

public class ManagerReaderImplTest extends TestCase
{
    private Date now;
    private MockControl dispatcherMC;
    private Dispatcher dispatcher;
    private MockControl socketConnectionFacadeMC;
    private SocketConnectionFacade socketConnectionFacade;
    private AsteriskServer asteriskServer;
    private ManagerReader managerReader;

    public void setUp()
    {
        now = new Date();
        DateUtil.overrideCurrentDate(now);
        asteriskServer = new AsteriskServer();
        dispatcherMC = MockControl.createControl(Dispatcher.class);
        dispatcher = (Dispatcher) dispatcherMC.getMock();
        managerReader = new ManagerReaderImpl(dispatcher, asteriskServer);

        socketConnectionFacadeMC = MockControl.createControl(SocketConnectionFacade.class);
        socketConnectionFacade = (SocketConnectionFacade) socketConnectionFacadeMC.getMock();
    }

    public void testRunWithoutSocket() throws Exception
    {
        try
        {
            managerReader.run();
            fail("Must throw IllegalStateException");
        }
        catch (IllegalStateException e)
        {
            assertTrue("Exception must be of type IllegalStateException", e instanceof IllegalStateException);
        }
    }

    public void testRunReceivingProtocolIdentifier() throws Exception
    {
        ConnectEvent connectEvent;
        DisconnectEvent disconnectEvent;

        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue("Asterisk Call Manager/1.0");
        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue(null);

        connectEvent = new ConnectEvent(asteriskServer);
        connectEvent.setProtocolIdentifier("Asterisk Call Manager/1.0");
        connectEvent.setDateReceived(now);
        dispatcher.dispatchEvent(connectEvent);

        disconnectEvent = new DisconnectEvent(asteriskServer);
        disconnectEvent.setDateReceived(now);
        dispatcher.dispatchEvent(disconnectEvent);

        socketConnectionFacadeMC.replay();
        dispatcherMC.replay();

        managerReader.setSocket(socketConnectionFacade);
        managerReader.run();

        socketConnectionFacadeMC.verify();
        dispatcherMC.verify();
    }

    public void testRunReceivingEvent() throws Exception
    {
        DisconnectEvent disconnectEvent;
        StatusCompleteEvent statusCompleteEvent;

        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue("Event: StatusComplete");
        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue("");
        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue(null);

        statusCompleteEvent = new StatusCompleteEvent(asteriskServer);
        statusCompleteEvent.setDateReceived(now);
        dispatcher.dispatchEvent(statusCompleteEvent);

        disconnectEvent = new DisconnectEvent(asteriskServer);
        disconnectEvent.setDateReceived(now);
        dispatcher.dispatchEvent(disconnectEvent);

        socketConnectionFacadeMC.replay();
        dispatcherMC.replay();

        managerReader.setSocket(socketConnectionFacade);
        managerReader.run();

        socketConnectionFacadeMC.verify();
        dispatcherMC.verify();
    }

    public void testRunReceivingResponse() throws Exception
    {
        DisconnectEvent disconnectEvent;
        ManagerResponse response;

        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue("Response: Success");
        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue("Message: Authentication accepted");
        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue("");
        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue(null);

        response = new ManagerResponse();
        response.setResponse("Success");
        response.setMessage("Authentication accepted");
        response.setDateReceived(now);
        dispatcher.dispatchResponse(response);

        disconnectEvent = new DisconnectEvent(asteriskServer);
        disconnectEvent.setDateReceived(now);
        dispatcher.dispatchEvent(disconnectEvent);

        socketConnectionFacadeMC.replay();
        dispatcherMC.replay();

        managerReader.setSocket(socketConnectionFacade);
        managerReader.run();

        socketConnectionFacadeMC.verify();
        dispatcherMC.verify();
    }

    public void testRunReceivingCommandResponse() throws Exception
    {
        DisconnectEvent disconnectEvent;
        CommandResponse response;
        List result = new ArrayList();

        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue("Response: Follows");
        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue("ActionID: 12345");
        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue("Line1");
        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue("Line2");
        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue("--END COMMAND--");
        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue("");
        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setReturnValue(null);

        response = new CommandResponse();
        response.setResponse("Follows");
        response.setActionId("12345");
        result.add("Line1");
        result.add("Line2");
        response.setResult(result);
        response.setDateReceived(now);
        dispatcher.dispatchResponse(response);

        disconnectEvent = new DisconnectEvent(asteriskServer);
        disconnectEvent.setDateReceived(now);
        dispatcher.dispatchEvent(disconnectEvent);

        socketConnectionFacadeMC.replay();
        dispatcherMC.replay();

        managerReader.setSocket(socketConnectionFacade);
        managerReader.run();

        socketConnectionFacadeMC.verify();
        dispatcherMC.verify();
    }

    public void testRunCatchingIOException() throws Exception
    {
        DisconnectEvent disconnectEvent;

        socketConnectionFacade.readLine();
        socketConnectionFacadeMC.setThrowable(new IOException("Something happened to the network..."));

        disconnectEvent = new DisconnectEvent(asteriskServer);
        disconnectEvent.setDateReceived(now);
        dispatcher.dispatchEvent(disconnectEvent);

        socketConnectionFacadeMC.replay();
        dispatcherMC.replay();

        managerReader.setSocket(socketConnectionFacade);
        managerReader.run();

        socketConnectionFacadeMC.verify();
        dispatcherMC.verify();
    }
}

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/io SocketConnectionFacade.java,NONE,1.1 SocketConnectionFacadeImpl.java,NONE,1.1

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/io
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29560/src/java/net/sf/asterisk/manager/io

Added Files:
	SocketConnectionFacade.java SocketConnectionFacadeImpl.java 
Log Message:
Added unit tests for ManagerReader and ManagerWriter (and did some refactoring to make this work)

--- NEW FILE: SocketConnectionFacade.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.manager.io;

import java.io.IOException;

public interface SocketConnectionFacade
{
    String readLine() throws IOException;
    
    void print(String s) throws IOException;
    
    void flush() throws IOException;
    
    void close() throws IOException;
}

--- NEW FILE: SocketConnectionFacadeImpl.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.manager.io;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.Socket;

public class SocketConnectionFacadeImpl implements SocketConnectionFacade
{
    private final Socket socket;
    private final BufferedReader reader;
    private final PrintWriter writer;
    
    public SocketConnectionFacadeImpl(String host, int port) throws IOException
    {
        this.socket = new Socket(host, port);
        this.reader = new BufferedReader(new InputStreamReader(this.socket.getInputStream()));
        this.writer = new PrintWriter(new OutputStreamWriter(this.socket.getOutputStream()));
    }
    
    public String readLine() throws IOException
    {
        return reader.readLine();
    }

    public void print(String s) throws IOException
    {
        writer.print(s);
    }

    public void flush() throws IOException
    {
        writer.flush();
    }

    public void close() throws IOException
    {
        this.socket.close();
    }
}

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/event ConnectEvent.java,1.2,1.3

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29560/src/java/net/sf/asterisk/manager/event

Modified Files:
	ConnectEvent.java 
Log Message:
Added unit tests for ManagerReader and ManagerWriter (and did some refactoring to make this work)

Index: ConnectEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/ConnectEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ConnectEvent.java	23 Feb 2005 22:50:58 -0000	1.2
+++ ConnectEvent.java	2 Mar 2005 23:15:50 -0000	1.3
@@ -31,10 +31,35 @@ public class ConnectEvent extends Manage
     private static final long serialVersionUID = 3257845467831284784L;
 
     /**
+     * The version of the manager protocol.
+     */
+    private String protocolIdentifier;
+
+    /**
      * @param source
      */
     public ConnectEvent(Object source)
     {
         super(source);
     }
+
+    /**
+     * Returns the version of the protocol.
+     * 
+     * @return the version of the protocol.
+     */
+    public String getProtocolIdentifier()
+    {
+        return protocolIdentifier;
+    }
+
+    /**
+     * Sets the version of the protocol.
+     * 
+     * @param protocolIdentifier the version of the protocol.
+     */
+    public void setProtocolIdentifier(String protocolIdentifier)
+    {
+        this.protocolIdentifier = protocolIdentifier;
+    }
 }

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/io - New directory

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/io
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29493/src/java/net/sf/asterisk/manager/io

Log Message:
Directory /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/io added to the repository

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/util - New directory

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29493/src/java/net/sf/asterisk/manager/util

Log Message:
Directory /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/util added to the repository

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager EventBuilder.java,1.6,1.7

[Jon H. <squ...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24543/manager

Modified Files:
	EventBuilder.java 
Log Message:
add QueueMemberStatusEvent


Index: EventBuilder.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/EventBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- EventBuilder.java	2 Mar 2005 01:57:29 -0000	1.6
+++ EventBuilder.java	2 Mar 2005 18:35:38 -0000	1.7
@@ -53,6 +53,7 @@ import net.sf.asterisk.manager.event.Par
 import net.sf.asterisk.manager.event.PeerStatusEvent;
 import net.sf.asterisk.manager.event.QueueEntryEvent;
 import net.sf.asterisk.manager.event.QueueMemberEvent;
+import net.sf.asterisk.manager.event.QueueMemberStatusEvent;
 import net.sf.asterisk.manager.event.QueueParamsEvent;
 import net.sf.asterisk.manager.event.RegistryEvent;
 import net.sf.asterisk.manager.event.ReloadEvent;
@@ -117,6 +118,7 @@ public class EventBuilder
         registerEventClass(PeerStatusEvent.class);
         registerEventClass(QueueEntryEvent.class);
         registerEventClass(QueueMemberEvent.class);
+        registerEventClass(QueueMemberStatusEvent.class);
         registerEventClass(QueueParamsEvent.class);
         registerEventClass(RegistryEvent.class);
         registerEventClass(ReloadEvent.class);

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/event QueueMemberStatusEvent.java,NONE,1.1

[Jon H. <squ...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24543/manager/event

Added Files:
	QueueMemberStatusEvent.java 
Log Message:
add QueueMemberStatusEvent


--- NEW FILE: QueueMemberStatusEvent.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.manager.event;

/**
 * A QueueMemberStatusEvent shows the status of a QueueMemberEvent
 * 
 * @author Asteria Solutions Group, Inc. <http://www.asteriasgi.com/>
 * @version $Id: QueueMemberStatusEvent.java,v 1.1 2005/03/02 18:35:38 squinky86 Exp $
 */
public class QueueMemberStatusEvent extends QueueMemberEvent
{
    /**
     * Serializable version identifier
     */
    private static final long serialVersionUID = -2293926744791895763L;
	private String status;
    /**
     * @param source
     */
    public QueueMemberStatusEvent(Object source)
    {
        super(source);
    }
    /**
     * Returns the status.
     */
    public String getStatus()
    {
    	return status;
    }
    /**
     * Sets the status.
     */
    public void setStatus(String status)
    {
    	this.status = status;
    }
}

[Asterisk-java-cvs] CVS: asterisk-java .cvsignore,1.2,1.3

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4336

Modified Files:
	.cvsignore 
Log Message:
Added .project and .classpath

Index: .cvsignore
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- .cvsignore	23 Feb 2005 12:42:32 -0000	1.2
+++ .cvsignore	2 Mar 2005 11:33:06 -0000	1.3
@@ -5,3 +5,5 @@ bin
 .externalToolBuilders
 velocity.log
 target
+.classpath
+.project

[Asterisk-java-cvs] CVS: asterisk-java .classpath,1.3,NONE .project,1.2,NONE

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2433

Removed Files:
	.classpath .project 
Log Message:
- removed eclipse specific files (can be easily generated by "maven eclipse"


--- .classpath DELETED ---

--- .project DELETED ---

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/event DialEvent.java,NONE,1.1

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23220/src/java/net/sf/asterisk/manager/event

Added Files:
	DialEvent.java 
Log Message:
Added DialEvent (Patch #1154463)

--- NEW FILE: DialEvent.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.manager.event;

/**
 * A dial event is triggered whenever a phone attempts to dial someone.<br>
 * This event is implemented in <code>apps/app_dial.c</code>
 * 
 * @author Asteria Solutions Group, Inc. <http://www.asteriasgi.com/>
 * @version $Id: DialEvent.java,v 1.1 2005/03/02 01:57:29 srt Exp $
 */
public class DialEvent extends ManagerEvent
{
    /**
     * Serializable version identifier
     */
    private static final long serialVersionUID = 3258130241292417336L;

    /**
     * The name of the source channel.
     */
    private String src;

    /**
     * The name of the destination channel.
     */
    private String destination;

    /**
     * The new Caller*ID.
     */
    private String callerId;

    /**
     * The new Caller*ID Name.
     */
    private String callerIdName;

    /**
     * The unique id of the source channel.
     */
    private String srcUniqueId;

    /**
     * The unique id of the destination channel.
     */
    private String destUniqueId;

    /**
     * @param source
     */
    public DialEvent(Object source)
    {
        super(source);
    }

    /**
     * Returns the name of the source channel.
     * 
     * @return the name of the source channel.
     */
    public String getSrc()
    {
        return src;
    }

    /**
     * Sets the name of the source channel.
     * 
     * @param source the name of the source channel.
     */
    public void setSrc(String src)
    {
        this.src = src;
    }

    /**
     * Returns the name of the destination channel.
     * 
     * @return the name of the destination channel.
     */
    public String getDestination()
    {
        return destination;
    }

    /**
     * Sets the name of the destination channel.
     * 
     * @param destination the name of the destination channel.
     */
    public void setDestination(String destination)
    {
        this.destination = destination;
    }

    /**
     * Returns the Caller*ID.
     * 
     * @return the Caller*ID.
     */
    public String getCallerId()
    {
        return callerId;
    }

    /**
     * Sets the caller*ID.
     * 
     * @param callerId the caller*ID.
     */
    public void setCallerId(String callerid)
    {
        this.callerId = callerid;
    }

    /**
     * Returns the Caller*ID Name.
     * 
     * @return the Caller*ID Name.
     */
    public String getCallerIdName()
    {
        return callerIdName;
    }

    /**
     * Sets the callerId name.
     */
    public void setCallerIdName(String calleridname)
    {
        this.callerIdName = calleridname;
    }

    /**
     * Returns the unique ID of the source channel.
     * 
     * @return the unique ID of the source channel.
     */
    public String getSrcUniqueId()
    {
        return srcUniqueId;
    }

    /**
     * Sets the unique ID of the source channel.
     * 
     * @param srcUniqueId the unique ID of the source channel.
     */
    public void setSrcUniqueId(String srcuniqueid)
    {
        this.srcUniqueId = srcuniqueid;
    }

    /**
     * Returns the unique ID of the deistination channel.
     * 
     * @return the unique ID of the deistination channel.
     */
    public String getDestUniqueId()
    {
        return destUniqueId;
    }

    /**
     * Sets the unique ID of the distination channel.
     * 
     * @param destUniqueId the unique ID of the distination channel.
     */
    public void setDestUniqueId(String destuniqueid)
    {
        this.destUniqueId = destuniqueid;
    }
}

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager EventBuilder.java,1.5,1.6

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23220/src/java/net/sf/asterisk/manager

Modified Files:
	EventBuilder.java 
Log Message:
Added DialEvent (Patch #1154463)

Index: EventBuilder.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/EventBuilder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- EventBuilder.java	2 Mar 2005 00:38:18 -0000	1.5
+++ EventBuilder.java	2 Mar 2005 01:57:29 -0000	1.6
@@ -31,6 +31,7 @@ import net.sf.asterisk.manager.event.Age
 import net.sf.asterisk.manager.event.AlarmClearEvent;
 import net.sf.asterisk.manager.event.AlarmEvent;
 import net.sf.asterisk.manager.event.CdrEvent;
+import net.sf.asterisk.manager.event.DialEvent;
 import net.sf.asterisk.manager.event.ExtensionStatusEvent;
 import net.sf.asterisk.manager.event.HangupEvent;
 import net.sf.asterisk.manager.event.HoldedCallEvent;
@@ -95,6 +96,7 @@ public class EventBuilder
         registerEventClass(AlarmEvent.class);
         registerEventClass(AlarmClearEvent.class);
         registerEventClass(CdrEvent.class);
+        registerEventClass(DialEvent.class);
         registerEventClass(ExtensionStatusEvent.class);
         registerEventClass(HangupEvent.class);
         registerEventClass(HoldedCallEvent.class);

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager EventBuilder.java,1.4,1.5

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30471/src/java/net/sf/asterisk/manager

Modified Files:
	EventBuilder.java 
Log Message:
Changed logging of event registration to debug

Index: EventBuilder.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/EventBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- EventBuilder.java	1 Mar 2005 19:24:35 -0000	1.4
+++ EventBuilder.java	2 Mar 2005 00:38:18 -0000	1.5
@@ -187,7 +187,7 @@ public class EventBuilder
 
         registeredEventClasses.put(eventType.toLowerCase(), clazz);
 
-        logger.info("Registered event type '" + eventType + "' (" + clazz + ")");
+        logger.debug("Registered event type '" + eventType + "' (" + clazz + ")");
     }
 
     public ManagerEvent buildEvent(Object source, Map attributes)

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager DefaultManagerConnection.java,1.2,1.3

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30168/src/java/net/sf/asterisk/manager

Modified Files:
	DefaultManagerConnection.java 
Log Message:
Synchronized access to socket and writer

Index: DefaultManagerConnection.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultManagerConnection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- DefaultManagerConnection.java	23 Feb 2005 22:50:57 -0000	1.2
+++ DefaultManagerConnection.java	2 Mar 2005 00:37:38 -0000	1.3
@@ -53,6 +53,9 @@ import org.apache.commons.logging.LogFac
  */
 public class DefaultManagerConnection implements ManagerConnection
 {
+    /**
+     * Instance logger.
+     */
     private final Log logger = LogFactory.getLog(getClass());
 
     private long actionIdCount = 0;
@@ -70,7 +73,6 @@ public class DefaultManagerConnection im
     private PrintWriter writer;
     private ActionBuilder actionBuilder = new ActionBuilder();
     private String protocolIdentifier;
-    private String challenge;
     private Map responseHandlers = new HashMap();
     private Collection eventHandlers = new HashSet();
     private boolean keepAlive = false;
@@ -175,7 +177,7 @@ public class DefaultManagerConnection im
      * login is delayed until the protocol identifier has been received by the reader.
      * 
      * @throws AuthenticationFailedException if the username and/or password are incorrect
-     * @throws TimeoutException if there no response is received within the specified timeout period
+     * @throws TimeoutException if no response is received within the specified timeout period
      * 
      * @see ChallengeAction
      * @see LoginAction
@@ -185,15 +187,34 @@ public class DefaultManagerConnection im
         login(defaultTimeout);
     }
 
+    /**
+     * Does the real login, following the steps outlined below.<br>
+     * <ol>
+     * <li>Connects to the asterisk server by calling {@link #connect()} if not already connected
+     * <li>Waits until the protocol identifier is received. This is checked every
+     * {@link #sleepTime} ms but not longer than timeout ms in total.
+     * <li>Sends a {@link ChallengeAction} requesting a challenge for authType MD5.
+     * <li>When the {@link ChallengeResponse} is received a {@link LoginAction} is sent using the
+     * calculated key (MD5 hash of the password appended to the received challenge).
+     * </ol>
+     * 
+     * @param timeout the maximum time to wait for the protocol identifier (in ms)
+     * @throws AuthenticationFailedException if username or password are incorrect and the login
+     * action returns an error or if the MD5 hash cannot be computed. The connection is closed in
+     * this case.
+     * @throws TimeoutException if a timeout occurs either while waiting for the protocol identifier
+     * or when sending the challenge or login action. The connection is closed in this case.
+     */
     private void login(long timeout) throws IOException, AuthenticationFailedException, TimeoutException
     {
         long timeSpent;
         ChallengeAction challengeAction;
         ChallengeResponse challengeResponse;
+        String challenge;
         LoginAction loginAction;
         ManagerResponse loginResponse;
 
-        if (socket == null)
+        if (!isConnected())
         {
             connect();
         }
@@ -236,7 +257,6 @@ public class DefaultManagerConnection im
         }
         catch (NoSuchAlgorithmException ex)
         {
-            logger.error("Unable to create login key using MD5 Message Digest", ex);
             disconnect();
             throw new AuthenticationFailedException("Unable to create login key using MD5 Message Digest", ex);
         }
@@ -244,7 +264,6 @@ public class DefaultManagerConnection im
         loginResponse = sendAction(loginAction);
         if (loginResponse instanceof ManagerError)
         {
-            logger.info("Authentication failed: " + loginResponse.getMessage());
             disconnect();
             throw new AuthenticationFailedException(loginResponse.getMessage());
         }
@@ -259,7 +278,7 @@ public class DefaultManagerConnection im
         dispatchEvent(new ConnectEvent(this.asteriskServer));
     }
 
-    private void connect() throws IOException
+    private synchronized void connect() throws IOException
     {
         BufferedReader bufferedReader;
 
@@ -274,7 +293,23 @@ public class DefaultManagerConnection im
         this.writer = new PrintWriter(new OutputStreamWriter(socket.getOutputStream()));
     }
 
-    public void logoff() throws IOException, TimeoutException
+    /**
+     * Returns <code>true</code> if there is a socket connection to the asterisk server,
+     * <code>false</code> otherwise.
+     * 
+     * @return <code>true</code> if there is a socket connection to the asterisk server,
+     * <code>false</code> otherwise.
+     */
+    protected synchronized boolean isConnected()
+    {
+        // return socket != null && socket.isConnected(); // JDK 1.4
+        return socket != null;
+    }
+
+    /**
+     * Sends a {@link LogoffAction} and disconnects from the server.
+     */
+    public synchronized void logoff() throws IOException, TimeoutException
     {
         LogoffAction logoffAction;
 
@@ -282,12 +317,15 @@ public class DefaultManagerConnection im
         this.keepAlive = false;
 
         logoffAction = new LogoffAction();
-        sendAction(logoffAction);
-
-        disconnect();
+        
+        if (isConnected())
+        {
+            sendAction(logoffAction);
+            disconnect();
+        }
     }
 
-    private void disconnect()
+    private synchronized void disconnect()
     {
         if (this.writer != null)
         {
@@ -351,6 +389,7 @@ public class DefaultManagerConnection im
     public void sendAction(ManagerAction action, ManagerResponseHandler callbackHandler) throws IOException
     {
         String internalActionId;
+        String actionString;
 
         if (action == null)
         {
@@ -377,16 +416,21 @@ public class DefaultManagerConnection im
             }
         }
 
-        synchronized (this.writer)
+        actionString = actionBuilder.buildAction(action);
+
+        synchronized (this)
         {
-            String actionString;
+            if (!isConnected())
+            {
+                throw new IllegalStateException("Unable to send " + action.getAction() + " action: not connected.");
+            }
 
-            actionString = actionBuilder.buildAction(action);
             this.writer.print(actionString);
             this.writer.flush();
-
-            logger.debug("Sent action with internalActionId '" + internalActionId + "':\n" + actionString);
         }
+
+        logger.debug("Sent " + action.getAction() + " action with internalActionId '" + internalActionId + "':\n"
+                + actionString);
     }
 
     /**
@@ -547,7 +591,7 @@ public class DefaultManagerConnection im
      */
     void setProtocolIdentifier(String protocolIdentifier)
     {
-        logger.debug("Received protocol identifier '" + protocolIdentifier + "'");
+        logger.info("Connected via " + protocolIdentifier);
 
         if (!"Asterisk Call Manager/1.0".equals(protocolIdentifier))
         {

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager ManagerReader.java,1.4,1.5

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29838/src/java/net/sf/asterisk/manager

Modified Files:
	ManagerReader.java 
Log Message:
Moved handleDisconnection to finally block

Index: ManagerReader.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/ManagerReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- ManagerReader.java	1 Mar 2005 19:25:35 -0000	1.4
+++ ManagerReader.java	2 Mar 2005 00:37:03 -0000	1.5
@@ -57,8 +57,8 @@ class ManagerReader extends Thread
     private EventBuilder eventBuilder;
 
     /**
-     * The response builder utility to convert a map of attributes reveived from asterisk to instances
-     * of well known response classes.
+     * The response builder utility to convert a map of attributes reveived from asterisk to
+     * instances of well known response classes.
      */
     private ResponseBuilder responseBuilder;
 
@@ -130,7 +130,7 @@ class ManagerReader extends Thread
                     }
                     continue;
                 }
-                
+
                 // Reponse: Follows indicates that the output starting on the next line until
                 // --END COMMAND-- must be treated as raw output of a command executed by a
                 // CommandAction.
@@ -189,8 +189,6 @@ class ManagerReader extends Thread
                     }
                 }
             }
-
-            connection.handleDisconnection();
         }
         catch (IOException e)
         {
@@ -198,7 +196,7 @@ class ManagerReader extends Thread
         }
         finally
         {
-            log.info("Disconnected, closing reader");
+            log.info("Disconnected, closing reader.");
             try
             {
                 reader.close();
@@ -207,6 +205,9 @@ class ManagerReader extends Thread
             {
                 log.warn("Unable to close reader", ex);
             }
+
+            // cleans resources and reconnects if needed
+            connection.handleDisconnection();
         }
     }
 

[Asterisk-java-cvs] CVS: asterisk-java/src/test/net/sf/asterisk/manager TestDefaultManagerConnection.java,1.1,1.2

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29317/src/test/net/sf/asterisk/manager

Modified Files:
	TestDefaultManagerConnection.java 
Log Message:
Added testLoginAuthenticationFailure

Index: TestDefaultManagerConnection.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager/TestDefaultManagerConnection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- TestDefaultManagerConnection.java	23 Feb 2005 12:45:23 -0000	1.1
+++ TestDefaultManagerConnection.java	2 Mar 2005 00:35:36 -0000	1.2
@@ -19,6 +19,7 @@ public class TestDefaultManagerConnectio
     {
         DefaultManagerConnection dmc;
 
+//        dmc = new DefaultManagerConnection("deprecated", 5038, "manager", "obelisk");
         dmc = new DefaultManagerConnection();
         dmc.setUsername("manager");
         dmc.setPassword("obelisk");
@@ -46,4 +47,22 @@ public class TestDefaultManagerConnectio
         Thread.sleep(3000);
         dmc.logoff();
     }
+
+    public void testLoginAuthenticationFailure() throws Exception
+    {
+        DefaultManagerConnection dmc;
+
+        dmc = getDefaultManagerConnection();
+        dmc.setPassword("");
+        
+        try
+        {
+            dmc.login();
+            fail("No AuthenticationFailedException received.");
+        }
+        catch (AuthenticationFailedException e)
+        {
+        }
+        dmc.logoff();
+    }
 }

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/action MailboxStatusAction.java,1.2,1.3

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26804/src/java/net/sf/asterisk/manager/action

Modified Files:
	MailboxStatusAction.java 
Log Message:
Fixed comment for mailbox attribute

Index: MailboxStatusAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/MailboxStatusAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- MailboxStatusAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ MailboxStatusAction.java	1 Mar 2005 19:28:17 -0000	1.3
@@ -52,7 +52,7 @@ public class MailboxStatusAction extends
 

     /**

      * Sets the name of the mailbox to query.<br>

-     * This can either be only the number of the mailbox or a string of the form

+     * This can either be only the name of the mailbox or a string of the form

      * mailboxnumber@context. If no context is specified "default" is assumed.<br>

      * Multiple mailboxes may be given, separated by ','. In this case the action checks whether at

      * least one of the given mailboxes has waiting messages.<br>

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/response MailboxStatusResponse.java,1.2,1.3

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/response
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26470/src/java/net/sf/asterisk/manager/response

Modified Files:
	MailboxStatusResponse.java 
Log Message:
Changed type of waiting to Boolean

Index: MailboxStatusResponse.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/response/MailboxStatusResponse.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- MailboxStatusResponse.java	23 Feb 2005 22:50:58 -0000	1.2
+++ MailboxStatusResponse.java	1 Mar 2005 19:27:00 -0000	1.3
@@ -17,8 +17,8 @@
 package net.sf.asterisk.manager.response;
 
 /**
- * A MailboxStatusResponse is sent in response to a MailboxStatusAction and indicates if a mailbox
- * contains waiting messages.
+ * A MailboxStatusResponse is sent in response to a MailboxStatusAction and indicates if a set
+ * of mailboxes contains waiting messages.
  * 
  * @see net.sf.asterisk.manager.action.MailboxStatusAction
  * 
@@ -31,11 +31,20 @@ public class MailboxStatusResponse exten
      * Serial version identifier
      */
     private static final long serialVersionUID = -7193581424292429279L;
+    
+    /**
+     * The name of the mailbox.
+     */
     private String mailbox;
-    private Integer waiting;
+    
+    /**
+     * Indicates if there are new messages waiting in the given set of mailboxes.
+     */
+    private Boolean waiting;
 
     /**
-     * Returns the name of the mailbox.
+     * Returns the names of the mailboxes, separated by ",".
+     * @return the names of the mailbox.
      */
     public String getMailbox()
     {
@@ -43,7 +52,8 @@ public class MailboxStatusResponse exten
     }
 
     /**
-     * Sets the name of the mailbox.
+     * Sets the names of the mailboxes.
+     * @param mailbox the names of the mailboxes.
      */
     public void setMailbox(String mailbox)
     {
@@ -51,17 +61,19 @@ public class MailboxStatusResponse exten
     }
 
     /**
-     * Returns 1 if the mailbox has waiting messages; 0 otherwise.
+     * Returns Boolean.TRUE if at least one of the given mailboxes contains new messages;
+     * Boolean.FALSE otherwise.
      */
-    public Integer getWaiting()
+    public Boolean getWaiting()
     {
         return waiting;
     }
 
     /**
-     * Set to 1 if the mailbox has waiting messages; 0 otherwise.
+     * Set to Boolean.TRUE if at least one of the mailboxes contains new messages;
+     * Boolean.FALSE otherwise.
      */
-    public void setWaiting(Integer waiting)
+    public void setWaiting(Boolean waiting)
     {
         this.waiting = waiting;
     }

[Asterisk-java-cvs] CVS: asterisk-java/src/test/net/sf/asterisk/manager ResponseBuilderTest.java,NONE,1.1

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26211/src/test/net/sf/asterisk/manager

Added Files:
	ResponseBuilderTest.java 
Log Message:
Extracted response building into a separte class

--- NEW FILE: ResponseBuilderTest.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.manager;

import java.util.HashMap;
import java.util.Map;

import net.sf.asterisk.manager.response.ChallengeResponse;
import net.sf.asterisk.manager.response.ExtensionStateResponse;
import net.sf.asterisk.manager.response.MailboxCountResponse;
import net.sf.asterisk.manager.response.MailboxStatusResponse;
import net.sf.asterisk.manager.response.ManagerError;
import net.sf.asterisk.manager.response.ManagerResponse;

import junit.framework.TestCase;

public class ResponseBuilderTest extends TestCase
{
    private ResponseBuilder responseBuilder;
    private Map attributes;

    public void setUp()
    {
        this.responseBuilder = new ResponseBuilder();
        this.attributes = new HashMap();
    }

    public void testBuildResponse()
    {
        ManagerResponse response;

        attributes.put("response", "Success");

        response = responseBuilder.buildResponse(attributes);
        assertEquals("Response of wrong type", ManagerResponse.class, response.getClass());
        assertEquals("Response not set correctly", "Success", response.getResponse());
    }

    public void testBuildError()
    {
        ManagerResponse response;

        attributes.put("response", "Error");
        attributes.put("message", "Missing action in request");

        response = responseBuilder.buildResponse(attributes);
        assertEquals("Response of wrong type", ManagerError.class, response.getClass());
        assertEquals("Message not set correctly", "Missing action in request", response.getMessage());
    }

    public void testBuildErrorWithActionId()
    {
        ManagerResponse response;

        attributes.put("response", "Error");
        attributes.put("actionid", "1234");
        attributes.put("message", "Missing action in request");

        response = responseBuilder.buildResponse(attributes);
        assertEquals("ActionId not set correctly", "1234", response.getActionId());
    }

    public void testBuildChallengeResponse()
    {
        ManagerResponse response;

        attributes.put("response", "Success");
        attributes.put("challenge", "131494410");

        response = responseBuilder.buildResponse(attributes);
        assertEquals("Response of wrong type", ChallengeResponse.class, response.getClass());
        assertEquals("Challenge not set correctly", "131494410", ((ChallengeResponse) response).getChallenge());
    }

    public void testBuildMailboxStatusResponse()
    {
        ManagerResponse response;

        attributes.put("response", "Success");
        attributes.put("message", "Mailbox Status");
        attributes.put("mailbox", "123");
        attributes.put("waiting", "1");

        response = responseBuilder.buildResponse(attributes);
        assertEquals("Response of wrong type", MailboxStatusResponse.class, response.getClass());
        
        MailboxStatusResponse mailboxStatusResponse = (MailboxStatusResponse) response;
        assertEquals("Mailbox not set correctly", "123", mailboxStatusResponse.getMailbox());
        assertEquals("Waiting not set correctly", Boolean.TRUE, mailboxStatusResponse.getWaiting());
    }

    public void testBuildMailboxStatusResponseWithNoWaiting()
    {
        ManagerResponse response;

        attributes.put("response", "Success");
        attributes.put("message", "Mailbox Status");
        attributes.put("mailbox", "123,user2");
        attributes.put("waiting", "0");

        response = responseBuilder.buildResponse(attributes);
        assertEquals("Response of wrong type", MailboxStatusResponse.class, response.getClass());
        
        MailboxStatusResponse mailboxStatusResponse = (MailboxStatusResponse) response;
        assertEquals("Mailbox not set correctly", "123,user2", mailboxStatusResponse.getMailbox());
        assertEquals("Waiting not set correctly", Boolean.FALSE, mailboxStatusResponse.getWaiting());
    }

    public void testBuildMailboxCountResponse()
    {
        ManagerResponse response;

        attributes.put("response", "Success");
        attributes.put("message", "Mailbox Message Count");
        attributes.put("mailbox", "123@myctx");
        attributes.put("newmessages", "2");
        attributes.put("oldmessages", "5");

        response = responseBuilder.buildResponse(attributes);
        assertEquals("Response of wrong type", MailboxCountResponse.class, response.getClass());
        
        MailboxCountResponse mailboxCountResponse = (MailboxCountResponse) response;
        assertEquals("Mailbox not set correctly", "123@myctx", mailboxCountResponse.getMailbox());
        assertEquals("New messages not set correctly", new Integer(2), mailboxCountResponse.getNewMessages());
        assertEquals("Old messages set correctly", new Integer(5), mailboxCountResponse.getOldMessages());
    }

    public void testBuildExtensionStateResponse()
    {
        ManagerResponse response;

        attributes.put("response", "Success");
        attributes.put("message", "Extension Status");
        attributes.put("exten", "1");
        attributes.put("context", "default");
        attributes.put("hint", "");
        attributes.put("status", "-1");

        response = responseBuilder.buildResponse(attributes);
        assertEquals("Response of wrong type", ExtensionStateResponse.class, response.getClass());
        
        ExtensionStateResponse extensionStateResponse = (ExtensionStateResponse) response;
        assertEquals("Exten not set correctly", "1", extensionStateResponse.getExten());
        assertEquals("Context not set correctly", "default", extensionStateResponse.getContext());
        assertEquals("Hint not set correctly", "", extensionStateResponse.getHint());
        assertEquals("Status not set correctly", new Integer(-1), extensionStateResponse.getStatus());
    }
}

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager ResponseBuilder.java,NONE,1.1 ManagerReader.java,1.3,1.4

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26211/src/java/net/sf/asterisk/manager

Modified Files:
	ManagerReader.java 
Added Files:
	ResponseBuilder.java 
Log Message:
Extracted response building into a separte class

--- NEW FILE: ResponseBuilder.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.manager;

import java.util.Map;

import net.sf.asterisk.manager.response.ChallengeResponse;
import net.sf.asterisk.manager.response.ExtensionStateResponse;
import net.sf.asterisk.manager.response.MailboxCountResponse;
import net.sf.asterisk.manager.response.MailboxStatusResponse;
import net.sf.asterisk.manager.response.ManagerError;
import net.sf.asterisk.manager.response.ManagerResponse;

/**
 * Transforms maps of attributes to instances of ManagerResponse.
 * 
 * @see net.sf.asterisk.manager.response.ManagerResponse
 * @author srt
 * @version $Id: ResponseBuilder.java,v 1.1 2005/03/01 19:25:35 srt Exp $
 */
public class ResponseBuilder
{
    /**
     * Constructs an instance of ManagerResponse based on a map of attributes.
     * 
     * @param attributes the attributes and their values. The keys of this map must be all lower
     * case.
     * @return the response with the given attributes.
     */
    public ManagerResponse buildResponse(final Map attributes)
    {
        ManagerResponse response;
        String responseType;
        
        responseType = (String) attributes.get("response");

        // determine type
        if ("error".equalsIgnoreCase(responseType))
        {
            response = new ManagerError();
        }
        else if (attributes.containsKey("challenge"))
        {
            ChallengeResponse challengeResponse = new ChallengeResponse();
            challengeResponse.setChallenge((String) attributes.get("challenge"));
            response = challengeResponse;
        }
        else if (attributes.containsKey("mailbox") && attributes.containsKey("waiting"))
        {
            MailboxStatusResponse mailboxStatusResponse = new MailboxStatusResponse();
            mailboxStatusResponse.setMailbox((String) attributes.get("mailbox"));
            
            if ("1".equals((String) attributes.get("waiting")))
            {
                mailboxStatusResponse.setWaiting(Boolean.TRUE);
            }
            else
            {
                mailboxStatusResponse.setWaiting(Boolean.FALSE);
            }
            
            response = mailboxStatusResponse;
        }
        else if (attributes.containsKey("mailbox") && attributes.containsKey("newmessages")
                && attributes.containsKey("oldmessages"))
        {
            MailboxCountResponse mailboxCountResponse = new MailboxCountResponse();
            mailboxCountResponse.setMailbox((String) attributes.get("mailbox"));
            mailboxCountResponse.setNewMessages(new Integer((String) attributes.get("newmessages")));
            mailboxCountResponse.setOldMessages(new Integer((String) attributes.get("oldmessages")));
            response = mailboxCountResponse;
        }
        else if (attributes.containsKey("exten") && attributes.containsKey("context") && attributes.containsKey("hint")
                && attributes.containsKey("status"))
        {
            ExtensionStateResponse extensionStateResponse = new ExtensionStateResponse();
            extensionStateResponse.setExten((String) attributes.get("exten"));
            extensionStateResponse.setContext((String) attributes.get("context"));
            extensionStateResponse.setHint((String) attributes.get("hint"));
            extensionStateResponse.setStatus(new Integer((String) attributes.get("status")));
            response = extensionStateResponse;
        }
        else
        {
            response = new ManagerResponse();
        }

        // fill known attributes
        response.setResponse(responseType);

        if (attributes.containsKey("actionid"))
        {
            response.setActionId((String) attributes.get("actionid"));
        }
        if (attributes.containsKey("message"))
        {
            response.setMessage((String) attributes.get("message"));
        }
        if (attributes.containsKey("uniqueid"))
        {
            response.setUniqueId((String) attributes.get("uniqueid"));
        }

        return response;
    }
}

Index: ManagerReader.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/ManagerReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- ManagerReader.java	28 Feb 2005 16:45:44 -0000	1.3
+++ ManagerReader.java	1 Mar 2005 19:25:35 -0000	1.4
@@ -25,12 +25,7 @@ import java.util.List;
 import java.util.Map;
 
 import net.sf.asterisk.manager.event.ManagerEvent;
-import net.sf.asterisk.manager.response.ChallengeResponse;
 import net.sf.asterisk.manager.response.CommandResponse;
-import net.sf.asterisk.manager.response.ExtensionStateResponse;
-import net.sf.asterisk.manager.response.MailboxCountResponse;
-import net.sf.asterisk.manager.response.MailboxStatusResponse;
-import net.sf.asterisk.manager.response.ManagerError;
 import net.sf.asterisk.manager.response.ManagerResponse;
 
 import org.apache.commons.logging.Log;
@@ -54,13 +49,19 @@ class ManagerReader extends Thread
     private Log log = LogFactory.getLog(getClass());
 
     private static int threadCount = 0;
-    
+
     /**
-     * The event builder utility to convert a map of attributes reveived from asterisk
-     * to instances of registered event classes.
+     * The event builder utility to convert a map of attributes reveived from asterisk to instances
+     * of registered event classes.
      */
     private EventBuilder eventBuilder;
-    
+
+    /**
+     * The response builder utility to convert a map of attributes reveived from asterisk to instances
+     * of well known response classes.
+     */
+    private ResponseBuilder responseBuilder;
+
     /**
      * If set to <code>true</code>, terminates and closes the reader.
      */
@@ -77,6 +78,7 @@ class ManagerReader extends Thread
         this.reader = reader;
 
         this.eventBuilder = new EventBuilder();
+        this.responseBuilder = new ResponseBuilder();
     }
 
     /**
@@ -120,7 +122,6 @@ class ManagerReader extends Thread
                         commandResponse.setDateReceived(new Date());
                         commandResponse.setResult(commandResult);
                         connection.dispatchResponse(commandResponse);
-                        commandResult = new ArrayList();
                         processingCommandResult = false;
                     }
                     else
@@ -129,9 +130,14 @@ class ManagerReader extends Thread
                     }
                     continue;
                 }
+                
+                // Reponse: Follows indicates that the output starting on the next line until
+                // --END COMMAND-- must be treated as raw output of a command executed by a
+                // CommandAction.
                 if ("Response: Follows".equalsIgnoreCase(line))
                 {
                     processingCommandResult = true;
+                    commandResult.clear();
                     continue;
                 }
 
@@ -183,6 +189,7 @@ class ManagerReader extends Thread
                     }
                 }
             }
+
             connection.handleDisconnection();
         }
         catch (IOException e)
@@ -211,68 +218,14 @@ class ManagerReader extends Thread
     private ManagerResponse buildResponse(Map buffer)
     {
         ManagerResponse response;
-        String responseType = (String) buffer.get("response");
 
-        // determine type
-        if ("error".equals(responseType))
-        {
-            response = new ManagerError();
-        }
-        else if (buffer.containsKey("challenge"))
-        {
-            ChallengeResponse challengeResponse = new ChallengeResponse();
-            challengeResponse.setChallenge((String) buffer.get("challenge"));
-            response = challengeResponse;
-        }
-        else if (buffer.containsKey("mailbox") && buffer.containsKey("waiting"))
-        {
-            MailboxStatusResponse mailboxStatusResponse = new MailboxStatusResponse();
-            mailboxStatusResponse.setMailbox((String) buffer.get("mailbox"));
-            mailboxStatusResponse.setWaiting(new Integer((String) buffer.get("mailbox")));
-            response = mailboxStatusResponse;
-        }
-        else if (buffer.containsKey("mailbox") && buffer.containsKey("newmessages")
-                && buffer.containsKey("oldmessages"))
-        {
-            MailboxCountResponse mailboxCountResponse = new MailboxCountResponse();
-            mailboxCountResponse.setMailbox((String) buffer.get("mailbox"));
-            mailboxCountResponse.setNewMessages(new Integer((String) buffer.get("newmessages")));
-            mailboxCountResponse.setOldMessages(new Integer((String) buffer.get("oldmessages")));
-            response = mailboxCountResponse;
-        }
-        else if (buffer.containsKey("exten") && buffer.containsKey("context") && buffer.containsKey("hint")
-                && buffer.containsKey("status"))
-        {
-            ExtensionStateResponse extensionStateResponse = new ExtensionStateResponse();
-            extensionStateResponse.setExten((String) buffer.get("exten"));
-            extensionStateResponse.setContext((String) buffer.get("context"));
-            extensionStateResponse.setHint((String) buffer.get("hint"));
-            extensionStateResponse.setStatus(new Integer((String) buffer.get("status")));
-            response = extensionStateResponse;
-        }
-        else
-        {
-            response = new ManagerResponse();
-        }
-
-        // fill known attributes
-        response.setResponse(responseType);
+        response = responseBuilder.buildResponse(buffer);
 
-        if (buffer.containsKey("actionid"))
-        {
-            response.setActionId((String) buffer.get("actionid"));
-        }
-        if (buffer.containsKey("message"))
-        {
-            response.setMessage((String) buffer.get("message"));
-        }
-        if (buffer.containsKey("uniqueid"))
+        if (response != null)
         {
-            response.setUniqueId((String) buffer.get("uniqueid"));
+            response.setDateReceived(new Date());
         }
 
-        response.setDateReceived(new Date());
-
         return response;
     }
 
@@ -280,7 +233,7 @@ class ManagerReader extends Thread
     {
         ManagerEvent event;
 
-        event = this.eventBuilder.buildEvent(source, buffer);
+        event = eventBuilder.buildEvent(source, buffer);
 
         if (event != null)
         {

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager EventBuilder.java,1.3,1.4

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25921/src/java/net/sf/asterisk/manager

Modified Files:
	EventBuilder.java 
Log Message:
Added javadoc
Simplified exception handling

Index: EventBuilder.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/EventBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- EventBuilder.java	26 Feb 2005 20:14:17 -0000	1.3
+++ EventBuilder.java	1 Mar 2005 19:24:35 -0000	1.4
@@ -17,7 +17,6 @@
 package net.sf.asterisk.manager;
 
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.HashMap;
@@ -69,6 +68,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 /**
+ * Transforms maps of attributes to instances of ManagerEvent.
+ * 
+ * @see net.sf.asterisk.manager.event.ManagerEvent
  * @author srt
  * @version $Id$
  */
@@ -223,17 +225,7 @@ public class EventBuilder
         {
             event = (ManagerEvent) constructor.newInstance(new Object[]{source});
         }
-        catch (InstantiationException ex)
-        {
-            logger.error("Unable to create new instance of " + eventClass, ex);
-            return null;
-        }
-        catch (IllegalAccessException ex)
-        {
-            logger.error("Unable to create new instance of " + eventClass, ex);
-            return null;
-        }
-        catch (InvocationTargetException ex)
+        catch (Exception ex)
         {
             logger.error("Unable to create new instance of " + eventClass, ex);
             return null;

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager ManagerReader.java,1.2,1.3

[Stefan R. <sr...@us...>]

Update of /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30279/src/java/net/sf/asterisk/manager

Modified Files:
	ManagerReader.java 
Log Message:


Index: ManagerReader.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/ManagerReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ManagerReader.java	23 Feb 2005 22:50:57 -0000	1.2
+++ ManagerReader.java	28 Feb 2005 16:45:44 -0000	1.3
@@ -54,7 +54,16 @@ class ManagerReader extends Thread
     private Log log = LogFactory.getLog(getClass());
 
     private static int threadCount = 0;
+    
+    /**
+     * The event builder utility to convert a map of attributes reveived from asterisk
+     * to instances of registered event classes.
+     */
     private EventBuilder eventBuilder;
+    
+    /**
+     * If set to <code>true</code>, terminates and closes the reader.
+     */
     private boolean die = false;
     private BufferedReader reader;
     private DefaultManagerConnection connection;