Replace System-Bundle header by BSN and a list that defines sys-bundles

12 years ago · 8b09d84210
parent c5d05781ed
commit 8b09d84210
145 changed files with 292 additions and 146 deletions
--- a/build.xml
+++ b/build.xml
@ -2479,7 +2479,7 @@ javax.swing.event, javax.swing.border"/>
                <attribute name="Bundle-Name" value="ZRTP4J"/>
                <attribute name="Bundle-Description" value="ZRTP for Java library."/>
                <attribute name="Bundle-Version" value="1.4.5"/>
-                <attribute name="System-Bundle" value="yes"/>
+                <attribute name="Bundle-SymbolicName" value="gnu.java.zrtp4j"/>
            </manifest>
        </jar>
    </target>
--- a/lib/installer-exclude/httpclient.manifest.mf
+++ b/lib/installer-exclude/httpclient.manifest.mf
@ -2,7 +2,7 @@ Bundle-Name: Apache Http Client
 Bundle-Description: Apache Http Client
 Bundle-Vendor: jitsi.org
 Bundle-Version: 4.2.3
-System-Bundle: yes
+Bundle-SymbolicName: org.apache.http
 Import-Package: org.apache.commons.logging,
 javax.security.auth.x500,
 javax.net.ssl
--- a/lib/installer-exclude/jfontchooser.manifest.mf
+++ b/lib/installer-exclude/jfontchooser.manifest.mf
@ -2,7 +2,7 @@ Bundle-Name: JFontChooser
 Bundle-Description: A library containing a Java Font Chooser
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: say.swing
 Import-Package: javax.swing,
 javax.swing.border,
 javax.swing.event,
--- a/lib/installer-exclude/jmdns.manifest.mf
+++ b/lib/installer-exclude/jmdns.manifest.mf
@ -2,5 +2,5 @@ Bundle-Name: JmDNS Lib Provider
 Bundle-Description: JmDNS Lib Provider
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: javax.jmdns
 Export-Package: javax.jmdns
--- a/lib/installer-exclude/jna.manifest.mf
+++ b/lib/installer-exclude/jna.manifest.mf
@ -2,7 +2,7 @@ Bundle-Name: JNA Lib Provider
 Bundle-Description: JNA Lib Provider
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: com.sun.jna
 Export-Package: com.sun.jna.win32,
 com.sun.jna,
 com.sun.jna.ptr,
--- a/lib/installer-exclude/smack.manifest.mf
+++ b/lib/installer-exclude/smack.manifest.mf
@ -2,7 +2,7 @@ Bundle-Name: Smack Lib Provider
 Bundle-Description: Smack Lib Provider
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: org.jivesoftware.smack
 Import-Package: javax.net,
 javax.net.ssl,
 javax.security.auth.callback,
--- a/lib/jitsi-defaults.properties
+++ b/lib/jitsi-defaults.properties
@ -38,3 +38,137 @@ net.java.sip.communicator.plugin.spellcheck.SYSTEM_HUNSPELL_DIR=/usr/share/hunsp

 # protocol order for the simple initial account registration wizard
 plugin.simpleaccreg.PROTOCOL_ORDER=SIP|Jabber|Facebook|Google Talk
