Commits patches for the following issues:

    #482 Overly complex plugin manager (work in progress)
    #448 Show complete SIP adddress when displaying account
    #510 switch to the latest version of Felix (Richard actually did most of the work here.)

29 files changed, 69 insertions, 38 deletions

diff --git a/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf b/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf
index f1ae175..6281899 100644
--- a/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Contact Info
 Bundle-Description: A plug-in that can set cross protocol account info.

 Bundle-Vendor: sip-communicator.org

 Bundle-Version: 0.0.1

+System-Bundle: yes

 Import-Package: org.osgi.framework,

   net.java.sip.communicator.service.browserlauncher,

   net.java.sip.communicator.service.contactlist,

@@ -27,4 +28,4 @@ Import-Package: org.osgi.framework,
   javax.swing.filechooser,

   javax.swing.tree,

   javax.swing.undo,

-  javax.swing.border
\ No newline at end of file
+  javax.swing.border

diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf
index 41da269..157df55 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: AIM account registration wizard
 Bundle-Description: AIM account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
@@ -31,4 +32,4 @@ Import-Package: org.osgi.framework,
  javax.swing.filechooser,
  javax.swing.tree,
  javax.swing.undo,
- javax.swing.border
\ No newline at end of file
+ javax.swing.border
diff --git a/src/net/java/sip/communicator/plugin/autoaway/autoaway.manifest.mf b/src/net/java/sip/communicator/plugin/autoaway/autoaway.manifest.mf
index feed9c0..2113cf7 100644
--- a/src/net/java/sip/communicator/plugin/autoaway/autoaway.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/autoaway/autoaway.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: AutoAwayPlugin
 Bundle-Description: A bundle that would automatically put your protocols in the away status after you've been idle for a certain amount of time.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.2
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.gui,
diff --git a/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf b/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf
index e22e173..c3d57ef 100755
--- a/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Branding plugin
 Bundle-Description: Branding plugin.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.resources,
diff --git a/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf b/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf
index 69ed48b..09e9468 100644
--- a/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Extended Call History Search
 Bundle-Description: An Extended Call History Search
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.callhistory,
  net.java.sip.communicator.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf b/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf
index a98d4d1..3e1afa9 100644
--- a/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf
@@ -3,10 +3,11 @@ Bundle-Name: Chat Alerter
 Bundle-Description: A plug-in that alerts for new messages by flashing the window in the taskbar.

 Bundle-Vendor: sip-communicator.org

 Bundle-Version: 0.0.1

+System-Bundle: yes

 Import-Package: org.osgi.framework,

   net.java.sip.communicator.util,

   net.java.sip.communicator.service.gui,

   net.java.sip.communicator.service.protocol,

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

   com.apple.cocoa.application,

-  javax.swing
\ No newline at end of file
+  javax.swing

diff --git a/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf b/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf
index e3a4bfc..c508e73 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Contact Info
 Bundle-Description: A plug-in that can show cross protocol user info.

 Bundle-Vendor: sip-communicator.org

 Bundle-Version: 0.0.1

+System-Bundle: yes

 Import-Package: org.osgi.framework,

   net.java.sip.communicator.service.browserlauncher,

   net.java.sip.communicator.service.contactlist,

@@ -26,4 +27,4 @@ Import-Package: org.osgi.framework,
   javax.swing.filechooser,

   javax.swing.tree,

   javax.swing.undo,

-  javax.swing.border
\ No newline at end of file
+  javax.swing.border

diff --git a/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf b/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf
index 182caf1..5b1a4e4 100644
--- a/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Default Resource Pack
 Bundle-Description: The plugin offering default images and languages.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.util,
  net.java.sip.communicator.service.resources
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf
index 0166229..fb61b3b 100644
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Dict account registration wizard
 Bundle-Description: Dict account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.dict4j,
  net.java.sip.communicator.service.browserlauncher,
diff --git a/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf b/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf
index 26d4992..0248b3c 100644
--- a/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Example plugin
 Bundle-Description: An example showing how to make plugins for the ui.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
diff --git a/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf b/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf
index be3709a..3bdd7f8 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: General config plugin
 Bundle-Description: The plugin offering general configuration page.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.contactlist,
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf
index 4ebcd1f..01caa2c 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Gibberish account registration wizard
 Bundle-Description: Gibberish account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf
