asterisk-java-cvs — Asterisk-Java Commit Logs

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

[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-serv6343/src/test/net/sf/asterisk/manager/impl

Modified Files:
	EventBuilderImplTest.java 
Log Message:
Added LogChannelEvent (AJ-5)

Index: EventBuilderImplTest.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/test/net/sf/asterisk/manager/impl/EventBuilderImplTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- EventBuilderImplTest.java	27 Aug 2005 02:57:54 -0000	1.6
+++ EventBuilderImplTest.java	28 Aug 2005 12:28:41 -0000	1.7
@@ -24,6 +24,7 @@ import net.sf.asterisk.manager.EventBuil
 import net.sf.asterisk.manager.event.CdrEvent;
 import net.sf.asterisk.manager.event.ChannelEvent;
 import net.sf.asterisk.manager.event.HangupEvent;
+import net.sf.asterisk.manager.event.LogChannelEvent;
 import net.sf.asterisk.manager.event.ManagerEvent;
 import net.sf.asterisk.manager.event.NewCallerIdEvent;
 import net.sf.asterisk.manager.event.NewChannelEvent;
@@ -332,7 +333,6 @@ public class EventBuilderImplTest extend
                 ((NewCallerIdEvent) event).getCidCallingPresTxt());
     }
 
-
     public void testBuildEventWithInvalidCidCallingPres()
     {
         Map properties = new HashMap();
@@ -348,4 +348,20 @@ public class EventBuilderImplTest extend
         assertNull("CidCallingPresTxt property not set correctly (must be null)",
                 ((NewCallerIdEvent) event).getCidCallingPresTxt());
     }
+
+    public void testBuildEventWithReason()
+    {
+        Map properties = new HashMap();
+        ManagerEvent event;
+
+        properties.put("event", "LogChannel");
+        properties.put("reason", "123 - a reason");
+        event = eventBuilder.buildEvent(this, properties);
+
+        assertNotNull(event);
+        assertEquals("Reason property not set correctly", new Integer(123),
+                ((LogChannelEvent) event).getReason());
+        assertEquals("ReasonTxt property not set correctly", "a reason", 
+                ((LogChannelEvent) event).getReasonTxt());
+    }
 }

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

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

Modified Files:
	EventBuilderImpl.java 
Log Message:
Added LogChannelEvent (AJ-5)

Index: EventBuilderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/EventBuilderImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -p -r1.14 -r1.15
--- EventBuilderImpl.java	28 Aug 2005 09:45:19 -0000	1.14
+++ EventBuilderImpl.java	28 Aug 2005 12:28:41 -0000	1.15
@@ -48,6 +48,7 @@ import net.sf.asterisk.manager.event.Hol
 import net.sf.asterisk.manager.event.JoinEvent;
 import net.sf.asterisk.manager.event.LeaveEvent;
 import net.sf.asterisk.manager.event.LinkEvent;
+import net.sf.asterisk.manager.event.LogChannelEvent;
 import net.sf.asterisk.manager.event.ManagerEvent;
 import net.sf.asterisk.manager.event.MeetMeJoinEvent;
 import net.sf.asterisk.manager.event.MeetMeLeaveEvent;
@@ -133,6 +134,7 @@ public class EventBuilderImpl implements
         registerEventClass(JoinEvent.class);
         registerEventClass(LeaveEvent.class);
         registerEventClass(LinkEvent.class);
+        registerEventClass(LogChannelEvent.class);
         registerEventClass(MeetMeJoinEvent.class);
         registerEventClass(MeetMeLeaveEvent.class);
         registerEventClass(MessageWaitingEvent.class);

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

Added Files:
	LogChannelEvent.java 
Log Message:
Added LogChannelEvent (AJ-5)

--- NEW FILE: LogChannelEvent.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 LogChannelEvent is triggered when logging is turned on or off.<br>
 * It is implemented in <code>logger.c</code>
 * 
 * @author srt
 * @version $Id: LogChannelEvent.java,v 1.1 2005/08/28 12:28:41 srt Exp $
 */
public class LogChannelEvent extends ManagerEvent
{
    /**
     * Serializable version identifier
     */
    static final long serialVersionUID = 650153034857116588L;

    private String channel;
    private Boolean enabled;
    private Integer reason;
    private String reasonTxt;

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

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

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

    /**
     * Returns if logging has been enabled or disabled.
     * 
     * @return Boolean.TRUE if logging has been enabled, Boolean.FALSE if it has
     *         been disabled.
     */
    public Boolean getEnabled()
    {
        return enabled;
    }

    /**
     * Sets if logging has been enabled or disabled.
     * 
     * @param enabled Boolean.TRUE if logging has been enabled, Boolean.FALSE if
     *            it has been disabled.
     */
    public void setEnabled(Boolean enabled)
    {
        this.enabled = enabled;
    }

    /**
     * Returns the reason code for disabling logging.
     * 
     * @return the reason code for disabling logging.
     */
    public Integer getReason()
    {
        return reason;
    }

    /**
     * Returns the textual representation of the reason for disabling logging.
     * 
     * @return the textual representation of the reason for disabling logging.
     */
    public String getReasonTxt()
    {
        return reasonTxt;
    }

    /**
     * Sets the reason for disabling logging.
     * 
     * @param s the reason in the form "%d - %s".
     */
    public void setReason(String s)
    {
        int spaceIdx;

        if (s == null)
        {
            return;
        }

        spaceIdx = s.indexOf(' ');
        if (spaceIdx <= 0)
        {
            spaceIdx = s.length();
        }

        try
        {
            this.reason = new Integer(s.substring(0, spaceIdx));
        }
        catch (NumberFormatException e)
        {
            return;
        }

        if (s.length() > spaceIdx + 3)
        {
            this.reasonTxt = s.substring(spaceIdx + 3, s.length());
        }
    }
}

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/event DNDStateEvent.java,1.2,1.3 HoldEvent.java,1.1,1.2 UnholdEvent.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-serv5109/src/java/net/sf/asterisk/manager/event

Modified Files:
	DNDStateEvent.java HoldEvent.java UnholdEvent.java 
Log Message:
Fixed incorrect abstract modifier

Index: DNDStateEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/DNDStateEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- DNDStateEvent.java	27 Aug 2005 11:33:08 -0000	1.2
+++ DNDStateEvent.java	28 Aug 2005 12:20:53 -0000	1.3
@@ -26,7 +26,7 @@ package net.sf.asterisk.manager.event;
  * @version $Id$
  * @since 0.2
  */
