diff --git a/build.gradle b/build.gradle index 1aa9f4725..ded0e4544 100644 --- a/build.gradle +++ b/build.gradle @@ -272,26 +272,6 @@ subprojects { } } -['smack-extensions', 'smack-experimental', 'smack-legacy'].each { name -> - project(":$name") { - jar { - manifest { - instruction 'Service-Component', "org.jivesoftware.smackx/$name-components.xml" - } - } - } -} - -['smack-resolver-javax', 'smack-resolver-dnsjava', 'smack-resolver-minidns', 'smack-sasl-javax', 'smack-sasl-provided', 'smack-java7'] .each { name -> - project(":$name") { - jar { - manifest { - instruction 'Service-Component', "org.jivesoftware.smack/$name-components.xml" - } - } - } -} - subprojects*.jar { manifest { from sharedManifest diff --git a/smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java b/smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java index 784e11433..bae2beb93 100644 --- a/smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java +++ b/smack-android/src/main/java/org/jivesoftware/smack/android/AndroidSmackInitializer.java @@ -20,13 +20,13 @@ import java.util.List; import org.apache.http.conn.ssl.StrictHostnameVerifier; import org.jivesoftware.smack.SmackConfiguration; -import org.jivesoftware.smack.initializer.SimpleSmackInitializer; +import org.jivesoftware.smack.initializer.SmackInitializer; import org.jivesoftware.smack.util.stringencoder.Base64; import org.jivesoftware.smack.util.stringencoder.Base64UrlSafeEncoder; import org.jivesoftware.smack.util.stringencoder.android.AndroidBase64Encoder; import org.jivesoftware.smack.util.stringencoder.android.AndroidBase64UrlSafeEncoder; -public class AndroidSmackInitializer extends SimpleSmackInitializer { +public class AndroidSmackInitializer implements SmackInitializer { @Override public List initialize() { diff --git a/smack-core/build.gradle b/smack-core/build.gradle index 24d367a4a..c350291bb 100644 --- a/smack-core/build.gradle +++ b/smack-core/build.gradle @@ -1,3 +1,8 @@ +// Note that this is also declared in the main build.gradle for +// subprojects, but since evaluationDependsOnChildren is enabled we +// need to declare it here too +apply plugin: 'osgi' + description = """\ Smack core components.""" @@ -32,3 +37,9 @@ task createVersionResource(type: CreateFileTask) { } compileJava.dependsOn(createVersionResource) + +jar { + manifest { + instruction 'DynamicImport-Package', '*' + } +} \ No newline at end of file diff --git a/smack-core/src/main/java/org/jivesoftware/smack/initializer/SimpleSmackInitializer.java b/smack-core/src/main/java/org/jivesoftware/smack/initializer/SimpleSmackInitializer.java deleted file mode 100644 index 52e1789d5..000000000 --- a/smack-core/src/main/java/org/jivesoftware/smack/initializer/SimpleSmackInitializer.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * - * Copyright 2014 Florian Schmaus - * - * 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.initializer; - -import java.util.List; - -public abstract class SimpleSmackInitializer implements SmackInitializer { - - @Override - public abstract List initialize(); - - @Override - public List initialize(ClassLoader classLoader) { - return initialize(); - } - -} diff --git a/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackAndOsgiInitializer.java b/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackAndOsgiInitializer.java deleted file mode 100644 index 17bf93c1b..000000000 --- a/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackAndOsgiInitializer.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * - * Copyright 2014 Florian Schmaus - * - * 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.initializer; - -import java.util.List; - -public abstract class SmackAndOsgiInitializer implements SmackInitializer { - - /** - * A simple wrapper around {@link #initialize} for OSGi, as the activate method of a component - * must have a void return type. - */ - public final void activate() { - initialize(); - } - - @Override - public List initialize(ClassLoader classLoader) { - return initialize(); - } - -} diff --git a/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java b/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java index 42b0e954f..6c5c1fc4d 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackInitializer.java @@ -31,5 +31,4 @@ import org.jivesoftware.smack.SmackConfiguration; */ public interface SmackInitializer { public List initialize(); - public List initialize(ClassLoader classLoader); } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/initializer/UrlInitializer.java b/smack-core/src/main/java/org/jivesoftware/smack/initializer/UrlInitializer.java index c3c876cd2..11e4f36ab 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/initializer/UrlInitializer.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/initializer/UrlInitializer.java @@ -34,17 +34,13 @@ import org.jivesoftware.smack.util.FileUtils; * * @author Florian Schmaus */ -public abstract class UrlInitializer extends SmackAndOsgiInitializer { +public abstract class UrlInitializer implements SmackInitializer { private static final Logger LOGGER = Logger.getLogger(UrlInitializer.class.getName()); @Override public List initialize() { - return initialize(this.getClass().getClassLoader()); - } - - @Override - public List initialize(ClassLoader classLoader) { InputStream is; + final ClassLoader classLoader = this.getClass().getClassLoader(); final List exceptions = new LinkedList(); final String providerUrl = getProvidersUrl(); if (providerUrl != null) { diff --git a/smack-core/src/main/resources/org.jivesoftware.smack/smack-config.xml b/smack-core/src/main/resources/org.jivesoftware.smack/smack-config.xml index df5ea47d8..d4a3262f0 100644 --- a/smack-core/src/main/resources/org.jivesoftware.smack/smack-config.xml +++ b/smack-core/src/main/resources/org.jivesoftware.smack/smack-config.xml @@ -11,10 +11,10 @@ org.jivesoftware.smack.util.dns.javax.JavaxResolver org.jivesoftware.smack.util.dns.minidns.MiniDnsResolver org.jivesoftware.smack.util.dns.dnsjava.DNSJavaResolver - org.jivesoftware.smack.initializer.extensions.ExtensionsInitializer - org.jivesoftware.smack.initializer.experimental.ExperimentalInitializer - org.jivesoftware.smack.initializer.legacy.LegacyInitializer - org.jivesoftware.smack.initializer.tcp.SmackTcpSmackInitializer + org.jivesoftware.smack.extensions.ExtensionsInitializer + org.jivesoftware.smack.experimental.ExperimentalInitializer + org.jivesoftware.smack.legacy.LegacyInitializer + org.jivesoftware.smack.tcp.TCPInitializer org.jivesoftware.smack.sasl.javax.SASLJavaXSmackInitializer org.jivesoftware.smack.sasl.provided.SASLProvidedSmackInitializer org.jivesoftware.smack.android.AndroidSmackInitializer diff --git a/smack-experimental/src/main/java/org/jivesoftware/smack/initializer/experimental/ExperimentalInitializer.java b/smack-experimental/src/main/java/org/jivesoftware/smack/experimental/ExperimentalInitializer.java similarity index 81% rename from smack-experimental/src/main/java/org/jivesoftware/smack/initializer/experimental/ExperimentalInitializer.java rename to smack-experimental/src/main/java/org/jivesoftware/smack/experimental/ExperimentalInitializer.java index c73b1a862..7509fc907 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smack/initializer/experimental/ExperimentalInitializer.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smack/experimental/ExperimentalInitializer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smack.initializer.experimental; +package org.jivesoftware.smack.experimental; import org.jivesoftware.smack.initializer.UrlInitializer; @@ -27,11 +27,11 @@ public class ExperimentalInitializer extends UrlInitializer { @Override protected String getProvidersUrl() { - return "classpath:org.jivesoftware.smackx/experimental.providers"; + return "classpath:org.jivesoftware.smack.experimental/experimental.providers"; } @Override protected String getConfigUrl() { - return "classpath:org.jivesoftware.smackx/experimental.xml"; + return "classpath:org.jivesoftware.smack.experimental/experimental.xml"; } } diff --git a/smack-experimental/src/main/resources/org.jivesoftware.smackx/experimental.providers b/smack-experimental/src/main/resources/org.jivesoftware.smack.experimental/experimental.providers similarity index 100% rename from smack-experimental/src/main/resources/org.jivesoftware.smackx/experimental.providers rename to smack-experimental/src/main/resources/org.jivesoftware.smack.experimental/experimental.providers diff --git a/smack-experimental/src/main/resources/org.jivesoftware.smackx/experimental.xml b/smack-experimental/src/main/resources/org.jivesoftware.smack.experimental/experimental.xml similarity index 100% rename from smack-experimental/src/main/resources/org.jivesoftware.smackx/experimental.xml rename to smack-experimental/src/main/resources/org.jivesoftware.smack.experimental/experimental.xml diff --git a/smack-experimental/src/main/resources/org.jivesoftware.smackx/smack-experimental-components.xml b/smack-experimental/src/main/resources/org.jivesoftware.smackx/smack-experimental-components.xml deleted file mode 100644 index eb477cf07..000000000 --- a/smack-experimental/src/main/resources/org.jivesoftware.smackx/smack-experimental-components.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java index 1d0fb3f6b..47a3fc4ec 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/ExperimentalInitializerTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; import java.util.List; -import org.jivesoftware.smack.initializer.experimental.ExperimentalInitializer; +import org.jivesoftware.smack.experimental.ExperimentalInitializer; import org.junit.Test; public class ExperimentalInitializerTest { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smack/initializer/extensions/ExtensionsInitializer.java b/smack-extensions/src/main/java/org/jivesoftware/smack/extensions/ExtensionsInitializer.java similarity index 82% rename from smack-extensions/src/main/java/org/jivesoftware/smack/initializer/extensions/ExtensionsInitializer.java rename to smack-extensions/src/main/java/org/jivesoftware/smack/extensions/ExtensionsInitializer.java index 9a5a9c82f..db451137d 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smack/initializer/extensions/ExtensionsInitializer.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smack/extensions/ExtensionsInitializer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smack.initializer.extensions; +package org.jivesoftware.smack.extensions; import org.jivesoftware.smack.initializer.UrlInitializer; @@ -27,11 +27,11 @@ public class ExtensionsInitializer extends UrlInitializer { @Override protected String getProvidersUrl() { - return "classpath:org.jivesoftware.smackx/extensions.providers"; + return "classpath:org.jivesoftware.smack.extensions/extensions.providers"; } @Override protected String getConfigUrl() { - return "classpath:org.jivesoftware.smackx/extensions.xml"; + return "classpath:org.jivesoftware.smack.extensions/extensions.xml"; } } diff --git a/smack-extensions/src/main/resources/org.jivesoftware.smackx/extensions.providers b/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.providers similarity index 100% rename from smack-extensions/src/main/resources/org.jivesoftware.smackx/extensions.providers rename to smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.providers diff --git a/smack-extensions/src/main/resources/org.jivesoftware.smackx/extensions.xml b/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.xml similarity index 100% rename from smack-extensions/src/main/resources/org.jivesoftware.smackx/extensions.xml rename to smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.xml diff --git a/smack-extensions/src/main/resources/org.jivesoftware.smackx/smack-extensions-components.xml b/smack-extensions/src/main/resources/org.jivesoftware.smackx/smack-extensions-components.xml deleted file mode 100644 index 4333efc5f..000000000 --- a/smack-extensions/src/main/resources/org.jivesoftware.smackx/smack-extensions-components.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/ExtensionsInitializerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/ExtensionsInitializerTest.java index 4e755e9b3..dbb55f015 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/ExtensionsInitializerTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/ExtensionsInitializerTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; import java.util.List; -import org.jivesoftware.smack.initializer.extensions.ExtensionsInitializer; +import org.jivesoftware.smack.extensions.ExtensionsInitializer; import org.junit.Test; public class ExtensionsInitializerTest { diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/InitExtensions.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/InitExtensions.java index 5c0c87228..061bd38b9 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/InitExtensions.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/InitExtensions.java @@ -16,7 +16,7 @@ */ package org.jivesoftware.smackx; -import org.jivesoftware.smack.initializer.extensions.ExtensionsInitializer; +import org.jivesoftware.smack.extensions.ExtensionsInitializer; public class InitExtensions { diff --git a/smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java b/smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java index 64a32d629..68badb1d8 100644 --- a/smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java +++ b/smack-java7/src/main/java/org/jivesoftware/smack/java7/Java7SmackInitializer.java @@ -19,13 +19,13 @@ package org.jivesoftware.smack.java7; import java.util.List; import org.jivesoftware.smack.SmackConfiguration; -import org.jivesoftware.smack.initializer.SmackAndOsgiInitializer; +import org.jivesoftware.smack.initializer.SmackInitializer; import org.jivesoftware.smack.util.stringencoder.Base64; import org.jivesoftware.smack.util.stringencoder.Base64UrlSafeEncoder; import org.jivesoftware.smack.util.stringencoder.java7.Java7Base64Encoder; import org.jivesoftware.smack.util.stringencoder.java7.Java7Base64UrlSafeEncoder; -public class Java7SmackInitializer extends SmackAndOsgiInitializer { +public class Java7SmackInitializer implements SmackInitializer { @Override public List initialize() { diff --git a/smack-java7/src/main/resources/org.jivesoftware.smack/smack-java7-components.xml b/smack-java7/src/main/resources/org.jivesoftware.smack/smack-java7-components.xml deleted file mode 100644 index 4fa757d15..000000000 --- a/smack-java7/src/main/resources/org.jivesoftware.smack/smack-java7-components.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/smack-legacy/src/main/java/org/jivesoftware/smack/initializer/legacy/LegacyInitializer.java b/smack-legacy/src/main/java/org/jivesoftware/smack/legacy/LegacyInitializer.java similarity index 86% rename from smack-legacy/src/main/java/org/jivesoftware/smack/initializer/legacy/LegacyInitializer.java rename to smack-legacy/src/main/java/org/jivesoftware/smack/legacy/LegacyInitializer.java index e4764e594..6e04b7486 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smack/initializer/legacy/LegacyInitializer.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smack/legacy/LegacyInitializer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smack.initializer.legacy; +package org.jivesoftware.smack.legacy; import org.jivesoftware.smack.initializer.UrlInitializer; @@ -22,6 +22,6 @@ public class LegacyInitializer extends UrlInitializer { @Override protected String getProvidersUrl() { - return "classpath:org.jivesoftware.smackx/legacy.providers"; + return "classpath:org.jivesoftware.smack.legacy/legacy.providers"; } } diff --git a/smack-legacy/src/main/resources/org.jivesoftware.smackx/legacy.providers b/smack-legacy/src/main/resources/org.jivesoftware.smack.legacy/legacy.providers similarity index 100% rename from smack-legacy/src/main/resources/org.jivesoftware.smackx/legacy.providers rename to smack-legacy/src/main/resources/org.jivesoftware.smack.legacy/legacy.providers diff --git a/smack-legacy/src/main/resources/org.jivesoftware.smackx/workgroup.providers b/smack-legacy/src/main/resources/org.jivesoftware.smack.legacy/workgroup.providers similarity index 100% rename from smack-legacy/src/main/resources/org.jivesoftware.smackx/workgroup.providers rename to smack-legacy/src/main/resources/org.jivesoftware.smack.legacy/workgroup.providers diff --git a/smack-legacy/src/main/resources/org.jivesoftware.smackx/smack-legacy-components.xml b/smack-legacy/src/main/resources/org.jivesoftware.smackx/smack-legacy-components.xml deleted file mode 100644 index 1bca19539..000000000 --- a/smack-legacy/src/main/resources/org.jivesoftware.smackx/smack-legacy-components.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/smack-legacy/src/test/java/org/jivesoftware/smackx/LegacyInitializerTest.java b/smack-legacy/src/test/java/org/jivesoftware/smackx/LegacyInitializerTest.java index 441251bd1..08e65e019 100644 --- a/smack-legacy/src/test/java/org/jivesoftware/smackx/LegacyInitializerTest.java +++ b/smack-legacy/src/test/java/org/jivesoftware/smackx/LegacyInitializerTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; import java.util.List; -import org.jivesoftware.smack.initializer.legacy.LegacyInitializer; +import org.jivesoftware.smack.legacy.LegacyInitializer; import org.junit.Test; public class LegacyInitializerTest { diff --git a/smack-resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/dnsjava/DNSJavaResolver.java b/smack-resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/dnsjava/DNSJavaResolver.java index 03b76be2e..cb4dbe532 100644 --- a/smack-resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/dnsjava/DNSJavaResolver.java +++ b/smack-resolver-dnsjava/src/main/java/org/jivesoftware/smack/util/dns/dnsjava/DNSJavaResolver.java @@ -19,7 +19,7 @@ package org.jivesoftware.smack.util.dns.dnsjava; import java.util.ArrayList; import java.util.List; -import org.jivesoftware.smack.initializer.SmackAndOsgiInitializer; +import org.jivesoftware.smack.initializer.SmackInitializer; import org.jivesoftware.smack.util.DNSUtil; import org.jivesoftware.smack.util.dns.DNSResolver; import org.jivesoftware.smack.util.dns.SRVRecord; @@ -32,7 +32,7 @@ import org.xbill.DNS.Type; * This implementation uses the dnsjava implementation for resolving DNS addresses. * */ -public class DNSJavaResolver extends SmackAndOsgiInitializer implements DNSResolver { +public class DNSJavaResolver implements SmackInitializer, DNSResolver { private static DNSJavaResolver instance = new DNSJavaResolver(); diff --git a/smack-resolver-dnsjava/src/main/resources/org.jivesoftware.smack/smack-resolver-dnsjava-components.xml b/smack-resolver-dnsjava/src/main/resources/org.jivesoftware.smack/smack-resolver-dnsjava-components.xml deleted file mode 100644 index 83f27180a..000000000 --- a/smack-resolver-dnsjava/src/main/resources/org.jivesoftware.smack/smack-resolver-dnsjava-components.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java b/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java index a6e76aa92..b099f05a5 100644 --- a/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java +++ b/smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java @@ -27,7 +27,7 @@ import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; -import org.jivesoftware.smack.initializer.SmackAndOsgiInitializer; +import org.jivesoftware.smack.initializer.SmackInitializer; import org.jivesoftware.smack.util.DNSUtil; import org.jivesoftware.smack.util.dns.DNSResolver; import org.jivesoftware.smack.util.dns.SRVRecord; @@ -38,7 +38,7 @@ import org.jivesoftware.smack.util.dns.SRVRecord; * @author Florian Schmaus * */ -public class JavaxResolver extends SmackAndOsgiInitializer implements DNSResolver { +public class JavaxResolver implements SmackInitializer, DNSResolver { private static JavaxResolver instance; private static DirContext dirContext; diff --git a/smack-resolver-javax/src/main/resources/org.jivesoftware.smack/smack-resolver-javax-components.xml b/smack-resolver-javax/src/main/resources/org.jivesoftware.smack/smack-resolver-javax-components.xml deleted file mode 100644 index 13d9deabd..000000000 --- a/smack-resolver-javax/src/main/resources/org.jivesoftware.smack/smack-resolver-javax-components.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsResolver.java b/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsResolver.java index 2fefa3d0e..36a04620d 100644 --- a/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsResolver.java +++ b/smack-resolver-minidns/src/main/java/org/jivesoftware/smack/util/dns/minidns/MiniDnsResolver.java @@ -19,7 +19,7 @@ package org.jivesoftware.smack.util.dns.minidns; import java.util.LinkedList; import java.util.List; -import org.jivesoftware.smack.initializer.SmackAndOsgiInitializer; +import org.jivesoftware.smack.initializer.SmackInitializer; import org.jivesoftware.smack.util.DNSUtil; import org.jivesoftware.smack.util.dns.DNSResolver; import org.jivesoftware.smack.util.dns.SRVRecord; @@ -39,7 +39,7 @@ import de.measite.minidns.record.SRV; * This implementation uses the minidns implementation for * resolving DNS addresses. */ -public class MiniDnsResolver extends SmackAndOsgiInitializer implements DNSResolver { +public class MiniDnsResolver implements SmackInitializer, DNSResolver { private static final long ONE_DAY = 24*60*60*1000; private static final MiniDnsResolver instance = new MiniDnsResolver(); diff --git a/smack-resolver-minidns/src/main/resources/org.jivesoftware.smack/smack-resolver-minidns-components.xml b/smack-resolver-minidns/src/main/resources/org.jivesoftware.smack/smack-resolver-minidns-components.xml deleted file mode 100644 index fd887d83e..000000000 --- a/smack-resolver-minidns/src/main/resources/org.jivesoftware.smack/smack-resolver-minidns-components.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLJavaXSmackInitializer.java b/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLJavaXSmackInitializer.java index 735fe214e..445b81edc 100644 --- a/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLJavaXSmackInitializer.java +++ b/smack-sasl-javax/src/main/java/org/jivesoftware/smack/sasl/javax/SASLJavaXSmackInitializer.java @@ -19,9 +19,9 @@ package org.jivesoftware.smack.sasl.javax; import java.util.List; import org.jivesoftware.smack.SASLAuthentication; -import org.jivesoftware.smack.initializer.SmackAndOsgiInitializer; +import org.jivesoftware.smack.initializer.SmackInitializer; -public class SASLJavaXSmackInitializer extends SmackAndOsgiInitializer { +public class SASLJavaXSmackInitializer implements SmackInitializer { @Override public List initialize() { @@ -34,9 +34,4 @@ public class SASLJavaXSmackInitializer extends SmackAndOsgiInitializer { return null; } - @Override - public List initialize(ClassLoader classLoader) { - return initialize(); - } - } diff --git a/smack-sasl-javax/src/main/resources/org.jivesoftware.smack/smack-sasl-javax-components.xml b/smack-sasl-javax/src/main/resources/org.jivesoftware.smack/smack-sasl-javax-components.xml deleted file mode 100644 index ebbd5403e..000000000 --- a/smack-sasl-javax/src/main/resources/org.jivesoftware.smack/smack-sasl-javax-components.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLProvidedSmackInitializer.java b/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLProvidedSmackInitializer.java index 07e8a476d..849ccbc15 100644 --- a/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLProvidedSmackInitializer.java +++ b/smack-sasl-provided/src/main/java/org/jivesoftware/smack/sasl/provided/SASLProvidedSmackInitializer.java @@ -19,9 +19,9 @@ package org.jivesoftware.smack.sasl.provided; import java.util.List; import org.jivesoftware.smack.SASLAuthentication; -import org.jivesoftware.smack.initializer.SmackAndOsgiInitializer; +import org.jivesoftware.smack.initializer.SmackInitializer; -public class SASLProvidedSmackInitializer extends SmackAndOsgiInitializer { +public class SASLProvidedSmackInitializer implements SmackInitializer { @Override public List initialize() { @@ -31,9 +31,4 @@ public class SASLProvidedSmackInitializer extends SmackAndOsgiInitializer { return null; } - @Override - public List initialize(ClassLoader classLoader) { - return initialize(); - } - } diff --git a/smack-sasl-provided/src/main/resources/org.jivesoftware.smack/smack-sasl-provided-components.xml b/smack-sasl-provided/src/main/resources/org.jivesoftware.smack/smack-sasl-provided-components.xml deleted file mode 100644 index ee995e18b..000000000 --- a/smack-sasl-provided/src/main/resources/org.jivesoftware.smack/smack-sasl-provided-components.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/initializer/tcp/SmackTcpSmackInitializer.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/TCPInitializer.java similarity index 80% rename from smack-tcp/src/main/java/org/jivesoftware/smack/initializer/tcp/SmackTcpSmackInitializer.java rename to smack-tcp/src/main/java/org/jivesoftware/smack/tcp/TCPInitializer.java index 80cb4dc3c..1d70c39c8 100644 --- a/smack-tcp/src/main/java/org/jivesoftware/smack/initializer/tcp/SmackTcpSmackInitializer.java +++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/TCPInitializer.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smack.initializer.tcp; +package org.jivesoftware.smack.tcp; import org.jivesoftware.smack.initializer.UrlInitializer; -public class SmackTcpSmackInitializer extends UrlInitializer { +public class TCPInitializer extends UrlInitializer { @Override protected String getProvidersUrl() { - return "classpath:org.jivesoftware.smack/smacktcp.providers"; + return "classpath:org.jivesoftware.smack.tcp/smacktcp.providers"; } } diff --git a/smack-tcp/src/main/resources/org.jivesoftware.smack/smacktcp.providers b/smack-tcp/src/main/resources/org.jivesoftware.smack.tcp/smacktcp.providers similarity index 100% rename from smack-tcp/src/main/resources/org.jivesoftware.smack/smacktcp.providers rename to smack-tcp/src/main/resources/org.jivesoftware.smack.tcp/smacktcp.providers