Switches Jitsi trunk to libjitsi.

.classpath

@@ -36,6 +36,7 @@
 	<classpathentry kind="lib" path="lib/installer-exclude/junit.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/laf-widget.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/libphonenumber-2.4.jar"/>
+	<classpathentry kind="lib" path="lib/installer-exclude/libjitsi.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/log4j-1.2.8.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/jain-sdp.jar">
 		<attributes>

build.xml

@@ -471,8 +471,15 @@
         </javac>
 
 
-        <taskdef name="sip-communicator-version" classpath="${dest}"
-                 classname="net.java.sip.communicator.impl.version.SipCommunicatorVersionTask"/>
+        <taskdef
+            name="sip-communicator-version"
+            classname="net.java.sip.communicator.impl.version.SipCommunicatorVersionTask">
+
+            <classpath>
+                <pathelement path="${dest}"/>
+            	<pathelement location="${lib.noinst}/libjitsi.jar"/>
+            </classpath>
+        </taskdef>
 
         <sip-communicator-version property="sip-communicator.version" />
 
@@ -905,7 +912,7 @@
         bundle-plugin-msnaccregwizz,bundle-plugin-sipaccregwizz,
         bundle-plugin-yahooaccregwizz,bundle-plugin-aimaccregwizz,
         bundle-commons-codec,bundle-httputil,bundle-plugin-spellcheck,
-        bundle-version,bundle-version-impl,bundle-shutdown-timeout,
+        bundle-version-impl,bundle-shutdown-timeout,
         bundle-growlnotification,bundle-swingnotification,bundle-galagonotification,
         bundle-sparkle, bundle-plugin-branding,
         bundle-systemactivitynotifications,
@@ -935,7 +942,7 @@
         bundle-provdisc,bundle-provdisc-dhcp,bundle-provdisc-mdns,
         bundle-provisioning,bundle-addrbook,bundle-plugin-ldap,
         bundle-plugin-contactsourceconfig,bundle-plugin-certconfig,
-        bundle-globalshortcut,bundle-plugin-msofficecomm"/>
+        bundle-globalshortcut,bundle-plugin-msofficecomm,bundle-libjitsi"/>
 
     <!--BUNDLE-SC-LAUNCHER-->
     <target name="bundle-sc-launcher">
@@ -1073,8 +1080,6 @@
             destfile="${bundles.dest}/configuration.jar"
             manifest="${src}/net/java/sip/communicator/impl/configuration/configuration.manifest.mf" >
 
-            <zipfileset dir="${dest}/net/java/sip/communicator/service/configuration"
-                prefix="net/java/sip/communicator/service/configuration"/>
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/configuration"
                 prefix="net/java/sip/communicator/impl/configuration" />
         </jar>
@@ -1120,24 +1125,33 @@
         </jar>
     </target>
 
+    <!--BUNDLE-LIBJITSI -->
+    <target name="bundle-libjitsi">
+        <jar
+            compress="false"
+            destfile="${bundles.dest}/libjitsi.jar"
+            manifest="${src}/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf">
+
+            <zipfileset dir="${dest}/net/java/sip/communicator/impl/libjitsi"
+                prefix="net/java/sip/communicator/impl/libjitsi"/>
+            <zipfileset src="${lib.noinst}/fmj.jar" prefix=""/>
+            <zipfileset src="${lib.noinst}/libjitsi.jar" prefix=""/>
+        </jar>
+    </target>
+
     <!--BUNDLE-NEOMEDIA-->
     <target name="bundle-neomedia">
         <!-- Creates a bundle containing the impl of the neomedia package and
             FMJ. -->
         <jar
-            compress="false" destfile="${bundles.dest}/neomedia.jar"
+            compress="false"
+            destfile="${bundles.dest}/neomedia.jar"
             manifest="${src}/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf">
 
-            <zipfileset dir="${dest}/net/java/sip/communicator/service/neomedia"
-                prefix="net/java/sip/communicator/service/neomedia"/>
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/neomedia"
                 prefix="net/java/sip/communicator/impl/neomedia"/>
-            <zipfileset dir="${dest}/net/java/sip/communicator/service/audionotifier"
-                prefix="net/java/sip/communicator/service/audionotifier"/>
             <zipfileset dir="${resources}/images/impl/media"
                 prefix="resources/images/impl/media"/>
-            <zipfileset src="${lib.noinst}/fmj.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/jspeex.jar" prefix=""/>
         </jar>
     </target>
 
@@ -1700,16 +1714,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-    <!-- BUNDLE-SERVICE-VERSION -->
-    <target name="bundle-version">
-        <!-- Creates a bundle for the version service.-->
-        <jar compress="false" destfile="${bundles.dest}/version.jar"
-            manifest="${src}/net/java/sip/communicator/service/version/version.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/service/version"
-                prefix="net/java/sip/communicator/service/version"/>
-        </jar>
-    </target>
-
     <!-- BUNDLE-SERVICEIMPL-VERSION -->
     <target name="bundle-version-impl">
         <!-- Creates a bundle for the version service impl.-->
@@ -2666,8 +2670,6 @@ javax.swing.event, javax.swing.border"/>
     <target name="bundle-packetlogging">
         <jar compress="false" destfile="${bundles.dest}/packetlogging.jar"
             manifest="${src}/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/service/packetlogging"
-                prefix="net/java/sip/communicator/service/packetlogging" />
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/packetlogging"
                 prefix="net/java/sip/communicator/impl/packetlogging" />
         </jar>

lib/felix.client.run.properties

