asterisk-java-cvs — Asterisk-Java Commit Logs

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

[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-serv11254/src/java/net/sf/asterisk/manager/action

Modified Files:
	EventGeneratingAction.java 
Log Message:
Introduced EventGeneratingActions

Index: EventGeneratingAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/EventGeneratingAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- EventGeneratingAction.java	16 Jul 2005 14:25:48 -0000	1.1
+++ EventGeneratingAction.java	16 Jul 2005 21:48:16 -0000	1.2
@@ -28,7 +28,7 @@ package net.sf.asterisk.manager.action;
  * @version $Id$
  * @since 0.2
  */
-public interface EventGeneratingAction
+public interface EventGeneratingAction extends ManagerAction
 {
     /**
      * Returns the event type that indicates that Asterisk is finished sending

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

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

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

Added Files:
	ResponseEventsImpl.java 
Log Message:
Introduced EventGeneratingActions

--- NEW FILE: ResponseEventsImpl.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.impl;

import java.util.ArrayList;
import java.util.Collection;

import net.sf.asterisk.manager.ResponseEvents;
import net.sf.asterisk.manager.event.ResponseEvent;
import net.sf.asterisk.manager.response.ManagerResponse;

/**
 * Implementation of the ResponseEvents interface.
 * 
 * @author srt
 * @version $Id: ResponseEventsImpl.java,v 1.1 2005/07/16 21:48:16 srt Exp $
 * @since 0.2
 */
public class ResponseEventsImpl implements ResponseEvents
{
    private ManagerResponse response;
    private final Collection events;
    private boolean complete;

    /**
     * Creates a new instance.
     */
    public ResponseEventsImpl()
    {
        this.events = new ArrayList();
        this.complete = false;
    }

    // implementation of the ResponseEvents interface

    public ManagerResponse getResponse()
    {
        return response;
    }

    public Collection getEvents()
    {
        return events;
    }

    public boolean isComplete()
    {
        return complete;
    }

    // helper methods to populate the ResponseEvents object

    /**
     * Sets the ManagerResponse received.
     * 
     * @param response the ManagerResponse received.
     */
    public void setRepsonse(ManagerResponse response)
    {
        this.response = response;
    }

    /**
     * Adds a ResponseEvent that has been received.
     * 
     * @param event the ResponseEvent that has been received.
     */
    public void addEvent(ResponseEvent event)
    {
        synchronized (events)
        {
            events.add(event);
        }
    }

    /**
     * Indicats if all events have been received.
     * 
     * @param complete <code>true</code> if all events have been received,
     *            <code>false</code> otherwise.
     */
    public void setComplete(boolean complete)
    {
        this.complete = complete;
    }
}

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

[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-serv28486/src/java/net/sf/asterisk/manager

Modified Files:
	PingThread.java 
Log Message:
Made PingThread smarter
Now catches any exception when sending the PingAction (including IllegalStateException thrown when sending an Action while not connected to Asterisk)

Index: PingThread.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/PingThread.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- PingThread.java	16 Jul 2005 19:35:19 -0000	1.1
+++ PingThread.java	16 Jul 2005 20:07:49 -0000	1.2
@@ -16,8 +16,6 @@
  */
 package net.sf.asterisk.manager;
 
-import java.io.IOException;
-
 import net.sf.asterisk.manager.action.PingAction;
 import net.sf.asterisk.manager.response.ManagerResponse;
 import net.sf.asterisk.util.Log;
@@ -105,13 +103,9 @@ public class PingThread extends Thread
                 response = connection.sendAction(new PingAction());
                 logger.debug("Ping response: " + response);
             }
-            catch (IOException e)
-            {
-                logger.warn("IOException on sending Ping", e);
-            }
-            catch (TimeoutException e)
+            catch (Exception e)
             {
-                logger.warn("Timeout on sending Ping", e);
+                logger.warn("Exception on sending Ping", e);
             }
         }
     }

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

