Separates dns package to service and impl. Creates a ParallelResolver interface that can be used from the util package. Moves NetworkUtils back to util package. Moves dnsconfig plugin to the impl/dns package (because it was using implementation classes directly).

21 files changed, 21 insertions, 21 deletions

diff --git a/test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf b/test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf
index 2a9372d..6a17071 100644
--- a/test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/callhistory/callhistory.slick.manifest.mf
@@ -19,7 +19,7 @@ Import-Package: junit.framework,
  org.w3c.dom,
  javax.xml.parsers,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  org.jitsi.util.xml,
  javax.xml.transform,
  javax.xml.transform.dom,
diff --git a/test/net/java/sip/communicator/slick/configuration/configuration.slick.manifest.mf b/test/net/java/sip/communicator/slick/configuration/configuration.slick.manifest.mf
index 292cdf1..0b75d21 100644
--- a/test/net/java/sip/communicator/slick/configuration/configuration.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/configuration/configuration.slick.manifest.mf
@@ -10,7 +10,7 @@ Import-Package: junit.framework,
  org.w3c.dom,
  javax.xml.parsers,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  org.jitsi.util.xml,
  javax.xml.transform,
  javax.xml.transform.dom,
diff --git a/test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf b/test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf
index 218b1ff..d9701e3 100644
--- a/test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/contactlist/meta.cl.slick.manifest.mf
@@ -9,7 +9,7 @@ Import-Package: net.java.sip.communicator.service.contactlist,
  org.osgi.framework,
  junit.framework,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  org.jitsi.service.configuration,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.icqconstants,
diff --git a/test/net/java/sip/communicator/slick/credentialsstorage/credentialsstorage.slick.manifest.mf b/test/net/java/sip/communicator/slick/credentialsstorage/credentialsstorage.slick.manifest.mf
index 8859140..674de48 100644
--- a/test/net/java/sip/communicator/slick/credentialsstorage/credentialsstorage.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/credentialsstorage/credentialsstorage.slick.manifest.mf
@@ -7,6 +7,6 @@ System-Bundle: yes
 Import-Package: junit.framework,
  net.java.sip.communicator.service.credentialsstorage,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  org.osgi.framework
 Export-Package: net.java.sip.communicator.slick.credentialsstorage
diff --git a/test/net/java/sip/communicator/slick/fileaccess/fileaccess.slick.manifest.mf b/test/net/java/sip/communicator/slick/fileaccess/fileaccess.slick.manifest.mf
index 7c07bb1..f34a3cd 100644
--- a/test/net/java/sip/communicator/slick/fileaccess/fileaccess.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/fileaccess/fileaccess.slick.manifest.mf
@@ -12,7 +12,7 @@ Import-Package: junit.framework,
  org.w3c.dom,
  javax.xml.parsers,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  javax.xml.transform,
  javax.xml.transform.dom,
  javax.xml.transform.stream,
diff --git a/test/net/java/sip/communicator/slick/history/history.slick.manifest.mf b/test/net/java/sip/communicator/slick/history/history.slick.manifest.mf
index 07f0e70..8d3c48f 100644
--- a/test/net/java/sip/communicator/slick/history/history.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/history/history.slick.manifest.mf
@@ -13,7 +13,7 @@ Import-Package: junit.framework,
  org.w3c.dom,
  javax.xml.parsers,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  org.jitsi.util.xml,
  javax.xml.transform,
  javax.xml.transform.dom,
diff --git a/test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf b/test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf
index fe0a6df..af97d92 100644
--- a/test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/metahistory/metahistory.slick.manifest.mf
@@ -20,7 +20,7 @@ Import-Package: junit.framework,
  org.w3c.dom,
  javax.xml.parsers,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  org.jitsi.util.xml,
  javax.xml.transform,
  javax.xml.transform.dom,
diff --git a/test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf b/test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf
index 4c8bee8..4cf11fc 100644
--- a/test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/msghistory/msghistory.slick.manifest.mf
@@ -17,7 +17,7 @@ Import-Package: junit.framework,
  org.w3c.dom,
  javax.xml.parsers,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  org.jitsi.util.xml,
  javax.xml.transform,
  javax.xml.transform.dom,
diff --git a/test/net/java/sip/communicator/slick/netaddr/netaddr.slick.manifest.mf b/test/net/java/sip/communicator/slick/netaddr/netaddr.slick.manifest.mf
index 155adca..4b4045a 100644
--- a/test/net/java/sip/communicator/slick/netaddr/netaddr.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/netaddr/netaddr.slick.manifest.mf
@@ -5,7 +5,7 @@ Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 System-Bundle: yes
 Import-Package: net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  net.java.sip.communicator.service.netaddr,
  org.jitsi.service.configuration,
  junit,
diff --git a/test/net/java/sip/communicator/slick/popupmessagehandler/popupmessagehandler.slick.manifest.mf b/test/net/java/sip/communicator/slick/popupmessagehandler/popupmessagehandler.slick.manifest.mf
index cf24ea8..7e89c81 100644
--- a/test/net/java/sip/communicator/slick/popupmessagehandler/popupmessagehandler.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/popupmessagehandler/popupmessagehandler.slick.manifest.mf
@@ -10,5 +10,5 @@ Import-Package: junit.framework,
  net.java.sip.communicator.service.systray,

  net.java.sip.communicator.service.systray.event,

  net.java.sip.communicator.util,

- net.java.sip.communicator.plugin.desktoputil.dns

