From ad87243060f53be4b25283680d18b10a29f38ce5 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sat, 31 Mar 2018 14:17:30 +0200 Subject: [PATCH] Globally 's;stanza(/packet);stanza;' --- .../smack/bosh/XMPPBOSHConnection.java | 4 +- .../java/org/jivesoftware/smack/IQTest.java | 2 +- .../smack/filter/PacketIDFilterTest.java | 2 +- .../smack/AbstractXMPPConnection.java | 46 +++--- .../smack/SmackConfiguration.java | 4 +- .../jivesoftware/smack/SmackException.java | 4 +- .../jivesoftware/smack/StanzaCollector.java | 40 ++--- .../jivesoftware/smack/StanzaListener.java | 6 +- .../jivesoftware/smack/XMPPConnection.java | 138 +++++++++--------- .../jivesoftware/smack/filter/AndFilter.java | 2 +- .../smack/filter/FromMatchesFilter.java | 4 +- .../smack/filter/IQReplyFilter.java | 4 +- .../smack/filter/IQTypeFilter.java | 2 +- .../jivesoftware/smack/filter/NotFilter.java | 2 +- .../jivesoftware/smack/filter/OrFilter.java | 2 +- .../smack/filter/PacketExtensionFilter.java | 16 +- .../smack/filter/PacketFilter.java | 12 +- .../smack/filter/PacketIDFilter.java | 10 +- .../smack/filter/PacketTypeFilter.java | 2 +- .../smack/filter/PresenceTypeFilter.java | 2 +- .../smack/filter/StanzaFilter.java | 2 +- .../smack/filter/StanzaTypeFilter.java | 2 +- .../smack/packet/AbstractError.java | 6 +- .../org/jivesoftware/smack/packet/Bind.java | 4 +- .../smack/packet/DefaultExtensionElement.java | 14 +- .../jivesoftware/smack/packet/Element.java | 4 +- .../org/jivesoftware/smack/packet/IQ.java | 16 +- .../smack/packet/NamedElement.java | 2 +- .../org/jivesoftware/smack/packet/Packet.java | 60 ++++---- .../jivesoftware/smack/packet/Presence.java | 6 +- .../jivesoftware/smack/packet/Session.java | 2 +- .../org/jivesoftware/smack/packet/Stanza.java | 56 +++---- .../jivesoftware/smack/packet/XMPPError.java | 4 +- .../smack/provider/ExtensionProviderInfo.java | 2 +- .../smack/provider/ProviderManager.java | 18 +-- .../smack/util/PacketParserUtils.java | 6 +- .../jivesoftware/smack/DummyConnection.java | 12 +- .../smack/ThreadedDummyConnection.java | 4 +- .../smackx/debugger/package-info.java | 22 ++- .../smackx/debugger/EnhancedDebugger.java | 12 +- .../carbons/packet/CarbonExtension.java | 2 +- .../provider/CarbonManagerProvider.java | 2 +- .../smackx/gcm/packet/GcmPacketExtension.java | 4 +- .../AbstractHttpOverXmppProvider.java | 2 +- .../provider/HttpOverXmppReqProvider.java | 2 +- .../provider/HttpOverXmppRespProvider.java | 2 +- .../smackx/iot/control/element/SetData.java | 2 +- .../json/packet/JsonPacketExtension.java | 4 +- .../smackx/muclight/MultiUserChatLight.java | 8 +- .../smackx/address/MultipleRecipientInfo.java | 4 +- .../address/MultipleRecipientManager.java | 34 ++--- .../address/packet/MultipleAddresses.java | 8 +- .../smackx/amp/packet/AMPExtension.java | 4 +- .../amp/provider/AMPExtensionProvider.java | 2 +- .../smackx/bytestreams/ibb/DataListener.java | 4 +- .../ibb/InBandBytestreamManager.java | 12 +- .../ibb/InBandBytestreamSession.java | 22 +-- .../smackx/bytestreams/ibb/packet/Data.java | 6 +- .../ibb/packet/DataPacketExtension.java | 8 +- .../ibb/provider/DataPacketProvider.java | 2 +- .../socks5/Socks5BytestreamManager.java | 8 +- .../socks5/Socks5ClientForInitiator.java | 2 +- .../bytestreams/socks5/packet/Bytestream.java | 12 +- .../smackx/caps/EntityCapsManager.java | 2 +- .../cache/SimpleDirectoryPersistentCache.java | 4 +- .../smackx/chatstates/ChatStateManager.java | 4 +- .../smackx/commands/AdHocCommandManager.java | 4 +- .../smackx/delay/packet/DelayInformation.java | 14 +- .../smackx/disco/NodeInformationProvider.java | 4 +- .../smackx/disco/ServiceDiscoveryManager.java | 10 +- .../filetransfer/FileTransferNegotiator.java | 2 +- .../filetransfer/FileTransferRequest.java | 4 +- .../smackx/filetransfer/StreamNegotiator.java | 2 +- .../smackx/forward/packet/Forwarded.java | 12 +- .../forward/provider/ForwardedProvider.java | 2 +- .../smackx/iqlast/LastActivityManager.java | 6 +- .../smackx/iqprivate/PrivateDataManager.java | 2 +- .../iqprivate/packet/DefaultPrivateData.java | 4 +- .../smackx/iqregister/AccountManager.java | 4 +- .../jiveproperties/JivePropertiesManager.java | 8 +- .../packet/JivePropertiesExtension.java | 4 +- .../JivePropertiesExtensionProvider.java | 2 +- .../smackx/muc/MultiUserChat.java | 22 +-- .../org/jivesoftware/smackx/muc/RoomInfo.java | 2 +- .../muc/packet/GroupChatInvitation.java | 8 +- .../smackx/muc/packet/MUCAdmin.java | 2 +- .../smackx/muc/packet/MUCOwner.java | 2 +- .../smackx/muc/packet/MUCUser.java | 4 +- .../smackx/muc/provider/MUCUserProvider.java | 2 +- .../offline/packet/OfflineMessageInfo.java | 6 +- .../smackx/privacy/PrivacyListManager.java | 8 +- .../smackx/privacy/packet/PrivacyItem.java | 2 +- .../jivesoftware/smackx/pubsub/FormNode.java | 2 +- .../jivesoftware/smackx/pubsub/LeafNode.java | 2 +- .../org/jivesoftware/smackx/pubsub/Node.java | 8 +- .../smackx/pubsub/OptionsExtension.java | 2 +- .../smackx/pubsub/packet/PubSub.java | 2 +- .../pubsub/provider/PubSubProvider.java | 2 +- .../receipts/ReceiptReceivedListener.java | 2 +- .../smackx/search/ReportedData.java | 4 +- .../sharedgroups/packet/SharedGroupsInfo.java | 2 +- .../org/jivesoftware/smackx/xdata/Form.java | 6 +- .../smackx/xdata/packet/DataForm.java | 2 +- .../smackx/xhtmlim/packet/XHTMLExtension.java | 4 +- .../bytestreams/ibb/DataListenerTest.java | 2 +- .../InBandBytestreamSessionMessageTest.java | 2 +- .../ibb/InBandBytestreamSessionTest.java | 6 +- .../bytestreams/socks5/Socks5PacketUtils.java | 6 +- .../jivesoftware/util/ConnectionUtils.java | 2 +- .../java/org/jivesoftware/util/Protocol.java | 4 +- .../org/jivesoftware/smack/chat/Chat.java | 4 +- .../org/jivesoftware/smack/package-info.java | 22 ++- .../smack/roster/package-info.java | 22 ++- .../smackx/caps/package-info.java | 22 ++- .../smackx/filetransfer/package-info.java | 22 ++- .../smackx/httpfileupload/package-info.java | 25 +++- .../jivesoftware/smackx/iot/package-info.java | 22 ++- .../smackx/iqversion/package-info.java | 22 ++- .../jivesoftware/smackx/mam/package-info.java | 26 +++- .../jivesoftware/smackx/muc/package-info.java | 22 ++- .../smackx/omemo/package-info.java | 27 +++- .../org/jivesoftware/smackx/package-info.java | 22 ++- .../smackx/ping/package-info.java | 22 ++- .../smackx/pubsub/package-info.java | 22 ++- .../smackx/xdata/package-info.java | 22 ++- .../smackx/jingleold/JingleManager.java | 4 +- .../smackx/jingleold/JingleNegotiator.java | 8 +- .../smackx/jingleold/JingleSession.java | 34 ++--- .../jingleold/JingleSessionRequest.java | 4 +- .../jingleold/media/MediaNegotiator.java | 8 +- .../jingleold/mediaimpl/jmf/AudioChannel.java | 4 +- .../jingleold/nat/DatagramListener.java | 4 +- .../smackx/jingleold/nat/RTPBridge.java | 8 +- .../smackx/jingleold/nat/STUN.java | 8 +- .../jingleold/nat/TransportNegotiator.java | 12 +- .../smackx/jingleold/packet/Jingle.java | 6 +- .../smackx/workgroup/MetaData.java | 6 +- .../smackx/workgroup/agent/AgentSession.java | 2 +- .../workgroup/ext/forms/WorkgroupForm.java | 4 +- .../ext/history/AgentChatHistory.java | 4 +- .../workgroup/ext/history/ChatMetadata.java | 4 +- .../smackx/workgroup/ext/macros/Macros.java | 4 +- .../smackx/workgroup/ext/notes/ChatNotes.java | 6 +- .../smackx/workgroup/packet/AgentInfo.java | 6 +- .../smackx/workgroup/packet/AgentStatus.java | 4 +- .../workgroup/packet/AgentStatusRequest.java | 8 +- .../workgroup/packet/DepartQueuePacket.java | 4 +- .../workgroup/packet/MonitorPacket.java | 4 +- .../workgroup/packet/OccupantsInfo.java | 4 +- .../smackx/workgroup/packet/QueueDetails.java | 8 +- .../workgroup/packet/QueueOverview.java | 4 +- .../smackx/workgroup/packet/QueueUpdate.java | 6 +- .../workgroup/packet/RoomInvitation.java | 4 +- .../smackx/workgroup/packet/RoomTransfer.java | 4 +- .../smackx/workgroup/packet/SessionID.java | 4 +- .../workgroup/packet/TranscriptSearch.java | 6 +- .../smackx/workgroup/packet/UserID.java | 4 +- .../packet/WorkgroupInformation.java | 8 +- .../workgroup/settings/ChatSettings.java | 4 +- .../workgroup/settings/GenericSettings.java | 4 +- .../workgroup/settings/OfflineSettings.java | 4 +- .../workgroup/settings/SearchSettings.java | 4 +- .../workgroup/settings/SoundSettings.java | 4 +- .../settings/WorkgroupProperties.java | 4 +- .../smackx/workgroup/user/Workgroup.java | 2 +- .../smackx/xevent/packet/MessageEvent.java | 8 +- .../xevent/provider/MessageEventProvider.java | 2 +- .../smackx/xroster/packet/RosterExchange.java | 4 +- .../provider/RosterExchangeProvider.java | 2 +- .../smack/tcp/XMPPTCPConnection.java | 8 +- .../smack/tcp/PacketWriterTest.java | 2 +- 171 files changed, 911 insertions(+), 599 deletions(-) mode change 120000 => 100644 smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/package-info.java mode change 120000 => 100644 smack-integration-test/src/main/java/org/jivesoftware/smack/package-info.java mode change 120000 => 100644 smack-integration-test/src/main/java/org/jivesoftware/smack/roster/package-info.java mode change 120000 => 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/package-info.java mode change 120000 => 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java mode change 120000 => 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/httpfileupload/package-info.java mode change 120000 => 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/package-info.java mode change 120000 => 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java mode change 120000 => 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/mam/package-info.java mode change 120000 => 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/package-info.java mode change 120000 => 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/package-info.java mode change 120000 => 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java mode change 120000 => 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/package-info.java mode change 120000 => 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/pubsub/package-info.java mode change 120000 => 100644 smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/package-info.java diff --git a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java index 6049a76ab..49096704f 100644 --- a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java +++ b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java @@ -248,7 +248,7 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection { * Closes the connection by setting presence to unavailable and closing the * HTTP client. The shutdown logic will be used during a planned disconnection or when * dealing with an unexpected disconnection. Unlike {@link #disconnect()} the connection's - * BOSH stanza(/packet) reader will not be removed; thus connection's state is kept. + * BOSH stanza reader will not be removed; thus connection's state is kept. * */ @Override @@ -460,7 +460,7 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection { /** * Listens for XML traffic from the BOSH connection manager and parses it into - * stanza(/packet) objects. + * stanza objects. * * @author Guenther Niess */ diff --git a/smack-core/src/integration-test/java/org/jivesoftware/smack/IQTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/IQTest.java index 6b9ca12f6..acdc89e42 100644 --- a/smack-core/src/integration-test/java/org/jivesoftware/smack/IQTest.java +++ b/smack-core/src/integration-test/java/org/jivesoftware/smack/IQTest.java @@ -37,7 +37,7 @@ public class IQTest extends SmackTestCase { } /** - * Check that the server responds a 503 error code when the client sends an IQ stanza(/packet) with an + * Check that the server responds a 503 error code when the client sends an IQ stanza with an * invalid namespace. */ public void testInvalidNamespace() { diff --git a/smack-core/src/integration-test/java/org/jivesoftware/smack/filter/PacketIDFilterTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/filter/PacketIDFilterTest.java index b6a6dc8ff..c1b0e8c9b 100644 --- a/smack-core/src/integration-test/java/org/jivesoftware/smack/filter/PacketIDFilterTest.java +++ b/smack-core/src/integration-test/java/org/jivesoftware/smack/filter/PacketIDFilterTest.java @@ -49,7 +49,7 @@ public class PacketIDFilterTest extends TestCase { } /** - * Wraps the MockPacket class to always give an expected stanza(/packet) ID field. + * Wraps the MockPacket class to always give an expected stanza ID field. */ private class MockIDPacket extends MockPacket { private String id; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java index 3a9f283d0..38421ac89 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java @@ -132,24 +132,24 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { private final Collection collectors = new ConcurrentLinkedQueue<>(); /** - * List of PacketListeners that will be notified synchronously when a new stanza(/packet) was received. + * List of PacketListeners that will be notified synchronously when a new stanza was received. */ private final Map syncRecvListeners = new LinkedHashMap<>(); /** - * List of PacketListeners that will be notified asynchronously when a new stanza(/packet) was received. + * List of PacketListeners that will be notified asynchronously when a new stanza was received. */ private final Map asyncRecvListeners = new LinkedHashMap<>(); /** - * List of PacketListeners that will be notified when a new stanza(/packet) was sent. + * List of PacketListeners that will be notified when a new stanza was sent. */ private final Map sendListeners = new HashMap<>(); /** - * List of PacketListeners that will be notified when a new stanza(/packet) is about to be - * sent to the server. These interceptors may modify the stanza(/packet) before it is being + * List of PacketListeners that will be notified when a new stanza is about to be + * sent to the server. These interceptors may modify the stanza before it is being * actually sent to the server. */ private final Map interceptors = @@ -267,7 +267,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { }); /** - * A executor service used to invoke the callbacks of synchronous stanza(/packet) listeners. We use a executor service to + * A executor service used to invoke the callbacks of synchronous stanza listeners. We use a executor service to * decouple incoming stanza processing from callback invocation. It is important that order of callback invocation * is the same as the order of the incoming stanzas. Therefore we use a single threaded executor service. */ @@ -420,7 +420,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { /** * Logs in to the server using the strongest SASL mechanism supported by - * the server. If more than the connection's default stanza(/packet) timeout elapses in each step of the + * the server. If more than the connection's default stanza timeout elapses in each step of the * authentication process without a response from the server, a * {@link SmackException.NoResponseException} will be thrown. *

@@ -716,8 +716,8 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { * by closing the stream. The XMPPConnection can still be used for connecting to the server * again. A custom unavailable presence is useful for communicating offline presence * information such as "On vacation". Typically, just the status text of the presence - * stanza(/packet) is set with online information, but most XMPP servers will deliver the full - * presence stanza(/packet) with whatever data is set. + * stanza is set with online information, but most XMPP servers will deliver the full + * presence stanza with whatever data is set. * * @param unavailablePresence the optional presence stanza to send during shutdown. * @throws NotConnectedException @@ -874,12 +874,12 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { } /** - * Process all stanza(/packet) listeners for sending packets. + * Process all stanza listeners for sending packets. *

* Compared to {@link #firePacketInterceptors(Stanza)}, the listeners will be invoked in a new thread. *

* - * @param packet the stanza(/packet) to process. + * @param packet the stanza to process. */ @SuppressWarnings("javadoc") protected void firePacketSendingListeners(final Stanza packet) { @@ -949,12 +949,12 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { } /** - * Process interceptors. Interceptors may modify the stanza(/packet) that is about to be sent. - * Since the thread that requested to send the stanza(/packet) will invoke all interceptors, it + * Process interceptors. Interceptors may modify the stanza that is about to be sent. + * Since the thread that requested to send the stanza will invoke all interceptors, it * is important that interceptors perform their work as soon as possible so that the * thread does not remain blocked for a long period. * - * @param packet the stanza(/packet) that is going to be sent to the server + * @param packet the stanza that is going to be sent to the server */ private void firePacketInterceptors(Stanza packet) { List interceptorsToInvoke = new LinkedList<>(); @@ -1037,8 +1037,8 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { } /** - * Processes a stanza(/packet) after it's been fully parsed by looping through the installed - * stanza(/packet) collectors and listeners and letting them examine the stanza(/packet) to see if + * Processes a stanza after it's been fully parsed by looping through the installed + * stanza collectors and listeners and letting them examine the stanza to see if * they are a match with the filter. * * @param stanza the stanza to process. @@ -1059,14 +1059,14 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { /** * Invoke {@link StanzaCollector#processStanza(Stanza)} for every - * StanzaCollector with the given packet. Also notify the receive listeners with a matching stanza(/packet) filter about the packet. + * StanzaCollector with the given packet. Also notify the receive listeners with a matching stanza filter about the packet. *

* This method will be invoked by the connections incoming processing thread which may be shared across multiple connections and * thus it is important that no user code, e.g. in form of a callback, is invoked by this method. For the same reason, * this method must not block for an extended period of time. *

* - * @param packet the stanza(/packet) to notify the StanzaCollectors and receive listeners about. + * @param packet the stanza to notify the StanzaCollectors and receive listeners about. */ protected void invokeStanzaCollectorsAndNotifyRecvListeners(final Stanza packet) { if (packet instanceof IQ) { @@ -1302,7 +1302,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { } /** - * A wrapper class to associate a stanza(/packet) filter with a listener. + * A wrapper class to associate a stanza filter with a listener. */ protected static class ListenerWrapper { @@ -1310,9 +1310,9 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { private final StanzaFilter packetFilter; /** - * Create a class which associates a stanza(/packet) filter with a listener. + * Create a class which associates a stanza filter with a listener. * - * @param packetListener the stanza(/packet) listener. + * @param packetListener the stanza listener. * @param packetFilter the associated filter or null if it listen for all packets. */ public ListenerWrapper(StanzaListener packetListener, StanzaFilter packetFilter) { @@ -1330,7 +1330,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { } /** - * A wrapper class to associate a stanza(/packet) filter with an interceptor. + * A wrapper class to associate a stanza filter with an interceptor. */ protected static class InterceptorWrapper { @@ -1338,7 +1338,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { private final StanzaFilter packetFilter; /** - * Create a class which associates a stanza(/packet) filter with an interceptor. + * Create a class which associates a stanza filter with an interceptor. * * @param packetInterceptor the interceptor. * @param packetFilter the associated filter or null if it intercepts all packets. diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java index 5612a0b90..5cef0f1c9 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java @@ -153,7 +153,7 @@ public final class SmackConfiguration { } /** - * Gets the default max size of a stanza(/packet) collector before it will delete + * Gets the default max size of a stanza collector before it will delete * the older packets. * * @return The number of packets to queue before deleting older packets. @@ -163,7 +163,7 @@ public final class SmackConfiguration { } /** - * Sets the default max size of a stanza(/packet) collector before it will delete + * Sets the default max size of a stanza collector before it will delete * the older packets. * * @param collectorSize the number of packets to queue before deleting older packets. diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java index b5829a9e2..f52ce63a5 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java @@ -57,8 +57,8 @@ public class SmackException extends Exception { } /** - * Exception thrown always when there was no response to an request within the stanza(/packet) reply timeout of the used - * connection instance. You can modify (e.g. increase) the stanza(/packet) reply timeout with + * Exception thrown always when there was no response to an request within the stanza reply timeout of the used + * connection instance. You can modify (e.g. increase) the stanza reply timeout with * {@link XMPPConnection#setReplyTimeout(long)}. */ public static final class NoResponseException extends SmackException { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java b/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java index 3bd03a101..46a83530e 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java @@ -33,7 +33,7 @@ import org.jivesoftware.smack.packet.Stanza; * use than a {@link StanzaListener} when you need to wait for a specific * result.

* - * Each stanza(/packet) collector will queue up a configured number of packets for processing before + * Each stanza collector will queue up a configured number of packets for processing before * older packets are automatically dropped. The default number is retrieved by * {@link SmackConfiguration#getStanzaCollectorSize()}. * @@ -47,7 +47,7 @@ public class StanzaCollector { private final ArrayBlockingQueue resultQueue; /** - * The stanza(/packet) collector which timeout for the next result will get reset once this collector collects a stanza. + * The stanza collector which timeout for the next result will get reset once this collector collects a stanza. */ private final StanzaCollector collectorToReset; @@ -56,7 +56,7 @@ public class StanzaCollector { private boolean cancelled = false; /** - * Creates a new stanza(/packet) collector. If the stanza(/packet) filter is null, then + * Creates a new stanza collector. If the stanza filter is null, then * all packets will match this collector. * * @param connection the connection the collector is tied to. @@ -70,9 +70,9 @@ public class StanzaCollector { } /** - * Explicitly cancels the stanza(/packet) collector so that no more results are - * queued up. Once a stanza(/packet) collector has been cancelled, it cannot be - * re-enabled. Instead, a new stanza(/packet) collector must be created. + * Explicitly cancels the stanza collector so that no more results are + * queued up. Once a stanza collector has been cancelled, it cannot be + * re-enabled. Instead, a new stanza collector must be created. */ public void cancel() { // If the packet collector has already been cancelled, do nothing. @@ -83,10 +83,10 @@ public class StanzaCollector { } /** - * Returns the stanza(/packet) filter associated with this stanza(/packet) collector. The packet + * Returns the stanza filter associated with this stanza collector. The packet * filter is used to determine what packets are queued as results. * - * @return the stanza(/packet) filter. + * @return the stanza filter. * @deprecated use {@link #getStanzaFilter()} instead. */ @Deprecated @@ -105,12 +105,12 @@ public class StanzaCollector { } /** - * Polls to see if a stanza(/packet) is currently available and returns it, or + * Polls to see if a stanza is currently available and returns it, or * immediately returns null if no packets are currently in the * result queue. * * @param

type of the result stanza. - * @return the next stanza(/packet) result, or null if there are no more + * @return the next stanza result, or null if there are no more * results. */ @SuppressWarnings("unchecked") @@ -119,7 +119,7 @@ public class StanzaCollector { } /** - * Polls to see if a stanza(/packet) is currently available and returns it, or + * Polls to see if a stanza is currently available and returns it, or * immediately returns null if no packets are currently in the * result queue. *

@@ -139,7 +139,7 @@ public class StanzaCollector { } /** - * Returns the next available packet. The method call will block (not return) until a stanza(/packet) is + * Returns the next available packet. The method call will block (not return) until a stanza is * available. * * @param

type of the result stanza. @@ -172,7 +172,7 @@ public class StanzaCollector { /** * Returns the next available packet. The method call will block (not return) - * until a stanza(/packet) is available or the timeout has elapsed. If the + * until a stanza is available or the timeout has elapsed. If the * timeout elapses without a result, null will be returned. * * @param

type of the result stanza. @@ -266,7 +266,7 @@ public class StanzaCollector { } /** - * Get the number of collected stanzas this stanza(/packet) collector has collected so far. + * Get the number of collected stanzas this stanza collector has collected so far. * * @return the count of collected stanzas. * @since 4.1 @@ -276,10 +276,10 @@ public class StanzaCollector { } /** - * Processes a stanza(/packet) to see if it meets the criteria for this stanza(/packet) collector. - * If so, the stanza(/packet) is added to the result queue. + * Processes a stanza to see if it meets the criteria for this stanza collector. + * If so, the stanza is added to the result queue. * - * @param packet the stanza(/packet) to process. + * @param packet the stanza to process. */ protected void processStanza(Stanza packet) { if (packetFilter == null || packetFilter.accept(packet)) { @@ -302,9 +302,9 @@ public class StanzaCollector { } /** - * Get a new stanza(/packet) collector configuration instance. + * Get a new stanza collector configuration instance. * - * @return a new stanza(/packet) collector configuration. + * @return a new stanza collector configuration. */ public static Configuration newConfiguration() { return new Configuration(); @@ -319,7 +319,7 @@ public class StanzaCollector { } /** - * Set the stanza(/packet) filter used by this collector. If null, then all packets will + * Set the stanza filter used by this collector. If null, then all packets will * get collected by this collector. * * @param packetFilter diff --git a/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java b/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java index d48ff117e..91b4a12f6 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java @@ -23,7 +23,7 @@ import org.jivesoftware.smack.packet.Stanza; /** * Provides a mechanism to listen for packets that pass a specified filter. - * This allows event-style programming -- every time a new stanza(/packet) is found, + * This allows event-style programming -- every time a new stanza is found, * the {@link #processStanza(Stanza)} method will be called. This is the * opposite approach to the functionality provided by a {@link StanzaCollector} * which lets you block while waiting for results. @@ -40,14 +40,14 @@ import org.jivesoftware.smack.packet.Stanza; public interface StanzaListener { /** - * Process the next stanza(/packet) sent to this stanza(/packet) listener. + * Process the next stanza sent to this stanza listener. *

* If this listener is synchronous, then a single thread is responsible for invoking all listeners, so * it's very important that implementations of this method not block * for any extended period of time. *

* - * @param packet the stanza(/packet) to process. + * @param packet the stanza to process. * @throws NotConnectedException * @throws InterruptedException * @throws NotLoggedInException diff --git a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java index 57da400fe..ac11fba9a 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java @@ -207,27 +207,27 @@ public interface XMPPConnection { throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException; /** - * Creates a new stanza(/packet) collector collecting packets that are replies to packet. - * Does also send packet. The stanza(/packet) filter for the collector is an - * {@link IQReplyFilter}, guaranteeing that stanza(/packet) id and JID in the 'from' address have + * Creates a new stanza collector collecting packets that are replies to packet. + * Does also send packet. The stanza filter for the collector is an + * {@link IQReplyFilter}, guaranteeing that stanza id and JID in the 'from' address have * expected values. * - * @param packet the stanza(/packet) to filter responses from - * @return a new stanza(/packet) collector. + * @param packet the stanza to filter responses from + * @return a new stanza collector. * @throws NotConnectedException * @throws InterruptedException */ StanzaCollector createStanzaCollectorAndSend(IQ packet) throws NotConnectedException, InterruptedException; /** - * Creates a new stanza(/packet) collector for this connection. A stanza(/packet) filter determines + * Creates a new stanza collector for this connection. A stanza filter determines * which packets will be accumulated by the collector. A StanzaCollector is * more suitable to use than a {@link StanzaListener} when you need to wait for * a specific result. * - * @param packetFilter the stanza(/packet) filter to use. + * @param packetFilter the stanza filter to use. * @param packet the packet to send right after the collector got created - * @return a new stanza(/packet) collector. + * @return a new stanza collector. * @throws InterruptedException * @throws NotConnectedException */ @@ -235,7 +235,7 @@ public interface XMPPConnection { throws NotConnectedException, InterruptedException; /** - * Creates a new stanza(/packet) collector for this connection. A stanza(/packet) filter + * Creates a new stanza collector for this connection. A stanza filter * determines which packets will be accumulated by the collector. A * StanzaCollector is more suitable to use than a {@link StanzaListener} * when you need to wait for a specific result. @@ -247,95 +247,95 @@ public interface XMPPConnection { * if an exception is thrown, or otherwise you may leak the StanzaCollector. *

* - * @param packetFilter the stanza(/packet) filter to use. - * @return a new stanza(/packet) collector. + * @param packetFilter the stanza filter to use. + * @return a new stanza collector. */ StanzaCollector createStanzaCollector(StanzaFilter packetFilter); /** - * Create a new stanza(/packet) collector with the given stanza(/packet) collector configuration. + * Create a new stanza collector with the given stanza collector configuration. *

* Please make sure to cancel the collector when it is no longer required. See also * {@link #createStanzaCollector(StanzaFilter)}. *

* - * @param configuration the stanza(/packet) collector configuration. - * @return a new stanza(/packet) collector. + * @param configuration the stanza collector configuration. + * @return a new stanza collector. * @since 4.1 */ StanzaCollector createStanzaCollector(StanzaCollector.Configuration configuration); /** - * Remove a stanza(/packet) collector of this connection. + * Remove a stanza collector of this connection. * - * @param collector a stanza(/packet) collectors which was created for this connection. + * @param collector a stanza collectors which was created for this connection. */ void removeStanzaCollector(StanzaCollector collector); /** - * Registers a synchronous stanza(/packet) listener with this connection. A stanza(/packet) listener will be invoked only when - * an incoming stanza(/packet) is received. A stanza(/packet) filter determines which packets will be delivered to the listener. If - * the same stanza(/packet) listener is added again with a different filter, only the new filter will be used. + * Registers a synchronous stanza listener with this connection. A stanza listener will be invoked only when + * an incoming stanza is received. A stanza filter determines which packets will be delivered to the listener. If + * the same stanza listener is added again with a different filter, only the new filter will be used. *

- * Important: This stanza(/packet) listeners will be called in the same single thread that processes all - * incoming stanzas. Only use this kind of stanza(/packet) filter if it does not perform any XMPP activity that waits for a + * Important: This stanza listeners will be called in the same single thread that processes all + * incoming stanzas. Only use this kind of stanza filter if it does not perform any XMPP activity that waits for a * response. Consider using {@link #addAsyncStanzaListener(StanzaListener, StanzaFilter)} when possible, i.e. when * the invocation order doesn't have to be the same as the order of the arriving packets. If the order of the * arriving packets, consider using a {@link StanzaCollector} when possible. *

* - * @param packetListener the stanza(/packet) listener to notify of new received packets. - * @param packetFilter the stanza(/packet) filter to use. + * @param packetListener the stanza listener to notify of new received packets. + * @param packetFilter the stanza filter to use. * @see #addStanzaInterceptor(StanzaListener, StanzaFilter) * @since 4.1 */ void addSyncStanzaListener(StanzaListener packetListener, StanzaFilter packetFilter); /** - * Removes a stanza(/packet) listener for received packets from this connection. + * Removes a stanza listener for received packets from this connection. * - * @param packetListener the stanza(/packet) listener to remove. - * @return true if the stanza(/packet) listener was removed + * @param packetListener the stanza listener to remove. + * @return true if the stanza listener was removed * @since 4.1 */ boolean removeSyncStanzaListener(StanzaListener packetListener); /** - * Registers an asynchronous stanza(/packet) listener with this connection. A stanza(/packet) listener will be invoked only - * when an incoming stanza(/packet) is received. A stanza(/packet) filter determines which packets will be delivered to the listener. - * If the same stanza(/packet) listener is added again with a different filter, only the new filter will be used. + * Registers an asynchronous stanza listener with this connection. A stanza listener will be invoked only + * when an incoming stanza is received. A stanza filter determines which packets will be delivered to the listener. + * If the same stanza listener is added again with a different filter, only the new filter will be used. *

- * Unlike {@link #addAsyncStanzaListener(StanzaListener, StanzaFilter)} stanza(/packet) listeners added with this method will be - * invoked asynchronously in their own thread. Use this method if the order of the stanza(/packet) listeners must not depend + * Unlike {@link #addAsyncStanzaListener(StanzaListener, StanzaFilter)} stanza listeners added with this method will be + * invoked asynchronously in their own thread. Use this method if the order of the stanza listeners must not depend * on the order how the stanzas where received. *

* - * @param packetListener the stanza(/packet) listener to notify of new received packets. - * @param packetFilter the stanza(/packet) filter to use. + * @param packetListener the stanza listener to notify of new received packets. + * @param packetFilter the stanza filter to use. * @see #addStanzaInterceptor(StanzaListener, StanzaFilter) * @since 4.1 */ void addAsyncStanzaListener(StanzaListener packetListener, StanzaFilter packetFilter); /** - * Removes an asynchronous stanza(/packet) listener for received packets from this connection. + * Removes an asynchronous stanza listener for received packets from this connection. * - * @param packetListener the stanza(/packet) listener to remove. - * @return true if the stanza(/packet) listener was removed + * @param packetListener the stanza listener to remove. + * @return true if the stanza listener was removed * @since 4.1 */ boolean removeAsyncStanzaListener(StanzaListener packetListener); /** - * Registers a stanza(/packet) listener with this connection. The listener will be - * notified of every stanza(/packet) that this connection sends. A stanza(/packet) filter determines + * Registers a stanza listener with this connection. The listener will be + * notified of every stanza that this connection sends. A stanza filter determines * which packets will be delivered to the listener. Note that the thread * that writes packets will be used to invoke the listeners. Therefore, each - * stanza(/packet) listener should complete all operations quickly or use a different + * stanza listener should complete all operations quickly or use a different * thread for processing. * - * @param packetListener the stanza(/packet) listener to notify of sent packets. - * @param packetFilter the stanza(/packet) filter to use. + * @param packetListener the stanza listener to notify of sent packets. + * @param packetFilter the stanza filter to use. * @deprecated use {@link #addStanzaSendingListener} instead */ // TODO Remove in Smack 4.4 @@ -343,22 +343,22 @@ public interface XMPPConnection { void addPacketSendingListener(StanzaListener packetListener, StanzaFilter packetFilter); /** - * Registers a stanza(/packet) listener with this connection. The listener will be - * notified of every stanza(/packet) that this connection sends. A stanza(/packet) filter determines + * Registers a stanza listener with this connection. The listener will be + * notified of every stanza that this connection sends. A stanza filter determines * which packets will be delivered to the listener. Note that the thread * that writes packets will be used to invoke the listeners. Therefore, each - * stanza(/packet) listener should complete all operations quickly or use a different + * stanza listener should complete all operations quickly or use a different * thread for processing. * - * @param packetListener the stanza(/packet) listener to notify of sent packets. - * @param packetFilter the stanza(/packet) filter to use. + * @param packetListener the stanza listener to notify of sent packets. + * @param packetFilter the stanza filter to use. */ void addStanzaSendingListener(StanzaListener packetListener, StanzaFilter packetFilter); /** - * Removes a stanza(/packet) listener for sending packets from this connection. + * Removes a stanza listener for sending packets from this connection. * - * @param packetListener the stanza(/packet) listener to remove. + * @param packetListener the stanza listener to remove. * @deprecated use {@link #removeStanzaSendingListener} instead */ // TODO Remove in Smack 4.4 @@ -366,24 +366,24 @@ public interface XMPPConnection { void removePacketSendingListener(StanzaListener packetListener); /** - * Removes a stanza(/packet) listener for sending packets from this connection. + * Removes a stanza listener for sending packets from this connection. * - * @param packetListener the stanza(/packet) listener to remove. + * @param packetListener the stanza listener to remove. */ void removeStanzaSendingListener(StanzaListener packetListener); /** - * Registers a stanza(/packet) interceptor with this connection. The interceptor will be - * invoked every time a stanza(/packet) is about to be sent by this connection. Interceptors - * may modify the stanza(/packet) to be sent. A stanza(/packet) filter determines which packets + * Registers a stanza interceptor with this connection. The interceptor will be + * invoked every time a stanza is about to be sent by this connection. Interceptors + * may modify the stanza to be sent. A stanza filter determines which packets * will be delivered to the interceptor. * *

* NOTE: For a similar functionality on incoming packets, see {@link #addAsyncStanzaListener(StanzaListener, StanzaFilter)}. *

* - * @param packetInterceptor the stanza(/packet) interceptor to notify of packets about to be sent. - * @param packetFilter the stanza(/packet) filter to use. + * @param packetInterceptor the stanza interceptor to notify of packets about to be sent. + * @param packetFilter the stanza filter to use. * @deprecated use {@link #addStanzaInterceptor} instead */ // TODO Remove in Smack 4.4 @@ -391,24 +391,24 @@ public interface XMPPConnection { void addPacketInterceptor(StanzaListener packetInterceptor, StanzaFilter packetFilter); /** - * Registers a stanza(/packet) interceptor with this connection. The interceptor will be - * invoked every time a stanza(/packet) is about to be sent by this connection. Interceptors - * may modify the stanza(/packet) to be sent. A stanza(/packet) filter determines which packets + * Registers a stanza interceptor with this connection. The interceptor will be + * invoked every time a stanza is about to be sent by this connection. Interceptors + * may modify the stanza to be sent. A stanza filter determines which packets * will be delivered to the interceptor. * *

* NOTE: For a similar functionality on incoming packets, see {@link #addAsyncStanzaListener(StanzaListener, StanzaFilter)}. *

* - * @param packetInterceptor the stanza(/packet) interceptor to notify of packets about to be sent. - * @param packetFilter the stanza(/packet) filter to use. + * @param packetInterceptor the stanza interceptor to notify of packets about to be sent. + * @param packetFilter the stanza filter to use. */ void addStanzaInterceptor(StanzaListener packetInterceptor, StanzaFilter packetFilter); /** - * Removes a stanza(/packet) interceptor. + * Removes a stanza interceptor. * - * @param packetInterceptor the stanza(/packet) interceptor to remove. + * @param packetInterceptor the stanza interceptor to remove. * @deprecated user {@link #removeStanzaInterceptor} instead */ // TODO Remove in Smack 4.4 @@ -416,9 +416,9 @@ public interface XMPPConnection { void removePacketInterceptor(StanzaListener packetInterceptor); /** - * Removes a stanza(/packet) interceptor. + * Removes a stanza interceptor. * - * @param packetInterceptor the stanza(/packet) interceptor to remove. + * @param packetInterceptor the stanza interceptor to remove. */ void removeStanzaInterceptor(StanzaListener packetInterceptor); @@ -431,7 +431,7 @@ public interface XMPPConnection { long getReplyTimeout(); /** - * Set the stanza(/packet) reply timeout in milliseconds. In most cases, Smack will throw a + * Set the stanza reply timeout in milliseconds. In most cases, Smack will throw a * {@link NoResponseException} if no reply to a request was received within the timeout period. * * @param timeout for a reply in milliseconds @@ -480,13 +480,13 @@ public interface XMPPConnection { FromMode getFromMode(); /** - * Get the feature stanza(/packet) extensions for a given stream feature of the + * Get the feature stanza extensions for a given stream feature of the * server, or null if the server doesn't support that feature. * * @param {@link ExtensionElement} type of the feature. * @param element * @param namespace - * @return a stanza(/packet) extensions of the feature or null + * @return a stanza extensions of the feature or null */ F getFeature(String element, String namespace); @@ -659,9 +659,9 @@ public interface XMPPConnection { /** * Add a callback that is called exactly once and synchronously with the incoming stanza that matches the given - * stanza(/packet) filter. + * stanza filter. * - * @param callback the callback invoked once the stanza(/packet) filter matches a stanza. + * @param callback the callback invoked once the stanza filter matches a stanza. * @param packetFilter the filter to match stanzas or null to match all. */ void addOneTimeSyncCallback(StanzaListener callback, StanzaFilter packetFilter); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/AndFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/AndFilter.java index 216c3ddde..cbdccd6e6 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/AndFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/AndFilter.java @@ -20,7 +20,7 @@ package org.jivesoftware.smack.filter; import org.jivesoftware.smack.packet.Stanza; /** - * Implements the logical AND operation over two or more stanza(/packet) filters. + * Implements the logical AND operation over two or more stanza filters. * In other words, packets pass this filter if they pass all of the filters. * * @author Matt Tucker diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java index 8c20d5254..8695d8a5a 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java @@ -24,7 +24,7 @@ import org.jxmpp.jid.Jid; * Filter for packets where the "from" field exactly matches a specified JID. If the specified * address is a bare JID then the filter will match any address whose bare JID matches the * specified JID. But if the specified address is a full JID then the filter will only match - * if the sender of the stanza(/packet) matches the specified resource. + * if the sender of the stanza matches the specified resource. * * @author Gaston Dombiak */ @@ -37,7 +37,7 @@ public final class FromMatchesFilter extends AbstractFromToMatchesFilter { * filter address. The second parameter specifies whether the full or the bare addresses are * compared. * - * @param address The address to filter for. If null is given, the stanza(/packet) must not + * @param address The address to filter for. If null is given, the stanza must not * have a from address. * @param ignoreResourcepart */ diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java index 981813b82..46bba980d 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java @@ -30,7 +30,7 @@ import org.jxmpp.jid.Jid; /** * Filters for packets which are a valid reply to an IQ request. *

- * Such a stanza(/packet) must have the same stanza(/packet) id and must be an IQ stanza(/packet) of type + * Such a stanza must have the same stanza id and must be an IQ stanza of type * RESULT or ERROR. Moreover, it is necessary to check * the from address to ignore forged replies. *

@@ -63,7 +63,7 @@ public class IQReplyFilter implements StanzaFilter { /** * Filters for packets which are a valid reply to an IQ request. *

- * Such a stanza(/packet) must have the same stanza(/packet) id and must be an IQ stanza(/packet) of type + * Such a stanza must have the same stanza id and must be an IQ stanza of type * RESULT or ERROR. Moreover, it is necessary to check * the from address to ignore forged replies. *

diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/IQTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/IQTypeFilter.java index fe50083df..1e39336bb 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/IQTypeFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/IQTypeFilter.java @@ -21,7 +21,7 @@ import org.jivesoftware.smack.packet.IQ.Type; import org.jivesoftware.smack.util.Objects; /** - * A filter for IQ stanza(/packet) types. Returns true only if the stanza(/packet) is an IQ packet + * A filter for IQ stanza types. Returns true only if the stanza is an IQ packet * and it matches the type provided in the constructor. * * @author Alexander Wenckus diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/NotFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/NotFilter.java index c836be1c1..006b5f4f9 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/NotFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/NotFilter.java @@ -21,7 +21,7 @@ import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.Objects; /** - * Implements the logical NOT operation on a stanza(/packet) filter. In other words, packets + * Implements the logical NOT operation on a stanza filter. In other words, packets * pass this filter if they do not pass the supplied filter. * * @author Matt Tucker diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/OrFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/OrFilter.java index fd5ffd0ae..8f80e775f 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/OrFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/OrFilter.java @@ -20,7 +20,7 @@ package org.jivesoftware.smack.filter; import org.jivesoftware.smack.packet.Stanza; /** - * Implements the logical OR operation over two or more stanza(/packet) filters. In + * Implements the logical OR operation over two or more stanza filters. In * other words, packets pass this filter if they pass any of the filters. * * @author Matt Tucker diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketExtensionFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketExtensionFilter.java index a310fafdc..c3036aeed 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketExtensionFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketExtensionFilter.java @@ -22,7 +22,7 @@ import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.StringUtils; /** - * Filters for packets with a particular type of stanza(/packet) extension. + * Filters for packets with a particular type of stanza extension. * * @author Matt Tucker * @deprecated use {@link StanzaExtensionFilter} instead. @@ -34,12 +34,12 @@ public class PacketExtensionFilter implements StanzaFilter { private final String namespace; /** - * Creates a new stanza(/packet) extension filter. Packets will pass the filter if - * they have a stanza(/packet) extension that matches the specified element name + * Creates a new stanza extension filter. Packets will pass the filter if + * they have a stanza extension that matches the specified element name * and namespace. * - * @param elementName the XML element name of the stanza(/packet) extension. - * @param namespace the XML namespace of the stanza(/packet) extension. + * @param elementName the XML element name of the stanza extension. + * @param namespace the XML namespace of the stanza extension. */ public PacketExtensionFilter(String elementName, String namespace) { StringUtils.requireNotNullOrEmpty(namespace, "namespace must not be null or empty"); @@ -49,17 +49,17 @@ public class PacketExtensionFilter implements StanzaFilter { } /** - * Creates a new stanza(/packet) extension filter. Packets will pass the filter if they have a packet + * Creates a new stanza extension filter. Packets will pass the filter if they have a packet * extension that matches the specified namespace. * - * @param namespace the XML namespace of the stanza(/packet) extension. + * @param namespace the XML namespace of the stanza extension. */ public PacketExtensionFilter(String namespace) { this(null, namespace); } /** - * Creates a new stanza(/packet) extension filter for the given stanza(/packet) extension. + * Creates a new stanza extension filter for the given stanza extension. * * @param packetExtension */ diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java index 6452626e8..bef397d59 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java @@ -19,24 +19,24 @@ package org.jivesoftware.smack.filter; /** * Defines a way to filter packets for particular attributes. Stanza(/Packet) filters are used when - * constructing stanza(/packet) listeners or collectors -- the filter defines what packets match the criteria - * of the collector or listener for further stanza(/packet) processing. + * constructing stanza listeners or collectors -- the filter defines what packets match the criteria + * of the collector or listener for further stanza processing. *

* Several simple filters are pre-defined. These filters can be logically combined for more complex - * stanza(/packet) filtering by using the {@link org.jivesoftware.smack.filter.AndFilter AndFilter} and + * stanza filtering by using the {@link org.jivesoftware.smack.filter.AndFilter AndFilter} and * {@link org.jivesoftware.smack.filter.OrFilter OrFilter} filters. It's also possible to define * your own filters by implementing this interface. The code example below creates a trivial filter * for packets with a specific ID (real code should use {@link StanzaIdFilter} instead). * * 

- * // Use an anonymous inner class to define a stanza(/packet) filter that returns
- * // all packets that have a stanza(/packet) ID of "RS145".
+ * // Use an anonymous inner class to define a stanza filter that returns
+ * // all packets that have a stanza ID of "RS145".
  * PacketFilter myFilter = new PacketFilter() {
  *     public boolean accept(Packet packet) {
  *         return "RS145".equals(packet.getStanzaId());
  *     }
  * };
- * // Create a new stanza(/packet) collector using the filter we created.
+ * // Create a new stanza collector using the filter we created.
  * StanzaCollector myCollector = packetReader.createStanzaCollector(myFilter);
  *
* diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketIDFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketIDFilter.java index d596f9ef9..d40c611a0 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketIDFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketIDFilter.java @@ -21,7 +21,7 @@ import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.util.StringUtils; /** - * Filters for packets with a particular stanza(/packet) ID. + * Filters for packets with a particular stanza ID. * * @author Matt Tucker * @deprecated use {@link StanzaIdFilter} instead. @@ -32,9 +32,9 @@ public class PacketIDFilter implements StanzaFilter { private final String packetID; /** - * Creates a new stanza(/packet) ID filter using the specified packet's ID. + * Creates a new stanza ID filter using the specified packet's ID. * - * @param packet the stanza(/packet) which the ID is taken from. + * @param packet the stanza which the ID is taken from. * @deprecated use {@link StanzaIdFilter#StanzaIdFilter(Stanza)} instead. */ @Deprecated @@ -43,9 +43,9 @@ public class PacketIDFilter implements StanzaFilter { } /** - * Creates a new stanza(/packet) ID filter using the specified stanza(/packet) ID. + * Creates a new stanza ID filter using the specified stanza ID. * - * @param packetID the stanza(/packet) ID to filter for. + * @param packetID the stanza ID to filter for. * @deprecated use {@link StanzaIdFilter#StanzaIdFilter(Stanza)} instead. */ @Deprecated diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketTypeFilter.java index a56e7a380..f5498ae29 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketTypeFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketTypeFilter.java @@ -42,7 +42,7 @@ public class PacketTypeFilter implements StanzaFilter { private final Class packetType; /** - * Creates a new stanza(/packet) type filter that will filter for packets that are the + * Creates a new stanza type filter that will filter for packets that are the * same type as packetType. * * @param packetType the Class type. diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/PresenceTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/PresenceTypeFilter.java index 95a2d3013..19011f04f 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/PresenceTypeFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/PresenceTypeFilter.java @@ -21,7 +21,7 @@ import org.jivesoftware.smack.packet.Presence.Type; import org.jivesoftware.smack.util.Objects; /** - * A filter for Presence types. Returns true only if the stanza is an Presence stanza(/packet) and it matches the type provided in the + * A filter for Presence types. Returns true only if the stanza is an Presence stanza and it matches the type provided in the * constructor. */ public final class PresenceTypeFilter extends FlexibleStanzaTypeFilter { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java index 92fe0229c..e747e87dc 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java @@ -51,7 +51,7 @@ public interface StanzaFilter { /** * Tests whether or not the specified stanza should pass the filter. * - * @param stanza the stanza(/packet) to test. + * @param stanza the stanza to test. * @return true if and only if stanza passes the filter. */ boolean accept(Stanza stanza); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaTypeFilter.java index 73c438cdf..a2bfb9f82 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaTypeFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaTypeFilter.java @@ -42,7 +42,7 @@ public final class StanzaTypeFilter implements StanzaFilter { private final Class packetType; /** - * Creates a new stanza(/packet) type filter that will filter for packets that are the + * Creates a new stanza type filter that will filter for packets that are the * same type as packetType. * * @param packetType the Class type. diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java index e2c45b014..17229df54 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java @@ -91,11 +91,11 @@ public class AbstractError { } /** - * Returns the first stanza(/packet) extension that matches the specified element name and + * Returns the first stanza extension that matches the specified element name and * namespace, or null if it doesn't exist. * - * @param elementName the XML element name of the stanza(/packet) extension. - * @param namespace the XML element namespace of the stanza(/packet) extension. + * @param elementName the XML element name of the stanza extension. + * @param namespace the XML element namespace of the stanza extension. * @param type of the ExtensionElement. * @return the extension, or null if it doesn't exist. */ diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java index a8dfcffa3..a84bfbbbe 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java @@ -21,8 +21,8 @@ import org.jxmpp.jid.EntityFullJid; import org.jxmpp.jid.parts.Resourcepart; /** - * IQ stanza(/packet) used by Smack to bind a resource and to obtain the jid assigned by the server. - * There are two ways to bind a resource. One is simply sending an empty Bind stanza(/packet) where the + * IQ stanza used by Smack to bind a resource and to obtain the jid assigned by the server. + * There are two ways to bind a resource. One is simply sending an empty Bind stanza where the * server will assign a new resource for this connection. The other option is to set a desired * resource but the server may return a modified version of the sent resource.

* diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultExtensionElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultExtensionElement.java index e51b5b4ee..04d5d1c52 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultExtensionElement.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultExtensionElement.java @@ -27,7 +27,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder; /** * Default implementation of the ExtensionElement interface. Unless a ExtensionElementProvider * is registered with {@link org.jivesoftware.smack.provider.ProviderManager ProviderManager}, - * instances of this class will be returned when getting stanza(/packet) extensions.

+ * instances of this class will be returned when getting stanza extensions.

* * This class provides a very simple representation of an XML sub-document. Each element * is a key in a Map with its CDATA being the value. For example, given the following @@ -55,7 +55,7 @@ public class DefaultExtensionElement implements ExtensionElement { private Map map; /** - * Creates a new generic stanza(/packet) extension. + * Creates a new generic stanza extension. * * @param elementName the name of the element of the XML sub-document. * @param namespace the namespace of the element. @@ -68,7 +68,7 @@ public class DefaultExtensionElement implements ExtensionElement { /** * Returns the XML element name of the extension sub-packet root element. * - * @return the XML element name of the stanza(/packet) extension. + * @return the XML element name of the stanza extension. */ @Override public String getElementName() { @@ -78,7 +78,7 @@ public class DefaultExtensionElement implements ExtensionElement { /** * Returns the XML namespace of the extension sub-packet root element. * - * @return the XML namespace of the stanza(/packet) extension. + * @return the XML namespace of the stanza extension. */ @Override public String getNamespace() { @@ -99,7 +99,7 @@ public class DefaultExtensionElement implements ExtensionElement { /** * Returns an unmodifiable collection of the names that can be used to get - * values of the stanza(/packet) extension. + * values of the stanza extension. * * @return the names. */ @@ -111,7 +111,7 @@ public class DefaultExtensionElement implements ExtensionElement { } /** - * Returns a stanza(/packet) extension value given a name. + * Returns a stanza extension value given a name. * * @param name the name. * @return the value. @@ -124,7 +124,7 @@ public class DefaultExtensionElement implements ExtensionElement { } /** - * Sets a stanza(/packet) extension value using the given name. + * Sets a stanza extension value using the given name. * * @param name the name. * @param value the value. diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java index 9bdb6194a..f1285d967 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java @@ -19,14 +19,14 @@ package org.jivesoftware.smack.packet; /** * Interface to represent a XML element. This is similar to {@link ExtensionElement}, but does not - * carry a namespace and is usually included as child element of an stanza(/packet) extension. + * carry a namespace and is usually included as child element of an stanza extension. */ public interface Element { /** * Returns the XML representation of this Element. * - * @return the stanza(/packet) extension as XML. + * @return the stanza extension as XML. */ CharSequence toXML(); } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java index 049e66f38..c9ddf3345 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java @@ -25,12 +25,12 @@ import org.jivesoftware.smack.util.XmlStringBuilder; /** * The base IQ (Info/Query) packet. IQ packets are used to get and set information * on the server, including authentication, roster operations, and creating - * accounts. Each IQ stanza(/packet) has a specific type that indicates what type of action + * accounts. Each IQ stanza has a specific type that indicates what type of action * is being taken: "get", "set", "result", or "error".

* * IQ packets can contain a single child element that exists in a specific XML * namespace. The combination of the element name and namespace determines what - * type of IQ stanza(/packet) it is. Some example IQ subpacket snippets:

    + * type of IQ stanza it is. Some example IQ subpacket snippets:
      * *
    • <query xmlns="jabber:iq:auth"> -- an authentication IQ. *
    • <query xmlns="jabber:iq:private"> -- a private storage IQ. @@ -237,7 +237,7 @@ public abstract class IQ extends Stanza { /** * Convenience method to create a new empty {@link Type#result IQ.Type.result} * IQ based on a {@link Type#get IQ.Type.get} or {@link Type#set IQ.Type.set} - * IQ. The new stanza(/packet) will be initialized with:
        + * IQ. The new stanza will be initialized with:
          *
        • The sender set to the recipient of the originating IQ. *
        • The recipient set to the sender of the originating IQ. *
        • The type set to {@link Type#result IQ.Type.result}. @@ -246,7 +246,7 @@ public abstract class IQ extends Stanza { *
        * * @param request the {@link Type#get IQ.Type.get} or {@link Type#set IQ.Type.set} IQ packet. - * @throws IllegalArgumentException if the IQ stanza(/packet) does not have a type of + * @throws IllegalArgumentException if the IQ stanza does not have a type of * {@link Type#get IQ.Type.get} or {@link Type#set IQ.Type.set}. * @return a new {@link Type#result IQ.Type.result} IQ based on the originating IQ. */ @@ -257,7 +257,7 @@ public abstract class IQ extends Stanza { /** * Convenience method to create a new {@link Type#error IQ.Type.error} IQ * based on a {@link Type#get IQ.Type.get} or {@link Type#set IQ.Type.set} - * IQ. The new stanza(/packet) will be initialized with:
          + * IQ. The new stanza will be initialized with:
            *
          • The sender set to the recipient of the originating IQ. *
          • The recipient set to the sender of the originating IQ. *
          • The type set to {@link Type#error IQ.Type.error}. @@ -268,7 +268,7 @@ public abstract class IQ extends Stanza { * * @param request the {@link Type#get IQ.Type.get} or {@link Type#set IQ.Type.set} IQ packet. * @param error the error to associate with the created IQ packet. - * @throws IllegalArgumentException if the IQ stanza(/packet) does not have a type of + * @throws IllegalArgumentException if the IQ stanza does not have a type of * {@link Type#get IQ.Type.get} or {@link Type#set IQ.Type.set}. * @return a new {@link Type#error IQ.Type.error} IQ based on the originating IQ. */ @@ -294,7 +294,7 @@ public abstract class IQ extends Stanza { /** * Convenience method to create a new {@link Type#error IQ.Type.error} IQ * based on a {@link Type#get IQ.Type.get} or {@link Type#set IQ.Type.set} - * IQ. The new stanza(/packet) will be initialized with:
              + * IQ. The new stanza will be initialized with:
                *
              • The sender set to the recipient of the originating IQ. *
              • The recipient set to the sender of the originating IQ. *
              • The type set to {@link Type#error IQ.Type.error}. @@ -305,7 +305,7 @@ public abstract class IQ extends Stanza { * * @param request the {@link Type#get IQ.Type.get} or {@link Type#set IQ.Type.set} IQ packet. * @param error the error to associate with the created IQ packet. - * @throws IllegalArgumentException if the IQ stanza(/packet) does not have a type of + * @throws IllegalArgumentException if the IQ stanza does not have a type of * {@link Type#get IQ.Type.get} or {@link Type#set IQ.Type.set}. * @return a new {@link Type#error IQ.Type.error} IQ based on the originating IQ. */ diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/NamedElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/NamedElement.java index 53d735d14..bdfa0e2cf 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/NamedElement.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/NamedElement.java @@ -19,7 +19,7 @@ package org.jivesoftware.smack.packet; /** * Interface to represent a XML element. This is similar to {@link ExtensionElement}, but does not - * carry a namespace and is usually included as child element of an stanza(/packet) extension. + * carry a namespace and is usually included as child element of an stanza extension. */ public interface NamedElement extends Element { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java index 1f24e8eec..b26001e17 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java @@ -47,7 +47,7 @@ public interface Packet extends TopLevelStreamElement { String getPacketID(); /** - * Sets the unique ID of the packet. To indicate that a stanza(/packet) has no id + * Sets the unique ID of the packet. To indicate that a stanza has no id * pass null as the packet's id value. * * @param id the unique ID for the packet. @@ -63,39 +63,39 @@ public interface Packet extends TopLevelStreamElement { void setPacketID(String packetID); /** - * Returns who the stanza(/packet) is being sent "to", or null if + * Returns who the stanza is being sent "to", or null if * the value is not set. The XMPP protocol often makes the "to" * attribute optional, so it does not always need to be set.

                * - * @return who the stanza(/packet) is being sent to, or null if the + * @return who the stanza is being sent to, or null if the * value has not been set. */ String getTo(); /** - * Sets who the stanza(/packet) is being sent "to". The XMPP protocol often makes + * Sets who the stanza is being sent "to". The XMPP protocol often makes * the "to" attribute optional, so it does not always need to be set. * - * @param to who the stanza(/packet) is being sent to. + * @param to who the stanza is being sent to. */ void setTo(String to); /** - * Returns who the stanza(/packet) is being sent "from" or null if + * Returns who the stanza is being sent "from" or null if * the value is not set. The XMPP protocol often makes the "from" * attribute optional, so it does not always need to be set.

                * - * @return who the stanza(/packet) is being sent from, or null if the + * @return who the stanza is being sent from, or null if the * value has not been set. */ String getFrom(); /** - * Sets who the stanza(/packet) is being sent "from". The XMPP protocol often + * Sets who the stanza is being sent "from". The XMPP protocol often * makes the "from" attribute optional, so it does not always need to * be set. * - * @param from who the stanza(/packet) is being sent to. + * @param from who the stanza is being sent to. */ void setFrom(String from); @@ -128,16 +128,16 @@ public interface Packet extends TopLevelStreamElement { void setLanguage(String language); /** - * Returns a copy of the stanza(/packet) extensions attached to the packet. + * Returns a copy of the stanza extensions attached to the packet. * - * @return the stanza(/packet) extensions. + * @return the stanza extensions. */ List getExtensions(); /** * Return a set of all extensions with the given element name and namespace. *

                - * Changes to the returned set will update the stanza(/packet) extensions, if the returned set is not the empty set. + * Changes to the returned set will update the stanza extensions, if the returned set is not the empty set. *

                * * @param elementName the element name, must not be null. @@ -148,18 +148,18 @@ public interface Packet extends TopLevelStreamElement { Set getExtensions(String elementName, String namespace); /** - * Returns the first extension of this stanza(/packet) that has the given namespace. + * Returns the first extension of this stanza that has the given namespace. *

                * When possible, use {@link #getExtension(String,String)} instead. *

                * * @param namespace the namespace of the extension that is desired. - * @return the stanza(/packet) extension with the given namespace. + * @return the stanza extension with the given namespace. */ ExtensionElement getExtension(String namespace); /** - * Returns the first stanza(/packet) extension that matches the specified element name and + * Returns the first stanza extension that matches the specified element name and * namespace, or null if it doesn't exist. If the provided elementName is null, * only the namespace is matched. Stanza(/Packet) extensions are * are arbitrary XML sub-documents in standard XMPP packets. By default, a @@ -169,60 +169,60 @@ public interface Packet extends TopLevelStreamElement { * class to handle custom parsing. In that case, the type of the Object * will be determined by the provider. * - * @param elementName the XML element name of the stanza(/packet) extension. (May be null) - * @param namespace the XML element namespace of the stanza(/packet) extension. + * @param elementName the XML element name of the stanza extension. (May be null) + * @param namespace the XML element namespace of the stanza extension. * @param type of the ExtensionElement. * @return the extension, or null if it doesn't exist. */ PE getExtension(String elementName, String namespace); /** - * Adds a stanza(/packet) extension to the packet. Does nothing if extension is null. + * Adds a stanza extension to the packet. Does nothing if extension is null. * - * @param extension a stanza(/packet) extension. + * @param extension a stanza extension. */ void addExtension(ExtensionElement extension); /** - * Adds a collection of stanza(/packet) extensions to the packet. Does nothing if extensions is null. + * Adds a collection of stanza extensions to the packet. Does nothing if extensions is null. * - * @param extensions a collection of stanza(/packet) extensions + * @param extensions a collection of stanza extensions */ void addExtensions(Collection extensions); /** - * Check if a stanza(/packet) extension with the given element and namespace exists. + * Check if a stanza extension with the given element and namespace exists. *

                * The argument elementName may be null. *

                * * @param elementName * @param namespace - * @return true if a stanza(/packet) extension exists, false otherwise. + * @return true if a stanza extension exists, false otherwise. */ boolean hasExtension(String elementName, String namespace); /** - * Check if a stanza(/packet) extension with the given namespace exists. + * Check if a stanza extension with the given namespace exists. * * @param namespace - * @return true if a stanza(/packet) extension exists, false otherwise. + * @return true if a stanza extension exists, false otherwise. */ boolean hasExtension(String namespace); /** - * Remove the stanza(/packet) extension with the given elementName and namespace. + * Remove the stanza extension with the given elementName and namespace. * * @param elementName * @param namespace - * @return the removed stanza(/packet) extension or null. + * @return the removed stanza extension or null. */ ExtensionElement removeExtension(String elementName, String namespace); /** - * Removes a stanza(/packet) extension from the packet. + * Removes a stanza extension from the packet. * - * @param extension the stanza(/packet) extension to remove. - * @return the removed stanza(/packet) extension or null. + * @param extension the stanza extension to remove. + * @return the removed stanza extension or null. */ ExtensionElement removeExtension(ExtensionElement extension); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java index d2e46e656..7d2278c88 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java @@ -28,7 +28,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder; import org.jxmpp.jid.Jid; /** - * Represents XMPP presence packets. Every presence stanza(/packet) has a type, which is one of + * Represents XMPP presence packets. Every presence stanza has a type, which is one of * the following values: *
                  *
                • {@link Presence.Type#available available} -- (Default) indicates the user is available to @@ -40,7 +40,7 @@ import org.jxmpp.jid.Jid; * sender's presence. *
                • {@link Presence.Type#unsubscribed unsubscribed} -- grant removal of subscription to * sender's presence. - *
                • {@link Presence.Type#error error} -- the presence stanza(/packet) contains an error message. + *
                • {@link Presence.Type#error error} -- the presence stanza contains an error message. *

                * * A number of attributes are optional: @@ -363,7 +363,7 @@ public final class Presence extends Stanza implements TypedCloneable { unsubscribed, /** - * The presence stanza(/packet) contains an error message. + * The presence stanza contains an error message. */ error, diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Session.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Session.java index 8f7d9acda..448a2009c 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Session.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Session.java @@ -20,7 +20,7 @@ package org.jivesoftware.smack.packet; import org.jivesoftware.smack.util.XmlStringBuilder; /** - * IQ stanza(/packet) that will be sent to the server to establish a session.

                + * IQ stanza that will be sent to the server to establish a session.

                * * If a server supports sessions, it MUST include a session element in the * stream features it advertises to a client after the completion of stream authentication. diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java index daa46d7bc..d5693f491 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java @@ -115,7 +115,7 @@ public abstract class Stanza implements TopLevelStreamElement { } /** - * Sets the unique ID of the packet. To indicate that a stanza(/packet) has no id + * Sets the unique ID of the packet. To indicate that a stanza has no id * pass null as the packet's id value. * * @param id the unique ID for the packet. @@ -163,11 +163,11 @@ public abstract class Stanza implements TopLevelStreamElement { } /** - * Returns who the stanza(/packet) is being sent "to", or null if + * Returns who the stanza is being sent "to", or null if * the value is not set. The XMPP protocol often makes the "to" * attribute optional, so it does not always need to be set.

                * - * @return who the stanza(/packet) is being sent to, or null if the + * @return who the stanza is being sent to, or null if the * value has not been set. */ public Jid getTo() { @@ -175,10 +175,10 @@ public abstract class Stanza implements TopLevelStreamElement { } /** - * Sets who the stanza(/packet) is being sent "to". The XMPP protocol often makes + * Sets who the stanza is being sent "to". The XMPP protocol often makes * the "to" attribute optional, so it does not always need to be set. * - * @param to who the stanza(/packet) is being sent to. + * @param to who the stanza is being sent to. * @throws IllegalArgumentException if to is not a valid JID String. * @deprecated use {@link #setTo(Jid)} instead. */ @@ -205,11 +205,11 @@ public abstract class Stanza implements TopLevelStreamElement { } /** - * Returns who the stanza(/packet) is being sent "from" or null if + * Returns who the stanza is being sent "from" or null if * the value is not set. The XMPP protocol often makes the "from" * attribute optional, so it does not always need to be set.

                * - * @return who the stanza(/packet) is being sent from, or null if the + * @return who the stanza is being sent from, or null if the * value has not been set. */ public Jid getFrom() { @@ -217,11 +217,11 @@ public abstract class Stanza implements TopLevelStreamElement { } /** - * Sets who the stanza(/packet) is being sent "from". The XMPP protocol often + * Sets who the stanza is being sent "from". The XMPP protocol often * makes the "from" attribute optional, so it does not always need to * be set. * - * @param from who the stanza(/packet) is being sent to. + * @param from who the stanza is being sent to. * @throws IllegalArgumentException if from is not a valid JID String. * @deprecated use {@link #setFrom(Jid)} instead. */ @@ -315,7 +315,7 @@ public abstract class Stanza implements TopLevelStreamElement { /** * Return a list of all extensions with the given element name and namespace. *

                - * Changes to the returned set will update the stanza(/packet) extensions, if the returned set is not the empty set. + * Changes to the returned set will update the stanza extensions, if the returned set is not the empty set. *

                * * @param elementName the element name, must not be null. @@ -331,13 +331,13 @@ public abstract class Stanza implements TopLevelStreamElement { } /** - * Returns the first extension of this stanza(/packet) that has the given namespace. + * Returns the first extension of this stanza that has the given namespace. *

                * When possible, use {@link #getExtension(String,String)} instead. *

                * * @param namespace the namespace of the extension that is desired. - * @return the stanza(/packet) extension with the given namespace. + * @return the stanza extension with the given namespace. */ public ExtensionElement getExtension(String namespace) { return PacketUtil.extensionElementFrom(getExtensions(), null, namespace); @@ -371,9 +371,9 @@ public abstract class Stanza implements TopLevelStreamElement { } /** - * Adds a stanza(/packet) extension to the packet. Does nothing if extension is null. + * Adds a stanza extension to the packet. Does nothing if extension is null. * - * @param extension a stanza(/packet) extension. + * @param extension a stanza extension. */ public void addExtension(ExtensionElement extension) { if (extension == null) return; @@ -401,9 +401,9 @@ public abstract class Stanza implements TopLevelStreamElement { } /** - * Adds a collection of stanza(/packet) extensions to the packet. Does nothing if extensions is null. + * Adds a collection of stanza extensions to the packet. Does nothing if extensions is null. * - * @param extensions a collection of stanza(/packet) extensions + * @param extensions a collection of stanza extensions */ public void addExtensions(Collection extensions) { if (extensions == null) return; @@ -413,14 +413,14 @@ public abstract class Stanza implements TopLevelStreamElement { } /** - * Check if a stanza(/packet) extension with the given element and namespace exists. + * Check if a stanza extension with the given element and namespace exists. *

                * The argument elementName may be null. *

                * * @param elementName * @param namespace - * @return true if a stanza(/packet) extension exists, false otherwise. + * @return true if a stanza extension exists, false otherwise. */ public boolean hasExtension(String elementName, String namespace) { if (elementName == null) { @@ -433,10 +433,10 @@ public abstract class Stanza implements TopLevelStreamElement { } /** - * Check if a stanza(/packet) extension with the given namespace exists. + * Check if a stanza extension with the given namespace exists. * * @param namespace - * @return true if a stanza(/packet) extension exists, false otherwise. + * @return true if a stanza extension exists, false otherwise. */ public boolean hasExtension(String namespace) { synchronized (packetExtensions) { @@ -450,11 +450,11 @@ public abstract class Stanza implements TopLevelStreamElement { } /** - * Remove the stanza(/packet) extension with the given elementName and namespace. + * Remove the stanza extension with the given elementName and namespace. * * @param elementName * @param namespace - * @return the removed stanza(/packet) extension or null. + * @return the removed stanza extension or null. */ public ExtensionElement removeExtension(String elementName, String namespace) { String key = XmppStringUtils.generateKey(elementName, namespace); @@ -464,10 +464,10 @@ public abstract class Stanza implements TopLevelStreamElement { } /** - * Removes a stanza(/packet) extension from the packet. + * Removes a stanza extension from the packet. * - * @param extension the stanza(/packet) extension to remove. - * @return the removed stanza(/packet) extension or null. + * @param extension the stanza extension to remove. + * @return the removed stanza extension or null. */ public ExtensionElement removeExtension(ExtensionElement extension) { return removeExtension(extension.getElementName(), extension.getNamespace()); @@ -481,10 +481,10 @@ public abstract class Stanza implements TopLevelStreamElement { /** * Returns the extension sub-packets (including properties data) as an XML - * String, or the Empty String if there are no stanza(/packet) extensions. + * String, or the Empty String if there are no stanza extensions. * * @return the extension sub-packets as XML or the Empty String if there - * are no stanza(/packet) extensions. + * are no stanza extensions. */ protected final XmlStringBuilder getExtensionsXML() { XmlStringBuilder xml = new XmlStringBuilder(); @@ -529,7 +529,7 @@ public abstract class Stanza implements TopLevelStreamElement { } /** - * Append an XMPPError is this stanza(/packet) has one set. + * Append an XMPPError is this stanza has one set. * * @param xml the XmlStringBuilder to append the error to. */ diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java index ce3df962f..654409480 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java @@ -28,7 +28,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder; /** * Represents an XMPP error sub-packet. Typically, a server responds to a request that has - * problems by sending the stanza(/packet) back and including an error packet. Each error has a type, + * problems by sending the stanza back and including an error packet. Each error has a type, * error condition as well as as an optional text explanation. Typical errors are:

                * * @@ -113,7 +113,7 @@ public class XMPPError extends AbstractError { * @param conditionText * @param errorGenerator * @param descriptiveTexts - * @param extensions list of stanza(/packet) extensions + * @param extensions list of stanza extensions * @param stanza the stanza carrying this XMPP error. */ public XMPPError(Condition condition, String conditionText, String errorGenerator, Type type, Map descriptiveTexts, diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/ExtensionProviderInfo.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/ExtensionProviderInfo.java index 8ba4479a6..cb3aab1de 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/provider/ExtensionProviderInfo.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/ExtensionProviderInfo.java @@ -19,7 +19,7 @@ package org.jivesoftware.smack.provider; import org.jivesoftware.smack.packet.ExtensionElement; /** - * Defines the information required to register a stanza(/packet) extension Provider with the {@link ProviderManager} when using the + * Defines the information required to register a stanza extension Provider with the {@link ProviderManager} when using the * {@link ProviderLoader}. * * @author Robin Collier diff --git a/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java index c8f34079c..b8528569e 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java @@ -65,7 +65,7 @@ import org.jxmpp.util.XmppStringUtils; * interface, or extend the IQ class. In the former case, each IQProvider is responsible for * parsing the raw XML stream to create an IQ instance. In the latter case, bean introspection * is used to try to automatically set properties of the IQ instance using the values found - * in the IQ stanza(/packet) XML. For example, an XMPP time stanza(/packet) resembles the following: + * in the IQ stanza XML. For example, an XMPP time stanza resembles the following: * 
                  * <iq type='result' to='joe@example.com' from='mary@example.com' id='time_1'>
  *     <query xmlns='jabber:iq:time'>
@@ -75,13 +75,13 @@ import org.jxmpp.util.XmppStringUtils;
  *     </query>
  * </iq>
                * - * In order for this stanza(/packet) to be automatically mapped to the Time object listed in the + * In order for this stanza to be automatically mapped to the Time object listed in the * providers file above, it must have the methods setUtc(String), setTz(String), and * setDisplay(String). The introspection service will automatically try to convert the String * value from the XML into a boolean, int, long, float, double, or Class depending on the * type the IQ instance expects.

                * - * A pluggable system for stanza(/packet) extensions, child elements in a custom namespace for + * A pluggable system for stanza extensions, child elements in a custom namespace for * message and presence packets, also exists. Each extension provider * is registered with a name space in the smack.providers file as in the following example: * @@ -96,12 +96,12 @@ import org.jxmpp.util.XmppStringUtils; * </smackProviders> * * If multiple provider entries attempt to register to handle the same element name and namespace, - * the first entry loaded from the classpath will take precedence. Whenever a stanza(/packet) extension + * the first entry loaded from the classpath will take precedence. Whenever a stanza extension * is found in a packet, parsing will be passed to the correct provider. Each provider * can either implement the PacketExtensionProvider interface or be a standard Java Bean. In * the former case, each extension provider is responsible for parsing the raw XML stream to * construct an object. In the latter case, bean introspection is used to try to automatically - * set the properties of th class using the values in the stanza(/packet) extension sub-element. When an + * set the properties of th class using the values in the stanza extension sub-element. When an * extension provider is not registered for an element name and namespace combination, Smack will * store all top-level elements of the sub-packet in DefaultPacketExtension object and then * attach it to the packet.

                @@ -147,7 +147,7 @@ public final class ProviderManager { /** * Returns the IQ provider registered to the specified XML element name and namespace. * For example, if a provider was registered to the element name "query" and the - * namespace "jabber:iq:time", then the following stanza(/packet) would trigger the provider: + * namespace "jabber:iq:time", then the following stanza would trigger the provider: * * 

                      * <iq type='result' to='joe@example.com' from='mary@example.com' id='time_1'>
@@ -221,9 +221,9 @@ public final class ProviderManager {
     }
 
     /**
-     * Returns the stanza(/packet) extension provider registered to the specified XML element name
+     * Returns the stanza extension provider registered to the specified XML element name
      * and namespace. For example, if a provider was registered to the element name "x" and the
-     * namespace "jabber:x:event", then the following stanza(/packet) would trigger the provider:
+     * namespace "jabber:x:event", then the following stanza would trigger the provider:
      *
      * 
                      * <message to='romeo@montague.net' id='message_1'>
@@ -274,7 +274,7 @@ public final class ProviderManager {
      *
      * @param elementName the XML element name.
      * @param namespace the XML namespace.
-     * @return the key of the removed stanza(/packet) extension provider
+     * @return the key of the removed stanza extension provider
      */
     public static String removeExtensionProvider(String elementName, String namespace) {
         String key = getKey(elementName, namespace);
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
index 8409f6c4a..da7a9c650 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
@@ -140,7 +140,7 @@ public class PacketParserUtils {
      * connection is optional and is used to return feature-not-implemented errors for unknown IQ stanzas.
      *
      * @param parser
-     * @return a stanza(/packet) which is either a Message, IQ or Presence.
+     * @return a stanza which is either a Message, IQ or Presence.
      * @throws Exception 
      */
     public static Stanza parseStanza(XmlPullParser parser) throws Exception {
@@ -903,7 +903,7 @@ public class PacketParserUtils {
      * Parses an extension element.
      *
      * @param elementName the XML element name of the extension element.
-     * @param namespace the XML namespace of the stanza(/packet) extension.
+     * @param namespace the XML namespace of the stanza extension.
      * @param parser the XML parser, positioned at the starting element of the extension.
      *
      * @return an extension element.
@@ -920,7 +920,7 @@ public class PacketParserUtils {
      * Parses an extension element.
      *
      * @param elementName the XML element name of the extension element.
-     * @param namespace the XML namespace of the stanza(/packet) extension.
+     * @param namespace the XML namespace of the stanza extension.
      * @param parser the XML parser, positioned at the starting element of the extension.
      *
      * @return an extension element.
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java b/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java
index ab4a43bff..75d2a29e1 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java
@@ -46,7 +46,7 @@ import org.jxmpp.stringprep.XmppStringprepException;
  * 
  * Packets that should be processed by the client to simulate a received stanza
  * can be delivered using the {@linkplain #processStanza(Stanza)} method.
- * It invokes the registered stanza(/packet) interceptors and listeners.
+ * It invokes the registered stanza interceptors and listeners.
  * 
  * @see XMPPConnection
  * @author Guenther Niess
@@ -147,7 +147,7 @@ public class DummyConnection extends AbstractXMPPConnection {
     }
 
     /**
-     * Returns the first stanza(/packet) that's sent through {@link #sendStanza(Stanza)}
+     * Returns the first stanza that's sent through {@link #sendStanza(Stanza)}
      * and that has not been returned by earlier calls to this method.
      * 
      * @return a sent packet.
@@ -157,7 +157,7 @@ public class DummyConnection extends AbstractXMPPConnection {
     }
 
     /**
-     * Returns the first stanza(/packet) that's sent through {@link #sendStanza(Stanza)}
+     * Returns the first stanza that's sent through {@link #sendStanza(Stanza)}
      * and that has not been returned by earlier calls to this method. This
      * method will block for up to the specified number of seconds if no packets
      * have been sent yet.
@@ -175,11 +175,11 @@ public class DummyConnection extends AbstractXMPPConnection {
     }
 
     /**
-     * Processes a stanza(/packet) through the installed stanza(/packet) collectors and listeners
-     * and letting them examine the stanza(/packet) to see if they are a match with the
+     * Processes a stanza through the installed stanza collectors and listeners
+     * and letting them examine the stanza to see if they are a match with the
      * filter.
      *
-     * @param packet the stanza(/packet) to process.
+     * @param packet the stanza to process.
      */
     @Override
     public void processStanza(Stanza packet) {
diff --git a/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java b/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
index 39101c2dd..75c7c6553 100644
--- a/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
+++ b/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java
@@ -67,8 +67,8 @@ public class ThreadedDummyConnection extends DummyConnection {
     }
 
     /**
-     * Calling this method will cause the next sendStanza call with an IQ stanza(/packet) to timeout.
-     * This is accomplished by simply stopping the auto creating of the reply stanza(/packet) 
+     * Calling this method will cause the next sendStanza call with an IQ stanza to timeout.
+     * This is accomplished by simply stopping the auto creating of the reply stanza 
      * or processing one that was entered via {@link #processStanza(Stanza)}.
      */
     public void setTimeout() {
diff --git a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/package-info.java b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/package-info.java
deleted file mode 120000
index ff0f3fb31..000000000
--- a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../smack-debug/src/main/java/org/jivesoftware/smackx/debugger/package-info.java
\ No newline at end of file
diff --git a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/package-info.java b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/package-info.java
new file mode 100644
index 000000000..a6e02ba25
--- /dev/null
+++ b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2015 Florian Schmaus
+ *
+ * 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.
+ */
+
+/**
+ * Smack optional Debuggers.
+ */
+package org.jivesoftware.smackx.debugger;
diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
index 7836edb65..17d38418a 100644
--- a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
+++ b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java
@@ -764,10 +764,10 @@ public class EnhancedDebugger extends SmackDebugger {
     }
 
     /**
-     * Adds the received stanza(/packet) detail to the messages table.
+     * Adds the received stanza detail to the messages table.
      *
      * @param dateFormatter the SimpleDateFormat to use to format Dates
-     * @param packet        the read stanza(/packet) to add to the table
+     * @param packet        the read stanza to add to the table
      */
     private void addReadPacketToTable(final SimpleDateFormat dateFormatter, final TopLevelStreamElement packet) {
         SwingUtilities.invokeLater(new Runnable() {
@@ -835,10 +835,10 @@ public class EnhancedDebugger extends SmackDebugger {
     }
 
     /**
-     * Adds the sent stanza(/packet) detail to the messages table.
+     * Adds the sent stanza detail to the messages table.
      *
      * @param dateFormatter the SimpleDateFormat to use to format Dates
-     * @param packet        the sent stanza(/packet) to add to the table
+     * @param packet        the sent stanza to add to the table
      */
     private void addSentPacketToTable(final SimpleDateFormat dateFormatter, final TopLevelStreamElement packet) {
         SwingUtilities.invokeLater(new Runnable() {
@@ -926,7 +926,7 @@ public class EnhancedDebugger extends SmackDebugger {
     }
 
     /**
-     * An ad-hoc stanza(/packet) is like any regular stanza(/packet) but with the exception that it's intention is
+     * An ad-hoc stanza is like any regular stanza but with the exception that it's intention is
      * to be used only to send packets.
                
      * 
                
      * The whole text to send must be passed to the constructor. This implies that the client of
@@ -940,7 +940,7 @@ public class EnhancedDebugger extends SmackDebugger {
          * Create a new AdHocPacket with the text to send. The passed text must be a valid text to
          * send to the server, no validation will be done on the passed text.
          *
-         * @param text the whole text of the stanza(/packet) to send
+         * @param text the whole text of the stanza to send
          */
         private AdHocPacket(String text) {
             this.text = text;
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java
index b0e1f9685..9b891caa1 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java
@@ -28,7 +28,7 @@ import org.jivesoftware.smackx.forward.packet.Forwarded;
  * meant to synchronize a message flow to multiple presences of a user.
  * 
  * 
                
- * It accomplishes this by wrapping a {@link Forwarded} stanza(/packet) in a sent
+ * It accomplishes this by wrapping a {@link Forwarded} stanza in a sent
  * or received element
  *
  * @author Georg Lukas
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java
index 95f7f17ab..d99948f0e 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java
@@ -28,7 +28,7 @@ import org.xmlpull.v1.XmlPullParser;
 
 /**
  * This class implements the {@link ExtensionElementProvider} to parse
- * carbon copied messages from a packet.  It will return a {@link CarbonExtension} stanza(/packet) extension.
+ * carbon copied messages from a packet.  It will return a {@link CarbonExtension} stanza extension.
  * 
  * @author Georg Lukas
  *
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/gcm/packet/GcmPacketExtension.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/gcm/packet/GcmPacketExtension.java
index ab0981f7f..eeab6d782 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/gcm/packet/GcmPacketExtension.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/gcm/packet/GcmPacketExtension.java
@@ -49,10 +49,10 @@ public class GcmPacketExtension extends AbstractJsonPacketExtension {
     }
 
     /**
-     * Retrieve the GCM stanza(/packet) extension from the packet.
+     * Retrieve the GCM stanza extension from the packet.
      *
      * @param packet
-     * @return the GCM stanza(/packet) extension or null.
+     * @return the GCM stanza extension or null.
      */
     public static GcmPacketExtension from(Stanza packet) {
         return packet.getExtension(ELEMENT, NAMESPACE);
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java
index 17903ee32..c3f597d09 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java
@@ -30,7 +30,7 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 /**
- * Abstract parent for Req and Resp stanza(/packet) providers.
+ * Abstract parent for Req and Resp stanza providers.
  *
  * @author Andriy Tsykholyas
  * @see XEP-0332: HTTP over XMPP transport
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java
index a87776867..0a69ab4bd 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java
@@ -22,7 +22,7 @@ import org.jivesoftware.smackx.hoxt.packet.HttpOverXmppReq;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
- * Req stanza(/packet) provider.
+ * Req stanza provider.
  *
  * @author Andriy Tsykholyas
  * @see XEP-0332: HTTP over XMPP transport
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java
index 8b4067629..7bb61a526 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java
@@ -23,7 +23,7 @@ import org.jivesoftware.smackx.shim.packet.HeadersExtension;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
- * Resp stanza(/packet) provider.
+ * Resp stanza provider.
  *
  * @author Andriy Tsykholyas
  * @see XEP-0332: HTTP over XMPP transport
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java
index e2e004f00..c803c8cc9 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java
@@ -79,7 +79,7 @@ public abstract class SetData implements NamedElement {
     /**
      * Returns the XML representation of this Element.
      *
-     * @return the stanza(/packet) extension as XML.
+     * @return the stanza extension as XML.
      */
     @Override
     public final XmlStringBuilder toXML() {
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/json/packet/JsonPacketExtension.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/json/packet/JsonPacketExtension.java
index 801c4d956..94230e6d2 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/json/packet/JsonPacketExtension.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/json/packet/JsonPacketExtension.java
@@ -43,10 +43,10 @@ public class JsonPacketExtension extends AbstractJsonPacketExtension {
     }
 
     /**
-     * Retrieve the JSON stanza(/packet) extension from the packet.
+     * Retrieve the JSON stanza extension from the packet.
      *
      * @param packet
-     * @return the JSON stanza(/packet) extension or null.
+     * @return the JSON stanza extension or null.
      */
     public static JsonPacketExtension from(Stanza packet) {
         return packet.getExtension(ELEMENT, NAMESPACE);
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java
index 504ec56b0..d292e302a 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java
@@ -210,12 +210,12 @@ public class MultiUserChatLight {
     }
 
     /**
-     * Adds a stanza(/packet) listener that will be notified of any new messages
+     * Adds a stanza listener that will be notified of any new messages
      * in the group chat. Only "group chat" messages addressed to this group
      * chat will be delivered to the listener.
      *
      * @param listener
-     *            a stanza(/packet) listener.
+     *            a stanza listener.
      * @return true if the listener was not already added.
      */
     public boolean addMessageListener(MessageListener listener) {
@@ -223,12 +223,12 @@ public class MultiUserChatLight {
     }
 
     /**
-     * Removes a stanza(/packet) listener that was being notified of any new
+     * Removes a stanza listener that was being notified of any new
      * messages in the MUCLight. Only "group chat" messages addressed to this
      * MUCLight were being delivered to the listener.
      *
      * @param listener
-     *            a stanza(/packet) listener.
+     *            a stanza listener.
      * @return true if the listener was removed, otherwise the listener was not
      *         added previously.
      */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java
index c2b003e6e..10410e320 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java
@@ -73,11 +73,11 @@ public class MultipleRecipientInfo {
     }
 
     /**
-     * Returns true if the received stanza(/packet) should not be replied. Use
+     * Returns true if the received stanza should not be replied. Use
      * {@link MultipleRecipientManager#reply(org.jivesoftware.smack.XMPPConnection, org.jivesoftware.smack.packet.Message, org.jivesoftware.smack.packet.Message)}
      * to send replies. 
      *
-     * @return true if the received stanza(/packet) should not be replied.
+     * @return true if the received stanza should not be replied.
      */
     public boolean shouldNotReply() {
         return !extension.getAddressesOfType(MultipleAddresses.Type.noreply).isEmpty();
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
index 3be4a83dc..2b45123d4 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java
@@ -49,14 +49,14 @@ import org.jxmpp.jid.Jid;
 public class MultipleRecipientManager {
 
     /**
-     * Sends the specified stanza(/packet) to the collection of specified recipients using the
+     * Sends the specified stanza to the collection of specified recipients using the
      * specified connection. If the server has support for XEP-33 then only one
-     * stanza(/packet) is going to be sent to the server with the multiple recipient instructions.
+     * stanza is going to be sent to the server with the multiple recipient instructions.
      * However, if XEP-33 is not supported by the server then the client is going to send
-     * the stanza(/packet) to each recipient.
+     * the stanza to each recipient.
      *
      * @param connection the connection to use to send the packet.
-     * @param packet     the stanza(/packet) to send to the list of recipients.
+     * @param packet     the stanza to send to the list of recipients.
      * @param to         the collection of JIDs to include in the TO list or null if no TO
      *                   list exists.
      * @param cc         the collection of JIDs to include in the CC list or null if no CC
@@ -77,13 +77,13 @@ public class MultipleRecipientManager {
     }
 
     /**
-     * Sends the specified stanza(/packet) to the collection of specified recipients using the specified
-     * connection. If the server has support for XEP-33 then only one stanza(/packet) is going to be sent to
+     * Sends the specified stanza to the collection of specified recipients using the specified
+     * connection. If the server has support for XEP-33 then only one stanza is going to be sent to
      * the server with the multiple recipient instructions. However, if XEP-33 is not supported by
-     * the server then the client is going to send the stanza(/packet) to each recipient.
+     * the server then the client is going to send the stanza to each recipient.
      * 
      * @param connection the connection to use to send the packet.
-     * @param packet the stanza(/packet) to send to the list of recipients.
+     * @param packet the stanza to send to the list of recipients.
      * @param to the collection of JIDs to include in the TO list or null if no TO list exists.
      * @param cc the collection of JIDs to include in the CC list or null if no CC list exists.
      * @param bcc the collection of JIDs to include in the BCC list or null if no BCC list
@@ -132,12 +132,12 @@ public class MultipleRecipientManager {
     }
 
     /**
-     * Sends a reply to a previously received stanza(/packet) that was sent to multiple recipients. Before
+     * Sends a reply to a previously received stanza that was sent to multiple recipients. Before
      * attempting to send the reply message some checks are performed. If any of those checks
      * fails, then an XMPPException is going to be thrown with the specific error detail.
      *
      * @param connection the connection to use to send the reply.
-     * @param original   the previously received stanza(/packet) that was sent to multiple recipients.
+     * @param original   the previously received stanza that was sent to multiple recipients.
      * @param reply      the new message to send as a reply.
      * @throws SmackException 
      * @throws XMPPErrorException 
@@ -192,12 +192,12 @@ public class MultipleRecipientManager {
     }
 
     /**
-     * Returns the {@link MultipleRecipientInfo} contained in the specified stanza(/packet) or
+     * Returns the {@link MultipleRecipientInfo} contained in the specified stanza or
      * null if none was found. Only packets sent to multiple recipients will
      * contain such information.
      *
-     * @param packet the stanza(/packet) to check.
-     * @return the MultipleRecipientInfo contained in the specified stanza(/packet) or null
+     * @param packet the stanza to check.
+     * @return the MultipleRecipientInfo contained in the specified stanza or null
      *         if none was found.
      */
     public static MultipleRecipientInfo getMultipleRecipientInfo(Stanza packet) {
@@ -289,8 +289,8 @@ public class MultipleRecipientManager {
 
     /**
      * Stanza(/Packet) that holds the XML stanza to send. This class is useful when the same packet
-     * is needed to be sent to different recipients. Since using the same stanza(/packet) is not possible
-     * (i.e. cannot change the TO address of a queues stanza(/packet) to be sent) then this class was
+     * is needed to be sent to different recipients. Since using the same stanza is not possible
+     * (i.e. cannot change the TO address of a queues stanza to be sent) then this class was
      * created to keep the XML stanza to send.
      */
     private static final class PacketCopy extends Stanza {
@@ -298,10 +298,10 @@ public class MultipleRecipientManager {
         private final CharSequence text;
 
         /**
-         * Create a copy of a stanza(/packet) with the text to send. The passed text must be a valid text to
+         * Create a copy of a stanza with the text to send. The passed text must be a valid text to
          * send to the server, no validation will be done on the passed text.
          *
-         * @param text the whole text of the stanza(/packet) to send
+         * @param text the whole text of the stanza to send
          */
         private PacketCopy(CharSequence text) {
             this.text = text;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java
index ab1f5c6de..12a05ce86 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java
@@ -27,7 +27,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder;
 import org.jxmpp.jid.Jid;
 
 /**
- * Stanza(/Packet) extension that contains the list of addresses that a stanza(/packet) should be sent or was sent.
+ * Stanza(/Packet) extension that contains the list of addresses that a stanza should be sent or was sent.
  *
  * @author Gaston Dombiak
  */
@@ -56,14 +56,14 @@ public class MultipleAddresses implements ExtensionElement {
     private final List
                 addresses = new ArrayList<>();
 
     /**
-     * Adds a new address to which the stanza(/packet) is going to be sent or was sent.
+     * Adds a new address to which the stanza is going to be sent or was sent.
      *
      * @param type on of the static type (BCC, CC, NO_REPLY, REPLY_ROOM, etc.)
      * @param jid the JID address of the recipient.
      * @param node used to specify a sub-addressable unit at a particular JID, corresponding to
      *             a Service Discovery node.
      * @param desc used to specify human-readable information for this address.
-     * @param delivered true when the stanza(/packet) was already delivered to this address.
+     * @param delivered true when the stanza was already delivered to this address.
      * @param uri used to specify an external system address, such as a sip:, sips:, or im: URI.
      */
     public void addAddress(Type type, Jid jid, String node, String desc, boolean delivered,
@@ -80,7 +80,7 @@ public class MultipleAddresses implements ExtensionElement {
     }
 
     /**
-     * Indicate that the stanza(/packet) being sent should not be replied.
+     * Indicate that the stanza being sent should not be replied.
      */
     public void setNoReply() {
         // Create a new address with the specified configuration
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java
index dfb9d3f30..771deda11 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java
@@ -132,7 +132,7 @@ public class AMPExtension implements ExtensionElement {
      * Returns the XML element name of the extension sub-packet root element.
      * Always returns "amp"
      *
-     * @return the XML element name of the stanza(/packet) extension.
+     * @return the XML element name of the stanza extension.
      */
     @Override
     public String getElementName() {
@@ -143,7 +143,7 @@ public class AMPExtension implements ExtensionElement {
      * Returns the XML namespace of the extension sub-packet root element.
      * According the specification the namespace is always "http://jabber.org/protocol/xhtml-im"
      *
-     * @return the XML namespace of the stanza(/packet) extension.
+     * @return the XML namespace of the stanza extension.
      */
     @Override
     public String getNamespace() {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java
index e93c718c7..3d6ed8797 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java
@@ -34,7 +34,7 @@ public class AMPExtensionProvider extends ExtensionElementProvider
     private static final Logger LOGGER = Logger.getLogger(AMPExtensionProvider.class.getName());
 
     /**
-     * Parses a AMPExtension stanza(/packet) (extension sub-packet).
+     * Parses a AMPExtension stanza (extension sub-packet).
      *
      * @param parser the XML parser, positioned at the starting element of the extension.
      * @return a PacketExtension.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
index b4fe52332..99380d60c 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
@@ -26,9 +26,9 @@ import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
 
 /**
  * DataListener handles all In-Band Bytestream IQ stanzas containing a data
- * stanza(/packet) extension that don't belong to an existing session.
+ * stanza extension that don't belong to an existing session.
  * 
                
- * If a data stanza(/packet) is received it looks if a stored In-Band Bytestream session
+ * If a data stanza is received it looks if a stored In-Band Bytestream session
  * exists. If no session with the given session ID exists an
  * <item-not-found/> error is returned to the sender.
  * 
                
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
index 085581801..828405420 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
@@ -53,7 +53,7 @@ import org.jxmpp.jid.Jid;
  * in case the Socks5 bytestream method of transferring data is not available.
  * 
                
  * There are two ways to send data over an In-Band Bytestream. It could either use IQ stanzas to
- * send data packets or message stanzas. If IQ stanzas are used every data stanza(/packet) is acknowledged by
+ * send data packets or message stanzas. If IQ stanzas are used every data stanza is acknowledged by
  * the receiver. This is the recommended way to avoid possible rate-limiting penalties. Message
  * stanzas are not acknowledged because most XMPP server implementation don't support stanza
  * flow-control method like Advanced Message
@@ -291,7 +291,7 @@ public final class InBandBytestreamManager extends Manager implements Bytestream
      * to the initiator.
      * 
                
      * This method should be used if you are awaiting an In-Band Bytestream request as a reply to
-     * another stanza(/packet) (e.g. file transfer).
+     * another stanza (e.g. file transfer).
      * 
      * @param sessionID to be ignored
      */
@@ -447,7 +447,7 @@ public final class InBandBytestreamManager extends Manager implements Bytestream
      * Responses to the given IQ packet's sender with an XMPP error that an In-Band Bytestream is
      * not accepted.
      * 
-     * @param request IQ stanza(/packet) that should be answered with a not-acceptable error
+     * @param request IQ stanza that should be answered with a not-acceptable error
      * @throws NotConnectedException 
      * @throws InterruptedException 
      */
@@ -460,7 +460,7 @@ public final class InBandBytestreamManager extends Manager implements Bytestream
      * Responses to the given IQ packet's sender with an XMPP error that an In-Band Bytestream open
      * request is rejected because its block size is greater than the maximum allowed block size.
      * 
-     * @param request IQ stanza(/packet) that should be answered with a resource-constraint error
+     * @param request IQ stanza that should be answered with a resource-constraint error
      * @throws NotConnectedException 
      * @throws InterruptedException 
      */
@@ -473,7 +473,7 @@ public final class InBandBytestreamManager extends Manager implements Bytestream
      * Responses to the given IQ packet's sender with an XMPP error that an In-Band Bytestream
      * session could not be found.
      * 
-     * @param request IQ stanza(/packet) that should be answered with a item-not-found error
+     * @param request IQ stanza that should be answered with a item-not-found error
      * @throws NotConnectedException 
      * @throws InterruptedException 
      */
@@ -543,7 +543,7 @@ public final class InBandBytestreamManager extends Manager implements Bytestream
     }
 
     /**
-     * Disables the InBandBytestreamManager by removing its stanza(/packet) listeners and resetting its
+     * Disables the InBandBytestreamManager by removing its stanza listeners and resetting its
      * internal status, which includes removing this instance from the managers map.
      */
     private void disableService() {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
index 3c298a979..af8169171 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
@@ -242,7 +242,7 @@ public class InBandBytestreamSession implements BytestreamSession {
 
     /**
      * IBBInputStream class is the base implementation of an In-Band Bytestream input stream.
-     * Subclasses of this input stream must provide a stanza(/packet) listener along with a stanza(/packet) filter to
+     * Subclasses of this input stream must provide a stanza listener along with a stanza filter to
      * collect the In-Band Bytestream data packets.
      */
     private abstract class IBBInputStream extends InputStream {
@@ -281,16 +281,16 @@ public class InBandBytestreamSession implements BytestreamSession {
         }
 
         /**
-         * Returns the stanza(/packet) listener that processes In-Band Bytestream data packets.
+         * Returns the stanza listener that processes In-Band Bytestream data packets.
          * 
-         * @return the data stanza(/packet) listener
+         * @return the data stanza listener
          */
         protected abstract StanzaListener getDataPacketListener();
 
         /**
-         * Returns the stanza(/packet) filter that accepts In-Band Bytestream data packets.
+         * Returns the stanza filter that accepts In-Band Bytestream data packets.
          * 
-         * @return the data stanza(/packet) filter
+         * @return the data stanza filter
          */
         protected abstract StanzaFilter getDataPacketFilter();
 
@@ -350,7 +350,7 @@ public class InBandBytestreamSession implements BytestreamSession {
         }
 
         /**
-         * This method blocks until a data stanza(/packet) is received, the stream is closed or the current
+         * This method blocks until a data stanza is received, the stream is closed or the current
          * thread is interrupted.
          * 
          * @return true if data was received, otherwise false
@@ -436,7 +436,7 @@ public class InBandBytestreamSession implements BytestreamSession {
         }
 
         /**
-         * This method sets the close flag and removes the data stanza(/packet) listener.
+         * This method sets the close flag and removes the data stanza listener.
          */
         private void closeInternal() {
             if (isClosed) {
@@ -513,7 +513,7 @@ public class InBandBytestreamSession implements BytestreamSession {
         protected StanzaFilter getDataPacketFilter() {
             /*
              * filter all IQ stanzas having type 'SET' (represented by Data class), containing a
-             * data stanza(/packet) extension, matching session ID and recipient
+             * data stanza extension, matching session ID and recipient
              */
             return new AndFilter(new StanzaTypeFilter(Data.class), new IBBDataPacketFilter());
         }
@@ -561,7 +561,7 @@ public class InBandBytestreamSession implements BytestreamSession {
         @Override
         protected StanzaFilter getDataPacketFilter() {
             /*
-             * filter all message stanzas containing a data stanza(/packet) extension, matching session ID
+             * filter all message stanzas containing a data stanza extension, matching session ID
              * and recipient
              */
             return new AndFilter(new StanzaTypeFilter(Message.class), new IBBDataPacketFilter());
@@ -571,7 +571,7 @@ public class InBandBytestreamSession implements BytestreamSession {
 
     /**
      * IBBDataPacketFilter class filters all packets from the remote peer of this session,
-     * containing an In-Band Bytestream data stanza(/packet) extension whose session ID matches this sessions
+     * containing an In-Band Bytestream data stanza extension whose session ID matches this sessions
      * ID.
      */
     private class IBBDataPacketFilter implements StanzaFilter {
@@ -632,7 +632,7 @@ public class InBandBytestreamSession implements BytestreamSession {
         }
 
         /**
-         * Writes the given data stanza(/packet) to the XMPP stream.
+         * Writes the given data stanza to the XMPP stream.
          * 
          * @param data the data packet
          * @throws IOException if an I/O error occurred while sending or if the stream is closed
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java
index b9c4369ee..67e7f88cd 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java
@@ -32,7 +32,7 @@ public class Data extends IQ {
     /**
      * Constructor.
      * 
-     * @param data data stanza(/packet) extension containing the encoded data
+     * @param data data stanza extension containing the encoded data
      */
     public Data(DataPacketExtension data) {
         super(DataPacketExtension.ELEMENT, DataPacketExtension.NAMESPACE);
@@ -45,9 +45,9 @@ public class Data extends IQ {
     }
 
     /**
-     * Returns the data stanza(/packet) extension.
+     * Returns the data stanza extension.
      * 
-     * @return the data stanza(/packet) extension
+     * @return the data stanza extension
      */
     public DataPacketExtension getDataPacketExtension() {
         return this.dataPacketExtension;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java
index 6a56aab2d..9ec335773 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java
@@ -30,7 +30,7 @@ import org.jivesoftware.smack.util.stringencoder.Base64;
 public class DataPacketExtension implements ExtensionElement {
 
     /**
-     * The element name of the data stanza(/packet) extension.
+     * The element name of the data stanza extension.
      */
     public static final String ELEMENT = "data";
 
@@ -54,7 +54,7 @@ public class DataPacketExtension implements ExtensionElement {
      * Creates a new In-Band Bytestream data packet.
      * 
      * @param sessionID unique session ID identifying this In-Band Bytestream
-     * @param seq sequence of this stanza(/packet) in regard to the other data packets
+     * @param seq sequence of this stanza in regard to the other data packets
      * @param data the base64 encoded data contained in this packet
      */
     public DataPacketExtension(String sessionID, long seq, String data) {
@@ -82,9 +82,9 @@ public class DataPacketExtension implements ExtensionElement {
     }
 
     /**
-     * Returns the sequence of this stanza(/packet) in regard to the other data packets.
+     * Returns the sequence of this stanza in regard to the other data packets.
      * 
-     * @return the sequence of this stanza(/packet) in regard to the other data packets.
+     * @return the sequence of this stanza in regard to the other data packets.
      */
     public long getSeq() {
         return seq;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
index fb0c9dd43..ab83d95d4 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
@@ -25,7 +25,7 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 /**
- * Parses an In-Band Bytestream data stanza(/packet) which can be a stanza(/packet) extension of
+ * Parses an In-Band Bytestream data stanza which can be a stanza extension of
  * either an IQ stanza or a message stanza.
  * 
  * @author Henning Staib
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
index eae07da35..677302f95 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
@@ -256,7 +256,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
      * to the initiator.
      * 
                
      * This method should be used if you are awaiting a SOCKS5 Bytestream request as a reply to
-     * another stanza(/packet) (e.g. file transfer).
+     * another stanza (e.g. file transfer).
      * 
      * @param sessionID to be ignored
      */
@@ -612,10 +612,10 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
     }
 
     /**
-     * Returns a IQ stanza(/packet) to query a SOCKS5 proxy its network settings.
+     * Returns a IQ stanza to query a SOCKS5 proxy its network settings.
      * 
      * @param proxy the proxy to query
-     * @return IQ stanza(/packet) to query a SOCKS5 proxy its network settings
+     * @return IQ stanza to query a SOCKS5 proxy its network settings
      */
     private static Bytestream createStreamHostRequest(Jid proxy) {
         Bytestream request = new Bytestream();
@@ -664,7 +664,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream
     }
 
     /**
-     * Returns a SOCKS5 Bytestream initialization request stanza(/packet) with the given session ID
+     * Returns a SOCKS5 Bytestream initialization request stanza with the given session ID
      * containing the given stream hosts for the given target JID.
      * 
      * @param sessionID the session ID for the SOCKS5 Bytestream
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
index 580739502..a81b87f6f 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
@@ -105,7 +105,7 @@ public class Socks5ClientForInitiator extends Socks5Client {
     }
 
     /**
-     * Activates the SOCKS5 Bytestream by sending an XMPP SOCKS5 Bytestream activation stanza(/packet) to the
+     * Activates the SOCKS5 Bytestream by sending an XMPP SOCKS5 Bytestream activation stanza to the
      * SOCKS5 proxy.
      * @throws XMPPErrorException 
      * @throws NoResponseException 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
index 867e905cf..addd9c1c3 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
@@ -29,7 +29,7 @@ import org.jivesoftware.smack.util.XmlStringBuilder;
 import org.jxmpp.jid.Jid;
 
 /**
- * A stanza(/packet) representing part of a SOCKS5 Bytestream negotiation.
+ * A stanza representing part of a SOCKS5 Bytestream negotiation.
  * 
  * @author Alexander Wenckus
  */
@@ -202,10 +202,10 @@ public class Bytestream extends IQ {
     }
 
     /**
-     * Returns the activate element of the stanza(/packet) sent to the proxy host to verify the identity of
+     * Returns the activate element of the stanza sent to the proxy host to verify the identity of
      * the initiator and match them to the appropriate stream.
      * 
-     * @return Returns the activate element of the stanza(/packet) sent to the proxy host to verify the
+     * @return Returns the activate element of the stanza sent to the proxy host to verify the
      *         identity of the initiator and match them to the appropriate stream.
      */
     public Activate getToActivate() {
@@ -213,7 +213,7 @@ public class Bytestream extends IQ {
     }
 
     /**
-     * Upon the response from the target of the used host the activate stanza(/packet) is sent to the SOCKS5
+     * Upon the response from the target of the used host the activate stanza is sent to the SOCKS5
      * proxy. The proxy will activate the stream or return an error after verifying the identity of
      * the initiator, using the activate packet.
      * 
@@ -341,7 +341,7 @@ public class Bytestream extends IQ {
 
     /**
      * After selected a SOCKS5 stream host and successfully connecting, the target of the file
-     * transfer returns a byte stream stanza(/packet) with the stream host used extension.
+     * transfer returns a byte stream stanza with the stream host used extension.
      * 
      * @author Alexander Wenckus
      */
@@ -384,7 +384,7 @@ public class Bytestream extends IQ {
     }
 
     /**
-     * The stanza(/packet) sent by the stream initiator to the stream proxy to activate the connection.
+     * The stanza sent by the stream initiator to the stream proxy to activate the connection.
      * 
      * @author Alexander Wenckus
      */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
index d8969f55b..ced47c452 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
@@ -564,7 +564,7 @@ public final class EntityCapsManager extends Manager {
     /**
      * 
      * @param info
-     * @return true if the stanza(/packet) extensions is ill-formed
+     * @return true if the stanza extensions is ill-formed
      */
     protected static boolean verifyPacketExtensions(DiscoverInfo info) {
         List foundFormTypes = new LinkedList<>();
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
index c6a7b1abb..f9e42e1d7 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java
@@ -123,7 +123,7 @@ public class SimpleDirectoryPersistentCache implements EntityCapsPersistentCache
     }
 
     /**
-     * Writes the DiscoverInfo stanza(/packet) to an file
+     * Writes the DiscoverInfo stanza to an file
      * 
      * @param file
      * @param info
@@ -139,7 +139,7 @@ public class SimpleDirectoryPersistentCache implements EntityCapsPersistentCache
     }
 
     /**
-     * Tries to restore an DiscoverInfo stanza(/packet) from a file.
+     * Tries to restore an DiscoverInfo stanza from a file.
      * 
      * @param file
      * @return the restored DiscoverInfo
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
index a8b185b4b..62a47c637 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java
@@ -46,7 +46,7 @@ import org.jxmpp.jid.EntityFullJid;
 
 /**
  * Handles chat state for all chats on a particular XMPPConnection. This class manages both the
- * stanza(/packet) extensions and the disco response necessary for compliance with
+ * stanza extensions and the disco response necessary for compliance with
  * XEP-0085.
  *
  * NOTE: {@link org.jivesoftware.smackx.chatstates.ChatStateManager#getInstance(org.jivesoftware.smack.XMPPConnection)}
@@ -178,7 +178,7 @@ public final class ChatStateManager extends Manager {
 
     /**
      * Sets the current state of the provided chat. This method will send an empty bodied Message
-     * stanza(/packet) with the state attached as a {@link org.jivesoftware.smack.packet.ExtensionElement}, if
+     * stanza with the state attached as a {@link org.jivesoftware.smack.packet.ExtensionElement}, if
      * and only if the new chat state is different than the last state.
      *
      * @param newState the new state of the chat
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
index 533a4f868..c32d7372a 100755
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java
@@ -306,7 +306,7 @@ public final class AdHocCommandManager extends Manager {
     }
 
     /**
-     * Process the AdHoc-Command stanza(/packet) that request the execution of some
+     * Process the AdHoc-Command stanza that request the execution of some
      * action of a command. If this is the first request, this method checks,
      * before executing the command, if:
      * 
                  
@@ -327,7 +327,7 @@ public final class AdHocCommandManager extends Manager {
      * 
                
      *
      * @param requestData
-     *            the stanza(/packet) to process.
+     *            the stanza to process.
      * @throws NotConnectedException
      * @throws NoResponseException
      * @throws InterruptedException 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java
index e6e6e5ef3..8109a9ab1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java
@@ -26,8 +26,8 @@ import org.jxmpp.util.XmppDateTime;
 
 /**
  * Represents timestamp information about data stored for later delivery. A DelayInformation will 
- * always includes the timestamp when the stanza(/packet) was originally sent and may include more 
- * information such as the JID of the entity that originally sent the stanza(/packet) as well as the reason
+ * always includes the timestamp when the stanza was originally sent and may include more 
+ * information such as the JID of the entity that originally sent the stanza as well as the reason
  * for the delay.
                
  * 
  * For more information see XEP-0091
@@ -61,10 +61,10 @@ public class DelayInformation implements ExtensionElement {
     }
 
     /**
-     * Returns the JID of the entity that originally sent the stanza(/packet) or that delayed the 
-     * delivery of the stanza(/packet) or null if this information is not available.
+     * Returns the JID of the entity that originally sent the stanza or that delayed the 
+     * delivery of the stanza or null if this information is not available.
      * 
-     * @return the JID of the entity that originally sent the stanza(/packet) or that delayed the 
+     * @return the JID of the entity that originally sent the stanza or that delayed the 
      *         delivery of the packet.
      */
     public String getFrom() {
@@ -72,10 +72,10 @@ public class DelayInformation implements ExtensionElement {
     }
 
     /**
-     * Returns the timestamp when the stanza(/packet) was originally sent. The returned Date is 
+     * Returns the timestamp when the stanza was originally sent. The returned Date is 
      * be understood as UTC.
      * 
-     * @return the timestamp when the stanza(/packet) was originally sent.
+     * @return the timestamp when the stanza was originally sent.
      */
     public Date getStamp() {
         return stamp;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java
index 35450dabb..34a8f4969 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java
@@ -65,9 +65,9 @@ public interface NodeInformationProvider {
     List getNodeIdentities();
 
     /**
-     * Returns a list of the stanza(/packet) extensions defined in the node.
+     * Returns a list of the stanza extensions defined in the node.
      *
-     * @return a list of the stanza(/packet) extensions defined in the node.
+     * @return a list of the stanza extensions defined in the node.
      */
     List getNodePacketExtensions();
 }
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
index 453fe462d..a08c953d5 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
@@ -373,7 +373,7 @@ public final class ServiceDiscoveryManager extends Manager {
      * Registers that a new feature is supported by this XMPP entity. When this client is 
      * queried for its information the registered features will be answered.
                
      *
-     * Since no stanza(/packet) is actually sent to the server it is safe to perform this operation
+     * Since no stanza is actually sent to the server it is safe to perform this operation
      * before logging to the server. In fact, you may want to configure the supported features
      * before logging to the server so that the information is already available if it is required
      * upon login.
@@ -390,7 +390,7 @@ public final class ServiceDiscoveryManager extends Manager {
     /**
      * Removes the specified feature from the supported features by this XMPP entity.
                
      *
-     * Since no stanza(/packet) is actually sent to the server it is safe to perform this operation
+     * Since no stanza is actually sent to the server it is safe to perform this operation
      * before logging to the server.
      *
      * @param feature the feature to remove from the supported features.
@@ -418,7 +418,7 @@ public final class ServiceDiscoveryManager extends Manager {
      * specified by XEP-0128.
      * 
                
      *
-     * Since no stanza(/packet) is actually sent to the server it is safe to perform this
+     * Since no stanza is actually sent to the server it is safe to perform this
      * operation before logging to the server. In fact, you may want to
      * configure the extended info before logging to the server so that the
      * information is already available if it is required upon login.
@@ -463,7 +463,7 @@ public final class ServiceDiscoveryManager extends Manager {
      * Removes the data form containing extended service discovery information
      * from the information returned by this XMPP entity.
                
      *
-     * Since no stanza(/packet) is actually sent to the server it is safe to perform this
+     * Since no stanza is actually sent to the server it is safe to perform this
      * operation before logging to the server.
      */
     public synchronized void removeExtendedInfo() {
@@ -607,7 +607,7 @@ public final class ServiceDiscoveryManager extends Manager {
       * be returned by the server whenever the server receives a disco request targeted to the bare
       * address of the client (i.e. user@host.com).
       * 
-      * @param info the discover info stanza(/packet) to check.
+      * @param info the discover info stanza to check.
       * @return true if the server supports publishing of items.
       * @deprecated The disco-publish feature was removed from XEP-0030 in 2008 in favor of XEP-0060: Publish-Subscribe.
       */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
index b18e35f34..39a424618 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
@@ -270,7 +270,7 @@ public final class FileTransferNegotiator extends Manager {
      * the option of, accepting, rejecting, or not responding to a received file
      * transfer request.
      * 
                
-     * If they accept, the stanza(/packet) will contain the other user's chosen stream
+     * If they accept, the stanza will contain the other user's chosen stream
      * type to send the file across. The two choices this implementation
      * provides to the other user for file transfer are SOCKS5 Bytestreams,
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java
index 190d173e1..5970aa275 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java
@@ -106,11 +106,11 @@ public class FileTransferRequest {
     }
 
     /**
-     * Returns the stream initiation stanza(/packet) that was sent by the requester which
+     * Returns the stream initiation stanza that was sent by the requester which
      * contains the parameters of the file transfer being transfer and also the
      * methods available to transfer the file.
      * 
-     * @return Returns the stream initiation stanza(/packet) that was sent by the
+     * @return Returns the stream initiation stanza that was sent by the
      *         requester which contains the parameters of the file transfer
      *         being transfer and also the methods available to transfer the
      *         file.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
index 6f491a36a..69c15bf69 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java
@@ -65,7 +65,7 @@ public abstract class StreamNegotiator extends Manager {
     protected static final EventManger initationSetEvents = new EventManger<>();
 
     /**
-     * Creates the initiation acceptance stanza(/packet) to forward to the stream
+     * Creates the initiation acceptance stanza to forward to the stream
      * initiator.
      *
      * @param streamInitiationOffer The offer from the stream initiator to connect for a stream.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/packet/Forwarded.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/packet/Forwarded.java
index 64120527a..8f0fe64f6 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/packet/Forwarded.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/packet/Forwarded.java
@@ -36,10 +36,10 @@ public class Forwarded implements ExtensionElement {
     private final Stanza forwardedPacket;
 
     /**
-     * Creates a new Forwarded stanza(/packet) extension.
+     * Creates a new Forwarded stanza extension.
      *
      * @param delay an optional {@link DelayInformation} timestamp of the packet.
-     * @param fwdPacket the stanza(/packet) that is forwarded (required).
+     * @param fwdPacket the stanza that is forwarded (required).
      */
     public Forwarded(DelayInformation delay, Stanza fwdPacket) {
         this.delay = delay;
@@ -47,9 +47,9 @@ public class Forwarded implements ExtensionElement {
     }
 
     /**
-     * Creates a new Forwarded stanza(/packet) extension.
+     * Creates a new Forwarded stanza extension.
      *
-     * @param fwdPacket the stanza(/packet) that is forwarded (required).
+     * @param fwdPacket the stanza that is forwarded (required).
      */
     public Forwarded(Stanza fwdPacket) {
         this(null, fwdPacket);
@@ -76,7 +76,7 @@ public class Forwarded implements ExtensionElement {
     }
 
     /**
-     * get the stanza(/packet) forwarded by this stanza.
+     * get the stanza forwarded by this stanza.
      *
      * @return the {@link Stanza} instance (typically a message) that was forwarded.
      * @deprecated use @{link {@link #getForwardedStanza()}} instead.
@@ -98,7 +98,7 @@ public class Forwarded implements ExtensionElement {
     /**
      * get the timestamp of the forwarded packet.
      *
-     * @return the {@link DelayInformation} representing the time when the original stanza(/packet) was sent. May be null.
+     * @return the {@link DelayInformation} representing the time when the original stanza was sent. May be null.
      */
     public DelayInformation getDelayInformation() {
         return delay;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java
index 91c7c9b5e..b63fe4d76 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java
@@ -32,7 +32,7 @@ import org.xmlpull.v1.XmlPullParser;
 
 /**
  * This class implements the {@link ExtensionElementProvider} to parse
- * forwarded messages from a packet.  It will return a {@link Forwarded} stanza(/packet) extension.
+ * forwarded messages from a packet.  It will return a {@link Forwarded} stanza extension.
  *
  * @author Georg Lukas
  */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java
index 3d175d3a0..bbde6c1d1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java
@@ -59,7 +59,7 @@ import org.jxmpp.jid.Jid;
  * 
  * 
  * For example to get the idle time of a user logged in a resource, simple send
- * the LastActivity stanza(/packet) to them, as in the following code:
+ * the LastActivity stanza to them, as in the following code:
  * 
  * 
                  * XMPPConnection con = new XMPPTCPConnection("jabber.org");
@@ -74,7 +74,7 @@ import org.jxmpp.jid.Jid;
  * LastActivity activity = LastActivity.getLastActivity(con, "xray@jabber.org");
  * 
                
  * 
- * To get the uptime of a host, you simple send the LastActivity stanza(/packet) to it,
+ * To get the uptime of a host, you simple send the LastActivity stanza to it,
  * as in the following code example:
  * 
                
  * 
@@ -228,7 +228,7 @@ public final class LastActivityManager extends Manager {
      * 
      * @param jid
      *            the JID of the user.
-     * @return the LastActivity stanza(/packet) of the jid.
+     * @return the LastActivity stanza of the jid.
      * @throws XMPPErrorException
      *             thrown if a server error has occured.
      * @throws NoResponseException if there was no response from the server.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
index 2d431af17..0a4fea036 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java
@@ -82,7 +82,7 @@ public final class PrivateDataManager extends Manager {
     /**
      * Returns the private data provider registered to the specified XML element name and namespace.
      * For example, if a provider was registered to the element name "prefs" and the
-     * namespace "http://www.xmppclient.com/prefs", then the following stanza(/packet) would trigger
+     * namespace "http://www.xmppclient.com/prefs", then the following stanza would trigger
      * the provider:
      *
      * 
                diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java
index a1d9cdf50..bcff29e76 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java
@@ -64,7 +64,7 @@ public class DefaultPrivateData implements PrivateData {
      /**
      * Returns the XML element name of the private data sub-packet root element.
      *
-     * @return the XML element name of the stanza(/packet) extension.
+     * @return the XML element name of the stanza extension.
      */
     @Override
     public String getElementName() {
@@ -74,7 +74,7 @@ public class DefaultPrivateData implements PrivateData {
     /**
      * Returns the XML namespace of the private data sub-packet root element.
      *
-     * @return the XML namespace of the stanza(/packet) extension.
+     * @return the XML namespace of the stanza extension.
      */
     @Override
     public String getNamespace() {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java
index 76ecc81a3..923317715 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java
@@ -99,7 +99,7 @@ public final class AccountManager extends Manager {
     /**
      * Flag that indicates whether the server supports In-Band Registration.
      * In-Band Registration may be advertised as a stream feature. If no stream feature
-     * was advertised from the server then try sending an IQ stanza(/packet) to discover if In-Band
+     * was advertised from the server then try sending an IQ stanza to discover if In-Band
      * Registration is available.
      */
     private boolean accountCreationSupported = false;
@@ -116,7 +116,7 @@ public final class AccountManager extends Manager {
     /**
      * Sets whether the server supports In-Band Registration. In-Band Registration may be
      * advertised as a stream feature. If no stream feature was advertised from the server
-     * then try sending an IQ stanza(/packet) to discover if In-Band Registration is available.
+     * then try sending an IQ stanza to discover if In-Band Registration is available.
      *
      * @param accountCreationSupported true if the server supports In-Band Registration.
      */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesManager.java
index c62c45543..f57beec10 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesManager.java
@@ -29,7 +29,7 @@ public class JivePropertiesManager {
     private static boolean javaObjectEnabled = false;
 
     /**
-     * Enables deserialization of Java objects embedded in the 'properties' stanza(/packet) extension. Since
+     * Enables deserialization of Java objects embedded in the 'properties' stanza extension. Since
      * this is a security sensitive feature, it is disabled per default in Smack. Only enable it if
      * you are sure that you understand the potential security implications it can cause.
      * 
                
@@ -51,7 +51,7 @@ public class JivePropertiesManager {
     /**
      * Convenience method to add a property to a packet.
      * 
-     * @param packet the stanza(/packet) to add the property to.
+     * @param packet the stanza to add the property to.
      * @param name the name of the property to add.
      * @param value the value of the property to add.
      */
@@ -65,7 +65,7 @@ public class JivePropertiesManager {
     }
 
     /**
-     * Convenience method to get a property from a packet. Will return null if the stanza(/packet) contains
+     * Convenience method to get a property from a packet. Will return null if the stanza contains
      * not property with the given name.
      * 
      * @param packet
@@ -97,7 +97,7 @@ public class JivePropertiesManager {
     }
 
     /**
-     * Return a map of all properties of the given packet. If the stanza(/packet) contains no properties
+     * Return a map of all properties of the given packet. If the stanza contains no properties
      * extension, an empty map will be returned.
      * 
      * @param packet
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java
index a5929a9cd..b247cd18b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java
@@ -41,7 +41,7 @@ import org.jivesoftware.smack.util.stringencoder.Base64;
  */
 public class JivePropertiesExtension implements ExtensionElement {
     /**
-     * Namespace used to store stanza(/packet) properties.
+     * Namespace used to store stanza properties.
      */
     public static final String NAMESPACE = "http://www.jivesoftware.com/xmlns/xmpp/properties";
 
@@ -60,7 +60,7 @@ public class JivePropertiesExtension implements ExtensionElement {
     }
 
     /**
-     * Returns the stanza(/packet) property with the specified name or null if the
+     * Returns the stanza property with the specified name or null if the
      * property doesn't exist. Property values that were originally primitives will
      * be returned as their object equivalent. For example, an int property will be
      * returned as an Integer, a double as a Double, etc.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java
index 7e6d83617..30b8ebf86 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java
@@ -41,7 +41,7 @@ public class JivePropertiesExtensionProvider extends ExtensionElementProvider
      * Note that you have to explicitly enabled Java object deserialization with @{link
      * {@link JivePropertiesManager#setJavaObjectEnabled(boolean)}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
index 6d34edcf0..c887e8495 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java
@@ -1006,7 +1006,7 @@ public class MultiUserChat {
      * is going to be sent by this MultiUserChat to the server. Stanza(/Packet) interceptors may
      * add new extensions to the presence that is going to be sent to the MUC service.
      *
-     * @param presenceInterceptor the new stanza(/packet) interceptor that will intercept presence packets.
+     * @param presenceInterceptor the new stanza interceptor that will intercept presence packets.
      */
     public void addPresenceInterceptor(PresenceListener presenceInterceptor) {
         presenceInterceptors.add(presenceInterceptor);
@@ -1017,7 +1017,7 @@ public class MultiUserChat {
      * was being sent by this MultiUserChat to the server. Stanza(/Packet) interceptors may
      * add new extensions to the presence that is going to be sent to the MUC service.
      *
-     * @param presenceInterceptor the stanza(/packet) interceptor to remove.
+     * @param presenceInterceptor the stanza interceptor to remove.
      */
     public void removePresenceInterceptor(PresenceListener presenceInterceptor) {
         presenceInterceptors.remove(presenceInterceptor);
@@ -1693,11 +1693,11 @@ public class MultiUserChat {
     }
 
     /**
-     * Adds a stanza(/packet) listener that will be notified of any new Presence packets
+     * Adds a stanza listener that will be notified of any new Presence packets
      * sent to the group chat. Using a listener is a suitable way to know when the list
      * of occupants should be re-loaded due to any changes.
      *
-     * @param listener a stanza(/packet) listener that will be notified of any presence packets
+     * @param listener a stanza listener that will be notified of any presence packets
      *      sent to the group chat.
      * @return true if the listener was not already added.
      */
@@ -1706,10 +1706,10 @@ public class MultiUserChat {
     }
 
     /**
-     * Removes a stanza(/packet) listener that was being notified of any new Presence packets
+     * Removes a stanza listener that was being notified of any new Presence packets
      * sent to the group chat.
      *
-     * @param listener a stanza(/packet) listener that was being notified of any presence packets
+     * @param listener a stanza listener that was being notified of any presence packets
      *      sent to the group chat.
      * @return true if the listener was removed, otherwise the listener was not added previously.
      */
@@ -1941,7 +1941,7 @@ public class MultiUserChat {
 
     /**
      * Returns the next available message in the chat. The method call will block
-     * (not return) until a stanza(/packet) is available or the timeout has elapased.
+     * (not return) until a stanza is available or the timeout has elapased.
      * If the timeout elapses without a result, null will be returned.
      *
      * @param timeout the maximum amount of time to wait for the next message.
@@ -1958,14 +1958,14 @@ public class MultiUserChat {
     }
 
     /**
-     * Adds a stanza(/packet) listener that will be notified of any new messages in the
+     * Adds a stanza listener that will be notified of any new messages in the
      * group chat. Only "group chat" messages addressed to this group chat will
      * be delivered to the listener. If you wish to listen for other packets
      * that may be associated with this group chat, you should register a
      * PacketListener directly with the XMPPConnection with the appropriate
      * PacketListener.
      *
-     * @param listener a stanza(/packet) listener.
+     * @param listener a stanza listener.
      * @return true if the listener was not already added.
      */
     public boolean addMessageListener(MessageListener listener) {
@@ -1973,11 +1973,11 @@ public class MultiUserChat {
     }
 
     /**
-     * Removes a stanza(/packet) listener that was being notified of any new messages in the
+     * Removes a stanza listener that was being notified of any new messages in the
      * multi user chat. Only "group chat" messages addressed to this multi user chat were
      * being delivered to the listener.
      *
-     * @param listener a stanza(/packet) listener.
+     * @param listener a stanza listener.
      * @return true if the listener was removed, otherwise the listener was not added previously.
      */
     public boolean removeMessageListener(MessageListener listener) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java
index 8f73c8028..99fc30832 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java
@@ -75,7 +75,7 @@ public class RoomInfo {
      */
     private final boolean moderated;
     /**
-     * Every presence stanza(/packet) can include the JID of every occupant unless the owner deactives this
+     * Every presence stanza can include the JID of every occupant unless the owner deactives this
      * configuration.
      */
     private final boolean nonanonymous;
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java
index e10f38eff..7d96340d9 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java
@@ -28,7 +28,7 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 /**
- * A group chat invitation stanza(/packet) extension, which is used to invite other
+ * A group chat invitation stanza extension, which is used to invite other
  * users to a group chat room. To invite a user to a group chat room, address
  * a new message to the user and set the room name appropriately, as in the
  * following code example:
@@ -46,7 +46,7 @@ import org.xmlpull.v1.XmlPullParserException;
  *
  * 
                  * PacketFilter filter = new StanzaExtensionFilter("x", "jabber:x:conference");
- * // Create a stanza(/packet) collector or stanza(/packet) listeners using the filter...
+ * // Create a stanza collector or stanza listeners using the filter...
  * 
                
  *
  * Note: this protocol is outdated now that the Multi-User Chat (MUC) XEP is available
@@ -59,12 +59,12 @@ import org.xmlpull.v1.XmlPullParserException;
 public class GroupChatInvitation implements ExtensionElement {
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT = "x";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "jabber:x:conference";
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java
index 006947bde..2b369082b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java
@@ -23,7 +23,7 @@ import java.util.List;
 import org.jivesoftware.smack.packet.IQ;
 
 /**
- * IQ stanza(/packet) that serves for kicking users, granting and revoking voice, banning users, 
+ * IQ stanza that serves for kicking users, granting and revoking voice, banning users, 
  * modifying the ban list, granting and revoking membership and granting and revoking 
  * moderator privileges. All these operations are scoped by the 
  * 'http://jabber.org/protocol/muc#admin' namespace.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java
index e6bebcd0d..cb3c7f82b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java
@@ -23,7 +23,7 @@ import java.util.List;
 import org.jivesoftware.smack.packet.IQ;
 
 /**
- * IQ stanza(/packet) that serves for granting and revoking ownership privileges, granting 
+ * IQ stanza that serves for granting and revoking ownership privileges, granting 
  * and revoking administrative privileges and destroying a room. All these operations 
  * are scoped by the 'http://jabber.org/protocol/muc#owner' namespace.
  * 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java
index ff5b0645b..e6b39c4eb 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java
@@ -138,7 +138,7 @@ public class MUCUser implements ExtensionElement {
 
     /**
      * Returns the notification that the room has been destroyed. After a room has been destroyed,
-     * the room occupants will receive a Presence stanza(/packet) of type 'unavailable' with the reason for
+     * the room occupants will receive a Presence stanza of type 'unavailable' with the reason for
      * the room destruction if provided by the room owner.
      *
      * @return a notification that the room has been destroyed.
@@ -208,7 +208,7 @@ public class MUCUser implements ExtensionElement {
 
     /**
      * Sets the notification that the room has been destroyed. After a room has been destroyed,
-     * the room occupants will receive a Presence stanza(/packet) of type 'unavailable' with the reason for
+     * the room occupants will receive a Presence stanza of type 'unavailable' with the reason for
      * the room destruction if provided by the room owner.
      *
      * @param destroy the notification that the room has been destroyed.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java
index 4aa488d87..1c33e1e61 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java
@@ -38,7 +38,7 @@ import org.xmlpull.v1.XmlPullParserException;
 public class MUCUserProvider extends ExtensionElementProvider {
 
     /**
-     * Parses a MUCUser stanza(/packet) (extension sub-packet).
+     * Parses a MUCUser stanza (extension sub-packet).
      *
      * @param parser the XML parser, positioned at the starting element of the extension.
      * @return a PacketExtension.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java
index f288c6ec3..c4b7863b1 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java
@@ -41,7 +41,7 @@ public class OfflineMessageInfo implements ExtensionElement {
     * Returns the XML element name of the extension sub-packet root element.
     * Always returns "offline"
     *
-    * @return the XML element name of the stanza(/packet) extension.
+    * @return the XML element name of the stanza extension.
     */
     @Override
     public String getElementName() {
@@ -52,7 +52,7 @@ public class OfflineMessageInfo implements ExtensionElement {
      * Returns the XML namespace of the extension sub-packet root element.
      * According the specification the namespace is always "http://jabber.org/protocol/offline"
      *
-     * @return the XML namespace of the stanza(/packet) extension.
+     * @return the XML namespace of the stanza extension.
      */
     @Override
     public String getNamespace() {
@@ -95,7 +95,7 @@ public class OfflineMessageInfo implements ExtensionElement {
     public static class Provider extends ExtensionElementProvider {
 
         /**
-         * Parses a OfflineMessageInfo stanza(/packet) (extension sub-packet).
+         * Parses a OfflineMessageInfo stanza (extension sub-packet).
          *
          * @param parser the XML parser, positioned at the starting element of the extension.
          * @return a PacketExtension.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java
index 7ce107259..04903b9b8 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java
@@ -218,10 +218,10 @@ public final class PrivacyListManager extends Manager {
     }
 
     /**
-     * Send the {@link Privacy} stanza(/packet) to the server in order to know some privacy content and then 
+     * Send the {@link Privacy} stanza to the server in order to know some privacy content and then 
      * waits for the answer.
      * 
-     * @param requestPrivacy is the {@link Privacy} stanza(/packet) configured properly whose XML
+     * @param requestPrivacy is the {@link Privacy} stanza configured properly whose XML
      *      will be sent to the server.
      * @return a new {@link Privacy} with the data received from the server.
      * @throws XMPPErrorException 
@@ -237,10 +237,10 @@ public final class PrivacyListManager extends Manager {
     }
 
     /**
-     * Send the {@link Privacy} stanza(/packet) to the server in order to modify the server privacy and waits
+     * Send the {@link Privacy} stanza to the server in order to modify the server privacy and waits
      * for the answer.
      * 
-     * @param requestPrivacy is the {@link Privacy} stanza(/packet) configured properly whose xml will be
+     * @param requestPrivacy is the {@link Privacy} stanza configured properly whose xml will be
      *        sent to the server.
      * @return a new {@link Privacy} with the data received from the server.
      * @throws XMPPErrorException 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java
index dd062fad0..fa984902d 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.privacy.packet;
 import org.jivesoftware.smack.util.NumberUtil;
 
 /**
- * A privacy item acts a rule that when matched defines if a stanza(/packet) should be blocked or not.
+ * A privacy item acts a rule that when matched defines if a stanza should be blocked or not.
  *
  * Privacy Items can handle different kind of blocking communications based on JID, group,
  * subscription type or globally by:
                  
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java
index 096ea896a..ebdcea34b 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.pubsub;
 import org.jivesoftware.smackx.xdata.Form;
 
 /**
- * Generic stanza(/packet) extension which represents any PubSub form that is
+ * Generic stanza extension which represents any PubSub form that is
  * parsed from the incoming stream or being sent out to the server.
  * 
  * Form types are defined in {@link FormNodeType}.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
index fe0422458..bd07e1a20 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java
@@ -170,7 +170,7 @@ public class LeafNode extends Node
      * Get items persisted on the node.
      * 
                  
      * {@code additionalExtensions} can be used e.g. to add a "Result Set Management" extension.
-     * {@code returnedExtensions} will be filled with the stanza(/packet) extensions found in the answer.
+     * {@code returnedExtensions} will be filled with the stanza extensions found in the answer.
      * 
                  
      * 
      * @param additionalExtensions additional {@code PacketExtensions} to be added to the request.
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
index b2437face..077482f8e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java
@@ -145,7 +145,7 @@ public abstract class Node
      * Get the subscriptions currently associated with this node.
      * 
                  
      * {@code additionalExtensions} can be used e.g. to add a "Result Set Management" extension.
-     * {@code returnedExtensions} will be filled with the stanza(/packet) extensions found in the answer.
+     * {@code returnedExtensions} will be filled with the stanza extensions found in the answer.
      * 
                  
      *
      * @param additionalExtensions
@@ -187,11 +187,11 @@ public abstract class Node
      * 
                  
      * 
                  
      * {@code additionalExtensions} can be used e.g. to add a "Result Set Management" extension.
-     * {@code returnedExtensions} will be filled with the stanza(/packet) extensions found in the answer.
+     * {@code returnedExtensions} will be filled with the stanza extensions found in the answer.
      * 
                  
      *
      * @param additionalExtensions
-     * @param returnedExtensions a collection that will be filled with the returned stanza(/packet) extensions
+     * @param returnedExtensions a collection that will be filled with the returned stanza extensions
      * @return List of {@link Subscription}
      * @throws NoResponseException
      * @throws XMPPErrorException
@@ -242,7 +242,7 @@ public abstract class Node
      * Get the affiliations of this node.
      * 
                  
      * {@code additionalExtensions} can be used e.g. to add a "Result Set Management" extension.
-     * {@code returnedExtensions} will be filled with the stanza(/packet) extensions found in the answer.
+     * {@code returnedExtensions} will be filled with the stanza extensions found in the answer.
      * 
                  
      *
      * @param additionalExtensions additional {@code PacketExtensions} add to the request
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java
index 2c1969876..82dce9a4c 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java
@@ -19,7 +19,7 @@ package org.jivesoftware.smackx.pubsub;
 import org.jivesoftware.smack.util.XmlStringBuilder;
 
 /**
- * A stanza(/packet) extension representing the options element. 
+ * A stanza extension representing the options element. 
  * 
  * @author Robin Collier
  */
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
index 046bc70d9..24dc778ac 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java
@@ -58,7 +58,7 @@ public class PubSub extends IQ
     /**
      * Returns the XML representation of a pubsub element according the specification.
      * 
-     * The XML representation will be inside of an iq stanza(/packet) like
+     * The XML representation will be inside of an iq stanza like
      * in the following example:
      * 
                        * <iq type='set' id="MlIpV-4" to="pubsub.gato.home" from="gato3@gato.home/Smack">
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java
index 1f5336783..ef7f62985 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java
@@ -26,7 +26,7 @@ import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
- * Parses the root PubSub stanza(/packet) extensions of the {@link IQ} stanza(/packet) and returns
+ * Parses the root PubSub stanza extensions of the {@link IQ} stanza and returns
  * a {@link PubSub} instance.
  * 
  * @author Robin Collier
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java
index 6914de8b3..f0f7cf55a 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java
@@ -35,7 +35,7 @@ public interface ReceiptReceivedListener {
      * 
      * @param fromJid the jid that send this receipt
      * @param toJid the jid which received this receipt
-     * @param receiptId the message ID of the stanza(/packet) which has been received and this receipt is for
+     * @param receiptId the message ID of the stanza which has been received and this receipt is for
      * @param receipt the receipt
      */
     void onReceiptReceived(Jid fromJid, Jid toJid, String receiptId, Stanza receipt);
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java
index b505f48e6..7d8bb0e0f 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java
@@ -39,10 +39,10 @@ public class ReportedData {
     private String title = "";
 
     /**
-     * Returns a new ReportedData if the stanza(/packet) is used for reporting data and includes an 
+     * Returns a new ReportedData if the stanza is used for reporting data and includes an 
      * extension that matches the elementName and namespace "x","jabber:x:data".
      * 
-     * @param packet the stanza(/packet) used for reporting data.
+     * @param packet the stanza used for reporting data.
      * @return ReportedData from the packet if present, otherwise null.
      */
     public static ReportedData getReportedDataFrom(Stanza packet) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java
index 249c26a5c..f79f72930 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java
@@ -27,7 +27,7 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 /**
- * IQ stanza(/packet) used for discovering the user's shared groups and for getting the answer back
+ * IQ stanza used for discovering the user's shared groups and for getting the answer back
  * from the server.
                  
  *
  * Important note: This functionality is not part of the XMPP spec and it will only work
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java
index 63c8e5b5b..d9f202803 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java
@@ -47,11 +47,11 @@ public class Form {
     private DataForm dataForm;
 
     /**
-     * Returns a new ReportedData if the stanza(/packet) is used for gathering data and includes an 
+     * Returns a new ReportedData if the stanza is used for gathering data and includes an 
      * extension that matches the elementName and namespace "x","jabber:x:data".  
      * 
-     * @param packet the stanza(/packet) used for gathering data.
-     * @return the data form parsed from the stanza(/packet) or null if there was not
+     * @param packet the stanza used for gathering data.
+     * @return the data form parsed from the stanza or null if there was not
      *      a form in the packet.
      */
     public static Form getFormFrom(Stanza packet) {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java
index e9fefb7fe..d45ae5784 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java
@@ -44,7 +44,7 @@ public class DataForm implements ExtensionElement {
 
     public enum Type {
         /**
-         * This stanza(/packet) contains a form to fill out. Display it to the user (if your program can).
+         * This stanza contains a form to fill out. Display it to the user (if your program can).
          */
         form,
 
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java
index 79a712bc7..35d695dc0 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java
@@ -46,7 +46,7 @@ public class XHTMLExtension implements ExtensionElement {
     * Returns the XML element name of the extension sub-packet root element.
     * Always returns "html"
     *
-    * @return the XML element name of the stanza(/packet) extension.
+    * @return the XML element name of the stanza extension.
     */
     @Override
     public String getElementName() {
@@ -57,7 +57,7 @@ public class XHTMLExtension implements ExtensionElement {
      * Returns the XML namespace of the extension sub-packet root element.
      * According the specification the namespace is always "http://jabber.org/protocol/xhtml-im"
      *
-     * @return the XML namespace of the stanza(/packet) extension.
+     * @return the XML namespace of the stanza extension.
      */
     @Override
     public String getNamespace() {
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
index 2b3b27f1e..bdd4dd495 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
@@ -45,7 +45,7 @@ public class DataListenerTest extends InitExtensions {
     private static final Jid targetJID = JidTestUtil.FULL_JID_1_RESOURCE_1;
 
     /**
-     * If a data stanza(/packet) of an unknown session is received it should be replied
+     * If a data stanza of an unknown session is received it should be replied
      * with an <item-not-found/> error.
      * 
      * @throws Exception should not happen
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
index 7ea7e00ca..ba2f9fb78 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
@@ -252,7 +252,7 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions {
     }
 
     /**
-     * If a data stanza(/packet) is received out of order the session should be closed. See XEP-0047 Section
+     * If a data stanza is received out of order the session should be closed. See XEP-0047 Section
      * 2.2.
      * 
      * @throws Exception should not happen
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
index 1f5a64833..16620ec52 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
@@ -363,7 +363,7 @@ public class InBandBytestreamSessionTest extends InitExtensions {
     }
 
     /**
-     * If the data stanza(/packet) has a sequence that is already used an 'unexpected-request' error should
+     * If the data stanza has a sequence that is already used an 'unexpected-request' error should
      * be returned. See XEP-0047 Section 2.2.
      * 
      * @throws Exception should not happen
@@ -405,7 +405,7 @@ public class InBandBytestreamSessionTest extends InitExtensions {
     }
 
     /**
-     * If the data stanza(/packet) contains invalid Base64 encoding an 'bad-request' error should be
+     * If the data stanza contains invalid Base64 encoding an 'bad-request' error should be
      * returned. See XEP-0047 Section 2.2.
      * 
      * @throws Exception should not happen
@@ -441,7 +441,7 @@ public class InBandBytestreamSessionTest extends InitExtensions {
     }
 
     /**
-     * If a data stanza(/packet) is received out of order the session should be closed. See XEP-0047 Section
+     * If a data stanza is received out of order the session should be closed. See XEP-0047 Section
      * 2.2.
      * 
      * @throws Exception should not happen
diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java
index a42976227..f0c768e7a 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java
@@ -51,7 +51,7 @@ public class Socks5PacketUtils {
     }
 
     /**
-     * Returns a response to a SOCKS5 Bytestream initialization request. The stanza(/packet) doesn't contain
+     * Returns a response to a SOCKS5 Bytestream initialization request. The stanza doesn't contain
      * the uses-host information.
      * 
      * @param from the target
@@ -67,7 +67,7 @@ public class Socks5PacketUtils {
     }
 
     /**
-     * Returns a response to an item discovery request. The stanza(/packet) doesn't contain any items.
+     * Returns a response to an item discovery request. The stanza doesn't contain any items.
      * 
      * @param from the XMPP server
      * @param to the XMPP client
@@ -82,7 +82,7 @@ public class Socks5PacketUtils {
     }
 
     /**
-     * Returns a response to an info discovery request. The stanza(/packet) doesn't contain any infos.
+     * Returns a response to an info discovery request. The stanza doesn't contain any infos.
      * 
      * @param from the target
      * @param to the initiator
diff --git a/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java b/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
index fd0931a3a..3c489f525 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
@@ -46,7 +46,7 @@ import org.mockito.stubbing.Answer;
 public class ConnectionUtils {
 
     /**
-     * Creates a mocked XMPP connection that stores every stanza(/packet) that is send over this
+     * Creates a mocked XMPP connection that stores every stanza that is send over this
      * connection in the given protocol instance and returns the predefined answer packets
      * form the protocol instance.
      * 
                  
diff --git a/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java b/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java
index ead9f27f1..906c57594 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java
@@ -50,7 +50,7 @@ import org.jivesoftware.smack.packet.Stanza;
  * 
                    * 
  * public void methodToTest() {
- *   Stanza(/Packet) stanza(/packet) = new Packet(); // create an XMPP packet
+ *   Stanza(/Packet) stanza = new Packet(); // create an XMPP packet
  *   StanzaCollector collector = connection.createStanzaCollector(new StanzaIdFilter());
  *   connection.sendStanza(packet);
  *   Stanza(/Packet) reply = collector.nextResult();
@@ -62,7 +62,7 @@ import org.jivesoftware.smack.packet.Stanza;
  *   // create mocked connection
  *   XMPPConnection connection = ConnectionUtils.createMockedConnection(protocol, "user@xmpp-server", "xmpp-server");
  *   
- *   // add reply stanza(/packet) to protocol
+ *   // add reply stanza to protocol
  *   Stanza(/Packet) reply = new Packet();
  *   protocol.add(reply);
  *   
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java b/smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java
index 0aa9e06e2..29cfda5ca 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java
@@ -121,10 +121,10 @@ public class Chat {
     }
 
     /**
-     * Adds a stanza(/packet) listener that will be notified of any new messages in the
+     * Adds a stanza listener that will be notified of any new messages in the
      * chat.
      *
-     * @param listener a stanza(/packet) listener.
+     * @param listener a stanza listener.
      */
     public void addMessageListener(ChatMessageListener listener) {
         if (listener == null) {
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/package-info.java
deleted file mode 120000
index a3d8f86a1..000000000
--- a/smack-integration-test/src/main/java/org/jivesoftware/smack/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../smack-core/src/main/java/org/jivesoftware/smack/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/package-info.java
new file mode 100644
index 000000000..ba596a352
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2015 Florian Schmaus
+ *
+ * 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.
+ */
+
+/**
+ * Core classes of the Smack API.
+ */
+package org.jivesoftware.smack;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/package-info.java
deleted file mode 120000
index a484788a7..000000000
--- a/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../smack-im/src/main/java/org/jivesoftware/smack/roster/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/package-info.java
new file mode 100644
index 000000000..cfc810e09
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/roster/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2015 Florian Schmaus
+ *
+ * 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.
+ */
+
+/**
+ * Smacks API for Rosters.
+ */
+package org.jivesoftware.smack.roster;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/package-info.java
deleted file mode 120000
index 65b39fb44..000000000
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/caps/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/package-info.java
new file mode 100644
index 000000000..1c6e66aea
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2015 Florian Schmaus
+ *
+ * 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.
+ */
+
+/**
+ * Smacks implementation of XEP-0115: Entity Capabilities.
+ */
+package org.jivesoftware.smackx.caps;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java
deleted file mode 120000
index 538c3207c..000000000
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java
new file mode 100644
index 000000000..b31a88347
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/filetransfer/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2015 Florian Schmaus
+ *
+ * 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.
+ */
+
+/**
+ * File Transfers via XEP-0095: Stream Initialization.
+ */
+package org.jivesoftware.smackx.filetransfer;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/httpfileupload/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/httpfileupload/package-info.java
deleted file mode 120000
index 1bde5bbc6..000000000
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/httpfileupload/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/httpfileupload/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/httpfileupload/package-info.java
new file mode 100644
index 000000000..d61996ae9
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/httpfileupload/package-info.java
@@ -0,0 +1,24 @@
+/**
+ *
+ * Copyright © 2017 Grigory Fedorov
+ *
+ * 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.
+ */
+
+/**
+ * Smack's API for XEP-0363: HTTP File Upload.
+ *
+ * @author Grigory Fedorov
+ * @see XEP-0363: HTTP File Upload
+ */
+package org.jivesoftware.smackx.httpfileupload;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/package-info.java
deleted file mode 120000
index 3c51eae31..000000000
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../smack-experimental/src/main/java/org/jivesoftware/smackx/iot/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/package-info.java
new file mode 100644
index 000000000..f60c57e84
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iot/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright © 2016 Florian Schmaus
+ *
+ * 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.
+ */
+
+/**
+ * Smack's API for XMPP IoT.
+ */
+package org.jivesoftware.smackx.iot;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java
deleted file mode 120000
index f1ac066f1..000000000
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java
new file mode 100644
index 000000000..03f33d1fd
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/iqversion/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2015 Florian Schmaus
+ *
+ * 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.
+ */
+
+/**
+ * Smacks implementation of XEP-0092: Software Version.
+ */
+package org.jivesoftware.smackx.iqversion;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/mam/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/mam/package-info.java
deleted file mode 120000
index 54c99cb44..000000000
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/mam/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../smack-experimental/src/main/java/org/jivesoftware/smackx/mam/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/mam/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/mam/package-info.java
new file mode 100644
index 000000000..16b8b2b7b
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/mam/package-info.java
@@ -0,0 +1,25 @@
+/**
+ *
+ * Copyright 2016 Fernando Ramirez
+ *
+ * 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.
+ */
+
+/**
+ * XEP-0313: Message Archive Management.
+ * 
+ * @see XEP-0313: Message
+ *      Archive Management
+ * 
+ */
+package org.jivesoftware.smackx.mam;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/package-info.java
deleted file mode 120000
index d2e3650fc..000000000
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/muc/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/package-info.java
new file mode 100644
index 000000000..9861e03c4
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/muc/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2015 Florian Schmaus
+ *
+ * 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.
+ */
+
+/**
+ * Classes and Interfaces that implement Multi-User Chat (MUC) as defined in XEP-0045.
+ */
+package org.jivesoftware.smackx.muc;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/package-info.java
deleted file mode 120000
index 2af0aa211..000000000
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/package-info.java
new file mode 100644
index 000000000..737ea40e6
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/omemo/package-info.java
@@ -0,0 +1,26 @@
+/**
+ *
+ * Copyright 2017 Paul Schaub
+ *
+ * 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.
+ */
+/**
+ * Classes and interfaces for OMEMO Encryption. This module consists of the
+ * XMPP logic and some abstract crypto classes that have to be implemented
+ * using concrete crypto libraries (like signal-protocol-java or olm).
+ * See smack-omemo-signal for a concrete implementation (GPL licensed).
+ * 
+ * @author Paul Schaub
+ * @see XEP-0384: OMEMO
+ */
+package org.jivesoftware.smackx.omemo;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java
deleted file mode 120000
index f0646658f..000000000
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java
new file mode 100644
index 000000000..b7b3f868f
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2015 Florian Schmaus
+ *
+ * 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.
+ */
+
+/**
+ * Integration tests.
+ */
+package org.jivesoftware.smackx;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/package-info.java
deleted file mode 120000
index edea7d8fd..000000000
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/ping/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/package-info.java
new file mode 100644
index 000000000..49e29068b
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/ping/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2015 Florian Schmaus
+ *
+ * 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.
+ */
+
+/**
+ * Smacks implementation of XEP-0199: XMPP Ping.
+ */
+package org.jivesoftware.smackx.ping;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/pubsub/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/pubsub/package-info.java
deleted file mode 120000
index 2ac8fc1a3..000000000
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/pubsub/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/pubsub/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/pubsub/package-info.java
new file mode 100644
index 000000000..18f3ea8c5
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/pubsub/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2015 Florian Schmaus
+ *
+ * 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.
+ */
+
+/**
+ * Smack's API for XEP-0060: Publish-Subscribe.
+ */
+package org.jivesoftware.smackx.pubsub;
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/package-info.java
deleted file mode 120000
index 10c8fa20c..000000000
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/package-info.java
\ No newline at end of file
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/package-info.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/package-info.java
new file mode 100644
index 000000000..1c6665572
--- /dev/null
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/xdata/package-info.java
@@ -0,0 +1,21 @@
+/**
+ *
+ * Copyright 2015 Florian Schmaus
+ *
+ * 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.
+ */
+
+/**
+ * Smacks implementation of XEP-0004: Data Forms.
+ */
+package org.jivesoftware.smackx.xdata;
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java
index ef0ac5d3e..338fb4230 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java
@@ -436,7 +436,7 @@ public class JingleManager implements JingleSessionListener {
     }
 
     /**
-     * Register the listenerJingles, waiting for a Jingle stanza(/packet) that tries to
+     * Register the listenerJingles, waiting for a Jingle stanza that tries to
      * establish a new session.
      */
     private void initJingleSessionRequestListeners() {
@@ -490,7 +490,7 @@ public class JingleManager implements JingleSessionListener {
     /**
      * Activates the listenerJingles on a Jingle session request.
      *
-     * @param initJin the stanza(/packet) that must be passed to the jingleSessionRequestListener.
+     * @param initJin the stanza that must be passed to the jingleSessionRequestListener.
      */
     void triggerSessionRequested(Jingle initJin) {
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiator.java
index ddb2e08dc..6a763db09 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiator.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleNegotiator.java
@@ -202,7 +202,7 @@ public abstract class JingleNegotiator {
     /**
      * Dispatch an incoming packet.
      * 
-     * The negotiators form a tree relationship that roughly matches the Jingle stanza(/packet) format:
+     * The negotiators form a tree relationship that roughly matches the Jingle stanza format:
      * 
      * JingleSession
      *      Content Negotiator
@@ -220,15 +220,15 @@ public abstract class JingleNegotiator {
      *          <description>
      *          <transport>
      *          
-     * This way, each segment of a Jingle stanza(/packet) has a corresponding negotiator that know how to deal with that
+     * This way, each segment of a Jingle stanza has a corresponding negotiator that know how to deal with that
      * part of the Jingle packet.  It also allows us to support Jingle packets of arbitraty complexity.
      * 
      * Each parent calls dispatchIncomingPacket for each of its children.  The children then pass back a List of
      * results that will get sent when we reach the top level negotiator (JingleSession).
      *
-     * @param iq the stanza(/packet) received
+     * @param iq the stanza received
      * @param id the ID of the response that will be sent
-     * @return the new stanza(/packet) to send (either a Jingle or an IQ error).
+     * @return the new stanza to send (either a Jingle or an IQ error).
      * @throws XMPPException
      * @throws InterruptedException 
      */
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
index 9ea3924fd..59d67058f 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java
@@ -271,14 +271,14 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
 
     /**
      * Process and respond to an incoming packet. This method is called
-     * from the stanza(/packet) listener dispatcher when a new stanza(/packet) has arrived. The
-     * method is responsible for recognizing the stanza(/packet) type and, depending on
+     * from the stanza listener dispatcher when a new stanza has arrived. The
+     * method is responsible for recognizing the stanza type and, depending on
      * the current state, delivering it to the right event handler and wait for
-     * a response. The response will be another Jingle stanza(/packet) that will be sent
+     * a response. The response will be another Jingle stanza that will be sent
      * to the other end point.
      * 
      * @param iq
-     *            the stanza(/packet) received
+     *            the stanza received
      * @throws XMPPException
      * @throws SmackException 
      * @throws InterruptedException 
@@ -343,12 +343,12 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
 
     /**
      * Dispatch an incoming packet. The method is responsible for recognizing
-     * the stanza(/packet) type and, depending on the current state, delivering the
-     * stanza(/packet) to the right event handler and wait for a response.
+     * the stanza type and, depending on the current state, delivering the
+     * stanza to the right event handler and wait for a response.
      * 
      * @param iq
-     *            the stanza(/packet) received
-     * @return the new Jingle stanza(/packet) to send.
+     *            the stanza received
+     * @return the new Jingle stanza to send.
      * @throws XMPPException
      * @throws SmackException 
      * @throws InterruptedException 
@@ -423,7 +423,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
      * reponse, using the session information we have.
      * 
      * @param jout
-     *            the Jingle stanza(/packet) we want to complete and send
+     *            the Jingle stanza we want to complete and send
      * @throws NotConnectedException 
      * @throws InterruptedException 
      */
@@ -437,9 +437,9 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
      * incoming packet.
      * 
      * @param iq
-     *            The Jingle stanza(/packet) we are responding to
+     *            The Jingle stanza we are responding to
      * @param jout
-     *            the Jingle stanza(/packet) we want to complete and send
+     *            the Jingle stanza we want to complete and send
      * @throws NotConnectedException 
      * @throws InterruptedException 
      */
@@ -664,7 +664,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
     }
 
     /**
-     * Remove the stanza(/packet) listener used for processing packet.
+     * Remove the stanza listener used for processing packet.
      */
     protected void removeAsyncPacketListener() {
         if (packetListener != null) {
@@ -675,8 +675,8 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
     }
 
     /**
-     * Install the stanza(/packet) listener. The listener is responsible for responding
-     * to any stanza(/packet) that we receive...
+     * Install the stanza listener. The listener is responsible for responding
+     * to any stanza that we receive...
      */
     protected void updatePacketListener() {
         removeAsyncPacketListener();
@@ -1045,9 +1045,9 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
      * incoming packet.
      * 
      * @param iq
-     *            The Jingle stanza(/packet) we are responding to
+     *            The Jingle stanza we are responding to
      * @param jingleError
-     *            the IQ stanza(/packet) we want to complete and send
+     *            the IQ stanza we want to complete and send
      */
     public IQ createJingleError(IQ iq, JingleError jingleError) {
         IQ errorPacket = null;
@@ -1153,7 +1153,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
 
     /**
      * When we initiate a session we need to start a bunch of negotiators right after we receive the result
-     * stanza(/packet) for our session-initiate.  This is where we start them.
+     * stanza for our session-initiate.  This is where we start them.
      * 
      */
     private void startNegotiators() {
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionRequest.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionRequest.java
index 2584f3279..40b12c4b0 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionRequest.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSessionRequest.java
@@ -30,7 +30,7 @@ import org.jxmpp.jid.Jid;
  * A Jingle session request.
  *
  * This class is a facade of a received Jingle request. The user can have direct
- * access to the Jingle stanza(/packet) (JingleSessionRequest.getJingle() ) of
+ * access to the Jingle stanza (JingleSessionRequest.getJingle() ) of
  * the request or can use the convenience methods provided by this class.
  *
  * @author Alvaro Saurin
@@ -78,7 +78,7 @@ public class JingleSessionRequest {
     }
 
     /**
-     * Returns the Jingle stanza(/packet) that was sent by the requester which contains
+     * Returns the Jingle stanza that was sent by the requester which contains
      * the parameters of the session.
      */
     public Jingle getJingle() {
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java
index 24d5545f5..28e43afb0 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/media/MediaNegotiator.java
@@ -96,12 +96,12 @@ public class MediaNegotiator extends JingleNegotiator {
 
     /**
      * Dispatch an incoming packet. The method is responsible for recognizing
-     * the stanza(/packet) type and, depending on the current state, delivering the
-     * stanza(/packet) to the right event handler and wait for a response.
+     * the stanza type and, depending on the current state, delivering the
+     * stanza to the right event handler and wait for a response.
      * 
      * @param iq
-     *            the stanza(/packet) received
-     * @return the new Jingle stanza(/packet) to send.
+     *            the stanza received
+     * @return the new Jingle stanza to send.
      * @throws XMPPException
      * @throws NotConnectedException 
      * @throws InterruptedException 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java
index fdd9c8689..d5bbbb285 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioChannel.java
@@ -310,11 +310,11 @@ public class AudioChannel {
     }
 
     /**
-     * Get the best stanza(/packet) size for a given codec and a codec rate
+     * Get the best stanza size for a given codec and a codec rate
      *
      * @param codecFormat
      * @param milliseconds
-     * @return the best stanza(/packet) size
+     * @return the best stanza size
      * @throws IllegalArgumentException
      */
     private int getPacketSize(Format codecFormat, int milliseconds) throws IllegalArgumentException {
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/DatagramListener.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/DatagramListener.java
index 135000bc1..291af0016 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/DatagramListener.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/DatagramListener.java
@@ -27,9 +27,9 @@ public interface DatagramListener {
 
     /**
      * Called when a datagram is received. If the method returns false, the
-     * stanza(/packet) MUST NOT be resent from the received Channel.
+     * stanza MUST NOT be resent from the received Channel.
      *
-     * @param datagramPacket the datagram stanza(/packet) received.
+     * @param datagramPacket the datagram stanza received.
      * @return ?
      */
     boolean datagramReceived(DatagramPacket datagramPacket);
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
index 2a7c00fe4..b382d9f1c 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
@@ -72,17 +72,17 @@ public class RTPBridge extends IQ {
     }
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String NAME = "rtpbridge";
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "rtpbridge";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://www.jivesoftware.com/protocol/rtpbridge";
 
@@ -322,7 +322,7 @@ public class RTPBridge extends IQ {
 
     /**
      * IQProvider for RTP Bridge packets.
-     * Parse receive RTPBridge stanza(/packet) to a RTPBridge instance
+     * Parse receive RTPBridge stanza to a RTPBridge instance
      *
      * @author Thiago Rocha
      */
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
index ed0d54003..f4fb608b8 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
@@ -55,17 +55,17 @@ public class STUN extends SimpleIQ {
     private String publicIp = null;
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String DOMAIN = "stun";
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "query";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "google:jingleinfo";
 
@@ -109,7 +109,7 @@ public class STUN extends SimpleIQ {
 
     /**
      * IQProvider for RTP Bridge packets.
-     * Parse receive RTPBridge stanza(/packet) to a RTPBridge instance
+     * Parse receive RTPBridge stanza to a RTPBridge instance
      *
      * @author Thiago Rocha
      */
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java
index 55378b42e..94d311fba 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportNegotiator.java
@@ -47,7 +47,7 @@ import org.jivesoftware.smackx.jingleold.packet.JingleTransport.JingleTransportC
  * Transport negotiator.
  *
  * This class is responsible for managing the transport negotiation process,
- * handling all the stanza(/packet) interchange and the stage control.
+ * handling all the stanza interchange and the stage control.
  *
  * @author Alvaro Saurin
  */
@@ -551,7 +551,7 @@ public abstract class TransportNegotiator extends JingleNegotiator {
     }
 
     /**
-     * Create a Jingle stanza(/packet) where we announce our transport candidates.
+     * Create a Jingle stanza where we announce our transport candidates.
      *
      * @throws XMPPException
      * @throws SmackException 
@@ -597,11 +597,11 @@ public abstract class TransportNegotiator extends JingleNegotiator {
 
     /**
      * Dispatch an incoming packet. The method is responsible for recognizing
-     * the stanza(/packet) type and, depending on the current state, delivering the
-     * stanza(/packet) to the right event handler and wait for a response.
+     * the stanza type and, depending on the current state, delivering the
+     * stanza to the right event handler and wait for a response.
      *
-     * @param iq the stanza(/packet) received
-     * @return the new Jingle stanza(/packet) to send.
+     * @param iq the stanza received
+     * @return the new Jingle stanza to send.
      * @throws XMPPException
      * @throws SmackException 
      * @throws InterruptedException 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java
index 5efbbaa73..7712a3474 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java
@@ -182,7 +182,7 @@ public class Jingle extends IQ {
      * Returns the XML element name of the extension sub-packet root element.
      * Always returns "jingle"
      *
-     * @return the XML element name of the stanza(/packet) extension.
+     * @return the XML element name of the stanza extension.
      */
     public static String getElementName() {
         return NODENAME;
@@ -191,7 +191,7 @@ public class Jingle extends IQ {
     /**
      * Returns the XML namespace of the extension sub-packet root element.
      *
-     * @return the XML namespace of the stanza(/packet) extension.
+     * @return the XML namespace of the stanza extension.
      */
     public static String getNamespace() {
         return NAMESPACE;
@@ -326,7 +326,7 @@ public class Jingle extends IQ {
     }
 
     /**
-     * Get a hash key for the session this stanza(/packet) belongs to.
+     * Get a hash key for the session this stanza belongs to.
      *
      * @param sid       The session id
      * @param initiator The initiator
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java
index df11ed420..f20545230 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java
@@ -25,17 +25,17 @@ import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smackx.workgroup.util.MetaDataUtils;
 
 /**
- * MetaData stanza(/packet) extension.
+ * MetaData stanza extension.
  */
 public class MetaData implements ExtensionElement {
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "metadata";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
index 719e8e28c..fb1e60f2e 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
@@ -197,7 +197,7 @@ public class AgentSession {
 
     /**
      * Close the agent session. The underlying connection will remain opened but the
-     * stanza(/packet) listeners that were added by this agent session will be removed.
+     * stanza listeners that were added by this agent session will be removed.
      */
     public void close() {
         connection.removeAsyncStanzaListener(packetListener);
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java
index 319d065eb..1e5ae1707 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java
@@ -26,12 +26,12 @@ import org.xmlpull.v1.XmlPullParser;
 public class WorkgroupForm extends SimpleIQ {
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "workgroup-form";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
index c677e4d07..3e7829883 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
@@ -36,12 +36,12 @@ import org.xmlpull.v1.XmlPullParserException;
 public class AgentChatHistory extends IQ {
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "chat-sessions";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java
index ddfbc9c52..4f258bfb2 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java
@@ -33,12 +33,12 @@ import org.xmlpull.v1.XmlPullParserException;
 public class ChatMetadata extends IQ {
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "chat-metadata";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
index 8a1a31ae4..4b2c67c91 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
@@ -35,12 +35,12 @@ import org.xmlpull.v1.XmlPullParserFactory;
 public class Macros extends IQ {
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "macros";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java
index d303cf7fe..7d05a9b29 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java
@@ -26,17 +26,17 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 /**
- * IQ stanza(/packet) for retrieving and adding Chat Notes.
+ * IQ stanza for retrieving and adding Chat Notes.
  */
 public class ChatNotes extends IQ {
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "chat-notes";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java
index ab93086c9..dccd69e33 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java
@@ -26,17 +26,17 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 /**
- * IQ stanza(/packet) for retrieving and changing the Agent personal information.
+ * IQ stanza for retrieving and changing the Agent personal information.
  */
 public class AgentInfo extends IQ {
 
     /**
-    * Element name of the stanza(/packet) extension.
+    * Element name of the stanza extension.
     */
    public static final String ELEMENT_NAME = "agent-info";
 
    /**
-    * Namespace of the stanza(/packet) extension.
+    * Namespace of the stanza extension.
     */
    public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
index b90fb0010..787ac0c98 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
@@ -47,12 +47,12 @@ public class AgentStatus implements ExtensionElement {
     }
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "agent-status";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
index 2bac45a01..c40bc4273 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
@@ -30,8 +30,8 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 /**
- * 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
+ * Agent status request packet. This stanza is used by agents to request the list of
+ * agents in a workgroup. The response stanza contains a list of packets. Presence
  * packets from individual agents follow.
  *
  * @author Matt Tucker
@@ -39,12 +39,12 @@ import org.xmlpull.v1.XmlPullParserException;
 public class AgentStatusRequest extends IQ {
 
      /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "agent-status-request";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java
index 9a16e1c6f..d75a10f4c 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java
@@ -22,7 +22,7 @@ import org.jivesoftware.smack.packet.IQ;
 import org.jxmpp.jid.Jid;
 
 /**
- * A IQ stanza(/packet) used to depart a workgroup queue. There are two cases for issuing a depart
+ * A IQ stanza used to depart a workgroup queue. There are two cases for issuing a depart
  * queue request:
                    
  *     
                  • The user wants to leave the queue. In this case, an instance of this class
  *         should be created without passing in a user address.
@@ -41,7 +41,7 @@ public class DepartQueuePacket extends IQ {
     }
 
     /**
-     * Creates a depart queue request stanza(/packet) to the specified workgroup.
+     * Creates a depart queue request stanza to the specified workgroup.
      *
      * @param workgroup the workgroup to depart.
      */
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java
index 3484bae4a..d5ea47978 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java
@@ -47,12 +47,12 @@ public class MonitorPacket extends IQ {
     }
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "monitor";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
index 224b7fd80..217e2929e 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
@@ -49,12 +49,12 @@ public class OccupantsInfo extends IQ {
     }
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "occupants-info";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
index c7d291e72..c840298ea 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
@@ -36,19 +36,19 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 /**
- * Queue details stanza(/packet) extension, which contains details about the users
+ * Queue details stanza extension, which contains details about the users
  * currently in a queue.
  */
 public final class QueueDetails implements ExtensionElement {
     private static final Logger LOGGER = Logger.getLogger(QueueDetails.class.getName());
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "notify-queue-details";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
 
@@ -139,7 +139,7 @@ public final class QueueDetails implements ExtensionElement {
     }
 
     /**
-     * Provider class for QueueDetails stanza(/packet) extensions.
+     * Provider class for QueueDetails stanza extensions.
      */
     public static class Provider extends ExtensionElementProvider {
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
index e2fdaca52..92644ecf9 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
@@ -34,12 +34,12 @@ import org.xmlpull.v1.XmlPullParserException;
 public class QueueOverview implements ExtensionElement {
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static String ELEMENT_NAME = "notify-queue";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static String NAMESPACE = "http://jabber.org/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
index 642908f0c..1f5cb577f 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
@@ -26,19 +26,19 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 /**
- * An IQ stanza(/packet) that encapsulates both types of workgroup queue
+ * An IQ stanza 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 stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "queue-status";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
index e48a7610d..4275c5b30 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
@@ -36,12 +36,12 @@ import org.xmlpull.v1.XmlPullParserException;
 public class RoomInvitation implements ExtensionElement {
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "invite";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
index d0e6c8829..f270b7cbf 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
@@ -36,12 +36,12 @@ import org.xmlpull.v1.XmlPullParserException;
 public class RoomTransfer implements ExtensionElement {
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "transfer";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java
index a2a926924..8d0924e5b 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java
@@ -28,12 +28,12 @@ import org.xmlpull.v1.XmlPullParserException;
 public class SessionID implements ExtensionElement {
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "session";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
index 9fe4aa84e..0e53e7a54 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
@@ -24,7 +24,7 @@ import org.jivesoftware.smack.util.PacketParserUtils;
 import org.xmlpull.v1.XmlPullParser;
 
 /**
- * IQ stanza(/packet) for retrieving the transcript search form, submitting the completed search form
+ * IQ stanza for retrieving the transcript search form, submitting the completed search form
  * or retrieving the answer of a transcript search.
  *
  * @author Gaston Dombiak
@@ -32,12 +32,12 @@ import org.xmlpull.v1.XmlPullParser;
 public class TranscriptSearch extends SimpleIQ {
 
     /**
-    * Element name of the stanza(/packet) extension.
+    * Element name of the stanza extension.
     */
    public static final String ELEMENT_NAME = "transcript-search";
 
    /**
-    * Namespace of the stanza(/packet) extension.
+    * Namespace of the stanza extension.
     */
    public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
index 20469d2ee..ba0162619 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
@@ -30,12 +30,12 @@ import org.xmlpull.v1.XmlPullParserException;
 public class UserID implements ExtensionElement {
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "user";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
index 1cb631549..6fa3eac74 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
@@ -26,18 +26,18 @@ import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 /**
- * 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.
+ * A stanza extension that contains information about the user and agent in a
+ * workgroup chat. The stanza extension is attached to group chat invitations.
  */
 public class WorkgroupInformation implements ExtensionElement {
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "workgroup";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
index 421dc0345..b410d0979 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
@@ -51,12 +51,12 @@ public class ChatSettings extends IQ {
     private int type = -1;
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "chat-settings";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
index c106c4879..03bc8de64 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
@@ -52,12 +52,12 @@ public class GenericSettings extends IQ {
 
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "generic-metadata";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java
index 7428ec590..ba6148613 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java
@@ -88,12 +88,12 @@ public class OfflineSettings extends SimpleIQ {
     }
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "offline-settings";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java
index 259921b94..d888c113c 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java
@@ -59,12 +59,12 @@ public class SearchSettings extends SimpleIQ {
 
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "search-settings";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java
index 89f23632c..8aa18443d 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java
@@ -49,12 +49,12 @@ public class SoundSettings extends SimpleIQ {
 
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "sound-settings";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
index 80fdf7e6a..5c9a4556c 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
@@ -67,12 +67,12 @@ public class WorkgroupProperties extends IQ {
 
 
     /**
-     * Element name of the stanza(/packet) extension.
+     * Element name of the stanza extension.
      */
     public static final String ELEMENT_NAME = "workgroup-properties";
 
     /**
-     * Namespace of the stanza(/packet) extension.
+     * Namespace of the stanza extension.
      */
     public static final String NAMESPACE = "http://jivesoftware.com/protocol/workgroup";
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
index c99dc729d..06b19c589 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
@@ -562,7 +562,7 @@ public class Workgroup {
     }
 
     /**
-     * IQ stanza(/packet) to request joining the workgroup queue.
+     * IQ stanza to request joining the workgroup queue.
      */
     private final class JoinQueuePacket extends IQ {
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java
index 6d1bff5f1..78ca6c8f7 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java
@@ -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 stanza(/packet) extension.
+    * @return the XML element name of the stanza extension.
     */
     @Override
     public String getElementName() {
@@ -87,7 +87,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 stanza(/packet) extension.
+     * @return the XML namespace of the stanza extension.
      */
     @Override
     public String getNamespace() {
@@ -155,7 +155,7 @@ public class MessageEvent implements ExtensionElement {
 
     /**
      * Returns the unique ID of the message that requested to be notified of the event.
-     * The stanza(/packet) id is not used when the message is a request for notifications
+     * The stanza id is not used when the message is a request for notifications
      *
      * @return the message id that requested to be notified of the event.
      */
@@ -256,7 +256,7 @@ public class MessageEvent implements ExtensionElement {
 
     /**
      * Sets the unique ID of the message that requested to be notified of the event.
-     * The stanza(/packet) id is not used when the message is a request for notifications
+     * The stanza 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.
      */
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java
index a85752974..c743c131d 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java
@@ -35,7 +35,7 @@ import org.xmlpull.v1.XmlPullParserException;
 public class MessageEventProvider extends ExtensionElementProvider {
 
     /**
-     * Parses a MessageEvent stanza(/packet) (extension sub-packet).
+     * Parses a MessageEvent stanza (extension sub-packet).
      *
      * @param parser the XML parser, positioned at the starting element of the extension.
      * @return a PacketExtension.
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java
index cb0cdebb9..d646f3c16 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java
@@ -109,7 +109,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 stanza(/packet) extension.
+    * @return the XML element name of the stanza extension.
     */
     @Override
     public String getElementName() {
@@ -121,7 +121,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 stanza(/packet) extension.
+     * @return the XML namespace of the stanza extension.
      */
     @Override
     public String getNamespace() {
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
index 9baeb005a..53ee26c40 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
@@ -39,7 +39,7 @@ import org.xmlpull.v1.XmlPullParserException;
 public class RosterExchangeProvider extends ExtensionElementProvider {
 
     /**
-     * Parses a RosterExchange stanza(/packet) (extension sub-packet).
+     * Parses a RosterExchange stanza (extension sub-packet).
      *
      * @param parser the XML parser, positioned at the starting element of the extension.
      * @return a PacketExtension.
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
index df9bba343..c0c73dc19 100644
--- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
+++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
@@ -621,7 +621,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
     }
 
     /**
-     * Initializes the connection by creating a stanza(/packet) reader and writer and opening a
+     * Initializes the connection by creating a stanza reader and writer and opening a
      * XMPP stream to the server.
      *
      * @throws XMPPException if establishing a connection to the server fails.
@@ -1012,7 +1012,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
          }
 
         /**
-         * Shuts the stanza(/packet) reader down. This method simply sets the 'done' flag to true.
+         * Shuts the stanza reader down. This method simply sets the 'done' flag to true.
          */
         void shutdown() {
             done = true;
@@ -1267,7 +1267,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
                         XMPPTCPConnection.this, "shutdown completed");
 
         /**
-         * If set, the stanza(/packet) writer is shut down
+         * If set, the stanza writer is shut down
          */
         protected volatile Long shutdownTimestamp = null;
 
@@ -1347,7 +1347,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
         }
 
         /**
-         * Shuts down the stanza(/packet) writer. Once this method has been called, no further
+         * Shuts down the stanza writer. Once this method has been called, no further
          * packets will be written to the server.
          * @throws InterruptedException 
          */
diff --git a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java
index 6862ac32d..5cfd11fe5 100644
--- a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java
+++ b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java
@@ -35,7 +35,7 @@ public class PacketWriterTest {
     private volatile boolean prematureUnblocked;
 
     /**
-     * Make sure that stanza(/packet) writer does block once the queue reaches
+     * Make sure that stanza writer does block once the queue reaches
      * {@link PacketWriter#QUEUE_SIZE} and that
      * {@link PacketWriter#sendStanza(org.jivesoftware.smack.tcp.packet.Packet)} does unblock after the
      * interrupt.