+
+# Bundles marked as "system" in the plugin editor
+net.java.sip.communicator.plugin.pluginmanager.SYSTEM_BUNDLES=\
+    net.java.sip.communicator.plugin.aimaccregwizz,\
+    net.java.sip.communicator.plugin.advancedconfig,\
+    net.java.sip.communicator.argdelegation,\
+    net.java.sip.communicator.service.argdelegation,\
+    net.java.sip.communicator.replacement.bliptv,\
+    net.java.sip.communicator.plugin.branding,\
+    net.java.sip.communicator.browserlauncher,\
+    net.java.sip.communicator.callhistory,\
+    net.java.sip.communicator.plugin.certconfig,\
+    net.java.sip.communicator.certificate,\
+    net.java.sip.communicator.plugin.chatalerter,\
+    net.java.sip.communicator.muc,\
+    net.java.sip.communicator.configuration,\
+    net.java.sip.communicator.service.contacteventhandler,\
+    net.java.sip.communicator.plugin.contactinfo,\
+    net.java.sip.communicator.plugin.accountinfo,\
+    net.java.sip.communicator.service.contactsource,\
+    net.java.sip.communicator.plugin.contactsourceconfig,\
+    net.java.sip.communicator.service.contactlist,\
+    net.java.sip.communicator.credentialsstorage,\
+    net.java.sip.communicator.service.customavatar,\
+    net.java.sip.communicator.service.customcontactactions,\
+    net.java.sip.communicator.provdisc.dhcp,\
+    net.java.sip.communicator.replacement.dailymotion,\
+    net.java.sip.communicator.plugin.defaultresourcepack,\
+    net.java.sip.communicator.plugin.demuxcontactsource,\
+    net.java.sip.communicator.replacement.directimage,\
+    net.java.sip.communicator.plugin.facebookaccregwizz,\
+    net.java.sip.communicator.fileaccess,\
+    net.java.sip.communicator.filehistory,\
+    net.java.sip.communicator.replacement.flickr,\
+    net.java.sip.communicator.plugin.generalconfig,\
+    net.java.sip.communicator.globaldisplaydetails,\
+    net.java.sip.communicator.plugin.globalproxyconfig,\
+    net.java.sip.communicator.globalshortcut,\
+    net.java.sip.communicator.service.googlecontacts,\
+    net.java.sip.communicator.googlecontacts,\
+    net.java.sip.communicator.plugin.googletalkaccregwizz,\
+    net.java.sip.communicator.service.hid,\
+    net.java.sip.communicator.hid,\
+    net.java.sip.communicator.history,\
+    net.java.sip.communicator.replacement.hulu,\
+    net.java.sip.communicator.protocol.icq,\
+    net.java.sip.communicator.plugin.icqaccregwizz,\
+    net.java.sip.communicator.plugin.iptelaccregwizz,\
+    net.java.sip.communicator.plugin.ippiaccregwizz,\
+    net.java.sip.communicator.service.dns,\
+    net.java.sip.communicator.plugin.dnsconfig,\
+    net.java.sip.communicator.impl.dns,\
+    net.java.sip.communicator.service.httputil,\
+    net.java.sip.communicator.plugin.desktoputil,\
+    net.java.sip.communicator.service.util,\
+    net.java.sip.communicator.plugin.keybindingchooser,\
+    net.java.sip.communicator.keybindings,\
+    net.java.sip.communicator.ldap,\
+    net.java.sip.communicator.plugin.ldap,\
+    net.java.sip.communicator.plugin.loggingutils,\
+    net.java.sip.communicator.service.protocol.media,\
+    net.java.sip.communicator.msghistory,\
+    net.java.sip.communicator.metahistory,\
+    net.java.sip.communicator.contactlist,\
+    net.java.sip.communicator.replacement.metacafe,\
+    net.java.sip.communicator.plugin.msofficecomm,\
+    net.java.sip.communicator.protocol.msn,\
+    net.java.sip.communicator.plugin.msnaccregwizz,\
+    net.java.sip.communicator.neomedia,\
+    net.java.sip.communicator.netaddr,\
+    net.java.sip.communicator.plugin.nimbuzzavatars,\
+    net.java.sip.communicator.plugin.notificationwiring,\
+    net.java.sip.communicator.notification,\
+    net.java.sip.communicator.service.notification,\
+    net.java.sip.communicator.osdependent,\
+    net.java.sip.communicator.plugin.addrbook,\
+    net.java.sip.communicator.plugin.otr,\
+    net.java.sip.communicator.packetlogging,\
+    net.java.sip.communicator.plugin.phonenumbercontactsource,\
+    net.java.sip.communicator.plugin.chatconfig,\
+    net.java.sip.communicator.plugin.notificationconfiguration,\
+    net.java.sip.communicator.plugin.pluginmanager,\
+    net.java.sip.communicator.plugin.propertieseditor,\
+    net.java.sip.communicator.service.protocol,\
+    net.java.sip.communicator.service.provdisc,\
+    net.java.sip.communicator.plugin.provisioning,\
+    net.java.sip.communicator.plugin.reconnectplugin,\
+    net.java.sip.communicator.service.replacement,\
+    net.java.sip.communicator.resources,\
+    net.java.sip.communicator.protocol.sip,\
+    net.java.sip.communicator.plugin.sipaccregwizz,\
+    net.java.sip.communicator.plugin.securityconfig,\
+    net.java.sip.communicator.shutdowntimeout,\
+    net.java.sip.communicator.plugin.simpleaccreg,\
+    net.java.sip.communicator.plugin.skinmanager,\
+    net.java.sip.communicator.replacement.smiley,\
+    net.java.sip.communicator.plugin.spellcheck,\
+    net.java.sip.communicator.swingnotification,\
+    net.java.sip.communicator.sysactivity,\
+    net.java.sip.communicator.service.systray,\
+    net.java.sip.communicator.replacement.twitpic,\
+    net.java.sip.communicator.service.gui,\
+    net.java.sip.communicator.swingui,\
+    net.java.sip.communicator.plugin.update,\
+    net.java.sip.communicator.service.update,\
+    net.java.sip.communicator.replacement.vbox7,\
+    net.java.sip.communicator.version,\
+    net.java.sip.communicator.replacement.viddler,\
+    net.java.sip.communicator.replacement.vimeo,\
+    net.java.sip.communicator.protocol.yahoo,\
+    net.java.sip.communicator.plugin.yahooaccregwizz,\
+    net.java.sip.communicator.replacement.youtube,\
+    net.java.sip.communicator.libjitsi,\
+    net.java.sip.communicator.provdisc.mdns,\
+    net.java.sip.communicator.plugin.thunderbird,\
+    org.apache.felix.bundlerepository,\
+    org.apache.http,\
+    org.apache.commons.codec,\
+    org.apache.commons.lang3,\
+    commons-logging,\
+    say.swing,\
+    com.sun.jna,\
+    com.googlecode.json-simple,\
+    net.java.sip.communicator.protocol.jabber,\
+    net.java.sip.communicator.plugin.jabberaccregwizz,\
+    jmork,\
+    javax.jmdns,\
+    org.jivesoftware.smack,\
+    org.apache.felix.framework,\
+    org.jitsi.bccontrib,\
+    bcprov,\
+    gnu.java.zrtp4j,\
+    SDES4J,\
+    log4j
--- a/src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf
+++ b/src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Argument Delegation
 Bundle-Description: A bundle that delegates invocation arguments to register handler services
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.argdelegation
 Import-Package: org.osgi.framework,
 com.apple.eawt,
 net.java.sip.communicator.util,