@@ -31,6 +31,9 @@ felix.auto.start.10= \
 # file:lib/bundle/servicebinder.jar \
 # file:lib/bundle/tablelayout.jar
 
+felix.auto.start.15= \
+ reference:file:sc-bundles/libjitsi.jar
+
 felix.auto.start.20= \
  reference:file:sc-bundles/util.jar \
  reference:file:lib/bundle/log4j.jar \
@@ -69,7 +72,6 @@ felix.auto.start.42= \
 felix.auto.start.45= \
  reference:file:sc-bundles/ui-service.jar \
  reference:file:sc-bundles/argdelegation-service.jar \
- reference:file:sc-bundles/version.jar \
  reference:file:sc-bundles/version-impl.jar \
  reference:file:sc-bundles/branding.jar \
  reference:file:sc-bundles/provdisc-dhcp.jar \

lib/felix.unit.test.properties

@@ -51,6 +51,9 @@ felix.auto.start.10= \
 # file:lib/bundle/bundlerepository.jar \
 # file:lib/bundle/servicebinder.jar \
 
+felix.auto.start.15= \
+ reference:file:sc-bundles/libjitsi.jar
+
 felix.auto.start.20= \
  reference:file:sc-bundles/util.jar \
  reference:file:lib/bundle/log4j.jar \
@@ -74,7 +77,6 @@ felix.auto.start.40= \
  reference:file:sc-bundles/resourcemanager.jar \
  reference:file:sc-bundles/defaultresources.jar \
  reference:file:sc-bundles/jfontchooserlib.jar \
- reference:file:sc-bundles/version.jar \
  reference:file:sc-bundles/version-impl.jar \
  reference:file:sc-bundles/keybindings.jar \
  reference:file:sc-bundles/netaddr.jar \

src/net/java/sip/communicator/impl/argdelegation/ArgDelegationActivator.java

@@ -6,16 +6,17 @@
  */
 package net.java.sip.communicator.impl.argdelegation;
 
+import java.lang.reflect.*;
+
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.launchutils.*;
 
+import org.jitsi.util.*;
 import org.osgi.framework.*;
 
 import com.apple.eawt.*;
 
-import java.lang.reflect.*;
-
 /**
  * Activates the <tt>ArgDelegationService</tt> and registers a URI delegation
  * peer with the util package arg manager so that we would be notified when the

src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf

@@ -8,7 +8,8 @@ Import-Package: org.osgi.framework,
  com.apple.eawt,
  net.java.sip.communicator.util,
  net.java.sip.communicator.util.launchutils,
- net.java.sip.communicator.service.configuration,
+ org.jitsi.service.configuration,
+ org.jitsi.util,
  net.java.sip.communicator.service.argdelegation,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.event,

src/net/java/sip/communicator/impl/browserlauncher/BrowserLauncherImpl.java

@@ -7,7 +7,9 @@
 package net.java.sip.communicator.impl.browserlauncher;
 
 import net.java.sip.communicator.service.browserlauncher.*;
-import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Logger;
+
+import org.jitsi.util.*;
 
 import com.apple.eio.*;
 

src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf

@@ -6,6 +6,7 @@ Bundle-Version: 0.0.1
 System-Bundle: yes
 Export-Package: net.java.sip.communicator.service.browserlauncher
 Import-Package: org.osgi.framework,
+ org.jitsi.util,
  net.java.sip.communicator.util,
  net.java.sip.communicator.service.browserlauncher,
  com.apple.eio

src/net/java/sip/communicator/impl/callhistory/CallHistoryActivator.java

@@ -8,14 +8,14 @@
 
 import java.util.*;
 
-import org.osgi.framework.*;
-
+import net.java.sip.communicator.service.callhistory.*;
+import net.java.sip.communicator.service.contactsource.*;
 import net.java.sip.communicator.service.history.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.service.callhistory.*;
-import net.java.sip.communicator.service.contactsource.*;
+
+import org.jitsi.service.resources.*;
+import org.osgi.framework.*;
 
 /**
  * Activates the <tt>CallHistoryService</tt>.

src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf

@@ -5,7 +5,7 @@ Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
 System-Bundle: yes
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.service.fileaccess,
+ org.jitsi.service.fileaccess,
  net.java.sip.communicator.service.history,
  net.java.sip.communicator.service.history.event,
  net.java.sip.communicator.service.contactlist,
@@ -15,7 +15,7 @@ Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.protocol.icqconstants,
  net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.contactsource,
- net.java.sip.communicator.service.resources
+ org.jitsi.service.resources, net.java.sip.communicator.service.resources
 Export-Package: net.java.sip.communicator.service.callhistory,
  net.java.sip.communicator.service.callhistory.event
 Metadata-Location: net.java.sip.communicator.impl.msghistory,

src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java

@@ -11,7 +11,7 @@
 import java.lang.reflect.*;
 import java.net.*;
 import java.security.*;
-import java.security.KeyStore.*;
+import java.security.KeyStore.Builder;
 import java.security.cert.*;
 import java.security.cert.Certificate;
 import java.util.*;
@@ -20,18 +20,19 @@
 import javax.security.auth.callback.*;
 import javax.swing.*;
 
-import org.bouncycastle.asn1.*;
-import org.bouncycastle.asn1.x509.*;
-import org.bouncycastle.asn1.x509.X509Extension;
-
 import net.java.sip.communicator.service.certificate.*;
-import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.service.httputil.*;
-import net.java.sip.communicator.service.resources.*;
-import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Logger;
 import net.java.sip.communicator.util.swing.*;
 
+import org.bouncycastle.asn1.*;
+import org.bouncycastle.asn1.x509.*;
+import org.bouncycastle.asn1.x509.X509Extension;
+import org.jitsi.service.configuration.*;
+import org.jitsi.service.resources.*;
+import org.jitsi.util.*;
+
 /**
  * Implementation of the CertificateService. It asks the user to trust a
  * certificate when the automatic verification fails.

src/net/java/sip/communicator/impl/certificate/CertificateVerificationActivator.java

@@ -7,11 +7,11 @@
 package net.java.sip.communicator.impl.certificate;
 
 import net.java.sip.communicator.service.certificate.*;
-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.resources.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
 /**

src/net/java/sip/communicator/impl/certificate/VerifyCertificateDialog.java

@@ -12,9 +12,10 @@
 
 import javax.swing.*;
 
-import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.resources.*;
+
 /**
  * Dialog that is shown to the user when a certificate verification failed.
  */