index f85b003..26ada2b 100644
--- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Google Talk account registration wizard
 Bundle-Description: Google Talk account registration wizard.

 Bundle-Vendor: sip-communicator.org

 Bundle-Version: 0.0.1

+System-Bundle: yes

 Import-Package: org.osgi.framework,

  net.java.sip.communicator.service.browserlauncher,

  net.java.sip.communicator.service.configuration,

diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf
index 7a1dec1..b5e1723 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: ICQ account registration wizard
 Bundle-Description: ICQ account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
@@ -30,4 +31,4 @@ Import-Package: org.osgi.framework,
  javax.swing.filechooser,
  javax.swing.tree,
  javax.swing.undo,
- javax.swing.border
\ No newline at end of file
+ javax.swing.border
diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf
index 02e5d96..adceb04 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: IRC account registration wizard
 Bundle-Description: IRC account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
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 4ff5349..763f72b 100755
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Jabber account registration wizard
 Bundle-Description: Jabber account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
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 6787861..32f57fd 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Keybinding Chooser
 Bundle-Description: Provides configuring UI for keyboard shortcuts.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.keybindings,
diff --git a/src/net/java/sip/communicator/plugin/mailbox/mailbox.manifest.mf b/src/net/java/sip/communicator/plugin/mailbox/mailbox.manifest.mf
index 89e15e4..2f65efd 100644
--- a/src/net/java/sip/communicator/plugin/mailbox/mailbox.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/mailbox/mailbox.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Mailbox
 Bundle-Description: A bundle that implements the Mailbox Package.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.contactlist,
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf
index b70f82a..bb88367 100755
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Msn account registration wizard
 Bundle-Description: Msn account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/PluginTableModel.java b/src/net/java/sip/communicator/plugin/pluginmanager/PluginTableModel.java