--- a/src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf
+++ b/src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Browser Launcher
 Bundle-Description: An implementation of the BrowserLauncher service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.browserlauncher
 Export-Package: net.java.sip.communicator.service.browserlauncher
 Import-Package: org.osgi.framework,
 org.jitsi.util,
--- a/src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf
+++ b/src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Call History Service Provider
 Bundle-Description: A bundle that implements the call history package.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.callhistory
 Import-Package: org.osgi.framework,
 org.jitsi.service.fileaccess,
 net.java.sip.communicator.service.history,
--- a/src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf
+++ b/src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Certificate Verification Activator
 Bundle-Description: A bundle that offers certificate verification
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.certificate
 Export-Package: net.java.sip.communicator.service.certificate
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.gui,
--- a/src/net/java/sip/communicator/impl/configuration/configuration.manifest.mf
+++ b/src/net/java/sip/communicator/impl/configuration/configuration.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Configuration Service Implementation
 Bundle-Description: A bundle that offers configuration utilities
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.configuration
 Import-Package: org.jitsi.service.configuration,
 org.jitsi.service.libjitsi,
 org.jitsi.util,
--- a/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf
+++ b/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: MetaContactList
 Bundle-Description: An implementation of the MetaContactList service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.contactlist
 Import-Package: org.osgi.framework,
 org.jitsi.service.fileaccess,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/impl/credentialsstorage/credentialsstorage.manifest.mf
+++ b/src/net/java/sip/communicator/impl/credentialsstorage/credentialsstorage.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Credentials Storage Service Implementation
 Bundle-Description: A bundle that handles credentials
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.credentialsstorage
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 net.java.sip.communicator.util,
--- a/src/net/java/sip/communicator/impl/dns/dns.manifest.mf
+++ b/src/net/java/sip/communicator/impl/dns/dns.manifest.mf
@ -4,7 +4,6 @@ Bundle-SymbolicName: net.java.sip.communicator.impl.dns
 Bundle-Description: A bundle that export packages with DNS utility classes.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
 Import-Package: org.jitsi.util, 
 org.osgi.framework,
 net.java.sip.communicator.util,
--- a/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
+++ b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
@ -6,4 +6,4 @@ Bundle-Version: 0.0.1
 Import-Package: org.jitsi.service.fileaccess,
 org.jitsi.service.libjitsi,
 org.osgi.framework
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.fileaccess
--- a/src/net/java/sip/communicator/impl/filehistory/filehistory.manifest.mf
+++ b/src/net/java/sip/communicator/impl/filehistory/filehistory.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: File History Service Provider
 Bundle-Description: A bundle that implements the file history package.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.filehistory
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.history,
 net.java.sip.communicator.service.history.records,