src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf

@@ -8,10 +8,11 @@ Export-Package: net.java.sip.communicator.service.certificate
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.util,
  net.java.sip.communicator.util.swing,
- net.java.sip.communicator.service.configuration,
+ org.jitsi.service.configuration,
+ org.jitsi.util,
  net.java.sip.communicator.service.credentialsstorage,
  net.java.sip.communicator.service.httputil,
- net.java.sip.communicator.service.resources,
+ org.jitsi.service.resources, net.java.sip.communicator.service.resources,
  javax.net.ssl,
  javax.security.auth.callback,
  javax.security.auth.x500,

src/net/java/sip/communicator/impl/configuration/ChangeEventDispatcher.java

@@ -9,7 +9,7 @@
 import java.util.*;
 import java.beans.*;
 
-import net.java.sip.communicator.service.configuration.*;
+import org.jitsi.service.configuration.*;
 
 /**
  * This is a utility class that can be used by objects that support constrained

src/net/java/sip/communicator/impl/configuration/ConfigurationActivator.java

@@ -8,7 +8,7 @@
 
 import org.osgi.framework.*;
 
-import net.java.sip.communicator.service.configuration.*;
+import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.util.*;
 
 /**

src/net/java/sip/communicator/impl/configuration/ConfigurationServiceImpl.java

@@ -11,11 +11,11 @@
 import java.util.*;
 
 import net.java.sip.communicator.impl.configuration.xml.*;
-import net.java.sip.communicator.service.configuration.*;
-import net.java.sip.communicator.service.fileaccess.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.xml.*;
 
+import org.jitsi.service.configuration.*;
+import org.jitsi.service.fileaccess.*;
 import org.osgi.framework.*;
 
 /**
@@ -556,18 +556,13 @@ void start(BundleContext bc)
         {
             logger.error("Failed to load the configuration file", ex);
         }
-        catch (XMLException ex)
-        {
-            logger.error("Failed to parse the configuration file", ex);
-        }
     }
 
     /*
      * Implements ConfigurationService#reloadConfiguration().
      */
     public void reloadConfiguration()
-        throws IOException,
-               XMLException
+        throws IOException
     {
         this.configurationFile = null;
 
@@ -591,7 +586,17 @@ public void reloadConfiguration()
             }
         }
 
-        store.reloadConfiguration(file);
+        try
+        {
+            store.reloadConfiguration(file);
+        }
+        catch (XMLException xmle)
+        {
+            IOException ioe = new IOException();
+
+            ioe.initCause(xmle);
+            throw ioe;
+        }
     }
 
     /*

src/net/java/sip/communicator/impl/configuration/configuration.manifest.mf

@@ -13,5 +13,5 @@ Import-Package: org.osgi.framework,
  javax.xml.parsers,
  net.java.sip.communicator.util,
  net.java.sip.communicator.util.xml,
- net.java.sip.communicator.service.fileaccess
-Export-Package: net.java.sip.communicator.service.configuration
+ org.jitsi.service.configuration,
+ org.jitsi.service.fileaccess

src/net/java/sip/communicator/impl/contactlist/ContactlistActivator.java

@@ -7,10 +7,10 @@
 package net.java.sip.communicator.impl.contactlist;
 
 import net.java.sip.communicator.service.contactlist.*;
-import net.java.sip.communicator.service.fileaccess.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.fileaccess.*;
 import org.osgi.framework.*;
 
 /**

src/net/java/sip/communicator/impl/contactlist/MclStorageManager.java

@@ -11,18 +11,18 @@
 
 import javax.xml.parsers.*;
 
-import org.osgi.framework.*;
-import org.w3c.dom.*;
-
-import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.contactlist.event.*;
-import net.java.sip.communicator.service.fileaccess.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.xml.*;
 import net.java.sip.communicator.util.xml.XMLUtils;
 
+import org.jitsi.service.configuration.*;
+import org.jitsi.service.fileaccess.*;
+import org.osgi.framework.*;
+import org.w3c.dom.*;
+
 /**
  * The class handles read / write operations over the file where a persistent
  * copy of the meta contact list is stored.

src/net/java/sip/communicator/impl/contactlist/MetaContactImpl.java

@@ -11,10 +11,11 @@
 
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.contactlist.event.*;
-import net.java.sip.communicator.service.fileaccess.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.fileaccess.*;
+
 /**
  * A default implementation of the <code>MetaContact</code> interface.
  *

src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf

@@ -5,8 +5,8 @@ Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
 System-Bundle: yes
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.service.fileaccess,
- net.java.sip.communicator.service.configuration,
+ org.jitsi.service.fileaccess,
+ org.jitsi.service.configuration,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.protocol,

src/net/java/sip/communicator/impl/credentialsstorage/CredentialsStorageServiceImpl.java

@@ -8,7 +8,7 @@
 
 import java.util.*;
 
-import net.java.sip.communicator.service.configuration.*;
+import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;

src/net/java/sip/communicator/impl/credentialsstorage/credentialsstorage.manifest.mf

@@ -5,7 +5,7 @@ Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
 System-Bundle: yes
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.service.configuration,
+ org.jitsi.service.configuration,
  net.java.sip.communicator.util,
  net.java.sip.communicator.util.swing,
  javax.crypto,

src/net/java/sip/communicator/impl/fileaccess/FailSafeTransactionImpl.java

@@ -8,7 +8,8 @@
 package net.java.sip.communicator.impl.fileaccess;
 
 import java.io.*;
-import net.java.sip.communicator.service.fileaccess.*;
+
+import org.jitsi.service.fileaccess.*;
 
 /**
  * A failsafe transaction class. By failsafe we mean here that the file

src/net/java/sip/communicator/impl/fileaccess/FileAccessActivator.java

@@ -6,10 +6,9 @@
  */
 package net.java.sip.communicator.impl.fileaccess;
 