-public abstract class DNDStateEvent extends ManagerEvent
+public class DNDStateEvent extends ManagerEvent
 {
     /**
      * Serializable version identifier

Index: HoldEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/HoldEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- HoldEvent.java	27 Aug 2005 11:20:24 -0000	1.1
+++ HoldEvent.java	28 Aug 2005 12:20:53 -0000	1.2
@@ -27,7 +27,7 @@ package net.sf.asterisk.manager.event;
  * @version $Id$
  * @since 0.2
  */
-public abstract class HoldEvent extends ManagerEvent
+public class HoldEvent extends ManagerEvent
 {
     /**
      * Serializable version identifier

Index: UnholdEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/UnholdEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- UnholdEvent.java	27 Aug 2005 11:20:24 -0000	1.1
+++ UnholdEvent.java	28 Aug 2005 12:20:53 -0000	1.2
@@ -27,7 +27,7 @@ package net.sf.asterisk.manager.event;
  * @version $Id$
  * @since 0.2
  */
-public abstract class UnholdEvent extends ManagerEvent
+public class UnholdEvent extends ManagerEvent
 {
     /**
      * Serializable version identifier

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/event PeerStatusEvent.java,1.2,1.3 RegistryEvent.java,1.6,1.7 AbstractMemberEvent.java,1.1,NONE

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

Modified Files:
	PeerStatusEvent.java RegistryEvent.java 
Removed Files:
	AbstractMemberEvent.java 
Log Message:
Some cleanup

Index: PeerStatusEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/PeerStatusEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- PeerStatusEvent.java	23 Feb 2005 22:50:58 -0000	1.2
+++ PeerStatusEvent.java	28 Aug 2005 10:37:55 -0000	1.3
@@ -70,8 +70,8 @@ public class PeerStatusEvent extends Man
      * <li>Unregistered</li>
      * <li>Reachable</li>
      * <li>Lagged</li>
-     * <li>Rejected (IAX only)</li>
      * <li>Unreachable</li>
+     * <li>Rejected (IAX only)</li>
      * </ul>
      */
     public String getPeerStatus()

Index: RegistryEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/RegistryEvent.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- RegistryEvent.java	27 Aug 2005 03:48:26 -0000	1.6
+++ RegistryEvent.java	28 Aug 2005 10:37:55 -0000	1.7
@@ -114,13 +114,14 @@ public class RegistryEvent extends Manag
      * For sip this may be one of (not sure if all of these are exposed via the
      * manager api, at least "Registered" and "Timeout" are used though)
      * <ul>
+     * <li>Registered</li>
      * <li>Unregistered</li>
      * <li>Request Sent</li>
      * <li>Auth. Sent</li>
-     * <li>Registered</li>
      * <li>Rejected</li>
      * <li>Timeout</li>
      * <li>No Authentication</li>
+     * <li>Unreachable</li>
      * </ul>
      * IAX2 only uses
      * <ul>
@@ -144,7 +145,8 @@ public class RegistryEvent extends Manag
     /**
      * Returns the cause of a rejected registration.
      * 
-     * @return the cause of a rejected registration.
+     * @return the cause of a rejected registration or "&lt;unknown&gt;" if the
+     *         cause is unknown.
      * @since 0.2
      */
     public String getCause()

--- AbstractMemberEvent.java DELETED ---

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/event QueueMemberPausedEvent.java,NONE,1.1 AbstractAgentEvent.java,NONE,1.1 QueueMemberAddedEvent.java,NONE,1.1 QueueMemberRemovedEvent.java,NONE,1.1 AbstractQueueMemberEvent.java,NONE,1.1 AgentCompleteEvent.java,1.1,1.2 AgentDumpEvent.java,1.1,1.2 AgentConnectEvent.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-serv14230/src/java/net/sf/asterisk/manager/event

Modified Files:
	AgentCompleteEvent.java AgentDumpEvent.java 
	AgentConnectEvent.java 
Added Files:
	QueueMemberPausedEvent.java AbstractAgentEvent.java 
	QueueMemberAddedEvent.java QueueMemberRemovedEvent.java 
	AbstractQueueMemberEvent.java 
Log Message:
Added new events for app_queue: QueueMemberRemoved, QueueMemberAdded, QueueMemberPaused (AJ-7)
Updated events for AgentDump, AgentConnect, AgentComplete

--- NEW FILE: QueueMemberPausedEvent.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 QueueMemberPausedEvent is triggered when a queue member is paused or
 * unpaused.<br>
 * It is implemented in <code>apps/app_queue.c</code>.<br>
 * Available since Asterisk 1.2
 * 
 * @author srt
 * @version $Id: QueueMemberPausedEvent.java,v 1.1 2005/08/28 09:45:18 srt Exp $
 * @since 0.2
 */
public class QueueMemberPausedEvent extends AbstractQueueMemberEvent
{
    /**
     * Serial version identifier.
     */
    private static final long serialVersionUID = 2108033737226142194L;

    private Boolean paused;

    public QueueMemberPausedEvent(Object source)
    {
        super(source);
    }

    /**
     * Returns if this queue member is paused (not accepting calls).<br>
     * 
     * @return <code>Boolean.TRUE</code> if this member has been paused or
     *         <code>Boolean.FALSE</code> if not.
     */
    public Boolean getPaused()
    {
        return paused;
    }

    /**
     * Sets if this member is paused.
     * 
     * @param paused <code>Boolean.TRUE</code> if this member has been paused
     *            or <code>Boolean.FALSE</code> if not.
     */
    public void setPaused(Boolean paused)
    {
        this.paused = paused;
    }
}

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

/**
 * Abstract base class for several agent related events.
 * 
 * @author srt
 * @version $Id: AbstractAgentEvent.java,v 1.1 2005/08/28 09:45:18 srt Exp $
 * @since 0.2
 */
public abstract class AbstractAgentEvent extends ManagerEvent
{
    /**
     * Serializable version identifier
     */
    private static final long serialVersionUID = -7437833328723536814L;
    private String channel;
    private String uniqueId;
    private String queue;
    private String member;

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

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

    /**
     * Sets the name of the channel.
     */
    public void setChannel(String channel)
    {
        this.channel = channel;
    }

    /**
     * Returns the unique id of the channel.
     * 
     * @return the unique id of the channel.
     */
    public String getUniqueId()
    {
        return uniqueId;
    }

    /**
     * Sets the unique id of the channel.
     * 
     * @param uniqueId the unique id of the channel.
     */
    public void setUniqueId(String uniqueId)
    {
        this.uniqueId = uniqueId;
    }

    /**
     * Returns the name of the queue.
     * 
     * @return the name of the queue.
     */
    public String getQueue()
    {
        return queue;
    }

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

    /**
     * Returns the name of the member's interface.
     * 
     * @return the name of the member's interface.
     */
    public String getMember()
    {
        return member;
    }

    /**
     * Sets the name of the member's interface.
     * 
     * @param member the name of the member's interface.
     */
    public void setMember(String member)
    {
        this.member = member;
    }
}

--- NEW FILE: QueueMemberAddedEvent.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 QueueMemberAddedEvent is triggered when a queue member is added to a queue.<br>
 * It is implemented in <code>apps/app_queue.c</code>.<br>
 * Available since Asterisk 1.2
 * 
 * @author srt
 * @version $Id: QueueMemberAddedEvent.java,v 1.1 2005/08/28 09:45:19 srt Exp $
 * @since 0.2
 */
public class QueueMemberAddedEvent extends AbstractQueueMemberEvent
{
    /**
     * Serial version identifier.
     */
    private static final long serialVersionUID = 2108033737226142194L;

    private String membership;
    private Integer penalty;
    private Integer callsTaken;
    private Long lastCall;
    private Integer status;
    private Boolean paused;

    public QueueMemberAddedEvent(Object source)
    {
        super(source);
    }

    /**
     * Returns if the added member is a dynamic or static queue member.
     * 
     * @return "dynamic" if the added member is a dynamic queue member, "static"
     *         if the added member is a static queue member.
     */
    public String getMembership()
    {
        return membership;
    }

    /**
     * Sets if the added member is a dynamic or static queue member.
     * 
     * @param membership "dynamic" if the added member is a dynamic queue
     *            member, "static" if the added member is a static queue member.
     */
    public void setMembership(String membership)
    {
        this.membership = membership;
    }

    /**
     * Returns the penalty for the added member. When calls are distributed
     * members with higher penalties are considered last.
     * 
     * @return the penalty for the added member.
     */
    public Integer getPenalty()
    {
        return penalty;
    }

    /**
     * Sets the penalty for this member.
     * 
     * @param penalty the penalty for this member.
     */
    public void setPenalty(Integer penalty)
    {
        this.penalty = penalty;
    }

    /**
     * Returns the number of calls answered by the member.
     * 
     * @return the number of calls answered by the member.
     */
    public Integer getCallsTaken()
    {
        return callsTaken;
    }

    /**
     * Sets the number of calls answered by the added member.
     * 
     * @param callsTaken the number of calls answered by the added member.
     */
    public void setCallsTaken(Integer callsTaken)
    {
        this.callsTaken = callsTaken;
    }

    /**
     * Returns the time the last successful call answered by the added member
     * was hungup.
     * 
     * @return the time (in seconds since 01/01/1970) the last successful call
     *         answered by the added member was hungup.
     */
    public Long getLastCall()
    {
        return lastCall;
    }

    /**
     * Sets the time the last successful call answered by this member was
     * hungup.
     * 
     * @param lastCall the time (in seconds since 01/01/1970) the last
     *            successful call answered by the added member was hungup.
     */
    public void setLastCall(Long lastCall)
    {
        this.lastCall = lastCall;
    }

    /**
     * Returns the status of this queue member.<br>
     * Valid status codes are:
     * <dl>
     * <dt>AST_DEVICE_UNKNOWN (0)</dt>
     * <dd>Queue member is available</dd>
     * <dt>AST_DEVICE_NOT_INUSE (1)</dt>
     * <dd>?</dd>
     * <dt>AST_DEVICE_INUSE (2)</dt>
     * <dd>?</dd>
     * <dt>AST_DEVICE_BUSY (3)</dt>
     * <dd>?</dd>
     * <dt>AST_DEVICE_INVALID (4)</dt>
     * <dd>?</dd>
     * <dt>AST_DEVICE_UNAVAILABLE (5)</dt>
     * <dd>?</dd>
     * </dl>
     * 
     * @return the status of this queue member.
     */
    public Integer getStatus()
    {
        return status;
    }

    /**
     * Sets the status of this queue member.
     * 
     * @param the status of this queue member
     */
    public void setStatus(Integer status)
    {
        this.status = status;
    }

    /**
     * Returns if this queue member is paused (not accepting calls).<br>
     * 
     * @return <code>Boolean.TRUE</code> if this member has been paused or
     *         <code>Boolean.FALSE</code> if not.
     */
    public Boolean getPaused()
    {
        return paused;
    }

    /**
     * Sets if this member is paused.
     * 
     * @param paused <code>Boolean.TRUE</code> if this member has been paused
     *            or <code>Boolean.FALSE</code> if not.
     */
    public void setPaused(Boolean paused)
    {
        this.paused = paused;
    }
}

--- NEW FILE: QueueMemberRemovedEvent.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 QueueMemberRemovedEvent is triggered when a queue member is removed from a
 * queue.<br>
 * It is implemented in <code>apps/app_queue.c</code>.<br>
 * Available since Asterisk 1.2
 * 
 * @author srt
 * @version $Id: QueueMemberRemovedEvent.java,v 1.1 2005/08/28 09:45:19 srt Exp $
 * @since 0.2
 */
public class QueueMemberRemovedEvent extends AbstractQueueMemberEvent
{
    /**
     * Serial version identifier.
     */
    private static final long serialVersionUID = 2108033737226142194L;

    public QueueMemberRemovedEvent(Object source)
    {
        super(source);
    }
}

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

/**
 * Abstract base class for several queue member related events.
 * 
 * @author srt
 * @version $Id: AbstractQueueMemberEvent.java,v 1.1 2005/08/28 09:45:19 srt Exp $
 * @since 0.2
 */
public abstract class AbstractQueueMemberEvent extends ManagerEvent
{
    /**
     * Serializable version identifier
     */
    private static final long serialVersionUID = -7437833328723536814L;
    private String queue;
    private String location;

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

    /**
     * Returns the name of the queue.
     * 
     * @return the name of the queue.
     */
    public String getQueue()
    {
        return queue;
    }

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

    /**
     * Returns the name of the member's interface.<br>
     * E.g. the channel name or agent group.
     * 
     * @return the name of the member's interface.
     */
    public String getLocation()
    {
        return location;
    }

    /**
     * Sets the name of the member's interface.
     * 
     * @param member the name of the member's interface.
     */
    public void setLocation(String member)
    {
        this.location = member;
    }
}

Index: AgentCompleteEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/AgentCompleteEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- AgentCompleteEvent.java	27 Aug 2005 21:39:23 -0000	1.1
+++ AgentCompleteEvent.java	28 Aug 2005 09:45:18 -0000	1.2
@@ -26,7 +26,7 @@ package net.sf.asterisk.manager.event;
  * @version $Id$
  * @since 0.2
  */
-public class AgentCompleteEvent extends AbstractMemberEvent
+public class AgentCompleteEvent extends AbstractAgentEvent
 {
     /**
      * Serial version identifier.

Index: AgentDumpEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/AgentDumpEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- AgentDumpEvent.java	27 Aug 2005 21:39:23 -0000	1.1
+++ AgentDumpEvent.java	28 Aug 2005 09:45:19 -0000	1.2
@@ -26,7 +26,7 @@ package net.sf.asterisk.manager.event;
  * @version $Id$
  * @since 0.2
  */
-public class AgentDumpEvent extends AbstractMemberEvent
+public class AgentDumpEvent extends AbstractAgentEvent
 {
     /**
      * Serial version identifier.

Index: AgentConnectEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/AgentConnectEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- AgentConnectEvent.java	27 Aug 2005 21:39:23 -0000	1.1
+++ AgentConnectEvent.java	28 Aug 2005 09:45:19 -0000	1.2
@@ -25,7 +25,7 @@ package net.sf.asterisk.manager.event;
  * @version $Id$
  * @since 0.2
  */
-public class AgentConnectEvent extends AbstractMemberEvent
+public class AgentConnectEvent extends AbstractAgentEvent
 {
     /**
      * Serial version identifier.

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

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

Modified Files:
	EventBuilderImpl.java 
Log Message:
Added new events for app_queue: QueueMemberRemoved, QueueMemberAdded, QueueMemberPaused (AJ-7)
Updated events for AgentDump, AgentConnect, AgentComplete

Index: EventBuilderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/EventBuilderImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -p -r1.13 -r1.14
--- EventBuilderImpl.java	27 Aug 2005 12:08:59 -0000	1.13
+++ EventBuilderImpl.java	28 Aug 2005 09:45:19 -0000	1.14
@@ -28,6 +28,9 @@ import net.sf.asterisk.manager.Util;
 import net.sf.asterisk.manager.event.AgentCallbackLoginEvent;
 import net.sf.asterisk.manager.event.AgentCallbackLogoffEvent;
 import net.sf.asterisk.manager.event.AgentCalledEvent;
+import net.sf.asterisk.manager.event.AgentCompleteEvent;
+import net.sf.asterisk.manager.event.AgentConnectEvent;
+import net.sf.asterisk.manager.event.AgentDumpEvent;
 import net.sf.asterisk.manager.event.AgentLoginEvent;
 import net.sf.asterisk.manager.event.AgentLogoffEvent;
 import net.sf.asterisk.manager.event.AgentsCompleteEvent;
@@ -63,7 +66,10 @@ import net.sf.asterisk.manager.event.Pee
 import net.sf.asterisk.manager.event.PeerStatusEvent;
 import net.sf.asterisk.manager.event.PeerlistCompleteEvent;
 import net.sf.asterisk.manager.event.QueueEntryEvent;
+import net.sf.asterisk.manager.event.QueueMemberAddedEvent;
 import net.sf.asterisk.manager.event.QueueMemberEvent;
+import net.sf.asterisk.manager.event.QueueMemberPausedEvent;
+import net.sf.asterisk.manager.event.QueueMemberRemovedEvent;
 import net.sf.asterisk.manager.event.QueueMemberStatusEvent;
 import net.sf.asterisk.manager.event.QueueParamsEvent;
 import net.sf.asterisk.manager.event.QueueStatusCompleteEvent;
@@ -80,7 +86,6 @@ import net.sf.asterisk.manager.event.Unp
 import net.sf.asterisk.manager.event.UserEvent;
 import net.sf.asterisk.manager.event.ZapShowChannelsCompleteEvent;
 import net.sf.asterisk.manager.event.ZapShowChannelsEvent;
-
 import net.sf.asterisk.util.AstUtil;
 import net.sf.asterisk.util.Log;
 import net.sf.asterisk.util.LogFactory;
@@ -108,6 +113,9 @@ public class EventBuilderImpl implements
         registerEventClass(AgentCallbackLoginEvent.class);
         registerEventClass(AgentCallbackLogoffEvent.class);
         registerEventClass(AgentCalledEvent.class);
+        registerEventClass(AgentConnectEvent.class);
+        registerEventClass(AgentCompleteEvent.class);
+        registerEventClass(AgentDumpEvent.class);
         registerEventClass(AgentLoginEvent.class);
         registerEventClass(AgentLogoffEvent.class);
         registerEventClass(AgentsEvent.class);
@@ -142,7 +150,10 @@ public class EventBuilderImpl implements
         registerEventClass(PeerlistCompleteEvent.class);
         registerEventClass(PeerStatusEvent.class);
         registerEventClass(QueueEntryEvent.class);
+        registerEventClass(QueueMemberAddedEvent.class);
         registerEventClass(QueueMemberEvent.class);
+        registerEventClass(QueueMemberPausedEvent.class);
+        registerEventClass(QueueMemberRemovedEvent.class);
         registerEventClass(QueueMemberStatusEvent.class);
         registerEventClass(QueueParamsEvent.class);
         registerEventClass(QueueStatusCompleteEvent.class);

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

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

Modified Files:
	QueueMemberEvent.java 
Log Message:
Fixed spelling of penalty

Index: QueueMemberEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/QueueMemberEvent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- QueueMemberEvent.java	15 Jul 2005 11:44:23 -0000	1.3
+++ QueueMemberEvent.java	28 Aug 2005 09:39:50 -0000	1.4
@@ -17,12 +17,11 @@
 package net.sf.asterisk.manager.event;
 
 /**
- * A QueueMemberEvent is triggered in response to a QueueStatusAction and contains information about
- * a member of a queue.<br>
+ * A QueueMemberEvent is triggered in response to a QueueStatusAction and
+ * contains information about a member of a queue.<br>
  * It is implemented in <code>apps/app_queue.c</code>
  * 
  * @see net.sf.asterisk.manager.action.QueueStatusAction
- * 
  * @author srt
  * @version $Id$
  */
@@ -51,6 +50,8 @@ public class QueueMemberEvent extends Re
 
     /**
      * Returns the name of the queue.
+     * 
+     * @return the name of the queue.
      */
     public String getQueue()
     {
@@ -59,6 +60,8 @@ public class QueueMemberEvent extends Re
 
     /**
      * Sets the name of the queue.
+     * 
+     * @param queue the name of the queue.
      */
     public void setQueue(String queue)
     {
@@ -66,8 +69,10 @@ public class QueueMemberEvent extends Re
     }
 
     /**
-     * Returns the location of this member.<br>
+     * Returns the name of the member's interface.<br>
      * E.g. the channel name or agent group.
+     * 
+     * @return the name of the member's interface.
      */
     public String getLocation()
     {
@@ -75,7 +80,9 @@ public class QueueMemberEvent extends Re
     }
 
     /**
-     * Sets the location of this member.
+     * Sets the name of the member's interface.
+     * 
+     * @param member the name of the member's interface.
      */
     public void setLocation(String location)
     {
@@ -83,9 +90,12 @@ public class QueueMemberEvent extends Re
     }
 
     /**
-     * Returns "dynamic" if this member has been dynamically added by the QueueAdd command (in the
-     * dialplan or via the manager api) or "static" if this member is has been statically defined in
-     * <code>queues.conf</code>.
+     * Returns if this member has been dynamically added by the QueueAdd command
+     * (in the dialplan or via the Manager API) or if this member is has been
+     * statically defined in <code>queues.conf</code>.
+     * 
+     * @return "dynamic" if the added member is a dynamic queue member, "static"
+     *         if the added member is a static queue member.
      */
     public String getMembership()
     {
@@ -95,7 +105,8 @@ public class QueueMemberEvent extends Re
     /**
      * Sets if this member has been dynamically or statically added.
      * 
-     * @param membership either "dynamic" or "static".
+     * @param membership "dynamic" if the added member is a dynamic queue
+     *            member, "static" if the added member is a static queue member.
      */
     public void setMembership(String membership)
     {
@@ -103,7 +114,10 @@ public class QueueMemberEvent extends Re
     }
 
     /**
-     * Returns the penality of this member.
+     * Returns the penalty for the added member. When calls are distributed
+     * members with higher penalties are considered last.
+     * 
+     * @return the penalty for the added member.
      */
     public Integer getPenalty()
     {
@@ -111,15 +125,19 @@ public class QueueMemberEvent extends Re
     }
 
     /**
-     * Sets the penality of this member.
+     * Sets the penalty for this member.
+     * 
+     * @param penalty the penalty for this member.
      */
-    public void setPenalty(Integer penality)
+    public void setPenalty(Integer penalty)
     {
-        this.penalty = penality;
+        this.penalty = penalty;
     }
 
     /**
-     * Returns the number of calls answered by this member.
+     * Returns the number of calls answered by the member.
+     * 
+     * @return the number of calls answered by the member.
      */
     public Integer getCallsTaken()
     {
@@ -127,7 +145,9 @@ public class QueueMemberEvent extends Re
     }
 
     /**
-     * Sets the number of calls answered by this member.
+     * Sets the number of calls answered by the added member.
+     * 
+     * @param callsTaken the number of calls answered by the added member.
      */
     public void setCallsTaken(Integer callsTaken)
     {
@@ -135,8 +155,11 @@ public class QueueMemberEvent extends Re
     }
 
     /**
-     * Returns the time (in seconds since 01/01/1970) the last 
-     * successful call answered by this member was hungup.
+     * Returns the time the last successful call answered by the added member
+     * was hungup.
+     * 
+     * @return the time (in seconds since 01/01/1970) the last successful call
+     *         answered by the added member was hungup.
      */
     public Long getLastCall()
     {
@@ -144,8 +167,11 @@ public class QueueMemberEvent extends Re
     }
 
     /**
-     * Sets the time (in seconds since 01/01/1970) the last successful call answered by this member
-     * was hungup.
+     * Sets the time the last successful call answered by this member was
+     * hungup.
+     * 
+     * @param lastCall the time (in seconds since 01/01/1970) the last
+     *            successful call answered by the added member was hungup.
      */
     public void setLastCall(Long lastCall)
     {
@@ -171,9 +197,8 @@ public class QueueMemberEvent extends Re
      * <dd>?</dd>
      * </dl>
      * 
-     * @return the status of this queue member or <code>null</code>
-     *         if this attribute is not supported by your version of 
-     *         Asterisk.
+     * @return the status of this queue member or <code>null</code> if this
+     *         attribute is not supported by your version of Asterisk.
      * @since 0.2
      */
     public Integer getStatus()
@@ -197,9 +222,9 @@ public class QueueMemberEvent extends Re
      * Available since Asterisk 1.2.
      * 
      * @return <code>Boolean.TRUE</code> if this member has been paused,
-     *         <code>Boolean.FALSE</code> if not or <code>null</code> 
-     *         if pausing is not supported by your version of Asterisk.
-     * @since 0.2 
+     *         <code>Boolean.FALSE</code> if not or <code>null</code> if
+     *         pausing is not supported by your version of Asterisk.
+     * @since 0.2
      */
     public Boolean getPaused()
     {
@@ -208,6 +233,7 @@ public class QueueMemberEvent extends Re
 
     /**
      * Sets if this member has been paused.
+     * 
      * @since 0.2
      */
     public void setPaused(Boolean paused)

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

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

Modified Files:
	QueueAddAction.java 
Log Message:
Fixed spelling of penalty

Index: QueueAddAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/QueueAddAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- QueueAddAction.java	27 Aug 2005 09:42:34 -0000	1.5
+++ QueueAddAction.java	28 Aug 2005 09:28:59 -0000	1.6
@@ -31,7 +31,7 @@ public class QueueAddAction extends Abst
     private static final long serialVersionUID = -7022129266332219953L;
     private String queue;
     private String iface;
-    private Integer penality;
+    private Integer penalty;
     private Boolean paused;
 
     /**
@@ -59,21 +59,21 @@ public class QueueAddAction extends Abst
 
     /**
      * Creates a new QueueAddAction that adds a new member on the given
-     * interface to the given queue with the given penality.
+     * interface to the given queue with the given penalty.
      * 
      * @param queue the name of the queue the new member will be added to
      * @param iface Sets the interface to add. To add a specific channel just
      *            use the channel name, e.g. "SIP/1234".
-     * @param penality the penality for this member. The penality must be a
-     *            positive integer or 0 for no penality. When calls are
+     * @param penalty the penalty for this member. The penalty must be a
+     *            positive integer or 0 for no penalty. When calls are
      *            distributed members with higher penalties are considered last.
      * @since 0.2
      */
-    public QueueAddAction(String queue, String iface, Integer penality)
+    public QueueAddAction(String queue, String iface, Integer penalty)
     {
         this.queue = queue;
         this.iface = iface;
-        this.penality = penality;
+        this.penalty = penalty;
     }
 
     /**
@@ -120,23 +120,23 @@ public class QueueAddAction extends Abst
     }
 
     /**
-     * Returns the penality for this member.
+     * Returns the penalty for this member.
      */
-    public Integer getPenality()
+    public Integer getPenalty()
     {
-        return penality;
+        return penalty;
     }
 
     /**
-     * Sets the penality for this member.<br>
-     * The penality must be a positive integer or 0 for no penality. If it is
+     * Sets the penalty for this member.<br>
+     * The penalty must be a positive integer or 0 for no penalty. If it is
      * not set 0 is assumed.<br>
      * When calls are distributed members with higher penalties are considered
      * last.
      */
-    public void setPenality(Integer penality)
+    public void setPenalty(Integer penalty)
     {
-        this.penality = penality;
+        this.penalty = penalty;
     }
 
     /**

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/event AgentCompleteEvent.java,NONE,1.1 AbstractMemberEvent.java,NONE,1.1 AgentDumpEvent.java,NONE,1.1 AgentConnectEvent.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-serv25869/src/java/net/sf/asterisk/manager/event

Added Files:
	AgentCompleteEvent.java AbstractMemberEvent.java 
	AgentDumpEvent.java AgentConnectEvent.java 
Log Message:
 Added new events for app_queue: AgentDump, AgentConnect, AgentComplete (AJ-7)

--- NEW FILE: AgentCompleteEvent.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 AgentCompleteEvent is triggered when at the end of a call if the caller
 * was connected to an agent.<br>
 * It is implemented in <code>apps/app_queue.c</code>.<br>
 * Available since Asterisk 1.2
 * 
 * @author srt
 * @version $Id: AgentCompleteEvent.java,v 1.1 2005/08/27 21:39:23 srt Exp $
 * @since 0.2
 */
public class AgentCompleteEvent extends AbstractMemberEvent
{
    /**
     * Serial version identifier.
     */
    private static final long serialVersionUID = 2108033737226142194L;

    private Long holdTime;
    private Long talkTime;
    private String reason;

    public AgentCompleteEvent(Object source)
    {
        super(source);
    }

    /**
     * Returns the amount of time the caller was on hold.
     * 
     * @return the amount of time the caller was on hold in seconds.
     */
    public Long getHoldTime()
    {
        return holdTime;
    }

    /**
     * Sets the amount of time the caller was on hold.
     * 
     * @param holdtime the amount of time the caller was on hold in seconds.
     */
    public void setHoldTime(Long holdtime)
    {
        this.holdTime = holdtime;
    }

    /**
     * Returns the amount of time the caller talked to the agent.
     * 
     * @return the amount of time the caller talked to the agent in seconds.
     */
    public Long getTalkTime()
    {
        return talkTime;
    }

    /**
     * Sets the amount of time the caller talked to the agent.
     * 
     * @param talkTime the amount of time the caller talked to the agent in
     *            seconds.
     */
    public void setTalkTime(Long talkTime)
    {
        this.talkTime = talkTime;
    }

    /**
     * Returns if the agent or the caller terminated the call.
     * 
     * @return "agent" if the agent terminated the call, "caller" if the caller
     *         terminated the call.
     */
    public String getReason()
    {
        return reason;
    }

    /**
     * Sets if the agent or the caller terminated the call.
     * 
     * @param reason "agent" if the agent terminated the call, "caller" if the
     *            caller terminated the call.
     */
    public void setReason(String reason)
    {
        this.reason = reason;
    }
}

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

/**
 * Abstract base class for several queue member related events.
 * 
 * @author srt
 * @version $Id: AbstractMemberEvent.java,v 1.1 2005/08/27 21:39:23 srt Exp $
 * @since 0.2
 */
public abstract class AbstractMemberEvent extends ManagerEvent
{
    /**
     * Serializable version identifier
     */
    private static final long serialVersionUID = -7437833328723536814L;
    private String channel;
    private String uniqueId;
    private String queue;
    private String member;

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

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

    /**
     * Sets the name of the channel.
     */
    public void setChannel(String channel)
    {
        this.channel = channel;
    }

    /**
     * Returns the unique id of the channel.
     * 
     * @return the unique id of the channel.
     */
    public String getUniqueId()
    {
        return uniqueId;
    }

    /**
     * Sets the unique id of the channel.
     * 
     * @param uniqueId the unique id of the channel.
     */
    public void setUniqueId(String uniqueId)
    {
        this.uniqueId = uniqueId;
    }

    /**
     * Returns the name of the queue.
     * 
     * @return the name of the queue.
     */
    public String getQueue()
    {
        return queue;
    }

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

    /**
     * Returns the name of the member's interface.
     * 
     * @return the name of the member's interface.
     */
    public String getMember()
    {
        return member;
    }

    /**
     * Sets the name of the member's interface.
     * 
     * @param member the name of the member's interface.
     */
    public void setMember(String member)
    {
        this.member = member;
    }
}

--- NEW FILE: AgentDumpEvent.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 AgentDumpEvent is triggered when an agent dumps the caller while listening
 * to the queue announcement.<br>
 * It is implemented in <code>apps/app_queue.c</code>.<br>
 * Available since Asterisk 1.2
 * 
 * @author srt
 * @version $Id: AgentDumpEvent.java,v 1.1 2005/08/27 21:39:23 srt Exp $
 * @since 0.2
 */
public class AgentDumpEvent extends AbstractMemberEvent
{
    /**
     * Serial version identifier.
     */
    private static final long serialVersionUID = 2108033737226142194L;

    public AgentDumpEvent(Object source)
    {
        super(source);
    }
}

--- NEW FILE: AgentConnectEvent.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 AgentConnectEvent is triggered when a caller is connected to an agent.<br>
 * It is implemented in <code>apps/app_queue.c</code>.<br>
 * Available since Asterisk 1.2
 * 
 * @author srt
 * @version $Id: AgentConnectEvent.java,v 1.1 2005/08/27 21:39:23 srt Exp $
 * @since 0.2
 */
public class AgentConnectEvent extends AbstractMemberEvent
{
    /**
     * Serial version identifier.
     */
    private static final long serialVersionUID = 2108033737226142194L;

    private Long holdTime;

    public AgentConnectEvent(Object source)
    {
        super(source);
    }

    /**
     * Returns the amount of time the caller was on hold.
     * 
     * @return the amount of time the caller was on hold in seconds.
     */
    public Long getHoldTime()
    {
        return holdTime;
    }

    /**
     * Sets the amount of time the caller was on hold.
     * 
     * @param holdtime the amount of time the caller was on hold in seconds.
     */
    public void setHoldTime(Long holdtime)
    {
        this.holdTime = holdtime;
    }
}

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

Added Files:
	AbstractParkedCallEvent.java 
Log Message:
Added AbstractParkedCallEvent

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

/**
 * Abstract base class for several call parking related events.
 * 
 * @author srt
 * @version $Id: AbstractParkedCallEvent.java,v 1.1 2005/08/27 16:16:45 srt Exp $
 * @since 0.2
 */
public abstract class AbstractParkedCallEvent extends ManagerEvent
{
    /**
     * Serializable version identifier
     */
    private static final long serialVersionUID = -7437833328723536814L;
    private String exten;
    private String channel;
    private String callerId;
    private String callerIdName;

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

    /**
     * Returns the extension the channel is or was parked at.
     */
    public String getExten()
    {
        return exten;
    }

    /**
     * Sets the extension the channel is or was parked at.
     */
    public void setExten(String exten)
    {
        this.exten = exten;
    }

    /**
     * Returns the name of the channel that is or was parked.
     */
    public String getChannel()
    {
        return channel;
    }

    /**
     * Sets the name of the channel that is or was parked.
     */
    public void setChannel(String channel)
    {
        this.channel = channel;
    }

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

    /**
     * Sets the Caller*ID number of the parked channel.
     * 
     * @param callerId the Caller*ID number of the parked channel.
     */
    public void setCallerId(String callerId)
    {
        this.callerId = callerId;
    }

    /**
     * Returns the Caller*ID name of the parked channel.
     * 
     * @return the Caller*ID name of the parked channel.
     */
    public String getCallerIdName()
    {
        return callerIdName;
    }

    /**
     * Sets the Caller*ID name of the parked channel.
     * 
     * @param callerIdName the Caller*ID name of the parked channel.
     */
    public void setCallerIdName(String callerIdName)
    {
        this.callerIdName = callerIdName;
    }
}

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

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

Modified Files:
	EventBuilderImpl.java 
Log Message:
Added new events for res_features: ParkedCallTimeOut, ParkedCallGiveUp, UnParkedCall (AJ-10)

Index: EventBuilderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/EventBuilderImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -p -r1.12 -r1.13
--- EventBuilderImpl.java	27 Aug 2005 11:30:01 -0000	1.12
+++ EventBuilderImpl.java	27 Aug 2005 12:08:59 -0000	1.13
@@ -56,6 +56,8 @@ import net.sf.asterisk.manager.event.New
 import net.sf.asterisk.manager.event.OriginateFailureEvent;
 import net.sf.asterisk.manager.event.OriginateSuccessEvent;
 import net.sf.asterisk.manager.event.ParkedCallEvent;
+import net.sf.asterisk.manager.event.ParkedCallGiveUpEvent;
+import net.sf.asterisk.manager.event.ParkedCallTimeOutEvent;
 import net.sf.asterisk.manager.event.ParkedCallsCompleteEvent;
 import net.sf.asterisk.manager.event.PeerEntryEvent;
 import net.sf.asterisk.manager.event.PeerStatusEvent;
@@ -74,6 +76,7 @@ import net.sf.asterisk.manager.event.Sta
 import net.sf.asterisk.manager.event.StatusEvent;
 import net.sf.asterisk.manager.event.UnholdEvent;
 import net.sf.asterisk.manager.event.UnlinkEvent;
+import net.sf.asterisk.manager.event.UnparkedCallEvent;
 import net.sf.asterisk.manager.event.UserEvent;
 import net.sf.asterisk.manager.event.ZapShowChannelsCompleteEvent;
 import net.sf.asterisk.manager.event.ZapShowChannelsEvent;
@@ -131,7 +134,9 @@ public class EventBuilderImpl implements
         registerEventClass(NewStateEvent.class);
         registerEventClass(OriginateFailureEvent.class);
         registerEventClass(OriginateSuccessEvent.class);
+        registerEventClass(ParkedCallGiveUpEvent.class);
         registerEventClass(ParkedCallEvent.class);
+        registerEventClass(ParkedCallTimeOutEvent.class);
         registerEventClass(ParkedCallsCompleteEvent.class);
         registerEventClass(PeerEntryEvent.class);
         registerEventClass(PeerlistCompleteEvent.class);
@@ -149,6 +154,7 @@ public class EventBuilderImpl implements
         registerEventClass(StatusCompleteEvent.class);
         registerEventClass(UnholdEvent.class);
         registerEventClass(UnlinkEvent.class);
+        registerEventClass(UnparkedCallEvent.class);
         registerEventClass(ZapShowChannelsEvent.class);
         registerEventClass(ZapShowChannelsCompleteEvent.class);
     }

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/event ParkedCallTimeOutEvent.java,NONE,1.1 ParkedCallGiveUpEvent.java,NONE,1.1 UnparkedCallEvent.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-serv18784/src/java/net/sf/asterisk/manager/event

Added Files:
	ParkedCallTimeOutEvent.java ParkedCallGiveUpEvent.java 
	UnparkedCallEvent.java 
Log Message:
Added new events for res_features: ParkedCallTimeOut, ParkedCallGiveUp, UnParkedCall (AJ-10)

--- NEW FILE: ParkedCallTimeOutEvent.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 ParkedCallTimeOutEvent is triggered when call parking times out for a given
 * channel.<br>
 * It is implemented in <code>res/res_features.c</code><br>
 * Available since Asterisk 1.2
 * 
 * @author srt
 * @version $Id: ParkedCallTimeOutEvent.java,v 1.1 2005/08/27 12:08:59 srt Exp $
 * @since 0.2
 */
public class ParkedCallTimeOutEvent extends AbstractParkedCallEvent
{
    /**
     * Serializable version identifier
     */
    private static final long serialVersionUID = -7437833328723536814L;

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

--- NEW FILE: ParkedCallGiveUpEvent.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 ParkedCallGiveUpEvent is triggered when a channel that has been parked is
 * hung up.<br>
 * It is implemented in <code>res/res_features.c</code><br>
 * Available since Asterisk 1.2
 * 
 * @author srt
 * @version $Id: ParkedCallGiveUpEvent.java,v 1.1 2005/08/27 12:08:59 srt Exp $
 * @since 0.2
 */
public class ParkedCallGiveUpEvent extends AbstractParkedCallEvent
{
    /**
     * Serializable version identifier
     */
    private static final long serialVersionUID = -7437833328723536814L;

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

--- NEW FILE: UnparkedCallEvent.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 UnparkedCallEvent is triggered when a channel that has been parked is
 * resumed.<br>
 * It is implemented in <code>res/res_features.c</code><br>
 * Available since Asterisk 1.2
 * 
 * @author srt
 * @version $Id: UnparkedCallEvent.java,v 1.1 2005/08/27 12:08:59 srt Exp $
 * @since 0.2
 */
public class UnparkedCallEvent extends AbstractParkedCallEvent
{
    /**
     * Serializable version identifier
     */
    private static final long serialVersionUID = -7437833328723536814L;

    private String from;

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

    /**
     * Returns the name of the channel that parked the call.
     */
    public String getFrom()
    {
        return from;
    }

    /**
     * Sets the name of the channel that parked the call.
     */
    public void setFrom(String from)
    {
        this.from = from;
    }
}

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

Modified Files:
	DNDStateEvent.java 
Log Message:
Detailed javadoc for getChannel() (AJ-9)

Index: DNDStateEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/DNDStateEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- DNDStateEvent.java	27 Aug 2005 11:30:01 -0000	1.1
+++ DNDStateEvent.java	27 Aug 2005 11:33:08 -0000	1.2
@@ -17,8 +17,8 @@
 package net.sf.asterisk.manager.event;
 
 /**
- * A DNDStateEvent is triggered by the Zap channel driver when a channel enters or
- * leaves DND (do not disturb) state.<br>
+ * A DNDStateEvent is triggered by the Zap channel driver when a channel enters
+ * or leaves DND (do not disturb) state.<br>
  * It is implemented in <code>channels/chan_zap.c</code>.<br>
  * Available since Asterisk 1.2
  * 
@@ -54,7 +54,8 @@ public abstract class DNDStateEvent exte
     }
 
     /**
-     * Returns the name of the channel.
+     * Returns the name of the channel. The channel name is of the form
+     * "Zap/&lt;channel number&gt;".
      */
     public String getChannel()
     {

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

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

Modified Files:
	EventBuilderImpl.java 
Log Message:
Added DNDStateEvent (AJ-9)

Index: EventBuilderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/EventBuilderImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -p -r1.11 -r1.12
--- EventBuilderImpl.java	27 Aug 2005 11:21:34 -0000	1.11
+++ EventBuilderImpl.java	27 Aug 2005 11:30:01 -0000	1.12
@@ -36,6 +36,7 @@ import net.sf.asterisk.manager.event.Ala
 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.DNDStateEvent;
 import net.sf.asterisk.manager.event.DialEvent;
 import net.sf.asterisk.manager.event.ExtensionStatusEvent;
 import net.sf.asterisk.manager.event.HangupEvent;
@@ -113,6 +114,7 @@ public class EventBuilderImpl implements
         registerEventClass(CdrEvent.class);
         registerEventClass(DBGetResponseEvent.class);
         registerEventClass(DialEvent.class);
+        registerEventClass(DNDStateEvent.class);
         registerEventClass(ExtensionStatusEvent.class);
         registerEventClass(HangupEvent.class);
         registerEventClass(HoldedCallEvent.class);

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

Added Files:
	DNDStateEvent.java 
Log Message:
Added DNDStateEvent (AJ-9)

--- NEW FILE: DNDStateEvent.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 DNDStateEvent is triggered by the Zap channel driver when a channel enters or
 * leaves DND (do not disturb) state.<br>
 * It is implemented in <code>channels/chan_zap.c</code>.<br>
 * Available since Asterisk 1.2
 * 
 * @author srt
 * @version $Id: DNDStateEvent.java,v 1.1 2005/08/27 11:30:01 srt Exp $
 * @since 0.2
 */
public abstract class DNDStateEvent extends ManagerEvent
{
    /**
     * Serializable version identifier
     */
    static final long serialVersionUID = 5906599407896179295L;

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

    /**
     * The DND state of the channel.
     */
    private String state;

    /**
     * Creates a new DNDStateEvent.
     * 
     * @param source
     */
    public DNDStateEvent(Object source)
    {
        super(source);
    }

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

    /**
     * Sets the name of the channel.
     */
    public void setChannel(String channel)
    {
        this.channel = channel;
    }

    /**
     * Returns DND state of the channel.
     * 
     * @return "enabled" if do not disturb is on, "disabled" if it is off.
     */
    public String getState()
    {
        return state;
    }

    /**
     * Sets the DND state of the channel.
     */
    public void setState(String state)
    {
        this.state = state;
    }
}

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

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

Modified Files:
	EventBuilderImpl.java 
Log Message:
Added HoldEvent and UnholdEvent (AJ-8)

Index: EventBuilderImpl.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/impl/EventBuilderImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -p -r1.10 -r1.11
--- EventBuilderImpl.java	27 Aug 2005 02:26:59 -0000	1.10
+++ EventBuilderImpl.java	27 Aug 2005 11:21:34 -0000	1.11
@@ -39,6 +39,7 @@ import net.sf.asterisk.manager.event.DBG
 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.HoldEvent;
 import net.sf.asterisk.manager.event.HoldedCallEvent;
 import net.sf.asterisk.manager.event.JoinEvent;
 import net.sf.asterisk.manager.event.LeaveEvent;
@@ -70,6 +71,7 @@ import net.sf.asterisk.manager.event.Res
 import net.sf.asterisk.manager.event.ShutdownEvent;
 import net.sf.asterisk.manager.event.StatusCompleteEvent;
 import net.sf.asterisk.manager.event.StatusEvent;
+import net.sf.asterisk.manager.event.UnholdEvent;
 import net.sf.asterisk.manager.event.UnlinkEvent;
 import net.sf.asterisk.manager.event.UserEvent;
 import net.sf.asterisk.manager.event.ZapShowChannelsCompleteEvent;
@@ -114,6 +116,7 @@ public class EventBuilderImpl implements
         registerEventClass(ExtensionStatusEvent.class);
         registerEventClass(HangupEvent.class);
         registerEventClass(HoldedCallEvent.class);
+        registerEventClass(HoldEvent.class);
         registerEventClass(JoinEvent.class);
         registerEventClass(LeaveEvent.class);
         registerEventClass(LinkEvent.class);
@@ -142,6 +145,7 @@ public class EventBuilderImpl implements
         registerEventClass(ShutdownEvent.class);
         registerEventClass(StatusEvent.class);
         registerEventClass(StatusCompleteEvent.class);
+        registerEventClass(UnholdEvent.class);
         registerEventClass(UnlinkEvent.class);
         registerEventClass(ZapShowChannelsEvent.class);
         registerEventClass(ZapShowChannelsCompleteEvent.class);

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

Added Files:
	HoldEvent.java UnholdEvent.java 
Log Message:
Added HoldEvent and UnholdEvent (AJ-8)

--- NEW FILE: HoldEvent.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 HoldEvent is triggered by the SIP channel driver when a channel is put on
 * hold.<br>
 * It is implemented in <code>channels/chan_sip.c</code>.<br>
 * Available since Asterisk 1.2
 * 
 * @see net.sf.asterisk.manager.event.UnholdEvent
 * @author srt
 * @version $Id: HoldEvent.java,v 1.1 2005/08/27 11:20:24 srt Exp $
 * @since 0.2
 */
public abstract class HoldEvent extends ManagerEvent
{
    /**
     * Serializable version identifier
     */
    static final long serialVersionUID = 5906599407896179295L;

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

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

    /**
     * Creates a new HoldEvent.
     * 
     * @param source
     */
    public HoldEvent(Object source)
    {
        super(source);
    }

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

    /**
     * Sets the name of the channel.
     */
    public void setChannel(String channel)
    {
        this.channel = channel;
    }

    /**
     * Returns the unique id of the channel.
     */
    public String getUniqueId()
    {
        return uniqueId;
    }

    /**
     * Sets the unique id of the channel.
     */
    public void setUniqueId(String uniqueId)
    {
        this.uniqueId = uniqueId;
    }
}

--- NEW FILE: UnholdEvent.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 UnholdEvent is triggered by the SIP channel driver when a channel is no
 * longer put on hold.<br>
 * It is implemented in <code>channels/chan_sip.c</code>.<br>
 * Available since Asterisk 1.2
 * 
 * @see net.sf.asterisk.manager.event.HoldEvent
 * @author srt
 * @version $Id: UnholdEvent.java,v 1.1 2005/08/27 11:20:24 srt Exp $
 * @since 0.2
 */
public abstract class UnholdEvent extends ManagerEvent
{
    /**
     * Serializable version identifier
     */
    static final long serialVersionUID = 5906599407896179295L;

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

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

    /**
     * Creates a new UnholdEvent.
     * 
     * @param source
     */
    public UnholdEvent(Object source)
    {
        super(source);
    }

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

    /**
     * Sets the name of the channel.
     */
    public void setChannel(String channel)
    {
        this.channel = channel;
    }

    /**
     * Returns the unique id of the channel.
     */
    public String getUniqueId()
    {
        return uniqueId;
    }

    /**
     * Sets the unique id of the channel.
     */
    public void setUniqueId(String uniqueId)
    {
        this.uniqueId = uniqueId;
    }
}

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/action SIPShowPeerAction.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-serv31595/src/java/net/sf/asterisk/manager/action

Modified Files:
	SIPShowPeerAction.java 
Log Message:
Fixed getAction

Index: SIPShowPeerAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/SIPShowPeerAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- SIPShowPeerAction.java	7 Aug 2005 16:55:18 -0000	1.2
+++ SIPShowPeerAction.java	27 Aug 2005 10:18:05 -0000	1.3
@@ -62,7 +62,7 @@ public class SIPShowPeerAction extends A
 
     public String getAction()
     {
-        return "SIPPeer";
+        return "SIPShowPeer";
     }
 
     /**

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

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

Modified Files:
	QueueStatusAction.java 
Log Message:
Added queue and member filter

Index: QueueStatusAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/QueueStatusAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -p -r1.6 -r1.7
--- QueueStatusAction.java	7 Aug 2005 16:43:29 -0000	1.6
+++ QueueStatusAction.java	27 Aug 2005 10:09:16 -0000	1.7
@@ -44,6 +44,9 @@ public class QueueStatusAction extends A
      */
     private static final long serialVersionUID = -8599401015517232869L;
 
+    private String queue;
+    private String member;
+
     /**
      * Creates a new QueueStatusAction.
      */
@@ -60,6 +63,52 @@ public class QueueStatusAction extends A
         return "QueueStatus";
     }
 
+    /**
+     * Returns the queue filter.
+     * 
+     * @return the queue filter.
+     * @since 0.2
+     */
+    public String getQueue()
+    {
+        return queue;
+    }
+
+    /**
+     * Sets the queue filter. If set QueueParamEvents are only generated for the
+     * given queue name.
+     * 
+     * @param queue the queue filter.
+     * @since 0.2
+     */
+    public void setQueue(String queue)
+    {
+        this.queue = queue;
+    }
+
+    /**
+     * Returns the member filter.
+     * 
+     * @return the member filter.
+     * @since 0.2
+     */
+    public String getMember()
+    {
+        return member;
+    }
+
+    /**
+     * Sets the member filter. If set QueueMemberEvents are only generated for the
+     * given member name.
+     * 
+     * @param member the member filter.
+     * @since 0.2
+     */
+    public void setMember(String member)
+    {
+        this.member = member;
+    }
+
     public Class getActionCompleteEventClass()
     {
         return QueueStatusCompleteEvent.class;

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/action QueuePauseAction.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-serv28511/src/java/net/sf/asterisk/manager/action

Modified Files:
	QueuePauseAction.java 
Log Message:
Fixed javadoc for getAction (AJ-11)

Index: QueuePauseAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/QueuePauseAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- QueuePauseAction.java	27 Aug 2005 10:02:40 -0000	1.1
+++ QueuePauseAction.java	27 Aug 2005 10:03:40 -0000	1.2
@@ -102,7 +102,7 @@ public class QueuePauseAction extends Ab
     }
 
     /**
-     * Returns the name of this action, i.e. "QueueRemove".
+     * Returns the name of this action, i.e. "QueuePause".
      * 
      * @return the name of this action.
      */

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/action QueuePauseAction.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-serv28321/src/java/net/sf/asterisk/manager/action

Added Files:
	QueuePauseAction.java 
Log Message:
Added QueuePauseAction (AJ-11)

--- NEW FILE: QueuePauseAction.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 QueuePauseAction makes a queue member temporarily unavailabe (or
 * available again).<br>
 * It is implemented in <code>apps/app_queue.c</code><br>
 * Available since Asterisk 1.2.
 * 
 * @author srt
 * @version $Id: QueuePauseAction.java,v 1.1 2005/08/27 10:02:40 srt Exp $
 * @since 0.2
 */
public class QueuePauseAction extends AbstractManagerAction
{
    /**
     * Serializable version identifier
     */
    private static final long serialVersionUID = -4296471882045706821L;

    private String iface;
    private Boolean paused;
    private String queue;

    /**
     * Creates a new empty QueuePauseAction.
     */
    public QueuePauseAction()
    {

    }

    /**
     * Creates a new QueuePauseAction that makes the member on the given
     * interface unavailable on all queues.
     * 
     * @param iface the interface of the member to make unavailable
     */
    public QueuePauseAction(String iface)
    {
        this.iface = iface;
        this.paused = Boolean.TRUE;
    }

    /**
     * Creates a new QueuePauseAction that makes the member on the given
     * interface unavailable on the given queue.
     * 
     * @param iface the interface of the member to make unavailable
     * @param queue the queue the member is made unvailable on
     */
    public QueuePauseAction(String iface, String queue)
    {
        this.iface = iface;
        this.queue = queue;
        this.paused = Boolean.TRUE;
    }

    /**
     * Creates a new QueuePauseAction that makes the member on the given
     * interface available or unavailable on all queues.
     * 
     * @param iface the interface of the member to make unavailable
     * @param paused Boolean.TRUE to make the member unavailbale, Boolean.FALSE
     *            to make the member available
     */
    public QueuePauseAction(String iface, Boolean paused)
    {
        this.iface = iface;
        this.paused = paused;
    }

    /**
     * Creates a new QueuePauseAction that makes the member on the given
     * interface unavailable on the given queue.
     * 
     * @param iface the interface of the member to make unavailable
     * @param queue the queue the member is made unvailable on
     * @param paused Boolean.TRUE to make the member unavailbale, Boolean.FALSE
     *            to make the member available
     */
    public QueuePauseAction(String iface, String queue, Boolean paused)
    {
        this.iface = iface;
        this.queue = queue;
        this.paused = paused;
    }

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

    /**
     * Returns the interface of the member to make available or unavailable.
     * 
     * @return the interface of the member to make available or unavailable.
     */
    public String getInterface()
    {
        return iface;
    }

    /**
     * Sets the interface of the member to make available or unavailable.<br>
     * This property is mandatory.
     * 
     * @param iface the interface of the member to make available or
     *            unavailable.
     */
    public void setInterface(String iface)
    {
        this.iface = iface;
    }

    /**
     * Returns the name of the queue the member is made available or unavailable
     * on.
     * 
     * @return the name of the queue the member is made available or unavailable
     *         on or <code>null</code> for all queues.
     */
    public String getQueue()
    {
        return queue;
    }

    /**
     * Sets the name of the queue the member is made available or unavailable
     * on.
     * 
     * @param queue the name of the queue the member is made available or
     *            unavailable on or <code>null</code> for all queues.
     */
    public void setQueue(String queue)
    {
        this.queue = queue;
    }

    /**
     * Returns if the member is made available or unavailable.
     * 
     * @return Boolean.TRUE to make the member unavailbale, Boolean.FALSE to
     *         make the member available
     */
    public Boolean getPaused()
    {
        return paused;
    }

    /**
     * Sets if the member is made available or unavailable.<br>
     * This property is mandatory.
     * 
     * @param paused Boolean.TRUE to make the member unavailbale, Boolean.FALSE
     *            to make the member available
     */
    public void setPaused(Boolean paused)
    {
        this.paused = paused;
    }
}

[Asterisk-java-cvs] CVS: asterisk-java/src/java/net/sf/asterisk/manager/action QueueAddAction.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-serv25551/src/java/net/sf/asterisk/manager/action

Modified Files:
	QueueAddAction.java 
Log Message:
Added paused attribute

Index: QueueAddAction.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/action/QueueAddAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- QueueAddAction.java	7 Aug 2005 16:43:29 -0000	1.4
+++ QueueAddAction.java	27 Aug 2005 09:42:34 -0000	1.5
@@ -32,6 +32,7 @@ public class QueueAddAction extends Abst
     private String queue;
     private String iface;
     private Integer penality;
+    private Boolean paused;
 
     /**
      * Creates a new empty QueueAddAction.
@@ -137,4 +138,27 @@ public class QueueAddAction extends Abst
     {
         this.penality = penality;
     }
+
+    /**
+     * Returns if the queue member should be paused when added.
+     * 
+     * @return Boolean.TRUE if the queue member should be paused when added.
+     * @since 0.2
+     */
+    public Boolean getPaused()
+    {
+        return paused;
+    }
+
+    /**
+     * Sets if the queue member should be paused when added.
+     * 
+     * @param paused Boolean.TRUE if the queue member should be paused when
+     *            added.
+     * @since 0.2
+     */
+    public void setPaused(Boolean paused)
+    {
+        this.paused = paused;
+    }
 }

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

Modified Files:
	QueueEntryEvent.java 
Log Message:
Added callerIdName attribute

Index: QueueEntryEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/QueueEntryEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- QueueEntryEvent.java	23 Feb 2005 22:50:58 -0000	1.2
+++ QueueEntryEvent.java	27 Aug 2005 09:36:24 -0000	1.3
@@ -17,12 +17,11 @@
 package net.sf.asterisk.manager.event;
 
 /**
- * A QueueEntryEvent is triggered in response to a QueueStatusAction and contains information about
- * an entry in a queue.<br>
+ * A QueueEntryEvent is triggered in response to a QueueStatusAction and
+ * contains information about an entry in a queue.<br>
  * It is implemented in <code>apps/app_queue.c</code>
  * 
  * @see net.sf.asterisk.manager.action.QueueStatusAction
- * 
  * @author srt
  * @version $Id$
  */
@@ -36,6 +35,7 @@ public class QueueEntryEvent extends Res
     private Integer position;
     private String channel;
     private String callerId;
+    private String callerIdName;
     private Long wait;
 
     /**
@@ -95,7 +95,9 @@ public class QueueEntryEvent extends Res
     }
 
     /**
-     * Returns the callerid of the channel of this entry.
+     * Returns the the Caller*ID number of this entry.
+     * 
+     * @return the the Caller*ID number of this entry.
      */
     public String getCallerId()
     {
@@ -103,7 +105,9 @@ public class QueueEntryEvent extends Res
     }
 
     /**
-     * Sets the callerid of the channel of this entry.
+     * Sets the the Caller*ID number of this entry.
+     * 
+     * @param callerId the the Caller*ID number of this entry.
      */
     public void setCallerId(String callerId)
     {
@@ -111,6 +115,28 @@ public class QueueEntryEvent extends Res
     }
 
     /**
+     * Returns the Caller*ID name of this entry.
+     * 
+     * @return the Caller*ID name of this entry.
+     * @since 0.2
+     */
+    public String getCallerIdName()
+    {
+        return callerIdName;
+    }
+
+    /**
+     * Sets the Caller*ID name of this entry.
+     * 
+     * @param callerIdName the Caller*ID name of this entry.
+     * @since 0.2
+     */
+    public void setCallerIdName(String callerIdName)
+    {
+        this.callerIdName = callerIdName;
+    }
+
+    /**
      * Returns the number of seconds this entry has spent in the queue.
      */
     public Long getWait()

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

Modified Files:
	ParkedCallEvent.java 
Log Message:
Added callerIdName attribute

Index: ParkedCallEvent.java
===================================================================
RCS file: /cvsroot/asterisk-java/asterisk-java/src/java/net/sf/asterisk/manager/event/ParkedCallEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -p -r1.2 -r1.3
--- ParkedCallEvent.java	23 Feb 2005 22:50:58 -0000	1.2
+++ ParkedCallEvent.java	27 Aug 2005 04:04:29 -0000	1.3
@@ -17,12 +17,11 @@
 package net.sf.asterisk.manager.event;
 
 /**
- * A ParkedCallEvent is triggered when a channel is parked (in this case no action id is set) and in
- * response to a ParkedCallsAction.<br>
+ * A ParkedCallEvent is triggered when a channel is parked (in this case no
+ * action id is set) and in response to a ParkedCallsAction.<br>
  * It is implemented in <code>res/res_features.c</code>
  * 
  * @see net.sf.asterisk.manager.action.ParkedCallsAction
- * 
  * @author srt
  * @version $Id$
  */
@@ -37,6 +36,7 @@ public class ParkedCallEvent extends Res
     private String from;
     private Integer timeout;
     private String callerId;
+    private String callerIdName;
     private String uniqueId;
 
     /**
@@ -97,7 +97,8 @@ public class ParkedCallEvent extends Res
 
     /**
      * Returns the number of seconds this call will be parked.<br>
-     * This corresponds to the <code>parkingtime</code> option in <code>features.conf</code>.
+     * This corresponds to the <code>parkingtime</code> option in
+     * <code>features.conf</code>.
      */
     public Integer getTimeout()
     {
@@ -113,7 +114,8 @@ public class ParkedCallEvent extends Res
     }
 
     /**
-     * Returns the caller id of the parked channel.
+     * Returns the Caller*ID number of the parked channel.
+     * @return the Caller*ID number of the parked channel.
      */
     public String getCallerId()
     {
@@ -121,7 +123,8 @@ public class ParkedCallEvent extends Res
     }
 
     /**
-     * Sets the caller id of the parked channel.
+     * Sets the Caller*ID number of the parked channel.
+     * @param callerId the Caller*ID number of the parked channel.
      */
     public void setCallerId(String callerId)
     {
@@ -129,6 +132,28 @@ public class ParkedCallEvent extends Res
     }
 
     /**
+     * Returns the Caller*ID name of the parked channel.
+     * 
+     * @return the Caller*ID name of the parked channel.
+     * @since 0.2
+     */
+    public String getCallerIdName()
+    {
+        return callerIdName;
+    }
+
+    /**
+     * Sets the Caller*ID name of the parked channel.
+     * 
+     * @param callerIdName the Caller*ID name of the parked channel.
+     * @since 0.2
+     */
+    public void setCallerIdName(String callerIdName)
+    {
+        this.callerIdName = callerIdName;
+    }
+
+    /**
      * Returns the unique id of the parked channel.
      */
     public String getUniqueId()