--- a/src/net/java/sip/communicator/impl/galagonotification/galagonotification.manifest.mf
+++ b/src/net/java/sip/communicator/impl/galagonotification/galagonotification.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Desktop Notifications Provider
 Bundle-Description: A bundle which implements notifications according to the freedesktop.org Desktop Notifications spec.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.galagonotification
 Import-Package: javax.imageio,
 net.java.sip.communicator.service.systray,
 org.jitsi.service.resources, net.java.sip.communicator.service.resources,
--- a/src/net/java/sip/communicator/impl/globaldisplaydetails/globaldisplaydetails.manifest.mf
+++ b/src/net/java/sip/communicator/impl/globaldisplaydetails/globaldisplaydetails.manifest.mf
@ -3,7 +3,7 @@ Bundle-Description: A bundle that implements the global display details package.
 Bundle-Name: Global Display Details Service Provider
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.globaldisplaydetails
 Import-Package: org.jitsi.service.resources,
 org.jitsi.service.configuration,
 net.java.sip.communicator.util,
--- a/src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf
+++ b/src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Global shortcut
 Bundle-Description: A bundle which implements global shortcut
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.globalshortcut
 Import-Package: org.osgi.framework,
 org.jitsi.util,
 net.java.sip.communicator.service.protocol,
--- a/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
+++ b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Google Contacts Service Implementation
 Bundle-Description: A bundle that offers access to Google Contacts
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.googlecontacts
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 net.java.sip.communicator.service.credentialsstorage,
--- a/src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf
+++ b/src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Growl Notification Service Provider
 Bundle-Description: A bundle which implements Growl notifications.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.growlnotification
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 org.jitsi.util,
--- a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
+++ b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: UI Service Provider Implementation
 Bundle-Description: An implementation of the UI service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.swingui
 Import-Package: com.apple.eawt,
 com.sun.jna.platform,
 javax.accessibility,
--- a/src/net/java/sip/communicator/impl/hid/hid.manifest.mf
+++ b/src/net/java/sip/communicator/impl/hid/hid.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: HID Service Implementation
 Bundle-Description: A bundle that offers Human Interaction features.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.hid
 Import-Package: org.osgi.framework,
 org.jitsi.util,
 net.java.sip.communicator.util,
--- a/src/net/java/sip/communicator/impl/history/history.manifest.mf
+++ b/src/net/java/sip/communicator/impl/history/history.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: History Service Provider
 Bundle-Description: A bundle that implements the history package.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.history
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 org.jitsi.service.fileaccess,
--- a/src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf
+++ b/src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Keybindings
 Bundle-Description: Provides management and persistence of keyboard shortcuts.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.keybindings
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.util,
 org.jitsi.service.fileaccess,
--- a/src/net/java/sip/communicator/impl/ldap/ldap.manifest.mf
+++ b/src/net/java/sip/communicator/impl/ldap/ldap.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: LDAP service provider
 Bundle-Description: A bundle that implements LDAP service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.ldap
 Import-Package: org.osgi.framework,
 javax.naming,
 javax.naming.directory,
--- a/src/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf
+++ b/src/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf
@ -3,6 +3,7 @@ Bundle-Description: The core of Jitsi as a stand-alone library
 Bundle-Name: libjitsi
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
+Bundle-SymbolicName: net.java.sip.communicator.libjitsi
 Export-Package: javax.media,
 javax.media.protocol,
 org.jitsi.impl.neomedia,
@ -86,4 +87,3 @@ Import-Package: apple.awt,
 quicktime.std.image,
 quicktime.std.sg,
 quicktime.util
-System-Bundle: yes
--- a/src/net/java/sip/communicator/impl/metahistory/metahistory.manifest.mf
+++ b/src/net/java/sip/communicator/impl/metahistory/metahistory.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Meta History Service Provider
 Bundle-Description: A bundle that implements the meta history package.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.metahistory
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.history,
 net.java.sip.communicator.service.history.event,
--- a/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf
+++ b/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Message History Service Provider
 Bundle-Description: A bundle that implements the message history package.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.msghistory
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 org.jitsi.service.resources, net.java.sip.communicator.service.resources,
--- a/src/net/java/sip/communicator/impl/muc/muc.manifest.mf
+++ b/src/net/java/sip/communicator/impl/muc/muc.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Chat room contact source
 Bundle-Description: Chat room contact source
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.muc
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.contactsource,
 net.java.sip.communicator.service.protocol,
--- a/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf
+++ b/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Neomedia Service Implementation
 Bundle-Description: A bundle that offers Media capture and presentation capabilities.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.neomedia
 Import-Package: apple.awt,
 ch.imvs.sdes4j,
 ch.imvs.sdes4j.srtp,