+import org.jitsi.service.fileaccess.*;
 import org.osgi.framework.*;
 
-import net.java.sip.communicator.service.fileaccess.*;
-
 /**
  * Invoke "Service Binder" to parse the service XML and register all services.
  *

src/net/java/sip/communicator/impl/fileaccess/FileAccessServiceImpl.java

@@ -10,9 +10,11 @@
 
 import javax.swing.filechooser.*;
 
-import net.java.sip.communicator.service.configuration.*;
-import net.java.sip.communicator.service.fileaccess.*;
-import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Logger;
+
+import org.jitsi.service.configuration.*;
+import org.jitsi.service.fileaccess.*;
+import org.jitsi.util.*;
 
 /**
  * Default FileAccessService implementation.

src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf

@@ -14,6 +14,6 @@ Import-Package: org.osgi.framework,
  javax.swing.filechooser,
  net.java.sip.communicator.util,
  net.java.sip.communicator.util.xml,
- net.java.sip.communicator.service.fileaccess
-Export-Package: net.java.sip.communicator.service.fileaccess
+ org.jitsi.service.fileaccess,
+ org.jitsi.util
 Metadata-Location: /net/java/sip/communicator/impl/fileaccess/fileaccess.metadata.xml

src/net/java/sip/communicator/impl/galagonotification/GalagoNotificationActivator.java

@@ -10,6 +10,7 @@
 import net.java.sip.communicator.service.systray.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
 /**

src/net/java/sip/communicator/impl/galagonotification/galagonotification.manifest.mf

@@ -6,6 +6,6 @@ Bundle-Version: 0.0.1
 System-Bundle: yes
 Import-Package: javax.imageio,
  net.java.sip.communicator.service.systray,
- net.java.sip.communicator.service.resources,
+ org.jitsi.service.resources, net.java.sip.communicator.service.resources,
  net.java.sip.communicator.util,
  org.osgi.framework

src/net/java/sip/communicator/impl/globalshortcut/GlobalShortcutServiceImpl.java

@@ -6,14 +6,16 @@
  */
 package net.java.sip.communicator.impl.globalshortcut;
 
-import java.util.*;
-import java.util.List; // disambiguation
-
 import java.awt.*;
+import java.util.*;
+import java.util.List;
 
 import net.java.sip.communicator.service.globalshortcut.*;
 import net.java.sip.communicator.service.keybindings.*;
-import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Logger;
+
+import org.jitsi.util.*;
+// disambiguation
 
 /**
  * This global shortcut service permits to register listeners for global

src/net/java/sip/communicator/impl/globalshortcut/NativeKeyboardHookDelegate.java

@@ -41,4 +41,4 @@ public interface NativeKeyboardHookDelegate
      * @param modifiers modifiers received (ALT or CTRL + letter, ...)
      */
     public void receiveKey(int keycode, int modifiers);
-}
+}

src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf

@@ -5,6 +5,7 @@ Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
 System-Bundle: yes
 Import-Package: org.osgi.framework,
+ org.jitsi.util,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.media,
  net.java.sip.communicator.service.protocol.event,

src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsActivator.java

@@ -8,15 +8,15 @@
 
 import java.util.*;
 
-import net.java.sip.communicator.service.configuration.*;
+import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.contactsource.*;
 import net.java.sip.communicator.service.credentialsstorage.*;
 import net.java.sip.communicator.service.googlecontacts.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
 /**

src/net/java/sip/communicator/impl/googlecontacts/GoogleContactsServiceImpl.java

@@ -11,7 +11,7 @@
 import java.util.*;
 import java.util.regex.*;
 
-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.googlecontacts.*;
 import net.java.sip.communicator.impl.googlecontacts.configform.*;

src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf

@@ -5,11 +5,11 @@ Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
 System-Bundle: yes
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.service.configuration,
+ org.jitsi.service.configuration,
  net.java.sip.communicator.service.credentialsstorage,
  net.java.sip.communicator.service.contactsource,
  net.java.sip.communicator.service.gui,
- net.java.sip.communicator.service.resources,
+ org.jitsi.service.resources, net.java.sip.communicator.service.resources,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.util,
  net.java.sip.communicator.util.swing,

src/net/java/sip/communicator/impl/growlnotification/GrowlNotificationActivator.java

@@ -6,14 +6,14 @@
  */
 package net.java.sip.communicator.impl.growlnotification;
 
