Tests reorder bundles.

cusax-fix
Damian Minkov 13 years ago
parent ba0ceae3d4
commit 5d0e75a9cc

@ -69,9 +69,6 @@ felix.auto.start.31= \
reference:file:sc-bundles/configuration.jar \
reference:file:sc-bundles/notification-service.jar
felix.auto.start.32= \
reference:file:sc-bundles/dns.jar
felix.auto.start.40= \
reference:file:sc-bundles/hid.jar \
reference:file:sc-bundles/ui-service.jar \
@ -87,6 +84,9 @@ felix.auto.start.40= \
reference:file:sc-bundles/browserlauncher.jar \
reference:file:sc-bundles/contactsource.jar
felix.auto.start.42= \
reference:file:sc-bundles/dns.jar
felix.auto.start.50= \
reference:file:sc-bundles/bouncycastle.jar \
reference:file:sc-bundles/zrtp4j.jar \

@ -111,13 +111,13 @@ public class ParallelResolverImpl
private void initProperties()
{
String rslvrAddrStr
= UtilActivator.getConfigurationService().getString(
= DnsUtilActivator.getConfigurationService().getString(
DnsUtilActivator.PNAME_BACKUP_RESOLVER,
DnsUtilActivator.DEFAULT_BACKUP_RESOLVER);
String customResolverIP
= UtilActivator.getConfigurationService().getString(
= DnsUtilActivator.getConfigurationService().getString(
DnsUtilActivator.PNAME_BACKUP_RESOLVER_FALLBACK_IP,
UtilActivator.getResources().getSettingsString(
DnsUtilActivator.getResources().getSettingsString(
DnsUtilActivator.PNAME_BACKUP_RESOLVER_FALLBACK_IP));
InetAddress resolverAddress = null;
@ -147,7 +147,7 @@ private void initProperties()
}
}
int resolverPort = UtilActivator.getConfigurationService().getInt(
int resolverPort = DnsUtilActivator.getConfigurationService().getInt(
DnsUtilActivator.PNAME_BACKUP_RESOLVER_PORT,
SimpleResolver.DEFAULT_PORT);

Loading…
Cancel
Save