--- a/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf
+++ b/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Network Address Management service
 Bundle-Description: A bundle that provides local address selection and negotiation via ice4j.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.netaddr
 Import-Package: org.jitsi.service.configuration,
 org.jitsi.service.packetlogging,
 org.jitsi.util,
--- a/src/net/java/sip/communicator/impl/notification/notification.manifest.mf
+++ b/src/net/java/sip/communicator/impl/notification/notification.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Notifications
 Bundle-Description: An implementation of the Notification service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.notification
 Import-Package: org.osgi.framework,
 javax.imageio,
 org.jitsi.util,
--- a/src/net/java/sip/communicator/impl/osdependent/osdependent.manifest.mf
+++ b/src/net/java/sip/communicator/impl/osdependent/osdependent.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: OS dependent
 Bundle-Description: OS dependent.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.osdependent
 Export-Package: net.java.sip.communicator.service.desktop
 Import-Package: org.osgi.framework,
 com.apple.cocoa.application,
--- a/src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf
+++ b/src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Packet Logging service
 Bundle-Description: A bundle that provides packet logging in pcap file format
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.packetlogging
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 org.jitsi.service.fileaccess,
--- a/src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Dict Protocol Provider
 Bundle-Description: A bundle providing support for the Dict protocol.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.dict
 Import-Package: org.osgi.framework,
 org.jitsi.service.version,
 net.java.sip.communicator.service.contactlist,
--- a/src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Gibberish Protocol Provider
 Bundle-Description: A bundle providing support for the Gibberish protocol.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.gibberish
 Import-Package: org.osgi.framework,
 org.jitsi.service.resources, net.java.sip.communicator.service.resources,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: ICQ Protocol Provider Implementation
 Bundle-Description: An ICQ/AIM implementation of the Protocol Provider Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.icq
 Import-Package: org.osgi.framework,
 javax.net,
 sun.misc,
--- a/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Irc Protocol Provider
 Bundle-Description: A bundle providing support for the Irc protocol.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.irc
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 org.jitsi.service.resources, net.java.sip.communicator.service.resources,
--- a/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Jabber Protocol Provider Implementation
 Bundle-Description: An Jabber implementation of the Protocol Provider Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.jabber
 Import-Package: ch.imvs.sdes4j.srtp,
 javax.net,
 javax.net.ssl,
--- a/src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf
@ -2,7 +2,7 @@ Bundle-Name: MockProvider
 Bundle-Description: Mock provider service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.mock
 Import-Package: net.java.sip.communicator.service.contactlist,
 net.java.sip.communicator.service.contactlist.event,
 org.osgi.framework,
--- a/src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Msn Protocol Provider Implementation
 Bundle-Description: An Msn implementation of the Protocol Provider Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.msn
 Import-Package: org.apache.commons.logging,
 org.apache.http,
 org.apache.http.entity,
--- a/src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Rss Protocol Provider
 Bundle-Description: A bundle providing support for the Rss protocol.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.rss
 Import-Package: org.osgi.framework,
 org.apache.log4j,
 org.xml.sax,
--- 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
@ -3,7 +3,7 @@ Bundle-Name: SIP Communicator SIP Protocol Provider
 Bundle-Description: A bundle that implements the Protocol Provider package over SIP.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.sip
 Import-Package:  ch.imvs.sdes4j.srtp,
 javax.net,
 javax.net.ssl,
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: SSH Protocol Provider
 Bundle-Description: A bundle providing support for the SSH protocol.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.ssh
 Import-Package: org.osgi.framework,
 javax.crypto,
 javax.crypto.interfaces,
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Yahoo Protocol Provider Implementation
 Bundle-Description: An Yahoo implementation of the Protocol Provider Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.yahoo
 Import-Package: org.osgi.framework,
 javax.net.ssl,
 javax.swing,
--- a/src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Zeroconf Protocol Provider
 Bundle-Description: A bundle providing support for the Zeroconf protocol.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.zeroconf
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 org.jitsi.service.resources, net.java.sip.communicator.service.resources,
--- a/src/net/java/sip/communicator/impl/provdisc/dhcp/dhcp.provdisc.manifest.mf
+++ b/src/net/java/sip/communicator/impl/provdisc/dhcp/dhcp.provdisc.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: DHCP provisioning discovery
 Bundle-Description: A bundle providing support for DHCP provisioning discovery
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.provdisc.dhcp
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.provdisc,
 net.java.sip.communicator.service.provdisc.event,