-import net.java.sip.communicator.service.configuration.*;
+import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.service.systray.*;
+import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
-import net.java.sip.communicator.util.*;
-
 /**
  * Activates the GrowlNotificationService
  *

src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf

@@ -5,10 +5,10 @@ Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
 System-Bundle: yes
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.service.configuration,
+ org.jitsi.service.configuration,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.util,
- net.java.sip.communicator.service.resources,
+ org.jitsi.service.resources, net.java.sip.communicator.service.resources,
  net.java.sip.communicator.service.systray,
  net.java.sip.communicator.service.systray.event,
  net.java.sip.communicator.util.swing,

src/net/java/sip/communicator/impl/gui/GuiActivator.java

@@ -11,26 +11,26 @@
 import net.java.sip.communicator.impl.gui.main.account.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.audionotifier.*;
 import net.java.sip.communicator.service.browserlauncher.*;
 import net.java.sip.communicator.service.callhistory.*;
-import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.contactsource.*;
 import net.java.sip.communicator.service.desktop.*;
-import net.java.sip.communicator.service.fileaccess.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.keybindings.*;
 import net.java.sip.communicator.service.metahistory.*;
-import net.java.sip.communicator.service.neomedia.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.replacement.*;
 import net.java.sip.communicator.service.replacement.smilies.*;
-import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.service.shutdown.*;
 import net.java.sip.communicator.service.systray.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.audionotifier.*;
+import org.jitsi.service.configuration.*;
+import org.jitsi.service.fileaccess.*;
+import org.jitsi.service.neomedia.*;
+import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
 /**

src/net/java/sip/communicator/impl/gui/UIServiceImpl.java

@@ -35,12 +35,14 @@
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.gui.event.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.service.shutdown.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Logger;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.resources.*;
+import org.jitsi.util.*;
 import org.osgi.framework.*;
 
 import com.sun.jna.examples.*;
@@ -1515,4 +1517,4 @@ public void startChat(String[] participants)
         else
             throw new IllegalArgumentException("participants");
     }
-}
+}

src/net/java/sip/communicator/impl/gui/customcontrols/SCScrollPane.java

@@ -15,10 +15,11 @@
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.util.*;
+
 /**
  * The SCScrollPane is a JScrollPane with a custom viewport that allows to
  * set an image as a background. Depending on the

src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java

@@ -16,9 +16,10 @@
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.resources.*;
+
 /**
  * This class implements a basic wizard dialog, where the programmer can insert
  * one or more Components to act as panels. These panels can be navigated

src/net/java/sip/communicator/impl/gui/lookandfeel/SIPCommCheckBoxUI.java

@@ -34,4 +34,4 @@ public void paint(Graphics g, JComponent c)
         AntialiasingManager.activateAntialiasing(g);
         super.paint(g, c);
     }
-}
+}

src/net/java/sip/communicator/impl/gui/main/DialPadFieldUI.java

@@ -103,4 +103,4 @@ public static ComponentUI createUI(JComponent c)
     {
         return new DialPadFieldUI();
     }
-}
+}

src/net/java/sip/communicator/impl/gui/main/GeneralDialPadDialog.java

@@ -14,11 +14,12 @@
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.call.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 import net.java.sip.communicator.util.swing.plaf.*;
 
+import org.jitsi.util.*;
+
 import com.explodingpixels.macwidgets.*;
 
 /**

src/net/java/sip/communicator/impl/gui/main/GeneralDialPanel.java

@@ -16,10 +16,11 @@
 import net.java.sip.communicator.impl.gui.main.call.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.resources.*;
-import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.util.*;
+
 /**
  * The <tt>DialPanel</tt> is the panel that contains the buttons to dial a
  * phone number.

src/net/java/sip/communicator/impl/gui/main/MainFrame.java

@@ -8,7 +8,7 @@
 
 import java.awt.*;
 import java.awt.event.*;
-import java.beans.PropertyChangeEvent;
+import java.beans.*;
 import java.util.*;
 import java.util.List;
 
@@ -23,20 +23,22 @@
 import net.java.sip.communicator.impl.gui.main.menus.*;
 import net.java.sip.communicator.impl.gui.main.presence.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.contacteventhandler.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.protocol.OperationSetMessageWaiting.*;
+import net.java.sip.communicator.service.protocol.OperationSetMessageWaiting.MessageType;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Logger;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 import net.java.sip.communicator.util.swing.event.*;
 
+import org.jitsi.service.configuration.*;
+import org.jitsi.service.resources.*;
+import org.jitsi.util.*;
 import org.osgi.framework.*;
 
 import com.explodingpixels.macwidgets.*;
@@ -2009,4 +2011,4 @@ public void loadSkin()
                 GuiActivator.getResources()
                     .getColor("service.gui.MAIN_WINDOW_BACKGROUND")));
     }
-}
+}

src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java

@@ -7,18 +7,17 @@
 
 import java.io.*;
 import java.util.*;
-import java.util.List;
 
 import javax.imageio.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.wizard.*;
 import net.java.sip.communicator.impl.gui.main.*;
-import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.osgi.framework.*;
 
 /**

src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java

@@ -14,11 +14,12 @@
 import javax.swing.event.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.configuration.*;
+
 /**
  * The <tt>AccountsConfigurationPanel</tt> is the panel containing the accounts
  * list and according buttons shown in the options form.

src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java

@@ -18,10 +18,10 @@
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
 
 /**

src/net/java/sip/communicator/impl/gui/main/call/AbstractCallToggleButton.java

@@ -300,4 +300,4 @@ public void setIconImageID(ImageID iconImageID)
      * action has been performed and that it should execute its very logic.
      */
     public abstract void buttonPressed();
