From 8d3814a8a79f0c6b573f4f186320551eeba218ba Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sat, 15 Feb 2014 11:35:08 +0100 Subject: [PATCH] New API design (SMACK-545) --- core/src/main/resources/smack-config.xml | 9 +- .../smackx/carbons/CarbonManager.java | 21 ++-- .../CarbonExtension.java} | 12 +- .../provider/CarbonManagerProvider.java | 8 +- .../smackx/workgroup/agent/AgentSession.java | 6 +- .../agent/TranscriptSearchManager.java | 4 +- .../smackx/workgroup/user/Workgroup.java | 12 +- .../smackx/carbons/CarbonTest.java | 13 +- .../{provider => }/ExtensionInitializer.java | 2 +- .../{ => address}/MultipleRecipientInfo.java | 8 +- .../MultipleRecipientManager.java | 9 +- .../packet/MultipleAddresses.java | 2 +- .../provider/MultipleAddressesProvider.java | 4 +- .../packet/AttentionExtension.java | 2 +- .../smackx/bookmark/BookmarkManager.java | 2 +- .../smackx/bookmark/Bookmarks.java | 4 +- .../socks5/Socks5BytestreamManager.java | 10 +- .../smackx/{ => chatstates}/ChatState.java | 2 +- .../{ => chatstates}/ChatStateListener.java | 2 +- .../{ => chatstates}/ChatStateManager.java | 11 +- .../packet/ChatStateExtension.java | 6 +- .../smackx/commands/AdHocCommand.java | 4 +- .../smackx/commands/AdHocCommandManager.java | 14 +-- .../smackx/commands/LocalCommand.java | 2 +- .../smackx/commands/RemoteCommand.java | 4 +- .../packet/AdHocCommandData.java | 3 +- .../provider/AdHocCommandDataProvider.java | 7 +- .../smackx/{ => delay}/packet/DelayInfo.java | 2 +- .../{ => delay}/packet/DelayInformation.java | 2 +- .../provider/DelayInfoProvider.java | 6 +- .../provider/DelayInformationProvider.java | 4 +- .../{ => disco}/NodeInformationProvider.java | 8 +- .../{ => disco}/ServiceDiscoveryManager.java | 10 +- .../{ => disco}/packet/DiscoverInfo.java | 2 +- .../{ => disco}/packet/DiscoverItems.java | 2 +- .../provider/DiscoverInfoProvider.java | 4 +- .../provider/DiscoverItemsProvider.java | 4 +- .../smackx/entitycaps/EntityCapsManager.java | 18 +-- .../cache/EntityCapsPersistentCache.java | 2 +- .../cache/SimpleDirectoryPersistentCache.java | 4 +- .../filetransfer/FaultTolerantNegotiator.java | 2 +- .../filetransfer/FileTransferManager.java | 2 +- .../filetransfer/FileTransferNegotiator.java | 10 +- .../filetransfer/FileTransferRequest.java | 2 +- .../filetransfer/IBBTransferNegotiator.java | 2 +- .../Socks5TransferNegotiator.java | 2 +- .../smackx/filetransfer/StreamNegotiator.java | 8 +- .../smackx/forward/Forwarded.java | 2 +- .../forward/provider/ForwardedProvider.java | 2 +- .../{ => iqlast}/LastActivityManager.java | 7 +- .../{ => iqlast}/packet/LastActivity.java | 6 +- .../{ => iqprivate}/PrivateDataManager.java | 8 +- .../packet/DefaultPrivateData.java | 4 +- .../{ => iqprivate}/packet/PrivateData.java | 4 +- .../provider/PrivateDataProvider.java | 4 +- .../{ => iqversion}/packet/Version.java | 2 +- .../jivesoftware/smackx/muc/Affiliate.java | 4 +- .../smackx/muc/DiscussionHistory.java | 2 +- .../jivesoftware/smackx/muc/HostedRoom.java | 2 +- .../smackx/muc/MultiUserChat.java | 18 +-- .../org/jivesoftware/smackx/muc/Occupant.java | 4 +- .../org/jivesoftware/smackx/muc/RoomInfo.java | 6 +- .../{ => muc/packet}/GroupChatInvitation.java | 2 +- .../smackx/{ => muc}/packet/MUCAdmin.java | 2 +- .../{ => muc}/packet/MUCInitialPresence.java | 2 +- .../smackx/{ => muc}/packet/MUCOwner.java | 2 +- .../smackx/{ => muc}/packet/MUCUser.java | 2 +- .../{ => muc}/provider/MUCAdminProvider.java | 4 +- .../{ => muc}/provider/MUCOwnerProvider.java | 4 +- .../{ => muc}/provider/MUCUserProvider.java | 9 +- .../smackx/{ => nick}/packet/Nick.java | 2 +- .../{ => offline}/OfflineMessageHeader.java | 4 +- .../{ => offline}/OfflineMessageManager.java | 12 +- .../packet/OfflineMessageInfo.java | 4 +- .../packet/OfflineMessageRequest.java | 2 +- .../java/org/jivesoftware/smackx/package.html | 1 - .../jivesoftware/smackx/packet/package.html | 1 - .../smackx/{ => pep}/PEPListener.java | 4 +- .../smackx/{ => pep}/PEPManager.java | 8 +- .../smackx/{ => pep}/packet/PEPEvent.java | 2 +- .../smackx/{ => pep}/packet/PEPItem.java | 2 +- .../smackx/{ => pep}/packet/PEPPubSub.java | 2 +- .../{ => pep}/provider/PEPProvider.java | 2 +- .../jivesoftware/smackx/ping/PingManager.java | 4 +- .../provider/EmbeddedExtensionProvider.java | 111 ------------------ .../jivesoftware/smackx/provider/package.html | 1 - .../smackx/pubsub/ConfigureForm.java | 6 +- .../smackx/pubsub/ConfigureNodeFields.java | 2 +- .../jivesoftware/smackx/pubsub/FormNode.java | 2 +- .../jivesoftware/smackx/pubsub/FormType.java | 2 +- .../jivesoftware/smackx/pubsub/LeafNode.java | 2 +- .../org/jivesoftware/smackx/pubsub/Node.java | 12 +- .../smackx/pubsub/PubSubManager.java | 10 +- .../smackx/pubsub/SubscribeForm.java | 6 +- .../pubsub/provider/AffiliationProvider.java | 2 +- .../pubsub/provider/AffiliationsProvider.java | 2 +- .../pubsub/provider/ConfigEventProvider.java | 4 +- .../smackx/pubsub/provider/EventProvider.java | 2 +- .../pubsub/provider/FormNodeProvider.java | 6 +- .../pubsub/provider/RetractEventProvider.java | 2 +- .../pubsub/provider/SimpleNodeProvider.java | 2 +- .../provider/SubscriptionsProvider.java | 2 +- .../smackx/pubsub/util/NodeUtils.java | 2 +- .../receipts/DeliveryReceiptManager.java | 4 +- .../smackx/{ => search}/ReportedData.java | 7 +- .../smackx/search/SimpleUserSearch.java | 5 +- .../smackx/search/UserSearch.java | 7 +- .../smackx/search/UserSearchManager.java | 9 +- .../SharedGroupManager.java | 6 +- .../packet/SharedGroupsInfo.java | 2 +- .../smackx/{ => shim}/packet/Header.java | 2 +- .../{ => shim}/packet/HeadersExtension.java | 2 +- .../{ => shim}/provider/HeaderProvider.java | 4 +- .../{ => shim}/provider/HeadersProvider.java | 7 +- .../{ => si}/packet/StreamInitiation.java | 3 +- .../provider/StreamInitiationProvider.java | 9 +- .../smackx/{ => time}/packet/Time.java | 2 +- .../smackx/{ => vcardtemp}/packet/VCard.java | 2 +- .../provider/VCardProvider.java | 5 +- .../jivesoftware/smackx/{ => xdata}/Form.java | 4 +- .../smackx/{ => xdata}/FormField.java | 2 +- .../smackx/{ => xdata}/packet/DataForm.java | 6 +- .../provider/DataFormProvider.java | 6 +- .../DefaultMessageEventRequestListener.java | 2 +- .../{ => xevent}/MessageEventManager.java | 4 +- .../MessageEventNotificationListener.java | 2 +- .../MessageEventRequestListener.java | 2 +- .../{ => xevent}/packet/MessageEvent.java | 2 +- .../provider/MessageEventProvider.java | 4 +- .../smackx/{ => xhtmlim}/XHTMLManager.java | 7 +- .../smackx/{ => xhtmlim}/XHTMLText.java | 2 +- .../{ => xhtmlim}/packet/XHTMLExtension.java | 2 +- .../provider/XHTMLExtensionProvider.java | 4 +- .../{ => xroster}/RemoteRosterEntry.java | 2 +- .../{ => xroster}/RosterExchangeListener.java | 2 +- .../{ => xroster}/RosterExchangeManager.java | 4 +- .../{ => xroster}/packet/RosterExchange.java | 4 +- .../provider/RosterExchangeProvider.java | 6 +- .../src/main/resources/extension.providers | 76 ++++++------ .../jivesoftware/smackx/VCardUnitTest.java | 5 +- .../socks5/InitiationListenerTest.java | 2 +- .../socks5/Socks5ByteStreamManagerTest.java | 10 +- .../bytestreams/socks5/Socks5PacketUtils.java | 4 +- .../entitycaps/EntityCapsManagerTest.java | 6 +- .../FileTransferNegotiatorTest.java | 2 +- .../smackx/forward/ForwardedTest.java | 4 +- .../jivesoftware/smackx/muc/RoomInfoTest.java | 8 +- .../jivesoftware/smackx/ping/PingTest.java | 2 +- .../smackx/provider/DelayInformationTest.java | 6 +- .../smackx/pubsub/ConfigureFormTest.java | 6 +- .../smackx/receipts/DeliveryReceiptTest.java | 2 +- .../jivesoftware/util/ConnectionUtils.java | 2 +- 152 files changed, 394 insertions(+), 493 deletions(-) rename experimental/src/main/java/org/jivesoftware/smackx/carbons/{Carbon.java => packet/CarbonExtension.java} (85%) rename extensions/src/main/java/org/jivesoftware/smackx/{provider => }/ExtensionInitializer.java (86%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => address}/MultipleRecipientInfo.java (91%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => address}/MultipleRecipientManager.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => address}/packet/MultipleAddresses.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => address}/provider/MultipleAddressesProvider.java (95%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => attention}/packet/AttentionExtension.java (95%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => chatstates}/ChatState.java (96%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => chatstates}/ChatStateListener.java (96%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => chatstates}/ChatStateManager.java (94%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => chatstates}/packet/ChatStateExtension.java (90%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => commands}/packet/AdHocCommandData.java (94%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => commands}/provider/AdHocCommandDataProvider.java (94%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => delay}/packet/DelayInfo.java (94%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => delay}/packet/DelayInformation.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => delay}/provider/DelayInfoProvider.java (87%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => delay}/provider/DelayInformationProvider.java (95%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => disco}/NodeInformationProvider.java (92%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => disco}/ServiceDiscoveryManager.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => disco}/packet/DiscoverInfo.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => disco}/packet/DiscoverItems.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => disco}/provider/DiscoverInfoProvider.java (96%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => disco}/provider/DiscoverItemsProvider.java (95%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => iqlast}/LastActivityManager.java (94%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => iqlast}/packet/LastActivity.java (95%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => iqprivate}/PrivateDataManager.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => iqprivate}/packet/DefaultPrivateData.java (96%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => iqprivate}/packet/PrivateData.java (91%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => iqprivate}/provider/PrivateDataProvider.java (93%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => iqversion}/packet/Version.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => muc/packet}/GroupChatInvitation.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => muc}/packet/MUCAdmin.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => muc}/packet/MUCInitialPresence.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => muc}/packet/MUCOwner.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => muc}/packet/MUCUser.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => muc}/provider/MUCAdminProvider.java (96%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => muc}/provider/MUCOwnerProvider.java (97%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => muc}/provider/MUCUserProvider.java (96%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => nick}/packet/Nick.java (94%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => offline}/OfflineMessageHeader.java (96%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => offline}/OfflineMessageManager.java (96%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => offline}/packet/OfflineMessageInfo.java (96%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => offline}/packet/OfflineMessageRequest.java (99%) delete mode 100644 extensions/src/main/java/org/jivesoftware/smackx/package.html delete mode 100644 extensions/src/main/java/org/jivesoftware/smackx/packet/package.html rename extensions/src/main/java/org/jivesoftware/smackx/{ => pep}/PEPListener.java (92%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => pep}/PEPManager.java (96%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => pep}/packet/PEPEvent.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => pep}/packet/PEPItem.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => pep}/packet/PEPPubSub.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => pep}/provider/PEPProvider.java (98%) delete mode 100644 extensions/src/main/java/org/jivesoftware/smackx/provider/EmbeddedExtensionProvider.java delete mode 100644 extensions/src/main/java/org/jivesoftware/smackx/provider/package.html rename extensions/src/main/java/org/jivesoftware/smackx/{ => search}/ReportedData.java (97%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => sharedgroups}/SharedGroupManager.java (93%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => sharedgroups}/packet/SharedGroupsInfo.java (95%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => shim}/packet/Header.java (92%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => shim}/packet/HeadersExtension.java (93%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => shim}/provider/HeaderProvider.java (90%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => shim}/provider/HeadersProvider.java (82%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => si}/packet/StreamInitiation.java (96%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => si}/provider/StreamInitiationProvider.java (90%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => time}/packet/Time.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => vcardtemp}/packet/VCard.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => vcardtemp}/provider/VCardProvider.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xdata}/Form.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xdata}/FormField.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xdata}/packet/DataForm.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xdata}/provider/DataFormProvider.java (97%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xevent}/DefaultMessageEventRequestListener.java (97%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xevent}/MessageEventManager.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xevent}/MessageEventNotificationListener.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xevent}/MessageEventRequestListener.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xevent}/packet/MessageEvent.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xevent}/provider/MessageEventProvider.java (95%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xhtmlim}/XHTMLManager.java (96%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xhtmlim}/XHTMLText.java (99%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xhtmlim}/packet/XHTMLExtension.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xhtmlim}/provider/XHTMLExtensionProvider.java (96%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xroster}/RemoteRosterEntry.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xroster}/RosterExchangeListener.java (96%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xroster}/RosterExchangeManager.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xroster}/packet/RosterExchange.java (98%) rename extensions/src/main/java/org/jivesoftware/smackx/{ => xroster}/provider/RosterExchangeProvider.java (94%) diff --git a/core/src/main/resources/smack-config.xml b/core/src/main/resources/smack-config.xml index b5dfe2a65..b660fcff5 100644 --- a/core/src/main/resources/smack-config.xml +++ b/core/src/main/resources/smack-config.xml @@ -22,15 +22,14 @@ org.jivesoftware.smack.provider.CoreInitializer org.jivesoftware.smack.provider.VmArgInitializer org.jivesoftware.smack.PrivacyListManager - org.jivesoftware.smack.keepalive.KeepAliveManager - org.jivesoftware.smackx.provider.ExtensionInitializer - org.jivesoftware.smackx.ServiceDiscoveryManager - org.jivesoftware.smackx.XHTMLManager + org.jivesoftware.smackx.ExtensionInitializer + org.jivesoftware.smackx.disco.ServiceDiscoveryManager + org.jivesoftware.smackx.xhtmlim.XHTMLManager org.jivesoftware.smackx.muc.MultiUserChat org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager org.jivesoftware.smackx.filetransfer.FileTransferManager - org.jivesoftware.smackx.LastActivityManager + org.jivesoftware.smackx.iqlast.LastActivityManager org.jivesoftware.smack.ReconnectionManager org.jivesoftware.smackx.commands.AdHocCommandManager org.jivesoftware.smack.util.dns.JavaxResolver diff --git a/experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java b/experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java index dc2159925..b7639d391 100644 --- a/experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java +++ b/experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java @@ -31,12 +31,13 @@ import org.jivesoftware.smack.filter.PacketIDFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smackx.ServiceDiscoveryManager; -import org.jivesoftware.smackx.packet.DiscoverInfo; +import org.jivesoftware.smackx.carbons.packet.CarbonExtension; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; /** * Packet extension for XEP-0280: Message Carbons. This class implements - * the manager for registering {@link Carbon} support, enabling and disabling + * the manager for registering {@link CarbonExtension} support, enabling and disabling * message carbons. * * You should call enableCarbons() before sending your first undirected @@ -62,7 +63,7 @@ public class CarbonManager { private CarbonManager(Connection connection) { ServiceDiscoveryManager sdm = ServiceDiscoveryManager.getInstanceFor(connection); - sdm.addFeature(Carbon.NAMESPACE); + sdm.addFeature(CarbonExtension.NAMESPACE); weakRefConnection = new WeakReference(connection); instances.put(connection, this); } @@ -87,7 +88,7 @@ public class CarbonManager { private IQ carbonsEnabledIQ(final boolean new_state) { IQ setIQ = new IQ() { public String getChildElementXML() { - return "<" + (new_state? "enable" : "disable") + " xmlns='" + Carbon.NAMESPACE + "'/>"; + return "<" + (new_state? "enable" : "disable") + " xmlns='" + CarbonExtension.NAMESPACE + "'/>"; } }; setIQ.setType(IQ.Type.SET); @@ -104,7 +105,7 @@ public class CarbonManager { try { DiscoverInfo result = ServiceDiscoveryManager .getInstanceFor(connection).discoverInfo(connection.getServiceName()); - return result.containsFeature(Carbon.NAMESPACE); + return result.containsFeature(CarbonExtension.NAMESPACE); } catch (XMPPException e) { return false; @@ -199,10 +200,10 @@ public class CarbonManager { * * @return a Carbon if available, null otherwise. */ - public static Carbon getCarbon(Message msg) { - Carbon cc = (Carbon)msg.getExtension("received", Carbon.NAMESPACE); + public static CarbonExtension getCarbon(Message msg) { + CarbonExtension cc = (CarbonExtension)msg.getExtension("received", CarbonExtension.NAMESPACE); if (cc == null) - cc = (Carbon)msg.getExtension("sent", Carbon.NAMESPACE); + cc = (CarbonExtension)msg.getExtension("sent", CarbonExtension.NAMESPACE); return cc; } @@ -212,6 +213,6 @@ public class CarbonManager { * @param msg Message object to mark private */ public static void disableCarbons(Message msg) { - msg.addExtension(new Carbon.Private()); + msg.addExtension(new CarbonExtension.Private()); } } diff --git a/experimental/src/main/java/org/jivesoftware/smackx/carbons/Carbon.java b/experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java similarity index 85% rename from experimental/src/main/java/org/jivesoftware/smackx/carbons/Carbon.java rename to experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java index 39c188851..ebc6d1e9e 100644 --- a/experimental/src/main/java/org/jivesoftware/smackx/carbons/Carbon.java +++ b/experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.carbons; +package org.jivesoftware.smackx.carbons.packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smackx.forward.Forwarded; @@ -30,7 +30,7 @@ import org.jivesoftware.smackx.forward.Forwarded; * * @author Georg Lukas */ -public class Carbon implements PacketExtension { +public class CarbonExtension implements PacketExtension { public static final String NAMESPACE = "urn:xmpp:carbons:2"; private Direction dir; @@ -42,7 +42,7 @@ public class Carbon implements PacketExtension { * @param dir Determines if the carbon is being sent/received * @param fwd The forwarded message. */ - public Carbon(Direction dir, Forwarded fwd) { + public CarbonExtension(Direction dir, Forwarded fwd) { this.dir = dir; this.fwd = fwd; } @@ -88,7 +88,7 @@ public class Carbon implements PacketExtension { } /** - * Defines the direction of a {@link Carbon} message. + * Defines the direction of a {@link CarbonExtension} message. */ public static enum Direction { received, @@ -107,11 +107,11 @@ public class Carbon implements PacketExtension { } public String getNamespace() { - return Carbon.NAMESPACE; + return CarbonExtension.NAMESPACE; } public String toXML() { - return "<" + ELEMENT + " xmlns=\"" + Carbon.NAMESPACE + "\"/>"; + return "<" + ELEMENT + " xmlns=\"" + CarbonExtension.NAMESPACE + "\"/>"; } } } diff --git a/experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java b/experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java index f76f33b18..3424a865a 100644 --- a/experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java +++ b/experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java @@ -19,14 +19,14 @@ package org.jivesoftware.smackx.carbons.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smack.util.PacketParserUtils; -import org.jivesoftware.smackx.carbons.Carbon; -import org.jivesoftware.smackx.carbons.Carbon.Direction; +import org.jivesoftware.smackx.carbons.packet.CarbonExtension; +import org.jivesoftware.smackx.carbons.packet.CarbonExtension.Direction; import org.jivesoftware.smackx.forward.Forwarded; import org.xmlpull.v1.XmlPullParser; /** * This class implements the {@link PacketExtensionProvider} to parse - * cabon copied messages from a packet. It will return a {@link Carbon} packet extension. + * cabon copied messages from a packet. It will return a {@link CarbonExtension} packet extension. * * @author Georg Lukas * @@ -48,6 +48,6 @@ public class CarbonManagerProvider implements PacketExtensionProvider { } if (fwd == null) throw new Exception("sent/received must contain exactly one tag"); - return new Carbon(dir, fwd); + return new CarbonExtension(dir, fwd); } } diff --git a/experimental/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java b/experimental/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java index 612c3dede..3348e5e14 100644 --- a/experimental/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java +++ b/experimental/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java @@ -17,6 +17,8 @@ package org.jivesoftware.smackx.workgroup.agent; +import org.jivesoftware.smackx.muc.packet.MUCUser; +import org.jivesoftware.smackx.search.ReportedData; import org.jivesoftware.smackx.workgroup.MetaData; import org.jivesoftware.smackx.workgroup.QueueUser; import org.jivesoftware.smackx.workgroup.WorkgroupInvitation; @@ -29,13 +31,11 @@ import org.jivesoftware.smackx.workgroup.ext.notes.ChatNotes; import org.jivesoftware.smackx.workgroup.packet.*; import org.jivesoftware.smackx.workgroup.settings.GenericSettings; import org.jivesoftware.smackx.workgroup.settings.SearchSettings; +import org.jivesoftware.smackx.xdata.Form; import org.jivesoftware.smack.*; import org.jivesoftware.smack.filter.*; import org.jivesoftware.smack.packet.*; import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.ReportedData; -import org.jivesoftware.smackx.packet.MUCUser; import java.util.*; import java.util.logging.Level; diff --git a/experimental/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java b/experimental/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java index c428b05bc..06515eb2a 100644 --- a/experimental/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java +++ b/experimental/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java @@ -17,15 +17,15 @@ package org.jivesoftware.smackx.workgroup.agent; +import org.jivesoftware.smackx.search.ReportedData; import org.jivesoftware.smackx.workgroup.packet.TranscriptSearch; +import org.jivesoftware.smackx.xdata.Form; import org.jivesoftware.smack.PacketCollector; import org.jivesoftware.smack.SmackConfiguration; import org.jivesoftware.smack.Connection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.filter.PacketIDFilter; import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.ReportedData; /** * A TranscriptSearchManager helps to retrieve the form to use for searching transcripts diff --git a/experimental/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java b/experimental/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java index d19c6d669..024b1e4bb 100644 --- a/experimental/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java +++ b/experimental/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java @@ -25,17 +25,17 @@ import org.jivesoftware.smackx.workgroup.packet.QueueUpdate; import org.jivesoftware.smackx.workgroup.packet.SessionID; import org.jivesoftware.smackx.workgroup.packet.UserID; import org.jivesoftware.smackx.workgroup.settings.*; +import org.jivesoftware.smackx.xdata.Form; +import org.jivesoftware.smackx.xdata.FormField; +import org.jivesoftware.smackx.xdata.packet.DataForm; import org.jivesoftware.smack.*; import org.jivesoftware.smack.filter.*; import org.jivesoftware.smack.packet.*; import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.FormField; -import org.jivesoftware.smackx.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.muc.MultiUserChat; -import org.jivesoftware.smackx.packet.DataForm; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.MUCUser; +import org.jivesoftware.smackx.muc.packet.MUCUser; import java.util.ArrayList; import java.util.Iterator; diff --git a/experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java b/experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java index f07afba57..1d5a7ac75 100644 --- a/experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java +++ b/experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java @@ -19,6 +19,7 @@ import java.util.Properties; import org.jivesoftware.smack.provider.ProviderManager; import org.jivesoftware.smack.test.util.TestUtils; +import org.jivesoftware.smackx.carbons.packet.CarbonExtension; import org.jivesoftware.smackx.carbons.provider.CarbonManagerProvider; import org.jivesoftware.smackx.forward.Forwarded; import org.jivesoftware.smackx.forward.provider.ForwardedProvider; @@ -44,7 +45,7 @@ public class CarbonTest { public void carbonSentTest() throws Exception { XmlPullParser parser; String control; - Carbon cc; + CarbonExtension cc; Forwarded fwd; control = XMLBuilder.create("sent") @@ -55,11 +56,11 @@ public class CarbonTest { .asString(outputProperties); parser = TestUtils.getParser(control, "sent"); - cc = (Carbon) new CarbonManagerProvider().parseExtension(parser); + cc = (CarbonExtension) new CarbonManagerProvider().parseExtension(parser); fwd = cc.getForwarded(); // meta - assertEquals(Carbon.Direction.sent, cc.getDirection()); + assertEquals(CarbonExtension.Direction.sent, cc.getDirection()); // no delay in packet assertEquals(null, fwd.getDelayInfo()); @@ -76,7 +77,7 @@ public class CarbonTest { public void carbonReceivedTest() throws Exception { XmlPullParser parser; String control; - Carbon cc; + CarbonExtension cc; control = XMLBuilder.create("received") .e("forwarded") @@ -86,9 +87,9 @@ public class CarbonTest { .asString(outputProperties); parser = TestUtils.getParser(control, "received"); - cc = (Carbon) new CarbonManagerProvider().parseExtension(parser); + cc = (CarbonExtension) new CarbonManagerProvider().parseExtension(parser); - assertEquals(Carbon.Direction.received, cc.getDirection()); + assertEquals(CarbonExtension.Direction.received, cc.getDirection()); // check end of tag assertEquals(XmlPullParser.END_TAG, parser.getEventType()); diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/ExtensionInitializer.java b/extensions/src/main/java/org/jivesoftware/smackx/ExtensionInitializer.java similarity index 86% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/ExtensionInitializer.java rename to extensions/src/main/java/org/jivesoftware/smackx/ExtensionInitializer.java index 3a907ddba..cc3b585ff 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/ExtensionInitializer.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/ExtensionInitializer.java @@ -1,4 +1,4 @@ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx; import org.jivesoftware.smack.provider.UrlProviderFileInitializer; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/MultipleRecipientInfo.java b/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java similarity index 91% rename from extensions/src/main/java/org/jivesoftware/smackx/MultipleRecipientInfo.java rename to extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java index 59043701b..fb6f6e2cc 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/MultipleRecipientInfo.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.address; -import org.jivesoftware.smackx.packet.MultipleAddresses; +import org.jivesoftware.smackx.address.packet.MultipleAddresses; import java.util.List; @@ -36,7 +36,7 @@ public class MultipleRecipientInfo { } /** - * Returns the list of {@link org.jivesoftware.smackx.packet.MultipleAddresses.Address} + * Returns the list of {@link org.jivesoftware.smackx.address.packet.MultipleAddresses.Address} * that were the primary recipients of the packet. * * @return list of primary recipients of the packet. @@ -46,7 +46,7 @@ public class MultipleRecipientInfo { } /** - * Returns the list of {@link org.jivesoftware.smackx.packet.MultipleAddresses.Address} + * Returns the list of {@link org.jivesoftware.smackx.address.packet.MultipleAddresses.Address} * that were the secondary recipients of the packet. * * @return list of secondary recipients of the packet. diff --git a/extensions/src/main/java/org/jivesoftware/smackx/MultipleRecipientManager.java b/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/MultipleRecipientManager.java rename to extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java index 8d28b6dea..61aa94560 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/MultipleRecipientManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.address; import org.jivesoftware.smack.Connection; import org.jivesoftware.smack.XMPPException; @@ -23,9 +23,10 @@ import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.util.Cache; import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.DiscoverItems; -import org.jivesoftware.smackx.packet.MultipleAddresses; +import org.jivesoftware.smackx.address.packet.MultipleAddresses; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; import java.util.ArrayList; import java.util.Iterator; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/MultipleAddresses.java b/extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/MultipleAddresses.java rename to extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java index 827ef9176..3139b86ce 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/MultipleAddresses.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.address.packet; import org.jivesoftware.smack.packet.PacketExtension; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/MultipleAddressesProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java similarity index 95% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/MultipleAddressesProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java index c97cffe1b..049325d39 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/MultipleAddressesProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.address.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; -import org.jivesoftware.smackx.packet.MultipleAddresses; +import org.jivesoftware.smackx.address.packet.MultipleAddresses; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/AttentionExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java similarity index 95% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/AttentionExtension.java rename to extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java index b362169cd..352b4fcce 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/AttentionExtension.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.attention.packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkManager.java b/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkManager.java index 600dd75ca..bd5e912d1 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/bookmark/BookmarkManager.java @@ -19,7 +19,7 @@ package org.jivesoftware.smackx.bookmark; import org.jivesoftware.smack.Connection; import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smackx.PrivateDataManager; +import org.jivesoftware.smackx.iqprivate.PrivateDataManager; import java.util.*; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bookmark/Bookmarks.java b/extensions/src/main/java/org/jivesoftware/smackx/bookmark/Bookmarks.java index 8f599892b..80a470769 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/bookmark/Bookmarks.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/bookmark/Bookmarks.java @@ -16,8 +16,8 @@ */ package org.jivesoftware.smackx.bookmark; -import org.jivesoftware.smackx.packet.PrivateData; -import org.jivesoftware.smackx.provider.PrivateDataProvider; +import org.jivesoftware.smackx.iqprivate.packet.PrivateData; +import org.jivesoftware.smackx.iqprivate.provider.PrivateDataProvider; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java index a15d86ef9..81c1a5bca 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java @@ -34,17 +34,17 @@ import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.util.SyncPacketSend; -import org.jivesoftware.smackx.ServiceDiscoveryManager; import org.jivesoftware.smackx.bytestreams.BytestreamListener; import org.jivesoftware.smackx.bytestreams.BytestreamManager; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHostUsed; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity; +import org.jivesoftware.smackx.disco.packet.DiscoverItems.Item; import org.jivesoftware.smackx.filetransfer.FileTransferManager; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.DiscoverItems; -import org.jivesoftware.smackx.packet.DiscoverInfo.Identity; -import org.jivesoftware.smackx.packet.DiscoverItems.Item; /** * The Socks5BytestreamManager class handles establishing SOCKS5 Bytestreams as specified in the XEP-0085. * - * NOTE: {@link org.jivesoftware.smackx.ChatStateManager#getInstance(org.jivesoftware.smack.Connection)} + * NOTE: {@link org.jivesoftware.smackx.chatstates.ChatStateManager#getInstance(org.jivesoftware.smack.Connection)} * needs to be called in order for the listeners to be registered appropriately with the connection. * If this does not occur you will not receive the update notifications. * * @author Alexander Wenckus - * @see org.jivesoftware.smackx.ChatState - * @see org.jivesoftware.smackx.packet.ChatStateExtension + * @see org.jivesoftware.smackx.chatstates.ChatState + * @see org.jivesoftware.smackx.chatstates.packet.ChatStateExtension */ public class ChatStateManager { diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/ChatStateExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java similarity index 90% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/ChatStateExtension.java rename to extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java index 20ae65b36..af382c629 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/ChatStateExtension.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.chatstates.packet; -import org.jivesoftware.smackx.ChatState; +import org.jivesoftware.smackx.chatstates.ChatState; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.xmlpull.v1.XmlPullParser; @@ -27,7 +27,7 @@ import org.xmlpull.v1.XmlPullParser; * the current status of a chat participant. * * @author Alexander Wenckus - * @see org.jivesoftware.smackx.ChatState + * @see org.jivesoftware.smackx.chatstates.ChatState */ public class ChatStateExtension implements PacketExtension { diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java index a8aaa6726..a9f87b063 100755 --- a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java @@ -18,8 +18,8 @@ package org.jivesoftware.smackx.commands; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.packet.XMPPError; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.packet.AdHocCommandData; +import org.jivesoftware.smackx.commands.packet.AdHocCommandData; +import org.jivesoftware.smackx.xdata.Form; import java.util.List; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java index 9ab0e5ae7..7719490b6 100755 --- a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java @@ -25,15 +25,15 @@ import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.NodeInformationProvider; -import org.jivesoftware.smackx.ServiceDiscoveryManager; import org.jivesoftware.smackx.commands.AdHocCommand.Action; import org.jivesoftware.smackx.commands.AdHocCommand.Status; -import org.jivesoftware.smackx.packet.AdHocCommandData; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.DiscoverInfo.Identity; -import org.jivesoftware.smackx.packet.DiscoverItems; +import org.jivesoftware.smackx.commands.packet.AdHocCommandData; +import org.jivesoftware.smackx.disco.NodeInformationProvider; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity; +import org.jivesoftware.smackx.xdata.Form; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java index d55afff60..eb9fdcdda 100755 --- a/extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java @@ -17,7 +17,7 @@ package org.jivesoftware.smackx.commands; -import org.jivesoftware.smackx.packet.AdHocCommandData; +import org.jivesoftware.smackx.commands.packet.AdHocCommandData; /** * Represents a command that can be executed locally from a remote location. This diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java index c2d6fbd05..35d3e4a58 100755 --- a/extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java @@ -24,8 +24,8 @@ import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.filter.PacketIDFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.packet.AdHocCommandData; +import org.jivesoftware.smackx.commands.packet.AdHocCommandData; +import org.jivesoftware.smackx.xdata.Form; /** * Represents a command that is in a remote location. Invoking one of the diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/AdHocCommandData.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java similarity index 94% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/AdHocCommandData.java rename to extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java index 86df5d304..43b314bad 100755 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/AdHocCommandData.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.commands.packet; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.PacketExtension; @@ -23,6 +23,7 @@ import org.jivesoftware.smackx.commands.AdHocCommand; import org.jivesoftware.smackx.commands.AdHocCommand.Action; import org.jivesoftware.smackx.commands.AdHocCommand.SpecificErrorCondition; import org.jivesoftware.smackx.commands.AdHocCommandNote; +import org.jivesoftware.smackx.xdata.packet.DataForm; import java.util.ArrayList; import java.util.List; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/AdHocCommandDataProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java similarity index 94% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/AdHocCommandDataProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java index 976928331..5fd67fbf6 100755 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/AdHocCommandDataProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.commands.provider; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.PacketExtension; @@ -25,9 +25,10 @@ import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smackx.commands.AdHocCommand; import org.jivesoftware.smackx.commands.AdHocCommand.Action; +import org.jivesoftware.smackx.commands.packet.AdHocCommandData; import org.jivesoftware.smackx.commands.AdHocCommandNote; -import org.jivesoftware.smackx.packet.AdHocCommandData; -import org.jivesoftware.smackx.packet.DataForm; +import org.jivesoftware.smackx.xdata.packet.DataForm; +import org.jivesoftware.smackx.xdata.provider.DataFormProvider; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/DelayInfo.java b/extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInfo.java similarity index 94% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/DelayInfo.java rename to extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInfo.java index f5ba78fa1..d5d406eb9 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/DelayInfo.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInfo.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.delay.packet; import java.util.Date; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/DelayInformation.java b/extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/DelayInformation.java rename to extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java index 5ba5897e5..24cacbba8 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/DelayInformation.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.delay.packet; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/DelayInfoProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInfoProvider.java similarity index 87% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/DelayInfoProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInfoProvider.java index 9d1dcd8f4..076c6c97d 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/DelayInfoProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInfoProvider.java @@ -12,11 +12,11 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.delay.provider; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.packet.DelayInfo; -import org.jivesoftware.smackx.packet.DelayInformation; +import org.jivesoftware.smackx.delay.packet.DelayInfo; +import org.jivesoftware.smackx.delay.packet.DelayInformation; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/DelayInformationProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInformationProvider.java similarity index 95% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/DelayInformationProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInformationProvider.java index 9e60e3830..19d09d4c9 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/DelayInformationProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInformationProvider.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.delay.provider; import java.text.ParseException; import java.util.Date; @@ -23,7 +23,7 @@ import java.util.Date; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smackx.packet.DelayInformation; +import org.jivesoftware.smackx.delay.packet.DelayInformation; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/NodeInformationProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java similarity index 92% rename from extensions/src/main/java/org/jivesoftware/smackx/NodeInformationProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java index 3e1cb2828..597a91e9b 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/NodeInformationProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.disco; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.DiscoverItems; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; import java.util.List; @@ -36,7 +36,7 @@ import java.util.List; public interface NodeInformationProvider { /** - * Returns a list of the Items {@link org.jivesoftware.smackx.packet.DiscoverItems.Item} + * Returns a list of the Items {@link org.jivesoftware.smackx.disco.packet.DiscoverItems.Item} * defined in the node. For example, the MUC protocol specifies that an XMPP client should * answer an Item for each joined room when asked for the rooms where the use has joined. * diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ServiceDiscoveryManager.java b/extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/ServiceDiscoveryManager.java rename to extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java index 9f1c528fd..08e011381 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/ServiceDiscoveryManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.disco; import org.jivesoftware.smack.*; import org.jivesoftware.smack.filter.PacketFilter; @@ -25,11 +25,11 @@ import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.packet.XMPPError; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity; import org.jivesoftware.smackx.entitycaps.EntityCapsManager; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.DiscoverInfo.Identity; -import org.jivesoftware.smackx.packet.DiscoverItems; -import org.jivesoftware.smackx.packet.DataForm; +import org.jivesoftware.smackx.xdata.packet.DataForm; import java.lang.ref.WeakReference; import java.util.*; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/DiscoverInfo.java b/extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/DiscoverInfo.java rename to extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java index 11e0e61f1..e27c03f49 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/DiscoverInfo.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.disco.packet; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.StringUtils; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/DiscoverItems.java b/extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/DiscoverItems.java rename to extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java index 69754dfe8..56cf78b6d 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/DiscoverItems.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.disco.packet; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.StringUtils; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/DiscoverInfoProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java similarity index 96% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/DiscoverInfoProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java index 9f8fa102f..88005c9f2 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/DiscoverInfoProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.disco.provider; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.PacketParserUtils; -import org.jivesoftware.smackx.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/DiscoverItemsProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java similarity index 95% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/DiscoverItemsProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java index d5316d84e..f73152592 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/DiscoverItemsProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.disco.provider; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; -import org.jivesoftware.smackx.packet.*; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/EntityCapsManager.java b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/EntityCapsManager.java index 563b606a2..4397654ab 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/EntityCapsManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/EntityCapsManager.java @@ -36,17 +36,17 @@ import org.jivesoftware.smack.filter.PacketTypeFilter; import org.jivesoftware.smack.filter.PacketExtensionFilter; import org.jivesoftware.smack.util.Base64; import org.jivesoftware.smack.util.Cache; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.FormField; -import org.jivesoftware.smackx.NodeInformationProvider; -import org.jivesoftware.smackx.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.NodeInformationProvider; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Feature; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity; +import org.jivesoftware.smackx.disco.packet.DiscoverItems.Item; import org.jivesoftware.smackx.entitycaps.cache.EntityCapsPersistentCache; import org.jivesoftware.smackx.entitycaps.packet.CapsExtension; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.DataForm; -import org.jivesoftware.smackx.packet.DiscoverInfo.Feature; -import org.jivesoftware.smackx.packet.DiscoverInfo.Identity; -import org.jivesoftware.smackx.packet.DiscoverItems.Item; +import org.jivesoftware.smackx.xdata.Form; +import org.jivesoftware.smackx.xdata.FormField; +import org.jivesoftware.smackx.xdata.packet.DataForm; import java.util.Collections; import java.util.Comparator; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/EntityCapsPersistentCache.java b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/EntityCapsPersistentCache.java index 044104351..5dfc02435 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/EntityCapsPersistentCache.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/EntityCapsPersistentCache.java @@ -15,7 +15,7 @@ package org.jivesoftware.smackx.entitycaps.cache; import java.io.IOException; -import org.jivesoftware.smackx.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; public interface EntityCapsPersistentCache { /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/SimpleDirectoryPersistentCache.java b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/SimpleDirectoryPersistentCache.java index 5be6f264d..d00cb43ad 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/SimpleDirectoryPersistentCache.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/entitycaps/cache/SimpleDirectoryPersistentCache.java @@ -31,9 +31,9 @@ import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.Base32Encoder; import org.jivesoftware.smack.util.StringEncoder; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.provider.DiscoverInfoProvider; import org.jivesoftware.smackx.entitycaps.EntityCapsManager; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.provider.DiscoverInfoProvider; import org.xmlpull.mxp1.MXParser; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java index d14aa50e0..30fa2af46 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java @@ -23,7 +23,7 @@ import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.filter.OrFilter; import org.jivesoftware.smack.filter.PacketFilter; import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smackx.packet.StreamInitiation; +import org.jivesoftware.smackx.si.packet.StreamInitiation; import java.io.InputStream; import java.io.OutputStream; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java index 512da976d..12c582f3f 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java @@ -25,7 +25,7 @@ import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smackx.packet.StreamInitiation; +import org.jivesoftware.smackx.si.packet.StreamInitiation; import java.util.ArrayList; import java.util.List; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java index b777c1b5f..a8febc025 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java @@ -35,13 +35,13 @@ import org.jivesoftware.smack.filter.PacketIDFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.XMPPError; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.FormField; -import org.jivesoftware.smackx.ServiceDiscoveryManager; import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager; import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager; -import org.jivesoftware.smackx.packet.DataForm; -import org.jivesoftware.smackx.packet.StreamInitiation; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.si.packet.StreamInitiation; +import org.jivesoftware.smackx.xdata.Form; +import org.jivesoftware.smackx.xdata.FormField; +import org.jivesoftware.smackx.xdata.packet.DataForm; /** * Manages the negotiation of file transfers according to JEP-0096. If a file is diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java index 23f5ccc93..5c4c30a75 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.filetransfer; -import org.jivesoftware.smackx.packet.StreamInitiation; +import org.jivesoftware.smackx.si.packet.StreamInitiation; /** * A request to send a file recieved from another user. diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java index 282739bde..d32400130 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java @@ -31,7 +31,7 @@ import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager; import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamRequest; import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamSession; import org.jivesoftware.smackx.bytestreams.ibb.packet.Open; -import org.jivesoftware.smackx.packet.StreamInitiation; +import org.jivesoftware.smackx.si.packet.StreamInitiation; /** * The In-Band Bytestream file transfer method, or IBB for short, transfers the diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java index 3c07fdca8..889ac7823 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java @@ -30,7 +30,7 @@ import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager; import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamRequest; import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamSession; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; -import org.jivesoftware.smackx.packet.StreamInitiation; +import org.jivesoftware.smackx.si.packet.StreamInitiation; /** * Negotiates a SOCKS5 Bytestream to be used for file transfers. The implementation is based on the diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java index 6c6791e6f..2378d5d8f 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java @@ -24,10 +24,10 @@ import org.jivesoftware.smack.filter.PacketFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.XMPPError; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.FormField; -import org.jivesoftware.smackx.packet.DataForm; -import org.jivesoftware.smackx.packet.StreamInitiation; +import org.jivesoftware.smackx.si.packet.StreamInitiation; +import org.jivesoftware.smackx.xdata.Form; +import org.jivesoftware.smackx.xdata.FormField; +import org.jivesoftware.smackx.xdata.packet.DataForm; import java.io.InputStream; import java.io.OutputStream; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java b/extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java index 16ab403b7..92026f2d2 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java @@ -18,7 +18,7 @@ package org.jivesoftware.smackx.forward; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.packet.DelayInfo; +import org.jivesoftware.smackx.delay.packet.DelayInfo; /** * Packet extension for XEP-0297: Stanza Forwarding. diff --git a/extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java index e2bef78c8..e19928726 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java @@ -20,8 +20,8 @@ import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smack.util.PacketParserUtils; +import org.jivesoftware.smackx.delay.packet.DelayInfo; import org.jivesoftware.smackx.forward.Forwarded; -import org.jivesoftware.smackx.packet.DelayInfo; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/LastActivityManager.java b/extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java similarity index 94% rename from extensions/src/main/java/org/jivesoftware/smackx/LastActivityManager.java rename to extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java index dd36f3ec1..c175973a5 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/LastActivityManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.iqlast; import org.jivesoftware.smack.*; import org.jivesoftware.smack.filter.AndFilter; @@ -26,8 +26,9 @@ import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.Presence; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.LastActivity; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.iqlast.packet.LastActivity; /** * A last activity manager for handling information about the last activity diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/LastActivity.java b/extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java similarity index 95% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/LastActivity.java rename to extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java index 6e2f5fb12..a4048a82e 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/LastActivity.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.iqlast.packet; import java.io.IOException; @@ -33,7 +33,7 @@ import org.xmlpull.v1.XmlPullParserException; /** * A last activity IQ for retrieving information about the last activity associated with a Jabber ID. * LastActivity (XEP-0012) allows for retrieval of how long a particular user has been idle and the - * message the specified when doing so. Use {@link org.jivesoftware.smackx.LastActivityManager} + * message the specified when doing so. Use {@link org.jivesoftware.smackx.iqlast.LastActivityManager} * to get the last activity of a user. * * @author Derek DeMoro @@ -136,7 +136,7 @@ public class LastActivity extends IQ { * @return the LastActivity packet of the jid. * @throws XMPPException thrown if a server error has occured. * @deprecated This method only retreives the lapsed time since the last logout of a particular jid. - * Replaced by {@link org.jivesoftware.smackx.LastActivityManager#getLastActivity(Connection, String) getLastActivity} + * Replaced by {@link org.jivesoftware.smackx.iqlast.LastActivityManager#getLastActivity(Connection, String) getLastActivity} */ public static LastActivity getLastActivity(Connection con, String jid) throws XMPPException { LastActivity activity = new LastActivity(); diff --git a/extensions/src/main/java/org/jivesoftware/smackx/PrivateDataManager.java b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/PrivateDataManager.java rename to extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java index 4cc5d93ad..bffffa09b 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/PrivateDataManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.iqprivate; import org.jivesoftware.smack.PacketCollector; import org.jivesoftware.smack.SmackConfiguration; @@ -24,9 +24,9 @@ import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.filter.PacketIDFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; -import org.jivesoftware.smackx.packet.DefaultPrivateData; -import org.jivesoftware.smackx.packet.PrivateData; -import org.jivesoftware.smackx.provider.PrivateDataProvider; +import org.jivesoftware.smackx.iqprivate.packet.DefaultPrivateData; +import org.jivesoftware.smackx.iqprivate.packet.PrivateData; +import org.jivesoftware.smackx.iqprivate.provider.PrivateDataProvider; import org.xmlpull.v1.XmlPullParser; import java.util.Hashtable; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/DefaultPrivateData.java b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java similarity index 96% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/DefaultPrivateData.java rename to extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java index d62bd62df..8a7143b79 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/DefaultPrivateData.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.iqprivate.packet; import java.util.Collections; import java.util.HashMap; @@ -40,7 +40,7 @@ import java.util.Map; * In this case, getValue("color") would return "blue", and getValue("food") would * return "pizza". This parsing mechanism mechanism is very simplistic and will not work * as desired in all cases (for example, if some of the elements have attributes. In those - * cases, a custom {@link org.jivesoftware.smackx.provider.PrivateDataProvider} should be used. + * cases, a custom {@link org.jivesoftware.smackx.iqprivate.provider.PrivateDataProvider} should be used. * * @author Matt Tucker */ diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/PrivateData.java b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java similarity index 91% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/PrivateData.java rename to extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java index 394eac699..4ef183d53 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/PrivateData.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.iqprivate.packet; /** * Interface to represent private data. Each private data chunk is an XML sub-document * with a root element name and namespace. * - * @see org.jivesoftware.smackx.PrivateDataManager + * @see org.jivesoftware.smackx.iqprivate.PrivateDataManager * @author Matt Tucker */ public interface PrivateData { diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/PrivateDataProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java similarity index 93% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/PrivateDataProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java index a14707b78..c34536c87 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/PrivateDataProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.iqprivate.provider; import org.xmlpull.v1.XmlPullParser; -import org.jivesoftware.smackx.packet.PrivateData; +import org.jivesoftware.smackx.iqprivate.packet.PrivateData; /** * An interface for parsing custom private data. Each PrivateDataProvider must diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/Version.java b/extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/Version.java rename to extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java index c4e4ed4eb..38f9d1bf7 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/Version.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.iqversion.packet; import org.jivesoftware.smack.packet.IQ; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java index 2dc6fd6b6..cfc450f42 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java @@ -17,8 +17,8 @@ package org.jivesoftware.smackx.muc; -import org.jivesoftware.smackx.packet.MUCAdmin; -import org.jivesoftware.smackx.packet.MUCOwner; +import org.jivesoftware.smackx.muc.packet.MUCAdmin; +import org.jivesoftware.smackx.muc.packet.MUCOwner; /** * Represents an affiliation of a user to a given room. The affiliate's information will always have diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/DiscussionHistory.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/DiscussionHistory.java index c20a1ebbc..7dd637861 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/muc/DiscussionHistory.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/DiscussionHistory.java @@ -19,7 +19,7 @@ package org.jivesoftware.smackx.muc; import java.util.Date; -import org.jivesoftware.smackx.packet.MUCInitialPresence; +import org.jivesoftware.smackx.muc.packet.MUCInitialPresence; /** * The DiscussionHistory class controls the number of characters or messages to receive diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java index 2b1090a8b..0cf739990 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx.muc; -import org.jivesoftware.smackx.packet.DiscoverItems; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; /** * Hosted rooms by a chat service may be discovered if they are configured to appear in the room diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java index 91a9a1ec9..4c28a81e3 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java @@ -55,15 +55,15 @@ import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.packet.Registration; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.NodeInformationProvider; -import org.jivesoftware.smackx.ServiceDiscoveryManager; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.DiscoverItems; -import org.jivesoftware.smackx.packet.MUCAdmin; -import org.jivesoftware.smackx.packet.MUCInitialPresence; -import org.jivesoftware.smackx.packet.MUCOwner; -import org.jivesoftware.smackx.packet.MUCUser; +import org.jivesoftware.smackx.disco.NodeInformationProvider; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; +import org.jivesoftware.smackx.muc.packet.MUCAdmin; +import org.jivesoftware.smackx.muc.packet.MUCInitialPresence; +import org.jivesoftware.smackx.muc.packet.MUCOwner; +import org.jivesoftware.smackx.muc.packet.MUCUser; +import org.jivesoftware.smackx.xdata.Form; /** * A MultiUserChat is a conversation that takes place among many users in a virtual diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java index bb447da85..0cf77bad0 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java @@ -17,8 +17,8 @@ package org.jivesoftware.smackx.muc; -import org.jivesoftware.smackx.packet.MUCAdmin; -import org.jivesoftware.smackx.packet.MUCUser; +import org.jivesoftware.smackx.muc.packet.MUCAdmin; +import org.jivesoftware.smackx.muc.packet.MUCUser; import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.util.StringUtils; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java index 9c98b083d..6363b9b8c 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java @@ -17,9 +17,9 @@ package org.jivesoftware.smackx.muc; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.FormField; -import org.jivesoftware.smackx.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.xdata.Form; +import org.jivesoftware.smackx.xdata.FormField; import java.util.Iterator; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/GroupChatInvitation.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/GroupChatInvitation.java rename to extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java index ff2a492cc..ddb38e002 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/GroupChatInvitation.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.muc.packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/MUCAdmin.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/MUCAdmin.java rename to extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java index 07dd58cae..a0844b8a5 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/MUCAdmin.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.muc.packet; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/MUCInitialPresence.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/MUCInitialPresence.java rename to extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java index 20c5fad6d..b821eb9a4 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/MUCInitialPresence.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.muc.packet; import org.jivesoftware.smack.packet.PacketExtension; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/MUCOwner.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/MUCOwner.java rename to extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java index 65eb3fc55..dd8609653 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/MUCOwner.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.muc.packet; import org.jivesoftware.smack.packet.IQ; import java.util.ArrayList; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/MUCUser.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/MUCUser.java rename to extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java index 9eeb13801..b46fb40e8 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/MUCUser.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.muc.packet; import org.jivesoftware.smack.packet.PacketExtension; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/MUCAdminProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java similarity index 96% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/MUCAdminProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java index afe932265..c6a9b999d 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/MUCAdminProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.muc.provider; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; -import org.jivesoftware.smackx.packet.MUCAdmin; +import org.jivesoftware.smackx.muc.packet.MUCAdmin; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/MUCOwnerProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java similarity index 97% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/MUCOwnerProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java index 3bd388f6a..440af008e 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/MUCOwnerProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.muc.provider; import org.jivesoftware.smack.packet.*; import org.jivesoftware.smack.provider.*; import org.jivesoftware.smack.util.PacketParserUtils; -import org.jivesoftware.smackx.packet.MUCOwner; +import org.jivesoftware.smackx.muc.packet.MUCOwner; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/MUCUserProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java similarity index 96% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/MUCUserProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java index 875bda947..503186544 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/MUCUserProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java @@ -15,11 +15,12 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.muc.provider; -import org.jivesoftware.smack.packet.*; -import org.jivesoftware.smack.provider.*; -import org.jivesoftware.smackx.packet.*; + +import org.jivesoftware.smack.packet.PacketExtension; +import org.jivesoftware.smack.provider.PacketExtensionProvider; +import org.jivesoftware.smackx.muc.packet.MUCUser; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/Nick.java b/extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java similarity index 94% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/Nick.java rename to extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java index 468f0d07f..75582b876 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/Nick.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.nick.packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/OfflineMessageHeader.java b/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java similarity index 96% rename from extensions/src/main/java/org/jivesoftware/smackx/OfflineMessageHeader.java rename to extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java index a208aca8e..98a2c3e87 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/OfflineMessageHeader.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.offline; -import org.jivesoftware.smackx.packet.DiscoverItems; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; /** * The OfflineMessageHeader holds header information of an offline message. The header diff --git a/extensions/src/main/java/org/jivesoftware/smackx/OfflineMessageManager.java b/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java similarity index 96% rename from extensions/src/main/java/org/jivesoftware/smackx/OfflineMessageManager.java rename to extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java index 10b049784..a81307f39 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/OfflineMessageManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.offline; import org.jivesoftware.smack.PacketCollector; import org.jivesoftware.smack.SmackConfiguration; @@ -25,10 +25,12 @@ import org.jivesoftware.smack.filter.*; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.DiscoverItems; -import org.jivesoftware.smackx.packet.OfflineMessageInfo; -import org.jivesoftware.smackx.packet.OfflineMessageRequest; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; +import org.jivesoftware.smackx.offline.packet.OfflineMessageInfo; +import org.jivesoftware.smackx.offline.packet.OfflineMessageRequest; +import org.jivesoftware.smackx.xdata.Form; import java.util.ArrayList; import java.util.Iterator; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/OfflineMessageInfo.java b/extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java similarity index 96% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/OfflineMessageInfo.java rename to extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java index ee535cd04..1421d0212 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/OfflineMessageInfo.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.offline.packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; @@ -23,7 +23,7 @@ import org.xmlpull.v1.XmlPullParser; /** * OfflineMessageInfo is an extension included in the retrieved offline messages requested by - * the {@link org.jivesoftware.smackx.OfflineMessageManager}. This extension includes a stamp + * the {@link org.jivesoftware.smackx.offline.OfflineMessageManager}. This extension includes a stamp * that uniquely identifies the offline message. This stamp may be used for deleting the offline * message. The stamp may be of the form UTC timestamps but it is not required to have that format. * diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/OfflineMessageRequest.java b/extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/OfflineMessageRequest.java rename to extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java index 74bff7acc..3834cad47 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/OfflineMessageRequest.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.offline.packet; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/package.html b/extensions/src/main/java/org/jivesoftware/smackx/package.html deleted file mode 100644 index d574a2a4d..000000000 --- a/extensions/src/main/java/org/jivesoftware/smackx/package.html +++ /dev/null @@ -1 +0,0 @@ -Smack extensions API. \ No newline at end of file diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/package.html b/extensions/src/main/java/org/jivesoftware/smackx/packet/package.html deleted file mode 100644 index 490d1d72d..000000000 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/package.html +++ /dev/null @@ -1 +0,0 @@ -XML packets that are part of the XMPP extension protocols. \ No newline at end of file diff --git a/extensions/src/main/java/org/jivesoftware/smackx/PEPListener.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java similarity index 92% rename from extensions/src/main/java/org/jivesoftware/smackx/PEPListener.java rename to extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java index 2dbf7f278..9ddad886c 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/PEPListener.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.pep; -import org.jivesoftware.smackx.packet.PEPEvent; +import org.jivesoftware.smackx.pep.packet.PEPEvent; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/PEPManager.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java similarity index 96% rename from extensions/src/main/java/org/jivesoftware/smackx/PEPManager.java rename to extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java index 9bd69436c..5c541b493 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/PEPManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.pep; import java.util.ArrayList; import java.util.List; @@ -27,9 +27,9 @@ import org.jivesoftware.smack.filter.PacketFilter; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.IQ.Type; -import org.jivesoftware.smackx.packet.PEPEvent; -import org.jivesoftware.smackx.packet.PEPItem; -import org.jivesoftware.smackx.packet.PEPPubSub; +import org.jivesoftware.smackx.pep.packet.PEPEvent; +import org.jivesoftware.smackx.pep.packet.PEPItem; +import org.jivesoftware.smackx.pep.packet.PEPPubSub; /** * diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/PEPEvent.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/PEPEvent.java rename to extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java index 6d785a9a5..2f79f23f0 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/PEPEvent.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.pep.packet; import org.jivesoftware.smack.packet.PacketExtension; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/PEPItem.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/PEPItem.java rename to extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java index 0e52ee8e1..8fb0e3bfb 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/PEPItem.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.pep.packet; import org.jivesoftware.smack.packet.PacketExtension; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/PEPPubSub.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/PEPPubSub.java rename to extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java index fc8a1646c..133e3f1cc 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/PEPPubSub.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.pep.packet; import org.jivesoftware.smack.packet.IQ; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/PEPProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pep/provider/PEPProvider.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/PEPProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/pep/provider/PEPProvider.java index 516e10c8b..ae0d6251d 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/PEPProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pep/provider/PEPProvider.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.pep.provider; import java.util.HashMap; import java.util.Map; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java b/extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java index d434210ac..1b43fe436 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java @@ -35,8 +35,8 @@ import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.IQ.Type; import org.jivesoftware.smack.util.SyncPacketSend; -import org.jivesoftware.smackx.ServiceDiscoveryManager; -import org.jivesoftware.smackx.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.ping.packet.Ping; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/EmbeddedExtensionProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/provider/EmbeddedExtensionProvider.java deleted file mode 100644 index 3d5ceb458..000000000 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/EmbeddedExtensionProvider.java +++ /dev/null @@ -1,111 +0,0 @@ -/** - * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jivesoftware.smackx.provider; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smack.provider.PacketExtensionProvider; -import org.jivesoftware.smack.util.PacketParserUtils; -import org.jivesoftware.smackx.pubsub.provider.ItemProvider; -import org.jivesoftware.smackx.pubsub.provider.ItemsProvider; -import org.xmlpull.v1.XmlPullParser; - -/** - * - * This class simplifies parsing of embedded elements by using the - * Template Method Pattern. - * After extracting the current element attributes and content of any child elements, the template method - * ({@link #createReturnExtension(String, String, Map, List)} is called. Subclasses - * then override this method to create the specific return type. - * - *

To use this class, you simply register your subclasses as extension providers in the - * smack.properties file. Then they will be automatically picked up and used to parse - * any child elements. - * - * 

- * For example, given the following message
- * 
- * <message from='pubsub.shakespeare.lit' to='francisco@denmark.lit' id='foo>
- *    <event xmlns='http://jabber.org/protocol/pubsub#event>
- *       <items node='princely_musings'>
- *          <item id='asdjkwei3i34234n356'>
- *             <entry xmlns='http://www.w3.org/2005/Atom'>
- *                <title>Soliloquy</title>
- *                <link rel='alternative' type='text/html'/>
- *                <id>tag:denmark.lit,2003:entry-32397</id>
- *             </entry>
- *          </item>
- *       </items>
- *    </event>
- * </message>
- * 
- * I would have a classes
- * {@link ItemsProvider} extends {@link EmbeddedExtensionProvider}
- * {@link ItemProvider} extends {@link EmbeddedExtensionProvider}
- * and
- * AtomProvider extends {@link PacketExtensionProvider}
- * 
- * These classes are then registered in the meta-inf/smack.providers file
- * as follows.
- * 
- *   <extensionProvider>
- *      <elementName>items</elementName>
- *      <namespace>http://jabber.org/protocol/pubsub#event</namespace>
- *      <className>org.jivesoftware.smackx.provider.ItemsEventProvider</className>
- *   </extensionProvider>
- *   <extensionProvider>
- *       <elementName>item</elementName>
- *       <namespace>http://jabber.org/protocol/pubsub#event</namespace>
- *       <className>org.jivesoftware.smackx.provider.ItemProvider</className>
- *   </extensionProvider>
- * 
- *
- * - * @author Robin Collier - * - * @deprecated This has been moved to {@link org.jivesoftware.smack.provider.EmbeddedExtensionProvider} - */ -abstract public class EmbeddedExtensionProvider implements PacketExtensionProvider -{ - - final public PacketExtension parseExtension(XmlPullParser parser) throws Exception - { - String namespace = parser.getNamespace(); - String name = parser.getName(); - Map attMap = new HashMap(); - - for(int i=0; i extensions = new ArrayList(); - - do - { - int tag = parser.next(); - - if (tag == XmlPullParser.START_TAG) - extensions.add(PacketParserUtils.parsePacketExtension(parser.getName(), parser.getNamespace(), parser)); - } while (!name.equals(parser.getName())); - - return createReturnExtension(name, namespace, attMap, extensions); - } - - abstract protected PacketExtension createReturnExtension(String currentElement, String currentNamespace, Map attributeMap, List content); -} diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/package.html b/extensions/src/main/java/org/jivesoftware/smackx/provider/package.html deleted file mode 100644 index 962ba6372..000000000 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/package.html +++ /dev/null @@ -1 +0,0 @@ -Provides pluggable parsing logic for Smack extensions. \ No newline at end of file diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java index f6fe1409a..03980039d 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java @@ -17,9 +17,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.FormField; -import org.jivesoftware.smackx.packet.DataForm; +import org.jivesoftware.smackx.xdata.Form; +import org.jivesoftware.smackx.xdata.FormField; +import org.jivesoftware.smackx.xdata.packet.DataForm; /** * A decorator for a {@link Form} to easily enable reading and updating diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureNodeFields.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureNodeFields.java index 39124831d..30f92af38 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureNodeFields.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureNodeFields.java @@ -15,7 +15,7 @@ package org.jivesoftware.smackx.pubsub; import java.net.URL; -import org.jivesoftware.smackx.Form; +import org.jivesoftware.smackx.xdata.Form; /** * This enumeration represents all the fields of a node configuration form. This enumeration diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java index e08bed259..0399d15b8 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java @@ -13,7 +13,7 @@ */ package org.jivesoftware.smackx.pubsub; -import org.jivesoftware.smackx.Form; +import org.jivesoftware.smackx.xdata.Form; /** * Generic packet extension which represents any pubsub form that is diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormType.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormType.java index e0fff519f..cb4ee39a1 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormType.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormType.java @@ -13,7 +13,7 @@ */ package org.jivesoftware.smackx.pubsub; -import org.jivesoftware.smackx.Form; +import org.jivesoftware.smackx.xdata.Form; /** * Defines the allowable types for a {@link Form} diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java index eee629361..dc73302c0 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java @@ -20,7 +20,7 @@ import java.util.List; import org.jivesoftware.smack.Connection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.packet.IQ.Type; -import org.jivesoftware.smackx.packet.DiscoverItems; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; import org.jivesoftware.smackx.pubsub.packet.PubSub; import org.jivesoftware.smackx.pubsub.packet.SyncPacketSend; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java index f02f4b7ab..474f5f1e4 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java @@ -21,7 +21,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.concurrent.ConcurrentHashMap; - + import org.jivesoftware.smack.PacketListener; import org.jivesoftware.smack.Connection; import org.jivesoftware.smack.XMPPException; @@ -31,11 +31,8 @@ import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.packet.IQ.Type; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.packet.DelayInformation; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.Header; -import org.jivesoftware.smackx.packet.HeadersExtension; +import org.jivesoftware.smackx.delay.packet.DelayInformation; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.pubsub.listener.ItemDeleteListener; import org.jivesoftware.smackx.pubsub.listener.ItemEventListener; import org.jivesoftware.smackx.pubsub.listener.NodeConfigListener; @@ -43,6 +40,9 @@ import org.jivesoftware.smackx.pubsub.packet.PubSub; import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace; import org.jivesoftware.smackx.pubsub.packet.SyncPacketSend; import org.jivesoftware.smackx.pubsub.util.NodeUtils; +import org.jivesoftware.smackx.shim.packet.Header; +import org.jivesoftware.smackx.shim.packet.HeadersExtension; +import org.jivesoftware.smackx.xdata.Form; abstract public class Node { diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java index 4fb01589c..e44651136 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java @@ -22,15 +22,15 @@ import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.packet.IQ.Type; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.FormField; -import org.jivesoftware.smackx.ServiceDiscoveryManager; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.DiscoverItems; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; import org.jivesoftware.smackx.pubsub.packet.PubSub; import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace; import org.jivesoftware.smackx.pubsub.packet.SyncPacketSend; import org.jivesoftware.smackx.pubsub.util.NodeUtils; +import org.jivesoftware.smackx.xdata.Form; +import org.jivesoftware.smackx.xdata.FormField; /** * This is the starting point for access to the pubsub service. It diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java index 53f26068f..4abef76b4 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java @@ -22,9 +22,9 @@ import java.util.Iterator; import java.util.UnknownFormatConversionException; import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.FormField; -import org.jivesoftware.smackx.packet.DataForm; +import org.jivesoftware.smackx.xdata.Form; +import org.jivesoftware.smackx.xdata.FormField; +import org.jivesoftware.smackx.xdata.packet.DataForm; /** * A decorator for a {@link Form} to easily enable reading and updating diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java index 4e27c5075..05e326699 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.provider.EmbeddedExtensionProvider; +import org.jivesoftware.smack.provider.EmbeddedExtensionProvider; import org.jivesoftware.smackx.pubsub.Affiliation; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationsProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationsProvider.java index 9bfeb8110..1d1bf6ea1 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationsProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationsProvider.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Map; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.provider.EmbeddedExtensionProvider; +import org.jivesoftware.smack.provider.EmbeddedExtensionProvider; import org.jivesoftware.smackx.pubsub.Affiliation; import org.jivesoftware.smackx.pubsub.AffiliationsExtension; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ConfigEventProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ConfigEventProvider.java index 30e3017ce..7a9a9fb70 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ConfigEventProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ConfigEventProvider.java @@ -18,10 +18,10 @@ import java.util.List; import java.util.Map; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.packet.DataForm; -import org.jivesoftware.smackx.provider.EmbeddedExtensionProvider; +import org.jivesoftware.smack.provider.EmbeddedExtensionProvider; import org.jivesoftware.smackx.pubsub.ConfigurationEvent; import org.jivesoftware.smackx.pubsub.ConfigureForm; +import org.jivesoftware.smackx.xdata.packet.DataForm; /** * Parses the node configuration element out of the message event stanza from diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java index ef5671ec8..262a05997 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.provider.EmbeddedExtensionProvider; +import org.jivesoftware.smack.provider.EmbeddedExtensionProvider; import org.jivesoftware.smackx.pubsub.EventElement; import org.jivesoftware.smackx.pubsub.EventElementType; import org.jivesoftware.smackx.pubsub.NodeExtension; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java index da75b2487..fc97120ed 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java @@ -17,11 +17,11 @@ import java.util.List; import java.util.Map; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.packet.DataForm; -import org.jivesoftware.smackx.provider.EmbeddedExtensionProvider; +import org.jivesoftware.smack.provider.EmbeddedExtensionProvider; import org.jivesoftware.smackx.pubsub.FormNode; import org.jivesoftware.smackx.pubsub.FormNodeType; +import org.jivesoftware.smackx.xdata.Form; +import org.jivesoftware.smackx.xdata.packet.DataForm; /** * Parses one of several elements used in pubsub that contain a form of some kind as a child element. The diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/RetractEventProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/RetractEventProvider.java index 8fa333770..3747954e9 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/RetractEventProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/RetractEventProvider.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.provider.EmbeddedExtensionProvider; +import org.jivesoftware.smack.provider.EmbeddedExtensionProvider; import org.jivesoftware.smackx.pubsub.RetractItem; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java index d2b7d30a4..da461eb3b 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.provider.EmbeddedExtensionProvider; +import org.jivesoftware.smack.provider.EmbeddedExtensionProvider; import org.jivesoftware.smackx.pubsub.NodeExtension; import org.jivesoftware.smackx.pubsub.PubSubElementType; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java index 94dc61d1f..38d4106f6 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.provider.EmbeddedExtensionProvider; +import org.jivesoftware.smack.provider.EmbeddedExtensionProvider; import org.jivesoftware.smackx.pubsub.Subscription; import org.jivesoftware.smackx.pubsub.SubscriptionsExtension; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/NodeUtils.java b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/NodeUtils.java index 414601f3e..2d05a66a6 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/NodeUtils.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/NodeUtils.java @@ -14,10 +14,10 @@ package org.jivesoftware.smackx.pubsub.util; import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smackx.Form; import org.jivesoftware.smackx.pubsub.ConfigureForm; import org.jivesoftware.smackx.pubsub.FormNode; import org.jivesoftware.smackx.pubsub.PubSubElementType; +import org.jivesoftware.smackx.xdata.Form; /** * Utility for extracting information from packets. diff --git a/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java b/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java index e628b20e5..a2d27f99f 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java @@ -30,8 +30,8 @@ import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.filter.PacketExtensionFilter; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smackx.ServiceDiscoveryManager; -import org.jivesoftware.smackx.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; /** * Manager for XEP-0184: Message Delivery Receipts. This class implements diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ReportedData.java b/extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java similarity index 97% rename from extensions/src/main/java/org/jivesoftware/smackx/ReportedData.java rename to extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java index b8f2e1262..1359d733f 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/ReportedData.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java @@ -15,12 +15,13 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.search; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.packet.DataForm; -import org.jivesoftware.smackx.packet.DataForm.Item; +import org.jivesoftware.smackx.xdata.FormField; +import org.jivesoftware.smackx.xdata.packet.DataForm; +import org.jivesoftware.smackx.xdata.packet.DataForm.Item; import java.util.ArrayList; import java.util.Collections; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java b/extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java index 74a70f07b..b9f24439a 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java @@ -17,9 +17,8 @@ package org.jivesoftware.smackx.search; import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.FormField; -import org.jivesoftware.smackx.ReportedData; +import org.jivesoftware.smackx.xdata.Form; +import org.jivesoftware.smackx.xdata.FormField; import org.xmlpull.v1.XmlPullParser; import java.util.ArrayList; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java b/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java index 781dd9ae1..e6d349d4c 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java @@ -24,10 +24,9 @@ import org.jivesoftware.smack.filter.PacketIDFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.PacketParserUtils; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.FormField; -import org.jivesoftware.smackx.ReportedData; -import org.jivesoftware.smackx.packet.DataForm; +import org.jivesoftware.smackx.xdata.Form; +import org.jivesoftware.smackx.xdata.FormField; +import org.jivesoftware.smackx.xdata.packet.DataForm; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java b/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java index 858c2a7fc..4ce8085de 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java @@ -18,11 +18,10 @@ package org.jivesoftware.smackx.search; import org.jivesoftware.smack.Connection; import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.ReportedData; -import org.jivesoftware.smackx.ServiceDiscoveryManager; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.DiscoverItems; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; +import org.jivesoftware.smackx.xdata.Form; import java.util.ArrayList; import java.util.Collection; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/SharedGroupManager.java b/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java similarity index 93% rename from extensions/src/main/java/org/jivesoftware/smackx/SharedGroupManager.java rename to extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java index df8a11c68..9d77b7ff5 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/SharedGroupManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.sharedgroups; import org.jivesoftware.smack.Connection; import org.jivesoftware.smack.PacketCollector; @@ -22,8 +22,8 @@ import org.jivesoftware.smack.SmackConfiguration; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.filter.PacketIDFilter; import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smackx.packet.SharedGroupsInfo; - +import org.jivesoftware.smackx.sharedgroups.packet.SharedGroupsInfo; + import java.util.List; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/SharedGroupsInfo.java b/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java similarity index 95% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/SharedGroupsInfo.java rename to extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java index 69bfd7891..52bac2b17 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/SharedGroupsInfo.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.sharedgroups.packet; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/Header.java b/extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java similarity index 92% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/Header.java rename to extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java index 3fa838662..a23dd829b 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/Header.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.shim.packet; import org.jivesoftware.smack.packet.PacketExtension; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/HeadersExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java similarity index 93% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/HeadersExtension.java rename to extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java index 78564dbbf..fe4b9261b 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/HeadersExtension.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java @@ -12,7 +12,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.shim.packet; import java.util.Collection; import java.util.Collections; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/HeaderProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java similarity index 90% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/HeaderProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java index 7344880ab..0182b44e5 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/HeaderProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.shim.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; -import org.jivesoftware.smackx.packet.Header; +import org.jivesoftware.smackx.shim.packet.Header; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/HeadersProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeadersProvider.java similarity index 82% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/HeadersProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeadersProvider.java index 056dd5826..0849180e2 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/HeadersProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeadersProvider.java @@ -11,15 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.shim.provider; import java.util.Collection; import java.util.List; import java.util.Map; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.packet.Header; -import org.jivesoftware.smackx.packet.HeadersExtension; +import org.jivesoftware.smack.provider.EmbeddedExtensionProvider; +import org.jivesoftware.smackx.shim.packet.Header; +import org.jivesoftware.smackx.shim.packet.HeadersExtension; /** * Parses the headers element as defined in Stanza Headers and Internet Metadata (SHIM). diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/StreamInitiation.java b/extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java similarity index 96% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/StreamInitiation.java rename to extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java index 52cca6307..5d0d87f94 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/StreamInitiation.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java @@ -14,13 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.si.packet; import java.util.Date; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.util.StringUtils; +import org.jivesoftware.smackx.xdata.packet.DataForm; /** * The process by which two entities initiate a stream. diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/StreamInitiationProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java similarity index 90% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/StreamInitiationProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java index 412197352..20c6da5cf 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/StreamInitiationProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.si.provider; import java.text.ParseException; import java.util.Date; @@ -24,9 +24,10 @@ import java.util.logging.Logger; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smackx.packet.DataForm; -import org.jivesoftware.smackx.packet.StreamInitiation; -import org.jivesoftware.smackx.packet.StreamInitiation.File; +import org.jivesoftware.smackx.si.packet.StreamInitiation; +import org.jivesoftware.smackx.si.packet.StreamInitiation.File; +import org.jivesoftware.smackx.xdata.packet.DataForm; +import org.jivesoftware.smackx.xdata.provider.DataFormProvider; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/Time.java b/extensions/src/main/java/org/jivesoftware/smackx/time/packet/Time.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/Time.java rename to extensions/src/main/java/org/jivesoftware/smackx/time/packet/Time.java index 67763d1e3..8999e780d 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/Time.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/time/packet/Time.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.time.packet; import org.jivesoftware.smack.packet.IQ; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/VCard.java b/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/VCard.java rename to extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java index b0d02af6e..dcf2dd4cc 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/VCard.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.vcardtemp.packet; import java.io.BufferedInputStream; import java.io.File; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/VCardProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/VCardProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java index 5400229e3..54dd96fe5 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/VCardProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java @@ -15,18 +15,19 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.vcardtemp.provider; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smackx.packet.VCard; +import org.jivesoftware.smackx.vcardtemp.packet.VCard; import org.w3c.dom.*; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; + import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.ArrayList; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/Form.java b/extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/Form.java rename to extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java index 934ecabbb..e760d961a 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/Form.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.xdata; import java.util.ArrayList; import java.util.Iterator; @@ -24,7 +24,7 @@ import java.util.StringTokenizer; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.packet.DataForm; +import org.jivesoftware.smackx.xdata.packet.DataForm; /** * Represents a Form for gathering data. The form could be of the following types: diff --git a/extensions/src/main/java/org/jivesoftware/smackx/FormField.java b/extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/FormField.java rename to extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java index 19d504679..307b08f9f 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/FormField.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.xdata; import org.jivesoftware.smack.util.StringUtils; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/DataForm.java b/extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/DataForm.java rename to extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java index 292dc637c..5603985cb 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/DataForm.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.xdata.packet; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.Form; -import org.jivesoftware.smackx.FormField; +import org.jivesoftware.smackx.xdata.Form; +import org.jivesoftware.smackx.xdata.FormField; import java.util.ArrayList; import java.util.Collections; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/DataFormProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java similarity index 97% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/DataFormProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java index c10fc79cd..8286d75fd 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/DataFormProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.xdata.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; -import org.jivesoftware.smackx.FormField; -import org.jivesoftware.smackx.packet.DataForm; +import org.jivesoftware.smackx.xdata.FormField; +import org.jivesoftware.smackx.xdata.packet.DataForm; import org.xmlpull.v1.XmlPullParser; import java.util.ArrayList; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/DefaultMessageEventRequestListener.java b/extensions/src/main/java/org/jivesoftware/smackx/xevent/DefaultMessageEventRequestListener.java similarity index 97% rename from extensions/src/main/java/org/jivesoftware/smackx/DefaultMessageEventRequestListener.java rename to extensions/src/main/java/org/jivesoftware/smackx/xevent/DefaultMessageEventRequestListener.java index 619dff170..c92a8f8c7 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/DefaultMessageEventRequestListener.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xevent/DefaultMessageEventRequestListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.xevent; /** * diff --git a/extensions/src/main/java/org/jivesoftware/smackx/MessageEventManager.java b/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/MessageEventManager.java rename to extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java index 32e0a5850..2a455e614 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/MessageEventManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.xevent; import java.lang.reflect.Method; import java.util.ArrayList; @@ -30,7 +30,7 @@ import org.jivesoftware.smack.filter.PacketExtensionFilter; import org.jivesoftware.smack.filter.PacketFilter; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smackx.packet.MessageEvent; +import org.jivesoftware.smackx.xevent.packet.MessageEvent; /** * Manages message events requests and notifications. A MessageEventManager provides a high diff --git a/extensions/src/main/java/org/jivesoftware/smackx/MessageEventNotificationListener.java b/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/MessageEventNotificationListener.java rename to extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java index 552201cad..dd55e8694 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/MessageEventNotificationListener.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.xevent; /** * diff --git a/extensions/src/main/java/org/jivesoftware/smackx/MessageEventRequestListener.java b/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/MessageEventRequestListener.java rename to extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java index 61e7d08cf..92dab7af2 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/MessageEventRequestListener.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.xevent; /** * diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/MessageEvent.java b/extensions/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/MessageEvent.java rename to extensions/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java index 8efcc6aed..92e649a30 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/MessageEvent.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.xevent.packet; import org.jivesoftware.smack.packet.PacketExtension; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/MessageEventProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java similarity index 95% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/MessageEventProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java index bdb8f81bf..ebf5751c8 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/MessageEventProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.xevent.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; -import org.jivesoftware.smackx.packet.MessageEvent; +import org.jivesoftware.smackx.xevent.packet.MessageEvent; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/XHTMLManager.java b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java similarity index 96% rename from extensions/src/main/java/org/jivesoftware/smackx/XHTMLManager.java rename to extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java index 146ee36bd..0e4f93554 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/XHTMLManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java @@ -15,14 +15,15 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.xhtmlim; import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.Connection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.packet.Message; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.XHTMLExtension; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.xhtmlim.packet.XHTMLExtension; import java.util.Iterator; import java.util.logging.Level; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/XHTMLText.java b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java similarity index 99% rename from extensions/src/main/java/org/jivesoftware/smackx/XHTMLText.java rename to extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java index 754edbdd8..8ecf3979e 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/XHTMLText.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.xhtmlim; import org.jivesoftware.smack.util.StringUtils; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/XHTMLExtension.java b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/XHTMLExtension.java rename to extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java index 1c0ed6372..d200426c0 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/XHTMLExtension.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.xhtmlim.packet; import org.jivesoftware.smack.packet.PacketExtension; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/XHTMLExtensionProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java similarity index 96% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/XHTMLExtensionProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java index c7f1908b8..097e3c442 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/XHTMLExtensionProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.xhtmlim.provider; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smackx.packet.XHTMLExtension; +import org.jivesoftware.smackx.xhtmlim.packet.XHTMLExtension; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/java/org/jivesoftware/smackx/RemoteRosterEntry.java b/extensions/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/RemoteRosterEntry.java rename to extensions/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java index 83b63c23d..09eda8513 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/RemoteRosterEntry.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.xroster; import java.util.*; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/RosterExchangeListener.java b/extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java similarity index 96% rename from extensions/src/main/java/org/jivesoftware/smackx/RosterExchangeListener.java rename to extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java index 13b40f057..a5fa8dee6 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/RosterExchangeListener.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.xroster; import java.util.Iterator; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/RosterExchangeManager.java b/extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/RosterExchangeManager.java rename to extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java index e57138ea7..fd8d650e3 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/RosterExchangeManager.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.jivesoftware.smackx; +package org.jivesoftware.smackx.xroster; import java.util.ArrayList; import java.util.Iterator; @@ -30,7 +30,7 @@ import org.jivesoftware.smack.filter.PacketExtensionFilter; import org.jivesoftware.smack.filter.PacketFilter; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smackx.packet.RosterExchange; +import org.jivesoftware.smackx.xroster.packet.RosterExchange; /** * diff --git a/extensions/src/main/java/org/jivesoftware/smackx/packet/RosterExchange.java b/extensions/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java similarity index 98% rename from extensions/src/main/java/org/jivesoftware/smackx/packet/RosterExchange.java rename to extensions/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java index 3939dea40..ab6669084 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/packet/RosterExchange.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.jivesoftware.smackx.packet; +package org.jivesoftware.smackx.xroster.packet; import org.jivesoftware.smack.Roster; import org.jivesoftware.smack.RosterEntry; import org.jivesoftware.smack.RosterGroup; import org.jivesoftware.smack.packet.PacketExtension; -import org.jivesoftware.smackx.RemoteRosterEntry; +import org.jivesoftware.smackx.xroster.RemoteRosterEntry; import java.util.ArrayList; import java.util.Collections; diff --git a/extensions/src/main/java/org/jivesoftware/smackx/provider/RosterExchangeProvider.java b/extensions/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java similarity index 94% rename from extensions/src/main/java/org/jivesoftware/smackx/provider/RosterExchangeProvider.java rename to extensions/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java index a80492738..3d98abeb9 100644 --- a/extensions/src/main/java/org/jivesoftware/smackx/provider/RosterExchangeProvider.java +++ b/extensions/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.jivesoftware.smackx.provider; +package org.jivesoftware.smackx.xroster.provider; import java.util.ArrayList; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.PacketExtensionProvider; -import org.jivesoftware.smackx.*; -import org.jivesoftware.smackx.packet.*; +import org.jivesoftware.smackx.xroster.RemoteRosterEntry; +import org.jivesoftware.smackx.xroster.packet.RosterExchange; import org.xmlpull.v1.XmlPullParser; /** diff --git a/extensions/src/main/resources/extension.providers b/extensions/src/main/resources/extension.providers index a5eb372fb..54b99d989 100644 --- a/extensions/src/main/resources/extension.providers +++ b/extensions/src/main/resources/extension.providers @@ -6,163 +6,163 @@ query jabber:iq:private - org.jivesoftware.smackx.PrivateDataManager$PrivateDataIQProvider + org.jivesoftware.smackx.iqprivate.PrivateDataManager$PrivateDataIQProvider query jabber:iq:time - org.jivesoftware.smackx.packet.Time + org.jivesoftware.smackx.time.packet.Time x jabber:x:roster - org.jivesoftware.smackx.provider.RosterExchangeProvider + org.jivesoftware.smackx.xroster.provider.RosterExchangeProvider x jabber:x:event - org.jivesoftware.smackx.provider.MessageEventProvider + org.jivesoftware.smackx.xevent.provider.MessageEventProvider active http://jabber.org/protocol/chatstates - org.jivesoftware.smackx.packet.ChatStateExtension$Provider + org.jivesoftware.smackx.chatstates.packet.ChatStateExtension$Provider composing http://jabber.org/protocol/chatstates - org.jivesoftware.smackx.packet.ChatStateExtension$Provider + org.jivesoftware.smackx.chatstates.packet.ChatStateExtension$Provider paused http://jabber.org/protocol/chatstates - org.jivesoftware.smackx.packet.ChatStateExtension$Provider + org.jivesoftware.smackx.chatstates.packet.ChatStateExtension$Provider inactive http://jabber.org/protocol/chatstates - org.jivesoftware.smackx.packet.ChatStateExtension$Provider + org.jivesoftware.smackx.chatstates.packet.ChatStateExtension$Provider gone http://jabber.org/protocol/chatstates - org.jivesoftware.smackx.packet.ChatStateExtension$Provider + org.jivesoftware.smackx.chatstates.packet.ChatStateExtension$Provider html http://jabber.org/protocol/xhtml-im - org.jivesoftware.smackx.provider.XHTMLExtensionProvider + org.jivesoftware.smackx.xhtmlim.provider.XHTMLExtensionProvider x jabber:x:conference - org.jivesoftware.smackx.GroupChatInvitation$Provider + org.jivesoftware.smackx.muc.packet.GroupChatInvitation$Provider query http://jabber.org/protocol/disco#items - org.jivesoftware.smackx.provider.DiscoverItemsProvider + org.jivesoftware.smackx.disco.provider.DiscoverItemsProvider query http://jabber.org/protocol/disco#info - org.jivesoftware.smackx.provider.DiscoverInfoProvider + org.jivesoftware.smackx.disco.provider.DiscoverInfoProvider x jabber:x:data - org.jivesoftware.smackx.provider.DataFormProvider + org.jivesoftware.smackx.xdata.provider.DataFormProvider x http://jabber.org/protocol/muc#user - org.jivesoftware.smackx.provider.MUCUserProvider + org.jivesoftware.smackx.muc.provider.MUCUserProvider query http://jabber.org/protocol/muc#admin - org.jivesoftware.smackx.provider.MUCAdminProvider + org.jivesoftware.smackx.muc.provider.MUCAdminProvider query http://jabber.org/protocol/muc#owner - org.jivesoftware.smackx.provider.MUCOwnerProvider + org.jivesoftware.smackx.muc.provider.MUCOwnerProvider x jabber:x:delay - org.jivesoftware.smackx.provider.DelayInformationProvider + org.jivesoftware.smackx.delay.provider.DelayInformationProvider delay urn:xmpp:delay - org.jivesoftware.smackx.provider.DelayInfoProvider + org.jivesoftware.smackx.delay.provider.DelayInfoProvider query jabber:iq:version - org.jivesoftware.smackx.packet.Version + org.jivesoftware.smackx.iqversion.packet.Version vCard vcard-temp - org.jivesoftware.smackx.provider.VCardProvider + org.jivesoftware.smackx.vcardtemp.provider.VCardProvider offline http://jabber.org/protocol/offline - org.jivesoftware.smackx.packet.OfflineMessageRequest$Provider + org.jivesoftware.smackx.offline.packet.OfflineMessageRequest$Provider offline http://jabber.org/protocol/offline - org.jivesoftware.smackx.packet.OfflineMessageInfo$Provider + org.jivesoftware.smackx.offline.packet.OfflineMessageInfo$Provider query jabber:iq:last - org.jivesoftware.smackx.packet.LastActivity$Provider + org.jivesoftware.smackx.iqlast.packet.LastActivity$Provider @@ -176,21 +176,21 @@ sharedgroup http://www.jivesoftware.org/protocol/sharedgroup - org.jivesoftware.smackx.packet.SharedGroupsInfo$Provider + org.jivesoftware.smackx.sharedgroups.packet.SharedGroupsInfo$Provider addresses http://jabber.org/protocol/address - org.jivesoftware.smackx.provider.MultipleAddressesProvider + org.jivesoftware.smackx.address.provider.MultipleAddressesProvider si http://jabber.org/protocol/si - org.jivesoftware.smackx.provider.StreamInitiationProvider + org.jivesoftware.smackx.si.provider.StreamInitiationProvider @@ -227,56 +227,56 @@ command http://jabber.org/protocol/commands - org.jivesoftware.smackx.provider.AdHocCommandDataProvider + org.jivesoftware.smackx.commands.provider.AdHocCommandDataProvider bad-action http://jabber.org/protocol/commands - org.jivesoftware.smackx.provider.AdHocCommandDataProvider$BadActionError + org.jivesoftware.smackx.commands.provider.AdHocCommandDataProvider$BadActionError malformed-actionn http://jabber.org/protocol/commands - org.jivesoftware.smackx.provider.AdHocCommandDataProvider$MalformedActionError + org.jivesoftware.smackx.commands.provider.AdHocCommandDataProvider$MalformedActionError bad-locale http://jabber.org/protocol/commands - org.jivesoftware.smackx.provider.AdHocCommandDataProvider$BadLocaleError + org.jivesoftware.smackx.commands.provider.AdHocCommandDataProvider$BadLocaleError bad-payload http://jabber.org/protocol/commands - org.jivesoftware.smackx.provider.AdHocCommandDataProvider$BadPayloadError + org.jivesoftware.smackx.commands.provider.AdHocCommandDataProvider$BadPayloadError bad-sessionid http://jabber.org/protocol/commands - org.jivesoftware.smackx.provider.AdHocCommandDataProvider$BadSessionIDError + org.jivesoftware.smackx.commands.provider.AdHocCommandDataProvider$BadSessionIDError session-expired http://jabber.org/protocol/commands - org.jivesoftware.smackx.provider.AdHocCommandDataProvider$SessionExpiredError + org.jivesoftware.smackx.commands.provider.AdHocCommandDataProvider$SessionExpiredError headers http://jabber.org/protocol/shim - org.jivesoftware.smackx.provider.HeadersProvider + org.jivesoftware.smackx.shim.provider.HeadersProvider header http://jabber.org/protocol/shim - org.jivesoftware.smackx.provider.HeaderProvider + org.jivesoftware.smackx.shim.provider.HeaderProvider @@ -406,14 +406,14 @@ nick http://jabber.org/protocol/nick - org.jivesoftware.smackx.packet.Nick$Provider + org.jivesoftware.smackx.nick.packet.Nick$Provider attention urn:xmpp:attention:0 - org.jivesoftware.smackx.packet.AttentionExtension$Provider + org.jivesoftware.smackx.attention.packet.AttentionExtension$Provider diff --git a/extensions/src/test/java/org/jivesoftware/smackx/VCardUnitTest.java b/extensions/src/test/java/org/jivesoftware/smackx/VCardUnitTest.java index 17adf75a7..228d00ffb 100644 --- a/extensions/src/test/java/org/jivesoftware/smackx/VCardUnitTest.java +++ b/extensions/src/test/java/org/jivesoftware/smackx/VCardUnitTest.java @@ -5,10 +5,9 @@ import static org.junit.Assert.*; import java.util.Arrays; import org.junit.Test; - import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smackx.packet.VCard; -import org.jivesoftware.smackx.provider.VCardProvider; +import org.jivesoftware.smackx.vcardtemp.packet.VCard; +import org.jivesoftware.smackx.vcardtemp.provider.VCardProvider; public class VCardUnitTest { diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java index df70ef5ec..b3b9186e0 100644 --- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java +++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java @@ -19,12 +19,12 @@ import static org.mockito.Mockito.*; import org.jivesoftware.smack.Connection; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.XMPPError; -import org.jivesoftware.smackx.ServiceDiscoveryManager; import org.jivesoftware.smackx.bytestreams.BytestreamRequest; import org.jivesoftware.smackx.bytestreams.socks5.InitiationListener; import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamListener; import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java index 1939ce54b..03c0bc772 100644 --- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java +++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java @@ -27,17 +27,17 @@ import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.packet.IQ.Type; -import org.jivesoftware.smackx.ServiceDiscoveryManager; import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager; import org.jivesoftware.smackx.bytestreams.socks5.Socks5Client; import org.jivesoftware.smackx.bytestreams.socks5.Socks5Proxy; import org.jivesoftware.smackx.bytestreams.socks5.Socks5Utils; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.DiscoverItems; -import org.jivesoftware.smackx.packet.DiscoverInfo.Identity; -import org.jivesoftware.smackx.packet.DiscoverItems.Item; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity; +import org.jivesoftware.smackx.disco.packet.DiscoverItems.Item; import org.jivesoftware.util.ConnectionUtils; import org.jivesoftware.util.Protocol; import org.jivesoftware.util.Verification; diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java index 3255fe104..9b3a59545 100644 --- a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java +++ b/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java @@ -15,8 +15,8 @@ package org.jivesoftware.smackx.bytestreams.socks5; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.DiscoverItems; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverItems; /** * A collection of utility methods to create XMPP packets. diff --git a/extensions/src/test/java/org/jivesoftware/smackx/entitycaps/EntityCapsManagerTest.java b/extensions/src/test/java/org/jivesoftware/smackx/entitycaps/EntityCapsManagerTest.java index 1ab4974ab..287623f27 100644 --- a/extensions/src/test/java/org/jivesoftware/smackx/entitycaps/EntityCapsManagerTest.java +++ b/extensions/src/test/java/org/jivesoftware/smackx/entitycaps/EntityCapsManagerTest.java @@ -13,11 +13,11 @@ import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.util.Base32Encoder; import org.jivesoftware.smack.util.Base64FileUrlEncoder; import org.jivesoftware.smack.util.StringEncoder; -import org.jivesoftware.smackx.FormField; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.entitycaps.cache.EntityCapsPersistentCache; import org.jivesoftware.smackx.entitycaps.cache.SimpleDirectoryPersistentCache; -import org.jivesoftware.smackx.packet.DataForm; -import org.jivesoftware.smackx.packet.DiscoverInfo; +import org.jivesoftware.smackx.xdata.FormField; +import org.jivesoftware.smackx.xdata.packet.DataForm; import org.junit.Ignore; import org.junit.Test; diff --git a/extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java b/extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java index 4b59ba55f..375d57514 100644 --- a/extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java +++ b/extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; import org.jivesoftware.smack.DummyConnection; import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smackx.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java b/extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java index 7cea6539f..301feaa22 100644 --- a/extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java +++ b/extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java @@ -26,8 +26,8 @@ import java.util.TimeZone; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.test.util.TestUtils; -import org.jivesoftware.smackx.packet.DelayInfo; -import org.jivesoftware.smackx.packet.DelayInformation; +import org.jivesoftware.smackx.delay.packet.DelayInfo; +import org.jivesoftware.smackx.delay.packet.DelayInformation; import org.jivesoftware.smackx.forward.Forwarded; import org.jivesoftware.smackx.forward.provider.ForwardedProvider; import org.junit.Test; diff --git a/extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java b/extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java index 7c8f2896b..2977191ab 100644 --- a/extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java +++ b/extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java @@ -16,12 +16,14 @@ */ package org.jivesoftware.smackx.muc; -import org.jivesoftware.smackx.FormField; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.muc.RoomInfo; -import org.jivesoftware.smackx.packet.DataForm; -import org.jivesoftware.smackx.packet.DiscoverInfo; +import org.jivesoftware.smackx.xdata.FormField; +import org.jivesoftware.smackx.xdata.packet.DataForm; + import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; + import org.junit.Test; public class RoomInfoTest { diff --git a/extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java b/extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java index 331cc75f9..d81a5530f 100644 --- a/extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java +++ b/extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java @@ -25,7 +25,7 @@ import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.test.util.TestUtils; import org.jivesoftware.smack.util.PacketParserUtils; -import org.jivesoftware.smackx.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; import org.jivesoftware.smackx.ping.packet.Ping; import org.junit.Before; import org.junit.Ignore; diff --git a/extensions/src/test/java/org/jivesoftware/smackx/provider/DelayInformationTest.java b/extensions/src/test/java/org/jivesoftware/smackx/provider/DelayInformationTest.java index 44a82b61f..5c869403a 100644 --- a/extensions/src/test/java/org/jivesoftware/smackx/provider/DelayInformationTest.java +++ b/extensions/src/test/java/org/jivesoftware/smackx/provider/DelayInformationTest.java @@ -25,8 +25,10 @@ import java.util.Properties; import java.util.TimeZone; import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smackx.packet.DelayInfo; -import org.jivesoftware.smackx.packet.DelayInformation; +import org.jivesoftware.smackx.delay.packet.DelayInfo; +import org.jivesoftware.smackx.delay.packet.DelayInformation; +import org.jivesoftware.smackx.delay.provider.DelayInfoProvider; +import org.jivesoftware.smackx.delay.provider.DelayInformationProvider; import org.junit.Test; import org.xmlpull.mxp1.MXParser; import org.xmlpull.v1.XmlPullParser; diff --git a/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java b/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java index 0ed1518d4..52812c1cc 100644 --- a/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java +++ b/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java @@ -17,7 +17,7 @@ package org.jivesoftware.smackx.pubsub; import static org.junit.Assert.assertEquals; - + import org.jivesoftware.smack.SmackConfiguration; import org.jivesoftware.smack.ThreadedDummyConnection; import org.jivesoftware.smack.XMPPException; @@ -25,8 +25,8 @@ import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.packet.XMPPError.Condition; -import org.jivesoftware.smackx.packet.DiscoverInfo; -import org.jivesoftware.smackx.packet.DiscoverInfo.Identity; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo; +import org.jivesoftware.smackx.disco.packet.DiscoverInfo.Identity; import org.jivesoftware.smackx.pubsub.packet.PubSub; import org.junit.Assert; import org.junit.Test; diff --git a/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java b/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java index 6fee6d001..fa21942eb 100644 --- a/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java +++ b/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java @@ -26,7 +26,7 @@ import org.jivesoftware.smack.DummyConnection; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smack.util.PacketParserUtils; -import org.jivesoftware.smackx.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.junit.Ignore; import org.junit.Test; import org.xmlpull.mxp1.MXParser; diff --git a/extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java b/extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java index ea986791f..62153385e 100644 --- a/extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java +++ b/extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java @@ -20,7 +20,7 @@ import org.jivesoftware.smack.PacketCollector; import org.jivesoftware.smack.Connection; import org.jivesoftware.smack.filter.PacketFilter; import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smackx.ServiceDiscoveryManager; +import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer;