diff --git a/.gitignore b/.gitignore
index e5e02eac8..60c6bbdd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,19 @@
.classpath
.project
.settings
+.gradle
+gradle.properties
+
+build/
+core/build/
+debug/build/
+experimental/build/
+extensions/build/
+
+bin/
+core/bin
+debug/bin
+experimental/bin
+extensions/bin
target/
-test-reports/
\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index a232e82dd..000000000
--- a/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-.PHONY: all clean javadoc test-unit eclipse
-
-export JAVA_TOOL_OPTIONS:='-Dfile.encoding=iso-8859-1'
-
-all: build-smack
-
-# Can not use 'build' as target name, because there is a
-# directory called build
-build-smack:
- cd build && ant
-
-clean:
- cd build && ant clean
-
-unit-test:
- cd build && ant test-unit
-
-integration-test:
- cd build && ant test
-
-javadoc:
- cd build && ant javadoc
-
-eclipse: .settings .classpath .project
-
-.settings:
- ln -s build/eclipse/settings .settings
-
-.classpath:
- ln -s build/eclipse/classpath .classpath
-
-.project:
- ln -s build/eclipse/project .project
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 000000000..4d9eea2fc
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,319 @@
+allprojects {
+ apply plugin: 'java'
+ apply plugin: 'maven'
+ apply plugin: 'eclipse'
+
+ ext {
+ shortVersion = '4.0.0'
+ isSnapshot = true
+ gitCommit = getGitCommit()
+ javadocAllDir = new File(buildDir, 'javadoc')
+ documentationDir = new File(projectDir, 'documentation')
+ releasedocsDir = new File(buildDir, 'releasedocs')
+ rootConfigDir = new File(rootDir, 'config')
+ sonatypeCredentialsAvailable = project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')
+ isReleaseVersion = !isSnapshot
+ signingRequired = isReleaseVersion
+ sonatypeSnapshotUrl = 'https://oss.sonatype.org/content/repositories/snapshots'
+ sonatypeStagingUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
+ buildDate = (new java.text.SimpleDateFormat("yyyy-MM-dd")).format(new Date())
+ }
+ group = 'org.igniterealtime.smack'
+ sourceCompatibility = 1.6
+ version = shortVersion
+ if (isSnapshot) {
+ version += '-SNAPSHOT'
+ }
+
+ ext.sharedManifest = manifest {
+ attributes('Implementation-Version': version,
+ 'Implementation-GitRevision': ext.gitCommit,
+ 'Bundle-Version': version)
+ }
+}
+
+task javadocAll(type: Javadoc) {
+ source subprojects.collect {project ->
+ project.sourceSets.main.allJava }
+ destinationDir = javadocAllDir
+ // Might need a classpath
+ classpath = files(subprojects.collect {project ->
+ project.sourceSets.main.compileClasspath})
+}
+
+import org.apache.tools.ant.filters.ReplaceTokens
+task prepareReleasedocs(type: Copy) {
+ from 'resources/releasedocs'
+ into releasedocsDir
+ filter(ReplaceTokens, tokens: [version: version, releasedate: buildDate])
+}
+
+task distributionZip(type: Zip, dependsOn: [javadocAll, prepareReleasedocs]) {
+ classifier buildDate
+ into ('javadoc') {
+ from(javadocAllDir)
+ }
+ into ('releasedocs') {
+ from(releasedocsDir)
+ }
+ into ('releasedocs/documentation') {
+ from(documentationDir)
+ }
+}
+
+jar {
+ // Root project should not create empty jar artifact
+ enabled = false
+}
+
+import org.gradle.plugins.signing.Sign
+gradle.taskGraph.whenReady { taskGraph ->
+ if (signingRequired && taskGraph.allTasks.any { it instanceof Sign }) {
+ // Use Java 6's console to read from the console (no good for a CI environment)
+ Console console = System.console()
+ console.printf '\n\nWe have to sign some things in this build.\n\nPlease enter your signing details.\n\n'
+ def password = console.readPassword('GnuPG Private Key Password: ')
+
+ allprojects { ext.'signing.password' = password }
+
+ console.printf '\nThanks.\n\n'
+ }
+}
+
+description = """\
+Smack ${version}
+An Open Source XMPP (Jabber) client library.
+"""
+
+subprojects {
+ apply plugin: 'osgi'
+ apply plugin: 'signing'
+ apply plugin: 'pmd'
+ apply plugin: 'checkstyle'
+ apply plugin: 'findbugs'
+
+ checkstyle {
+ configFile = new File(rootConfigDir, 'checkstyle.xml')
+ ignoreFailures = true
+ }
+ pmd {
+ ignoreFailures = true
+ }
+ findbugs {
+ ignoreFailures = true
+ }
+ repositories {
+ mavenCentral()
+ }
+ tasks.withType(Jar) {
+ baseName = 'smack'
+ appendix project.name
+ }
+ task sourcesJar(type: Jar, dependsOn: classes) {
+ appendix project.name
+ classifier = 'sources'
+ from sourceSets.main.allSource
+ }
+ task javadocJar(type: Jar, dependsOn: javadoc) {
+ appendix project.name
+ classifier = 'javadoc'
+ from javadoc.destinationDir
+ }
+ artifacts {
+ archives sourcesJar
+ archives javadocJar
+ }
+ uploadArchives {
+ repositories {
+ mavenDeployer {
+ if (signingRequired) {
+ beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+ }
+ repository(url: project.sonatypeStagingUrl) {
+ if (sonatypeCredentialsAvailable) {
+ authentication(userName: sonatypeUsername, password: sonatypePassword)
+ }
+ }
+ snapshotRepository(url: project.sonatypeSnapshotUrl) {
+ if (sonatypeCredentialsAvailable) {
+ authentication(userName: sonatypeUsername, password: sonatypePassword)
+ }
+ }
+ pom.project {
+ name 'Smack'
+ packaging 'jar'
+ url 'http://www.igniterealtime.org/projects/smack/'
+
+ scm {
+ url 'https://github.com/igniterealtime/Smack'
+ connection 'scm:git:https://github.com/igniterealtime/Smack.git'
+ developerConnection 'scm:git:https://github.com/igniterealtime/Smack.git'
+ }
+
+ licenses {
+ license {
+ name 'The Apache Software License, Version 2.0'
+ url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+ distribution 'repo'
+ }
+ }
+
+ developers {
+ developer {
+ id 'flow'
+ name 'Florian Schmaus'
+ email 'flow@igniterealtime.org'
+ }
+ }
+ }
+ }
+ }
+ }
+ rootProject.distributionZip {
+ dependsOn build
+ from(buildDir) {
+ include "$libsDirName/**"
+ }
+ }
+ signing {
+ required { signingRequired }
+ sign configurations.archives
+ }
+}
+
+project(':core') {
+ description = """\
+Smack core components.
+"""
+ configurations {
+ compression
+ dns
+ }
+ dependencies {
+ compile 'xpp3:xpp3:1.1.4c'
+ testCompile 'junit:junit:4.+'
+ testCompile 'xmlunit:xmlunit:1.5'
+ testCompile 'org.powermock:powermock-module-junit4:1.5.+'
+ testCompile 'org.powermock:powermock-api-mockito:1.5.+'
+ testCompile 'com.jamesmurty.utils:java-xmlbuilder:0.6+'
+ }
+ jar {
+ manifest {
+ attributes('Bundle-SymbolicName': project.group)
+ from sharedManifest
+ }
+ }
+ task compressionJar(type: Jar) {
+ appendix += '-compression'
+ dependsOn classes
+ from sourceSets.main.output
+ include('org/jivesoftware/smack/compression/**')
+ }
+ task dnsJar(type: Jar) {
+ appendix += '-dns'
+ dependsOn classes
+ from sourceSets.main.output
+ include('org/jivesoftware/smack/util/dns/**')
+ include('org/jivesoftware/smack/util/DNSUtil.class')
+ }
+ artifacts {
+ compression compressionJar
+ dns dnsJar
+ }
+}
+
+project(':compression-jzlib') {
+ description = """\
+Compression with jzlib
+Allow to compress the XMPP stream with help of jzlib.
+"""
+ dependencies {
+ compile project(path: ':core', configuration: 'compression')
+ compile 'com.jcraft:jzlib:1.1.3'
+ }
+}
+
+project(':resolver-dnsjava') {
+ description = """\
+DNS SRV with dnsjava
+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 'dnsjava:dnsjava:2.1.1'
+ }
+}
+
+project(':resolver-javax') {
+ description = """\
+DNS SRV with Java7
+Use javax.naming for DNS SRV lookups. The javax.naming API is availabe in JavaSE
+since Java7.
+"""
+ dependencies {
+ compile project(path: ':core', configuration: 'dns')
+ }
+}
+
+project(':extensions') {
+ description = """\
+Smack extensions.
+Classes and methods that implement support for the various XMPP XEPs
+(Multi-User Chat, PubSub, …) and other XMPP extensions.
+"""
+ dependencies {
+ compile project(':core')
+ testCompile project(':core').sourceSets.test.runtimeClasspath
+ // Test dependencies (junit, …) are interfered from the sourceSet.test of the core project
+ // So there is no need to add them explicitly here again
+ }
+}
+
+project(':experimental') {
+ description = """\
+Smack experimental extensions.
+Classes and methods for XEPs that are in status 'experimental' or that should
+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
+ // Test dependencies (junit, …) are interfered from the sourceSet.test of the core project
+ // So there is no need to add them explicitly here again
+ }
+}
+
+project(':debug') {
+ description = """\
+Smack GUI debugger.
+Inspect the exchanged XMPP stanzas.
+"""
+ dependencies {
+ compile project(':core')
+ testCompile project(':core').sourceSets.test.runtimeClasspath
+ // Test dependencies (junit, …) are interfered from the sourceSet.test of the core project
+ // So there is no need to add them explicitly here again
+ }
+}
+
+(subprojects - project(':core'))*.jar {
+ manifest {
+ attributes('Bundle-SymbolicName': project.group + '-' + appendix,
+ 'Fragment-Host': project.group)
+ from sharedManifest
+ }
+}
+
+def getGitCommit() {
+ def dotGit = new File("$projectDir/.git")
+ if (!dotGit.isDirectory()) return 'non-git build'
+
+ def cmd = 'git describe --tags --dirty=+'
+ def proc = cmd.execute()
+ def gitCommit = proc.text.trim()
+ assert !gitCommit.isEmpty()
+ gitCommit
+}
diff --git a/build/README.html b/build/README.html
deleted file mode 100644
index 88f0eafde..000000000
--- a/build/README.html
+++ /dev/null
@@ -1,266 +0,0 @@
-
-
-
-
- Smack Source Distribution
-
-
-
-
-
-
-Smack Source Distribution
-
-
-
-This document provides detailed information for developers that wish to
-compile and make changes to the Smack source code.
-
-
For additional developer resources, please visit:
-
-http://www.jivesoftware.org/smack/. The Smack build process is based on Ant. Visit the
-Ant website
-for more information and downloads.
-
-This documentation is divided into two sections:
-
-
Setup -- how to setup your environment for Smack development.
-
Build tasks -- tasks that can be performed using the build program.
-
-
-Getting your machine ready for Smack development requires a few steps. Wherever
-possible, instructions are provided for both Unix/Linux and Windows users.
-
- Java 5 (JDK 1.5 or later) must be installed and setup on your machine. To test the installation,
- open a shell in a Unix or a MS-DOS prompt in Windows. Check your version of
- Java with "java -version" -- it must version 1.5 or greater.
- If Java isn't installed, download a copy from the
- Java website.
-
- Important! -- the Smack build tool needs to know
- where Java is installed on your system. You must configure the "JAVA_HOME"
- environment variable to point to the correct directory. Instructions on
- how to set this variable for various platforms are as follows:
-
-
-
Unix/Linux
-
-
Edit the ".profile" file in your home directory (or
- corresponding file for your shell).
-
Set the JAVA_HOME environment variable by adding the
- following line to the file:
-
- export JAVA_HOME=/usr/local/jdk1.5
-
-
- The value "/usr/local/jdk1.5" should be replaced with your actual
- Java directory. Be sure there are no spaces after the end of
- the directory name. Do not add an extra slash after the directory name.
-
Save changes to the file and then "source" it:
-
- source .profile
-
-
- The JAVA_HOME variable should now be configured correctly.
-
-
-
-
Windows
-
-
Navigate to your desktop and right click on "My Computer";
- choose properties.
-
Select the "Advanced" tab and click on the
- "Environment Variables" button.
-
Click the "New..." button in the System variables section.
- Enter the variable name "JAVA_HOME" and set the variable
- value to the full path of your Java installation. For example,
- "c:\jdk1.5". Be sure to not add an extra slash to the end
- of the directory name.
-
Click "OK" in all of the menus to accept the changes.
-
Close any open command prompt windows. The next time you
- open a command prompt, the "JAVA_HOME" variable will be set
- correctly.
-
-Navigate into the subdirectory of this distribution named "build" via the command-line.
-
-
-
-Linux/Unix users only:You must make the ant script
-executable. From the build directory, type:
-
-chmod u+x ant
-
-
-
-
-Now, invoke the build tool to compile the Smack source code
-
-
- Windows: ant
-
-Unix/Linux: ./ant
-
-
-
-If the build tool is invoked correctly and Smack compiles, you've correctly
-configured your copy of the Smack developer distribution.
-
-
-
-
Finished!
-
-If you've gotten this far, you've finished setting up the Smack developer
-distribution. Now, read below to learn about all of the tasks that you can perform
-with the build tool.
-
-
- The list of build tasks is below. All build commands should be
- run from the "build" directory of your Smack distribution.
-
-
-
- For a list of the commands and a brief description from the command line, type
- ant -projecthelp. For more complete help, read the documentation below.
-
-
-
- To execute a build task, type ant [options] targetname where "targetname" is
- one of the targets listed below:
-
-
- The {@link org.jivesoftware.smack.XMPPConnection} class is the main entry point for the API.
-
diff --git a/jingle/extension/build/lib/Speex.jar b/jingle/lib/Speex.jar
similarity index 100%
rename from jingle/extension/build/lib/Speex.jar
rename to jingle/lib/Speex.jar
diff --git a/jingle/extension/build/lib/commons-logging-1.1.jar b/jingle/lib/commons-logging-1.1.jar
similarity index 100%
rename from jingle/extension/build/lib/commons-logging-1.1.jar
rename to jingle/lib/commons-logging-1.1.jar
diff --git a/jingle/extension/build/lib/commons-logging-adapters-1.1.jar b/jingle/lib/commons-logging-adapters-1.1.jar
similarity index 100%
rename from jingle/extension/build/lib/commons-logging-adapters-1.1.jar
rename to jingle/lib/commons-logging-adapters-1.1.jar
diff --git a/jingle/extension/build/lib/commons-logging-api-1.1.jar b/jingle/lib/commons-logging-api-1.1.jar
similarity index 100%
rename from jingle/extension/build/lib/commons-logging-api-1.1.jar
rename to jingle/lib/commons-logging-api-1.1.jar
diff --git a/jingle/extension/build/lib/jmf.jar b/jingle/lib/jmf.jar
similarity index 100%
rename from jingle/extension/build/lib/jmf.jar
rename to jingle/lib/jmf.jar
diff --git a/jingle/extension/build/lib/jspeex-0.9.7-jfcom.jar b/jingle/lib/jspeex-0.9.7-jfcom.jar
similarity index 100%
rename from jingle/extension/build/lib/jspeex-0.9.7-jfcom.jar
rename to jingle/lib/jspeex-0.9.7-jfcom.jar
diff --git a/jingle/extension/build/merge/jstun.jar b/jingle/lib/jstun.jar
similarity index 100%
rename from jingle/extension/build/merge/jstun.jar
rename to jingle/lib/jstun.jar
diff --git a/jingle/extension/build/lib/junit.jar b/jingle/lib/junit.jar
similarity index 100%
rename from jingle/extension/build/lib/junit.jar
rename to jingle/lib/junit.jar
diff --git a/jingle/extension/build/lib/mac/0JavaSoundStream.fix.mac.jar b/jingle/lib/mac/0JavaSoundStream.fix.mac.jar
similarity index 100%
rename from jingle/extension/build/lib/mac/0JavaSoundStream.fix.mac.jar
rename to jingle/lib/mac/0JavaSoundStream.fix.mac.jar
diff --git a/jingle/extension/build/lib/mac/0jmf.mac.jar b/jingle/lib/mac/0jmf.mac.jar
similarity index 100%
rename from jingle/extension/build/lib/mac/0jmf.mac.jar
rename to jingle/lib/mac/0jmf.mac.jar
diff --git a/jingle/extension/build/lib/windows/jmacm.dll b/jingle/lib/windows/jmacm.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmacm.dll
rename to jingle/lib/windows/jmacm.dll
diff --git a/jingle/extension/build/lib/windows/jmam.dll b/jingle/lib/windows/jmam.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmam.dll
rename to jingle/lib/windows/jmam.dll
diff --git a/jingle/extension/build/lib/windows/jmcvid.dll b/jingle/lib/windows/jmcvid.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmcvid.dll
rename to jingle/lib/windows/jmcvid.dll
diff --git a/jingle/extension/build/lib/windows/jmdaud.dll b/jingle/lib/windows/jmdaud.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmdaud.dll
rename to jingle/lib/windows/jmdaud.dll
diff --git a/jingle/extension/build/lib/windows/jmdaudc.dll b/jingle/lib/windows/jmdaudc.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmdaudc.dll
rename to jingle/lib/windows/jmdaudc.dll
diff --git a/jingle/extension/build/lib/windows/jmddraw.dll b/jingle/lib/windows/jmddraw.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmddraw.dll
rename to jingle/lib/windows/jmddraw.dll
diff --git a/jingle/extension/build/lib/windows/jmfjawt.dll b/jingle/lib/windows/jmfjawt.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmfjawt.dll
rename to jingle/lib/windows/jmfjawt.dll
diff --git a/jingle/extension/build/lib/windows/jmg723.dll b/jingle/lib/windows/jmg723.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmg723.dll
rename to jingle/lib/windows/jmg723.dll
diff --git a/jingle/extension/build/lib/windows/jmgdi.dll b/jingle/lib/windows/jmgdi.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmgdi.dll
rename to jingle/lib/windows/jmgdi.dll
diff --git a/jingle/extension/build/lib/windows/jmgsm.dll b/jingle/lib/windows/jmgsm.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmgsm.dll
rename to jingle/lib/windows/jmgsm.dll
diff --git a/jingle/extension/build/lib/windows/jmh263enc.dll b/jingle/lib/windows/jmh263enc.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmh263enc.dll
rename to jingle/lib/windows/jmh263enc.dll
diff --git a/jingle/extension/build/lib/windows/jmjpeg.dll b/jingle/lib/windows/jmjpeg.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmjpeg.dll
rename to jingle/lib/windows/jmjpeg.dll
diff --git a/jingle/extension/build/lib/windows/jmmci.dll b/jingle/lib/windows/jmmci.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmmci.dll
rename to jingle/lib/windows/jmmci.dll
diff --git a/jingle/extension/build/lib/windows/jmmpa.dll b/jingle/lib/windows/jmmpa.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmmpa.dll
rename to jingle/lib/windows/jmmpa.dll
diff --git a/jingle/extension/build/lib/windows/jmmpegv.dll b/jingle/lib/windows/jmmpegv.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmmpegv.dll
rename to jingle/lib/windows/jmmpegv.dll
diff --git a/jingle/extension/build/lib/windows/jmutil.dll b/jingle/lib/windows/jmutil.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmutil.dll
rename to jingle/lib/windows/jmutil.dll
diff --git a/jingle/extension/build/lib/windows/jmvcm.dll b/jingle/lib/windows/jmvcm.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmvcm.dll
rename to jingle/lib/windows/jmvcm.dll
diff --git a/jingle/extension/build/lib/windows/jmvfw.dll b/jingle/lib/windows/jmvfw.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmvfw.dll
rename to jingle/lib/windows/jmvfw.dll
diff --git a/jingle/extension/build/lib/windows/jmvh263.dll b/jingle/lib/windows/jmvh263.dll
similarity index 100%
rename from jingle/extension/build/lib/windows/jmvh263.dll
rename to jingle/lib/windows/jmvh263.dll
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/ContentNegotiator.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/ContentNegotiator.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/ContentNegotiator.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleActionEnum.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleActionEnum.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/JingleActionEnum.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleActionEnum.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleException.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/JingleException.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleException.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/JingleManager.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleManager.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleNegotiator.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/JingleNegotiator.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiator.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleNegotiatorState.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSession.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSession.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSession.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionRequest.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionRequest.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionRequest.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionState.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionState.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionState.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateActive.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateEnded.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStatePending.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/JingleSessionStateUnknown.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/SmackLogger.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/SmackLogger.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/SmackLogger.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/SmackLogger.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/CreatedJingleSessionListener.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/listeners/JingleListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleListener.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/listeners/JingleListener.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleListener.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaInfoListener.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleMediaListener.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionListener.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleSessionRequestListener.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/listeners/JingleTransportListener.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/media/ContentInfo.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/ContentInfo.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/media/ContentInfo.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/media/ContentInfo.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaManager.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/media/JingleMediaSession.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaNegotiator.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/media/MediaReceivedListener.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/media/PayloadType.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/media/PayloadType.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/media/PayloadType.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/media/PayloadType.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/JMFInit.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/demo/Demo.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioChannel.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioFormatUtils.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioMediaSession.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/AudioReceiver.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jmf/JmfMediaManager.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/AudioMediaSession.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/jspeex/SpeexMediaManager.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/multi/MultiMediaManager.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareMediaManager.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/ScreenShareSession.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/AbstractBufferedImageOp.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/AbstractBufferedImageOp.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/AbstractBufferedImageOp.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/AbstractBufferedImageOp.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultDecoder.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/DefaultEncoder.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageDecoder.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageEncoder.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageReceiver.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/ImageTransmitter.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/OctTreeQuantizer.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/OctTreeQuantizer.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/OctTreeQuantizer.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/OctTreeQuantizer.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/PixelUtils.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/PixelUtils.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/PixelUtils.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/PixelUtils.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/QuantizeFilter.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/QuantizeFilter.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/QuantizeFilter.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/QuantizeFilter.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/Quantizer.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/Quantizer.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/Quantizer.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/Quantizer.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/WholeImageFilter.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/WholeImageFilter.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/WholeImageFilter.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/sshare/api/WholeImageFilter.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaManager.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/mediaimpl/test/TestMediaSession.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/BasicResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicResolver.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/BasicResolver.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicResolver.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BasicTransportManager.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedResolver.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/BridgedTransportManager.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/DatagramListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/DatagramListener.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/DatagramListener.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/DatagramListener.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/FixedResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedResolver.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/FixedResolver.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedResolver.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/FixedTransportManager.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/HttpServer.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/HttpServer.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/HttpServer.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/HttpServer.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/ICECandidate.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICECandidate.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/ICECandidate.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICECandidate.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/ICEResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/ICEResolver.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICEResolver.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ICETransportManager.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/JingleTransportManager.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/RTPBridge.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/RTPBridge.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/RTPBridge.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/ResultListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ResultListener.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/ResultListener.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/ResultListener.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/STUN.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/STUN.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUN.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/STUNResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/STUNResolver.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNResolver.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/STUNTransportManager.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeClient.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TcpUdpBridgeServer.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TestResult.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TestResult.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TestResult.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TestResult.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportCandidate.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportNegotiator.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportResolver.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolver.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportResolver.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolver.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java b/jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java
rename to jingle/src/main/java/org/jivesoftware/smackx/jingle/nat/TransportResolverListener.java
diff --git a/source/org/jivesoftware/smackx/package.html b/jingle/src/main/java/org/jivesoftware/smackx/package.html
similarity index 100%
rename from source/org/jivesoftware/smackx/package.html
rename to jingle/src/main/java/org/jivesoftware/smackx/package.html
diff --git a/jingle/extension/source/org/jivesoftware/smackx/packet/Jingle.java b/jingle/src/main/java/org/jivesoftware/smackx/packet/Jingle.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/packet/Jingle.java
rename to jingle/src/main/java/org/jivesoftware/smackx/packet/Jingle.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/packet/JingleContent.java b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContent.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/packet/JingleContent.java
rename to jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContent.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/packet/JingleContentDescription.java b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentDescription.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/packet/JingleContentDescription.java
rename to jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentDescription.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/packet/JingleContentInfo.java b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentInfo.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/packet/JingleContentInfo.java
rename to jingle/src/main/java/org/jivesoftware/smackx/packet/JingleContentInfo.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/packet/JingleDescription.java b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleDescription.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/packet/JingleDescription.java
rename to jingle/src/main/java/org/jivesoftware/smackx/packet/JingleDescription.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/packet/JingleError.java b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleError.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/packet/JingleError.java
rename to jingle/src/main/java/org/jivesoftware/smackx/packet/JingleError.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/packet/JingleTransport.java b/jingle/src/main/java/org/jivesoftware/smackx/packet/JingleTransport.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/packet/JingleTransport.java
rename to jingle/src/main/java/org/jivesoftware/smackx/packet/JingleTransport.java
diff --git a/source/org/jivesoftware/smackx/packet/package.html b/jingle/src/main/java/org/jivesoftware/smackx/packet/package.html
similarity index 100%
rename from source/org/jivesoftware/smackx/packet/package.html
rename to jingle/src/main/java/org/jivesoftware/smackx/packet/package.html
diff --git a/jingle/extension/source/org/jivesoftware/smackx/provider/JingleContentDescriptionProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentDescriptionProvider.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/provider/JingleContentDescriptionProvider.java
rename to jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentDescriptionProvider.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/provider/JingleContentInfoProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentInfoProvider.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/provider/JingleContentInfoProvider.java
rename to jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentInfoProvider.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/provider/JingleContentProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentProvider.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/provider/JingleContentProvider.java
rename to jingle/src/main/java/org/jivesoftware/smackx/provider/JingleContentProvider.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/provider/JingleDescriptionProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleDescriptionProvider.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/provider/JingleDescriptionProvider.java
rename to jingle/src/main/java/org/jivesoftware/smackx/provider/JingleDescriptionProvider.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/provider/JingleProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleProvider.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/provider/JingleProvider.java
rename to jingle/src/main/java/org/jivesoftware/smackx/provider/JingleProvider.java
diff --git a/jingle/extension/source/org/jivesoftware/smackx/provider/JingleTransportProvider.java b/jingle/src/main/java/org/jivesoftware/smackx/provider/JingleTransportProvider.java
similarity index 100%
rename from jingle/extension/source/org/jivesoftware/smackx/provider/JingleTransportProvider.java
rename to jingle/src/main/java/org/jivesoftware/smackx/provider/JingleTransportProvider.java
diff --git a/source/org/jivesoftware/smackx/provider/package.html b/jingle/src/main/java/org/jivesoftware/smackx/provider/package.html
similarity index 100%
rename from source/org/jivesoftware/smackx/provider/package.html
rename to jingle/src/main/java/org/jivesoftware/smackx/provider/package.html
diff --git a/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleManagerTest.java b/jingle/src/test/java/org/jivesoftware/jingle/JingleManagerTest.java
similarity index 100%
rename from jingle/extension/test/org/jivesoftware/smackx/jingle/JingleManagerTest.java
rename to jingle/src/test/java/org/jivesoftware/jingle/JingleManagerTest.java
diff --git a/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleMediaTest.java b/jingle/src/test/java/org/jivesoftware/jingle/JingleMediaTest.java
similarity index 100%
rename from jingle/extension/test/org/jivesoftware/smackx/jingle/JingleMediaTest.java
rename to jingle/src/test/java/org/jivesoftware/jingle/JingleMediaTest.java
diff --git a/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleSessionTest.java b/jingle/src/test/java/org/jivesoftware/jingle/JingleSessionTest.java
similarity index 100%
rename from jingle/extension/test/org/jivesoftware/smackx/jingle/JingleSessionTest.java
rename to jingle/src/test/java/org/jivesoftware/jingle/JingleSessionTest.java
diff --git a/jingle/extension/test/org/jivesoftware/smackx/jingle/JingleSupportTests.java b/jingle/src/test/java/org/jivesoftware/jingle/JingleSupportTests.java
similarity index 100%
rename from jingle/extension/test/org/jivesoftware/smackx/jingle/JingleSupportTests.java
rename to jingle/src/test/java/org/jivesoftware/jingle/JingleSupportTests.java
diff --git a/jingle/extension/test/org/jivesoftware/smackx/jingle/PayloadTypeTest.java b/jingle/src/test/java/org/jivesoftware/jingle/PayloadTypeTest.java
similarity index 100%
rename from jingle/extension/test/org/jivesoftware/smackx/jingle/PayloadTypeTest.java
rename to jingle/src/test/java/org/jivesoftware/jingle/PayloadTypeTest.java
diff --git a/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java b/jingle/src/test/java/org/jivesoftware/jingle/nat/BasicResolverTest.java
similarity index 100%
rename from jingle/extension/test/org/jivesoftware/smackx/jingle/nat/BasicResolverTest.java
rename to jingle/src/test/java/org/jivesoftware/jingle/nat/BasicResolverTest.java
diff --git a/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java b/jingle/src/test/java/org/jivesoftware/jingle/nat/BridgedResolverTest.java
similarity index 100%
rename from jingle/extension/test/org/jivesoftware/smackx/jingle/nat/BridgedResolverTest.java
rename to jingle/src/test/java/org/jivesoftware/jingle/nat/BridgedResolverTest.java
diff --git a/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java b/jingle/src/test/java/org/jivesoftware/jingle/nat/LocalhostTest.java
similarity index 100%
rename from jingle/extension/test/org/jivesoftware/smackx/jingle/nat/LocalhostTest.java
rename to jingle/src/test/java/org/jivesoftware/jingle/nat/LocalhostTest.java
diff --git a/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java b/jingle/src/test/java/org/jivesoftware/jingle/nat/STUNResolverTest.java
similarity index 100%
rename from jingle/extension/test/org/jivesoftware/smackx/jingle/nat/STUNResolverTest.java
rename to jingle/src/test/java/org/jivesoftware/jingle/nat/STUNResolverTest.java
diff --git a/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java b/jingle/src/test/java/org/jivesoftware/jingle/nat/TransportCandidateTest.java
similarity index 100%
rename from jingle/extension/test/org/jivesoftware/smackx/jingle/nat/TransportCandidateTest.java
rename to jingle/src/test/java/org/jivesoftware/jingle/nat/TransportCandidateTest.java
diff --git a/jingle/extension/test/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java b/jingle/src/test/java/org/jivesoftware/jingle/nat/TransportResolverTest.java
similarity index 100%
rename from jingle/extension/test/org/jivesoftware/smackx/jingle/nat/TransportResolverTest.java
rename to jingle/src/test/java/org/jivesoftware/jingle/nat/TransportResolverTest.java
diff --git a/jingle/extension/test/org/jivesoftware/smackx/provider/JingleProviderTest.java b/jingle/src/test/java/org/jivesoftware/provider/JingleProviderTest.java
similarity index 100%
rename from jingle/extension/test/org/jivesoftware/smackx/provider/JingleProviderTest.java
rename to jingle/src/test/java/org/jivesoftware/provider/JingleProviderTest.java
diff --git a/jingle/extension/test/config/test-case.xml b/jingle/src/test/resources/test-case.xml
similarity index 100%
rename from jingle/extension/test/config/test-case.xml
rename to jingle/src/test/resources/test-case.xml
diff --git a/source/org/jivesoftware/smack/util/dns/DNSJavaResolver.java b/resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/DNSJavaResolver.java
similarity index 99%
rename from source/org/jivesoftware/smack/util/dns/DNSJavaResolver.java
rename to resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/DNSJavaResolver.java
index dd93fd3ae..b7b55078a 100644
--- a/source/org/jivesoftware/smack/util/dns/DNSJavaResolver.java
+++ b/resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/DNSJavaResolver.java
@@ -31,7 +31,6 @@ public class DNSJavaResolver implements DNSResolver {
private static DNSJavaResolver instance = new DNSJavaResolver();
private DNSJavaResolver() {
-
}
public static DNSResolver getInstance() {
diff --git a/source/org/jivesoftware/smack/util/dns/JavaxResolver.java b/resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/JavaxResolver.java
similarity index 100%
rename from source/org/jivesoftware/smack/util/dns/JavaxResolver.java
rename to resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/JavaxResolver.java
diff --git a/resources/README.html b/resources/README.html
new file mode 100644
index 000000000..bd1895657
--- /dev/null
+++ b/resources/README.html
@@ -0,0 +1,211 @@
+
+
+
+
+ Smack Source Distribution
+
+
+
+
+
+
+Smack Source Distribution
+
+
+
+This document provides detailed information for developers that wish to
+compile and make changes to the Smack source code.
+
+
+
+Getting your machine ready for Smack development requires a few steps. Wherever
+possible, instructions are provided for both Unix/Linux and Windows users.
+
+ Java 6 (JDK 1.6 or later) must be installed and setup on your machine. To test the installation,
+ open a shell in a Unix or a MS-DOS prompt in Windows. Check your version of
+ Java with "java -version".
+ If Java isn't installed, download a copy from the
+ Java website.
+
+Now, invoke the build tool to compile the Smack source code
+
+
+gradle build
+
+
+If the build tool is invoked correctly and Smack compiles, you've correctly
+configured your copy of the Smack developer distribution.
+
+
+
+
Finished!
+
+If you've gotten this far, you've finished setting up the Smack developer
+distribution. Now, read below to learn about all of the tasks that you can perform
+with the build tool.
+
+
+ For a list of the commands and a brief description from the command line, type
+ gradle tasks. For more complete help, read the documentation below.
+
+
+
+ To execute a build task, type gradle [options] targetname where "targetname" is
+ one of the targets listed below:
+
+
+
+Generates Eclipse configuration files for every project. After
+running gradle build eclipse you can import Smack in
+Eclipse by selecting File → Import...
+→ Existing Projects into Workspace
+
+Make sure to check "Search for nested projects". It may be
+also a good idea to create a working set for Smack, and add all Smack
+projects to that working set.
+
+Note that it's recommended to also call the build target
+when generating the Eclipse files, or else Eclipse may not find all
+requirements.
+
+
@@ -168,13 +169,9 @@ fixes to the code, please visit the
The smack.jar file in the main distribution folder is the only binary file
required for embedding XMPP functionality into client applications. The optional
-smackx.jar contains the Smack extensions
-while smackx-debug.jar contains an enhanced debugger.
+smack-extensions.jar contains the Smack extensions
+while smack-debug.jar contains an enhanced debugger.
-If you downloaded the developer release, the full source of the library is included in
-the source directory and can be compiled using the build scripts found in the
-build directory (please see the README file in the build directory for further details).
-
Changelog and Upgrading
View the changelog for a list of changes since the
@@ -182,7 +179,7 @@ last release.
License Agreements
-
Use of thie Smack source code is governed by the Apache License:
+
Use of the Smack source code is governed by the Apache License:
Copyright 2002-2008 Jive Software.
@@ -203,36 +200,6 @@ last release.
to use these icons outside of Smack.
Third-party source code is licensed as noted in their source files.
-
Third-party binary code is licensed as follows.
-
- dnsjava(http://dnsjava.org)
-
- Copyright (c) 1999-2005, Brian Wellington
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the dnsjava project nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/build/resources/releasedocs/changelog.html b/resources/releasedocs/changelog.html
similarity index 100%
rename from build/resources/releasedocs/changelog.html
rename to resources/releasedocs/changelog.html
diff --git a/build/resources/META-INF/sample.providers b/resources/sample.providers
similarity index 100%
rename from build/resources/META-INF/sample.providers
rename to resources/sample.providers
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 000000000..232355082
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include 'core', 'extensions', 'experimental', 'debug', 'resolver-dnsjava', 'resolver-javax', 'compression-jzlib'
\ No newline at end of file
diff --git a/source/org/jivesoftware/smack/keepalive/KeepAliveManager.java b/source/org/jivesoftware/smack/keepalive/KeepAliveManager.java
deleted file mode 100644
index 3560bc1c3..000000000
--- a/source/org/jivesoftware/smack/keepalive/KeepAliveManager.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/**
- * Copyright 2012-2013 Florian Schmaus
- *
- * All rights reserved. Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jivesoftware.smack.keepalive;
-
-import java.lang.ref.WeakReference;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-
-import org.jivesoftware.smack.Connection;
-import org.jivesoftware.smack.ConnectionCreationListener;
-import org.jivesoftware.smack.ConnectionListener;
-import org.jivesoftware.smack.PacketCollector;
-import org.jivesoftware.smack.PacketListener;
-import org.jivesoftware.smack.SmackConfiguration;
-import org.jivesoftware.smack.filter.PacketFilter;
-import org.jivesoftware.smack.filter.PacketIDFilter;
-import org.jivesoftware.smack.packet.Packet;
-import org.jivesoftware.smack.ping.PingFailedListener;
-import org.jivesoftware.smack.ping.packet.Ping;
-
-/**
- * Using an implementation of XMPP Ping (XEP-0199). This
- * class provides keepalive functionality with the server that will periodically "ping" the server to maintain and/or
- * verify that the connection still exists.
- *
- * The ping is done at the application level and is therefore protocol agnostic. It will thus work for both standard TCP
- * connections as well as BOSH or any other transport protocol. It will also work regardless of whether the server
- * supports the Ping extension, since an error response to the ping serves the same purpose as a pong.
- *
- * @author Florian Schmaus
- */
-public class KeepAliveManager {
- private static Map instances = Collections.synchronizedMap(new WeakHashMap());
- private static volatile ScheduledExecutorService periodicPingExecutorService;
-
- static {
- if (SmackConfiguration.getKeepAliveInterval() > 0) {
- Connection.addConnectionCreationListener(new ConnectionCreationListener() {
- public void connectionCreated(Connection connection) {
- getInstanceFor(connection);
- }
- });
- }
- }
-
- private WeakReference weakRefConnection;
- private long pingInterval = SmackConfiguration.getKeepAliveInterval();
- private Set pingFailedListeners = Collections.synchronizedSet(new HashSet());
- private volatile ScheduledFuture periodicPingTask;
- private volatile long lastSuccessfulContact = -1;
-
- /**
- * Retrieves a {@link KeepAliveManager} for the specified {@link Connection}, creating one if it doesn't already
- * exist.
- *
- * @param connection
- * The connection the manager is attached to.
- * @return The new or existing manager.
- */
- public synchronized static KeepAliveManager getInstanceFor(Connection connection) {
- KeepAliveManager pingManager = instances.get(connection);
-
- if (pingManager == null) {
- pingManager = new KeepAliveManager(connection);
- instances.put(connection, pingManager);
- }
- return pingManager;
- }
-
- /*
- * Start the executor service if it hasn't been started yet.
- */
- private synchronized static void enableExecutorService() {
- if (periodicPingExecutorService == null) {
- periodicPingExecutorService = new ScheduledThreadPoolExecutor(1, new ThreadFactory() {
- @Override
- public Thread newThread(Runnable runnable) {
- Thread pingThread = new Thread(runnable, "Smack Keepalive");
- pingThread.setDaemon(true);
- return pingThread;
- }
- });
- }
- }
-
- /*
- * Stop the executor service if all monitored connections are disconnected.
- */
- private synchronized static void handleDisconnect(Connection con) {
- if (periodicPingExecutorService != null) {
- instances.remove(con);
-
- if (instances.isEmpty()) {
- periodicPingExecutorService.shutdownNow();
- periodicPingExecutorService = null;
- }
- }
- }
-
- private KeepAliveManager(Connection connection) {
- weakRefConnection = new WeakReference(connection);
-
- connection.addConnectionListener(new ConnectionListener() {
-
- @Override
- public void connectionClosed() {
- stopPingServerTask();
- Connection connection = weakRefConnection.get();
- handleDisconnect(connection);
- }
-
- @Override
- public void connectionClosedOnError(Exception arg0) {
- stopPingServerTask();
- Connection connection = weakRefConnection.get();
- handleDisconnect(connection);
- }
-
- @Override
- public void reconnectionSuccessful() {
- handleConnect();
- schedulePingServerTask();
- }
-
- @Override
- public void reconnectingIn(int seconds) {
- }
-
- @Override
- public void reconnectionFailed(Exception e) {
- }
- });
-
- instances.put(connection, this);
- schedulePingServerTask();
- handleConnect();
- }
-
- /*
- * Call after every connection to add the packet listener.
- */
- private void handleConnect() {
- Connection connection = weakRefConnection.get();
- // Listen for all incoming packets and reset the scheduled ping whenever
- // one arrives.
- connection.addPacketListener(new PacketListener() {
-
- @Override
- public void processPacket(Packet packet) {
- // reschedule the ping based on this last server contact
- lastSuccessfulContact = System.currentTimeMillis();
- schedulePingServerTask();
- }
- }, null);
- }
-
- /**
- * Sets the ping interval.
- *
- * @param pingInterval
- * The new ping time interval in milliseconds.
- */
- public void setPingInterval(long newPingInterval) {
- if (pingInterval == newPingInterval)
- return;
-
- // Enable the executor service
- if (newPingInterval > 0)
- enableExecutorService();
-
- pingInterval = newPingInterval;
-
- if (pingInterval < 0) {
- stopPinging();
- }
- else {
- schedulePingServerTask();
- }
- }
-
- /**
- * Stops pinging the server. This cannot stop a ping that has already started, but will prevent another from being triggered.
- *
- * To restart, call {@link #setPingInterval(long)}.
- */
- public void stopPinging() {
- pingInterval = -1;
- stopPingServerTask();
- }
-
- /**
- * Gets the ping interval.
- *
- * @return The ping interval in milliseconds.
- */
- public long getPingInterval() {
- return pingInterval;
- }
-
- /**
- * Add listener for notification when a server ping fails.
- *
- *
- * Please note that this doesn't necessarily mean that the connection is lost, a slow to respond server could also
- * cause a failure due to taking too long to respond and thus causing a reply timeout.
- *
- * @param listener
- * The listener to be called
- */
- public void addPingFailedListener(PingFailedListener listener) {
- pingFailedListeners.add(listener);
- }
-
- /**
- * Remove the listener.
- *
- * @param listener
- * The listener to be removed.
- */
- public void removePingFailedListener(PingFailedListener listener) {
- pingFailedListeners.remove(listener);
- }
-
- /**
- * Returns the elapsed time (in milliseconds) since the last successful contact with the server
- * (i.e. the last time any message was received).
- *
- * Note: Result is -1 if no message has been received since manager was created and
- * 0 if the elapsed time is negative due to a clock reset.
- *
- * @return Elapsed time since last message was received.
- */
- public long getTimeSinceLastContact() {
- if (lastSuccessfulContact == -1)
- return lastSuccessfulContact;
- long delta = System.currentTimeMillis() - lastSuccessfulContact;
-
- return (delta < 0) ? 0 : delta;
- }
-
- /**
- * Cancels any existing periodic ping task if there is one and schedules a new ping task if pingInterval is greater
- * then zero.
- *
- * This is designed so only one executor is used for scheduling all pings on all connections. This results in only 1 thread used for pinging.
- */
- private synchronized void schedulePingServerTask() {
- enableExecutorService();
- stopPingServerTask();
-
- if (pingInterval > 0) {
- periodicPingTask = periodicPingExecutorService.schedule(new Runnable() {
- @Override
- public void run() {
- Ping ping = new Ping();
- PacketFilter responseFilter = new PacketIDFilter(ping.getPacketID());
- Connection connection = weakRefConnection.get();
- final PacketCollector response = pingFailedListeners.isEmpty() ? null : connection.createPacketCollector(responseFilter);
- connection.sendPacket(ping);
-
- if (response != null) {
- // Schedule a collector for the ping reply, notify listeners if none is received.
- periodicPingExecutorService.schedule(new Runnable() {
- @Override
- public void run() {
- Packet result = response.nextResult(1);
-
- // Stop queuing results
- response.cancel();
-
- // The actual result of the reply can be ignored since we only care if we actually got one.
- if (result == null) {
- for (PingFailedListener listener : pingFailedListeners) {
- listener.pingFailed();
- }
- }
- }
- }, SmackConfiguration.getPacketReplyTimeout(), TimeUnit.MILLISECONDS);
- }
- }
- }, getPingInterval(), TimeUnit.MILLISECONDS);
- }
- }
-
- private void stopPingServerTask() {
- if (periodicPingTask != null) {
- periodicPingTask.cancel(true);
- periodicPingTask = null;
- }
- }
-}
diff --git a/source/overview.html b/source/overview.html
deleted file mode 100644
index 49a6ce41e..000000000
--- a/source/overview.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
API specification for Smack, an Open Source XMPP client library.
-
-The {@link org.jivesoftware.smack.XMPPConnection} class is the main entry point for the API.
-
diff --git a/test-unit/org/jivesoftware/smack/keepalive/KeepaliveTest.java b/test-unit/org/jivesoftware/smack/keepalive/KeepaliveTest.java
deleted file mode 100644
index 240f9160b..000000000
--- a/test-unit/org/jivesoftware/smack/keepalive/KeepaliveTest.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.jivesoftware.smack.keepalive;
-
-import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.jivesoftware.smack.Connection;
-import org.jivesoftware.smack.DummyConnection;
-import org.jivesoftware.smack.PacketInterceptor;
-import org.jivesoftware.smack.PacketListener;
-import org.jivesoftware.smack.SmackConfiguration;
-import org.jivesoftware.smack.ThreadedDummyConnection;
-import org.jivesoftware.smack.filter.IQTypeFilter;
-import org.jivesoftware.smack.filter.PacketTypeFilter;
-import org.jivesoftware.smack.packet.IQ;
-import org.jivesoftware.smack.packet.Packet;
-import org.jivesoftware.smack.ping.PingFailedListener;
-import org.jivesoftware.smack.ping.packet.Ping;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class KeepaliveTest {
- private static final long PING_MINIMUM = 1000;
- private static String TO = "juliet@capulet.lit/balcony";
- private static String ID = "s2c1";
-
- private static Properties outputProperties = new Properties();
- {
- outputProperties.put(javax.xml.transform.OutputKeys.OMIT_XML_DECLARATION, "yes");
- }
-
- private int originalTimeout;
-
- @Before
- public void resetProperties()
- {
- SmackConfiguration.setKeepAliveInterval(-1);
- originalTimeout = SmackConfiguration.getPacketReplyTimeout();
- SmackConfiguration.setPacketReplyTimeout(1000);
- }
-
- @After
- public void restoreProperties()
- {
- SmackConfiguration.setPacketReplyTimeout(originalTimeout);
- }
- /*
- * Stanza copied from spec
- */
- @Test
- public void validatePingStanzaXML() throws Exception {
- // @formatter:off
- String control = ""
- + "";
- // @formatter:on
-
- Ping ping = new Ping(TO);
- ping.setPacketID(ID);
-
- assertXMLEqual(control, ping.toXML());
- }
-
- @Test
- public void serverPingFailSingleConnection() throws Exception {
- DummyConnection connection = getConnection();
- CountDownLatch latch = new CountDownLatch(2);
- addInterceptor(connection, latch);
- addPingFailedListener(connection, latch);
-
- // Time based testing kind of sucks, but this should be reliable on a DummyConnection since there
- // is no actual server involved. This will provide enough time to ping and wait for the lack of response.
- assertTrue(latch.await(getWaitTime(), TimeUnit.MILLISECONDS));
- }
-
- @Test
- public void serverPingSuccessfulSingleConnection() throws Exception {
- ThreadedDummyConnection connection = getThreadedConnection();
- final CountDownLatch latch = new CountDownLatch(1);
-
- connection.addPacketListener(new PacketListener() {
- @Override
- public void processPacket(Packet packet) {
- latch.countDown();
- }
- }, new IQTypeFilter(IQ.Type.RESULT));
-
- // Time based testing kind of sucks, but this should be reliable on a DummyConnection since there
- // is no actual server involved. This will provide enough time to ping and wait for the lack of response.
- assertTrue(latch.await(getWaitTime(), TimeUnit.MILLISECONDS));
- }
-
- @Test
- public void serverPingFailMultipleConnection() throws Exception {
- CountDownLatch latch = new CountDownLatch(6);
- SmackConfiguration.setPacketReplyTimeout(15000);
-
- DummyConnection con1 = getConnection();
- addInterceptor(con1, latch);
- addPingFailedListener(con1, latch);
-
- DummyConnection con2 = getConnection();
- addInterceptor(con2, latch);
- addPingFailedListener(con2, latch);
-
- DummyConnection con3 = getConnection();
- addInterceptor(con3, latch);
- addPingFailedListener(con2, latch);
-
- assertTrue(latch.await(getWaitTime(), TimeUnit.MILLISECONDS));
- }
-
- private void addPingFailedListener(DummyConnection con, final CountDownLatch latch) {
- KeepAliveManager manager = KeepAliveManager.getInstanceFor(con);
- manager.addPingFailedListener(new PingFailedListener() {
- @Override
- public void pingFailed() {
- latch.countDown();
- }
- });
- }
-
- private DummyConnection getConnection() {
- DummyConnection con = new DummyConnection();
- KeepAliveManager mgr = KeepAliveManager.getInstanceFor(con);
- mgr.setPingInterval(PING_MINIMUM);
-
- return con;
- }
-
- private ThreadedDummyConnection getThreadedConnection() {
- ThreadedDummyConnection con = new ThreadedDummyConnection();
- KeepAliveManager mgr = KeepAliveManager.getInstanceFor(con);
- mgr.setPingInterval(PING_MINIMUM);
-
- return con;
- }
-
- private void addInterceptor(final Connection con, final CountDownLatch latch) {
- con.addPacketInterceptor(new PacketInterceptor() {
- @Override
- public void interceptPacket(Packet packet) {
- con.removePacketInterceptor(this);
- latch.countDown();
- }
- }, new PacketTypeFilter(Ping.class));
- }
-
- private long getWaitTime() {
- return PING_MINIMUM + SmackConfiguration.getPacketReplyTimeout() + 3000;
- }
-}