-}
+}

src/net/java/sip/communicator/impl/gui/main/call/CallButton.java

@@ -149,4 +149,4 @@ private void updateTooltip()
         else
             setToolTipText(defaultTooltip);
     }
-}
+}

src/net/java/sip/communicator/impl/gui/main/call/CallHistoryButton.java

@@ -223,4 +223,4 @@ public void loadSkin()
 
         setHistoryView();
     }
-}
+}

src/net/java/sip/communicator/impl/gui/main/call/CallInfoFrame.java

@@ -12,16 +12,18 @@
 
 import javax.swing.*;
 
-import com.explodingpixels.macwidgets.*;
-
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.service.neomedia.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.media.*;
-import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
+
 import org.ice4j.ice.*;
+import org.jitsi.service.neomedia.*;
+import org.jitsi.service.resources.*;
+import org.jitsi.util.*;
+
+import com.explodingpixels.macwidgets.*;
 
 /**
  * The frame displaying the statistical information for a call.
@@ -495,8 +497,8 @@ private void appendStreamEncryptionMethod(
         }
 
         String rtpType;
-        SrtpControl srtpControl = callPeerMediaHandler
-            .getEncryptionMethod(mediaType);
+        SrtpControl srtpControl
+            = callPeerMediaHandler.getEncryptionMethod(mediaType);
         // If the stream is secured.
         if(srtpControl != null)
         {

src/net/java/sip/communicator/impl/gui/main/call/CallManager.java

@@ -19,14 +19,15 @@
 import net.java.sip.communicator.impl.gui.main.contactlist.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
-import net.java.sip.communicator.service.neomedia.*;
-import net.java.sip.communicator.service.neomedia.device.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.service.protocol.media.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.transparent.*;
 
+import org.jitsi.service.neomedia.*;
+import org.jitsi.service.neomedia.device.*;
+
 /**
  * The <tt>CallManager</tt> is the one that handles calls. It contains also
  * the "Call" and "Hang up" buttons panel. Here are handles incoming and
@@ -1170,7 +1171,7 @@ public void run()
                         qualityControl.setPreferredRemoteSendMaxPreset(
                                 qualityPreset);
                     }
-                    catch(OperationFailedException e)
+                    catch(org.jitsi.service.protocol.OperationFailedException e)
                     {
                         logger.info("Unable to change video quality.", e);
 

src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java

@@ -16,23 +16,25 @@
 import javax.swing.border.*;
 import javax.swing.event.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.event.*;
 import net.java.sip.communicator.impl.gui.main.call.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.service.neomedia.*;
-import net.java.sip.communicator.service.neomedia.device.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Logger;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 import net.java.sip.communicator.util.swing.border.*;
 
+import org.jitsi.service.neomedia.*;
+import org.jitsi.service.neomedia.device.*;
+import org.jitsi.util.*;
+import org.osgi.framework.*;
+
 /**
  * The dialog created for a given call.
  *

src/net/java/sip/communicator/impl/gui/main/call/CallPeerAdapter.java

@@ -11,6 +11,8 @@
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 
+import org.jitsi.service.protocol.event.*;
+
 /**
  * The <tt>CallPeerAdapter</tt> is an adapter that implements all common
  * <tt>CallPeer</tt> related listeners in order to facilitate the task of

src/net/java/sip/communicator/impl/gui/main/call/CallStatusPanel.java

@@ -53,4 +53,4 @@ public void paintComponent(Graphics g)
             g.dispose();
         }
     }
-}
+}

src/net/java/sip/communicator/impl/gui/main/call/CallTransferHandler.java

@@ -219,4 +219,4 @@ else if (t.isDataFlavorSupported(DataFlavor.stringFlavor))
         }
         return false;
     }
-}
+}

src/net/java/sip/communicator/impl/gui/main/call/DTMFHandler.java

@@ -13,12 +13,13 @@
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-
-import net.java.sip.communicator.service.audionotifier.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.audionotifier.*;
+import org.jitsi.service.protocol.*;
+
 /**
  * Handles DTMF sending and playing sound notifications for that.
  *

src/net/java/sip/communicator/impl/gui/main/call/DesktopSharingFrame.java

@@ -15,13 +15,15 @@
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.service.neomedia.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Logger;
 import net.java.sip.communicator.util.swing.*;
 import net.java.sip.communicator.util.swing.transparent.*;
 
+import org.jitsi.service.neomedia.*;
+import org.jitsi.util.*;
+
 /**
  *
  * @author Yana Stamcheva

src/net/java/sip/communicator/impl/gui/main/call/InputVolumeControlButton.java

@@ -16,11 +16,12 @@
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.neomedia.*;
-import net.java.sip.communicator.service.neomedia.event.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;
 
+import org.jitsi.service.neomedia.*;
+import org.jitsi.service.neomedia.event.*;
+
 /**
  * Represents an UI means to mute the audio stream sent in an associated
  * <tt>Call</tt>.

src/net/java/sip/communicator/impl/gui/main/call/LocalVideoButton.java

@@ -8,11 +8,12 @@
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.neomedia.*;
-import net.java.sip.communicator.service.neomedia.device.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.neomedia.*;
+import org.jitsi.service.neomedia.device.*;
+
 /**
  * The local video button is the button used to start/stop video in a
  * conversation.

src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPanel.java

@@ -12,13 +12,16 @@
 
 import javax.swing.*;
 
-import com.explodingpixels.macwidgets.*;
-
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Logger;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.util.*;
+
+import com.explodingpixels.macwidgets.*;
+
 /**
  * The <tt>CallPanel</tt> is the panel containing call information. It's created
  * and added to the main tabbed pane when user makes or receives calls. It shows

src/net/java/sip/communicator/impl/gui/main/call/OneToOneCallPeerPanel.java

@@ -17,7 +17,6 @@
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.neomedia.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.service.protocol.media.*;
@@ -25,6 +24,11 @@
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
+import net.java.sip.communicator.util.swing.TransparentPanel;
+
+import org.jitsi.service.neomedia.*;
+import org.jitsi.service.protocol.event.*;
+import org.jitsi.util.swing.*;
 
 /**
  * The <tt>OneToOneCallPeerPanel</tt> is the panel containing data for a call

src/net/java/sip/communicator/impl/gui/main/call/OutputVolumeControlButton.java

@@ -13,10 +13,11 @@
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.neomedia.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.neomedia.*;
+
 /**
  * The <tt>VolumeControlButton</tt> is the button shown in the call window,
  * which allows to adjust the playback volume of your call.

src/net/java/sip/communicator/impl/gui/main/call/ParanoiaTimerSecurityPanel.java

@@ -6,17 +6,19 @@
  */
 package net.java.sip.communicator.impl.gui.main.call;
 