--- 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
@ -3,7 +3,7 @@ Bundle-Name: mDNS provisioning discovery
 Bundle-Description: A bundle providing support for mDNS provisioning discovery
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.provdisc.mdns
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.provdisc,
 net.java.sip.communicator.service.provdisc.event,
--- a/src/net/java/sip/communicator/impl/replacement/bliptv/bliptv.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/bliptv/bliptv.source.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Blip.tv Preview Replacement Source
 Bundle-Description: A bundle providing processing for Blip.tv previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.bliptv
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.replacement,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/impl/replacement/dailymotion/dailymotion.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/dailymotion/dailymotion.source.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Dailymotion Replacement Source
 Bundle-Description: A bundle providing replacement for dailymotion links.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.dailymotion
 Import-Package: org.osgi.framework,
 org.jitsi.service.version,
 net.java.sip.communicator.service.replacement,
--- a/src/net/java/sip/communicator/impl/replacement/directimage/directimage.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/directimage/directimage.source.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Direct Image Link Replacement Source
 Bundle-Description: A bundle providing replacement for direct image links.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.directimage
 Import-Package: org.osgi.framework,
 org.jitsi.service.version,
 net.java.sip.communicator.service.replacement,
--- a/src/net/java/sip/communicator/impl/replacement/flickr/flickr.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/flickr/flickr.source.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Flickr Preview Replacement Source
 Bundle-Description: A bundle providing processing for flickr previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.flickr
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.replacement,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/impl/replacement/hulu/hulu.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/hulu/hulu.source.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Hulu Preview Replacement Source
 Bundle-Description: A bundle providing processing for Hulu previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.hulu
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.replacement,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/impl/replacement/metacafe/metacafe.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/metacafe/metacafe.source.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Metacafe Preview Replacement Source
 Bundle-Description: A bundle providing processing for metacafe previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.metacafe
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.replacement,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/impl/replacement/smiley/smiley.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/smiley/smiley.source.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Smiley Replacement Source
 Bundle-Description: A bundle providing processing for smileys.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.smiley
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.replacement,
 net.java.sip.communicator.service.replacement.smilies,
--- a/src/net/java/sip/communicator/impl/replacement/twitpic/twitpic.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/twitpic/twitpic.source.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Twitpic Preview Replacement Source
 Bundle-Description: A bundle providing processing for Twitpic previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.twitpic
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.replacement,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/impl/replacement/vbox7/vbox7.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/vbox7/vbox7.source.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Vbox7 Preview Replacement Source
 Bundle-Description: A bundle providing processing for vbox7 previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.vbox7
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.replacement,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/impl/replacement/viddler/viddler.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/viddler/viddler.source.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Viddler Preview Replacement Source
 Bundle-Description: A bundle providing processing for Viddler previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.viddler
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.replacement,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/impl/replacement/vimeo/vimeo.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/vimeo/vimeo.source.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Vimeo Preview Replacement Source
 Bundle-Description: A bundle providing processing for vimeo previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.vimeo
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.replacement,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/impl/replacement/youtube/youtube.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/youtube/youtube.source.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Youtube Replacement Source
 Bundle-Description: A bundle providing replacement for youtube links.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.youtube
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.replacement,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf
+++ b/src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Resource Management Service
 Bundle-Description: The plugin managing images and languages resource packs.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.resources
 Export-Package: net.java.sip.communicator.service.resources
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/impl/shutdowntimeout/shutdown.timeout.manifest.mf
+++ b/src/net/java/sip/communicator/impl/shutdowntimeout/shutdown.timeout.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: ShutdownBundle
 Bundle-Description: A bundle that makes sure that when closed SIP Communicator will exit in 15 seconds at most.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.shutdowntimeout
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 net.java.sip.communicator.util,
--- a/src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf
+++ b/src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Sparkle Auto-Update Service Provider
 Bundle-Description: A bundle that launches the Sparkle framework.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.sparkle
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 org.jitsi.service.resources, net.java.sip.communicator.service.resources,
--- a/src/net/java/sip/communicator/impl/swingnotification/swingnotification.manifest.mf
+++ b/src/net/java/sip/communicator/impl/swingnotification/swingnotification.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Swing Notification Service Provider
 Bundle-Description: A bundle which implements Swing notifications.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.swingnotification
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 net.java.sip.communicator.service.protocol,
--- a/src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf
+++ b/src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: System Activity Service Implementation
 Bundle-Description: System Activity Service Implementation.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.sysactivity
 Import-Package: org.osgi.framework,
 org.jitsi.service.version,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/impl/version/version.impl.manifest.mf
