vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-11-26 22:12:05 +01:00
Code Issues Releases Wiki Activity

moved ibb and socks5bytestream packages in the bytestream package

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/improve_bytestreams@11819 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Henning Staib 2010-08-15 11:27:13 +00:00 committed by henning
parent 8cb01900c9
commit 3e16b35162
58 changed files with 192 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/resources/META-INF/smack-config.xml
View file

@ -8,8 +8,8 @@
<className>org.jivesoftware.smack.PrivacyListManager</className>
<className>org.jivesoftware.smackx.XHTMLManager</className>
<className>org.jivesoftware.smackx.muc.MultiUserChat</className>
<className>org.jivesoftware.smackx.ibb.InBandBytestreamManager</className>
<className>org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamManager</className>
<className>org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager</className>
<className>org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager</className>
<className>org.jivesoftware.smackx.filetransfer.FileTransferManager</className>
<className>org.jivesoftware.smackx.LastActivityManager</className>
<className>org.jivesoftware.smack.ReconnectionManager</className>

22
build/resources/META-INF/smack.providers
View file

@ -158,7 +158,7 @@
<className>org.jivesoftware.smackx.packet.OfflineMessageInfo$Provider</className>
</extensionProvider>
<!-- Last Activity -->
<!-- Last Activity -->
<iqProvider>
<elementName>query</elementName>
<namespace>jabber:iq:last</namespace>
@ -186,7 +186,7 @@
<className>org.jivesoftware.smackx.provider.MultipleAddressesProvider</className>
</extensionProvider>
<!-- FileTransfer -->
<!-- FileTransfer -->
<iqProvider>
<elementName>si</elementName>
<namespace>http://jabber.org/protocol/si</namespace>
@ -196,31 +196,31 @@
<iqProvider>
<elementName>query</elementName>
<namespace>http://jabber.org/protocol/bytestreams</namespace>
<className>org.jivesoftware.smackx.socks5bytestream.provider.BytestreamsProvider</className>
<className>org.jivesoftware.smackx.bytestreams.socks5.provider.BytestreamsProvider</className>
</iqProvider>
<iqProvider>
<elementName>open</elementName>
<namespace>http://jabber.org/protocol/ibb</namespace>
<className>org.jivesoftware.smackx.ibb.provider.OpenIQProvider</className>
<className>org.jivesoftware.smackx.bytestreams.ibb.provider.OpenIQProvider</className>
</iqProvider>
<iqProvider>
<elementName>data</elementName>
<namespace>http://jabber.org/protocol/ibb</namespace>
<className>org.jivesoftware.smackx.ibb.provider.DataPacketProvider</className>
<className>org.jivesoftware.smackx.bytestreams.ibb.provider.DataPacketProvider</className>
</iqProvider>
<iqProvider>
<elementName>close</elementName>
<namespace>http://jabber.org/protocol/ibb</namespace>
<className>org.jivesoftware.smackx.ibb.provider.CloseIQProvider</className>
<className>org.jivesoftware.smackx.bytestreams.ibb.provider.CloseIQProvider</className>
</iqProvider>
<extensionProvider>
<elementName>data</elementName>
<namespace>http://jabber.org/protocol/ibb</namespace>
<className>org.jivesoftware.smackx.ibb.provider.DataPacketProvider</className>
<className>org.jivesoftware.smackx.bytestreams.ibb.provider.DataPacketProvider</className>
</extensionProvider>
<!-- Privacy -->
@ -497,7 +497,7 @@
<className>org.jivesoftware.smackx.provider.HeaderProvider</className>
</extensionProvider>
<!-- XEP-0060 pubsub -->
<!-- XEP-0060 pubsub -->
<iqProvider>
<elementName>pubsub</elementName>
<namespace>http://jabber.org/protocol/pubsub</namespace>
@ -552,7 +552,7 @@
<className>org.jivesoftware.smackx.pubsub.provider.FormNodeProvider</className>
</extensionProvider>
<!-- XEP-0060 pubsub#owner -->
<!-- XEP-0060 pubsub#owner -->
<iqProvider>
<elementName>pubsub</elementName>
<namespace>http://jabber.org/protocol/pubsub#owner</namespace>
@ -571,7 +571,7 @@
<className>org.jivesoftware.smackx.pubsub.provider.FormNodeProvider</className>
</extensionProvider>
<!-- XEP-0060 pubsub#event -->
<!-- XEP-0060 pubsub#event -->
<extensionProvider>
<elementName>event</elementName>
<namespace>http://jabber.org/protocol/pubsub#event</namespace>
@ -627,7 +627,7 @@
<className>org.jivesoftware.smackx.packet.Nick$Provider</className>
</extensionProvider>
<!-- Attention -->
<!-- Attention -->
<extensionProvider>
<elementName>attention</elementName>
<namespace>urn:xmpp:attention:0</namespace>