+import java.awt.*;
+import java.text.*;
+import java.util.*;
+import java.util.Timer;
+
+import javax.swing.*;
+
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.service.neomedia.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
-import javax.swing.*;
-import java.awt.*;
-import java.text.*;
-import java.util.*;
-import java.util.Timer;
+import org.jitsi.service.neomedia.*;
 
 /**
  * @author Damian Minkov

src/net/java/sip/communicator/impl/gui/main/call/PreCallDialog.java

@@ -12,11 +12,12 @@
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.neomedia.*;
-import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.neomedia.*;
+import org.jitsi.util.*;
+
 import com.explodingpixels.macwidgets.*;
 
 /**

src/net/java/sip/communicator/impl/gui/main/call/RecordButton.java

@@ -11,13 +11,15 @@
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.configuration.*;
-import net.java.sip.communicator.service.neomedia.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.resources.*;
-import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Logger;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.configuration.*;
+import org.jitsi.service.neomedia.*;
+import org.jitsi.service.resources.*;
+import org.jitsi.util.*;
+
 /**
  * The button that starts/stops the call recording.
  *

src/net/java/sip/communicator/impl/gui/main/call/ResizeVideoButton.java

@@ -13,9 +13,10 @@
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.neomedia.*;
 import net.java.sip.communicator.service.protocol.*;
 
+import org.jitsi.service.neomedia.*;
+
 /**
  * The button responsible to resize video for the associated participant.
  *

src/net/java/sip/communicator/impl/gui/main/call/SecurityPanel.java

@@ -6,12 +6,13 @@
  */
 package net.java.sip.communicator.impl.gui.main.call;
 