+++ b/src/net/java/sip/communicator/impl/version/version.impl.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Version Service Implementation
 Bundle-Description: Version Service Implementation.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.version
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 org.jitsi.service.version,
--- a/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Contact Info
 Bundle-Description: A plug-in that can set cross protocol account info.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.accountinfo
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.globaldisplaydetails,
--- a/src/net/java/sip/communicator/plugin/addrbook/addrbook.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/addrbook/addrbook.manifest.mf
@ -3,6 +3,7 @@ Bundle-Description: OS-specific Address Book support
 Bundle-Name: OS-specific Address Book support
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
+Bundle-SymbolicName: net.java.sip.communicator.plugin.addrbook
 Import-Package: javax.swing,
 org.jitsi.service.configuration,
 org.jitsi.util,
@ -13,4 +14,3 @@ Import-Package: javax.swing,
 net.java.sip.communicator.util,
 net.java.sip.communicator.plugin.desktoputil,
 org.osgi.framework
-System-Bundle: yes
--- a/src/net/java/sip/communicator/plugin/advancedconfig/advancedconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/advancedconfig/advancedconfig.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Advanced config plugin
 Bundle-Description: The plugin offering advanced configuration page.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.advancedconfig
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 net.java.sip.communicator.service.contactlist,
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: AIM account registration wizard
 Bundle-Description: AIM account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.aimaccregwizz
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.browserlauncher,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Branding plugin
 Bundle-Description: Branding plugin.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.branding
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.browserlauncher,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/plugin/certconfig/certconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/certconfig/certconfig.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Certificate Configuration Plugin
 Bundle-Description: Allows the configuration of general X.509 certificate settings.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: no
+Bundle-SymbolicName: net.java.sip.communicator.plugin.certconfig
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.certificate,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Chat Alerter
 Bundle-Description: A plug-in that alerts for new messages by flashing the window in the taskbar.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.chatalerter
 Import-Package: org.osgi.framework,
 org.jitsi.util,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/plugin/chatconfig/chatconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/chatconfig/chatconfig.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Plugin Manager Chat
 Bundle-Description: Manage all chat options.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.chatconfig
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 net.java.sip.communicator.service.gui,
--- a/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Contact Info
 Bundle-Description: A plug-in that can show cross protocol user info.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.contactinfo
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  net.java.sip.communicator.service.contactlist,
--- a/src/net/java/sip/communicator/plugin/contactsourceconfig/contactsourceconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/contactsourceconfig/contactsourceconfig.manifest.mf
@ -3,6 +3,7 @@ Bundle-Description: Contact sources configuration
 Bundle-Name: Contact sources configuration
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
+Bundle-SymbolicName: net.java.sip.communicator.plugin.contactsourceconfig
 Import-Package: net.java.sip.communicator.service.contactsource,
 net.java.sip.communicator.service.protocol,
 net.java.sip.communicator.util,
@ -12,4 +13,3 @@ Import-Package: net.java.sip.communicator.service.contactsource,
 org.jitsi.service.configuration,
 org.osgi.framework,
 javax.swing
-System-Bundle: yes
--- a/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Default Resource Pack
 Bundle-Description: The plugin offering default images and languages.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.defaultresourcepack
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.util,
 org.jitsi.service.resources, net.java.sip.communicator.service.resources
--- a/src/net/java/sip/communicator/plugin/demuxcontactsource/demuxcontactsource.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/demuxcontactsource/demuxcontactsource.manifest.mf
@ -2,9 +2,9 @@ Bundle-Activator: net.java.sip.communicator.plugin.demuxcontactsource.DemuxConta
 Bundle-Description: Demultiplexing contact source
 Bundle-Name: Demux Contact Source
 Bundle-Vendor: jitsi.org
-Bundle-Version: 0.0.1
+Bundle-Version: 0.0.1
+Bundle-SymbolicName: net.java.sip.communicator.plugin.demuxcontactsource
 Import-Package: net.java.sip.communicator.service.contactsource,
 net.java.sip.communicator.service.protocol,
 org.jitsi.util,
 org.osgi.framework
-System-Bundle: yes
--- a/src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Jitsi Swing Utility Packages
 Bundle-Description: A bundle that export packages with swing related utility classes.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.desktoputil
 Import-Package: com.sun.awt,
 javax.accessibility,
 javax.imageio,
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Dict account registration wizard
 Bundle-Description: Dict account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.dictaccregwizz
 Import-Package: org.osgi.framework,
 net.java.dict4j,
 net.java.sip.communicator.service.browserlauncher,
