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

Add SmackAndOsgiInitializer

Browse source 
OSGi ServiceComponents need the activate method, make sure it exists for
every SmackInitializer by using this class.
This commit is contained in:
Florian Schmaus 2014-07-20 11:19:50 +02:00
parent 9db5e28fe5
commit 59527d320d
3 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
smack-core/src/main/java/org/jivesoftware/smack/initializer/SmackAndOsgiInitializer.java Normal file
View file

@ -0,0 +1,28 @@
/**
*
* 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;
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();
}
}

10
smack-core/src/main/java/org/jivesoftware/smack/initializer/UrlInitializer.java
View file

@ -34,17 +34,9 @@ import org.jivesoftware.smack.util.FileUtils;
* *
* @author Florian Schmaus * @author Florian Schmaus
*/ */
public abstract class UrlInitializer implements SmackInitializer { public abstract class UrlInitializer extends SmackAndOsgiInitializer {
private static final Logger LOGGER = Logger.getLogger(UrlInitializer.class.getName()); private static final Logger LOGGER = Logger.getLogger(UrlInitializer.class.getName());
/**
* 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 @Override
public List<Exception> initialize() { public List<Exception> initialize() {
return initialize(this.getClass().getClassLoader()); return initialize(this.getClass().getClassLoader());

4
smack-resolver-javax/src/main/java/org/jivesoftware/smack/util/dns/javax/JavaxResolver.java
View file

@ -28,7 +28,7 @@ import javax.naming.directory.Attributes;
import javax.naming.directory.DirContext; import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext; import javax.naming.directory.InitialDirContext;
import org.jivesoftware.smack.initializer.SmackInitializer; import org.jivesoftware.smack.initializer.SmackAndOsgiInitializer;
import org.jivesoftware.smack.util.DNSUtil; import org.jivesoftware.smack.util.DNSUtil;
import org.jivesoftware.smack.util.dns.DNSResolver; import org.jivesoftware.smack.util.dns.DNSResolver;
import org.jivesoftware.smack.util.dns.SRVRecord; import org.jivesoftware.smack.util.dns.SRVRecord;
@ -39,7 +39,7 @@ import org.jivesoftware.smack.util.dns.SRVRecord;
* @author Florian Schmaus * @author Florian Schmaus
* *
*/ */
public class JavaxResolver implements DNSResolver, SmackInitializer { public class JavaxResolver extends SmackAndOsgiInitializer implements DNSResolver {
private static JavaxResolver instance; private static JavaxResolver instance;
private static DirContext dirContext; private static DirContext dirContext;