1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 09:09:38 +02:00

Merge branch '4.1'

Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
	smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
	version.gradle
This commit is contained in:
Florian Schmaus 2015-03-24 17:16:18 +01:00
commit 83b84c5bd3
168 changed files with 780 additions and 687 deletions

View file

@ -25,17 +25,17 @@ import org.jivesoftware.smackx.workgroup.util.MetaDataUtils;
import org.jivesoftware.smack.packet.ExtensionElement;
/**
* MetaData packet extension.
* MetaData stanza(/packet) extension.
*/
public class MetaData implements ExtensionElement {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "metadata";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";

View file

@ -163,7 +163,7 @@ public class AgentSession {
/**
* Close the agent session. The underlying connection will remain opened but the
* packet listeners that were added by this agent session will be removed.
* stanza(/packet) listeners that were added by this agent session will be removed.
*/
public void close() {
connection.removeAsyncStanzaListener(packetListener);

View file

@ -192,7 +192,7 @@ public class Offer {
}
/**
* Packet for rejecting offers.
* Stanza(/Packet) for rejecting offers.
*/
private class RejectPacket extends IQ {
@ -211,7 +211,7 @@ public class Offer {
}
/**
* Packet for accepting an offer.
* Stanza(/Packet) for accepting an offer.
*/
private class AcceptPacket extends IQ {

View file

@ -96,7 +96,7 @@ public class OfferConfirmation extends SimpleIQ {
/**
* Packet for notifying server of RoomName
* Stanza(/Packet) for notifying server of RoomName
*/
private class NotifyServicePacket extends IQ {
String roomName;

View file

@ -25,12 +25,12 @@ import org.xmlpull.v1.XmlPullParser;
public class WorkgroupForm extends SimpleIQ {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "workgroup-form";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";

View file

@ -35,12 +35,12 @@ import java.util.List;
public class AgentChatHistory extends IQ {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "chat-sessions";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
@ -86,7 +86,7 @@ public class AgentChatHistory extends IQ {
}
/**
* Packet extension provider for AgentHistory packets.
* Stanza(/Packet) extension provider for AgentHistory packets.
*/
public static class InternalProvider extends IQProvider<AgentChatHistory> {

View file

@ -31,12 +31,12 @@ import java.util.Map;
public class ChatMetadata extends IQ {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "chat-metadata";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";

View file

@ -34,12 +34,12 @@ import org.xmlpull.v1.XmlPullParser;
public class Macros extends IQ {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "macros";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";

View file

@ -25,17 +25,17 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* IQ packet for retrieving and adding Chat Notes.
* IQ stanza(/packet) for retrieving and adding Chat Notes.
*/
public class ChatNotes extends IQ {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "chat-notes";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";

View file

@ -25,17 +25,17 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* IQ packet for retrieving and changing the Agent personal information.
* IQ stanza(/packet) for retrieving and changing the Agent personal information.
*/
public class AgentInfo extends IQ {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "agent-info";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";

View file

@ -45,12 +45,12 @@ public class AgentStatus implements ExtensionElement {
}
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "agent-status";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
@ -221,7 +221,7 @@ public class AgentStatus implements ExtensionElement {
}
/**
* Packet extension provider for AgentStatus packets.
* Stanza(/Packet) extension provider for AgentStatus packets.
*/
public static class Provider extends ExtensionElementProvider<AgentStatus> {

View file

@ -29,8 +29,8 @@ import java.util.Iterator;
import java.util.Set;
/**
* Agent status request packet. This packet is used by agents to request the list of
* agents in a workgroup. The response packet contains a list of packets. Presence
* Agent status request packet. This stanza(/packet) is used by agents to request the list of
* agents in a workgroup. The response stanza(/packet) contains a list of packets. Presence
* packets from individual agents follow.
*
* @author Matt Tucker
@ -38,12 +38,12 @@ import java.util.Set;
public class AgentStatusRequest extends IQ {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "agent-status-request";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
@ -114,7 +114,7 @@ public class AgentStatusRequest extends IQ {
}
/**
* Packet extension provider for AgentStatusRequest packets.
* Stanza(/Packet) extension provider for AgentStatusRequest packets.
*/
public static class Provider extends IQProvider<AgentStatusRequest> {

View file

@ -21,7 +21,7 @@ import org.jivesoftware.smack.packet.IQ;
import org.jxmpp.jid.Jid;
/**
* A IQ packet used to depart a workgroup queue. There are two cases for issuing a depart
* A IQ stanza(/packet) used to depart a workgroup queue. There are two cases for issuing a depart
* queue request:<ul>
* <li>The user wants to leave the queue. In this case, an instance of this class
* should be created without passing in a user address.
@ -40,7 +40,7 @@ public class DepartQueuePacket extends IQ {
}
/**
* Creates a depart queue request packet to the specified workgroup.
* Creates a depart queue request stanza(/packet) to the specified workgroup.
*
* @param workgroup the workgroup to depart.
*/

View file

@ -46,12 +46,12 @@ public class MonitorPacket extends IQ {
}
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "monitor";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
@ -72,7 +72,7 @@ public class MonitorPacket extends IQ {
/**
* Packet extension provider for Monitor Packets.
* Stanza(/Packet) extension provider for Monitor Packets.
*/
public static class InternalProvider extends IQProvider<MonitorPacket> {

View file

@ -33,7 +33,7 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* Packet used for requesting information about occupants of a room or for retrieving information
* Stanza(/Packet) used for requesting information about occupants of a room or for retrieving information
* such information.
*
* @author Gaston Dombiak
@ -47,12 +47,12 @@ public class OccupantsInfo extends IQ {
}
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "occupants-info";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
@ -127,7 +127,7 @@ public class OccupantsInfo extends IQ {
}
/**
* Packet extension provider for AgentStatusRequest packets.
* Stanza(/Packet) extension provider for AgentStatusRequest packets.
*/
public static class Provider extends IQProvider<OccupantsInfo> {

View file

@ -34,19 +34,19 @@ import java.util.Set;
import java.util.logging.Logger;
/**
* Queue details packet extension, which contains details about the users
* Queue details stanza(/packet) extension, which contains details about the users
* currently in a queue.
*/
public class QueueDetails implements ExtensionElement {
private static final Logger LOGGER = Logger.getLogger(QueueDetails.class.getName());
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "notify-queue-details";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
@ -141,7 +141,7 @@ public class QueueDetails implements ExtensionElement {
}
/**
* Provider class for QueueDetails packet extensions.
* Provider class for QueueDetails stanza(/packet) extensions.
*/
public static class Provider extends ExtensionElementProvider<QueueDetails> {

View file

@ -32,12 +32,12 @@ import java.util.Date;
public class QueueOverview implements ExtensionElement {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static String ELEMENT_NAME = "notify-queue";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static String NAMESPACE = "http://jabber.org/protocol/workgroup";

View file

@ -25,19 +25,19 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* An IQ packet that encapsulates both types of workgroup queue
* An IQ stanza(/packet) that encapsulates both types of workgroup queue
* status notifications -- position updates, and estimated time
* left in the queue updates.
*/
public class QueueUpdate implements ExtensionElement {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "queue-status";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";

View file

@ -28,19 +28,19 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* Packet extension for {@link org.jivesoftware.smackx.workgroup.agent.InvitationRequest}.
* Stanza(/Packet) extension for {@link org.jivesoftware.smackx.workgroup.agent.InvitationRequest}.
*
* @author Gaston Dombiak
*/
public class RoomInvitation implements ExtensionElement {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "invite";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";

View file

@ -28,19 +28,19 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* Packet extension for {@link org.jivesoftware.smackx.workgroup.agent.TransferRequest}.
* Stanza(/Packet) extension for {@link org.jivesoftware.smackx.workgroup.agent.TransferRequest}.
*
* @author Gaston Dombiak
*/
public class RoomTransfer implements ExtensionElement {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "transfer";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";

View file

@ -27,12 +27,12 @@ import org.xmlpull.v1.XmlPullParserException;
public class SessionID implements ExtensionElement {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "session";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";

View file

@ -23,7 +23,7 @@ import org.jivesoftware.smack.util.PacketParserUtils;
import org.xmlpull.v1.XmlPullParser;
/**
* IQ packet for retrieving the transcript search form, submiting the completed search form
* IQ stanza(/packet) for retrieving the transcript search form, submiting the completed search form
* or retrieving the answer of a transcript search.
*
* @author Gaston Dombiak
@ -31,12 +31,12 @@ import org.xmlpull.v1.XmlPullParser;
public class TranscriptSearch extends SimpleIQ {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "transcript-search";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";

View file

@ -29,12 +29,12 @@ import org.xmlpull.v1.XmlPullParserException;
public class UserID implements ExtensionElement {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "user";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";

View file

@ -25,18 +25,18 @@ import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* A packet extension that contains information about the user and agent in a
* workgroup chat. The packet extension is attached to group chat invitations.
* A stanza(/packet) extension that contains information about the user and agent in a
* workgroup chat. The stanza(/packet) extension is attached to group chat invitations.
*/
public class WorkgroupInformation implements ExtensionElement {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "workgroup";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";

View file

@ -50,12 +50,12 @@ public class ChatSettings extends IQ {
private int type = -1;
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "chat-settings";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
@ -120,7 +120,7 @@ public class ChatSettings extends IQ {
}
/**
* Packet extension provider for AgentStatusRequest packets.
* Stanza(/Packet) extension provider for AgentStatusRequest packets.
*/
public static class InternalProvider extends IQProvider<ChatSettings> {

View file

@ -51,12 +51,12 @@ public class GenericSettings extends IQ {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "generic-metadata";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
@ -74,7 +74,7 @@ public class GenericSettings extends IQ {
}
/**
* Packet extension provider for SoundSetting Packets.
* Stanza(/Packet) extension provider for SoundSetting Packets.
*/
public static class InternalProvider extends IQProvider<GenericSettings> {

View file

@ -87,12 +87,12 @@ public class OfflineSettings extends SimpleIQ {
}
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "offline-settings";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
@ -101,7 +101,7 @@ public class OfflineSettings extends SimpleIQ {
}
/**
* Packet extension provider for AgentStatusRequest packets.
* Stanza(/Packet) extension provider for AgentStatusRequest packets.
*/
public static class InternalProvider extends IQProvider<OfflineSettings> {

View file

@ -58,12 +58,12 @@ public class SearchSettings extends SimpleIQ {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "search-settings";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
@ -72,7 +72,7 @@ public class SearchSettings extends SimpleIQ {
}
/**
* Packet extension provider for AgentStatusRequest packets.
* Stanza(/Packet) extension provider for AgentStatusRequest packets.
*/
public static class InternalProvider extends IQProvider<SearchSettings> {

View file

@ -48,12 +48,12 @@ public class SoundSettings extends SimpleIQ {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "sound-settings";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
@ -62,7 +62,7 @@ public class SoundSettings extends SimpleIQ {
}
/**
* Packet extension provider for SoundSetting Packets.
* Stanza(/Packet) extension provider for SoundSetting Packets.
*/
public static class InternalProvider extends IQProvider<SoundSettings> {

View file

@ -66,12 +66,12 @@ public class WorkgroupProperties extends IQ {
/**
* Element name of the packet extension.
* Element name of the stanza(/packet) extension.
*/
public static final String ELEMENT_NAME = "workgroup-properties";
/**
* Namespace of the packet extension.
* Namespace of the stanza(/packet) extension.
*/
public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
@ -89,7 +89,7 @@ public class WorkgroupProperties extends IQ {
}
/**
* Packet extension provider for SoundSetting Packets.
* Stanza(/Packet) extension provider for SoundSetting Packets.
*/
public static class InternalProvider extends IQProvider<WorkgroupProperties> {

View file

@ -554,7 +554,7 @@ public class Workgroup {
}
/**
* IQ packet to request joining the workgroup queue.
* IQ stanza(/packet) to request joining the workgroup queue.
*/
private class JoinQueuePacket extends IQ {

View file

@ -76,7 +76,7 @@ public class MessageEvent implements ExtensionElement {
* Returns the XML element name of the extension sub-packet root element.
* Always returns "x"
*
* @return the XML element name of the packet extension.
* @return the XML element name of the stanza(/packet) extension.
*/
public String getElementName() {
return ELEMENT;
@ -86,7 +86,7 @@ public class MessageEvent implements ExtensionElement {
* Returns the XML namespace of the extension sub-packet root element.
* According the specification the namespace is always "jabber:x:event"
*
* @return the XML namespace of the packet extension.
* @return the XML namespace of the stanza(/packet) extension.
*/
public String getNamespace() {
return NAMESPACE;
@ -153,7 +153,7 @@ public class MessageEvent implements ExtensionElement {
/**
* Returns the unique ID of the message that requested to be notified of the event.
* The packet id is not used when the message is a request for notifications
* The stanza(/packet) id is not used when the message is a request for notifications
*
* @return the message id that requested to be notified of the event.
*/
@ -254,7 +254,7 @@ public class MessageEvent implements ExtensionElement {
/**
* Sets the unique ID of the message that requested to be notified of the event.
* The packet id is not used when the message is a request for notifications
* The stanza(/packet) id is not used when the message is a request for notifications
*
* @param packetID the message id that requested to be notified of the event.
*/

View file

@ -33,7 +33,7 @@ import org.xmlpull.v1.XmlPullParserException;
public class MessageEventProvider extends ExtensionElementProvider<MessageEvent> {
/**
* Parses a MessageEvent packet (extension sub-packet).
* Parses a MessageEvent stanza(/packet) (extension sub-packet).
*
* @param parser the XML parser, positioned at the starting element of the extension.
* @return a PacketExtension.

View file

@ -108,7 +108,7 @@ public class RosterExchange implements ExtensionElement {
* Returns the XML element name of the extension sub-packet root element.
* Always returns "x"
*
* @return the XML element name of the packet extension.
* @return the XML element name of the stanza(/packet) extension.
*/
public String getElementName() {
return RosterExchangeManager.ELEMENT;
@ -119,7 +119,7 @@ public class RosterExchange implements ExtensionElement {
* According the specification the namespace is always "jabber:x:roster"
* (which is not to be confused with the 'jabber:iq:roster' namespace
*
* @return the XML namespace of the packet extension.
* @return the XML namespace of the stanza(/packet) extension.
*/
public String getNamespace() {
return RosterExchangeManager.NAMESPACE;

View file

@ -37,7 +37,7 @@ import org.xmlpull.v1.XmlPullParserException;
public class RosterExchangeProvider extends ExtensionElementProvider<RosterExchange> {
/**
* Parses a RosterExchange packet (extension sub-packet).
* Parses a RosterExchange stanza(/packet) (extension sub-packet).
*
* @param parser the XML parser, positioned at the starting element of the extension.
* @return a PacketExtension.