index 29b5443..a3e989e 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/PluginTableModel.java
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/PluginTableModel.java
@@ -14,30 +14,30 @@ import org.osgi.framework.*;
 
 /**
  * The <tt>TableModel</tt> of the table containing all plug-ins.
- * 
+ *
  * @author Yana Stamcheva
  */
 public class PluginTableModel extends AbstractTableModel
 {
     private BundleContext bundleContext = PluginManagerActivator.bundleContext;
-    
+
     private boolean showSystemBundles;
-    
+
     private Object showSystemBundlesSync = new Object();
-    
+
     private Bundle[] bundles = null;
-    
+
     private BundleComparator bundleComparator = new BundleComparator();
-    
+
     /**
-     * Create an instance of <tt>PluginTableModel</tt> 
+     * Create an instance of <tt>PluginTableModel</tt>
      */
     public PluginTableModel()
     {
         refreshSortedBundlesList();
     }
 
-    
+
     /**
      * Returns the count of table rows.
      * @return int the count of table rows
@@ -49,7 +49,7 @@ public class PluginTableModel extends AbstractTableModel
         {
             showSystem = showSystemBundles;
         }
-        
+
         if(bundles == null)
             return 0;
         else
@@ -59,14 +59,14 @@ public class PluginTableModel extends AbstractTableModel
             else
             {
                 int bundlesSize = 0;
-                
+
                 for (int i = 0; i < bundles.length; i ++)
                 {
                     Bundle bundle = bundles[i];
-                    
+
                     Object sysBundleProp
                         = bundle.getHeaders().get("System-Bundle");
-                
+
                     if(sysBundleProp == null || !sysBundleProp.equals("yes"))
                         bundlesSize++;
                 }
@@ -89,11 +89,11 @@ public class PluginTableModel extends AbstractTableModel
         {
             showSystem = showSystemBundles;
         }
-        
+
         for (int i = 0; i < bundles.length; i ++)
         {
             Bundle b = bundles[i];
-            
+
             if(b.equals(bundle))
             {
                 if(showSystem)
@@ -102,18 +102,18 @@ public class PluginTableModel extends AbstractTableModel
                 {
                     Object sysBundleProp
                         = bundle.getHeaders().get("System-Bundle");
-            
+
                     if(sysBundleProp == null || !sysBundleProp.equals("yes"))
                         return true;
                     else
                         return false;
                 }
-            }            
+            }
         }
-        
-        return false;        
+
+        return false;
     }
-    
+
     /**
      * Returns the count of table columns.
      * @return int the count of table columns
@@ -150,17 +150,20 @@ public class PluginTableModel extends AbstractTableModel
 
             for(int i = 0; i < bundles.length; i++)
             {
+                Object sysBundleProp
+                    = bundles[i].getHeaders().get("System-Bundle");
+
+                //ignore if this is a system bundle
+                if(sysBundleProp != null && sysBundleProp.equals("yes"))
+                    continue;
+
                 if(bundleCounter == row)
                     return bundles[i];
 
-                Object sysBundleProp
-                    = bundles[i+1].getHeaders().get("System-Bundle");
-
-                if(sysBundleProp == null || !sysBundleProp.equals("yes"))
-                    bundleCounter++;
+                bundleCounter++;
             }
         }
-        
+
         return null;
     }
 
@@ -172,7 +175,7 @@ public class PluginTableModel extends AbstractTableModel
         refreshSortedBundlesList();
         fireTableDataChanged();
     }
-    
+
     /**
      * Returns TRUE if system bundles are show, FALSE - otherwise.
      * @return TRUE if system bundles are show, FALSE - otherwise
@@ -180,12 +183,12 @@ public class PluginTableModel extends AbstractTableModel
     public boolean isShowSystemBundles()
     {
         boolean showSystem;
-        
+
         synchronized (showSystemBundlesSync)
         {
             showSystem = showSystemBundles;
         }
-        
+
         return showSystem;
     }
 
@@ -200,9 +203,9 @@ public class PluginTableModel extends AbstractTableModel
             this.showSystemBundles = showSystemBundles;
         }
     }
-    
+
     /**
-     * Syncs the content of the bundle list with the bundles currently 
+     * Syncs the content of the bundle list with the bundles currently
      * available in the bundle context and sorts it again.
      */
     private void refreshSortedBundlesList()
@@ -211,4 +214,4 @@ public class PluginTableModel extends AbstractTableModel
         Arrays.sort(this.bundles, bundleComparator);
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf b/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf
index fdc32da..1136fca 100644
--- a/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Integrated profiler plugin
 Bundle-Description: A bundle that provides profile cpu and memory of the running app.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
   net.java.sip.communicator.util,
   net.java.sip.communicator.service.contactlist,
@@ -18,4 +19,4 @@ Import-Package: org.osgi.framework,
   javax.xml.parsers,
   org.xml.sax,
   org.xml.sax.ext,
-  org.xml.sax.helpers
\ No newline at end of file
+  org.xml.sax.helpers
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf
index fb4829f..14be1ac 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Rss account registration wizard
 Bundle-Description: Rss account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf b/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf
index aa379ff..046588c 100644
--- a/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Simple account registration form
 Bundle-Description: Simple account registration form.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.util,
  net.java.sip.communicator.service.resources,
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
index 09b4a1a..e997b83 100755
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: SIP account registration wizard
 Bundle-Description: SIP account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf
index c50ebd5..e89a9a7 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: SSH account registration wizard
 Bundle-Description: SSH account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/updatechecker/updatecheck.manifest.mf b/src/net/java/sip/communicator/plugin/updatechecker/updatecheck.manifest.mf
index eb16831..14be15d 100644
--- a/src/net/java/sip/communicator/plugin/updatechecker/updatecheck.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/updatechecker/updatecheck.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: UpdateCheckPlugin
 Bundle-Description: A bundle that implements the UpdateCheck Plugin Package.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.gui,
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf b/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf
index d0802e5..5e00896 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Whiteboard plugin
 Bundle-Description: A whiteboard for SIP-Communicator.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
@@ -27,4 +28,4 @@ Import-Package: org.osgi.framework,
  javax.swing.filechooser,
  javax.swing.tree,
  javax.swing.undo,
- javax.swing.border
\ No newline at end of file
+ javax.swing.border
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf
index a9418de..ae55407 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Yahoo account registration wizard
 Bundle-Description: Yahoo account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf
index 6710544..676ddc3 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Zeroconf account registration wizard
 Bundle-Description: Zeroconf account registration wizard.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
+System-Bundle: yes
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.configuration,