Switches Jitsi trunk to libjitsi.

6 files changed, 9 insertions, 7 deletions

diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java
index cd567cd..d9d03be 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java
@@ -11,7 +11,7 @@ import java.util.*;
 import org.osgi.framework.*;
 
 import net.java.sip.communicator.service.browserlauncher.*;
-import net.java.sip.communicator.service.configuration.*;
+import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistration.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistration.java
index 4e579b4..799eff3 100755
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistration.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistration.java
@@ -816,4 +816,4 @@ public class JabberAccountRegistration
     {
         this.defaultDTMFMethod = defaultDTMFMethod;
     }
-}
\ No newline at end of file
+}
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
index 5c6a58b..eec4b28 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
@@ -729,4 +729,4 @@ public class JabberAccountRegistrationWizard
     {
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
index c893223..079fc76 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberServerChooserDialog.java
@@ -19,10 +19,10 @@ import javax.swing.event.*;
 import javax.swing.table.*;
 import javax.xml.parsers.*;
 
-import net.java.sip.communicator.service.fileaccess.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.fileaccess.*;
 import org.osgi.framework.*;
 import org.w3c.dom.*;
 import org.xml.sax.*;
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java
index 7ede295..7e241d2 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/Resources.java
@@ -10,6 +10,8 @@ import java.io.*;
 
 import net.java.sip.communicator.service.resources.*;
 
+import org.jitsi.service.resources.*;
+
 /**
  * The <tt>Resources</tt> class manages the access to the internationalization
  * properties files and the image resources used in this plugin.
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
index 4a06c85..184dd65 100755
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
@@ -7,17 +7,17 @@ System-Bundle: yes
 Export-package: net.java.sip.communicator.plugin.jabberaccregwizz
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
- net.java.sip.communicator.service.configuration,
+ org.jitsi.service.configuration,
  net.java.sip.communicator.service.credentialsstorage,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
- net.java.sip.communicator.service.fileaccess,
+ org.jitsi.service.fileaccess,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.protocol.icqconstants,
- net.java.sip.communicator.service.resources,
+ org.jitsi.service.resources, net.java.sip.communicator.service.resources,
  net.java.sip.communicator.util,
  net.java.sip.communicator.util.swing,
  javax.naming,