From 3e16b35162c9b4a1d9d9c422e3361e725d0a640d Mon Sep 17 00:00:00 2001 From: Henning Staib Date: Sun, 15 Aug 2010 11:27:13 +0000 Subject: [PATCH] moved ibb and socks5bytestream packages in the bytestream package git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/improve_bytestreams@11819 b35dd754-fafc-0310-a699-88a17e54d16e --- build/resources/META-INF/smack-config.xml | 4 ++-- build/resources/META-INF/smack.providers | 22 +++++++++---------- .../bytestreams/BytestreamListener.java | 8 +++---- .../smackx/bytestreams/BytestreamManager.java | 4 ++-- .../smackx/bytestreams/BytestreamRequest.java | 4 ++-- .../smackx/bytestreams/BytestreamSession.java | 4 ++-- .../{ => bytestreams}/ibb/CloseListener.java | 4 ++-- .../{ => bytestreams}/ibb/DataListener.java | 4 ++-- .../ibb/InBandBytestreamListener.java | 2 +- .../ibb/InBandBytestreamManager.java | 4 ++-- .../ibb/InBandBytestreamRequest.java | 4 ++-- .../ibb/InBandBytestreamSession.java | 10 ++++----- .../ibb/InitiationListener.java | 4 ++-- .../{ => bytestreams}/ibb/packet/Close.java | 4 ++-- .../{ => bytestreams}/ibb/packet/Data.java | 2 +- .../ibb/packet/DataPacketExtension.java | 4 ++-- .../{ => bytestreams}/ibb/packet/Open.java | 6 ++--- .../ibb/provider/CloseIQProvider.java | 4 ++-- .../ibb/provider/DataPacketProvider.java | 6 ++--- .../ibb/provider/OpenIQProvider.java | 6 ++--- .../socks5}/InitiationListener.java | 4 ++-- .../socks5}/Socks5BytestreamListener.java | 2 +- .../socks5}/Socks5BytestreamManager.java | 8 +++---- .../socks5}/Socks5BytestreamRequest.java | 6 ++--- .../socks5}/Socks5BytestreamSession.java | 2 +- .../socks5}/Socks5Client.java | 4 ++-- .../socks5}/Socks5ClientForInitiator.java | 6 ++--- .../socks5}/Socks5Proxy.java | 2 +- .../socks5}/Socks5Utils.java | 2 +- .../socks5}/packet/Bytestream.java | 2 +- .../socks5}/provider/BytestreamsProvider.java | 4 ++-- .../filetransfer/FileTransferNegotiator.java | 4 ++-- .../filetransfer/IBBTransferNegotiator.java | 8 +++---- .../Socks5TransferNegotiator.java | 8 +++---- .../ibb/CloseListenerTest.java | 6 +++-- .../ibb/DataListenerTest.java | 8 ++++--- .../{ => bytestreams}/ibb/IBBPacketUtils.java | 2 +- .../{ => bytestreams}/ibb/IBBTestsSuite.java | 12 +++++----- .../ibb/InBandBytestreamManagerTest.java | 8 ++++--- .../ibb/InBandBytestreamRequestTest.java | 7 ++++-- .../InBandBytestreamSessionMessageTest.java | 10 +++++---- .../ibb/InBandBytestreamSessionTest.java | 10 +++++---- .../ibb/InitiationListenerTest.java | 7 ++++-- .../ibb/packet/CloseTest.java | 3 ++- .../ibb/packet/DataPacketExtensionTest.java | 3 ++- .../ibb/packet/DataTest.java | 4 +++- .../ibb/packet/OpenTest.java | 5 +++-- .../ibb/provider/OpenIQProviderTest.java | 7 +++--- .../socks5}/InitiationListenerTest.java | 7 ++++-- .../socks5}/Socks5ByteStreamManagerTest.java | 10 ++++++--- .../socks5}/Socks5ByteStreamRequestTest.java | 7 ++++-- .../socks5}/Socks5ClientForInitiatorTest.java | 10 ++++++--- .../socks5}/Socks5ClientTest.java | 6 +++-- .../socks5}/Socks5PacketUtils.java | 4 ++-- .../socks5}/Socks5ProxyTest.java | 3 ++- .../socks5}/Socks5TestProxy.java | 3 ++- .../ibb/InBandBytestreamTest.java | 10 ++++++--- .../socks5}/Socks5ByteStreamTest.java | 10 +++++++-- 58 files changed, 192 insertions(+), 142 deletions(-) rename source/org/jivesoftware/smackx/{ => bytestreams}/ibb/CloseListener.java (93%) rename source/org/jivesoftware/smackx/{ => bytestreams}/ibb/DataListener.java (93%) rename source/org/jivesoftware/smackx/{ => bytestreams}/ibb/InBandBytestreamListener.java (94%) rename source/org/jivesoftware/smackx/{ => bytestreams}/ibb/InBandBytestreamManager.java (96%) rename source/org/jivesoftware/smackx/{ => bytestreams}/ibb/InBandBytestreamRequest.java (93%) rename source/org/jivesoftware/smackx/{ => bytestreams}/ibb/InBandBytestreamSession.java (96%) rename source/org/jivesoftware/smackx/{ => bytestreams}/ibb/InitiationListener.java (95%) rename source/org/jivesoftware/smackx/{ => bytestreams}/ibb/packet/Close.java (90%) rename source/org/jivesoftware/smackx/{ => bytestreams}/ibb/packet/Data.java (93%) rename source/org/jivesoftware/smackx/{ => bytestreams}/ibb/packet/DataPacketExtension.java (94%) rename source/org/jivesoftware/smackx/{ => bytestreams}/ibb/packet/Open.java (92%) rename source/org/jivesoftware/smackx/{ => bytestreams}/ibb/provider/CloseIQProvider.java (86%) rename source/org/jivesoftware/smackx/{ => bytestreams}/ibb/provider/DataPacketProvider.java (87%) rename source/org/jivesoftware/smackx/{ => bytestreams}/ibb/provider/OpenIQProvider.java (85%) rename source/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/InitiationListener.java (94%) rename source/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5BytestreamListener.java (94%) rename source/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5BytestreamManager.java (96%) rename source/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5BytestreamRequest.java (95%) rename source/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5BytestreamSession.java (94%) rename source/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5Client.java (95%) rename source/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5ClientForInitiator.java (92%) rename source/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5Proxy.java (97%) rename source/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5Utils.java (95%) rename source/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/packet/Bytestream.java (96%) rename source/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/provider/BytestreamsProvider.java (93%) rename test-unit/org/jivesoftware/smackx/{ => bytestreams}/ibb/CloseListenerTest.java (89%) rename test-unit/org/jivesoftware/smackx/{ => bytestreams}/ibb/DataListenerTest.java (87%) rename test-unit/org/jivesoftware/smackx/{ => bytestreams}/ibb/IBBPacketUtils.java (92%) rename test-unit/org/jivesoftware/smackx/{ => bytestreams}/ibb/IBBTestsSuite.java (61%) rename test-unit/org/jivesoftware/smackx/{ => bytestreams}/ibb/InBandBytestreamManagerTest.java (92%) rename test-unit/org/jivesoftware/smackx/{ => bytestreams}/ibb/InBandBytestreamRequestTest.java (87%) rename test-unit/org/jivesoftware/smackx/{ => bytestreams}/ibb/InBandBytestreamSessionMessageTest.java (93%) rename test-unit/org/jivesoftware/smackx/{ => bytestreams}/ibb/InBandBytestreamSessionTest.java (95%) rename test-unit/org/jivesoftware/smackx/{ => bytestreams}/ibb/InitiationListenerTest.java (95%) rename test-unit/org/jivesoftware/smackx/{ => bytestreams}/ibb/packet/CloseTest.java (92%) rename test-unit/org/jivesoftware/smackx/{ => bytestreams}/ibb/packet/DataPacketExtensionTest.java (93%) rename test-unit/org/jivesoftware/smackx/{ => bytestreams}/ibb/packet/DataTest.java (90%) rename test-unit/org/jivesoftware/smackx/{ => bytestreams}/ibb/packet/OpenTest.java (91%) rename test-unit/org/jivesoftware/smackx/{ => bytestreams}/ibb/provider/OpenIQProviderTest.java (88%) rename test-unit/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/InitiationListenerTest.java (94%) rename test-unit/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5ByteStreamManagerTest.java (96%) rename test-unit/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5ByteStreamRequestTest.java (95%) rename test-unit/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5ClientForInitiatorTest.java (92%) rename test-unit/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5ClientTest.java (94%) rename test-unit/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5PacketUtils.java (94%) rename test-unit/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5ProxyTest.java (95%) rename test-unit/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5TestProxy.java (95%) rename test/org/jivesoftware/smackx/{ => bytestreams}/ibb/InBandBytestreamTest.java (92%) rename test/org/jivesoftware/smackx/{socks5bytestream => bytestreams/socks5}/Socks5ByteStreamTest.java (93%) diff --git a/build/resources/META-INF/smack-config.xml b/build/resources/META-INF/smack-config.xml index 5378c6f47..34c5422ce 100644 --- a/build/resources/META-INF/smack-config.xml +++ b/build/resources/META-INF/smack-config.xml @@ -8,8 +8,8 @@ org.jivesoftware.smack.PrivacyListManager org.jivesoftware.smackx.XHTMLManager org.jivesoftware.smackx.muc.MultiUserChat - org.jivesoftware.smackx.ibb.InBandBytestreamManager - org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamManager + org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager + org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager org.jivesoftware.smackx.filetransfer.FileTransferManager org.jivesoftware.smackx.LastActivityManager org.jivesoftware.smack.ReconnectionManager diff --git a/build/resources/META-INF/smack.providers b/build/resources/META-INF/smack.providers index f4f992d4d..9f0f4f15a 100644 --- a/build/resources/META-INF/smack.providers +++ b/build/resources/META-INF/smack.providers @@ -158,7 +158,7 @@ org.jivesoftware.smackx.packet.OfflineMessageInfo$Provider - + query jabber:iq:last @@ -186,7 +186,7 @@ org.jivesoftware.smackx.provider.MultipleAddressesProvider - + si http://jabber.org/protocol/si @@ -196,31 +196,31 @@ query http://jabber.org/protocol/bytestreams - org.jivesoftware.smackx.socks5bytestream.provider.BytestreamsProvider + org.jivesoftware.smackx.bytestreams.socks5.provider.BytestreamsProvider open http://jabber.org/protocol/ibb - org.jivesoftware.smackx.ibb.provider.OpenIQProvider + org.jivesoftware.smackx.bytestreams.ibb.provider.OpenIQProvider data http://jabber.org/protocol/ibb - org.jivesoftware.smackx.ibb.provider.DataPacketProvider + org.jivesoftware.smackx.bytestreams.ibb.provider.DataPacketProvider close http://jabber.org/protocol/ibb - org.jivesoftware.smackx.ibb.provider.CloseIQProvider + org.jivesoftware.smackx.bytestreams.ibb.provider.CloseIQProvider data http://jabber.org/protocol/ibb - org.jivesoftware.smackx.ibb.provider.DataPacketProvider + org.jivesoftware.smackx.bytestreams.ibb.provider.DataPacketProvider @@ -497,7 +497,7 @@ org.jivesoftware.smackx.provider.HeaderProvider - + pubsub http://jabber.org/protocol/pubsub @@ -552,7 +552,7 @@ org.jivesoftware.smackx.pubsub.provider.FormNodeProvider - + pubsub http://jabber.org/protocol/pubsub#owner @@ -571,7 +571,7 @@ org.jivesoftware.smackx.pubsub.provider.FormNodeProvider - + event http://jabber.org/protocol/pubsub#event @@ -627,7 +627,7 @@ org.jivesoftware.smackx.packet.Nick$Provider - + attention urn:xmpp:attention:0 diff --git a/source/org/jivesoftware/smackx/bytestreams/BytestreamListener.java b/source/org/jivesoftware/smackx/bytestreams/BytestreamListener.java index 5cc698008..be78255d5 100644 --- a/source/org/jivesoftware/smackx/bytestreams/BytestreamListener.java +++ b/source/org/jivesoftware/smackx/bytestreams/BytestreamListener.java @@ -13,10 +13,10 @@ */ package org.jivesoftware.smackx.bytestreams; -import org.jivesoftware.smackx.ibb.InBandBytestreamListener; -import org.jivesoftware.smackx.ibb.InBandBytestreamManager; -import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamListener; -import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamManager; +import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamListener; +import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager; +import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamListener; +import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager; /** * BytestreamListener are notified if a remote user wants to initiate a bytestream. Implement this diff --git a/source/org/jivesoftware/smackx/bytestreams/BytestreamManager.java b/source/org/jivesoftware/smackx/bytestreams/BytestreamManager.java index cd61c5a0c..ca6bbc602 100644 --- a/source/org/jivesoftware/smackx/bytestreams/BytestreamManager.java +++ b/source/org/jivesoftware/smackx/bytestreams/BytestreamManager.java @@ -16,8 +16,8 @@ package org.jivesoftware.smackx.bytestreams; import java.io.IOException; import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smackx.ibb.InBandBytestreamManager; -import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamManager; +import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager; +import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager; /** * BytestreamManager provides a generic interface for bytestream managers. diff --git a/source/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java b/source/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java index e10a65994..e368bad99 100644 --- a/source/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java +++ b/source/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java @@ -14,8 +14,8 @@ package org.jivesoftware.smackx.bytestreams; import org.jivesoftware.smack.XMPPException; -import org.jivesoftware.smackx.ibb.InBandBytestreamRequest; -import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamRequest; +import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamRequest; +import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamRequest; /** * BytestreamRequest provides an interface to handle incoming bytestream requests. diff --git a/source/org/jivesoftware/smackx/bytestreams/BytestreamSession.java b/source/org/jivesoftware/smackx/bytestreams/BytestreamSession.java index a0b9b3805..7aafc3513 100644 --- a/source/org/jivesoftware/smackx/bytestreams/BytestreamSession.java +++ b/source/org/jivesoftware/smackx/bytestreams/BytestreamSession.java @@ -17,8 +17,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import org.jivesoftware.smackx.ibb.InBandBytestreamSession; -import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamSession; +import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamSession; +import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamSession; /** * BytestreamSession provides an interface for established bytestream sessions. diff --git a/source/org/jivesoftware/smackx/ibb/CloseListener.java b/source/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java similarity index 93% rename from source/org/jivesoftware/smackx/ibb/CloseListener.java rename to source/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java index 8bec215b6..7690e9537 100644 --- a/source/org/jivesoftware/smackx/ibb/CloseListener.java +++ b/source/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.ibb; +package org.jivesoftware.smackx.bytestreams.ibb; import org.jivesoftware.smack.PacketListener; import org.jivesoftware.smack.filter.AndFilter; @@ -20,7 +20,7 @@ import org.jivesoftware.smack.filter.PacketFilter; import org.jivesoftware.smack.filter.PacketTypeFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smackx.ibb.packet.Close; +import org.jivesoftware.smackx.bytestreams.ibb.packet.Close; /** * CloseListener handles all In-Band Bytestream close requests. diff --git a/source/org/jivesoftware/smackx/ibb/DataListener.java b/source/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java similarity index 93% rename from source/org/jivesoftware/smackx/ibb/DataListener.java rename to source/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java index 16c132eab..166c14647 100644 --- a/source/org/jivesoftware/smackx/ibb/DataListener.java +++ b/source/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.ibb; +package org.jivesoftware.smackx.bytestreams.ibb; import org.jivesoftware.smack.PacketListener; import org.jivesoftware.smack.filter.AndFilter; import org.jivesoftware.smack.filter.PacketFilter; import org.jivesoftware.smack.filter.PacketTypeFilter; import org.jivesoftware.smack.packet.Packet; -import org.jivesoftware.smackx.ibb.packet.Data; +import org.jivesoftware.smackx.bytestreams.ibb.packet.Data; /** * DataListener handles all In-Band Bytestream IQ stanzas containing a data diff --git a/source/org/jivesoftware/smackx/ibb/InBandBytestreamListener.java b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java similarity index 94% rename from source/org/jivesoftware/smackx/ibb/InBandBytestreamListener.java rename to source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java index 3aed11177..68791a6f3 100644 --- a/source/org/jivesoftware/smackx/ibb/InBandBytestreamListener.java +++ b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.ibb; +package org.jivesoftware.smackx.bytestreams.ibb; import org.jivesoftware.smackx.bytestreams.BytestreamListener; import org.jivesoftware.smackx.bytestreams.BytestreamRequest; diff --git a/source/org/jivesoftware/smackx/ibb/InBandBytestreamManager.java b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java similarity index 96% rename from source/org/jivesoftware/smackx/ibb/InBandBytestreamManager.java rename to source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java index 835f4f959..6c4e1b57a 100644 --- a/source/org/jivesoftware/smackx/ibb/InBandBytestreamManager.java +++ b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.ibb; +package org.jivesoftware.smackx.bytestreams.ibb; import java.util.Collections; import java.util.HashMap; @@ -29,8 +29,8 @@ import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smackx.bytestreams.BytestreamListener; import org.jivesoftware.smackx.bytestreams.BytestreamManager; +import org.jivesoftware.smackx.bytestreams.ibb.packet.Open; import org.jivesoftware.smackx.filetransfer.FileTransferManager; -import org.jivesoftware.smackx.ibb.packet.Open; import org.jivesoftware.smackx.packet.SyncPacketSend; /** diff --git a/source/org/jivesoftware/smackx/ibb/InBandBytestreamRequest.java b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java similarity index 93% rename from source/org/jivesoftware/smackx/ibb/InBandBytestreamRequest.java rename to source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java index 3fabdfa26..5bc689a4a 100644 --- a/source/org/jivesoftware/smackx/ibb/InBandBytestreamRequest.java +++ b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.ibb; +package org.jivesoftware.smackx.bytestreams.ibb; import org.jivesoftware.smack.Connection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smackx.bytestreams.BytestreamRequest; -import org.jivesoftware.smackx.ibb.packet.Open; +import org.jivesoftware.smackx.bytestreams.ibb.packet.Open; /** * InBandBytestreamRequest class handles incoming In-Band Bytestream requests. diff --git a/source/org/jivesoftware/smackx/ibb/InBandBytestreamSession.java b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java similarity index 96% rename from source/org/jivesoftware/smackx/ibb/InBandBytestreamSession.java rename to source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java index 8cd63f8c3..e3977a4c1 100644 --- a/source/org/jivesoftware/smackx/ibb/InBandBytestreamSession.java +++ b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.ibb; +package org.jivesoftware.smackx.bytestreams.ibb; import java.io.IOException; import java.io.InputStream; @@ -34,10 +34,10 @@ import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.packet.XMPPError; import org.jivesoftware.smack.util.StringUtils; import org.jivesoftware.smackx.bytestreams.BytestreamSession; -import org.jivesoftware.smackx.ibb.packet.Close; -import org.jivesoftware.smackx.ibb.packet.Data; -import org.jivesoftware.smackx.ibb.packet.DataPacketExtension; -import org.jivesoftware.smackx.ibb.packet.Open; +import org.jivesoftware.smackx.bytestreams.ibb.packet.Close; +import org.jivesoftware.smackx.bytestreams.ibb.packet.Data; +import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension; +import org.jivesoftware.smackx.bytestreams.ibb.packet.Open; import org.jivesoftware.smackx.packet.SyncPacketSend; /** diff --git a/source/org/jivesoftware/smackx/ibb/InitiationListener.java b/source/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java similarity index 95% rename from source/org/jivesoftware/smackx/ibb/InitiationListener.java rename to source/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java index 820db0387..0ecb08156 100644 --- a/source/org/jivesoftware/smackx/ibb/InitiationListener.java +++ b/source/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.ibb; +package org.jivesoftware.smackx.bytestreams.ibb; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -24,7 +24,7 @@ import org.jivesoftware.smack.filter.PacketTypeFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smackx.bytestreams.BytestreamListener; -import org.jivesoftware.smackx.ibb.packet.Open; +import org.jivesoftware.smackx.bytestreams.ibb.packet.Open; /** * InitiationListener handles all incoming In-Band Bytestream open requests. If there are no diff --git a/source/org/jivesoftware/smackx/ibb/packet/Close.java b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java similarity index 90% rename from source/org/jivesoftware/smackx/ibb/packet/Close.java rename to source/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java index ff0997ff1..9a78d736d 100644 --- a/source/org/jivesoftware/smackx/ibb/packet/Close.java +++ b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.ibb.packet; +package org.jivesoftware.smackx.bytestreams.ibb.packet; import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smackx.ibb.InBandBytestreamManager; +import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager; /** * Represents a request to close an In-Band Bytestream. diff --git a/source/org/jivesoftware/smackx/ibb/packet/Data.java b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java similarity index 93% rename from source/org/jivesoftware/smackx/ibb/packet/Data.java rename to source/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java index 1653be802..696fa75d3 100644 --- a/source/org/jivesoftware/smackx/ibb/packet/Data.java +++ b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.ibb.packet; +package org.jivesoftware.smackx.bytestreams.ibb.packet; import org.jivesoftware.smack.packet.IQ; diff --git a/source/org/jivesoftware/smackx/ibb/packet/DataPacketExtension.java b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java similarity index 94% rename from source/org/jivesoftware/smackx/ibb/packet/DataPacketExtension.java rename to source/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java index 0013843ae..80ed1e1fc 100644 --- a/source/org/jivesoftware/smackx/ibb/packet/DataPacketExtension.java +++ b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.ibb.packet; +package org.jivesoftware.smackx.bytestreams.ibb.packet; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.util.StringUtils; -import org.jivesoftware.smackx.ibb.InBandBytestreamManager; +import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager; /** * Represents a chunk of data of an In-Band Bytestream within an IQ stanza or a diff --git a/source/org/jivesoftware/smackx/ibb/packet/Open.java b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java similarity index 92% rename from source/org/jivesoftware/smackx/ibb/packet/Open.java rename to source/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java index a77503a73..94a7a9bf4 100644 --- a/source/org/jivesoftware/smackx/ibb/packet/Open.java +++ b/source/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.ibb.packet; +package org.jivesoftware.smackx.bytestreams.ibb.packet; import org.jivesoftware.smack.packet.IQ; -import org.jivesoftware.smackx.ibb.InBandBytestreamManager; -import org.jivesoftware.smackx.ibb.InBandBytestreamManager.StanzaType; +import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager; +import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType; /** * Represents a request to open an In-Band Bytestream. diff --git a/source/org/jivesoftware/smackx/ibb/provider/CloseIQProvider.java b/source/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java similarity index 86% rename from source/org/jivesoftware/smackx/ibb/provider/CloseIQProvider.java rename to source/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java index 2476b8d1a..566724c21 100644 --- a/source/org/jivesoftware/smackx/ibb/provider/CloseIQProvider.java +++ b/source/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.ibb.provider; +package org.jivesoftware.smackx.bytestreams.ibb.provider; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; -import org.jivesoftware.smackx.ibb.packet.Close; +import org.jivesoftware.smackx.bytestreams.ibb.packet.Close; import org.xmlpull.v1.XmlPullParser; /** diff --git a/source/org/jivesoftware/smackx/ibb/provider/DataPacketProvider.java b/source/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java similarity index 87% rename from source/org/jivesoftware/smackx/ibb/provider/DataPacketProvider.java rename to source/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java index 63fc3126b..5abed085c 100644 --- a/source/org/jivesoftware/smackx/ibb/provider/DataPacketProvider.java +++ b/source/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.ibb.provider; +package org.jivesoftware.smackx.bytestreams.ibb.provider; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.PacketExtension; import org.jivesoftware.smack.provider.IQProvider; import org.jivesoftware.smack.provider.PacketExtensionProvider; -import org.jivesoftware.smackx.ibb.packet.Data; -import org.jivesoftware.smackx.ibb.packet.DataPacketExtension; +import org.jivesoftware.smackx.bytestreams.ibb.packet.Data; +import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension; import org.xmlpull.v1.XmlPullParser; /** diff --git a/source/org/jivesoftware/smackx/ibb/provider/OpenIQProvider.java b/source/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java similarity index 85% rename from source/org/jivesoftware/smackx/ibb/provider/OpenIQProvider.java rename to source/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java index b62d75387..3cc725ae8 100644 --- a/source/org/jivesoftware/smackx/ibb/provider/OpenIQProvider.java +++ b/source/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.ibb.provider; +package org.jivesoftware.smackx.bytestreams.ibb.provider; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.provider.IQProvider; -import org.jivesoftware.smackx.ibb.InBandBytestreamManager.StanzaType; -import org.jivesoftware.smackx.ibb.packet.Open; +import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType; +import org.jivesoftware.smackx.bytestreams.ibb.packet.Open; import org.xmlpull.v1.XmlPullParser; /** diff --git a/source/org/jivesoftware/smackx/socks5bytestream/InitiationListener.java b/source/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java similarity index 94% rename from source/org/jivesoftware/smackx/socks5bytestream/InitiationListener.java rename to source/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java index 130e65bbf..2a78250a0 100644 --- a/source/org/jivesoftware/smackx/socks5bytestream/InitiationListener.java +++ b/source/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.socks5bytestream; +package org.jivesoftware.smackx.bytestreams.socks5; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -24,7 +24,7 @@ import org.jivesoftware.smack.filter.PacketTypeFilter; import org.jivesoftware.smack.packet.IQ; import org.jivesoftware.smack.packet.Packet; import org.jivesoftware.smackx.bytestreams.BytestreamListener; -import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream; +import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream; /** * InitiationListener handles all incoming SOCKS5 Bytestream initiation requests. If there are no diff --git a/source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamListener.java b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java similarity index 94% rename from source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamListener.java rename to source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java index a0365010e..1430b1d23 100644 --- a/source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamListener.java +++ b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.socks5bytestream; +package org.jivesoftware.smackx.bytestreams.socks5; import org.jivesoftware.smackx.bytestreams.BytestreamListener; import org.jivesoftware.smackx.bytestreams.BytestreamRequest; diff --git a/source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamManager.java b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java similarity index 96% rename from source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamManager.java rename to source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java index b953e9adb..5d4b50958 100644 --- a/source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamManager.java +++ b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.socks5bytestream; +package org.jivesoftware.smackx.bytestreams.socks5; import java.io.IOException; import java.net.Socket; @@ -36,15 +36,15 @@ import org.jivesoftware.smack.packet.XMPPError; 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.filetransfer.FileTransferManager; import org.jivesoftware.smackx.packet.DiscoverInfo; import org.jivesoftware.smackx.packet.DiscoverItems; import org.jivesoftware.smackx.packet.SyncPacketSend; import org.jivesoftware.smackx.packet.DiscoverInfo.Identity; import org.jivesoftware.smackx.packet.DiscoverItems.Item; -import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream; -import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHost; -import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHostUsed; /** * The Socks5BytestreamManager class handles establishing SOCKS5 Bytestreams as specified in the