8
source/org/jivesoftware/smackx/bytestreams/BytestreamListener.java
View file

@ -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

4
source/org/jivesoftware/smackx/bytestreams/BytestreamManager.java
View file

@ -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.

4
source/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java
View file

@ -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.

4
source/org/jivesoftware/smackx/bytestreams/BytestreamSession.java
View file

@ -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.

4
source/org/jivesoftware/smackx/ibb/CloseListener.java → source/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java
View file

@ -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.

4
source/org/jivesoftware/smackx/ibb/DataListener.java → source/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java
View file

@ -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

2
source/org/jivesoftware/smackx/ibb/InBandBytestreamListener.java → source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java
View file

@ -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;

4
source/org/jivesoftware/smackx/ibb/InBandBytestreamManager.java → source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java
View file

@ -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;
/**

4
source/org/jivesoftware/smackx/ibb/InBandBytestreamRequest.java → source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java
View file

@ -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.

10
source/org/jivesoftware/smackx/ibb/InBandBytestreamSession.java → source/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java
View file

@ -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;
/**

4
source/org/jivesoftware/smackx/ibb/InitiationListener.java → source/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java
View file

@ -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

4
source/org/jivesoftware/smackx/ibb/packet/Close.java → source/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java
View file

@ -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.

2
source/org/jivesoftware/smackx/ibb/packet/Data.java → source/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java
View file

@ -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;

4
source/org/jivesoftware/smackx/ibb/packet/DataPacketExtension.java → source/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java
View file

@ -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

6
source/org/jivesoftware/smackx/ibb/packet/Open.java → source/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java
View file

@ -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.

4
source/org/jivesoftware/smackx/ibb/provider/CloseIQProvider.java → source/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java
View file

@ -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;
/**

6
source/org/jivesoftware/smackx/ibb/provider/DataPacketProvider.java → source/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java
View file

@ -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;
/**

6
source/org/jivesoftware/smackx/ibb/provider/OpenIQProvider.java → source/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java
View file

@ -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;
/**

4
source/org/jivesoftware/smackx/socks5bytestream/InitiationListener.java → source/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java
View file

@ -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

2
source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamListener.java → source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java
View file

@ -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;

8
source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamManager.java → source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java
View file

@ -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 <a

6
source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamRequest.java → source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java
View file

@ -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;
@ -23,8 +23,8 @@ import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smack.util.Cache;
import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHost;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
/**
* Socks5BytestreamRequest class handles incoming SOCKS5 Bytestream requests.

2
source/org/jivesoftware/smackx/socks5bytestream/Socks5BytestreamSession.java → source/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java
View file

@ -1,4 +1,4 @@
package org.jivesoftware.smackx.socks5bytestream;
package org.jivesoftware.smackx.bytestreams.socks5;
import java.io.IOException;
import java.io.InputStream;

4
source/org/jivesoftware/smackx/socks5bytestream/Socks5Client.java → source/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java
View file

@ -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.DataInputStream;
import java.io.DataOutputStream;
@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHost;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
/**
* The SOCKS5 client class handles establishing a connection to a SOCKS5 proxy. Connecting to a

6
source/org/jivesoftware/smackx/socks5bytestream/Socks5ClientForInitiator.java → source/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java
View file

@ -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;
@ -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.smackx.bytestreams.socks5.packet.Bytestream;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
import org.jivesoftware.smackx.packet.SyncPacketSend;
import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHost;
/**
* Implementation of a SOCKS5 client used on the initiators side. This is needed because connecting

2
source/org/jivesoftware/smackx/socks5bytestream/Socks5Proxy.java → source/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java
View file

@ -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.DataInputStream;
import java.io.DataOutputStream;

2
source/org/jivesoftware/smackx/socks5bytestream/Socks5Utils.java → source/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java
View file

@ -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.DataInputStream;
import java.io.IOException;

2
source/org/jivesoftware/smackx/socks5bytestream/packet/Bytestream.java → source/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java
View file

@ -11,7 +11,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jivesoftware.smackx.socks5bytestream.packet;
package org.jivesoftware.smackx.bytestreams.socks5.packet;
import java.util.ArrayList;
import java.util.Collection;

4
source/org/jivesoftware/smackx/socks5bytestream/provider/BytestreamsProvider.java → source/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java
View file

@ -11,11 +11,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jivesoftware.smackx.socks5bytestream.provider;
package org.jivesoftware.smackx.bytestreams.socks5.provider;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
import org.xmlpull.v1.XmlPullParser;
/**

4
source/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java
View file

@ -41,10 +41,10 @@ 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.ibb.InBandBytestreamManager;
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.socks5bytestream.Socks5BytestreamManager;
/**
* Manages the negotiation of file transfers according to JEP-0096. If a file is

8
source/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
View file

@ -30,10 +30,10 @@ 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.InBandBytestreamManager;
import org.jivesoftware.smackx.ibb.InBandBytestreamRequest;
import org.jivesoftware.smackx.ibb.InBandBytestreamSession;
import org.jivesoftware.smackx.ibb.packet.Open;
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;
/**

8
source/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java
View file

@ -26,11 +26,11 @@ 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.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.socks5bytestream.Socks5BytestreamManager;
import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamRequest;
import org.jivesoftware.smackx.socks5bytestream.Socks5BytestreamSession;
import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
/**
* Negotiates a SOCKS5 Bytestream to be used for file transfers. The implementation is based on the

6
test-unit/org/jivesoftware/smackx/ibb/CloseListenerTest.java → test-unit/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java
View file

@ -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 static org.junit.Assert.*;
import static org.mockito.Mockito.*;
@ -19,7 +19,9 @@ 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.ibb.packet.Close;
import org.jivesoftware.smackx.bytestreams.ibb.CloseListener;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
import org.jivesoftware.smackx.bytestreams.ibb.packet.Close;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.powermock.reflect.Whitebox;

8
test-unit/org/jivesoftware/smackx/ibb/DataListenerTest.java → test-unit/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java
View file

@ -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 static org.junit.Assert.*;
import static org.mockito.Mockito.*;
@ -19,8 +19,10 @@ 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.ibb.packet.Data;
import org.jivesoftware.smackx.ibb.packet.DataPacketExtension;
import org.jivesoftware.smackx.bytestreams.ibb.DataListener;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
import org.jivesoftware.smackx.bytestreams.ibb.packet.Data;
import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.powermock.reflect.Whitebox;

2
test-unit/org/jivesoftware/smackx/ibb/IBBPacketUtils.java → test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java
View file

@ -1,4 +1,4 @@
package org.jivesoftware.smackx.ibb;
package org.jivesoftware.smackx.bytestreams.ibb;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XMPPError;

12
test-unit/org/jivesoftware/smackx/ibb/IBBTestsSuite.java → test-unit/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java
View file

@ -1,10 +1,10 @@
package org.jivesoftware.smackx.ibb;
package org.jivesoftware.smackx.bytestreams.ibb;
import org.jivesoftware.smackx.ibb.packet.CloseTest;
import org.jivesoftware.smackx.ibb.packet.DataPacketExtensionTest;
import org.jivesoftware.smackx.ibb.packet.DataTest;
import org.jivesoftware.smackx.ibb.packet.OpenTest;
import org.jivesoftware.smackx.ibb.provider.OpenIQProviderTest;
import org.jivesoftware.smackx.bytestreams.ibb.packet.CloseTest;
import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtensionTest;
import org.jivesoftware.smackx.bytestreams.ibb.packet.DataTest;
import org.jivesoftware.smackx.bytestreams.ibb.packet.OpenTest;
import org.jivesoftware.smackx.bytestreams.ibb.provider.OpenIQProviderTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;

8
test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamManagerTest.java → test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java
View file

@ -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 static org.junit.Assert.*;
import static org.mockito.Mockito.*;
@ -20,8 +20,10 @@ import org.jivesoftware.smack.Connection;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smackx.ibb.InBandBytestreamManager.StanzaType;
import org.jivesoftware.smackx.ibb.packet.Open;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamSession;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
import org.jivesoftware.util.ConnectionUtils;
import org.jivesoftware.util.Protocol;
import org.jivesoftware.util.Verification;

7
test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamRequestTest.java → test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java
View file

@ -1,4 +1,4 @@
package org.jivesoftware.smackx.ibb;
package org.jivesoftware.smackx.bytestreams.ibb;
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
@ -6,7 +6,10 @@ 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.ibb.packet.Open;
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.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;

10
test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamSessionMessageTest.java → test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java
View file

@ -1,4 +1,4 @@
package org.jivesoftware.smackx.ibb;
package org.jivesoftware.smackx.bytestreams.ibb;
import static org.junit.Assert.*;
@ -12,9 +12,11 @@ import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.ibb.InBandBytestreamManager.StanzaType;
import org.jivesoftware.smackx.ibb.packet.DataPacketExtension;
import org.jivesoftware.smackx.ibb.packet.Open;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamSession;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
import org.jivesoftware.util.ConnectionUtils;
import org.jivesoftware.util.Protocol;
import org.jivesoftware.util.Verification;

10
test-unit/org/jivesoftware/smackx/ibb/InBandBytestreamSessionTest.java → test-unit/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java
View file

@ -1,4 +1,4 @@
package org.jivesoftware.smackx.ibb;
package org.jivesoftware.smackx.bytestreams.ibb;
import static org.junit.Assert.*;
@ -12,9 +12,11 @@ import org.jivesoftware.smack.PacketListener;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smack.util.StringUtils;
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.InBandBytestreamManager;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamSession;
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.util.ConnectionUtils;
import org.jivesoftware.util.Protocol;
import org.jivesoftware.util.Verification;

7
test-unit/org/jivesoftware/smackx/ibb/InitiationListenerTest.java → test-unit/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java
View file

@ -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 static org.junit.Assert.*;
import static org.mockito.Mockito.*;
@ -20,7 +20,10 @@ import org.jivesoftware.smack.Connection;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smackx.bytestreams.BytestreamRequest;
import org.jivesoftware.smackx.ibb.packet.Open;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamListener;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager;
import org.jivesoftware.smackx.bytestreams.ibb.InitiationListener;
import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;

3
test-unit/org/jivesoftware/smackx/ibb/packet/CloseTest.java → test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java
View file

@ -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 static junit.framework.Assert.*;
import static org.custommonkey.xmlunit.XMLAssert.*;
@ -19,6 +19,7 @@ import static org.custommonkey.xmlunit.XMLAssert.*;
import java.util.Properties;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smackx.bytestreams.ibb.packet.Close;
import org.junit.Test;
import com.jamesmurty.utils.XMLBuilder;

3
test-unit/org/jivesoftware/smackx/ibb/packet/DataPacketExtensionTest.java → test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java
View file

@ -11,13 +11,14 @@
* 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 static junit.framework.Assert.*;
import static org.custommonkey.xmlunit.XMLAssert.*;
import java.util.Properties;
import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
import org.junit.Test;
import com.jamesmurty.utils.XMLBuilder;

4
test-unit/org/jivesoftware/smackx/ibb/packet/DataTest.java → test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java
View file

@ -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 static junit.framework.Assert.*;
import static org.custommonkey.xmlunit.XMLAssert.*;
@ -21,6 +21,8 @@ import java.util.Properties;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.util.Base64;
import org.jivesoftware.smackx.bytestreams.ibb.packet.Data;
import org.jivesoftware.smackx.bytestreams.ibb.packet.DataPacketExtension;
import org.junit.Test;
import com.jamesmurty.utils.XMLBuilder;

5
test-unit/org/jivesoftware/smackx/ibb/packet/OpenTest.java → test-unit/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java
View file

@ -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 static junit.framework.Assert.*;
import static org.custommonkey.xmlunit.XMLAssert.*;
@ -19,7 +19,8 @@ import static org.custommonkey.xmlunit.XMLAssert.*;
import java.util.Properties;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smackx.ibb.InBandBytestreamManager.StanzaType;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamManager.StanzaType;
import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
import org.junit.Test;
import com.jamesmurty.utils.XMLBuilder;

7
test-unit/org/jivesoftware/smackx/ibb/provider/OpenIQProviderTest.java → test-unit/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java
View file

@ -11,7 +11,7 @@
* 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 static org.junit.Assert.*;
@ -19,8 +19,9 @@ import java.io.IOException;
import java.io.StringReader;
import java.util.Properties;
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.jivesoftware.smackx.bytestreams.ibb.provider.OpenIQProvider;
import org.junit.Test;
import org.xmlpull.mxp1.MXParser;
import org.xmlpull.v1.XmlPullParser;

7
test-unit/org/jivesoftware/smackx/socks5bytestream/InitiationListenerTest.java → test-unit/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java
View file

@ -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 static org.junit.Assert.*;
import static org.mockito.Mockito.*;
@ -21,7 +21,10 @@ 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.socks5bytestream.packet.Bytestream;
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.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;

10
test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ByteStreamManagerTest.java → test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java
View file

@ -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 static org.junit.Assert.*;
import static org.mockito.Mockito.*;
@ -28,12 +28,16 @@ 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.socks5bytestream.packet.Bytestream;
import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHost;
import org.jivesoftware.util.ConnectionUtils;
import org.jivesoftware.util.Protocol;
import org.jivesoftware.util.Verification;

7
test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ByteStreamRequestTest.java → test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java
View file

@ -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 static org.junit.Assert.*;
@ -26,7 +26,10 @@ 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.smackx.socks5bytestream.packet.Bytestream;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamManager;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamRequest;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5Utils;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
import org.jivesoftware.util.ConnectionUtils;
import org.jivesoftware.util.Protocol;
import org.junit.After;

10
test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ClientForInitiatorTest.java → test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java
View file

@ -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 static org.junit.Assert.*;
@ -25,8 +25,12 @@ 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.socks5bytestream.packet.Bytestream;
import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHost;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5Client;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5ClientForInitiator;
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.util.ConnectionUtils;
import org.jivesoftware.util.Protocol;
import org.jivesoftware.util.Verification;

6
test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ClientTest.java → test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java
View file

@ -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 static org.junit.Assert.*;
@ -21,7 +21,9 @@ import java.net.ServerSocket;
import java.net.Socket;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream.StreamHost;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5Client;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5Utils;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream.StreamHost;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;

4
test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5PacketUtils.java → test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java
View file

@ -11,12 +11,12 @@
* 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.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.socks5bytestream.packet.Bytestream;
/**
* A collection of utility methods to create XMPP packets.

3
test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5ProxyTest.java → test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java
View file

@ -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 static org.junit.Assert.*;
@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import org.jivesoftware.smack.SmackConfiguration;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5Proxy;
import org.junit.After;
import org.junit.Test;

3
test-unit/org/jivesoftware/smackx/socks5bytestream/Socks5TestProxy.java → test-unit/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java
View file

@ -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.DataInputStream;
import java.io.DataOutputStream;
@ -25,6 +25,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5Utils;
/**
* Simple SOCKS5 proxy for testing purposes. It is almost the same as the Socks5Proxy class but the

10
test/org/jivesoftware/smackx/ibb/InBandBytestreamTest.java → test/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java
View file

@ -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.InputStream;
import java.io.OutputStream;
@ -25,8 +25,12 @@ import org.jivesoftware.smack.filter.PacketIDFilter;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smack.test.SmackTestCase;
import org.jivesoftware.smackx.ibb.InBandBytestreamManager.StanzaType;
import org.jivesoftware.smackx.ibb.packet.Open;
import org.jivesoftware.smackx.bytestreams.ibb.InBandBytestreamListener;
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.InBandBytestreamManager.StanzaType;
import org.jivesoftware.smackx.bytestreams.ibb.packet.Open;
/**
* Test for In-Band Bytestreams with real XMPP servers.

10
test/org/jivesoftware/smackx/socks5bytestream/Socks5ByteStreamTest.java → test/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java
View file

@ -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.InputStream;
import java.io.OutputStream;
@ -30,7 +30,13 @@ import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smack.test.SmackTestCase;
import org.jivesoftware.smackx.ServiceDiscoveryManager;
import org.jivesoftware.smackx.socks5bytestream.packet.Bytestream;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5BytestreamListener;
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.Socks5PacketUtils;
import org.jivesoftware.smackx.bytestreams.socks5.Socks5Proxy;
import org.jivesoftware.smackx.bytestreams.socks5.packet.Bytestream;
/**
* Test for Socks5 bytestreams with real XMPP servers.