+ net.java.sip.communicator.service.dns

 Export-Package: net.java.sip.communicator.slick.popupmessagehandler,

diff --git a/test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf
index ccf6510..7808c87 100644
--- a/test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/protocol/gibberish/gibberish.provider.slick.manifest.mf
@@ -8,6 +8,6 @@ Import-Package: org.jitsi.service.configuration,
  junit.framework,
  org.osgi.framework,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event
diff --git a/test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf
index 69d7eda..8f7c59f 100644
--- a/test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf
@@ -9,7 +9,7 @@ Import-Package: junit.framework,
  org.jitsi.service.configuration,
  org.osgi.framework,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.icqconstants,
  net.java.sip.communicator.service.protocol.aimconstants,
diff --git a/test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf
index 3012c8f..f35f7f2 100644
--- a/test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/protocol/jabber/jabber.provider.slick.manifest.mf
@@ -12,7 +12,7 @@ Import-Package: org.jitsi.service.configuration,
  javax.net.ssl,
  javax.xml.parsers,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.jabberconstants,
  net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
diff --git a/test/net/java/sip/communicator/slick/protocol/msn/msn.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/msn/msn.provider.slick.manifest.mf
index be0966b..7e7cc92 100644
--- a/test/net/java/sip/communicator/slick/protocol/msn/msn.provider.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/protocol/msn/msn.provider.slick.manifest.mf
@@ -13,5 +13,5 @@ Import-Package: junit.framework,
  net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
  net.java.sip.communicator.service.protocol.msnconstants,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  org.jitsi.service.fileaccess
diff --git a/test/net/java/sip/communicator/slick/protocol/rss/rss.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/rss/rss.provider.slick.manifest.mf
index a34a0ff..bbf9672 100644
--- a/test/net/java/sip/communicator/slick/protocol/rss/rss.provider.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/protocol/rss/rss.provider.slick.manifest.mf
@@ -8,6 +8,6 @@ Import-Package: org.jitsi.service.configuration,
  junit.framework,
  org.osgi.framework,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event
diff --git a/test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java b/test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java
index cd37348..3d1415f 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java
+++ b/test/net/java/sip/communicator/slick/protocol/sip/TestAutoProxyDetection.java
@@ -18,8 +18,8 @@ import java.text.*;
 import junit.framework.*;

 import net.java.sip.communicator.impl.protocol.sip.*;

 import net.java.sip.communicator.impl.protocol.sip.net.*;

+import net.java.sip.communicator.service.dns.*;

 import net.java.sip.communicator.util.*;

-import net.java.sip.communicator.plugin.desktoputil.dns.*;

 

 /**

  * Tests all variations of automatic proxy detection through (simulated) DNS.

diff --git a/test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf
index e03f913..3a87702 100644
--- a/test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/protocol/sip/sip.provider.slick.manifest.mf
@@ -11,7 +11,7 @@ Import-Package: org.jitsi.service.configuration,
  org.easymock,
  javax.xml.namespace,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.impl.dns,
  org.jitsi.util.xml,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
diff --git a/test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf b/test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf
index a031697..b50e23a 100644
--- a/test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/protocol/yahoo/yahoo.provider.slick.manifest.mf
@@ -10,7 +10,7 @@ Import-Package: org.jitsi.service.configuration,
  javax.net.ssl,
  javax.xml.parsers,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.yahooconstants,
  net.java.sip.communicator.service.protocol.event,org.jitsi.service.protocol.event,
diff --git a/test/net/java/sip/communicator/slick/runner/slick-runner.manifest.mf b/test/net/java/sip/communicator/slick/runner/slick-runner.manifest.mf
index 83ad748..c450df2 100644
--- a/test/net/java/sip/communicator/slick/runner/slick-runner.manifest.mf
+++ b/test/net/java/sip/communicator/slick/runner/slick-runner.manifest.mf
@@ -14,7 +14,7 @@ Import-Package: org.jitsi.service.configuration,
  org.osgi.framework,
  org.w3c.dom,
  javax.xml.parsers,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  org.jitsi.util.xml,
  javax.xml.transform,
  javax.xml.transform.dom,
diff --git a/test/net/java/sip/communicator/slick/slickless/slickless.manifest.mf b/test/net/java/sip/communicator/slick/slickless/slickless.manifest.mf
index 4a1d322..9d058d4 100644
--- a/test/net/java/sip/communicator/slick/slickless/slickless.manifest.mf
+++ b/test/net/java/sip/communicator/slick/slickless/slickless.manifest.mf
@@ -13,7 +13,7 @@ Import-Package: org.jitsi.service.configuration,
  org.osgi.framework,
  org.w3c.dom,
  javax.xml.parsers,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  org.jitsi.util.xml,
  javax.xml.transform,
  javax.xml.transform.dom,
diff --git a/test/net/java/sip/communicator/slick/version/version.slick.manifest.mf b/test/net/java/sip/communicator/slick/version/version.slick.manifest.mf
index a071925..18832fc 100644
--- a/test/net/java/sip/communicator/slick/version/version.slick.manifest.mf
+++ b/test/net/java/sip/communicator/slick/version/version.slick.manifest.mf
@@ -6,7 +6,7 @@ Bundle-Version: 0.0.1
 System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.util,
- net.java.sip.communicator.plugin.desktoputil.dns,
+ net.java.sip.communicator.service.dns,
  org.jitsi.service.configuration,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.icqconstants,