From c96be693dc06a42296c806a1c16c35588ca56049 Mon Sep 17 00:00:00 2001
From: rcollier <rcollier@b35dd754-fafc-0310-a699-88a17e54d16e>
Date: Wed, 21 Sep 2011 23:57:34 +0000
Subject: [PATCH] Moved utility class to the core, since it is not extension
 related and useful for all code.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12598 b35dd754-fafc-0310-a699-88a17e54d16e
---
 .../{smackx/packet => smack/util}/SyncPacketSend.java           | 2 +-
 .../smackx/bytestreams/ibb/InBandBytestreamManager.java         | 2 +-
 .../smackx/bytestreams/ibb/InBandBytestreamSession.java         | 2 +-
 .../smackx/bytestreams/socks5/Socks5BytestreamManager.java      | 2 +-
 .../smackx/bytestreams/socks5/Socks5ClientForInitiator.java     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename source/org/jivesoftware/{smackx/packet => smack/util}/SyncPacketSend.java (95%)

diff --git a/source/org/jivesoftware/smackx/packet/SyncPacketSend.java b/source/org/jivesoftware/smack/util/SyncPacketSend.java
similarity index 95%
rename from source/org/jivesoftware/smackx/packet/SyncPacketSend.java
rename to source/org/jivesoftware/smack/util/SyncPacketSend.java
index 8ce87f92b..a1c238aeb 100644
--- a/source/org/jivesoftware/smackx/packet/SyncPacketSend.java
+++ b/source/org/jivesoftware/smack/util/SyncPacketSend.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.smack.util;
 
 import org.jivesoftware.smack.PacketCollector;
 import org.jivesoftware.smack.SmackConfiguration;
diff --git a/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
index 6c4e1b57a..ef5253154 100644
--- a/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
@@ -27,11 +27,11 @@ import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.packet.XMPPError;
+import org.jivesoftware.smack.util.SyncPacketSend;
 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.packet.SyncPacketSend;
 
 /**
  * The InBandBytestreamManager class handles establishing In-Band Bytestreams as specified in the <a
diff --git a/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
index e3977a4c1..932fdc633 100644
--- a/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
+++ b/source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
@@ -33,12 +33,12 @@ 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.smack.util.SyncPacketSend;
 import org.jivesoftware.smackx.bytestreams.BytestreamSession;
 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;
 
 /**
  * InBandBytestreamSession class represents an In-Band Bytestream session.
diff --git a/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
index 5d4b50958..41826df13 100644
--- a/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
+++ b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
@@ -33,6 +33,7 @@ import org.jivesoftware.smack.XMPPException;
 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;
@@ -42,7 +43,6 @@ import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHostUs
 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;
 
diff --git a/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
index 04248c77b..0d90791a9 100644
--- a/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
+++ b/source/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
@@ -20,9 +20,9 @@ import java.util.concurrent.TimeoutException;
 import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.IQ;
+import org.jivesoftware.smack.util.SyncPacketSend;
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
 import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
-import org.jivesoftware.smackx.packet.SyncPacketSend;
 
 /**
  * Implementation of a SOCKS5 client used on the initiators side. This is needed because connecting