-import net.java.sip.communicator.service.neomedia.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.neomedia.*;
+
 /**
  * Base class for security panels that show encryption specific UI controls.
  * 

src/net/java/sip/communicator/impl/gui/main/call/SelectScreenDialog.java

@@ -14,11 +14,14 @@
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.service.neomedia.*;
-import net.java.sip.communicator.service.neomedia.device.*;
-import net.java.sip.communicator.service.neomedia.format.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
+import net.java.sip.communicator.util.swing.TransparentPanel;
+
+import org.jitsi.service.neomedia.*;
+import org.jitsi.service.neomedia.device.*;
+import org.jitsi.service.neomedia.format.*;
+import org.jitsi.util.swing.*;
 
 /**
  * A dialog dedicated to desktop streaming/sharing. Shows the possible screens

src/net/java/sip/communicator/impl/gui/main/call/UIVideoHandler.java

@@ -16,12 +16,15 @@
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.call.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.neomedia.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.util.event.*;
 import net.java.sip.communicator.util.swing.*;
+import net.java.sip.communicator.util.swing.TransparentPanel;
+
+import org.jitsi.service.neomedia.*;
+import org.jitsi.util.event.*;
+import org.jitsi.util.swing.*;
 
 /**
  * The <tt>UIVideoHandler</tt> is meant to handle all video related events.

src/net/java/sip/communicator/impl/gui/main/call/VolumeControlSlider.java

@@ -11,10 +11,11 @@
 import javax.swing.*;
 import javax.swing.event.*;
 
-import net.java.sip.communicator.service.neomedia.*;
-import net.java.sip.communicator.service.neomedia.event.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.neomedia.*;
+import org.jitsi.service.neomedia.event.*;
+
 /**
  * The volume control slider component.
  *

src/net/java/sip/communicator/impl/gui/main/call/ZrtpSecurityPanel.java

@@ -14,16 +14,18 @@
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
-import net.java.sip.communicator.service.neomedia.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.service.protocol.media.*;
-import net.java.sip.communicator.util.event.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.configuration.*;
+import org.jitsi.service.neomedia.*;
+import org.jitsi.service.protocol.event.*;
+import org.jitsi.util.event.*;
+
 /**
  * The panel containing details about ZRTP call security.
  *

src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java

@@ -13,13 +13,14 @@
 
 import net.java.sip.communicator.impl.gui.main.call.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.neomedia.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.neomedia.*;
+
 /**
  * The basic panel used to render any conference participant. Meant to be
  * extended for <tt>CallPeer</tt>s and <tt>ConferenceMember</tt>s.

src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceFocusPanel.java

@@ -18,6 +18,8 @@
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.protocol.event.*;
+
 /**
  *
  *

src/net/java/sip/communicator/impl/gui/main/call/conference/ConferenceInviteDialog.java

@@ -482,4 +482,4 @@ public String toString()
             return contact;
         }
     }
-}
+}

src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java

@@ -13,16 +13,19 @@
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.call.*;
-import net.java.sip.communicator.impl.gui.main.call.CallPeerAdapter; // disambiguation
+import net.java.sip.communicator.impl.gui.main.call.CallPeerAdapter;
 import net.java.sip.communicator.impl.gui.main.presence.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.neomedia.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.neomedia.*;
+import org.jitsi.service.protocol.event.*;
+// disambiguation
+
 /**
  * The <tt>ConferencePeerPanel</tt> renders a single <tt>ConferencePeer</tt>,
  * which is not a conference focus.

src/net/java/sip/communicator/impl/gui/main/call/conference/ProtocolProviderSelectorBox.java

@@ -253,4 +253,4 @@ public void paintComponent(Graphics g)
                 this);
         }
     }
-}
+}

src/net/java/sip/communicator/impl/gui/main/call/conference/VideoConferenceCallPanel.java

@@ -10,7 +10,8 @@
 import net.java.sip.communicator.impl.gui.main.call.CallPeerAdapter;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.util.swing.*;
+
+import org.jitsi.util.swing.*;
 
 /**
  * The UI for video conference calls. This panel contains all conference peers

src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationComponent.java

@@ -14,11 +14,12 @@
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.resources.*;
+
 /**
  * The <tt>ChatConversationComponent</tt> is a component that can be added to
  * the conversation area of the chat window in order to display any special

src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java

@@ -9,8 +9,7 @@
 import java.awt.*;
 import java.awt.Container;
 import java.awt.event.*;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
+import java.beans.*;
 import java.io.*;
 import java.util.*;
 import java.util.List;
@@ -30,11 +29,13 @@
 import net.java.sip.communicator.service.metahistory.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Logger;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 import net.java.sip.communicator.util.swing.SwingWorker;
 
+import org.jitsi.util.*;
+
 /**
  * The <tt>ChatPanel</tt> is the panel, where users can write and send messages,
  * view received messages. A ChatPanel is created for a contact or for a group
@@ -2636,4 +2637,4 @@ public void removeChatLinkClickedListener(ChatLinkClickedListener listener)
     {
         conversationPanel.removeChatLinkClickedListener(listener);
     }
-}
+}

src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java

@@ -23,9 +23,11 @@
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.service.keybindings.*;
 import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Logger;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.util.*;
 import org.osgi.framework.*;
 
 import com.explodingpixels.macwidgets.*;

src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java

@@ -20,7 +20,9 @@
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.event.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Logger;
+
+import org.jitsi.util.*;
 
 /**
  * Manages chat windows and panels.

src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java

@@ -21,7 +21,7 @@
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.main.chat.menus.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.configuration.*;
+import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.gui.event.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;

src/net/java/sip/communicator/impl/gui/main/chat/ContactPhotoPanel.java

@@ -188,4 +188,4 @@ public String getToolTipText(MouseEvent event)
     {
         return chatSession.getChatName();
     }
-}
+}

src/net/java/sip/communicator/impl/gui/main/chat/FontChooser.java

@@ -14,9 +14,10 @@
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.resources.*;
+
 /**
  * The <tt>FontChooserDialog</tt> is a dialog for font selection
  * 

src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactRoleIcon.java

@@ -50,4 +50,4 @@ public static Icon getRoleIcon(ChatRoomMemberRole role)
         }
         return i;
     }
-}
+}

src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java

@@ -15,11 +15,12 @@
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
-import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.skin.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.resources.*;
+
 /**
  * The panel containing the subject of the chat room and the configuration
  * button.

src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java

@@ -20,12 +20,12 @@
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.*;
 
-// Java 1.6 has javax.swing.SwingWorker so we have to disambiguate.
-import org.jdesktop.swingworker.SwingWorker;
+import org.jdesktop.swingworker.*;
+import org.jitsi.service.resources.*;
 import org.osgi.framework.*;
+// Java 1.6 has javax.swing.SwingWorker so we have to disambiguate.
 
 /**
  * The <tt>ConferenceChatManager</tt> is the one that manages both chat room and

src/net/java/sip/communicator/impl/gui/main/chatroomslist/AdHocChatRoomList.java

@@ -10,10 +10,10 @@
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
-import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
+import org.jitsi.service.configuration.*;
 import org.osgi.framework.*;
 
 /**

src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomList.java

@@ -11,7 +11,7 @@
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.service.configuration.*;
+import org.jitsi.service.configuration.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 

src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java

@@ -21,6 +21,8 @@
 import net.java.sip.communicator.service.resources.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.jitsi.service.resources.*;
+
 /**
  * The <tt>ChatRoomsListRightButtonMenu</tt> is the menu, opened when user clicks
  * with the right mouse button on the chat rooms list panel. It's the one that

src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java

@@ -75,4 +75,4 @@ public void wizardFinished(WizardEvent e)
                                 newChatRoom.getChatRoomProvider());
         }
     }
-}
+}