Moves dns config as plugin.

cusax-fix
Damian Minkov 13 years ago
parent c89ef5ecd7
commit d85567ad14

@ -903,7 +903,8 @@
<!-- - - - - - - - - - - - - - BUNDLE BUILDING TARGETS - - - - - - - - -->
<!--ALL BUNDLES-->
<target name="bundles"
depends="bundle-sc-launcher,bundle-util,bundle-service-dns,bundle-impl-dns,
depends="bundle-sc-launcher,bundle-util,bundle-service-dns,
bundle-impl-dns,bundle-dns-config,
bundle-configuration,bundle-configuration-slick,
bundle-history,bundle-history-slick,bundle-messagehistory, bundle-msghistory-slick,
bundle-callhistory, bundle-callhistory-slick, bundle-popupmessagehandler-slick,
@ -1091,6 +1092,15 @@
prefix="net/java/sip/communicator/impl/dns"/>
</jar>
</target>
<!--BUNDLE-DNS-CONFIG-->
<target name="bundle-dns-config">
<!-- Create the dnsconfig.jar-->
<jar compress="true" destfile="${bundles.dest}/dnsconfig.jar"
manifest="${src}/net/java/sip/communicator/plugin/dnsconfig/dnsconfig.manifest.mf">
<zipfileset dir="${dest}/net/java/sip/communicator/plugin/dnsconfig"
prefix="net/java/sip/communicator/plugin/dnsconfig"/>
</jar>
</target>
<!--BUNDLE-CONFIGURATION-->
<target name="bundle-configuration">

@ -55,7 +55,8 @@ felix.auto.start.31= \
reference:file:sc-bundles/notification-service.jar
felix.auto.start.32= \
reference:file:sc-bundles/dns.jar
reference:file:sc-bundles/dns.jar \
reference:file:sc-bundles/dnsconfig.jar
felix.auto.start.35= \
reference:file:sc-bundles/commons-codec.jar \

@ -6,7 +6,6 @@
*/
package net.java.sip.communicator.impl.dns;
import net.java.sip.communicator.impl.dns.dnsconfig.*;
import net.java.sip.communicator.service.dns.*;
import net.java.sip.communicator.service.netaddr.*;
import net.java.sip.communicator.service.netaddr.event.*;
@ -45,7 +44,6 @@ public class DnsUtilActivator
private static NotificationService notificationService;
private static ResourceManagementService resourceService;
private static BundleContext bundleContext;
private static DnsConfigActivator dnsConfigActivator;
/**
* The address of the backup resolver we would use by default.
@ -130,8 +128,6 @@ public void start(BundleContext context)
logger.info("DnssecResolver ... [REGISTERED]");
}
dnsConfigActivator = new DnsConfigActivator();
dnsConfigActivator.start(context);
logger.info("DNS service ... [STARTED]");
}
@ -208,8 +204,6 @@ public static void reloadDnsResolverConfig()
public void stop(BundleContext context)
throws Exception
{
if (dnsConfigActivator != null)
dnsConfigActivator.stop(context);
}
/**

@ -4,7 +4,7 @@
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package net.java.sip.communicator.impl.dns.dnsconfig;
package net.java.sip.communicator.plugin.dnsconfig;
import java.util.*;

@ -4,7 +4,7 @@
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package net.java.sip.communicator.impl.dns.dnsconfig;
package net.java.sip.communicator.plugin.dnsconfig;
import net.java.sip.communicator.plugin.desktoputil.*;
import net.java.sip.communicator.util.*;

@ -4,7 +4,7 @@
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package net.java.sip.communicator.impl.dns.dnsconfig;
package net.java.sip.communicator.plugin.dnsconfig;
import java.awt.*;
import java.awt.event.*;

@ -4,7 +4,7 @@
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package net.java.sip.communicator.impl.dns.dnsconfig;
package net.java.sip.communicator.plugin.dnsconfig;
import java.awt.*;
import java.util.*;

@ -4,7 +4,7 @@
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
package net.java.sip.communicator.impl.dns.dnsconfig;
package net.java.sip.communicator.plugin.dnsconfig;
import static net.java.sip.communicator.impl.dns.DnsUtilActivator.*;
import static net.java.sip.communicator.service.dns.CustomResolver.*;

@ -0,0 +1,30 @@
Bundle-Activator: net.java.sip.communicator.plugin.dnsconfig.DnsConfigActivator
Bundle-Name: Jitsi DNS config
Bundle-SymbolicName: net.java.sip.communicator.plugin
Bundle-Description: A bundle that export config panels for DNS utility classes.
Bundle-Vendor: jitsi.org
Bundle-Version: 0.0.1
System-Bundle: yes
Import-Package: org.jitsi.util,
org.osgi.framework,
net.java.sip.communicator.util,
net.java.sip.communicator.plugin.desktoputil,
org.jitsi.service.resources,
org.jitsi.service.fileaccess,
net.java.sip.communicator.impl.dns,
net.java.sip.communicator.service.resources,
net.java.sip.communicator.service.notification,
net.java.sip.communicator.service.dns,
net.java.sip.communicator.service.gui,
net.java.sip.communicator.service.netaddr,
net.java.sip.communicator.service.netaddr.event,
org.jitsi.service.configuration,
sun.net.dns,
org.xbill.DNS,
javax.swing,
javax.swing.event,
javax.swing.text,
javax.swing.border,
javax.swing.plaf.basic,
javax.swing.table
Loading…
Cancel
Save