Prefix subprojects with 'smack-'

instead of using the old baseName=smack appendix=project.name approach,
we are now going convention over configuration and renaming the
subprojects directories to the proper name.

Having a prefix is actually very helpful, because the resulting
libraries will be named like the subproject. And a core-4.0.0-rc1.jar is
not as explicit about what it actually *is* as a
smack-core-4.0.0-rc1.jar.

SMACK-265
filetransferTypos
Florian Schmaus 8 years ago
parent b6fb1f3743
commit 91fd15ad86
  1. 2
      build.gradle
  2. 8
      debug/build.gradle
  3. 22
      settings.gradle
  4. 2
      smack-bosh/build.gradle
  5. 0
      smack-bosh/src/main/java/org/jivesoftware/smack/BOSHConfiguration.java
  6. 0
      smack-bosh/src/main/java/org/jivesoftware/smack/BOSHPacketReader.java
  7. 0
      smack-bosh/src/main/java/org/jivesoftware/smack/XMPPBOSHConnection.java
  8. 2
      smack-compression-jzlib/build.gradle
  9. 0
      smack-compression-jzlib/src/main/java/org/jivesoftware/smack/compression/JzlibInputOutputStream.java
  10. 0
      smack-core/.gitignore
  11. 0
      smack-core/build.gradle
  12. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/ChatTest.java
  13. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/FloodTest.java
  14. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/IQTest.java
  15. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/LoginTest.java
  16. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/MessageTest.java
  17. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/PacketReaderTest.java
  18. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/PresenceTest.java
  19. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/PrivacyClient.java
  20. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/ReconnectionTest.java
  21. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/RosterInitializedBeforeConnectTest.java
  22. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/RosterListenerTest.java
  23. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/RosterSmackTest.java
  24. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/filter/AndFilterTest.java
  25. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/filter/FromContainsFilterTest.java
  26. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/filter/NotFilterTest.java
  27. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/filter/OrFilterTest.java
  28. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/filter/PacketIDFilterTest.java
  29. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/filter/PacketTypeFilterTest.java
  30. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/filter/ToContainsFilterTest.java
  31. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/packet/MockPacket.java
  32. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/packet/MockPacketFilter.java
  33. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyProviderTest.java
  34. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/packet/PrivacyTest.java
  35. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/test/SmackTestCase.java
  36. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/util/CacheTest.java
  37. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/util/ConnectionUtils.java
  38. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/util/DNSUtilTest.java
  39. 0
      smack-core/src/integration-test/java/org/jivesoftware/smack/util/XMPPErrorTest.java
  40. 0
      smack-core/src/integration-test/resources/test-case.example.xml
  41. 0
      smack-core/src/main/java/org/jivesoftware/smack/AbstractConnectionListener.java
  42. 0
      smack-core/src/main/java/org/jivesoftware/smack/AccountManager.java
  43. 0
      smack-core/src/main/java/org/jivesoftware/smack/Chat.java
  44. 0
      smack-core/src/main/java/org/jivesoftware/smack/ChatManager.java
  45. 0
      smack-core/src/main/java/org/jivesoftware/smack/ChatManagerListener.java
  46. 0
      smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
  47. 0
      smack-core/src/main/java/org/jivesoftware/smack/ConnectionCreationListener.java
  48. 0
      smack-core/src/main/java/org/jivesoftware/smack/ConnectionListener.java
  49. 0
      smack-core/src/main/java/org/jivesoftware/smack/DirectoryRosterStore.java
  50. 0
      smack-core/src/main/java/org/jivesoftware/smack/Manager.java
  51. 0
      smack-core/src/main/java/org/jivesoftware/smack/MessageListener.java
  52. 0
      smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java
  53. 0
      smack-core/src/main/java/org/jivesoftware/smack/PacketInterceptor.java
  54. 0
      smack-core/src/main/java/org/jivesoftware/smack/PacketListener.java
  55. 0
      smack-core/src/main/java/org/jivesoftware/smack/ReconnectionManager.java
  56. 0
      smack-core/src/main/java/org/jivesoftware/smack/Roster.java
  57. 0
      smack-core/src/main/java/org/jivesoftware/smack/RosterEntry.java
  58. 0
      smack-core/src/main/java/org/jivesoftware/smack/RosterGroup.java
  59. 0
      smack-core/src/main/java/org/jivesoftware/smack/RosterListener.java
  60. 0
      smack-core/src/main/java/org/jivesoftware/smack/RosterStore.java
  61. 0
      smack-core/src/main/java/org/jivesoftware/smack/SASLAuthentication.java
  62. 0
      smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java
  63. 0
      smack-core/src/main/java/org/jivesoftware/smack/SmackException.java
  64. 0
      smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
  65. 0
      smack-core/src/main/java/org/jivesoftware/smack/XMPPException.java
  66. 0
      smack-core/src/main/java/org/jivesoftware/smack/compression/Java7ZlibInputOutputStream.java
  67. 0
      smack-core/src/main/java/org/jivesoftware/smack/compression/XMPPInputOutputStream.java
  68. 0
      smack-core/src/main/java/org/jivesoftware/smack/debugger/ConsoleDebugger.java
  69. 0
      smack-core/src/main/java/org/jivesoftware/smack/debugger/LiteDebugger.java
  70. 0
      smack-core/src/main/java/org/jivesoftware/smack/debugger/SmackDebugger.java
  71. 0
      smack-core/src/main/java/org/jivesoftware/smack/debugger/package.html
  72. 0
      smack-core/src/main/java/org/jivesoftware/smack/filter/AndFilter.java
  73. 0
      smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java
  74. 0
      smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java
  75. 0
      smack-core/src/main/java/org/jivesoftware/smack/filter/IQTypeFilter.java
  76. 0
      smack-core/src/main/java/org/jivesoftware/smack/filter/MessageTypeFilter.java
  77. 0
      smack-core/src/main/java/org/jivesoftware/smack/filter/NotFilter.java
  78. 0
      smack-core/src/main/java/org/jivesoftware/smack/filter/OrFilter.java
  79. 0
      smack-core/src/main/java/org/jivesoftware/smack/filter/PacketExtensionFilter.java
  80. 0
      smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java
  81. 0
      smack-core/src/main/java/org/jivesoftware/smack/filter/PacketIDFilter.java
  82. 0
      smack-core/src/main/java/org/jivesoftware/smack/filter/PacketTypeFilter.java
  83. 0
      smack-core/src/main/java/org/jivesoftware/smack/filter/ThreadFilter.java
  84. 0
      smack-core/src/main/java/org/jivesoftware/smack/filter/package.html
  85. 0
      smack-core/src/main/java/org/jivesoftware/smack/initializer/LoggingInitializer.java
  86. 0
      smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java
  87. 0
      smack-core/src/main/java/org/jivesoftware/smack/initializer/UrlProviderFileInitializer.java
  88. 0
      smack-core/src/main/java/org/jivesoftware/smack/initializer/VmArgInitializer.java
  89. 0
      smack-core/src/main/java/org/jivesoftware/smack/package.html
  90. 0
      smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java
  91. 0
      smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultPacketExtension.java
  92. 0
      smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java
  93. 0
      smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java
  94. 0
      smack-core/src/main/java/org/jivesoftware/smack/packet/Packet.java
  95. 0
      smack-core/src/main/java/org/jivesoftware/smack/packet/PacketExtension.java
  96. 0
      smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java
  97. 0
      smack-core/src/main/java/org/jivesoftware/smack/packet/Registration.java
  98. 0
      smack-core/src/main/java/org/jivesoftware/smack/packet/RosterPacket.java
  99. 0
      smack-core/src/main/java/org/jivesoftware/smack/packet/Session.java
  100. 0
      smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java
  101. Some files were not shown because too many files have changed in this diff Show More

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

@ -1,8 +0,0 @@
description = """\
Smack GUI debugger.
Inspect the exchanged XMPP stanzas."""
dependencies {
compile project(':core')
testCompile project(':core').sourceSets.test.runtimeClasspath
}

@ -1,11 +1,11 @@
include 'core',
'tcp',
'extensions',
'experimental',
'debug',
'resolver-dnsjava',
'resolver-javax',
'compression-jzlib',
'legacy',
'jingle',
'bosh'
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'

@ -9,6 +9,6 @@ repositories {
}
dependencies {
compile project(':core')
compile project(':smack-core')
compile 'org.igniterealtime.jbosh:jbosh:0.8.0'
}

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

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save