Update Felix to 3.2.2

11 files changed, 29 insertions, 15 deletions

diff --git a/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf b/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf
index b934b46..7b028d9 100644
--- a/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf
+++ b/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf
@@ -18,4 +18,4 @@ Import-Package: org.osgi.framework,
  javax.xml.transform.stream,
  javax.xml.parsers,
  net.java.sip.communicator.util,
- net.java.sip.communicator.util.xml,
+ net.java.sip.communicator.util.xml
diff --git a/src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf b/src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf
index 1a73dbf..e78282d 100644
--- a/src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf
+++ b/src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf
@@ -10,5 +10,5 @@ Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.protocol.event,
  net.java.sip.communicator.service.keybindings,
  net.java.sip.communicator.service.gui,
- net.java.sip.communicator.util,
-Export-package: net.java.sip.communicator.service.globalshortcut,
\ No newline at end of file
+ net.java.sip.communicator.util
+Export-package: net.java.sip.communicator.service.globalshortcut
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
index 04c9fba..61e62da 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
+++ b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
@@ -22,5 +22,5 @@ Import-Package: org.osgi.framework,
  javax.swing.event,
  javax.swing.table,
  javax.swing.tree,
- javax.swing.text,
-Export-Package: net.java.sip.communicator.service.googlecontacts
\ No newline at end of file
+ javax.swing.text
+Export-Package: net.java.sip.communicator.service.googlecontacts
diff --git a/src/net/java/sip/communicator/impl/history/history.manifest.mf b/src/net/java/sip/communicator/impl/history/history.manifest.mf
index f680fed..f5f52fc 100644
--- a/src/net/java/sip/communicator/impl/history/history.manifest.mf
+++ b/src/net/java/sip/communicator/impl/history/history.manifest.mf
@@ -16,7 +16,7 @@ Import-Package: org.osgi.framework,
  javax.xml.transform.dom,
  javax.xml.transform.stream,
  net.java.sip.communicator.util,
- net.java.sip.communicator.util.xml,
+ net.java.sip.communicator.util.xml
 Export-Package: net.java.sip.communicator.service.history,
  net.java.sip.communicator.service.history.event,
  net.java.sip.communicator.service.history.records
diff --git a/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf b/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf
index 845a10d..ffeac0a 100644
--- a/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf
+++ b/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf
@@ -16,7 +16,7 @@ Import-Package: org.osgi.framework,
  net.java.sip.communicator.util,
  net.java.sip.communicator.service.protocol,
  net.java.sip.communicator.service.protocol.icqconstants,
- net.java.sip.communicator.service.protocol.event,
+ net.java.sip.communicator.service.protocol.event
 Export-Package: net.java.sip.communicator.service.msghistory,
  net.java.sip.communicator.service.msghistory.event
 Metadata-Location: /net/java/sip/communicator/impl/msghistory/msghistory.metadata.xml
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf
index 9ebb963..722c7e5 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf
@@ -63,7 +63,7 @@ Import-Package: org.apache.log4j,
  javax.xml.namespace,
  javax.xml.transform,
  javax.xml.transform.dom,
- javax.xml.transform.stream,
+ javax.xml.transform.stream
 Export-Package: net.java.sip.communicator.impl.protocol.sip,
  net.java.sip.communicator.impl.protocol.sip.net,
  net.java.sip.communicator.impl.protocol.sip.xcap,
diff --git a/src/net/java/sip/communicator/impl/provdisc/mdns/mdns.provdisc.manifest.mf b/src/net/java/sip/communicator/impl/provdisc/mdns/mdns.provdisc.manifest.mf
index 36a4bd7..b068c62 100644
--- a/src/net/java/sip/communicator/impl/provdisc/mdns/mdns.provdisc.manifest.mf
+++ b/src/net/java/sip/communicator/impl/provdisc/mdns/mdns.provdisc.manifest.mf
@@ -8,4 +8,4 @@ Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.provdisc,
  net.java.sip.communicator.service.provdisc.event,
  net.java.sip.communicator.util,
- javax.jmdns,
+ javax.jmdns
diff --git a/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigActivator.java b/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigActivator.java
index 3423e45..8a4fd1d 100644
--- a/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigActivator.java
+++ b/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigActivator.java
@@ -47,6 +47,16 @@ public class AdvancedConfigActivator
         = "net.java.sip.communicator.plugin.advancedconfig.DISABLED";
 
     /**
+     * The advanced configuration panel registered by this bundle.
+     */
+    private static AdvancedConfigurationPanel panel;
+
+    /**
+     * The OSGi service registration of the panel.
+     */
+    private static ServiceRegistration panelRegistration;
+
+    /**
      * Starts this bundle.
      * @param bc the bundle context
      * @throws Exception if something goes wrong
@@ -63,12 +73,16 @@ public class AdvancedConfigActivator
         Dictionary<String, String> properties = new Hashtable<String, String>();
         properties.put( ConfigurationForm.FORM_TYPE,
                         ConfigurationForm.GENERAL_TYPE);
-        bundleContext
+        panel = new AdvancedConfigurationPanel();
+        panelRegistration = bundleContext
             .registerService(
                 ConfigurationForm.class.getName(),
-                new AdvancedConfigurationPanel(),
+                panel,
                 properties);
 
+
+        bundleContext.addServiceListener(panel);
+
         if (logger.isInfoEnabled())
             logger.info("ADVANCED CONFIG PLUGIN... [REGISTERED]");
     }
@@ -80,6 +94,8 @@ public class AdvancedConfigActivator
      */
     public void stop(BundleContext bc) throws Exception
     {
+        bc.removeServiceListener(panel);
+        panelRegistration.unregister();
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigurationPanel.java b/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigurationPanel.java
index 9cd63d1..8f362a5 100644
--- a/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigurationPanel.java
+++ b/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigurationPanel.java
@@ -58,8 +58,6 @@ public class AdvancedConfigurationPanel
     {
         super(new BorderLayout(10, 0));
 
-        AdvancedConfigActivator.bundleContext.addServiceListener(this);
-
         initList();
 
         centerPanel.setPreferredSize(new Dimension(500, 500));
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf b/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
index 2746eea..1bb8e90 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
@@ -14,4 +14,4 @@ Import-Package: org.osgi.framework,
  net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
- javax.swing.table,
+ javax.swing.table
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf b/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
index 6c766c6..7d2106e 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
@@ -27,4 +27,4 @@ Import-Package: org.osgi.framework,
  javax.swing.filechooser,
  javax.swing.tree,
  javax.swing.undo,
- javax.swing.border,
+ javax.swing.border