--- a/src/net/java/sip/communicator/plugin/dnsconfig/dnsconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/dnsconfig/dnsconfig.manifest.mf
@ -1,10 +1,9 @@
 Bundle-Activator: net.java.sip.communicator.plugin.dnsconfig.DnsConfigActivator
 Bundle-Name: Jitsi DNS config
-Bundle-SymbolicName: net.java.sip.communicator.plugin
 Bundle-Description: A bundle that export config panels for DNS utility classes.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.dnsconfig
 Import-Package: org.jitsi.util, 
 org.osgi.framework,
 net.java.sip.communicator.util,
--- a/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Example plugin
 Bundle-Description: An example showing how to make plugins for the ui.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.exampleplugin
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.contactlist,
 net.java.sip.communicator.service.contactlist.event,
--- a/src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Facebook account registration wizard
 Bundle-Description: Facebook account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.facebookaccregwizz
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.browserlauncher,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: General config plugin
 Bundle-Description: The plugin offering general configuration page.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.generalconfig
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 org.jitsi.util,
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Gibberish account registration wizard
 Bundle-Description: Gibberish account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.gibberishaccregwizz
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.browserlauncher,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Global Proxy Config Plugin
 Bundle-Description: A plugin to configure global proxy for sip communicator
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.globalproxyconfig
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.util,
 net.java.sip.communicator.plugin.desktoputil,
--- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Google Talk account registration wizard
 Bundle-Description: Google Talk account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.googletalkaccregwizz
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.browserlauncher,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: ICQ account registration wizard
 Bundle-Description: ICQ account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.icqaccregwizz
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.browserlauncher,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/plugin/ippiaccregwizz/ippiaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/ippiaccregwizz/ippiaccregwizz.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Ippi account registration wizard
 Bundle-Description: Ippi account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.ippiaccregwizz
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.browserlauncher,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: IP Tel account registration wizard
 Bundle-Description: IP Tel account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.iptelaccregwizz
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.browserlauncher,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: IRC account registration wizard
 Bundle-Description: IRC account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.ircaccregwizz
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.browserlauncher,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Jabber account registration wizard
 Bundle-Description: Jabber account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.jabberaccregwizz
 Export-package: net.java.sip.communicator.plugin.jabberaccregwizz
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.browserlauncher,
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Keybinding Chooser
 Bundle-Description: Provides configuring UI for keyboard shortcuts.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.keybindingchooser
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.gui,
 net.java.sip.communicator.service.keybindings,
--- a/src/net/java/sip/communicator/plugin/ldap/ldap.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/ldap/ldap.manifest.mf
@ -3,6 +3,7 @@ Bundle-Description: LDAP support
 Bundle-Name: LDAP support
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
+Bundle-SymbolicName: net.java.sip.communicator.plugin.ldap
 Import-Package: net.java.sip.communicator.service.contactsource,
 org.jitsi.service.resources, net.java.sip.communicator.service.resources,
 net.java.sip.communicator.service.protocol,
@ -18,4 +19,3 @@ Import-Package: net.java.sip.communicator.service.contactsource,
 javax.swing.tree,
 javax.swing.text,
 org.osgi.framework
-System-Bundle: yes
--- a/src/net/java/sip/communicator/plugin/loggingutils/loggingutils.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/loggingutils/loggingutils.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Logging utils
 Bundle-Description: A bundle that provides packet logging utils as config and saving archived logs
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.loggingutils
 Import-Package: org.osgi.framework,
 org.jitsi.service.configuration,
 org.jitsi.service.fileaccess,
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf
@ -3,7 +3,7 @@ Bundle-Name: Msn account registration wizard
 Bundle-Description: Msn account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.msnaccregwizz
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.browserlauncher,
 org.jitsi.service.configuration,
--- a/src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf
@ -3,6 +3,7 @@ Bundle-Description: Microsoft Office Communicator
 Bundle-Name: Microsoft Office Communicator
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
+Bundle-SymbolicName: net.java.sip.communicator.plugin.msofficecomm
 Import-Package: javax.swing,
 net.java.sip.communicator.service.contactlist,
 net.java.sip.communicator.service.gui,
--- a/src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf
@ -3,6 +3,6 @@ Bundle-Name: NimbuzzAvatars
 Bundle-Description: Custom Nimbuzz Avatars plugin
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.nimbuzzavatars
 Import-Package: org.osgi.framework,
 net.java.sip.communicator.service.customavatar
--- a/Show More
+++ b/Show More