diff --git a/build.gradle b/build.gradle index 325fae53f..08e52881f 100644 --- a/build.gradle +++ b/build.gradle @@ -187,7 +187,7 @@ subprojects { } } -(subprojects - project(':core'))*.jar { +(subprojects - project(':smack-core'))*.jar { manifest { attributes('Bundle-SymbolicName': project.group + '-' + project.name, 'Fragment-Host': project.group, diff --git a/debug/build.gradle b/debug/build.gradle deleted file mode 100644 index a2f1de2f0..000000000 --- a/debug/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -description = """\ -Smack GUI debugger. -Inspect the exchanged XMPP stanzas.""" - -dependencies { - compile project(':core') - testCompile project(':core').sourceSets.test.runtimeClasspath -} diff --git a/settings.gradle b/settings.gradle index ee10de317..39b03c03d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,11 +1,11 @@ -include 'core', - 'tcp', - 'extensions', - 'experimental', - 'debug', - 'resolver-dnsjava', - 'resolver-javax', - 'compression-jzlib', - 'legacy', - 'jingle', - 'bosh' \ No newline at end of file +include 'smack-core', + 'smack-tcp', + 'smack-extensions', + 'smack-experimental', + 'smack-debug', + 'smack-resolver-dnsjava', + 'smack-resolver-javax', + 'smack-compression-jzlib', + 'smack-legacy', + 'smack-jingle', + 'smack-bosh' \ No newline at end of file diff --git a/bosh/build.gradle b/smack-bosh/build.gradle similarity index 88% rename from bosh/build.gradle rename to smack-bosh/build.gradle index c53edcb56..a074f339e 100644 --- a/bosh/build.gradle +++ b/smack-bosh/build.gradle @@ -9,6 +9,6 @@ repositories { } dependencies { - compile project(':core') + compile project(':smack-core') compile 'org.igniterealtime.jbosh:jbosh:0.8.0' } diff --git a/bosh/src/main/java/org/jivesoftware/smack/BOSHConfiguration.java b/smack-bosh/src/main/java/org/jivesoftware/smack/BOSHConfiguration.java similarity index 100% rename from bosh/src/main/java/org/jivesoftware/smack/BOSHConfiguration.java rename to smack-bosh/src/main/java/org/jivesoftware/smack/BOSHConfiguration.java diff --git a/bosh/src/main/java/org/jivesoftware/smack/BOSHPacketReader.java b/smack-bosh/src/main/java/org/jivesoftware/smack/BOSHPacketReader.java similarity index 100% rename from bosh/src/main/java/org/jivesoftware/smack/BOSHPacketReader.java rename to smack-bosh/src/main/java/org/jivesoftware/smack/BOSHPacketReader.java diff --git a/bosh/src/main/java/org/jivesoftware/smack/XMPPBOSHConnection.java b/smack-bosh/src/main/java/org/jivesoftware/smack/XMPPBOSHConnection.java similarity index 100% rename from bosh/src/main/java/org/jivesoftware/smack/XMPPBOSHConnection.java rename to smack-bosh/src/main/java/org/jivesoftware/smack/XMPPBOSHConnection.java diff --git a/compression-jzlib/build.gradle b/smack-compression-jzlib/build.gradle similarity index 68% rename from compression-jzlib/build.gradle rename to smack-compression-jzlib/build.gradle index ec58f128a..444763171 100644 --- a/compression-jzlib/build.gradle +++ b/smack-compression-jzlib/build.gradle @@ -3,6 +3,6 @@ Compression with jzlib Allow to compress the XMPP stream with help of jzlib.""" dependencies { - compile project(path: ':core', configuration: 'compression') + compile project(path: ':smack-core', configuration: 'compression') compile 'com.jcraft:jzlib:1.1.3' } diff --git a/compression-jzlib/src/main/java/org/jivesoftware/smack/compression/JzlibInputOutputStream.java b/smack-compression-jzlib/src/main/java/org/jivesoftware/smack/compression/JzlibInputOutputStream.java similarity index 100% rename from compression-jzlib/src/main/java/org/jivesoftware/smack/compression/JzlibInputOutputStream.java rename to smack-compression-jzlib/src/main/java/org/jivesoftware/smack/compression/JzlibInputOutputStream.java diff --git a/core/.gitignore b/smack-core/.gitignore similarity index 100% rename from core/.gitignore rename to smack-core/.gitignore diff --git a/core/build.gradle b/smack-core/build.gradle similarity index 100% rename from core/build.gradle rename to smack-core/build.gradle diff --git a/core/src/integration-test/java/org/jivesoftware/smack/ChatTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/ChatTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/ChatTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/ChatTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/FloodTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/FloodTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/FloodTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/FloodTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/IQTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/IQTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/IQTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/IQTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/LoginTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/LoginTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/LoginTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/LoginTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/MessageTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/MessageTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/MessageTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/MessageTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/PacketReaderTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/PacketReaderTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/PacketReaderTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/PacketReaderTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/PresenceTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/PresenceTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/PresenceTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/PresenceTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/PrivacyClient.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/PrivacyClient.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/PrivacyClient.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/PrivacyClient.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/ReconnectionTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/ReconnectionTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/ReconnectionTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/ReconnectionTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/RosterListenerTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/RosterListenerTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/RosterListenerTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/RosterListenerTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/RosterSmackTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/RosterSmackTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/RosterSmackTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/RosterSmackTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/filter/AndFilterTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/filter/AndFilterTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/filter/AndFilterTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/filter/AndFilterTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/filter/FromContainsFilterTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/filter/FromContainsFilterTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/filter/FromContainsFilterTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/filter/FromContainsFilterTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/filter/NotFilterTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/filter/NotFilterTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/filter/NotFilterTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/filter/NotFilterTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/filter/OrFilterTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/filter/OrFilterTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/filter/OrFilterTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/filter/OrFilterTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/filter/PacketIDFilterTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/filter/PacketIDFilterTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/filter/PacketIDFilterTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/filter/PacketIDFilterTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/filter/PacketTypeFilterTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/filter/PacketTypeFilterTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/filter/PacketTypeFilterTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/filter/PacketTypeFilterTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/filter/ToContainsFilterTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/filter/ToContainsFilterTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/filter/ToContainsFilterTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/filter/ToContainsFilterTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/packet/MockPacket.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/packet/MockPacket.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/packet/MockPacket.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/packet/MockPacket.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/packet/MockPacketFilter.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/packet/MockPacketFilter.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/packet/MockPacketFilter.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/packet/MockPacketFilter.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyProviderTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyProviderTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyProviderTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyProviderTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/test/SmackTestCase.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/test/SmackTestCase.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/test/SmackTestCase.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/test/SmackTestCase.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/util/CacheTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/util/CacheTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/util/CacheTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/util/CacheTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/util/ConnectionUtils.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/util/ConnectionUtils.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/util/ConnectionUtils.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/util/ConnectionUtils.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/util/DNSUtilTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/util/DNSUtilTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/util/DNSUtilTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/util/DNSUtilTest.java diff --git a/core/src/integration-test/java/org/jivesoftware/smack/util/XMPPErrorTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/util/XMPPErrorTest.java similarity index 100% rename from core/src/integration-test/java/org/jivesoftware/smack/util/XMPPErrorTest.java rename to smack-core/src/integration-test/java/org/jivesoftware/smack/util/XMPPErrorTest.java diff --git a/core/src/integration-test/resources/test-case.example.xml b/smack-core/src/integration-test/resources/test-case.example.xml similarity index 100% rename from core/src/integration-test/resources/test-case.example.xml rename to smack-core/src/integration-test/resources/test-case.example.xml diff --git a/core/src/main/java/org/jivesoftware/smack/AbstractConnectionListener.java b/smack-core/src/main/java/org/jivesoftware/smack/AbstractConnectionListener.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/AbstractConnectionListener.java rename to smack-core/src/main/java/org/jivesoftware/smack/AbstractConnectionListener.java diff --git a/core/src/main/java/org/jivesoftware/smack/AccountManager.java b/smack-core/src/main/java/org/jivesoftware/smack/AccountManager.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/AccountManager.java rename to smack-core/src/main/java/org/jivesoftware/smack/AccountManager.java diff --git a/core/src/main/java/org/jivesoftware/smack/Chat.java b/smack-core/src/main/java/org/jivesoftware/smack/Chat.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/Chat.java rename to smack-core/src/main/java/org/jivesoftware/smack/Chat.java diff --git a/core/src/main/java/org/jivesoftware/smack/ChatManager.java b/smack-core/src/main/java/org/jivesoftware/smack/ChatManager.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/ChatManager.java rename to smack-core/src/main/java/org/jivesoftware/smack/ChatManager.java diff --git a/core/src/main/java/org/jivesoftware/smack/ChatManagerListener.java b/smack-core/src/main/java/org/jivesoftware/smack/ChatManagerListener.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/ChatManagerListener.java rename to smack-core/src/main/java/org/jivesoftware/smack/ChatManagerListener.java diff --git a/core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java rename to smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java diff --git a/core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java rename to smack-core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java diff --git a/core/src/main/java/org/jivesoftware/smack/ConnectionListener.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionListener.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/ConnectionListener.java rename to smack-core/src/main/java/org/jivesoftware/smack/ConnectionListener.java diff --git a/core/src/main/java/org/jivesoftware/smack/DirectoryRosterStore.java b/smack-core/src/main/java/org/jivesoftware/smack/DirectoryRosterStore.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/DirectoryRosterStore.java rename to smack-core/src/main/java/org/jivesoftware/smack/DirectoryRosterStore.java diff --git a/core/src/main/java/org/jivesoftware/smack/Manager.java b/smack-core/src/main/java/org/jivesoftware/smack/Manager.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/Manager.java rename to smack-core/src/main/java/org/jivesoftware/smack/Manager.java diff --git a/core/src/main/java/org/jivesoftware/smack/MessageListener.java b/smack-core/src/main/java/org/jivesoftware/smack/MessageListener.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/MessageListener.java rename to smack-core/src/main/java/org/jivesoftware/smack/MessageListener.java diff --git a/core/src/main/java/org/jivesoftware/smack/PacketCollector.java b/smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/PacketCollector.java rename to smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java diff --git a/core/src/main/java/org/jivesoftware/smack/PacketInterceptor.java b/smack-core/src/main/java/org/jivesoftware/smack/PacketInterceptor.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/PacketInterceptor.java rename to smack-core/src/main/java/org/jivesoftware/smack/PacketInterceptor.java diff --git a/core/src/main/java/org/jivesoftware/smack/PacketListener.java b/smack-core/src/main/java/org/jivesoftware/smack/PacketListener.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/PacketListener.java rename to smack-core/src/main/java/org/jivesoftware/smack/PacketListener.java diff --git a/core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java b/smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java rename to smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java diff --git a/core/src/main/java/org/jivesoftware/smack/Roster.java b/smack-core/src/main/java/org/jivesoftware/smack/Roster.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/Roster.java rename to smack-core/src/main/java/org/jivesoftware/smack/Roster.java diff --git a/core/src/main/java/org/jivesoftware/smack/RosterEntry.java b/smack-core/src/main/java/org/jivesoftware/smack/RosterEntry.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/RosterEntry.java rename to smack-core/src/main/java/org/jivesoftware/smack/RosterEntry.java diff --git a/core/src/main/java/org/jivesoftware/smack/RosterGroup.java b/smack-core/src/main/java/org/jivesoftware/smack/RosterGroup.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/RosterGroup.java rename to smack-core/src/main/java/org/jivesoftware/smack/RosterGroup.java diff --git a/core/src/main/java/org/jivesoftware/smack/RosterListener.java b/smack-core/src/main/java/org/jivesoftware/smack/RosterListener.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/RosterListener.java rename to smack-core/src/main/java/org/jivesoftware/smack/RosterListener.java diff --git a/core/src/main/java/org/jivesoftware/smack/RosterStore.java b/smack-core/src/main/java/org/jivesoftware/smack/RosterStore.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/RosterStore.java rename to smack-core/src/main/java/org/jivesoftware/smack/RosterStore.java diff --git a/core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java b/smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java rename to smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java diff --git a/core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java rename to smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java diff --git a/core/src/main/java/org/jivesoftware/smack/SmackException.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/SmackException.java rename to smack-core/src/main/java/org/jivesoftware/smack/SmackException.java diff --git a/core/src/main/java/org/jivesoftware/smack/XMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/XMPPConnection.java rename to smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java diff --git a/core/src/main/java/org/jivesoftware/smack/XMPPException.java b/smack-core/src/main/java/org/jivesoftware/smack/XMPPException.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/XMPPException.java rename to smack-core/src/main/java/org/jivesoftware/smack/XMPPException.java diff --git a/core/src/main/java/org/jivesoftware/smack/compression/Java7ZlibInputOutputStream.java b/smack-core/src/main/java/org/jivesoftware/smack/compression/Java7ZlibInputOutputStream.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/compression/Java7ZlibInputOutputStream.java rename to smack-core/src/main/java/org/jivesoftware/smack/compression/Java7ZlibInputOutputStream.java diff --git a/core/src/main/java/org/jivesoftware/smack/compression/XMPPInputOutputStream.java b/smack-core/src/main/java/org/jivesoftware/smack/compression/XMPPInputOutputStream.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/compression/XMPPInputOutputStream.java rename to smack-core/src/main/java/org/jivesoftware/smack/compression/XMPPInputOutputStream.java diff --git a/core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java b/smack-core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java rename to smack-core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java diff --git a/core/src/main/java/org/jivesoftware/smack/debugger/LiteDebugger.java b/smack-core/src/main/java/org/jivesoftware/smack/debugger/LiteDebugger.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/debugger/LiteDebugger.java rename to smack-core/src/main/java/org/jivesoftware/smack/debugger/LiteDebugger.java diff --git a/core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java b/smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java rename to smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java diff --git a/core/src/main/java/org/jivesoftware/smack/debugger/package.html b/smack-core/src/main/java/org/jivesoftware/smack/debugger/package.html similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/debugger/package.html rename to smack-core/src/main/java/org/jivesoftware/smack/debugger/package.html diff --git a/core/src/main/java/org/jivesoftware/smack/filter/AndFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/AndFilter.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/filter/AndFilter.java rename to smack-core/src/main/java/org/jivesoftware/smack/filter/AndFilter.java diff --git a/core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java rename to smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java diff --git a/core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java rename to smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java diff --git a/core/src/main/java/org/jivesoftware/smack/filter/IQTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/IQTypeFilter.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/filter/IQTypeFilter.java rename to smack-core/src/main/java/org/jivesoftware/smack/filter/IQTypeFilter.java diff --git a/core/src/main/java/org/jivesoftware/smack/filter/MessageTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/MessageTypeFilter.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/filter/MessageTypeFilter.java rename to smack-core/src/main/java/org/jivesoftware/smack/filter/MessageTypeFilter.java diff --git a/core/src/main/java/org/jivesoftware/smack/filter/NotFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/NotFilter.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/filter/NotFilter.java rename to smack-core/src/main/java/org/jivesoftware/smack/filter/NotFilter.java diff --git a/core/src/main/java/org/jivesoftware/smack/filter/OrFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/OrFilter.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/filter/OrFilter.java rename to smack-core/src/main/java/org/jivesoftware/smack/filter/OrFilter.java diff --git a/core/src/main/java/org/jivesoftware/smack/filter/PacketExtensionFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketExtensionFilter.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/filter/PacketExtensionFilter.java rename to smack-core/src/main/java/org/jivesoftware/smack/filter/PacketExtensionFilter.java diff --git a/core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java rename to smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java diff --git a/core/src/main/java/org/jivesoftware/smack/filter/PacketIDFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketIDFilter.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/filter/PacketIDFilter.java rename to smack-core/src/main/java/org/jivesoftware/smack/filter/PacketIDFilter.java diff --git a/core/src/main/java/org/jivesoftware/smack/filter/PacketTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketTypeFilter.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/filter/PacketTypeFilter.java rename to smack-core/src/main/java/org/jivesoftware/smack/filter/PacketTypeFilter.java diff --git a/core/src/main/java/org/jivesoftware/smack/filter/ThreadFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/ThreadFilter.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/filter/ThreadFilter.java rename to smack-core/src/main/java/org/jivesoftware/smack/filter/ThreadFilter.java diff --git a/core/src/main/java/org/jivesoftware/smack/filter/package.html b/smack-core/src/main/java/org/jivesoftware/smack/filter/package.html similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/filter/package.html rename to smack-core/src/main/java/org/jivesoftware/smack/filter/package.html diff --git a/core/src/main/java/org/jivesoftware/smack/initializer/LoggingInitializer.java b/smack-core/src/main/java/org/jivesoftware/smack/initializer/LoggingInitializer.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/initializer/LoggingInitializer.java rename to smack-core/src/main/java/org/jivesoftware/smack/initializer/LoggingInitializer.java diff --git a/core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java b/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java rename to smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java diff --git a/core/src/main/java/org/jivesoftware/smack/initializer/UrlProviderFileInitializer.java b/smack-core/src/main/java/org/jivesoftware/smack/initializer/UrlProviderFileInitializer.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/initializer/UrlProviderFileInitializer.java rename to smack-core/src/main/java/org/jivesoftware/smack/initializer/UrlProviderFileInitializer.java diff --git a/core/src/main/java/org/jivesoftware/smack/initializer/VmArgInitializer.java b/smack-core/src/main/java/org/jivesoftware/smack/initializer/VmArgInitializer.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/initializer/VmArgInitializer.java rename to smack-core/src/main/java/org/jivesoftware/smack/initializer/VmArgInitializer.java diff --git a/core/src/main/java/org/jivesoftware/smack/package.html b/smack-core/src/main/java/org/jivesoftware/smack/package.html similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/package.html rename to smack-core/src/main/java/org/jivesoftware/smack/package.html diff --git a/core/src/main/java/org/jivesoftware/smack/packet/Bind.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/packet/Bind.java rename to smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java diff --git a/core/src/main/java/org/jivesoftware/smack/packet/DefaultPacketExtension.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultPacketExtension.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/packet/DefaultPacketExtension.java rename to smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultPacketExtension.java diff --git a/core/src/main/java/org/jivesoftware/smack/packet/IQ.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/packet/IQ.java rename to smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java diff --git a/core/src/main/java/org/jivesoftware/smack/packet/Message.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/packet/Message.java rename to smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java diff --git a/core/src/main/java/org/jivesoftware/smack/packet/Packet.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/packet/Packet.java rename to smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java diff --git a/core/src/main/java/org/jivesoftware/smack/packet/PacketExtension.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/PacketExtension.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/packet/PacketExtension.java rename to smack-core/src/main/java/org/jivesoftware/smack/packet/PacketExtension.java diff --git a/core/src/main/java/org/jivesoftware/smack/packet/Presence.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/packet/Presence.java rename to smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java diff --git a/core/src/main/java/org/jivesoftware/smack/packet/Registration.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Registration.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/packet/Registration.java rename to smack-core/src/main/java/org/jivesoftware/smack/packet/Registration.java diff --git a/core/src/main/java/org/jivesoftware/smack/packet/RosterPacket.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/RosterPacket.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/packet/RosterPacket.java rename to smack-core/src/main/java/org/jivesoftware/smack/packet/RosterPacket.java diff --git a/core/src/main/java/org/jivesoftware/smack/packet/Session.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Session.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/packet/Session.java rename to smack-core/src/main/java/org/jivesoftware/smack/packet/Session.java diff --git a/core/src/main/java/org/jivesoftware/smack/packet/StreamError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/packet/StreamError.java rename to smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java diff --git a/core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java rename to smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java diff --git a/core/src/main/java/org/jivesoftware/smack/packet/package.html b/smack-core/src/main/java/org/jivesoftware/smack/packet/package.html similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/packet/package.html rename to smack-core/src/main/java/org/jivesoftware/smack/packet/package.html diff --git a/core/src/main/java/org/jivesoftware/smack/parsing/ExceptionLoggingCallback.java b/smack-core/src/main/java/org/jivesoftware/smack/parsing/ExceptionLoggingCallback.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/parsing/ExceptionLoggingCallback.java rename to smack-core/src/main/java/org/jivesoftware/smack/parsing/ExceptionLoggingCallback.java diff --git a/core/src/main/java/org/jivesoftware/smack/parsing/ExceptionThrowingCallback.java b/smack-core/src/main/java/org/jivesoftware/smack/parsing/ExceptionThrowingCallback.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/parsing/ExceptionThrowingCallback.java rename to smack-core/src/main/java/org/jivesoftware/smack/parsing/ExceptionThrowingCallback.java diff --git a/core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java b/smack-core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java rename to smack-core/src/main/java/org/jivesoftware/smack/parsing/ParsingExceptionCallback.java diff --git a/core/src/main/java/org/jivesoftware/smack/parsing/UnparsablePacket.java b/smack-core/src/main/java/org/jivesoftware/smack/parsing/UnparsablePacket.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/parsing/UnparsablePacket.java rename to smack-core/src/main/java/org/jivesoftware/smack/parsing/UnparsablePacket.java diff --git a/core/src/main/java/org/jivesoftware/smack/provider/AbstractProviderInfo.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/AbstractProviderInfo.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/provider/AbstractProviderInfo.java rename to smack-core/src/main/java/org/jivesoftware/smack/provider/AbstractProviderInfo.java diff --git a/core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java rename to smack-core/src/main/java/org/jivesoftware/smack/provider/EmbeddedExtensionProvider.java diff --git a/core/src/main/java/org/jivesoftware/smack/provider/ExtensionProviderInfo.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/ExtensionProviderInfo.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/provider/ExtensionProviderInfo.java rename to smack-core/src/main/java/org/jivesoftware/smack/provider/ExtensionProviderInfo.java diff --git a/core/src/main/java/org/jivesoftware/smack/provider/IQProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/IQProvider.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/provider/IQProvider.java rename to smack-core/src/main/java/org/jivesoftware/smack/provider/IQProvider.java diff --git a/core/src/main/java/org/jivesoftware/smack/provider/IQProviderInfo.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/IQProviderInfo.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/provider/IQProviderInfo.java rename to smack-core/src/main/java/org/jivesoftware/smack/provider/IQProviderInfo.java diff --git a/core/src/main/java/org/jivesoftware/smack/provider/PacketExtensionProvider.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/PacketExtensionProvider.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/provider/PacketExtensionProvider.java rename to smack-core/src/main/java/org/jivesoftware/smack/provider/PacketExtensionProvider.java diff --git a/core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java rename to smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderFileLoader.java diff --git a/core/src/main/java/org/jivesoftware/smack/provider/ProviderLoader.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderLoader.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/provider/ProviderLoader.java rename to smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderLoader.java diff --git a/core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java b/smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java rename to smack-core/src/main/java/org/jivesoftware/smack/provider/ProviderManager.java diff --git a/core/src/main/java/org/jivesoftware/smack/provider/package.html b/smack-core/src/main/java/org/jivesoftware/smack/provider/package.html similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/provider/package.html rename to smack-core/src/main/java/org/jivesoftware/smack/provider/package.html diff --git a/core/src/main/java/org/jivesoftware/smack/proxy/DirectSocketFactory.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/DirectSocketFactory.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/proxy/DirectSocketFactory.java rename to smack-core/src/main/java/org/jivesoftware/smack/proxy/DirectSocketFactory.java diff --git a/core/src/main/java/org/jivesoftware/smack/proxy/HTTPProxySocketFactory.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/HTTPProxySocketFactory.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/proxy/HTTPProxySocketFactory.java rename to smack-core/src/main/java/org/jivesoftware/smack/proxy/HTTPProxySocketFactory.java diff --git a/core/src/main/java/org/jivesoftware/smack/proxy/ProxyException.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyException.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/proxy/ProxyException.java rename to smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyException.java diff --git a/core/src/main/java/org/jivesoftware/smack/proxy/ProxyInfo.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyInfo.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/proxy/ProxyInfo.java rename to smack-core/src/main/java/org/jivesoftware/smack/proxy/ProxyInfo.java diff --git a/core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketFactory.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketFactory.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketFactory.java rename to smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks4ProxySocketFactory.java diff --git a/core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketFactory.java b/smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketFactory.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketFactory.java rename to smack-core/src/main/java/org/jivesoftware/smack/proxy/Socks5ProxySocketFactory.java diff --git a/core/src/main/java/org/jivesoftware/smack/sasl/SASLAnonymous.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLAnonymous.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/sasl/SASLAnonymous.java rename to smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLAnonymous.java diff --git a/core/src/main/java/org/jivesoftware/smack/sasl/SASLCramMD5Mechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLCramMD5Mechanism.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/sasl/SASLCramMD5Mechanism.java rename to smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLCramMD5Mechanism.java diff --git a/core/src/main/java/org/jivesoftware/smack/sasl/SASLDigestMD5Mechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLDigestMD5Mechanism.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/sasl/SASLDigestMD5Mechanism.java rename to smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLDigestMD5Mechanism.java diff --git a/core/src/main/java/org/jivesoftware/smack/sasl/SASLError.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLError.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/sasl/SASLError.java rename to smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLError.java diff --git a/core/src/main/java/org/jivesoftware/smack/sasl/SASLErrorException.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLErrorException.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/sasl/SASLErrorException.java rename to smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLErrorException.java diff --git a/core/src/main/java/org/jivesoftware/smack/sasl/SASLExternalMechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLExternalMechanism.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/sasl/SASLExternalMechanism.java rename to smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLExternalMechanism.java diff --git a/core/src/main/java/org/jivesoftware/smack/sasl/SASLGSSAPIMechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLGSSAPIMechanism.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/sasl/SASLGSSAPIMechanism.java rename to smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLGSSAPIMechanism.java diff --git a/core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java rename to smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLMechanism.java diff --git a/core/src/main/java/org/jivesoftware/smack/sasl/SASLPlainMechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLPlainMechanism.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/sasl/SASLPlainMechanism.java rename to smack-core/src/main/java/org/jivesoftware/smack/sasl/SASLPlainMechanism.java diff --git a/core/src/main/java/org/jivesoftware/smack/sasl/package.html b/smack-core/src/main/java/org/jivesoftware/smack/sasl/package.html similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/sasl/package.html rename to smack-core/src/main/java/org/jivesoftware/smack/sasl/package.html diff --git a/core/src/main/java/org/jivesoftware/smack/util/Base32Encoder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/Base32Encoder.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/Base32Encoder.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/Base32Encoder.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/Base64.java b/smack-core/src/main/java/org/jivesoftware/smack/util/Base64.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/Base64.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/Base64.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/Base64Encoder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/Base64Encoder.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/Base64Encoder.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/Base64Encoder.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/Base64FileUrlEncoder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/Base64FileUrlEncoder.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/Base64FileUrlEncoder.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/Base64FileUrlEncoder.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/Cache.java b/smack-core/src/main/java/org/jivesoftware/smack/util/Cache.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/Cache.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/Cache.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/DNSUtil.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/FileUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/FileUtils.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/FileUtils.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/FileUtils.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/LazyStringBuilder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/LazyStringBuilder.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/LazyStringBuilder.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/LazyStringBuilder.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/ObservableReader.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ObservableReader.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/ObservableReader.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/ObservableReader.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/ObservableWriter.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ObservableWriter.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/ObservableWriter.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/ObservableWriter.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/ReaderListener.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ReaderListener.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/ReaderListener.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/ReaderListener.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/StringEncoder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/StringEncoder.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/StringEncoder.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/StringEncoder.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/StringUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/StringUtils.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/WriterListener.java b/smack-core/src/main/java/org/jivesoftware/smack/util/WriterListener.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/WriterListener.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/WriterListener.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/XmppDateTime.java b/smack-core/src/main/java/org/jivesoftware/smack/util/XmppDateTime.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/XmppDateTime.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/XmppDateTime.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/dns/DNSResolver.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/dns/HostAddress.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java b/smack-core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java rename to smack-core/src/main/java/org/jivesoftware/smack/util/dns/SRVRecord.java diff --git a/core/src/main/java/org/jivesoftware/smack/util/package.html b/smack-core/src/main/java/org/jivesoftware/smack/util/package.html similarity index 100% rename from core/src/main/java/org/jivesoftware/smack/util/package.html rename to smack-core/src/main/java/org/jivesoftware/smack/util/package.html diff --git a/core/src/main/resources/org.jivesoftware.smack/jul.properties b/smack-core/src/main/resources/org.jivesoftware.smack/jul.properties similarity index 100% rename from core/src/main/resources/org.jivesoftware.smack/jul.properties rename to smack-core/src/main/resources/org.jivesoftware.smack/jul.properties diff --git a/core/src/main/resources/org.jivesoftware.smack/smack-config.xml b/smack-core/src/main/resources/org.jivesoftware.smack/smack-config.xml similarity index 100% rename from core/src/main/resources/org.jivesoftware.smack/smack-config.xml rename to smack-core/src/main/resources/org.jivesoftware.smack/smack-config.xml diff --git a/core/src/test/java/org/jivesoftware/smack/ChatConnectionTest.java b/smack-core/src/test/java/org/jivesoftware/smack/ChatConnectionTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/ChatConnectionTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/ChatConnectionTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/DirectoryRosterStoreTest.java b/smack-core/src/test/java/org/jivesoftware/smack/DirectoryRosterStoreTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/DirectoryRosterStoreTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/DirectoryRosterStoreTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/DummyConnection.java b/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/DummyConnection.java rename to smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java diff --git a/core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java b/smack-core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/RosterTest.java b/smack-core/src/test/java/org/jivesoftware/smack/RosterTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/RosterTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/RosterTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java b/smack-core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/RosterVersioningTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/SmackConfigurationTest.java b/smack-core/src/test/java/org/jivesoftware/smack/SmackConfigurationTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/SmackConfigurationTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/SmackConfigurationTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java b/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java rename to smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java diff --git a/core/src/test/java/org/jivesoftware/smack/filters/FromMatchesFilterTest.java b/smack-core/src/test/java/org/jivesoftware/smack/filters/FromMatchesFilterTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/filters/FromMatchesFilterTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/filters/FromMatchesFilterTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/packet/IQResponseTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/IQResponseTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/packet/IQResponseTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/packet/IQResponseTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/packet/StreamErrorTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/StreamErrorTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/packet/StreamErrorTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/packet/StreamErrorTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java b/smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/parsing/ParsingExceptionTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java b/smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/provider/ProviderConfigTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java b/smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java rename to smack-core/src/test/java/org/jivesoftware/smack/test/util/TestUtils.java diff --git a/core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/util/StringUtilsTest.java diff --git a/core/src/test/java/org/jivesoftware/smack/util/XmppDateTimeTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/XmppDateTimeTest.java similarity index 100% rename from core/src/test/java/org/jivesoftware/smack/util/XmppDateTimeTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/util/XmppDateTimeTest.java diff --git a/core/src/test/resources/test.providers b/smack-core/src/test/resources/test.providers similarity index 100% rename from core/src/test/resources/test.providers rename to smack-core/src/test/resources/test.providers diff --git a/smack-debug/build.gradle b/smack-debug/build.gradle new file mode 100644 index 000000000..86a2bb290 --- /dev/null +++ b/smack-debug/build.gradle @@ -0,0 +1,8 @@ +description = """\ +Smack GUI debugger. +Inspect the exchanged XMPP stanzas.""" + +dependencies { + compile project(':smack-core') + testCompile project(':smack-core').sourceSets.test.runtimeClasspath +} diff --git a/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java similarity index 100% rename from debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java rename to smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java diff --git a/debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java similarity index 100% rename from debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java rename to smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebuggerWindow.java diff --git a/debug/src/main/java/org/jivesoftware/smackx/debugger/package.html b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/package.html similarity index 100% rename from debug/src/main/java/org/jivesoftware/smackx/debugger/package.html rename to smack-debug/src/main/java/org/jivesoftware/smackx/debugger/package.html diff --git a/debug/src/main/resources/message.png b/smack-debug/src/main/resources/message.png similarity index 100% rename from debug/src/main/resources/message.png rename to smack-debug/src/main/resources/message.png diff --git a/debug/src/main/resources/nav_left_blue.png b/smack-debug/src/main/resources/nav_left_blue.png similarity index 100% rename from debug/src/main/resources/nav_left_blue.png rename to smack-debug/src/main/resources/nav_left_blue.png diff --git a/debug/src/main/resources/nav_right_red.png b/smack-debug/src/main/resources/nav_right_red.png similarity index 100% rename from debug/src/main/resources/nav_right_red.png rename to smack-debug/src/main/resources/nav_right_red.png diff --git a/debug/src/main/resources/photo_portrait.png b/smack-debug/src/main/resources/photo_portrait.png similarity index 100% rename from debug/src/main/resources/photo_portrait.png rename to smack-debug/src/main/resources/photo_portrait.png diff --git a/debug/src/main/resources/question_and_answer.png b/smack-debug/src/main/resources/question_and_answer.png similarity index 100% rename from debug/src/main/resources/question_and_answer.png rename to smack-debug/src/main/resources/question_and_answer.png diff --git a/debug/src/main/resources/trafficlight_green.png b/smack-debug/src/main/resources/trafficlight_green.png similarity index 100% rename from debug/src/main/resources/trafficlight_green.png rename to smack-debug/src/main/resources/trafficlight_green.png diff --git a/debug/src/main/resources/trafficlight_off.png b/smack-debug/src/main/resources/trafficlight_off.png similarity index 100% rename from debug/src/main/resources/trafficlight_off.png rename to smack-debug/src/main/resources/trafficlight_off.png diff --git a/debug/src/main/resources/trafficlight_red.png b/smack-debug/src/main/resources/trafficlight_red.png similarity index 100% rename from debug/src/main/resources/trafficlight_red.png rename to smack-debug/src/main/resources/trafficlight_red.png diff --git a/debug/src/main/resources/unknown.png b/smack-debug/src/main/resources/unknown.png similarity index 100% rename from debug/src/main/resources/unknown.png rename to smack-debug/src/main/resources/unknown.png diff --git a/debug/src/main/resources/warning.png b/smack-debug/src/main/resources/warning.png similarity index 100% rename from debug/src/main/resources/warning.png rename to smack-debug/src/main/resources/warning.png diff --git a/experimental/build.gradle b/smack-experimental/build.gradle similarity index 63% rename from experimental/build.gradle rename to smack-experimental/build.gradle index b1406b676..7108c646b 100644 --- a/experimental/build.gradle +++ b/smack-experimental/build.gradle @@ -5,7 +5,7 @@ otherwise carefully considered for deployment. The API may change even between patch versions.""" dependencies { - compile project(':core') - compile project(':extensions') - testCompile project(':core').sourceSets.test.runtimeClasspath + compile project(':smack-core') + compile project(':smack-extensions') + testCompile project(':smack-core').sourceSets.test.runtimeClasspath } diff --git a/experimental/src/main/java/org/jivesoftware/smackx/ExperimentalProviderInitializer.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/ExperimentalProviderInitializer.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/ExperimentalProviderInitializer.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/ExperimentalProviderInitializer.java diff --git a/experimental/src/main/java/org/jivesoftware/smackx/ExperimentalStartupClasses.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/ExperimentalStartupClasses.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/ExperimentalStartupClasses.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/ExperimentalStartupClasses.java diff --git a/experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/CarbonManager.java diff --git a/experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java diff --git a/experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/provider/CarbonManagerProvider.java diff --git a/experimental/src/main/java/org/jivesoftware/smackx/hoxt/HOXTManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/HOXTManager.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/hoxt/HOXTManager.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/HOXTManager.java diff --git a/experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java diff --git a/experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java diff --git a/experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/HttpMethod.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/HttpMethod.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/HttpMethod.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/HttpMethod.java diff --git a/experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/HttpOverXmppReq.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/HttpOverXmppReq.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/HttpOverXmppReq.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/HttpOverXmppReq.java diff --git a/experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/HttpOverXmppResp.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/HttpOverXmppResp.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/HttpOverXmppResp.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/HttpOverXmppResp.java diff --git a/experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProvider.java diff --git a/experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProvider.java diff --git a/experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProvider.java diff --git a/experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java similarity index 100% rename from experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java rename to smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProvider.java diff --git a/experimental/src/main/resources/org.jivesoftware.smackx/experimental.providers b/smack-experimental/src/main/resources/org.jivesoftware.smackx/experimental.providers similarity index 100% rename from experimental/src/main/resources/org.jivesoftware.smackx/experimental.providers rename to smack-experimental/src/main/resources/org.jivesoftware.smackx/experimental.providers diff --git a/experimental/src/main/resources/org.jivesoftware.smackx/extensions.xml b/smack-experimental/src/main/resources/org.jivesoftware.smackx/extensions.xml similarity index 100% rename from experimental/src/main/resources/org.jivesoftware.smackx/extensions.xml rename to smack-experimental/src/main/resources/org.jivesoftware.smackx/extensions.xml diff --git a/experimental/src/test/java/org/jivesoftware/smackx/ExperimentalProviderInitializerTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalProviderInitializerTest.java similarity index 100% rename from experimental/src/test/java/org/jivesoftware/smackx/ExperimentalProviderInitializerTest.java rename to smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalProviderInitializerTest.java diff --git a/experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java similarity index 100% rename from experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java rename to smack-experimental/src/test/java/org/jivesoftware/smackx/carbons/CarbonTest.java diff --git a/experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProviderTest.java similarity index 100% rename from experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProviderTest.java rename to smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/AbstractHttpOverXmppProviderTest.java diff --git a/experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProviderTest.java similarity index 100% rename from experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProviderTest.java rename to smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/Base64BinaryChunkProviderTest.java diff --git a/experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java similarity index 100% rename from experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java rename to smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppReqProviderTest.java diff --git a/experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProviderTest.java similarity index 100% rename from experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProviderTest.java rename to smack-experimental/src/test/java/org/jivesoftware/smackx/hoxt/provider/HttpOverXmppRespProviderTest.java diff --git a/extensions/build.gradle b/smack-extensions/build.gradle similarity index 74% rename from extensions/build.gradle rename to smack-extensions/build.gradle index a9c002822..67a5a09fd 100644 --- a/extensions/build.gradle +++ b/smack-extensions/build.gradle @@ -6,6 +6,6 @@ Classes and methods that implement support for the various XMPP XEPs // Note that the test dependencies (junit, …) are inferred from the // sourceSet.test of the core subproject dependencies { - compile project(':core') - testCompile project(':core').sourceSets.test.runtimeClasspath + compile project(':smack-core') + testCompile project(':smack-core').sourceSets.test.runtimeClasspath } diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/CompressionTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/CompressionTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/CompressionTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/CompressionTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/FileTransferTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/FileTransferTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/FileTransferTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/FileTransferTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/FormTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/FormTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/FormTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/FormTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/GroupChatInvitationTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/GroupChatInvitationTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/GroupChatInvitationTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/GroupChatInvitationTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/LastActivityManagerTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/LastActivityManagerTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/LastActivityManagerTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/LastActivityManagerTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/MessageEventManagerTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/MessageEventManagerTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/MessageEventManagerTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/MessageEventManagerTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/MessageEventTests.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/MessageEventTests.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/MessageEventTests.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/MessageEventTests.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/MultipleRecipientManagerTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/MultipleRecipientManagerTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/MultipleRecipientManagerTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/MultipleRecipientManagerTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/OfflineMessageManagerTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/OfflineMessageManagerTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/OfflineMessageManagerTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/OfflineMessageManagerTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/RosterExchangeManagerTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/RosterExchangeManagerTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/RosterExchangeManagerTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/RosterExchangeManagerTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/RosterExchangeTests.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/RosterExchangeTests.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/RosterExchangeTests.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/RosterExchangeTests.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/ServiceDiscoveryManagerTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/SharedGroupsTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/SharedGroupsTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/SharedGroupsTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/SharedGroupsTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/VCardTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/VCardTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/VCardTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/VCardTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/VersionTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/VersionTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/VersionTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/VersionTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLManagerTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLManagerTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLManagerTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLManagerTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLSupportTests.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLSupportTests.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLSupportTests.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLSupportTests.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/commands/AdHocCommandDiscoTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/commands/AdHocCommandDiscoTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/commands/AdHocCommandDiscoTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/commands/AdHocCommandDiscoTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/entitycaps/EntityCapsTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/entitycaps/EntityCapsTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/entitycaps/EntityCapsTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/entitycaps/EntityCapsTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatCreationTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatCreationTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatCreationTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatCreationTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/packet/MessageEventTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/MessageEventTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/packet/MessageEventTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/MessageEventTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/packet/RosterExchangeTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/RosterExchangeTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/packet/RosterExchangeTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/RosterExchangeTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/CarExtension.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/CarExtension.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/CarExtension.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/CarExtension.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/CarExtensionProvider.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/EntityUseCases.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/EntityUseCases.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/EntityUseCases.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/EntityUseCases.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/MultiUserSubscriptionUseCases.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/MultiUserSubscriptionUseCases.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/MultiUserSubscriptionUseCases.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/MultiUserSubscriptionUseCases.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/OwnerUseCases.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/OwnerUseCases.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/OwnerUseCases.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/OwnerUseCases.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/PublisherUseCases.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/PublisherUseCases.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/PublisherUseCases.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/PublisherUseCases.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/SubscriberUseCases.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/TestAPI.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/TestAPI.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/TestAPI.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/TestAPI.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/TestEvents.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/TestEvents.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/TestEvents.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/TestEvents.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/TestMessageContent.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/TestMessageContent.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/TestMessageContent.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/TestMessageContent.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/test/PubSubTestCase.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/test/PubSubTestCase.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/test/PubSubTestCase.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/test/PubSubTestCase.java diff --git a/extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/test/SingleUserTestCase.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/test/SingleUserTestCase.java similarity index 100% rename from extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/test/SingleUserTestCase.java rename to smack-extensions/src/integration-test/java/org/jivesoftware/smackx/pubsub/test/SingleUserTestCase.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ExtensionsProviderInitializer.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ExtensionsProviderInitializer.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/ExtensionsProviderInitializer.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/ExtensionsProviderInitializer.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ExtensionsStartupClasses.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ExtensionsStartupClasses.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/ExtensionsStartupClasses.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/ExtensionsStartupClasses.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientInfo.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/address/provider/MultipleAddressesProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPDeliverCondition.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPExpireAtCondition.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/amp/AMPManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/amp/AMPMatchResourceCondition.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/amp/provider/AMPExtensionProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedConference.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/BookmarkedURL.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/Bookmarks.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bookmarks/SharedBookmark.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/SharedBookmark.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bookmarks/SharedBookmark.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bookmarks/SharedBookmark.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamRequest.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/BytestreamSession.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/DataListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Close.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Data.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/Open.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/CloseIQProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/DataPacketProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamSession.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Client.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Proxy.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5Utils.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/provider/BytestreamsProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/caps/cache/EntityCapsPersistentCache.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/EntityCapsPersistentCache.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/caps/cache/EntityCapsPersistentCache.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/EntityCapsPersistentCache.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/caps/provider/CapsExtensionProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatState.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatState.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatState.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatState.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/ChatStateManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommand.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandNote.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandNote.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandNote.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandNote.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommand.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommandFactory.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommandFactory.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommandFactory.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/commands/LocalCommandFactory.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/commands/provider/AdHocCommandDataProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInfo.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInfo.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInfo.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInfoProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInfoProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInfoProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInfoProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInformationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInformationProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInformationProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/delay/provider/DelayInformationProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/disco/NodeInformationProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverInfo.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/disco/packet/DiscoverItems.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverInfoProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/disco/provider/DiscoverItemsProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferRequest.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IncomingFileTransfer.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IncomingFileTransfer.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IncomingFileTransfer.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IncomingFileTransfer.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/Socks5TransferNegotiator.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/forward/Forwarded.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/forward/provider/ForwardedProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/packet/LastActivity.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/DefaultPrivateData.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/packet/PrivateData.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/provider/PrivateDataProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/packet/Version.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/iqversion/provider/VersionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/provider/VersionProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/iqversion/provider/VersionProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/provider/VersionProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/provider/JivePropertiesExtensionProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Affiliate.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollector.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollector.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollector.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollector.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/DeafOccupantInterceptor.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/DeafOccupantInterceptor.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/DeafOccupantInterceptor.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/DeafOccupantInterceptor.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultParticipantStatusListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultParticipantStatusListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultParticipantStatusListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultParticipantStatusListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultUserStatusListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultUserStatusListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultUserStatusListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/DefaultUserStatusListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/DiscussionHistory.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/DiscussionHistory.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/DiscussionHistory.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/DiscussionHistory.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/HostedRoom.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/InvitationRejectionListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/PacketMultiplexListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/PacketMultiplexListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/PacketMultiplexListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/PacketMultiplexListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/ParticipantStatusListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/ParticipantStatusListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/ParticipantStatusListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/ParticipantStatusListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/RoomListenerMultiplexor.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomListenerMultiplexor.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/RoomListenerMultiplexor.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomListenerMultiplexor.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/SubjectUpdatedListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/UserStatusListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/UserStatusListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/UserStatusListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/UserStatusListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/package.html b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/package.html similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/package.html rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/package.html diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCAdminProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCOwnerProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/muc/provider/MUCUserProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageHeader.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageRequest.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPEvent.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPItem.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pep/packet/PEPPubSub.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pep/provider/PEPProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/provider/PEPProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pep/provider/PEPProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pep/provider/PEPProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ping/PingFailedListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingFailedListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/ping/PingFailedListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingFailedListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Ping.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Ping.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Ping.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Ping.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Pong.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Pong.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Pong.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/ping/packet/Pong.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/ping/provider/PingProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyList.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyList.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyList.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyList.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/Privacy.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/packet/PrivacyItem.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/provider/PrivacyProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/AccessModel.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/AccessModel.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/AccessModel.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/AccessModel.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/AffiliationsExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/AffiliationsExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/AffiliationsExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/AffiliationsExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ChildrenAssociationPolicy.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ChildrenAssociationPolicy.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/ChildrenAssociationPolicy.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ChildrenAssociationPolicy.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/CollectionNode.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigurationEvent.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigurationEvent.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigurationEvent.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigurationEvent.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureForm.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureNodeFields.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureNodeFields.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureNodeFields.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ConfigureNodeFields.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EmbeddedPacketExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EmbeddedPacketExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/EmbeddedPacketExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EmbeddedPacketExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElementType.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElementType.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElementType.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElementType.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNodeType.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNodeType.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNodeType.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNodeType.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormType.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormType.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormType.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormType.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/GetItemsRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/GetItemsRequest.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/GetItemsRequest.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/GetItemsRequest.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemDeleteEvent.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemDeleteEvent.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemDeleteEvent.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemDeleteEvent.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemPublishEvent.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemPublishEvent.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemPublishEvent.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemPublishEvent.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemReply.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemReply.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemReply.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemReply.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeEvent.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeEvent.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeEvent.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeEvent.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeType.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeType.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeType.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeType.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PresenceState.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PresenceState.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/PresenceState.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PresenceState.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubElementType.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubElementType.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubElementType.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubElementType.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishModel.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishModel.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishModel.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishModel.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeForm.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeOptionFields.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeOptionFields.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeOptionFields.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeOptionFields.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/Subscription.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Subscription.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/Subscription.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Subscription.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionEvent.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionEvent.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionEvent.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionEvent.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionsExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionsExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionsExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionsExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/UnsubscribeExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/UnsubscribeExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/UnsubscribeExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/UnsubscribeExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemDeleteListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemDeleteListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemDeleteListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemDeleteListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemEventListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemEventListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemEventListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/ItemEventListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/NodeConfigListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/NodeConfigListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/NodeConfigListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/listener/NodeConfigListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSub.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSubNamespace.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSubNamespace.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSubNamespace.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/packet/PubSubNamespace.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationsProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationsProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationsProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/AffiliationsProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ConfigEventProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ConfigEventProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ConfigEventProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ConfigEventProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/EventProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/FormNodeProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemsProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemsProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemsProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemsProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/PubSubProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/RetractEventProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/RetractEventProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/RetractEventProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/RetractEventProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SimpleNodeProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/SubscriptionsProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/NodeUtils.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/NodeUtils.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/NodeUtils.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/util/NodeUtils.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceipt.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceipt.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceipt.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceipt.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptRequest.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/ReceiptReceivedListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/search/ReportedData.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/search/SimpleUserSearch.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearchManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/packet/SharedGroupsInfo.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeaderProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeadersProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeadersProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeadersProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/shim/provider/HeadersProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/si/provider/StreamInitiationProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/time/packet/Time.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/time/packet/Time.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/time/packet/Time.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/time/packet/Time.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/packet/VCard.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/provider/VCardProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/Form.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/provider/DataFormProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xevent/DefaultMessageEventRequestListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xevent/DefaultMessageEventRequestListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/xevent/DefaultMessageEventRequestListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/xevent/DefaultMessageEventRequestListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventNotificationListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/xevent/MessageEventRequestListener.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLManager.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/XHTMLText.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java diff --git a/extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java similarity index 100% rename from extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProvider.java diff --git a/extensions/src/main/resources/org.jivesoftware.smackx/extensions.providers b/smack-extensions/src/main/resources/org.jivesoftware.smackx/extensions.providers similarity index 100% rename from extensions/src/main/resources/org.jivesoftware.smackx/extensions.providers rename to smack-extensions/src/main/resources/org.jivesoftware.smackx/extensions.providers diff --git a/extensions/src/main/resources/org.jivesoftware.smackx/extensions.xml b/smack-extensions/src/main/resources/org.jivesoftware.smackx/extensions.xml similarity index 100% rename from extensions/src/main/resources/org.jivesoftware.smackx/extensions.xml rename to smack-extensions/src/main/resources/org.jivesoftware.smackx/extensions.xml diff --git a/extensions/src/test/java/org/jivesoftware/smackx/ExtensionsProviderInitializerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/ExtensionsProviderInitializerTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/ExtensionsProviderInitializerTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/ExtensionsProviderInitializerTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/ExtensionsStartupClassesTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/ExtensionsStartupClassesTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/ExtensionsStartupClassesTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/ExtensionsStartupClassesTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/InitExtensions.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/InitExtensions.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/InitExtensions.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/InitExtensions.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/VCardUnitTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/VCardUnitTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/VCardUnitTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/VCardUnitTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/amp/AMPExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/amp/AMPExtensionTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/amp/AMPExtensionTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/amp/AMPExtensionTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBPacketUtils.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/IBBTestsSuite.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManagerTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/provider/OpenIQProviderTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamManagerTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamRequestTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiatorTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5PacketUtils.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ProxyTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/delay/provider/DelayInformationTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/forward/ForwardedTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/iqlast/LastActivityTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/iqlast/LastActivityTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/iqlast/LastActivityTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/iqlast/LastActivityTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/iqversion/VersionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/iqversion/VersionTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/iqversion/VersionTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/iqversion/VersionTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/jiveproperties/JivePropertiesExtensionTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollectorTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollectorTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollectorTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/muc/ConnectionDetachedPacketCollectorTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/muc/RoomInfoTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/ping/KeepaliveTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/ping/KeepaliveTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/ping/KeepaliveTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/ping/KeepaliveTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/ping/PingTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/privacy/provider/PrivacyProviderTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ConfigureFormTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/receipts/DeliveryReceiptTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/time/packet/TimeTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/time/packet/TimeTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/time/packet/TimeTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/time/packet/TimeTest.java diff --git a/extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProviderTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProviderTest.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProviderTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/xhtmlim/provider/XHTMLExtensionProviderTest.java diff --git a/extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java b/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java rename to smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java diff --git a/extensions/src/test/java/org/jivesoftware/util/Protocol.java b/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/util/Protocol.java rename to smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java diff --git a/extensions/src/test/java/org/jivesoftware/util/Verification.java b/smack-extensions/src/test/java/org/jivesoftware/util/Verification.java similarity index 100% rename from extensions/src/test/java/org/jivesoftware/util/Verification.java rename to smack-extensions/src/test/java/org/jivesoftware/util/Verification.java diff --git a/extensions/src/test/resources/org/jivesoftware/smackx/amp/correct_stanza_test.xml b/smack-extensions/src/test/resources/org/jivesoftware/smackx/amp/correct_stanza_test.xml similarity index 100% rename from extensions/src/test/resources/org/jivesoftware/smackx/amp/correct_stanza_test.xml rename to smack-extensions/src/test/resources/org/jivesoftware/smackx/amp/correct_stanza_test.xml diff --git a/extensions/src/test/resources/org/jivesoftware/smackx/amp/incorrect_stanza_test.xml b/smack-extensions/src/test/resources/org/jivesoftware/smackx/amp/incorrect_stanza_test.xml similarity index 100% rename from extensions/src/test/resources/org/jivesoftware/smackx/amp/incorrect_stanza_test.xml rename to smack-extensions/src/test/resources/org/jivesoftware/smackx/amp/incorrect_stanza_test.xml diff --git a/extensions/src/test/resources/org/jivesoftware/smackx/xhtmlim/provider/xhtml.xml b/smack-extensions/src/test/resources/org/jivesoftware/smackx/xhtmlim/provider/xhtml.xml similarity index 100% rename from extensions/src/test/resources/org/jivesoftware/smackx/xhtmlim/provider/xhtml.xml rename to smack-extensions/src/test/resources/org/jivesoftware/smackx/xhtmlim/provider/xhtml.xml diff --git a/jingle/build.gradle b/smack-jingle/build.gradle similarity index 63% rename from jingle/build.gradle rename to smack-jingle/build.gradle index 5ecd2cf8e..3e27ba851 100644 --- a/jingle/build.gradle +++ b/smack-jingle/build.gradle @@ -3,9 +3,9 @@ Smack Jingle API. Warning: This API is beta, outdated and currenlty unmaintained.""" dependencies { - compile project(':core') - compile project(':extensions') + compile project(':smack-core') + compile project(':smack-extensions') compile 'javax.media:jmf:2.1.1e' compile files('libs/jspeex-0.9.7-jfcom.jar', 'libs/jstun.jar', 'libs/Speex.jar') - testCompile project(':core').sourceSets.test.runtimeClasspath + testCompile project(':smack-core').sourceSets.test.runtimeClasspath } diff --git a/jingle/libs/Speex.jar b/smack-jingle/libs/Speex.jar similarity index 100% rename from jingle/libs/Speex.jar rename to smack-jingle/libs/Speex.jar diff --git a/jingle/libs/jspeex-0.9.7-jfcom.jar b/smack-jingle/libs/jspeex-0.9.7-jfcom.jar similarity index 100% rename from jingle/libs/jspeex-0.9.7-jfcom.jar rename to smack-jingle/libs/jspeex-0.9.7-jfcom.jar diff --git a/jingle/libs/jstun.jar b/smack-jingle/libs/jstun.jar similarity index 100% rename from jingle/libs/jstun.jar rename to smack-jingle/libs/jstun.jar diff --git a/jingle/libs/mac/0JavaSoundStream.fix.mac.jar b/smack-jingle/libs/mac/0JavaSoundStream.fix.mac.jar similarity index 100% rename from jingle/libs/mac/0JavaSoundStream.fix.mac.jar rename to smack-jingle/libs/mac/0JavaSoundStream.fix.mac.jar diff --git a/jingle/libs/mac/0jmf.mac.jar b/smack-jingle/libs/mac/0jmf.mac.jar similarity index 100% rename from jingle/libs/mac/0jmf.mac.jar rename to smack-jingle/libs/mac/0jmf.mac.jar diff --git a/jingle/libs/windows/jmacm.dll b/smack-jingle/libs/windows/jmacm.dll similarity index 100% rename from jingle/libs/windows/jmacm.dll rename to smack-jingle/libs/windows/jmacm.dll diff --git a/jingle/libs/windows/jmam.dll b/smack-jingle/libs/windows/jmam.dll similarity index 100% rename from jingle/libs/windows/jmam.dll rename to smack-jingle/libs/windows/jmam.dll diff --git a/jingle/libs/windows/jmcvid.dll b/smack-jingle/libs/windows/jmcvid.dll similarity index 100% rename from jingle/libs/windows/jmcvid.dll rename to smack-jingle/libs/windows/jmcvid.dll diff --git a/jingle/libs/windows/jmdaud.dll b/smack-jingle/libs/windows/jmdaud.dll similarity index 100% rename from jingle/libs/windows/jmdaud.dll rename to smack-jingle/libs/windows/jmdaud.dll diff --git a/jingle/libs/windows/jmdaudc.dll b/smack-jingle/libs/windows/jmdaudc.dll similarity index 100% rename from jingle/libs/windows/jmdaudc.dll rename to smack-jingle/libs/windows/jmdaudc.dll diff --git a/jingle/libs/windows/jmddraw.dll b/smack-jingle/libs/windows/jmddraw.dll similarity index 100% rename from jingle/libs/windows/jmddraw.dll rename to smack-jingle/libs/windows/jmddraw.dll diff --git a/jingle/libs/windows/jmfjawt.dll b/smack-jingle/libs/windows/jmfjawt.dll similarity index 100% rename from jingle/libs/windows/jmfjawt.dll rename to smack-jingle/libs/windows/jmfjawt.dll diff --git a/jingle/libs/windows/jmg723.dll b/smack-jingle/libs/windows/jmg723.dll similarity index 100% rename from jingle/libs/windows/jmg723.dll rename to smack-jingle/libs/windows/jmg723.dll diff --git a/jingle/libs/windows/jmgdi.dll b/smack-jingle/libs/windows/jmgdi.dll similarity index 100% rename from jingle/libs/windows/jmgdi.dll rename to smack-jingle/libs/windows/jmgdi.dll diff --git a/jingle/libs/windows/jmgsm.dll b/smack-jingle/libs/windows/jmgsm.dll similarity index 100% rename from jingle/libs/windows/jmgsm.dll rename to smack-jingle/libs/windows/jmgsm.dll diff --git a/jingle/libs/windows/jmh263enc.dll b/smack-jingle/libs/windows/jmh263enc.dll similarity index 100% rename from jingle/libs/windows/jmh263enc.dll rename to smack-jingle/libs/windows/jmh263enc.dll diff --git a/jingle/libs/windows/jmjpeg.dll b/smack-jingle/libs/windows/jmjpeg.dll similarity index 100% rename from jingle/libs/windows/jmjpeg.dll rename to smack-jingle/libs/windows/jmjpeg.dll diff --git a/jingle/libs/windows/jmmci.dll b/smack-jingle/libs/windows/jmmci.dll similarity index 100% rename from jingle/libs/windows/jmmci.dll rename to smack-jingle/libs/windows/jmmci.dll diff --git a/jingle/libs/windows/jmmpa.dll b/smack-jingle/libs/windows/jmmpa.dll similarity index 100% rename from jingle/libs/windows/jmmpa.dll rename to smack-jingle/libs/windows/jmmpa.dll diff --git a/jingle/libs/windows/jmmpegv.dll b/smack-jingle/libs/windows/jmmpegv.dll similarity index 100% rename from jingle/libs/windows/jmmpegv.dll rename to smack-jingle/libs/windows/jmmpegv.dll diff --git a/jingle/libs/windows/jmutil.dll b/smack-jingle/libs/windows/jmutil.dll similarity index 100% rename from jingle/libs/windows/jmutil.dll rename to smack-jingle/libs/windows/jmutil.dll diff --git a/jingle/libs/windows/jmvcm.dll b/smack-jingle/libs/windows/jmvcm.dll similarity index 100% rename from jingle/libs/windows/jmvcm.dll rename to smack-jingle/libs/windows/jmvcm.dll diff --git a/jingle/libs/windows/jmvfw.dll b/smack-jingle/libs/windows/jmvfw.dll similarity index 100% rename from jingle/libs/windows/jmvfw.dll rename to smack-jingle/libs/windows/jmvfw.dll diff --git a/jingle/libs/windows/jmvh263.dll b/smack-jingle/libs/windows/jmvh263.dll similarity index 100% rename from jingle/libs/windows/jmvh263.dll rename to smack-jingle/libs/windows/jmvh263.dll diff --git a/jingle/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java b/smack-jingle/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java similarity index 100% rename from jingle/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java rename to smack-jingle/src/demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java b/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java rename to smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java b/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java rename to smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSessionTest.java b/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSessionTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSessionTest.java rename to smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSessionTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSupportTests.java b/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSupportTests.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSupportTests.java rename to smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleSupportTests.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/PayloadTypeTest.java b/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/PayloadTypeTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/PayloadTypeTest.java rename to smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/PayloadTypeTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java b/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java rename to smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java b/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java rename to smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java b/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java rename to smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java b/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java rename to smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java b/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java rename to smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java b/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java rename to smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java diff --git a/jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java b/smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java similarity index 100% rename from jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java rename to smack-jingle/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java diff --git a/jingle/src/integration-test/resources/test-case.xml b/smack-jingle/src/integration-test/resources/test-case.xml similarity index 100% rename from jingle/src/integration-test/resources/test-case.xml rename to smack-jingle/src/integration-test/resources/test-case.xml diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleActionEnum.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleActionEnum.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleActionEnum.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleActionEnum.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleListener.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleListener.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleListener.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleListener.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/ContentInfo.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/ContentInfo.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/media/ContentInfo.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/ContentInfo.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/PayloadType.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/PayloadType.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/media/PayloadType.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/media/PayloadType.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/AbstractBufferedImageOp.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/AbstractBufferedImageOp.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/AbstractBufferedImageOp.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/AbstractBufferedImageOp.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/OctTreeQuantizer.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/OctTreeQuantizer.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/OctTreeQuantizer.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/OctTreeQuantizer.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/PixelUtils.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/PixelUtils.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/PixelUtils.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/PixelUtils.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/QuantizeFilter.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/QuantizeFilter.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/QuantizeFilter.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/QuantizeFilter.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/Quantizer.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/Quantizer.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/Quantizer.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/Quantizer.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/WholeImageFilter.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/WholeImageFilter.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/WholeImageFilter.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/WholeImageFilter.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicResolver.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicResolver.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicResolver.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicResolver.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/DatagramListener.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/DatagramListener.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/DatagramListener.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/DatagramListener.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedResolver.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedResolver.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedResolver.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedResolver.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/HttpServer.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/HttpServer.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/HttpServer.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/HttpServer.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICECandidate.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICECandidate.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICECandidate.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICECandidate.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ResultListener.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ResultListener.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ResultListener.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ResultListener.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TestResult.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TestResult.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TestResult.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TestResult.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolver.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolver.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolver.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolver.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/Jingle.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/Jingle.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/Jingle.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/Jingle.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContent.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContent.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContent.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContent.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentDescription.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentDescription.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentDescription.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentDescription.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentInfo.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentInfo.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentInfo.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleContentInfo.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleDescription.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleDescription.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleDescription.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleDescription.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleError.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleError.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleError.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleError.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleTransport.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleTransport.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleTransport.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/packet/JingleTransport.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentDescriptionProvider.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentInfoProvider.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentInfoProvider.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentInfoProvider.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentInfoProvider.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProvider.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProvider.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProvider.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleContentProvider.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleDescriptionProvider.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleDescriptionProvider.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleDescriptionProvider.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleDescriptionProvider.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleProvider.java diff --git a/jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleTransportProvider.java b/smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleTransportProvider.java similarity index 100% rename from jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleTransportProvider.java rename to smack-jingle/src/main/java/org/jivesoftware/smackx/jingle/provider/JingleTransportProvider.java diff --git a/legacy/build.gradle b/smack-legacy/build.gradle similarity index 56% rename from legacy/build.gradle rename to smack-legacy/build.gradle index b4ed05c12..3faa82487 100644 --- a/legacy/build.gradle +++ b/smack-legacy/build.gradle @@ -4,7 +4,7 @@ Usually XEPs in the state 'retracted', 'rejected', 'deprecated', 'obsolete' or in a long standing 'deferred' state.""" dependencies { - compile project(':core') - compile project(':extensions') - testCompile project(':core').sourceSets.test.runtimeClasspath + compile project(':smack-core') + compile project(':smack-extensions') + testCompile project(':smack-core').sourceSets.test.runtimeClasspath } diff --git a/legacy/src/main/java/org/jivesoftware/smackx/LegacyProviderInitializer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/LegacyProviderInitializer.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/LegacyProviderInitializer.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/LegacyProviderInitializer.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/WorkgroupProviderInitializer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/WorkgroupProviderInitializer.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/WorkgroupProviderInitializer.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/WorkgroupProviderInitializer.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/QueueUser.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/QueueUser.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/QueueUser.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/QueueUser.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitation.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitation.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitation.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/WorkgroupInvitationListener.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRosterListener.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmationListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmationListener.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmationListener.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmationListener.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferContent.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferContent.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferContent.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferContent.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferListener.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferListener.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferListener.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/QueueUsersListener.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/RevokedOffer.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/UserRequest.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/UserRequest.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/UserRequest.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/UserRequest.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/WorkgroupQueue.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/WorkgroupQueue.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/WorkgroupQueue.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/WorkgroupQueue.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatSession.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatSession.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatSession.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatSession.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macro.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macro.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macro.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macro.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/MacroGroup.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/DepartQueuePacket.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcripts.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcripts.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcripts.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcripts.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSetting.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSetting.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSetting.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSetting.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/QueueListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/QueueListener.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/QueueListener.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/QueueListener.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ModelUtil.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ModelUtil.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ModelUtil.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ModelUtil.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RemoteRosterEntry.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeListener.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java diff --git a/legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java similarity index 100% rename from legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java rename to smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java diff --git a/legacy/src/main/resources/org.jivesoftware.smackx/legacy.providers b/smack-legacy/src/main/resources/org.jivesoftware.smackx/legacy.providers similarity index 100% rename from legacy/src/main/resources/org.jivesoftware.smackx/legacy.providers rename to smack-legacy/src/main/resources/org.jivesoftware.smackx/legacy.providers diff --git a/legacy/src/main/resources/org.jivesoftware.smackx/workgroup.providers b/smack-legacy/src/main/resources/org.jivesoftware.smackx/workgroup.providers similarity index 100% rename from legacy/src/main/resources/org.jivesoftware.smackx/workgroup.providers rename to smack-legacy/src/main/resources/org.jivesoftware.smackx/workgroup.providers diff --git a/legacy/src/test/java/org/jivesoftware/smackx/LegacyProviderInitializerTest.java b/smack-legacy/src/test/java/org/jivesoftware/smackx/LegacyProviderInitializerTest.java similarity index 100% rename from legacy/src/test/java/org/jivesoftware/smackx/LegacyProviderInitializerTest.java rename to smack-legacy/src/test/java/org/jivesoftware/smackx/LegacyProviderInitializerTest.java diff --git a/legacy/src/test/java/org/jivesoftware/smackx/WorkgroupProviderInitializerTest.java b/smack-legacy/src/test/java/org/jivesoftware/smackx/WorkgroupProviderInitializerTest.java similarity index 100% rename from legacy/src/test/java/org/jivesoftware/smackx/WorkgroupProviderInitializerTest.java rename to smack-legacy/src/test/java/org/jivesoftware/smackx/WorkgroupProviderInitializerTest.java diff --git a/resolver-dnsjava/build.gradle b/smack-resolver-dnsjava/build.gradle similarity index 76% rename from resolver-dnsjava/build.gradle rename to smack-resolver-dnsjava/build.gradle index a20e7ca3b..34624bd4d 100644 --- a/resolver-dnsjava/build.gradle +++ b/smack-resolver-dnsjava/build.gradle @@ -4,6 +4,6 @@ Use dnsjava for DNS SRV lookups. For platforms that don't provide the javax.naming API (e.g. Android).""" dependencies { - compile project(path: ':core', configuration: 'dns') + compile project(path: ':smack-core', configuration: 'dns') compile 'dnsjava:dnsjava:2.1.+' } diff --git a/resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/DNSJavaResolver.java b/smack-resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/DNSJavaResolver.java similarity index 100% rename from resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/DNSJavaResolver.java rename to smack-resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/DNSJavaResolver.java diff --git a/resolver-javax/build.gradle b/smack-resolver-javax/build.gradle similarity index 71% rename from resolver-javax/build.gradle rename to smack-resolver-javax/build.gradle index 60b833c38..e004ae1ea 100644 --- a/resolver-javax/build.gradle +++ b/smack-resolver-javax/build.gradle @@ -4,5 +4,5 @@ Use javax.naming for DNS SRV lookups. The javax.naming API is availabe in JavaSE since Java7.""" dependencies { - compile project(path: ':core', configuration: 'dns') + compile project(path: ':smack-core', configuration: 'dns') } diff --git a/resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/JavaxResolver.java b/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/JavaxResolver.java similarity index 100% rename from resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/JavaxResolver.java rename to smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/JavaxResolver.java diff --git a/smack-tcp/build.gradle b/smack-tcp/build.gradle new file mode 100644 index 000000000..03eb40af3 --- /dev/null +++ b/smack-tcp/build.gradle @@ -0,0 +1,7 @@ +description = """\ +Smack for standard XMPP connections over TCP.""" + +dependencies { + compile project(':smack-core') + testCompile project(':smack-core').sourceSets.test.runtimeClasspath +} diff --git a/tcp/src/main/java/org/jivesoftware/smack/PacketReader.java b/smack-tcp/src/main/java/org/jivesoftware/smack/PacketReader.java similarity index 100% rename from tcp/src/main/java/org/jivesoftware/smack/PacketReader.java rename to smack-tcp/src/main/java/org/jivesoftware/smack/PacketReader.java diff --git a/tcp/src/main/java/org/jivesoftware/smack/PacketWriter.java b/smack-tcp/src/main/java/org/jivesoftware/smack/PacketWriter.java similarity index 100% rename from tcp/src/main/java/org/jivesoftware/smack/PacketWriter.java rename to smack-tcp/src/main/java/org/jivesoftware/smack/PacketWriter.java diff --git a/tcp/src/main/java/org/jivesoftware/smack/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/XMPPTCPConnection.java similarity index 100% rename from tcp/src/main/java/org/jivesoftware/smack/XMPPTCPConnection.java rename to smack-tcp/src/main/java/org/jivesoftware/smack/XMPPTCPConnection.java diff --git a/tcp/src/test/java/org/jivesoftware/smack/RosterOfflineTest.java b/smack-tcp/src/test/java/org/jivesoftware/smack/RosterOfflineTest.java similarity index 100% rename from tcp/src/test/java/org/jivesoftware/smack/RosterOfflineTest.java rename to smack-tcp/src/test/java/org/jivesoftware/smack/RosterOfflineTest.java diff --git a/tcp/build.gradle b/tcp/build.gradle deleted file mode 100644 index fa628d4a5..000000000 --- a/tcp/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -description = """\ -Smack for standard XMPP connections over TCP.""" - -dependencies { - compile project(':core') - testCompile project(':core').sourceSets.test.runtimeClasspath -}