[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-serv23725/src/java/net/sf/asterisk/manager

Added Files:
	PingThread.java 
Log Message:
Added PingThread.

--- NEW FILE: PingThread.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.PingAction;
import net.sf.asterisk.manager.response.ManagerResponse;
import net.sf.asterisk.util.Log;
import net.sf.asterisk.util.LogFactory;

/**
 * A Thread that pings the Asterisk server at a given interval.<br>
 * You can use this to prevent the connection being shut down when there is no
 * traffic.
 * 
 * @author srt
 * @version $Id: PingThread.java,v 1.1 2005/07/16 19:35:19 srt Exp $
 */
public class PingThread extends Thread
{
    /**
     * Default value for the interval attribute.
     */
    private static final long DEFAULT_INTERVAL = 2000;

    /**
     * Instance logger.
     */
    private final Log logger = LogFactory.getLog(getClass());

    private long interval;
    private boolean die;
    private ManagerConnection connection;

    /**
     * Creates a new PingThread that uses the given ManagerConnection.
     * 
     * @param connection ManagerConnection that is pinged
     */
    public PingThread(ManagerConnection connection)
    {
        this.connection = connection;
        this.interval = DEFAULT_INTERVAL;
        this.die = false;
        setName("Ping");
    }

    /**
     * Adjusts how often a PingAction is sent.<br>
     * Default is 2000ms.
     * 
     * @param interval the interval in milliseconds
     */
    public void setInterval(long interval)
    {
        this.interval = interval;
    }

    /**
     * Terminates this PingThread.
     */
    public void die()
    {
        this.die = true;
        interrupt();
    }

    public void run()
    {
        ManagerResponse response;

        while (!die)
        {
            try
            {
                sleep(interval);
            }
            catch (InterruptedException e)
            {
                // swallow
            }

            if (die)
            {
                break;
            }

            try
            {
                response = connection.sendAction(new PingAction());
                logger.debug("Ping response: " + response);
            }
            catch (IOException e)
            {
                logger.warn("IOException on sending Ping", e);
            }
            catch (TimeoutException e)
            {
                logger.warn("Timeout on sending Ping", e);
            }
        }
    }
}

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/action EventGeneratingAction.java,NONE,1.1 DBGetAction.java,1.1,1.2 OriginateAction.java,1.3,1.4 ParkedCallsAction.java,1.3,1.4 AgentsAction.java,1.3,1.4 StatusAction.java,1.3,1.4 QueueStatusAction.java,1.4,1.5

[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-serv791/src/java/net/sf/asterisk/manager/action

Modified Files:
	DBGetAction.java OriginateAction.java ParkedCallsAction.java 
	AgentsAction.java StatusAction.java QueueStatusAction.java 
Added Files:
	EventGeneratingAction.java 
Log Message:
Added ResponseGeneratingAction interface

--- NEW FILE: EventGeneratingAction.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.action;

/**
 * The EventGeneratingAction interface is implemented by ManagerActions that
 * return their result not in a ManagerResponse but by sending a series of
 * events.<br>
 * The event type that indicates that Asterisk is finished is returned by the
 * getActionCompleteEventClass() method.
 * 
 * @see net.sf.asterisk.manager.event.ResponseEvent
 * @author srt
 * @version $Id: EventGeneratingAction.java,v 1.1 2005/07/16 14:25:48 srt Exp $
 * @since 0.2
 */
public interface EventGeneratingAction
{
    /**
     * Returns the event type that indicates that Asterisk is finished sending
     * response events for this action.
     * 
     * @return a Class that is an instance of ResponseEvent.
     * @see net.sf.asterisk.manager.event.ResponseEvent
     */
    Class getActionCompleteEventClass();
}

Index: DBGetAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/DBGetAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- DBGetAction.java	16 Jul 2005 13:19:34 -0000	1.1
+++ DBGetAction.java	16 Jul 2005 14:25:48 -0000	1.2
@@ -16,6 +16,8 @@
  */
 package net.sf.asterisk.manager.action;
 
+import net.sf.asterisk.manager.event.DBGetResponseEvent;
+
 /**
  * Retrieves an entry in the Asterisk database for a given family and key.<br>
  * If an entry is found a DBGetResponseEvent is sent by Asterisk containing 
@@ -26,7 +28,7 @@ package net.sf.asterisk.manager.action;
  * @version $Id$
  * @since 0.2
  */
-public class DBGetAction extends AbstractManagerAction
+public class DBGetAction extends AbstractManagerAction implements EventGeneratingAction
 {
     /**
      * Serial version identifier
@@ -79,4 +81,9 @@ public class DBGetAction extends Abstrac
     {
         this.key = key;
     }
+
+    public Class getActionCompleteEventClass()
+    {
+        return DBGetResponseEvent.class;
+    }
 }

Index: OriginateAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/OriginateAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- OriginateAction.java	16 Jul 2005 13:19:34 -0000	1.3
+++ OriginateAction.java	16 Jul 2005 14:25:48 -0000	1.4
@@ -16,6 +16,8 @@
  */

 package net.sf.asterisk.manager.action;

 

+import net.sf.asterisk.manager.event.OriginateEvent;

+

 /**

  * The OriginateAction generates an outgoing call to the extension in the given context with the

  * given priority or to a given application with optional parameters.<br>

@@ -39,7 +41,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class OriginateAction extends AbstractManagerAction

+public class OriginateAction extends AbstractManagerAction implements EventGeneratingAction

 {

     /**

      * Serializable version identifier

@@ -271,4 +273,9 @@ public class OriginateAction extends Abs
     {

         this.async = async;

     }

+

+    public Class getActionCompleteEventClass()

+    {

+        return OriginateEvent.class;

+    }

 }


Index: ParkedCallsAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/ParkedCallsAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- ParkedCallsAction.java	16 Jul 2005 13:19:34 -0000	1.3
+++ ParkedCallsAction.java	16 Jul 2005 14:25:48 -0000	1.4
@@ -16,6 +16,8 @@
  */

 package net.sf.asterisk.manager.action;

 

+import net.sf.asterisk.manager.event.ParkedCallsCompleteEvent;

+

 /**

  * The ParkedCallsAction requests a list of all currently parked calls.<br>

  * For each active channel a ParkedCallEvent is generated. After all parked calls have been reported

@@ -27,7 +29,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class ParkedCallsAction extends AbstractManagerAction

+public class ParkedCallsAction extends AbstractManagerAction implements EventGeneratingAction

 {

     /**

      * Serializable version identifier

@@ -41,4 +43,9 @@ public class ParkedCallsAction extends A
     {

         return "ParkedCalls";

     }

+

+    public Class getActionCompleteEventClass()

+    {

+        return ParkedCallsCompleteEvent.class;

+    }

 }


Index: AgentsAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/AgentsAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- AgentsAction.java	16 Jul 2005 13:19:34 -0000	1.3
+++ AgentsAction.java	16 Jul 2005 14:25:48 -0000	1.4
@@ -16,6 +16,8 @@
  */
 package net.sf.asterisk.manager.action;
 
+import net.sf.asterisk.manager.event.AgentsCompleteEvent;
+
 /**
  * The AgentsAction requests the state of all agents.<br>
  * For each agent an AgentsEvent is generated. After the state of all agents has been
@@ -29,7 +31,7 @@ package net.sf.asterisk.manager.action;
  * @version $Id$
  * @since 0.2
  */
-public class AgentsAction extends AbstractManagerAction
+public class AgentsAction extends AbstractManagerAction implements EventGeneratingAction
 {
     /**
      * Serializable version identifier
@@ -43,4 +45,9 @@ public class AgentsAction extends Abstra
     {
         return "Agents";
     }
+
+    public Class getActionCompleteEventClass()
+    {
+        return AgentsCompleteEvent.class;
+    }
 }

Index: StatusAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/StatusAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- StatusAction.java	16 Jul 2005 13:19:34 -0000	1.3
+++ StatusAction.java	16 Jul 2005 14:25:48 -0000	1.4
@@ -16,6 +16,8 @@
  */

 package net.sf.asterisk.manager.action;

 

+import net.sf.asterisk.manager.event.StatusCompleteEvent;

+

 /**

  * The StatusAction requests the state of all active channels.<br>

  * For each active channel a StatusEvent is generated. After the state of all channels has been

@@ -27,7 +29,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class StatusAction extends AbstractManagerAction

+public class StatusAction extends AbstractManagerAction implements EventGeneratingAction

 {

     /**

      * Serializable version identifier

@@ -41,4 +43,9 @@ public class StatusAction extends Abstra
     {

         return "Status";

     }

+

+    public Class getActionCompleteEventClass()

+    {

+        return StatusCompleteEvent.class;

+    }

 }


Index: QueueStatusAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/QueueStatusAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- QueueStatusAction.java	16 Jul 2005 13:19:34 -0000	1.4
+++ QueueStatusAction.java	16 Jul 2005 14:25:48 -0000	1.5
@@ -16,6 +16,8 @@
  */
 package net.sf.asterisk.manager.action;
 
+import net.sf.asterisk.manager.event.QueueStatusCompleteEvent;
+
 /**
  * The QueueStatusAction requests the state of all defined queues their members (agents) and entries
  * (callers).<br>
@@ -35,7 +37,7 @@ package net.sf.asterisk.manager.action;
  * @author srt
  * @version $Id$
  */
-public class QueueStatusAction extends AbstractManagerAction
+public class QueueStatusAction extends AbstractManagerAction implements EventGeneratingAction
 {
     /**
      * Serializable version identifier
@@ -49,4 +51,9 @@ public class QueueStatusAction extends A
     {
         return "QueueStatus";
     }
+
+    public Class getActionCompleteEventClass()
+    {
+        return QueueStatusCompleteEvent.class;
+    }
 }

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

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

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

Modified Files:
	ActionBuilderImplTest.java 
Log Message:
Added ResponseGeneratingAction interface

Index: ActionBuilderImplTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager/impl/ActionBuilderImplTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ActionBuilderImplTest.java	16 Jul 2005 13:19:34 -0000	1.2
+++ ActionBuilderImplTest.java	16 Jul 2005 14:25:48 -0000	1.3
@@ -19,6 +19,7 @@ package net.sf.asterisk.manager.impl;
 import junit.framework.TestCase;
 import net.sf.asterisk.manager.ActionBuilder;
 import net.sf.asterisk.manager.action.AbstractManagerAction;
+import net.sf.asterisk.manager.action.AgentsAction;
 
 public class ActionBuilderImplTest extends TestCase
 {
@@ -64,6 +65,20 @@ public class ActionBuilderImplTest exten
         assertEquals("Incorrect length", 42, actual.length());
     }
 
+    public void testBuildEventGeneratingAction()
+    {
+        AgentsAction action;
+        String actual;
+
+        action = new AgentsAction();
+
+        actual = actionBuilder.buildAction(action);
+
+        assertTrue("Action name missing", actual.indexOf("action: Agents\r\n") >= 0);
+        assertTrue("Action contains actionCompleteEventClass property", actual.indexOf("actioncompleteeventclass:") == -1);
+        assertTrue("Missing trailing CRNL CRNL", actual.endsWith("\r\n\r\n"));
+    }
+    
     class MyAction extends AbstractManagerAction
     {
         private static final long serialVersionUID = 3257568425345102641L;

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

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

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

Modified Files:
	ActionBuilderImpl.java 
Log Message:
Added ResponseGeneratingAction interface

Index: ActionBuilderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/ActionBuilderImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ActionBuilderImpl.java	31 Mar 2005 22:29:52 -0000	1.2
+++ ActionBuilderImpl.java	16 Jul 2005 14:25:48 -0000	1.3
@@ -84,8 +84,11 @@ public class ActionBuilderImpl implement
             {
                 continue;
             }
-
-            if (value instanceof String)
+            else if (value instanceof Class)
+            {
+                continue;
+            }
+            else if (value instanceof String)
             {
                 stringValue = (String) value;
             }

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

[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-serv26010/src/java/net/sf/asterisk/manager/event

Modified Files:
	DBGetResponseEvent.java 
Log Message:
The value attribute of DBPut and DBGet is called val not value - fixed it.

Index: DBGetResponseEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/DBGetResponseEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- DBGetResponseEvent.java	16 Jul 2005 13:39:54 -0000	1.1
+++ DBGetResponseEvent.java	16 Jul 2005 13:44:36 -0000	1.2
@@ -30,7 +30,7 @@ public class DBGetResponseEvent extends 
 {
     private String family;
     private String key;
-    private String value;
+    private String val;
 
     /**
      * Serial version identifier
@@ -90,18 +90,18 @@ public class DBGetResponseEvent extends 
      * 
      * @return the value of the database entry that was queried.
      */
-    public String getValue()
+    public String getVal()
     {
-        return value;
+        return val;
     }
 
     /**
      * Sets the value of the database entry that was queried.
      * 
-     * @param value the value of the database entry that was queried.
+     * @param val the value of the database entry that was queried.
      */
-    public void setValue(String value)
+    public void setVal(String val)
     {
-        this.value = value;
+        this.val = val;
     }
 }

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

[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-serv26010/src/java/net/sf/asterisk/manager/action

Modified Files:
	DBPutAction.java 
Log Message:
The value attribute of DBPut and DBGet is called val not value - fixed it.

Index: DBPutAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/DBPutAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- DBPutAction.java	16 Jul 2005 13:19:33 -0000	1.1
+++ DBPutAction.java	16 Jul 2005 13:44:36 -0000	1.2
@@ -33,7 +33,7 @@ public class DBPutAction extends Abstrac
     private static final long serialVersionUID = 921037572305993779L;
     private String family;
     private String key;
-    private String value;
+    private String val;
 
     public String getAction()
     {
@@ -85,18 +85,18 @@ public class DBPutAction extends Abstrac
      * 
      * @return the value to set.
      */
-    public String getValue()
+    public String getVal()
     {
-        return value;
+        return val;
     }
 
     /**
      * Sets the value to set.
      * 
-     * @param value the value to set.
+     * @param val the value to set.
      */
-    public void setValue(String value)
+    public void setVal(String val)
     {
-        this.value = value;
+        this.val = val;
     }
 }

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

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

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

Modified Files:
	EventBuilderImpl.java 
Log Message:
Added DBGetResponseEvent

Index: EventBuilderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/EventBuilderImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- EventBuilderImpl.java	16 Jul 2005 00:16:01 -0000	1.6
+++ EventBuilderImpl.java	16 Jul 2005 13:39:54 -0000	1.7
@@ -35,6 +35,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.DBGetResponseEvent;
 import net.sf.asterisk.manager.event.DialEvent;
 import net.sf.asterisk.manager.event.ExtensionStatusEvent;
 import net.sf.asterisk.manager.event.HangupEvent;
@@ -105,6 +106,7 @@ public class EventBuilderImpl implements
         registerEventClass(AlarmEvent.class);
         registerEventClass(AlarmClearEvent.class);
         registerEventClass(CdrEvent.class);
+        registerEventClass(DBGetResponseEvent.class);
         registerEventClass(DialEvent.class);
         registerEventClass(ExtensionStatusEvent.class);
         registerEventClass(HangupEvent.class);

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/event DBGetResponseEvent.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-serv25122/src/java/net/sf/asterisk/manager/event

Added Files:
	DBGetResponseEvent.java 
Log Message:
Added DBGetResponseEvent

--- NEW FILE: DBGetResponseEvent.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 DBGetResponseEvent is sent in response to a DBGetAction and contains the
 * entry that was queried.<br>
 * Available since Asterisk 1.2
 * 
 * @see net.sf.asterisk.manager.action.DBGetAction
 * @author srt
 * @version $Id: DBGetResponseEvent.java,v 1.1 2005/07/16 13:39:54 srt Exp $
 * @since 0.2
 */
public class DBGetResponseEvent extends ResponseEvent
{
    private String family;
    private String key;
    private String value;

    /**
     * Serial version identifier
     */
    private static final long serialVersionUID = -1177773673509373296L;

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

    /**
     * Returns the family of the database entry that was queried.
     * 
     * @return the family of the database entry that was queried.
     */
    public String getFamily()
    {
        return family;
    }

    /**
     * Sets the family of the database entry that was queried.
     * 
     * @param family the family of the database entry that was queried.
     */
    public void setFamily(String family)
    {
        this.family = family;
    }

    /**
     * Returns the key of the database entry that was queried.
     * 
     * @return the key of the database entry that was queried.
     */
    public String getKey()
    {
        return key;
    }

    /**
     * Sets the key of the database entry that was queried.
     * 
     * @param key the key of the database entry that was queried.
     */
    public void setKey(String key)
    {
        this.key = key;
    }

    /**
     * Returns the value of the database entry that was queried.
     * 
     * @return the value of the database entry that was queried.
     */
    public String getValue()
    {
        return value;
    }

    /**
     * Sets the value of the database entry that was queried.
     * 
     * @param value the value of the database entry that was queried.
     */
    public void setValue(String value)
    {
        this.value = value;
    }
}

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/action DBPutAction.java,NONE,1.1 DBGetAction.java,NONE,1.1 AbstractManagerAction.java,NONE,1.1 ZapDNDOffAction.java,1.2,1.3 SetCDRUserFieldAction.java,1.2,1.3 MailboxStatusAction.java,1.3,1.4 QueueRemoveAction.java,1.3,1.4 MailboxCountAction.java,1.2,1.3 ZapTransferAction.java,1.2,1.3 ManagerAction.java,1.3,1.4 ChallengeAction.java,1.2,1.3 StopMonitorAction.java,1.3,1.4 PingAction.java,1.2,1.3 ExtensionStateAction.java,1.2,1.3 ZapDNDOnAction.java,1.2,1.3 SetVarAction.java,1.1,1.2 HangupAction.java,1.2,1.3 ParkedCallsAction.java,1.2,1.3 AgentsAction.java,1.2,1.3 StatusAction.java,1.2,1.3 LoginAction.java,1.2,1.3 CommandAction.java,1.2,1.3 MonitorAction.java,1.2,1.3 ZapShowChannelsAction.java,1.2,1.3 ZapHangupAction.java,1.2,1.3 QueueAddAction.java,1.2,1.3 EventsAction.java,1.2,1.3 QueueStatusAction.java,1.3,1.4 GetVarAction.java,1.2,1.3 ChangeMonitorAction.java,1.2,1.3 RedirectAction.java,1.2,1.3 ZapDialOffhookAction.java,1.2,1.3 LogoffAction.java,1.2,1.3 OriginateAction.java,1.2,1.3 AbsoluteTimeoutAction.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-serv22023/src/java/net/sf/asterisk/manager/action

Modified Files:
	ZapDNDOffAction.java SetCDRUserFieldAction.java 
	MailboxStatusAction.java QueueRemoveAction.java 
	MailboxCountAction.java ZapTransferAction.java 
	ManagerAction.java ChallengeAction.java StopMonitorAction.java 
	PingAction.java ExtensionStateAction.java ZapDNDOnAction.java 
	SetVarAction.java HangupAction.java ParkedCallsAction.java 
	AgentsAction.java StatusAction.java LoginAction.java 
	CommandAction.java MonitorAction.java 
	ZapShowChannelsAction.java ZapHangupAction.java 
	QueueAddAction.java EventsAction.java QueueStatusAction.java 
	GetVarAction.java ChangeMonitorAction.java RedirectAction.java 
	ZapDialOffhookAction.java LogoffAction.java 
	OriginateAction.java AbsoluteTimeoutAction.java 
Added Files:
	DBPutAction.java DBGetAction.java AbstractManagerAction.java 
Log Message:
Changed ManagerAction to be an interface rather than an abstract class to provide more flexibility regarding implementation of additional Actions.

--- NEW FILE: DBPutAction.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.action;

/**
 * Adds or updates an entry in the Asterisk database for a given family, key,
 * and value.<br>
 * Available since Asterisk 1.2
 * 
 * @author srt
 * @version $Id: DBPutAction.java,v 1.1 2005/07/16 13:19:33 srt Exp $
 * @since 0.2
 */
public class DBPutAction extends AbstractManagerAction
{
    /**
     * Serial version identifier
     */
    private static final long serialVersionUID = 921037572305993779L;
    private String family;
    private String key;
    private String value;

    public String getAction()
    {
        return "DBPut";
    }
    
    /**
     * Returns the family of the key to set.
     * 
     * @return the family of the key to set.
     */
    public String getFamily()
    {
        return family;
    }

    /**
     * Sets the family of the key to set.
     * 
     * @param family the family of the key to set.
     */
    public void setFamily(String family)
    {
        this.family = family;
    }

    /**
     * Returns the the key to set.
     * 
     * @return the key to set.
     */
    public String getKey()
    {
        return key;
    }

    /**
     * Sets the key to set.
     * 
     * @param key the key to set.
     */
    public void setKey(String key)
    {
        this.key = key;
    }

    /**
     * Returns the value to set.
     * 
     * @return the value to set.
     */
    public String getValue()
    {
        return value;
    }

    /**
     * Sets the value to set.
     * 
     * @param value the value to set.
     */
    public void setValue(String value)
    {
        this.value = value;
    }
}

--- NEW FILE: DBGetAction.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.action;

/**
 * Retrieves an entry in the Asterisk database for a given family and key.<br>
 * If an entry is found a DBGetResponseEvent is sent by Asterisk containing 
 * the value, otherwise a ManagerError indicates that no entry matches.<br>
 * Available since Asterisk 1.2
 * 
 * @author srt
 * @version $Id: DBGetAction.java,v 1.1 2005/07/16 13:19:34 srt Exp $
 * @since 0.2
 */
public class DBGetAction extends AbstractManagerAction
{
    /**
     * Serial version identifier
     */
    private static final long serialVersionUID = 921037572305993779L;
    private String family;
    private String key;

    public String getAction()
    {
        return "DBGet";
    }
    
    /**
     * Returns the family of the key to retrieve.
     * 
     * @return the family of the key to retrieve.
     */
    public String getFamily()
    {
        return family;
    }

    /**
     * Sets the family of the key to retrieve.
     * 
     * @param family the family of the key to retrieve.
     */
    public void setFamily(String family)
    {
        this.family = family;
    }

    /**
     * Returns the the key to retrieve.
     * 
     * @return the key to retrieve.
     */
    public String getKey()
    {
        return key;
    }

    /**
     * Sets the key to retrieve.
     * 
     * @param key the key to retrieve.
     */
    public void setKey(String key)
    {
        this.key = key;
    }
}

--- NEW FILE: AbstractManagerAction.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.action;



/**

 * This class implements the ManagerAction interface and can serve as base class

 * for your concrete Action implementations.

 * 

 * @author srt

 * @version $Id: AbstractManagerAction.java,v 1.1 2005/07/16 13:19:34 srt Exp $

 * @since 0.2

 */

public abstract class AbstractManagerAction implements ManagerAction

{

    /**

     * Serializable version identifier

     */

    static final long serialVersionUID = -7667827187378395689L;



    private String actionId;



    public abstract String getAction();



    public String getActionId()

    {

        return actionId;

    }



    public void setActionId(String actionId)

    {

        this.actionId = actionId;

    }



    public String toString()

    {

        StringBuffer sb;



        sb = new StringBuffer(getClass().getName() + ": ");

        sb.append("action='" + getAction() + "'; ");

        // TODO print attributes

        sb.append("systemHashcode=" + System.identityHashCode(this));



        return sb.toString();

    }

}


Index: ZapDNDOffAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/ZapDNDOffAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ZapDNDOffAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ ZapDNDOffAction.java	16 Jul 2005 13:19:33 -0000	1.3
@@ -22,7 +22,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class ZapDNDOffAction extends ManagerAction

+public class ZapDNDOffAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: SetCDRUserFieldAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/SetCDRUserFieldAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- SetCDRUserFieldAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ SetCDRUserFieldAction.java	16 Jul 2005 13:19:33 -0000	1.3
@@ -25,7 +25,7 @@ package net.sf.asterisk.manager.action;
  * @author srt
  * @version $Id$
  */
-public class SetCDRUserFieldAction extends ManagerAction
+public class SetCDRUserFieldAction extends AbstractManagerAction
 {
     /**
      * Serializable version identifier

Index: MailboxStatusAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/MailboxStatusAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- MailboxStatusAction.java	1 Mar 2005 19:28:17 -0000	1.3
+++ MailboxStatusAction.java	16 Jul 2005 13:19:33 -0000	1.4
@@ -25,7 +25,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class MailboxStatusAction extends ManagerAction

+public class MailboxStatusAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: QueueRemoveAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/QueueRemoveAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- QueueRemoveAction.java	27 Feb 2005 15:12:16 -0000	1.3
+++ QueueRemoveAction.java	16 Jul 2005 13:19:33 -0000	1.4
@@ -23,7 +23,7 @@ package net.sf.asterisk.manager.action;
  * @author srt
  * @version $Id$
  */
-public class QueueRemoveAction extends ManagerAction
+public class QueueRemoveAction extends AbstractManagerAction
 {
     /**
      * Serializable version identifier

Index: MailboxCountAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/MailboxCountAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- MailboxCountAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ MailboxCountAction.java	16 Jul 2005 13:19:33 -0000	1.3
@@ -14,7 +14,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class MailboxCountAction extends ManagerAction

+public class MailboxCountAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: ZapTransferAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/ZapTransferAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ZapTransferAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ ZapTransferAction.java	16 Jul 2005 13:19:33 -0000	1.3
@@ -22,7 +22,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class ZapTransferAction extends ManagerAction

+public class ZapTransferAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: ManagerAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/ManagerAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- ManagerAction.java	13 Mar 2005 11:26:49 -0000	1.3
+++ ManagerAction.java	16 Jul 2005 13:19:33 -0000	1.4
@@ -1,75 +1,55 @@
-/*

- * 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.action;

-

-import java.io.Serializable;

-

-/**

- * Abstract base class for all Actions that can be sent to the Asterisk server.<br>

- * Instances of this class represent a command sent to Asterisk, requesting a particular Action be

- * performed. The number of actions available to the client are determined by the modules presently

- * loaded in the Asterisk engine.<br>

- * There is one conrete subclass of ManagerAction per each supported Asterisk Action.

- * 

- * @author srt

- * @version $Id$

- */

-public abstract class ManagerAction implements Serializable

-{

-    /**

-     * Serializable version identifier

-     */

-    static final long serialVersionUID = -7667827187378395689L;

-

-    private String actionId;

-

-    /**

-     * Returns the name of the action.

-     */

-    public abstract String getAction();

-

-    /**

-     * Returns the action id.

-     */

-    public String getActionId()

-    {

-        return actionId;

-    }

-

-    /**

-     * Sets the action id.<br>

-     * If the action id is set and sent to the asterisk server any response returned by the asterisk

-     * server will include the same action id. This way the action id can be used to track actions

-     * and their corresponding responses.

-     */

-    public void setActionId(String actionId)

-    {

-        this.actionId = actionId;

-    }

-

-    public String toString()

-    {

-        StringBuffer sb;

-        

-        sb = new StringBuffer(getClass().getName() + ": ");

-        sb.append("action='" + getAction() + "'; ");

-        //TODO print attributes

-        sb.append("systemHashcode=" + System.identityHashCode(this));

-

-        return sb.toString();

-    }

-}

+/*
+ * 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.action;
+
+import java.io.Serializable;
+
+/**
+ * Interface that all Actions that can be sent to the Asterisk server must
+ * impement.<br>
+ * Instances of this class represent a command sent to Asterisk via Manager API,
+ * requesting a particular Action be performed. The number of actions available
+ * to the client are determined by the modules presently loaded in the Asterisk
+ * engine.<br>
+ * There is one conrete subclass of ManagerAction per each supported Asterisk
+ * Action.
+ * 
+ * @author srt
+ * @version $Id$
+ */
+public interface ManagerAction extends Serializable
+{
+    /**
+     * Returns the name of the action.
+     */
+    String getAction();
+
+    /**
+     * Returns the action id.
+     */
+    String getActionId();
+
+    /**
+     * Sets the action id.<br>
+     * If the action id is set and sent to the asterisk server any response
+     * returned by the asterisk server will include the same action id. This way
+     * the action id can be used to track actions and their corresponding
+     * responses.
+     */
+    void setActionId(String actionId);
+
+}

Index: ChallengeAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/ChallengeAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ChallengeAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ ChallengeAction.java	16 Jul 2005 13:19:33 -0000	1.3
@@ -27,7 +27,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class ChallengeAction extends ManagerAction

+public class ChallengeAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: StopMonitorAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/StopMonitorAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- StopMonitorAction.java	27 Feb 2005 15:10:02 -0000	1.3
+++ StopMonitorAction.java	16 Jul 2005 13:19:33 -0000	1.4
@@ -23,7 +23,7 @@ package net.sf.asterisk.manager.action;
  * @author srt
  * @version $Id$
  */
-public class StopMonitorAction extends ManagerAction
+public class StopMonitorAction extends AbstractManagerAction
 {
     /**
      * Serializable version identifier

Index: PingAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/PingAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- PingAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ PingAction.java	16 Jul 2005 13:19:33 -0000	1.3
@@ -23,7 +23,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class PingAction extends ManagerAction

+public class PingAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: ExtensionStateAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/ExtensionStateAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ExtensionStateAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ ExtensionStateAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -22,7 +22,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class ExtensionStateAction extends ManagerAction

+public class ExtensionStateAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: ZapDNDOnAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/ZapDNDOnAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ZapDNDOnAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ ZapDNDOnAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -22,7 +22,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class ZapDNDOnAction extends ManagerAction

+public class ZapDNDOnAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: SetVarAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/SetVarAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- SetVarAction.java	25 Feb 2005 11:25:49 -0000	1.1
+++ SetVarAction.java	16 Jul 2005 13:19:34 -0000	1.2
@@ -22,7 +22,7 @@ package net.sf.asterisk.manager.action;
  * @author Asteria Solutions Group, Inc. <http://www.asteriasgi.com>
  * @version $Id$
  */
-public class SetVarAction extends ManagerAction
+public class SetVarAction extends AbstractManagerAction
 {
     /**
      * Serial version identifier

Index: HangupAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/HangupAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- HangupAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ HangupAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -22,7 +22,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class HangupAction extends ManagerAction

+public class HangupAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: ParkedCallsAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/ParkedCallsAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ParkedCallsAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ ParkedCallsAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -27,7 +27,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class ParkedCallsAction extends ManagerAction

+public class ParkedCallsAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: AgentsAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/AgentsAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- AgentsAction.java	15 Jul 2005 19:40:24 -0000	1.2
+++ AgentsAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -29,7 +29,7 @@ package net.sf.asterisk.manager.action;
  * @version $Id$
  * @since 0.2
  */
-public class AgentsAction extends ManagerAction
+public class AgentsAction extends AbstractManagerAction
 {
     /**
      * Serializable version identifier

Index: StatusAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/StatusAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- StatusAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ StatusAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -27,7 +27,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class StatusAction extends ManagerAction

+public class StatusAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: LoginAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/LoginAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- LoginAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ LoginAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -29,7 +29,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class LoginAction extends ManagerAction

+public class LoginAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: CommandAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/CommandAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- CommandAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ CommandAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -23,7 +23,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class CommandAction extends ManagerAction

+public class CommandAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: MonitorAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/MonitorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- MonitorAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ MonitorAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -23,7 +23,7 @@ package net.sf.asterisk.manager.action;
  * @author srt
  * @version $Id$
  */
-public class MonitorAction extends ManagerAction
+public class MonitorAction extends AbstractManagerAction
 {
     /**
      * Serializable version identifier

Index: ZapShowChannelsAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/ZapShowChannelsAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ZapShowChannelsAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ ZapShowChannelsAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -27,7 +27,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class ZapShowChannelsAction extends ManagerAction

+public class ZapShowChannelsAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: ZapHangupAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/ZapHangupAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ZapHangupAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ ZapHangupAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -22,7 +22,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class ZapHangupAction extends ManagerAction

+public class ZapHangupAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: QueueAddAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/QueueAddAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- QueueAddAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ QueueAddAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -23,7 +23,7 @@ package net.sf.asterisk.manager.action;
  * @author srt
  * @version $Id$
  */
-public class QueueAddAction extends ManagerAction
+public class QueueAddAction extends AbstractManagerAction
 {
     /**
      * Serializable version identifier

Index: EventsAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/EventsAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- EventsAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ EventsAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -23,7 +23,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class EventsAction extends ManagerAction

+public class EventsAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: QueueStatusAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/QueueStatusAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- QueueStatusAction.java	15 Jul 2005 11:50:45 -0000	1.3
+++ QueueStatusAction.java	16 Jul 2005 13:19:34 -0000	1.4
@@ -35,7 +35,7 @@ package net.sf.asterisk.manager.action;
  * @author srt
  * @version $Id$
  */
-public class QueueStatusAction extends ManagerAction
+public class QueueStatusAction extends AbstractManagerAction
 {
     /**
      * Serializable version identifier

Index: GetVarAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/GetVarAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- GetVarAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ GetVarAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -22,7 +22,7 @@ package net.sf.asterisk.manager.action;
  * @author srt
  * @version $Id$
  */
-public class GetVarAction extends ManagerAction
+public class GetVarAction extends AbstractManagerAction
 {
     /**
      * Serializable version identifier

Index: ChangeMonitorAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/ChangeMonitorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ChangeMonitorAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ ChangeMonitorAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -24,7 +24,7 @@ package net.sf.asterisk.manager.action;
  * @author srt
  * @version $Id$
  */
-public class ChangeMonitorAction extends ManagerAction
+public class ChangeMonitorAction extends AbstractManagerAction
 {
     /**
      * Serializable version identifier

Index: RedirectAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/RedirectAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- RedirectAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ RedirectAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -20,7 +20,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class RedirectAction extends ManagerAction

+public class RedirectAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: ZapDialOffhookAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/ZapDialOffhookAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ZapDialOffhookAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ ZapDialOffhookAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -22,7 +22,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class ZapDialOffhookAction extends ManagerAction

+public class ZapDialOffhookAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: LogoffAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/LogoffAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- LogoffAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ LogoffAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -22,7 +22,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class LogoffAction extends ManagerAction

+public class LogoffAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: OriginateAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/OriginateAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- OriginateAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ OriginateAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -39,7 +39,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class OriginateAction extends ManagerAction

+public class OriginateAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier


Index: AbsoluteTimeoutAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/AbsoluteTimeoutAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- AbsoluteTimeoutAction.java	23 Feb 2005 22:50:58 -0000	1.2
+++ AbsoluteTimeoutAction.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -29,7 +29,7 @@ package net.sf.asterisk.manager.action;

  * @author srt

  * @version $Id$

  */

-public class AbsoluteTimeoutAction extends ManagerAction

+public class AbsoluteTimeoutAction extends AbstractManagerAction

 {

     /**

      * Serializable version identifier

[Asterisk-java-cvs] CVS: asterisk-java/src/integrationtest/net/sf/asterisk/manager AsteriskManagerTestCase.java,1.1,1.2 TestDefaultAsteriskManager.java,1.2,1.3

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

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

Modified Files:
	AsteriskManagerTestCase.java TestDefaultAsteriskManager.java 
Log Message:
Changed ManagerAction to be an interface rather than an abstract class to provide more flexibility regarding implementation of additional Actions.

Index: AsteriskManagerTestCase.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/integrationtest/net/sf/asterisk/manager/AsteriskManagerTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- AsteriskManagerTestCase.java	30 Apr 2005 16:45:15 -0000	1.1
+++ AsteriskManagerTestCase.java	16 Jul 2005 13:19:34 -0000	1.2
@@ -26,9 +26,9 @@ public class AsteriskManagerTestCase ext
     public void setUp() throws Exception
     {
         managerConnection = new DefaultManagerConnection();
-        managerConnection.setHostname("deprecated");
+        managerConnection.setHostname("localhost");
         managerConnection.setUsername("manager");
-        managerConnection.setPassword("obelisk");
+        managerConnection.setPassword("pa55w0rd");
 
         manager = new DefaultAsteriskManager();
         manager.setManagerConnection(managerConnection);

Index: TestDefaultAsteriskManager.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/integrationtest/net/sf/asterisk/manager/TestDefaultAsteriskManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- TestDefaultAsteriskManager.java	30 Apr 2005 16:45:15 -0000	1.2
+++ TestDefaultAsteriskManager.java	16 Jul 2005 13:19:34 -0000	1.3
@@ -24,4 +24,21 @@ public class TestDefaultAsteriskManager 
 
         System.out.println(manager.getChannels());
     }
+
+    public void testOriginate() throws Exception
+    {
+        Originate originate;
+        Call call;
+
+        originate = new Originate();
+        originate.setChannel("Local/1310");
+        originate.setContext("default");
+        originate.setExten("1330");
+        originate.setPriority(new Integer(1));
+
+        call = manager.originateCall(originate);
+
+        System.out.println(call);
+    }
+
 }

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager ManagerConnection.java,1.8,1.9

[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-serv22023/src/java/net/sf/asterisk/manager

Modified Files:
	ManagerConnection.java 
Log Message:
Changed ManagerAction to be an interface rather than an abstract class to provide more flexibility regarding implementation of additional Actions.

Index: ManagerConnection.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/ManagerConnection.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -p -r1.8 -r1.9
--- ManagerConnection.java	7 Jul 2005 00:19:17 -0000	1.8
+++ ManagerConnection.java	16 Jul 2005 13:19:34 -0000	1.9
@@ -19,6 +19,7 @@ package net.sf.asterisk.manager;
 import java.io.IOException;
 
 import net.sf.asterisk.manager.action.ManagerAction;
+import net.sf.asterisk.manager.event.ManagerEvent;
 import net.sf.asterisk.manager.response.ManagerResponse;
 
 /**

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

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

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

Modified Files:
	ActionBuilderImplTest.java 
Log Message:
Changed ManagerAction to be an interface rather than an abstract class to provide more flexibility regarding implementation of additional Actions.

Index: ActionBuilderImplTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager/impl/ActionBuilderImplTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- ActionBuilderImplTest.java	11 Mar 2005 15:27:24 -0000	1.1
+++ ActionBuilderImplTest.java	16 Jul 2005 13:19:34 -0000	1.2
@@ -18,7 +18,7 @@ package net.sf.asterisk.manager.impl;
 
 import junit.framework.TestCase;
 import net.sf.asterisk.manager.ActionBuilder;
-import net.sf.asterisk.manager.action.ManagerAction;
+import net.sf.asterisk.manager.action.AbstractManagerAction;
 
 public class ActionBuilderImplTest extends TestCase
 {
@@ -64,7 +64,7 @@ public class ActionBuilderImplTest exten
         assertEquals("Incorrect length", 42, actual.length());
     }
 
-    class MyAction extends ManagerAction
+    class MyAction extends AbstractManagerAction
     {
         private static final long serialVersionUID = 3257568425345102641L;
         private String firstProperty;

[Asterisk-java-cvs] CVS: asterisk-java ChangeLog,1.3,1.4

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

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

Modified Files:
	ChangeLog 
Log Message:
Changed ManagerAction to be an interface rather than an abstract class to provide more flexibility regarding implementation of additional Actions.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/ChangeLog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- ChangeLog	23 Jun 2005 22:17:45 -0000	1.3
+++ ChangeLog	16 Jul 2005 13:19:34 -0000	1.4
@@ -2,6 +2,9 @@ Asterisk-Java 0.2
 	* Fixed getting the uniqueId from a successful originate
 	  in the DefaultAsteriskManager
 	* Added isConnected() method to ManagerConnection
+	* Changed ManagerAction to be an interface rather that an
+	  abstract base class. If you extended ManagerAction, please
+	  use AbstractManagerAction instead.
 
 Asterisk-Java 0.1
 	* Added accessors for raw attributes in ManagerResponse

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

[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-serv6895/src/java/net/sf/asterisk/manager

Modified Files:
	DefaultManagerConnection.java 
Log Message:
new ManagerEventHandler is only added when not already registered

Index: DefaultManagerConnection.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/DefaultManagerConnection.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -p -r1.19 -r1.20
--- DefaultManagerConnection.java	7 Jul 2005 00:27:35 -0000	1.19
+++ DefaultManagerConnection.java	16 Jul 2005 00:17:26 -0000	1.20
@@ -505,7 +505,10 @@ public class DefaultManagerConnection im
     {
         synchronized (this.eventHandlers)
         {
-            this.eventHandlers.add(eventHandler);
+            if (! this.eventHandlers.contains(eventHandler))
+            {
+                this.eventHandlers.add(eventHandler);
+            }
         }
     }
 

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/event ResponseEvent.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-serv6530/src/java/net/sf/asterisk/manager/event

Modified Files:
	ResponseEvent.java 
Log Message:
Added internalActionId attribute to ResponseEvent

Index: ResponseEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/ResponseEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ResponseEvent.java	23 Feb 2005 22:50:58 -0000	1.2
+++ ResponseEvent.java	16 Jul 2005 00:16:02 -0000	1.3
@@ -17,18 +17,18 @@
 package net.sf.asterisk.manager.event;
 
 /**
- * Abstract base class for events triggered in response to an Action.<br>
- * All ResponseEvents contain an additional action id property that links the event to the action
- * that caused it.
+ * Abstract base class for events triggered in response to a ManagerAction.<br>
+ * All ResponseEvents contain an additional action id property that links the
+ * event to the action that caused it.
  * 
  * @see net.sf.asterisk.manager.action.ManagerAction
- * 
  * @author srt
  * @version $Id$
  */
 public abstract class ResponseEvent extends ManagerEvent
 {
     private String actionId;
+    private String internalActionId;
 
     /**
      * @param source
@@ -39,7 +39,9 @@ public abstract class ResponseEvent exte
     }
 
     /**
-     * Returns the action id of the corresponding ManagerAction that caused this event.
+     * Returns the action id of the ManagerAction that caused this event.
+     * 
+     * @return the action id of the ManagerAction that caused this event.
      */
     public String getActionId()
     {
@@ -47,10 +49,38 @@ public abstract class ResponseEvent exte
     }
 
     /**
-     * Sets the action id of the corresponding ManagerAction that caused this event.
+     * Sets the action id of the ManagerAction that caused this event.
+     * 
+     * @param actionId the action id of the ManagerAction that caused this
+     *            event.
      */
     public void setActionId(String actionId)
     {
         this.actionId = actionId;
     }
+
+    /**
+     * Returns the internal action id of the ManagerAction that caused this
+     * event.
+     * 
+     * @return the internal action id of the ManagerAction that caused this
+     *         event.
+     * @since 0.2
+     */
+    public String getInternalActionId()
+    {
+        return internalActionId;
+    }
+
+    /**
+     * Sets the internal action id of the ManagerAction that caused this event.
+     * 
+     * @param internalActionId the internal action id of the ManagerAction that
+     *            caused this event.
+     * @since 0.2
+     */
+    public void setInternalActionId(String internalActionId)
+    {
+        this.internalActionId = internalActionId;
+    }
 }

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

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

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

Modified Files:
	EventBuilderImpl.java 
Log Message:
Added internalActionId attribute to ResponseEvent

Index: EventBuilderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/EventBuilderImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- EventBuilderImpl.java	15 Jul 2005 19:01:33 -0000	1.5
+++ EventBuilderImpl.java	16 Jul 2005 00:16:01 -0000	1.6
@@ -243,6 +243,9 @@ public class EventBuilderImpl implements
 
         setAttributes(event, attributes);
 
+        // ResponseEvents are sent in response to a ManagerAction if the
+        // response contains lots of data. They include the actionId of
+        // the corresponding ManagerAction.
         if (event instanceof ResponseEvent)
         {
             ResponseEvent responseEvent;
@@ -253,6 +256,7 @@ public class EventBuilderImpl implements
             if (actionId != null)
             {
                 responseEvent.setActionId(Util.stripInternalActionId(actionId));
+                responseEvent.setInternalActionId(Util.getInternalActionId(actionId));
             }
         }
 

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

[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-serv13225/src/java/net/sf/asterisk/manager/action

Modified Files:
	AgentsAction.java 
Log Message:
Added note about AgentsCompleteEvent that is sent to denote that all agents have been reported

Index: AgentsAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/AgentsAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- AgentsAction.java	15 Jul 2005 12:55:31 -0000	1.1
+++ AgentsAction.java	15 Jul 2005 19:40:24 -0000	1.2
@@ -19,7 +19,7 @@ package net.sf.asterisk.manager.action;
 /**
  * The AgentsAction requests the state of all agents.<br>
  * For each agent an AgentsEvent is generated. After the state of all agents has been
- * reported a ...CompleteEvent is generated.<br>
+ * reported an AgentsCompleteEvent is generated.<br>
  * Available since Asterisk 1.2
  * 
  * @see net.sf.asterisk.manager.event.AgentsEvent

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

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

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

Modified Files:
	EventBuilderImpl.java 
Log Message:
Added AgentsEvent and AgentsCompleteEvent after patch for Asterisk has been included in CVS-HEAD

Index: EventBuilderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/EventBuilderImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- EventBuilderImpl.java	15 Jul 2005 11:50:45 -0000	1.4
+++ EventBuilderImpl.java	15 Jul 2005 19:01:33 -0000	1.5
@@ -30,6 +30,8 @@ import net.sf.asterisk.manager.event.Age
 import net.sf.asterisk.manager.event.AgentCalledEvent;
 import net.sf.asterisk.manager.event.AgentLoginEvent;
 import net.sf.asterisk.manager.event.AgentLogoffEvent;
+import net.sf.asterisk.manager.event.AgentsCompleteEvent;
+import net.sf.asterisk.manager.event.AgentsEvent;
 import net.sf.asterisk.manager.event.AlarmClearEvent;
 import net.sf.asterisk.manager.event.AlarmEvent;
 import net.sf.asterisk.manager.event.CdrEvent;
@@ -98,6 +100,8 @@ public class EventBuilderImpl implements
         registerEventClass(AgentCalledEvent.class);
         registerEventClass(AgentLoginEvent.class);
         registerEventClass(AgentLogoffEvent.class);
+        registerEventClass(AgentsEvent.class);
+        registerEventClass(AgentsCompleteEvent.class);
         registerEventClass(AlarmEvent.class);
         registerEventClass(AlarmClearEvent.class);
         registerEventClass(CdrEvent.class);

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/event AgentsEvent.java,NONE,1.1 AgentsCompleteEvent.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-serv3811/src/java/net/sf/asterisk/manager/event

Added Files:
	AgentsEvent.java AgentsCompleteEvent.java 
Log Message:
Added AgentsEvent and AgentsCompleteEvent after patch for Asterisk has been included in CVS-HEAD

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

/**
 * An AgentsEvent is triggered for each agent in response to an AgentsAction.<br>
 * Available since Asterisk 1.2
 * 
 * @see net.sf.asterisk.manager.action.AgentsAction
 * @author srt
 * @version $Id: AgentsEvent.java,v 1.1 2005/07/15 19:01:33 srt Exp $
 * @since 0.2
 */
public class AgentsEvent extends ResponseEvent
{
    /**
     * Serial version identifier
     */
    private static final long serialVersionUID = -3619197512835308812L;
    private String agent;
    private String name;
    private String status;
    private String loggedInChan;
    private Long loggedInTime;
    private String talkingTo;

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

    /**
     * Returns the agentid.
     */
    public String getAgent()
    {
        return agent;
    }

    /**
     * Sets the agentid.
     */
    public void setAgent(String agent)
    {
        this.agent = agent;
    }

    /**
     * Returns the name of this agent.
     * 
     * @return the name of this agent
     */
    public String getName()
    {
        return name;
    }

    /**
     * Sets the name of this agent.
     * 
     * @param name the name of this agent
     */
    public void setName(String name)
    {
        this.name = name;
    }

    /**
     * Returns the status of this agent.<br>
     * This is one of
     * <dl>
     * <dt>"AGENT_LOGGEDOFF"</dt>
     * <dd>Agent isn't logged in</dd>
     * <dt>"AGENT_IDLE"</dt>
     * <dd>Agent is logged in, and waiting for call</dd>
     * <dt>"AGENT_ONCALL"</dt>
     * <dd>Agent is logged in, and on a call</dd>
     * <dt>"AGENT_UNKNOWN"</dt>
     * <dd>Don't know anything about agent. Shouldn't ever get this.</dd>
     * </dl>
     * 
     * @return the status of this agent
     */
    public String getStatus()
    {
        return status;
    }

    /**
     * Sets the status of this agent.
     * 
     * @param status the status of this agent
     */
    public void setStatus(String status)
    {
        this.status = status;
    }

    /**
     * Returns the name of channel this agent logged in from.
     * 
     * @return the name of the channel this agent logged in from or "n/a" if the
     *         agent is not logged in.
     */
    public String getLoggedInChan()
    {
        return loggedInChan;
    }

    /**
     * Sets the name of channel this agent logged in from.
     * 
     * @param loggedInChan the name of channel this agent logged in from
     */
    public void setLoggedInChan(String loggedInChan)
    {
        this.loggedInChan = loggedInChan;
    }

    /**
     * Returns the time (in seconds since 01/01/1970) when the agent logged in.
     * 
     * @return the time when the agent logged in or 0 if the user is not logged
     *         in.
     */
    public Long getLoggedInTime()
    {
        return loggedInTime;
    }

    /**
     * Sets the time when the agent logged in.
     * 
     * @param loggedInTime the time when the agent logged in
     */
    public void setLoggedInTime(Long loggedInTime)
    {
        this.loggedInTime = loggedInTime;
    }

    /**
     * Returns the numerical Caller*ID of the channel this agent is talking to.
     * 
     * @return the numerical Caller*ID of the channel this agent is talking to
     *         or "n/a" if this agent is talking to nobody.
     */
    public String getTalkingTo()
    {
        return talkingTo;
    }

    /**
     * Sets the numerical Caller*ID of the channel this agent is talking to.
     * 
     * @param talkingTo the numerical Caller*ID of the channel this agent is
     *            talking to
     */
    public void setTalkingTo(String talkingTo)
    {
        this.talkingTo = talkingTo;
    }
}

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

/**
 * An AgentsCompleteEvent is triggered after the state of all agents has been
 * reported in response to an AgentsAction.<br>
 * Available since Asterisk 1.2
 * 
 * @see net.sf.asterisk.manager.action.AgentsAction
 * @author srt
 * @version $Id: AgentsCompleteEvent.java,v 1.1 2005/07/15 19:01:33 srt Exp $
 * @since 0.2
 */
public class AgentsCompleteEvent extends ResponseEvent
{
    /**
     * Serial version identifier
     */
    private static final long serialVersionUID = -1177773673509373296L;

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

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

[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-serv21754/src/java/net/sf/asterisk/manager/action

Added Files:
	AgentsAction.java 
Log Message:
Added AgentsAction
Still needs a fix for Asterisk (include ActionId in ResponseEvent and send AgentsCompleteEvent)

--- NEW FILE: AgentsAction.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.action;

/**
 * The AgentsAction requests the state of all agents.<br>
 * For each agent an AgentsEvent is generated. After the state of all agents has been
 * reported a ...CompleteEvent is generated.<br>
 * Available since Asterisk 1.2
 * 
 * @see net.sf.asterisk.manager.event.AgentsEvent
 * @see net.sf.asterisk.manager.event.AgentsCompleteEvent
 * 
 * @author srt
 * @version $Id: AgentsAction.java,v 1.1 2005/07/15 12:55:31 srt Exp $
 * @since 0.2
 */
public class AgentsAction extends ManagerAction
{
    /**
     * Serializable version identifier
     */
    static final long serialVersionUID = -320228893513973367L;

    /**
     * Returns the name of this action, i.e. "Agents".
     */
    public String getAction()
    {
        return "Agents";
    }
}

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/event QueueStatusCompleteEvent.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-serv10442/src/java/net/sf/asterisk/manager/event

Added Files:
	QueueStatusCompleteEvent.java 
Log Message:
Added QueueStatusCompleteEvent

--- NEW FILE: QueueStatusCompleteEvent.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 QueueStatusCompleteEvent is triggered after the state of all queues has been reported in response
 * to a QueueStatusAction.<br>
 * Since Asterisk 1.2
 * 
 * @see net.sf.asterisk.manager.action.QueueStatusAction
 * 
 * @author srt
 * @version $Id: QueueStatusCompleteEvent.java,v 1.1 2005/07/15 11:50:45 srt Exp $
 * @since 0.2
 */
public class QueueStatusCompleteEvent extends ResponseEvent
{
    /**
     * Serial version identifier
     */
    private static final long serialVersionUID = -1177773673509373296L;

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

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

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

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

Modified Files:
	EventBuilderImpl.java 
Log Message:
Added QueueStatusCompleteEvent

Index: EventBuilderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/EventBuilderImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- EventBuilderImpl.java	31 Mar 2005 22:29:52 -0000	1.3
+++ EventBuilderImpl.java	15 Jul 2005 11:50:45 -0000	1.4
@@ -57,6 +57,7 @@ import net.sf.asterisk.manager.event.Que
 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.QueueStatusCompleteEvent;
 import net.sf.asterisk.manager.event.RegistryEvent;
 import net.sf.asterisk.manager.event.ReloadEvent;
 import net.sf.asterisk.manager.event.RenameEvent;
@@ -123,6 +124,7 @@ public class EventBuilderImpl implements
         registerEventClass(QueueMemberEvent.class);
         registerEventClass(QueueMemberStatusEvent.class);
         registerEventClass(QueueParamsEvent.class);
+        registerEventClass(QueueStatusCompleteEvent.class);
         registerEventClass(RegistryEvent.class);
         registerEventClass(ReloadEvent.class);
         registerEventClass(RenameEvent.class);