+ * Similarly, if an AMI event name contains characters that are not valid Java + * identifiers, the class itself can be decorated with this annotation to + * affect the mapping. * * @since 1.0.0 */ -@Target({METHOD, FIELD}) +@Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME) public @interface AsteriskMapping { String value(); diff --git a/src/main/java/org/asteriskjava/manager/action/FaxLicenseListAction.java b/src/main/java/org/asteriskjava/manager/action/FaxLicenseListAction.java new file mode 100644 index 000000000..1dd8d560d --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/action/FaxLicenseListAction.java @@ -0,0 +1,16 @@ +package org.asteriskjava.manager.action; + +import org.asteriskjava.manager.event.FaxLicenseListCompleteEvent; +import org.asteriskjava.manager.event.ResponseEvent; + +public final class FaxLicenseListAction extends AbstractManagerAction implements EventGeneratingAction { + @Override + public String getAction() { + return "FaxLicenseList"; + } + + @Override + public Class getActionCompleteEventClass() { + return FaxLicenseListCompleteEvent.class; + } +} diff --git a/src/main/java/org/asteriskjava/manager/action/FaxLicenseStatusAction.java b/src/main/java/org/asteriskjava/manager/action/FaxLicenseStatusAction.java new file mode 100644 index 000000000..5768ded9f --- /dev/null +++ b/src/main/java/org/asteriskjava/manager/action/FaxLicenseStatusAction.java @@ -0,0 +1,12 @@ +package org.asteriskjava.manager.action; + +import org.asteriskjava.manager.ExpectedResponse; +import org.asteriskjava.manager.response.FaxLicenseStatusResponse; + +@ExpectedResponse(FaxLicenseStatusResponse.class) +public final class FaxLicenseStatusAction extends AbstractManagerAction { + @Override + public String getAction() { + return "FaxLicenseStatus"; + } +} diff --git a/src/main/java/org/asteriskjava/manager/action/HangupAction.java b/src/main/java/org/asteriskjava/manager/action/HangupAction.java index 2ea1fc3af..84cdd34fe 100644 --- a/src/main/java/org/asteriskjava/manager/action/HangupAction.java +++ b/src/main/java/org/asteriskjava/manager/action/HangupAction.java @@ -16,18 +16,31 @@ */ package org.asteriskjava.manager.action; +import org.asteriskjava.manager.event.ChannelsHungupListComplete; +import org.asteriskjava.manager.event.ResponseEvent; + /** - * The HangupAction causes Asterisk to hang up a given channel.
+ * The HangupAction causes Asterisk to hang up a given channel. + *
* Hangup with a cause code is only supported by Asterisk versions later than 1.6.2. + *
+ * If the provided channel is surrounded by {@code /forward slashes/}, Asterisk + * will interpret the value as a + * POSIX Extended Regular Expression (ERE), + * allowing multiple channels to be hung up at once. + *
+ * If you are passing a regular expression to this action, ensure that you also + * use one of the {@link org.asteriskjava.manager.ManagerConnection#sendEventGeneratingAction(EventGeneratingAction)} + * overloads to capture the response correctly. * * @author srt * @version $Id$ */ -public class HangupAction extends AbstractManagerAction { +public class HangupAction extends AbstractManagerAction implements EventGeneratingAction { /** * Serializable version identifier */ - static final long serialVersionUID = 0L; + private static final long serialVersionUID = -7534073930283445113L; private String channel; private Integer cause; @@ -42,22 +55,22 @@ public HangupAction() { /** * Creates a new HangupAction that hangs up the given channel. * - * @param channel the name of the channel to hangup. + * @param channelOrRegex the name of the channel to hangup. * @since 0.2 */ - public HangupAction(String channel) { - this.channel = channel; + public HangupAction(String channelOrRegex) { + this.channel = channelOrRegex; } /** * Creates a new HangupAction that hangs up the given channel with the given cause code. * - * @param channel the name of the channel to hangup. - * @param cause the cause code. The cause code must be >= 0 and <= 127. + * @param channelOrRegex the name of the channel to hangup. + * @param cause the cause code. The cause code must be >= 0 and <= 127. * @since 1.0.0 */ - public HangupAction(String channel, int cause) { - this.channel = channel; + public HangupAction(String channelOrRegex, int cause) { + this.channel = channelOrRegex; this.cause = cause; } @@ -108,4 +121,9 @@ public Integer getCause() { public void setCause(Integer cause) { this.cause = cause; } + + @Override + public Class getActionCompleteEventClass() { + return ChannelsHungupListComplete.class; + } } diff --git a/src/main/java/org/asteriskjava/manager/action/PlayDtmfAction.java b/src/main/java/org/asteriskjava/manager/action/PlayDtmfAction.java index 50ea790d5..c0b71995c 100644 --- a/src/main/java/org/asteriskjava/manager/action/PlayDtmfAction.java +++ b/src/main/java/org/asteriskjava/manager/action/PlayDtmfAction.java @@ -36,6 +36,7 @@ public class PlayDtmfAction extends AbstractManagerAction { private String channel; private String digit; private Integer duration = null; + private Boolean receive; /** * Creates a new empty PlayDtmfAction. @@ -62,6 +63,26 @@ public String getAction() { return "PlayDTMF"; } + /** + * Returns the 'receive' property of this action. + * (since asterisk 16.7.0) + * + * @return the receive property, or null if not set + */ + public Boolean getReceive() { + return this.receive; + } + + /** + * Set the receive property of the action. + * (since asterisk 16.7.0) + * + * @param receive value for receive, or null to unset + */ + public void setReceive(Boolean receive) { + this.receive = receive; + } + /** * Returns the name of the channel to send the digit to. * diff --git a/src/main/java/org/asteriskjava/manager/action/QueueAddAction.java b/src/main/java/org/asteriskjava/manager/action/QueueAddAction.java index 61c394ec9..cf432bd03 100644 --- a/src/main/java/org/asteriskjava/manager/action/QueueAddAction.java +++ b/src/main/java/org/asteriskjava/manager/action/QueueAddAction.java @@ -20,7 +20,8 @@ * The QueueAddAction adds a new member to a queue.
* It is implemented in apps/app_queue.c
* The memberName property was added in Asterisk 1.4, the
- * stateInterface property in Asterisk 1.6.
+ * stateInterface property in Asterisk 1.6,
+ * the reason property in Asterisk 20.
*
* @author srt
* @version $Id$
@@ -31,6 +32,7 @@ public class QueueAddAction extends AbstractManagerAction {
private String iface;
private Integer penalty;
private Boolean paused;
+ private String reason;
private String memberName;
private String stateInterface;
@@ -161,6 +163,26 @@ public Boolean getPaused() {
public void setPaused(Boolean paused) {
this.paused = paused;
}
+
+ /**
+ * Returns the queue member pause reason.
+ * Available since Asterisk 20.
+ *
+ * @return Pause reason.
+ */
+ public String getReason() {
+ return reason;
+ }
+
+ /**
+ * Sets the queue member pause reason.
+ * Available since Asterisk 20.
+ *
+ * @param reason.
+ */
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
/**
* Returns the name of the queue memeber (agent name).
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractBridgeEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractBridgeEvent.java
index 58f9fcf42..9a1353405 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractBridgeEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractBridgeEvent.java
@@ -15,7 +15,8 @@ public abstract class AbstractBridgeEvent extends ManagerEvent {
private String bridgeName;
private String bridgeTechnology;
private String accountCode;
- private String bridgevideosourcemode;
+ private String bridgeVideoSource;
+ private String bridgeVideoSourceMode;
AbstractBridgeEvent(Object source) {
super(source);
@@ -77,11 +78,19 @@ public void setAccountCode(String accountCode) {
this.accountCode = accountCode;
}
+ public String getBridgeVideoSource() {
+ return bridgeVideoSource;
+ }
+
+ public void setBridgeVideoSource(String bridgeVideoSource) {
+ this.bridgeVideoSource = bridgeVideoSource;
+ }
+
public String getBridgevideosourcemode() {
- return bridgevideosourcemode;
+ return bridgeVideoSourceMode;
}
- public void setBridgevideosourcemode(String bridgevideosourcemode) {
- this.bridgevideosourcemode = bridgevideosourcemode;
+ public void setBridgevideosourcemode(String bridgeVideoSourceMode) {
+ this.bridgeVideoSourceMode = bridgeVideoSourceMode;
}
}
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractMeetMeEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractMeetMeEvent.java
index 0a2bcbdce..cc969b029 100644
--- a/src/main/java/org/asteriskjava/manager/event/AbstractMeetMeEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractMeetMeEvent.java
@@ -26,11 +26,14 @@
* @version $Id$
*/
public abstract class AbstractMeetMeEvent extends ManagerEvent {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
private String channel;
private String uniqueId;
private String meetMe;
private Integer user;
+ private String language;
+ private String accountCode;
+ private String linkedId;
/**
* @param source
@@ -143,4 +146,44 @@ public Integer getUser() {
public void setUser(Integer userNum) {
this.user = userNum;
}
+
+ /**
+ * Get the account code associated with the current channel.
+ *
+ * @return the channel's account code
+ */
+ public String getAccountCode() {
+ return accountCode;
+ }
+
+ public void setAccountCode(String accountCode) {
+ this.accountCode = accountCode;
+ }
+
+ /**
+ * Get the language associated with the current channel.
+ *
+ * @return the channel's language
+ */
+ public String getLanguage() {
+ return language;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ /**
+ * Get the linked ID of the channel, which ties this event to other related
+ * channel's events.
+ *
+ * @return the channel's linked ID
+ */
+ public String getLinkedId() {
+ return linkedId;
+ }
+
+ public void setLinkedId(String linkedId) {
+ this.linkedId = linkedId;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/AbstractSecurityEvent.java b/src/main/java/org/asteriskjava/manager/event/AbstractSecurityEvent.java
new file mode 100644
index 000000000..c08a8329e
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/AbstractSecurityEvent.java
@@ -0,0 +1,98 @@
+package org.asteriskjava.manager.event;
+
+public abstract class AbstractSecurityEvent extends ManagerEvent {
+ private String eventTv;
+ private String severity;
+ private String service;
+ private Integer eventVersion;
+ private String accountId;
+ private String sessionId;
+ private String localAddress;
+ private String remoteAddress;
+ private String module;
+ private String sessionTv;
+
+ protected AbstractSecurityEvent(Object source) {
+ super(source);
+ }
+
+ public String getAccountId() {
+ return accountId;
+ }
+
+ public void setAccountId(String accountId) {
+ this.accountId = accountId;
+ }
+
+ public String getEventTv() {
+ return eventTv;
+ }
+
+ public void setEventTv(String eventTimestamp) {
+ this.eventTv = eventTimestamp;
+ }
+
+ public Integer getEventVersion() {
+ return eventVersion;
+ }
+
+ public void setEventVersion(Integer eventVersion) {
+ this.eventVersion = eventVersion;
+ }
+
+ public String getLocalAddress() {
+ return localAddress;
+ }
+
+ public void setLocalAddress(String localAddress) {
+ this.localAddress = localAddress;
+ }
+
+ public String getModule() {
+ return module;
+ }
+
+ public void setModule(String module) {
+ this.module = module;
+ }
+
+ public String getRemoteAddress() {
+ return remoteAddress;
+ }
+
+ public void setRemoteAddress(String remoteAddress) {
+ this.remoteAddress = remoteAddress;
+ }
+
+ public String getService() {
+ return service;
+ }
+
+ public void setService(String service) {
+ this.service = service;
+ }
+
+ public String getSessionId() {
+ return sessionId;
+ }
+
+ public void setSessionId(String sessionId) {
+ this.sessionId = sessionId;
+ }
+
+ public String getSessionTv() {
+ return sessionTv;
+ }
+
+ public void setSessionTv(String sessionTimestamp) {
+ this.sessionTv = sessionTimestamp;
+ }
+
+ public String getSeverity() {
+ return severity;
+ }
+
+ public void setSeverity(String severity) {
+ this.severity = severity;
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/AorDetail.java b/src/main/java/org/asteriskjava/manager/event/AorDetail.java
index fa8f8cd8a..03fa0ce3c 100644
--- a/src/main/java/org/asteriskjava/manager/event/AorDetail.java
+++ b/src/main/java/org/asteriskjava/manager/event/AorDetail.java
@@ -40,6 +40,8 @@ public AorDetail(Object source) {
private int totalContacts;
private int contactsRegistered;
private String endpointName;
+ private Boolean removeUnavailable;
+ private Boolean qualify2xxOnly;
public String getObjectType() {
return objectType;
@@ -185,4 +187,20 @@ public void setEndpointName(String endpointName) {
this.endpointName = endpointName;
}
+ public Boolean isRemoveUnavailable() {
+ return removeUnavailable;
+ }
+
+ public void setRemoveUnavailable(Boolean removeUnavailable) {
+ this.removeUnavailable = removeUnavailable;
+ }
+
+ public Boolean isQualify2xxOnly() {
+ return qualify2xxOnly;
+ }
+
+ public void setQualify2xxOnly(Boolean qualify2xxOnly) {
+ this.qualify2xxOnly = qualify2xxOnly;
+ }
+
}
diff --git a/src/main/java/org/asteriskjava/manager/event/AuthMethodNotAllowedEvent.java b/src/main/java/org/asteriskjava/manager/event/AuthMethodNotAllowedEvent.java
new file mode 100644
index 000000000..6eaa33565
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/AuthMethodNotAllowedEvent.java
@@ -0,0 +1,17 @@
+package org.asteriskjava.manager.event;
+
+public final class AuthMethodNotAllowedEvent extends AbstractSecurityEvent {
+ private String authMethod;
+
+ public AuthMethodNotAllowedEvent(Object source) {
+ super(source);
+ }
+
+ public String getAuthMethod() {
+ return authMethod;
+ }
+
+ public void setAuthMethod(String value) {
+ this.authMethod = value;
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/BridgeVideoSourceUpdateEvent.java b/src/main/java/org/asteriskjava/manager/event/BridgeVideoSourceUpdateEvent.java
new file mode 100644
index 000000000..c2495f584
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/BridgeVideoSourceUpdateEvent.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2023 Hector Espert
+ *
+ * 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 org.asteriskjava.manager.event;
+
+/**
+ * Raised when the channel that is the source of video in a bridge changes.
+ */
+public class BridgeVideoSourceUpdateEvent extends AbstractBridgeEvent {
+ private String bridgePreviousVideoSource;
+
+ public BridgeVideoSourceUpdateEvent(Object source) {
+ super(source);
+ }
+
+ /**
+ * Gets the unique ID of the channel that was the video source.
+ *
+ * @return the unique ID of the channel that was the video source.
+ */
+ public String getBridgePreviousVideoSource() {
+ return bridgePreviousVideoSource;
+ }
+
+ public void setBridgePreviousVideoSource(String bridgePreviousVideoSource) {
+ this.bridgePreviousVideoSource = bridgePreviousVideoSource;
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/CdrEvent.java b/src/main/java/org/asteriskjava/manager/event/CdrEvent.java
index 7dc374750..fe15b41f5 100644
--- a/src/main/java/org/asteriskjava/manager/event/CdrEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/CdrEvent.java
@@ -19,6 +19,8 @@
import org.asteriskjava.util.DateUtil;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
import java.util.TimeZone;
/**
@@ -66,12 +68,14 @@ public class CdrEvent extends ManagerEvent {
private String uniqueId;
private String userField;
private String recordfile;
+ private Map
+ * Asterisk AMI Events: CEL
*/
public class CelEvent extends ManagerEvent {
private static final long serialVersionUID = 1L;
@@ -22,7 +23,11 @@ public class CelEvent extends ManagerEvent {
public static final String CEL_EVENT_FORWARD = "FORWARD";
public static final String CEL_EVENT_LINKEDID_END = "LINKEDID_END";
public static final String CEL_EVENT_LOCAL_OPTIMIZE = "LOCAL_OPTIMIZE";
+ public static final String CEL_EVENT_LOCAL_OPTIMIZE_BEGIN = "LOCAL_OPTIMIZE_BEGIN";
public static final String CEL_EVENT_USER_DEFINED = "USER_DEFINED";
+ public static final String CEL_EVENT_STREAM_BEGIN = "STREAM_BEGIN";
+ public static final String CEL_EVENT_STREAM_END = "STREAM_END";
+ public static final String CEL_EVENT_DTMF = "DTMF";
private String eventName;
private String accountCode;
diff --git a/src/main/java/org/asteriskjava/manager/event/ChallengeResponseFailedEvent.java b/src/main/java/org/asteriskjava/manager/event/ChallengeResponseFailedEvent.java
index 3c88d838a..877facde9 100644
--- a/src/main/java/org/asteriskjava/manager/event/ChallengeResponseFailedEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ChallengeResponseFailedEvent.java
@@ -10,13 +10,20 @@ public class ChallengeResponseFailedEvent extends ManagerEvent {
/**
* Serializable version identifier.
*/
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -4630209124005390153L;
private String severity;
private String eventversion;
private String service;
private String remoteaddress;
private String localaddress;
+ private String accountId;
+ private String module;
+ private String sessiontv;
+ private String sessionId;
+ private String challange;
+ private String response;
+ private String expectedResponse;
/**
* @param source
@@ -77,4 +84,60 @@ public void setEventtv(String eventv) {
this.setTimestamp(t.doubleValue());
}
}
+
+ public String getAccountId() {
+ return accountId;
+ }
+
+ public void setAccountId(String accountId) {
+ this.accountId = accountId;
+ }
+
+ public String getModule() {
+ return module;
+ }
+
+ public void setModule(String module) {
+ this.module = module;
+ }
+
+ public String getSessiontv() {
+ return sessiontv;
+ }
+
+ public void setSessiontv(String sessiontv) {
+ this.sessiontv = sessiontv;
+ }
+
+ public String getSessionId() {
+ return sessionId;
+ }
+
+ public void setSessionId(String sessionId) {
+ this.sessionId = sessionId;
+ }
+
+ public String getChallange() {
+ return challange;
+ }
+
+ public void setChallange(String challange) {
+ this.challange = challange;
+ }
+
+ public String getResponse() {
+ return response;
+ }
+
+ public void setResponse(String response) {
+ this.response = response;
+ }
+
+ public String getExpectedResponse() {
+ return expectedResponse;
+ }
+
+ public void setExpectedResponse(String expectedResponse) {
+ this.expectedResponse = expectedResponse;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/ChallengeSentEvent.java b/src/main/java/org/asteriskjava/manager/event/ChallengeSentEvent.java
index c924266e9..a4e9256a8 100644
--- a/src/main/java/org/asteriskjava/manager/event/ChallengeSentEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ChallengeSentEvent.java
@@ -7,7 +7,7 @@ public class ChallengeSentEvent extends ManagerEvent {
/**
*
*/
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 8219597230372769610L;
private String severity;
private Integer eventVersion;
private String accountId;
@@ -17,6 +17,8 @@ public class ChallengeSentEvent extends ManagerEvent {
private String localAddress;
private String challenge;
private String sessionId;
+ private String module;
+ private String sessiontv;
public ChallengeSentEvent(Object source) {
super(source);
@@ -93,4 +95,20 @@ public String getSessionId() {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}
+
+ public String getModule() {
+ return module;
+ }
+
+ public void setModule(String module) {
+ this.module = module;
+ }
+
+ public String getSessiontv() {
+ return sessiontv;
+ }
+
+ public void setSessiontv(String sessiontv) {
+ this.sessiontv = sessiontv;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/ChannelHungupEvent.java b/src/main/java/org/asteriskjava/manager/event/ChannelHungupEvent.java
new file mode 100644
index 000000000..6992bfaa3
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/ChannelHungupEvent.java
@@ -0,0 +1,38 @@
+package org.asteriskjava.manager.event;
+
+public class ChannelHungupEvent extends ResponseEvent {
+ /**
+ * Serial version identifier.
+ */
+ private static final long serialVersionUID = -3439496042163782400L;
+
+ private String channel;
+
+ /**
+ * Constructs a ChannelHungupEvent
+ *
+ * @param source The object on which the Event initially occurred.
+ * @throws IllegalArgumentException if source is null.
+ */
+ public ChannelHungupEvent(Object source) {
+ super(source);
+ }
+
+ /**
+ * Get the name of the channel that was hung up.
+ *
+ * @return the name of the channel
+ */
+ public String getChannel() {
+ return channel;
+ }
+
+ /**
+ * Set the name of the channel that was hung up.
+ *
+ * @param channel the name of the channel
+ */
+ public void setChannel(String channel) {
+ this.channel = channel;
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/ChannelsHungupListComplete.java b/src/main/java/org/asteriskjava/manager/event/ChannelsHungupListComplete.java
new file mode 100644
index 000000000..b5b42ad6d
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/ChannelsHungupListComplete.java
@@ -0,0 +1,41 @@
+package org.asteriskjava.manager.event;
+
+public class ChannelsHungupListComplete extends ResponseEvent {
+ /**
+ * Serial version identifier.
+ */
+ private static final long serialVersionUID = 2531650218749540207L;
+ private Integer listItems;
+
+ /**
+ * Constructs a ChannelsHungupListComplete
+ *
+ * @param source The object on which the Event initially occurred.
+ * @throws IllegalArgumentException if source is null.
+ */
+ public ChannelsHungupListComplete(Object source) {
+ super(source);
+ }
+
+ /**
+ * Returns the number of ChannelHungup that have been reported.
+ *
+ * @return the number of ChannelHungup that have been reported.
+ */
+ public Integer getListItems() {
+ return listItems;
+ }
+
+ /**
+ * Sets the number of ChannelHungup that have been reported.
+ *
+ * @param listItems the number of ChannelHungup that have been reported.
+ */
+ public void setListItems(Integer listItems) {
+ this.listItems = listItems;
+ }
+
+ public void setEventList(String eventList) {
+ // This exists just to silence a warning, the value is always 'Complete'
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/ContactList.java b/src/main/java/org/asteriskjava/manager/event/ContactList.java
index 8d23aca21..a83958265 100644
--- a/src/main/java/org/asteriskjava/manager/event/ContactList.java
+++ b/src/main/java/org/asteriskjava/manager/event/ContactList.java
@@ -54,6 +54,7 @@ public class ContactList extends ResponseEvent {
String objecttype;
String pruneonboot;
ContactStatusEnum status;
+ Boolean qualify2xxOnly;
/**
* Creates a new instance.
@@ -213,6 +214,14 @@ public void setStatus(String status) {
}
+ public Boolean isQualify2xxOnly() {
+ return qualify2xxOnly;
+ }
+
+ public void setQualify2xxOnly(Boolean qualify2xxOnly) {
+ this.qualify2xxOnly = qualify2xxOnly;
+ }
+
@Override
public String toString() {
return "ContactList [qualifyTimeout=" + qualifyTimeout + ", callid=" + callid + ", regserver=" + regserver
@@ -220,7 +229,7 @@ public String toString() {
+ authenticatequalify + ", objectname=" + objectname + ", useragent=" + useragent + ", uri=" + uri
+ ", viaaddr=" + viaaddr + ", qualifyfrequency=" + qualifyfrequency + ", path=" + path + ", endpoint="
+ endpoint + ", viaport=" + viaport + ", outboundproxy=" + outboundproxy + ", actionId=" + actionId
- + ", objecttype=" + objecttype + ", pruneonboot=" + pruneonboot + ", status=" + status + "]\n";
+ + ", objecttype=" + objecttype + ", pruneonboot=" + pruneonboot + ", status=" + status + ", qualify2xxOnly=" + qualify2xxOnly + "]\n";
}
}
diff --git a/src/main/java/org/asteriskjava/manager/event/ContactStatusDetail.java b/src/main/java/org/asteriskjava/manager/event/ContactStatusDetail.java
index efdb18a78..08fca1cd1 100644
--- a/src/main/java/org/asteriskjava/manager/event/ContactStatusDetail.java
+++ b/src/main/java/org/asteriskjava/manager/event/ContactStatusDetail.java
@@ -34,6 +34,7 @@ public class ContactStatusDetail extends ResponseEvent {
private String path;
private int qualifyFrequency;
private Float qualifyTimeout;
+ private Boolean qualify2xxOnly;
public String getAor() {
return aor;
@@ -151,6 +152,14 @@ public void setQualifyTimeout(String qualifyTimeout) {
this.qualifyTimeout = Float.parseFloat(qualifyTimeout);
}
+ public Boolean isQualify2xxOnly() {
+ return qualify2xxOnly;
+ }
+
+ public void setQualify2xxOnly(Boolean qualify2xxOnly) {
+ this.qualify2xxOnly = qualify2xxOnly;
+ }
+
public ContactStatusDetail(Object source) {
super(source);
}
diff --git a/src/main/java/org/asteriskjava/manager/event/DAHDIChannelEvent.java b/src/main/java/org/asteriskjava/manager/event/DAHDIChannelEvent.java
index 72134b028..40ab63d22 100644
--- a/src/main/java/org/asteriskjava/manager/event/DAHDIChannelEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/DAHDIChannelEvent.java
@@ -8,11 +8,24 @@ public class DAHDIChannelEvent extends ManagerEvent {
/**
*
*/
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
+
+ private Integer dahdigroup;
private String dahdichannel;
private String dahdispan;
private String uniqueid;
private String channel;
+ private String language;
+ private String accountCode;
+ private String linkedId;
+
+ public Integer getDahdigroup() {
+ return this.dahdigroup;
+ }
+
+ public void setDahdigroup(Integer dahdigroup) {
+ this.dahdigroup = dahdigroup;
+ }
public String getDahdichannel() {
return dahdichannel;
@@ -46,6 +59,30 @@ public void setChannel(String channel) {
this.channel = channel;
}
+ public String getLinkedId() {
+ return this.linkedId;
+ }
+
+ public void setLinkedId(String linkedid) {
+ this.linkedId = linkedid;
+ }
+
+ public String getLanguage() {
+ return this.language;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ public String getAccountCode() {
+ return this.accountCode;
+ }
+
+ public void setAccountCode(String accountcode) {
+ this.accountCode = accountcode;
+ }
+
public DAHDIChannelEvent(Object source) {
super(source);
}
diff --git a/src/main/java/org/asteriskjava/manager/event/FailedACLEvent.java b/src/main/java/org/asteriskjava/manager/event/FailedACLEvent.java
new file mode 100644
index 000000000..8b7d19474
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/FailedACLEvent.java
@@ -0,0 +1,17 @@
+package org.asteriskjava.manager.event;
+
+public final class FailedACLEvent extends AbstractSecurityEvent {
+ private String aclName;
+
+ public FailedACLEvent(Object source) {
+ super(source);
+ }
+
+ public String getAclName() {
+ return this.aclName;
+ }
+
+ public void setAclName(String aclName) {
+ this.aclName = aclName;
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/FaxDocumentStatusEvent.java b/src/main/java/org/asteriskjava/manager/event/FaxDocumentStatusEvent.java
index 0df1d28a6..894718ba6 100644
--- a/src/main/java/org/asteriskjava/manager/event/FaxDocumentStatusEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/FaxDocumentStatusEvent.java
@@ -41,6 +41,10 @@ public class FaxDocumentStatusEvent extends AbstractFaxEvent {
private String remoteSid;
private String remoteDis;
+ private String language;
+ private String accountCode;
+ private String linkedId;
+ private String uniqueId;
public FaxDocumentStatusEvent(Object source) {
super(source);
@@ -302,6 +306,36 @@ public void setRemoteDis(String remoteDis) {
this.remoteDis = remoteDis;
}
+ public String getAccountCode() {
+ return accountCode;
+ }
+
+ public void setAccountCode(String accountCode) {
+ this.accountCode = accountCode;
+ }
+
+ public String getLanguage() {
+ return language;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+ public String getLinkedId() {
+ return linkedId;
+ }
+
+ public void setLinkedId(String linkedId) {
+ this.linkedId = linkedId;
+ }
+
+ public String getUniqueId() {
+ return uniqueId;
+ }
+
+ public void setUniqueId(String uniqueId) {
+ this.uniqueId = uniqueId;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/FaxLicenseEvent.java b/src/main/java/org/asteriskjava/manager/event/FaxLicenseEvent.java
new file mode 100644
index 000000000..184e8d0d5
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/FaxLicenseEvent.java
@@ -0,0 +1,64 @@
+package org.asteriskjava.manager.event;
+
+public final class FaxLicenseEvent extends ResponseEvent {
+ private String file;
+ private String key;
+ private String product;
+ private String hostId;
+ private Integer ports;
+ private String status;
+
+ public FaxLicenseEvent(Object source) {
+ super(source);
+ }
+
+ @Override
+ public String getFile() {
+ return file;
+ }
+
+ @Override
+ public void setFile(String file) {
+ this.file = file;
+ }
+
+ public String getHostId() {
+ return hostId;
+ }
+
+ public void setHostId(String hostId) {
+ this.hostId = hostId;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public Integer getPorts() {
+ return ports;
+ }
+
+ public void setPorts(Integer ports) {
+ this.ports = ports;
+ }
+
+ public String getProduct() {
+ return product;
+ }
+
+ public void setProduct(String product) {
+ this.product = product;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/FaxLicenseListCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/FaxLicenseListCompleteEvent.java
new file mode 100644
index 000000000..a4167232d
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/FaxLicenseListCompleteEvent.java
@@ -0,0 +1,10 @@
+package org.asteriskjava.manager.event;
+
+import org.asteriskjava.manager.AsteriskMapping;
+
+@AsteriskMapping("FaxLicenseList complete")
+public final class FaxLicenseListCompleteEvent extends ResponseEvent {
+ public FaxLicenseListCompleteEvent(Object source) {
+ super(source);
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/FaxStatusEvent.java b/src/main/java/org/asteriskjava/manager/event/FaxStatusEvent.java
index 76aa6e8b4..1724fc197 100644
--- a/src/main/java/org/asteriskjava/manager/event/FaxStatusEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/FaxStatusEvent.java
@@ -56,6 +56,11 @@ public class FaxStatusEvent extends AbstractFaxEvent {
private String status;
private String operation;
+ private String language;
+ private String accountCode;
+ private String linkedId;
+ private String uniqueId;
+
public FaxStatusEvent(Object source) {
super(source);
}
@@ -494,5 +499,37 @@ public String getOperation() {
public void setOperation(String operation) {
this.operation = operation;
}
+
+ public String getAccountCode() {
+ return accountCode;
+ }
+
+ public void setAccountCode(String accountCode) {
+ this.accountCode = accountCode;
+ }
+
+ public String getLanguage() {
+ return language;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ public String getLinkedId() {
+ return linkedId;
+ }
+
+ public void setLinkedId(String linkedId) {
+ this.linkedId = linkedId;
+ }
+
+ public String getUniqueId() {
+ return uniqueId;
+ }
+
+ public void setUniqueId(String uniqueId) {
+ this.uniqueId = uniqueId;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/HangupHandlerPushEvent.java b/src/main/java/org/asteriskjava/manager/event/HangupHandlerPushEvent.java
new file mode 100644
index 000000000..3925d4dc9
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/HangupHandlerPushEvent.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2004-2006 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 org.asteriskjava.manager.event;
+
+/**
+ * A HangupHandlerPushEvent is triggered when a channel pushes a hangup handler.
+ *
+ * It is implemented in
+ * It is implemented in
+ * These are only sent by Asterisk if it has been configured to do so in
+ * the manager configuration file (manager.conf).
+ *
+ * @return an unmodifiable map of channel variables and their values, never {@code null}
+ */
+ public Map
* Until Asterisk 1.2 Asterisk used different events to indicate start
diff --git a/src/main/java/org/asteriskjava/manager/event/MeetMeTalkingRequestEvent.java b/src/main/java/org/asteriskjava/manager/event/MeetMeTalkingRequestEvent.java
index ea1ad63ed..95729b194 100644
--- a/src/main/java/org/asteriskjava/manager/event/MeetMeTalkingRequestEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/MeetMeTalkingRequestEvent.java
@@ -16,27 +16,31 @@
*/
package org.asteriskjava.manager.event;
+import org.asteriskjava.manager.AsteriskMapping;
+
/**
- * A MeetMeTalkingEvent is triggered when a muted user requests talking in a meet me
- * conference.
- * To enable talker detection you must pass the option 'T' to the MeetMe application.
- * It is implemented in
- * Available since Asterisk 1.6
+ * A MeetMeTalkRequestEvent is triggered when a muted user requests talking in
+ * a MeetMe conference.
*
* @author srt
* @version $Id$
* @since 1.0.0
*/
+@AsteriskMapping("MeetMeTalkRequest")
public class MeetMeTalkingRequestEvent extends AbstractMeetMeEvent {
/**
* Serializable version identifier.
*/
- private static final long serialVersionUID = 0L;
+ private static final long serialVersionUID = 1L;
private Boolean status;
+ private Integer duration;
/**
- * @param source
+ * Constructs a MeetMeTalkingRequestEvent
+ *
+ * @param source The object on which the Event initially occurred.
+ * @throws IllegalArgumentException if source is null.
*/
public MeetMeTalkingRequestEvent(Object source) {
super(source);
@@ -45,10 +49,24 @@ public MeetMeTalkingRequestEvent(Object source) {
// see http://bugs.digium.com/view.php?id=9418
/**
- * Returns whether the user has started or stopped requesting talking.
+ * The length of time (in seconds) that the MeetMe user has been in the
+ * conference at the time of this event
+ *
+ * @return the number of seconds this user has been in the conference.
+ */
+ public Integer getDuration() {
+ return duration;
+ }
+
+ public void setDuration(Integer duration) {
+ this.duration = duration;
+ }
+
+ /**
+ * Returns whether the user has started or stopped requesting talking
*
- * @return
+ * Before the release of Asterisk 12, this event was called
+ * {@code QueueMemberPaused} but was erroneously changed in commit a2d02edc to
+ * {@code QueueMemberPause}.
+ */
public class QueueMemberPauseEvent extends QueueMemberPausedEvent {
- private static final long serialVersionUID = 58564514209197321L;
+ private static final long serialVersionUID = 5184794168561845630L;
// Logger logger = LogManager.getLogger();
String membership;
@@ -14,6 +22,8 @@ public class QueueMemberPauseEvent extends QueueMemberPausedEvent {
String stateInterface;
Integer incall;
String pausedreason;
+ Integer logintime;
+ Integer wrapuptime;
public QueueMemberPauseEvent(Object source) {
super(source);
@@ -155,5 +165,39 @@ public void setPausedreason(String pausedreason) {
this.pausedreason = pausedreason;
}
+ /**
+ * Gets the login time
+ *
+ * @return the login time of the agent as a UNIX timestamp
+ */
+ public Integer getLoginTime() {
+ return logintime;
+ }
+
+ /**
+ * Sets the login time
+ *
+ * @param logintime the login time of the agent as a UNIX timestamp
+ */
+ public void setLoginTime(Integer logintime) {
+ this.logintime = logintime;
+ }
+ /**
+ * Gets the agent's wrap up time
+ *
+ * @return the agent's wrap up time (in seconds)
+ */
+ public Integer getWrapupTime() {
+ return wrapuptime;
+ }
+
+ /**
+ * Sets the agent's wrap up time
+ *
+ * @param wrapuptime the agent's wrap up time (in seconds)
+ */
+ public void setWrapupTime(Integer wrapuptime) {
+ this.wrapuptime = wrapuptime;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueMemberPenaltyEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueMemberPenaltyEvent.java
index e77d943d0..054a7cfcb 100644
--- a/src/main/java/org/asteriskjava/manager/event/QueueMemberPenaltyEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/QueueMemberPenaltyEvent.java
@@ -30,7 +30,8 @@ public class QueueMemberPenaltyEvent extends ManagerEvent {
/**
* Serializable version identifier.
*/
- private static final long serialVersionUID = 0L;
+ private static final long serialVersionUID = 2361464012968723903L;
+
private String queue;
private String location;
private Integer penalty;
@@ -47,6 +48,7 @@ public class QueueMemberPenaltyEvent extends ManagerEvent {
private Integer lastcall;
private String membername;
private Integer status;
+ private Integer logintime;
/**
* Creates a new instance.
@@ -346,4 +348,22 @@ public Integer getPenalty() {
public void setPenalty(Integer penalty) {
this.penalty = penalty;
}
+
+ /**
+ * Gets the login time (as a UNIX timestamp)
+ *
+ * @return the login time of the agent
+ */
+ public Integer getLoginTime() {
+ return logintime;
+ }
+
+ /**
+ * Sets the login time (as a UNIX timestamp)
+ *
+ * @param logintime the login time of the agent
+ */
+ public void setLoginTime(Integer logintime) {
+ this.logintime = logintime;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueMemberRemovedEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueMemberRemovedEvent.java
index d03a4e88b..9d9da69ba 100644
--- a/src/main/java/org/asteriskjava/manager/event/QueueMemberRemovedEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/QueueMemberRemovedEvent.java
@@ -40,6 +40,9 @@ public class QueueMemberRemovedEvent extends AbstractQueueMemberEvent {
Boolean ringinuse;
Long lastcall;
Integer status;
+ Integer logintime;
+ Integer wrapuptime;
+ Integer lastpause;
public QueueMemberRemovedEvent(Object source) {
@@ -124,4 +127,28 @@ public Integer getStatus() {
public void setStatus(Integer status) {
this.status = status;
}
+
+ public Integer getLoginTime() {
+ return logintime;
+ }
+
+ public void setLoginTime(Integer logintime) {
+ this.logintime = logintime;
+ }
+
+ public Integer getWrapupTime() {
+ return wrapuptime;
+ }
+
+ public void setWrapupTime(Integer wrapuptime) {
+ this.wrapuptime = wrapuptime;
+ }
+
+ public Integer getLastPause() {
+ return lastpause;
+ }
+
+ public void setLastPause(Integer lastpause) {
+ this.lastpause = lastpause;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueMemberRingInUseEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueMemberRingInUseEvent.java
new file mode 100644
index 000000000..4d70cc714
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/QueueMemberRingInUseEvent.java
@@ -0,0 +1,321 @@
+package org.asteriskjava.manager.event;
+
+public class QueueMemberRingInUseEvent extends ManagerEvent {
+ private static final long serialVersionUID = -631622399932926664L;
+
+ private String queue;
+ private String memberName;
+ private String _interface;
+ private String stateInterface;
+ private String membership;
+ private Integer penalty;
+ private Integer callsTaken;
+ private Integer lastCall;
+ private Integer lastPause;
+ private Integer loginTime;
+ private Integer inCall;
+ private Integer status;
+ private Boolean paused;
+ private String pausedReason;
+ private Integer ringInUse;
+ private Integer wrapUpTime;
+
+ /**
+ * Constructs a QueueMemberRingInUseEvent
+ *
+ * @param source The object on which the Event initially occurred.
+ * @throws IllegalArgumentException if source is null.
+ */
+ public QueueMemberRingInUseEvent(Object source) {
+ super(source);
+ }
+
+ /**
+ * Returns if the member is paused
+ *
+ * @return if the member is paused
+ */
+ public Boolean getPaused() {
+ return paused;
+ }
+
+ /**
+ * Sets if member is paused or not
+ *
+ * @param paused if paused
+ */
+ public void setPaused(Boolean paused) {
+ this.paused = paused;
+ }
+
+ /**
+ * Returns wrapuptime
+ *
+ * @return Returns wrapuptime
+ */
+ public Integer getWrapuptime() {
+ return wrapUpTime;
+ }
+
+ /**
+ * Sets wrapuptime
+ *
+ * @param wrapuptime the wrapuptime
+ */
+ public void setWrapuptime(Integer wrapuptime) {
+ this.wrapUpTime = wrapuptime;
+ }
+
+ /**
+ * Returns time in seconds when started last paused the queue member
+ *
+ * @return Returns time in seconds when started last paused the queue member
+ */
+ public Integer getLastpause() {
+ return lastPause;
+ }
+
+ /**
+ * Sets time in seconds when started last paused the queue member
+ *
+ * @param lastpause time in seconds when started last paused the queue member
+ */
+ public void setLastpause(Integer lastpause) {
+ this.lastPause = lastpause;
+ }
+
+ /**
+ * Returns the queue member's tech or location state
+ *
+ * @return the queue member's tech or location state
+ */
+ public String getStateinterface() {
+ return stateInterface;
+ }
+
+ /**
+ * Sets channel technology or location from which the member device changed
+ *
+ * @param stateinterface channel technology or location from which the member device changed
+ */
+ public void setStateinterface(String stateinterface) {
+ this.stateInterface = stateinterface;
+ }
+
+ /**
+ * Returns reason if set when paused
+ *
+ * @return reason if set when paused
+ */
+ public String getPausedreason() {
+ return pausedReason;
+ }
+
+ /**
+ * Sets reason if set when paused
+ *
+ * @param pausedreason reason if set when paused
+ */
+ public void setPausedreason(String pausedreason) {
+ this.pausedReason = pausedreason;
+ }
+
+ /**
+ * Returns if member is in call when event is raised
+ *
+ * @return if member is in call when event is raised
+ */
+ public Integer getIncall() {
+ return inCall;
+ }
+
+ /**
+ * Sets if member is in call when event is raised
+ *
+ * @param incall if member is in call when event is raised
+ */
+ public void setIncall(Integer incall) {
+ this.inCall = incall;
+ }
+
+ /**
+ * Returns membership in queue
+ * E.g. dynamic, realtime, static
+ *
+ * @return membership in queue
+ */
+ public String getMembership() {
+ return membership;
+ }
+
+ /**
+ * Sets membership in queue
+ *
+ * @param membership membership in queue
+ */
+ public void setMembership(String membership) {
+ this.membership = membership;
+ }
+
+ /**
+ * Returns queue member's tech or location name
+ *
+ * @return queue member's tech or location name
+ */
+ public String getInterface() {
+ return _interface;
+ }
+
+ /**
+ * Sets queue member's tech or location name
+ *
+ * @param _interface queue member's tech or location name
+ */
+ public void setInterface(String _interface) {
+ this._interface = _interface;
+ }
+
+ /**
+ * Returns number of calls this queue member has serviced
+ *
+ * @return number of calls this queue member has serviced
+ */
+ public Integer getCallstaken() {
+ return callsTaken;
+ }
+
+ /**
+ * Sets number of calls this queue member has serviced
+ *
+ * @param callstaken number of calls this queue member has serviced
+ */
+ public void setCallstaken(Integer callstaken) {
+ this.callsTaken = callstaken;
+ }
+
+ /**
+ * Returns member's ring in use setup
+ *
+ * @return member's ring in use setup
+ */
+ public Integer getRinginuse() {
+ return ringInUse;
+ }
+
+ /**
+ * Sets member's ring in use setup
+ *
+ * @param ringinuse member's ring in use setup
+ */
+ public void setRinginuse(Integer ringinuse) {
+ this.ringInUse = ringinuse;
+ }
+
+ /**
+ * Returns time this member last took a call, expressed in seconds
+ *
+ * @return time this member last took a call, expressed in seconds
+ */
+ public Integer getLastcall() {
+ return lastCall;
+ }
+
+ /**
+ * Sets time this member last took a call, expressed in seconds
+ *
+ * @param lastcall time this member last took a call, expressed in seconds
+ */
+ public void setLastcall(Integer lastcall) {
+ this.lastCall = lastcall;
+ }
+
+ /**
+ * Returns name of the queue member.
+ *
+ * @return name of the queue member.
+ */
+ public String getMembername() {
+ return memberName;
+ }
+
+ /**
+ * Sets name of the queue member.
+ *
+ * @param membername name of the queue member.
+ */
+ public void setMembername(String membername) {
+ this.memberName = membername;
+ }
+
+ /**
+ * Returns numeric device state status of the queue member
+ *
+ * @return numeric device state status of the queue member
+ */
+ public Integer getStatus() {
+ return status;
+ }
+
+ /**
+ * Sets numeric device state status of the queue member
+ *
+ * @param status numeric device state status of the queue member
+ */
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
+ /**
+ * 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 new penalty.
+ *
+ * @return the new penalty.
+ */
+ public Integer getPenalty() {
+ return penalty;
+ }
+
+ /**
+ * Sets the new penalty.
+ *
+ * @param penalty the new penalty.
+ */
+ public void setPenalty(Integer penalty) {
+ this.penalty = penalty;
+ }
+
+ /**
+ * Gets the login time
+ *
+ * @return the login time of the agent as a UNIX timestamp
+ */
+ public Integer getLoginTime() {
+ return loginTime;
+ }
+
+ /**
+ * Sets the login time
+ *
+ * @param logintime the login time of the agent as a UNIX timestamp
+ */
+ public void setLoginTime(Integer logintime) {
+ this.loginTime = logintime;
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/ReceiveFaxEvent.java b/src/main/java/org/asteriskjava/manager/event/ReceiveFaxEvent.java
index 2585040db..a38c571e8 100644
--- a/src/main/java/org/asteriskjava/manager/event/ReceiveFaxEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ReceiveFaxEvent.java
@@ -14,6 +14,11 @@ public class ReceiveFaxEvent extends ManagerEvent {
private Integer transferRate;
private String fileName;
+ private String language;
+ private String accountCode;
+ private String linkedId;
+ private String uniqueId;
+
public ReceiveFaxEvent(Object source) {
super(source);
}
@@ -81,4 +86,36 @@ public String getFileName() {
public void setFileName(String fileName) {
this.fileName = fileName;
}
+
+ public String getAccountCode() {
+ return accountCode;
+ }
+
+ public void setAccountCode(String accountCode) {
+ this.accountCode = accountCode;
+ }
+
+ public String getLanguage() {
+ return language;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ public String getLinkedId() {
+ return linkedId;
+ }
+
+ public void setLinkedId(String linkedId) {
+ this.linkedId = linkedId;
+ }
+
+ public String getUniqueId() {
+ return uniqueId;
+ }
+
+ public void setUniqueId(String uniqueId) {
+ this.uniqueId = uniqueId;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/RegistryEvent.java b/src/main/java/org/asteriskjava/manager/event/RegistryEvent.java
index 28ad6ca80..90b842413 100644
--- a/src/main/java/org/asteriskjava/manager/event/RegistryEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/RegistryEvent.java
@@ -45,6 +45,7 @@ public class RegistryEvent extends ManagerEvent {
private String username;
private String status;
private String cause;
+ private String trunkname;
/**
* @param source
@@ -229,4 +230,11 @@ public void setCause(String cause) {
this.cause = cause;
}
+ public String getTrunkname() {
+ return trunkname;
+ }
+
+ public void setTrunkname(String trunkname) {
+ this.trunkname = trunkname;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/RequestBadFormatEvent.java b/src/main/java/org/asteriskjava/manager/event/RequestBadFormatEvent.java
index cd2f96ce5..6895fbf47 100644
--- a/src/main/java/org/asteriskjava/manager/event/RequestBadFormatEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/RequestBadFormatEvent.java
@@ -9,7 +9,7 @@ public class RequestBadFormatEvent extends ManagerEvent {
/**
* Serializable version identifier.
*/
- private final static long serialVersionUID = 12534663L;
+ private final static long serialVersionUID = -4626589852577838795L;
private String severity;
@@ -31,6 +31,10 @@ public class RequestBadFormatEvent extends ManagerEvent {
private String remoteaddress;
+ private String module;
+
+ private String requestparams;
+
public RequestBadFormatEvent(Object source) {
super(source);
}
@@ -114,4 +118,20 @@ public String getRemoteaddress() {
public void setRemoteaddress(String remoteaddress) {
this.remoteaddress = remoteaddress;
}
+
+ public String getModule() {
+ return module;
+ }
+
+ public void setModule(String module) {
+ this.module = module;
+ }
+
+ public String getRequestparams() {
+ return requestparams;
+ }
+
+ public void setRequestparams(String requestparams) {
+ this.requestparams = requestparams;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/RequestNotAllowedEvent.java b/src/main/java/org/asteriskjava/manager/event/RequestNotAllowedEvent.java
new file mode 100644
index 000000000..5aa323670
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/RequestNotAllowedEvent.java
@@ -0,0 +1,26 @@
+package org.asteriskjava.manager.event;
+
+public final class RequestNotAllowedEvent extends AbstractSecurityEvent {
+ private String requestParams;
+ private String requestType;
+
+ public RequestNotAllowedEvent(Object source) {
+ super(source);
+ }
+
+ public Object getRequestParams() {
+ return requestParams;
+ }
+
+ public void setRequestParams(String value) {
+ this.requestParams = value;
+ }
+
+ public Object getRequestType() {
+ return requestType;
+ }
+
+ public void setRequestType(String value) {
+ this.requestType = value;
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/RequestNotSupportedEvent.java b/src/main/java/org/asteriskjava/manager/event/RequestNotSupportedEvent.java
new file mode 100644
index 000000000..e84aa6245
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/RequestNotSupportedEvent.java
@@ -0,0 +1,17 @@
+package org.asteriskjava.manager.event;
+
+public final class RequestNotSupportedEvent extends AbstractSecurityEvent {
+ private String requestType;
+
+ public RequestNotSupportedEvent(Object source) {
+ super(source);
+ }
+
+ public String getRequestType() {
+ return requestType;
+ }
+
+ public void setRequestType(String value) {
+ this.requestType = value;
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/RtcpReceivedEvent.java b/src/main/java/org/asteriskjava/manager/event/RtcpReceivedEvent.java
index b0f3dcc37..11681ebae 100644
--- a/src/main/java/org/asteriskjava/manager/event/RtcpReceivedEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/RtcpReceivedEvent.java
@@ -73,6 +73,7 @@ public class RtcpReceivedEvent extends AbstractRtcpEvent {
private Long sentPackets;
private Long sentrtp;
private String accountCode;
+ private Double mes;
public RtcpReceivedEvent(Object source) {
@@ -380,5 +381,11 @@ public void setAccountCode(String accountCode) {
this.accountCode = accountCode;
}
+ public Double getMes() {
+ return mes;
+ }
+ public void setMes(Double mes) {
+ this.mes = mes;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/RtcpSentEvent.java b/src/main/java/org/asteriskjava/manager/event/RtcpSentEvent.java
index ba130793d..188a7bf00 100644
--- a/src/main/java/org/asteriskjava/manager/event/RtcpSentEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/RtcpSentEvent.java
@@ -58,6 +58,7 @@ public class RtcpSentEvent extends AbstractRtcpEvent {
private Integer report0iaJitter;
private Integer report0HighestSequence;
private String accountCode;
+ private Double mes;
public RtcpSentEvent(Object source) {
super(source);
@@ -328,4 +329,12 @@ public String getAccountCode() {
public void setAccountCode(String accountCode) {
this.accountCode = accountCode;
}
+
+ public Double getMes() {
+ return mes;
+ }
+
+ public void setMes(Double mes) {
+ this.mes = mes;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/SendFaxEvent.java b/src/main/java/org/asteriskjava/manager/event/SendFaxEvent.java
index 6398df053..7209364cc 100644
--- a/src/main/java/org/asteriskjava/manager/event/SendFaxEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/SendFaxEvent.java
@@ -24,6 +24,7 @@ public class SendFaxEvent extends AbstractFaxEvent {
* Serial version identifier.
*/
private static final long serialVersionUID = -1L;
+ private String channel;
private String callerId;
private String localStationId;
private String remoteStationId;
@@ -32,11 +33,24 @@ public class SendFaxEvent extends AbstractFaxEvent {
private String transferRate;
private String fileName;
+ private String language;
+ private String accountCode;
+ private String linkedId;
+ private String uniqueId;
public SendFaxEvent(Object source) {
super(source);
}
+ @Override
+ public String getChannel() {
+ return channel;
+ }
+
+ @Override
+ public void setChannel(String channel) {
+ this.channel = channel;
+ }
/**
* @return the callerId
@@ -149,6 +163,36 @@ public void setFileName(String fileName) {
this.fileName = fileName;
}
+ public String getAccountCode() {
+ return accountCode;
+ }
+ public void setAccountCode(String accountCode) {
+ this.accountCode = accountCode;
+ }
+
+ public String getLanguage() {
+ return language;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ public String getLinkedId() {
+ return linkedId;
+ }
+
+ public void setLinkedId(String linkedId) {
+ this.linkedId = linkedId;
+ }
+
+ public String getUniqueId() {
+ return uniqueId;
+ }
+
+ public void setUniqueId(String uniqueId) {
+ this.uniqueId = uniqueId;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/SessionLimitEvent.java b/src/main/java/org/asteriskjava/manager/event/SessionLimitEvent.java
new file mode 100644
index 000000000..f6debbfe2
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/SessionLimitEvent.java
@@ -0,0 +1,7 @@
+package org.asteriskjava.manager.event;
+
+public final class SessionLimitEvent extends AbstractSecurityEvent {
+ public SessionLimitEvent(Object source) {
+ super(source);
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/SkypeChatMessageEvent.java b/src/main/java/org/asteriskjava/manager/event/SkypeChatMessageEvent.java
index a4c597577..913241a1c 100644
--- a/src/main/java/org/asteriskjava/manager/event/SkypeChatMessageEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/SkypeChatMessageEvent.java
@@ -16,9 +16,8 @@
*/
package org.asteriskjava.manager.event;
-import org.asteriskjava.util.Base64;
-
import java.nio.charset.StandardCharsets;
+import java.util.Base64;
/**
* A SkypeChatMessageEvent is triggered when a Skype Chat message is sent or
@@ -107,6 +106,6 @@ public String getDecodedMessage() {
if (message == null) {
return null;
}
- return new String(Base64.base64ToByteArray(message), StandardCharsets.UTF_8);
+ return new String(Base64.getDecoder().decode(message), StandardCharsets.UTF_8);
}
}
diff --git a/src/main/java/org/asteriskjava/manager/event/SuccessfulAuthEvent.java b/src/main/java/org/asteriskjava/manager/event/SuccessfulAuthEvent.java
index e8b533ddf..33a4ed511 100644
--- a/src/main/java/org/asteriskjava/manager/event/SuccessfulAuthEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/SuccessfulAuthEvent.java
@@ -7,7 +7,7 @@ public class SuccessfulAuthEvent extends ManagerEvent {
/**
*
*/
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -1075176582208556468L;
private String severity;
private Integer eventVersion;
private String accountId;
@@ -18,6 +18,7 @@ public class SuccessfulAuthEvent extends ManagerEvent {
private String remoteAddress;
private String localAddress;
private String sessionId;
+ private String module;
public SuccessfulAuthEvent(Object source) {
super(source);
@@ -102,4 +103,12 @@ public String getSessionId() {
public void setSessionId(String sessionId) {
this.sessionId = sessionId;
}
+
+ public String getModule() {
+ return module;
+ }
+
+ public void setModule(String module) {
+ this.module = module;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/T38FaxStatusEvent.java b/src/main/java/org/asteriskjava/manager/event/T38FaxStatusEvent.java
index 2ac0158ed..26f062513 100644
--- a/src/main/java/org/asteriskjava/manager/event/T38FaxStatusEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/T38FaxStatusEvent.java
@@ -39,6 +39,11 @@ public class T38FaxStatusEvent extends AbstractFaxEvent {
private Integer minimumJitterSpace;
private Integer unrecoverablePackets;
+ private String language;
+ private String accountCode;
+ private String linkedId;
+ private String uniqueId;
+
public T38FaxStatusEvent(Object source) {
super(source);
}
@@ -271,6 +276,38 @@ public Integer getAverageRxDataRateInBps() {
return averageRxDataRateStripped == null ? null : Integer.valueOf(averageRxDataRateStripped);
}
+ public String getAccountCode() {
+ return accountCode;
+ }
+
+ public void setAccountCode(String accountCode) {
+ this.accountCode = accountCode;
+ }
+
+ public String getLanguage() {
+ return language;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ public String getLinkedId() {
+ return linkedId;
+ }
+
+ public void setLinkedId(String linkedId) {
+ this.linkedId = linkedId;
+ }
+
+ public String getUniqueId() {
+ return uniqueId;
+ }
+
+ public void setUniqueId(String uniqueId) {
+ this.uniqueId = uniqueId;
+ }
+
String stripUnit(String s) {
if (s == null || s.length() == 0) {
return null;
diff --git a/src/main/java/org/asteriskjava/manager/event/UnexpectedAddressEvent.java b/src/main/java/org/asteriskjava/manager/event/UnexpectedAddressEvent.java
new file mode 100644
index 000000000..7229bb2d6
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/UnexpectedAddressEvent.java
@@ -0,0 +1,17 @@
+package org.asteriskjava.manager.event;
+
+public final class UnexpectedAddressEvent extends AbstractSecurityEvent {
+ private String expectedAddress;
+
+ public UnexpectedAddressEvent(Object source) {
+ super(source);
+ }
+
+ public String getExpectedAddress() {
+ return expectedAddress;
+ }
+
+ public void setExpectedAddress(String value) {
+ this.expectedAddress = value;
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/internal/ActionBuilderImpl.java b/src/main/java/org/asteriskjava/manager/internal/ActionBuilderImpl.java
index 77f05d445..01f440d4c 100644
--- a/src/main/java/org/asteriskjava/manager/internal/ActionBuilderImpl.java
+++ b/src/main/java/org/asteriskjava/manager/internal/ActionBuilderImpl.java
@@ -293,7 +293,7 @@ private static String mapToAsterisk(Method getter) {
// ok, no field
}
- return fieldName.toLowerCase(Locale.US);
+ return fieldName.toLowerCase(Locale.ENGLISH);
}
static String determineSetterName(String getterName) {
diff --git a/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java b/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java
index e7241e2f0..d007e63e8 100644
--- a/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java
+++ b/src/main/java/org/asteriskjava/manager/internal/EventBuilderImpl.java
@@ -15,6 +15,7 @@
*/
package org.asteriskjava.manager.internal;
+import org.asteriskjava.manager.AsteriskMapping;
import org.asteriskjava.manager.event.*;
import org.asteriskjava.manager.util.EventAttributesHelper;
import org.asteriskjava.util.Log;
@@ -60,14 +61,18 @@ private void registerBuiltinEventClasses() {
}
public final void registerEventClass(Class clazz) throws IllegalArgumentException {
- String className;
String eventType;
- className = clazz.getName();
- eventType = className.substring(className.lastIndexOf('.') + 1).toLowerCase(Locale.ENGLISH);
+ AsteriskMapping annotation = clazz.getAnnotation(AsteriskMapping.class);
+ if (annotation == null) {
+ String className = clazz.getName();
+ eventType = className.substring(className.lastIndexOf('.') + 1).toLowerCase(Locale.ENGLISH);
- if (eventType.endsWith("event")) {
- eventType = eventType.substring(0, eventType.length() - "event".length());
+ if (eventType.endsWith("event")) {
+ eventType = eventType.substring(0, eventType.length() - "event".length());
+ }
+ } else {
+ eventType = annotation.value().toLowerCase(Locale.ENGLISH);
}
if (UserEvent.class.isAssignableFrom(clazz) && !eventType.startsWith("userevent")) {
@@ -107,7 +112,7 @@ public final void registerEventClass(String eventType, Class attributes) {
return null;
}
- eventType = ((String) attributes.get("event")).toLowerCase(Locale.US);
+ eventType = ((String) attributes.get("event")).toLowerCase(Locale.ENGLISH);
// Change in Asterisk 1.4 where the name of the UserEvent is sent as
// property instead
@@ -179,7 +184,7 @@ public ManagerEvent buildEvent(Object source, Map
* From java.util.prefs.
*
+ * @deprecated Use {@link java.util.Base64} instead.
+ *
* @author Josh Bloch
*/
+@Deprecated
public class Base64 {
private Base64() {
diff --git a/src/main/java/org/asteriskjava/util/ReflectionUtil.java b/src/main/java/org/asteriskjava/util/ReflectionUtil.java
index 0dfc844e0..86a32e252 100644
--- a/src/main/java/org/asteriskjava/util/ReflectionUtil.java
+++ b/src/main/java/org/asteriskjava/util/ReflectionUtil.java
@@ -16,6 +16,8 @@
*/
package org.asteriskjava.util;
+import org.reflections.Reflections;
+
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Constructor;
@@ -30,6 +32,9 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/**
* Utility class that provides helper methods for reflection that is used by the
@@ -132,7 +137,7 @@ private static Mapchannel.c
+ *
+ * @author srt
+ * @version $Id$
+ */
+public class HangupHandlerPushEvent extends AbstractChannelStateEvent {
+ /**
+ * Serializable version identifier.
+ */
+ static final long serialVersionUID = 0L;
+
+ private String language;
+ private String linkedId;
+
+ private String handler;
+
+ public HangupHandlerPushEvent(Object source) {
+ super(source);
+ }
+
+ public String getLanguage() {
+ return language;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ public String getLinkedId() {
+ return linkedId;
+ }
+
+ public void setLinkedId(String linkedId) {
+ this.linkedId = linkedId;
+ }
+
+ public String getHandler() {
+ return handler;
+ }
+
+ public void setHandler(String handler) {
+ this.handler = handler;
+ }
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append("HangupHandlerPush [language=");
+ builder.append(language);
+ builder.append(", linkedId=");
+ builder.append(linkedId);
+ builder.append(", accountCode=");
+ builder.append(accountCode);
+ builder.append("]");
+ return builder.toString();
+ }
+
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/HangupHandlerRunEvent.java b/src/main/java/org/asteriskjava/manager/event/HangupHandlerRunEvent.java
new file mode 100644
index 000000000..dbdfbb486
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/HangupHandlerRunEvent.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2004-2006 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 org.asteriskjava.manager.event;
+
+/**
+ * A HangupHandlerRunEvent is triggered when a hangup handler is run.
+ * channel.c
+ *
+ * @author srt
+ * @version $Id$
+ */
+public class HangupHandlerRunEvent extends AbstractChannelStateEvent {
+ /**
+ * Serializable version identifier.
+ */
+ static final long serialVersionUID = 0L;
+
+ private String language;
+ private String linkedId;
+ private String handler;
+
+ public HangupHandlerRunEvent(Object source) {
+ super(source);
+ }
+
+ public String getLanguage() {
+ return language;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ public String getLinkedId() {
+ return linkedId;
+ }
+
+ public void setLinkedId(String linkedId) {
+ this.linkedId = linkedId;
+ }
+
+ public String getHandler() {
+ return handler;
+ }
+
+ public void setHandler(String handler) {
+ this.handler = handler;
+ }
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append("HangupHandlerRun [language=");
+ builder.append(language);
+ builder.append(", linkedId=");
+ builder.append(linkedId);
+ builder.append(", accountCode=");
+ builder.append(accountCode);
+ builder.append("]");
+ return builder.toString();
+ }
+
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/InvalidAccountId.java b/src/main/java/org/asteriskjava/manager/event/InvalidAccountId.java
index be7bbe4c1..24db59dce 100644
--- a/src/main/java/org/asteriskjava/manager/event/InvalidAccountId.java
+++ b/src/main/java/org/asteriskjava/manager/event/InvalidAccountId.java
@@ -9,7 +9,7 @@ public class InvalidAccountId extends ManagerEvent {
/**
*
*/
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 7812041063040911614L;
private String severity;
private Integer eventVersion;
private String eventtv;
@@ -19,6 +19,8 @@ public class InvalidAccountId extends ManagerEvent {
private String service;
private String remoteAddress;
private String event;
+ private String module;
+ private String sessiontv;
public InvalidAccountId(Object source) {
super(source);
@@ -99,4 +101,20 @@ public String getEvent() {
public void setEvent(String event) {
this.event = event;
}
+
+ public String getModule() {
+ return module;
+ }
+
+ public void setModule(String module) {
+ this.module = module;
+ }
+
+ public String getSessiontv() {
+ return sessiontv;
+ }
+
+ public void setSessiontv(String sessiontv) {
+ this.sessiontv = sessiontv;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/InvalidPasswordEvent.java b/src/main/java/org/asteriskjava/manager/event/InvalidPasswordEvent.java
index c0a9090a1..866dc725e 100644
--- a/src/main/java/org/asteriskjava/manager/event/InvalidPasswordEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/InvalidPasswordEvent.java
@@ -7,7 +7,7 @@ public class InvalidPasswordEvent extends ManagerEvent {
/**
*
*/
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -5161586187203331724L;
private String severity;
private Integer eventVersion;
private String eventtv;
@@ -19,6 +19,10 @@ public class InvalidPasswordEvent extends ManagerEvent {
private String service;
private String remoteAddress;
private String challenge;
+ private String sessiontv;
+ private String localAddress;
+ private String sessionId;
+ private String module;
public InvalidPasswordEvent(Object source) {
super(source);
@@ -111,4 +115,36 @@ public String getChallenge() {
public void setChallenge(String challenge) {
this.challenge = challenge;
}
+
+ public String getLocalAddress() {
+ return localAddress;
+ }
+
+ public void setLocalAddress(String localAddress) {
+ this.localAddress = localAddress;
+ }
+
+ public String getModule() {
+ return module;
+ }
+
+ public void setModule(String module) {
+ this.module = module;
+ }
+
+ public String getSessionId() {
+ return sessionId;
+ }
+
+ public void setSessionId(String sessionId) {
+ this.sessionId = sessionId;
+ }
+
+ public String getSessiontv() {
+ return sessiontv;
+ }
+
+ public void setSessiontv(String sessiontv) {
+ this.sessiontv = sessiontv;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/InvalidTransportEvent.java b/src/main/java/org/asteriskjava/manager/event/InvalidTransportEvent.java
new file mode 100644
index 000000000..6a2e1c5d9
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/InvalidTransportEvent.java
@@ -0,0 +1,17 @@
+package org.asteriskjava.manager.event;
+
+public final class InvalidTransportEvent extends AbstractSecurityEvent {
+ private String attemptedTransport;
+
+ public InvalidTransportEvent(Object source) {
+ super(source);
+ }
+
+ public String getAttemptedTransport() {
+ return attemptedTransport;
+ }
+
+ public void setAttemptedTransport(String value) {
+ this.attemptedTransport = value;
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/LoadAverageLimitEvent.java b/src/main/java/org/asteriskjava/manager/event/LoadAverageLimitEvent.java
new file mode 100644
index 000000000..71aa38e24
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/LoadAverageLimitEvent.java
@@ -0,0 +1,7 @@
+package org.asteriskjava.manager.event;
+
+public final class LoadAverageLimitEvent extends AbstractSecurityEvent {
+ public LoadAverageLimitEvent(Object source) {
+ super(source);
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/ManagerEvent.java b/src/main/java/org/asteriskjava/manager/event/ManagerEvent.java
index 13cce6f3d..1aaa100a1 100644
--- a/src/main/java/org/asteriskjava/manager/event/ManagerEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ManagerEvent.java
@@ -37,7 +37,7 @@ public abstract class ManagerEvent extends EventObject {
/**
* Serializable version identifier.
*/
- static final long serialVersionUID = 2L;
+ private static final long serialVersionUID = 2L;
protected String connectedLineNum;
protected String connectedLineName;
protected Integer priority;
@@ -46,6 +46,7 @@ public abstract class ManagerEvent extends EventObject {
protected String exten;
protected String callerIdNum;
protected String callerIdName;
+ protected Mapapps/app_meetme.ctrue if ther user has started requesting talking,
- * false if the user has stopped requesting talking.
+ * @return {@code true} if the user has started requesting talking,
+ * {@code false} if the user has stopped requesting talking.
*/
public Boolean getStatus() {
return status;
diff --git a/src/main/java/org/asteriskjava/manager/event/MemoryLimitEvent.java b/src/main/java/org/asteriskjava/manager/event/MemoryLimitEvent.java
new file mode 100644
index 000000000..6b086fbe1
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/MemoryLimitEvent.java
@@ -0,0 +1,7 @@
+package org.asteriskjava.manager.event;
+
+public final class MemoryLimitEvent extends AbstractSecurityEvent {
+ public MemoryLimitEvent(Object source) {
+ super(source);
+ }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueMemberAddedEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueMemberAddedEvent.java
index b4644cc14..9bf217bc7 100644
--- a/src/main/java/org/asteriskjava/manager/event/QueueMemberAddedEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/QueueMemberAddedEvent.java
@@ -40,6 +40,9 @@ public class QueueMemberAddedEvent extends AbstractQueueMemberEvent {
private String stateinterface;
private Boolean ringinuse;
+ private Integer logintime;
+ private Integer wrapuptime;
+ private Integer lastpause;
public QueueMemberAddedEvent(Object source) {
super(source);
@@ -192,4 +195,28 @@ public Boolean getRinginuse() {
public void setRinginuse(Boolean ringinuse) {
this.ringinuse = ringinuse;
}
+
+ public Integer getLoginTime() {
+ return logintime;
+ }
+
+ public void setLoginTime(Integer logintime) {
+ this.logintime = logintime;
+ }
+
+ public Integer getWrapupTime() {
+ return wrapuptime;
+ }
+
+ public void setWrapupTime(Integer wrapuptime) {
+ this.wrapuptime = wrapuptime;
+ }
+
+ public Integer getLastPause() {
+ return lastpause;
+ }
+
+ public void setLastPause(Integer lastpause) {
+ this.lastpause = lastpause;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueMemberEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueMemberEvent.java
index eb1ca075b..04f92ecd7 100644
--- a/src/main/java/org/asteriskjava/manager/event/QueueMemberEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/QueueMemberEvent.java
@@ -64,6 +64,7 @@ public class QueueMemberEvent extends ResponseEvent {
private String pausedreason;
private Integer wrapuptime;
private String _interface;
+ private Integer logintime;
/**
* @param source
@@ -396,4 +397,12 @@ public Integer getWrapuptime() {
public void setWrapuptime(Integer wrapuptime) {
this.wrapuptime = wrapuptime;
}
+
+ public Integer getLogintime() {
+ return logintime;
+ }
+
+ public void setLogintime(Integer logintime) {
+ this.logintime = logintime;
+ }
}
diff --git a/src/main/java/org/asteriskjava/manager/event/QueueMemberPauseEvent.java b/src/main/java/org/asteriskjava/manager/event/QueueMemberPauseEvent.java
index c39ab200e..80eb1be30 100644
--- a/src/main/java/org/asteriskjava/manager/event/QueueMemberPauseEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/QueueMemberPauseEvent.java
@@ -1,7 +1,15 @@
package org.asteriskjava.manager.event;
+/**
+ * A QueueMemberPauseEvent is triggered when a queue member is paused or
+ * unpaused.
+ *