Moving to Felix

build.xml

@@ -287,7 +287,7 @@
                   name="${macosx.app.name}-${macosx.app.ver}"
                   shortname="SIP Communicator"
                   signature="sipc"
-                  mainclass="org.ungoverned.oscar.Main"
+                  mainclass="org.apache.felix.main.Main"
                   icon="src/net/java/sip/communicator/impl/gui/resources/common/logo/sc_logo_128x128.icns"
                   jvmversion="1.4+"
                   version="${macosx.app.ver}"
@@ -302,8 +302,8 @@
         <javaproperty name="apple.awt.showGrowBox" value="false"/>
 
         <!-- Tell oscar to run sip-communicator -->
-        <javaproperty name="oscar.config.properties"
-                      value="file:oscar.client.run.properties"/>
+        <javaproperty name="felix.config.properties"
+                      value="file:felix.client.run.properties"/>
         <!-- Tell java.util.logging about our logging preferences -->
         <javaproperty name="java.util.logging.config.file"
                       value="logging.properties"/>
@@ -315,7 +315,7 @@
           <include name="${bundles.dest}/*.jar" />
         </jarfileset>
         <javafilelist dir="${lib}"
-                      files="logging.properties, oscar.client.run.properties"/>
+                      files="logging.properties, felix.client.run.properties"/>
       </jarbundler>
     </target>
 
@@ -395,7 +395,7 @@
 
         <!-- Do the testing itself. Note that we don't fail on error as we need
              to generate an html report before leaving this target.-->
-        <java classname="org.ungoverned.oscar.Main"
+        <java classname="org.apache.felix.main.Main"
             fork="true"
             failonerror="false"
             resultproperty="test.result.code"
@@ -403,8 +403,8 @@
 
             <!-- The following two configure oscar telling it that it's running
                  as a test environment-->
-            <sysproperty key="oscar.config.properties"
-                value="file:./lib/oscar.unit.test.properties"/>
+            <sysproperty key="felix.config.properties"
+                value="file:./lib/felix.unit.test.properties"/>
 
             <!-- Tell the slick runner where to store test results. -->
             <sysproperty key="net.java.sip.communicator.slick.runner.OUTPUT_DIR"
@@ -470,8 +470,8 @@
     <target name="run"
         description="Starts oscar and runs sip-comunicator gui (use latest build).">
 
-         <!-- forking prevents from debugging-->
-        <java classname="org.ungoverned.oscar.Main"
+         <!-- forking prevents from debugging -->
+        <java classname="org.apache.felix.main.Main"
             fork="true"
             failonerror="true"
             classpathref="project.class.path">
@@ -480,8 +480,8 @@
             <!--sysproperty key="icq.custom.message.charset" value="windows-1252"/-->
 
             <!-- Tell oscar to run sip-communicator-->
-            <sysproperty key="oscar.config.properties"
-                value="file:./lib/oscar.client.run.properties"/>
+            <sysproperty key="felix.config.properties"
+                value="file:./lib/felix.client.run.properties"/>
 
             <!-- Tell java.util.logging about our logging preferences -->
             <sysproperty key="java.util.logging.config.file"
@@ -519,7 +519,7 @@
         </nbjpdastart>
 
         <java fork="true"
-              classname="org.ungoverned.oscar.Main"
+              classname="org.apache.felix.main.Main"
               classpathref="project.class.path"
               failonerror="true" >
            <jvmarg value="-Xdebug"/>
@@ -530,8 +530,8 @@
 
             <!-- The following two configure oscar telling it that it's running
                  as a test environment-->
-            <sysproperty key="oscar.config.properties"
-                value="file:./lib/oscar.unit.test.properties"/>
+            <sysproperty key="felix.config.properties"
+                value="file:./lib/felix.unit.test.properties"/>
 
             <!-- Tell the slick runner where to store test results. -->
             <sysproperty key="net.java.sip.communicator.slick.runner.OUTPUT_DIR"
@@ -565,7 +565,7 @@
         bundle-protocol,bundle-icq,bundle-icq-slick,bundle-mock,
         bundle-jabber,bundle-jabber-slick,bundle-swing-ui,
         bundle-msn,bundle-msn-slick,
-        meta-contactlist,meta-contactlist-slick,
+        bundle-contactlist,meta-contactlist,meta-contactlist-slick,
         bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz,
         bundle-plugin-msnaccregwizz,bundle-plugin-sipaccregwizz"/>
 
@@ -923,13 +923,21 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
+    <!-- BUNDLE-CONTACTLIST -->
+    <target name="bundle-contactlist">
+        <!-- Creates a bundle containing the contactlist interfaces."-->
+        <jar compress="false" destfile="${bundles.dest}/contactlist.jar"
+            manifest="src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf">
+            <zipfileset dir="${dest}/net/java/sip/communicator/service/contactlist"
+                prefix="net/java/sip/communicator/service/contactlist"/>
+        </jar>
+    </target>
+
     <!-- BUNDLE-META-CONTACTLIST -->
     <target name="meta-contactlist">
         <!-- Creates the meta contact list bundle."-->
         <jar compress="false" destfile="${bundles.dest}/meta-cl.jar"
             manifest="src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/service/contactlist"
-                prefix="net/java/sip/communicator/service/contactlist"/>
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/contactlist"
                 prefix="net/java/sip/communicator/impl/contactlist"/>
         </jar>

lib/felix.client.run.properties

@@ -0,0 +1,97 @@
+#
+# Framework config properties.
+#
+org.osgi.framework.system.packages= org.osgi.framework; \
+ javax.swing; \
+ javax.swing.event; \
+ javax.swing.table; \
+ javax.swing.text; \
+ javax.swing.text.html; \
+ javax.accessibility; \
+ javax.swing.plaf; \
+ javax.swing.plaf.metal; \
+ javax.swing.plaf.basic; \
+ javax.imageio; \
+ javax.swing.tree; \
+ javax.swing.undo; \
+ javax.swing.event; \
+ javax.swing.border; \
+ javax.swing.filechooser; \
+ org.w3c.dom; \
+ org.xml.sax; \
+ javax.xml.parsers;\
+ org.apache.xml.serializer; \
+ javax.xml.transform; \
+ javax.xml.transform.dom; \
+ javax.xml.transform.stream; \
+ sun.security.action; \
+ net.java.stun4j; \
+ net.java.stun4j.client; \
+ net.java.stun4j.StunAddress; \
+ net.java.stun4j.StunException; \
+ javax.net.ssl; \
+ javax.naming; \
+ javax.naming.directory; \
+ javax.sound;\
+ javax.sound.sampled; \
+ edu.stanford.ejalbert; \
+ edu.stanford.ejalbert.exception; \
+ edu.stanford.ejalbert.exceptionhandler;
+
+felix.auto.start.1= reference:file:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar
+#reference:file:lib/bundle/org.apache.felix.bundlerepository-0.8.0-SNAPSHOT.jar
+#\
+# file:lib/bundle/shell.jar \
+#  \
+# file:lib/bundle/servicebinder.jar \
+# file:lib/bundle/tablelayout.jar
+
+felix.auto.start.2= \
+ reference:file:sc-bundles/util.jar
+
+felix.auto.start.3= \
+ reference:file:sc-bundles/configuration.jar \
+ reference:file:sc-bundles/fileaccess.jar \
+ reference:file:sc-bundles/protocol.jar \
+ reference:file:sc-bundles/contactlist.jar \
+ reference:file:sc-bundles/media.jar \
+ reference:file:sc-bundles/protocol-icq.jar \
+ reference:file:sc-bundles/protocol-sip.jar \
+ reference:file:sc-bundles/protocol-jabber.jar \
+ reference:file:sc-bundles/protocol-msn.jar \
+ reference:file:sc-bundles/netaddr.jar \
+ reference:file:sc-bundles/meta-cl.jar
+
+felix.auto.start.4= \
+ reference:file:sc-bundles/history.jar \
+ reference:file:sc-bundles/msghistory.jar \
+ reference:file:sc-bundles/callhistory.jar
+
+
+ felix.auto.start.66= \
+ reference:file:sc-bundles/swing-ui.jar
+
+ felix.auto.start.67= \
+ reference:file:sc-bundles/icqaccregwizz.jar \
+ reference:file:sc-bundles/sipaccregwizz.jar \
+ reference:file:sc-bundles/jabberaccregwizz.jar \
+ reference:file:sc-bundles/msnaccregwizz.jar
+
+# Uncomment the following lines if you want to run the architect viewer
+# bundle.
+#oscar.auto.start.100= \
+# file:lib/bundle/architectureviewer1.1.jar
+
+#Specify the directory where oscar should deploy its bundles
+felix.cache.profiledir=sip-communicator.bin
+
+
+felix.startlevel.framework=100
+felix.startlevel.bundle=100
+#
+# Bundle config properties.
+#
+#org.osgi.service.http.port=8080
+#osgi.shell.telnet=on
+#oscar.repository.url=file:/home/rickhall/projects/noscar/repository.xml
+oscar.embedded.execution=false

lib/felix.unit.test.properties

@@ -0,0 +1,89 @@
+#
+# Oscar configuration properties.
+# This file configures the OSCAR framework to run sip-communicator unit tests
+# and Service Implementation Compatibility Kits
+#
+org.osgi.framework.system.packages= org.osgi.framework; \
+ javax.swing; \
+ javax.swing.event; \
+ javax.swing.table; \
+ org.w3c.dom; \
+ org.xml.sax; \
+ sun.security.action; \
+ javax.xml.parsers;\
+ org.apache.xml.serializer;\
+ javax.xml.transform;\
+ javax.xml.transform.dom;\
+ javax.xml.transform.stream;\
+ net.java.stun4j;\
+ net.java.stun4j.client;\
+ javax.sound;\
+ javax.sound.sampled; \
+ javax.naming; \
+ javax.naming.directory; \
+ javax.net.ssl;
+
+#
+# In case you want testing to run using oscar's graphical ui then uncomment
+#
+# the following and copy/paste them after the shell.jar bundle
+# file:lib/bundle/shellgui.jar \
+# file:lib/bundle/shellplugin.jar \
+# file:lib/bundle/tablelayout.jar \
+#
+
+felix.auto.start.1= file:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar \
+ file:lib/bundle/junit.jar
+# file:lib/bundle/shell.jar \
+# file:lib/bundle/bundlerepository.jar \
+# file:lib/bundle/servicebinder.jar \
+#
+
+felix.auto.start.2= \
+ file:sc-bundles/util.jar
+
+felix.auto.start.3= \
+ file:sc-bundles/configuration.jar \
+ file:sc-bundles/netaddr.jar
+
+felix.auto.start.4= \
+ file:sc-bundles/protocol.jar \
+ file:sc-bundles/contactlist.jar \
+ file:sc-bundles/fileaccess.jar \
+ file:sc-bundles/history.jar \
+ file:sc-bundles/protocol-icq.jar \
+ file:sc-bundles/protocol-jabber.jar \
+ file:sc-bundles/protocol-msn.jar \
+ file:sc-bundles/protocol-sip.jar \
+ file:sc-bundles/media.jar \
+ file:sc-bundles/meta-cl.jar \
+ file:sc-bundles/msghistory.jar \
+ file:sc-bundles/callhistory.jar
+
+felix.auto.start.5= \
+ file:sc-bundles/slickless.jar \
+ file:sc-bundles/configuration-slick.jar \
+ file:sc-bundles/protocol.jar \
+ file:sc-bundles/protocol-mock.jar \
+ file:sc-bundles/media-slick.jar \
+ file:sc-bundles/netaddr-slick.jar \
+ file:sc-bundles/fileaccess-slick.jar \
+ file:sc-bundles/history-slick.jar \
+ file:sc-bundles/meta-cl-slick.jar \
+ file:sc-bundles/protocol-icq-slick.jar \
+ file:sc-bundles/protocol-sip-slick.jar \
+ file:sc-bundles/protocol-jabber-slick.jar \
+ file:sc-bundles/protocol-msn-slick.jar \
+ file:sc-bundles/msghistory-slick.jar \
+ file:sc-bundles/callhistory-slick.jar
+
+felix.auto.start.100= \
+ file:sc-bundles/slick-runner.jar
+
+#Specify the directory where oscar should deploy its bundles
+felix.cache.profiledir=sip-communicator.utest.bin
+
+felix.startlevel.framework=100
+felix.startlevel.bundle=100
+
+felix.embedded.execution=true

resources/install/generic/installer-generic.xml

@@ -53,7 +53,7 @@
                                 <exclude name="izpack"/>
 			</fileset>
 
-			<file targetdir="$INSTALL_PATH/lib" src="lib/oscar.client.run.properties"/>
+			<file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties"/>
 			<file targetdir="$INSTALL_PATH/lib" src="lib/logging.properties"/>
 		</pack>
 
@@ -73,6 +73,10 @@
 			<description>SIP Communicator bundle Protocol</description>
 			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol.jar"/>
 		</pack>
+		<pack name="contactlist" required="yes">
+			<description>SIP Communicator bundle Contactlist</description>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/contactlist.jar"/>
+		</pack>
 		<pack name="media" required="yes">
 			<description>SIP Communicator bundle Media</description>
 			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar"/>

resources/install/linux/installer-linux.xml

@@ -51,7 +51,7 @@
                                 <exclude name="izpack"/>
 			</fileset>
 
-			<file targetdir="$INSTALL_PATH/lib" src="lib/oscar.client.run.properties"/>
+			<file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties"/>
 			<file targetdir="$INSTALL_PATH/lib" src="lib/logging.properties"/>
 		</pack>
 
@@ -71,6 +71,10 @@
 			<description>SIP Communicator bundle Protocol</description>
 			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol.jar"/>
 		</pack>
+		<pack name="contactlist" required="yes">
+			<description>SIP Communicator bundle Contactlist</description>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/contactlist.jar"/>
+		</pack>
 		<pack name="media" required="yes">
 			<description>SIP Communicator bundle Media</description>
 			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar"/>

resources/install/linux/run.sh

@@ -1,2 +1,2 @@
 export JAVA_HOME=jre
-${JAVA_HOME}/bin/java -classpath "lib/JainSipApi1.1.jar:lib/Stun4J.jar:lib/architectureviewer1.1.jar:lib/bcprov-jdk14-130.jar:lib/joscar-0.9.4-cvs-bin.jar:lib/moduleloader.jar:lib/nist-sdp-1.0.jar:lib/nist-sip-1.2.jar:lib/oscar-aim.jar:lib/oscar.jar:lib/osgi.jar:lib/retroweaver-rt.jar:lib/retroweaver.jar:lib/servicebinder.jar:lib/BrowserLauncher2-10rc4.jar:lib/sip-sdp.jar:lib/cindy.jar:lib/commons-logging.jar:lib/jml-1.0a3.jar" -Dicq.custom.message.charset=windows-1251 -Doscar.config.properties=file:./lib/oscar.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.ungoverned.oscar.Main
+${JAVA_HOME}/bin/java -classpath "lib/JainSipApi1.1.jar:lib/Stun4J.jar:lib/architectureviewer1.1.jar:lib/bcprov-jdk14-130.jar:lib/joscar-0.9.4-cvs-bin.jar:lib/nist-sdp-1.0.jar:lib/nist-sip-1.2.jar:lib/oscar-aim.jar:lib/felix.jar:lib/kxml-min.jar:lib/retroweaver-rt.jar:lib/retroweaver.jar:lib/servicebinder.jar:lib/BrowserLauncher2-10rc4.jar:lib/sip-sdp.jar:lib/cindy.jar:lib/commons-logging.jar:lib/jml-1.0a3.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main

resources/install/windows/installer-windows.xml

@@ -52,7 +52,7 @@
                                 <exclude name="izpack"/>
 			</fileset>
 
-			<file targetdir="$INSTALL_PATH/lib" src="lib/oscar.client.run.properties"/>
+			<file targetdir="$INSTALL_PATH/lib" src="lib/felix.client.run.properties"/>
 			<file targetdir="$INSTALL_PATH/lib" src="lib/logging.properties"/>
 		</pack>
 
@@ -72,6 +72,10 @@
 			<description>SIP Communicator bundle Protocol</description>
 			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/protocol.jar"/>
 		</pack>
+        <pack name="contactlist" required="yes">
+			<description>SIP Communicator bundle Contactlist</description>
+			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/contactlist.jar"/>
+		</pack>
 		<pack name="media" required="yes">
 			<description>SIP Communicator bundle Media</description>
 			<file  targetdir="$INSTALL_PATH/sc-bundles" src="sc-bundles/media.jar"/>

resources/install/windows/run.bat

@@ -1 +1 @@
-start javaw -classpath "lib/JainSipApi1.1.jar;lib/Stun4J.jar;lib/architectureviewer1.1.jar;lib/bcprov-jdk14-130.jar;lib/joscar-0.9.4-cvs-bin.jar;lib/moduleloader.jar;lib/nist-sdp-1.0.jar;lib/nist-sip-1.2.jar;lib/oscar-aim.jar;lib/oscar.jar;lib/osgi.jar;lib/retroweaver-rt.jar;lib/retroweaver.jar;lib/servicebinder.jar;lib/BrowserLauncher2-10rc4.jar;lib/sip-sdp.jar;lib/cindy.jar;lib/commons-logging.jar;lib/jml-1.0a3.jar" -Dicq.custom.message.charset=windows-1251 -Doscar.config.properties=file:./lib/oscar.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.ungoverned.oscar.Main
+start javaw -classpath "lib/JainSipApi1.1.jar;lib/Stun4J.jar;lib/architectureviewer1.1.jar;lib/bcprov-jdk14-130.jar;lib/joscar-0.9.4-cvs-bin.jar;lib/nist-sdp-1.0.jar;lib/nist-sip-1.2.jar;lib/oscar-aim.jar;lib/felix.jar;lib/kxml-min.jar;lib/retroweaver-rt.jar;lib/retroweaver.jar;lib/servicebinder.jar;lib/BrowserLauncher2-10rc4.jar;lib/sip-sdp.jar;lib/cindy.jar;lib/commons-logging.jar;lib/jml-1.0a3.jar" -Dicq.custom.message.charset=windows-1251 -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main

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

@@ -64,6 +64,7 @@ public void start(BundleContext bundleContext) throws Exception
 
     public void stop(BundleContext bundleContext) throws Exception
     {
-
+        if(callHistoryService != null)
+            callHistoryService.stop(bundleContext);
     }
 }

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

@@ -501,6 +501,44 @@ public void start(BundleContext bc)
         }
     }
 
+    /**
+     * stops the service.
+     *
+     * @param bc BundleContext
+     */
+    public void stop(BundleContext bc)
+    {
+        bc.removeServiceListener(this);
+
+        ServiceReference[] protocolProviderRefs = null;
+        try
+        {
+            protocolProviderRefs = bc.getServiceReferences(
+                ProtocolProviderService.class.getName(),
+                null);
+        }
+        catch (InvalidSyntaxException ex)
+        {
+            // this shouldn't happen since we're providing no parameter string
+            // but let's log just in case.
+            logger.error("Error while retrieving service refs", ex);
+            return;
+        }
+
+        // in case we found any
+        if (protocolProviderRefs != null)
+        {
+            for (int i = 0; i < protocolProviderRefs.length; i++)
+            {
+                ProtocolProviderService provider = (ProtocolProviderService) bc
+                    .getService(protocolProviderRefs[i]);
+
+                this.handleProviderRemoved(provider);
+            }
+        }
+    }
+
+
     /**
      * Writes the given record to the history service
      * @param callRecord CallRecord

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

@@ -3,8 +3,7 @@ Bundle-Name: Call History Service Provider
 Bundle-Description: A bundle that implements the call history package.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
-Import-Package: org.ungoverned.gravity.servicebinder,
- org.osgi.framework,
+Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.fileaccess,
  net.java.sip.communicator.service.history,
  net.java.sip.communicator.service.history.event,

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

@@ -12,6 +12,6 @@ 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
 Export-Package: net.java.sip.communicator.service.configuration,
- net.java.sip.communicator.service.configuration.event,
+ net.java.sip.communicator.service.configuration.event

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

@@ -61,7 +61,7 @@ public void start(BundleContext context) throws Exception
      */
     public void stop(BundleContext context) throws Exception
     {
-        if(mclServiceImpl == null)
+        if(mclServiceImpl != null)
             mclServiceImpl.stop(context);
     }
 }

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

@@ -199,7 +199,7 @@ public void stop(BundleContext bc)
 
         //stop listening to all currently installed providers
         Iterator providers
-            = this.currentlyInstalledProviders.keySet().iterator();
+            = this.currentlyInstalledProviders.values().iterator();
 
         while (providers.hasNext())
         {
@@ -447,7 +447,7 @@ private void addNewContactToMetaContact( ProtocolProviderService provider,
      * by <tt>protoProvider</tt>. The method does not return before creating
      * all groups has completed.
      *
-     * @param protoProvider a reference to the protocol provider where the 
+     * @param protoProvider a reference to the protocol provider where the
      * groups should be created.
      * @param metaGroup a ref to the last group of the path that should be
      * created in the specified <tt>protoProvider</tt>
@@ -779,18 +779,18 @@ public void renameMetaContact(MetaContact metaContact, String newDisplayName)
      * Makes the specified <tt>contact</tt> a child of the
      * <tt>newParentMetaGroup</tt> MetaContactGroup. If <tt>contact</tt> was
      * previously a child of a meta contact, it will be removed from its
-     * old parent and to a newly created one even if they both are in the same 
-     * group. If the specified contact was the only child of its previous 
+     * old parent and to a newly created one even if they both are in the same
+     * group. If the specified contact was the only child of its previous
      * parent, then the meta contact will also be moved.
-     * 
-     * 
+     *
+     *
      * @param contact the <tt>Contact</tt> to move to the
      * @param newParentMetaGroup the MetaContactGroup where we'd like contact to be moved.
      * @throws MetaContactListException with an appropriate code if the
      * operation fails for some reason.
      */
-    public void moveContact(Contact contact, 
-                            MetaContactGroup newParentMetaGroup) 
+    public void moveContact(Contact contact,
+                            MetaContactGroup newParentMetaGroup)
         throws MetaContactListException
     {
         /** @todo implement */
@@ -1457,7 +1457,8 @@ private void handleProviderRemoved(
         logger.debug("Removing protocol provider "
                      + provider.getProtocolName());
 
-        this.currentlyInstalledProviders.remove(provider);
+        this.currentlyInstalledProviders.
+            remove(provider.getAccountID().getAccountUniqueID());
 
         //get the root group for the provider so that we could remove it.
         OperationSetPersistentPresence persPresOpSet

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

@@ -6,7 +6,6 @@ Bundle-Version: 0.0.1
 Export-Package: net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.util,
  net.java.sip.communicator.service.fileaccess,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,

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

@@ -3,20 +3,19 @@ Bundle-Name: File Access Service Provider
 Bundle-Description: A bundle that implements the file access package.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
-Import-Package: org.ungoverned.gravity.servicebinder,
- org.osgi.framework,
- net.java.sip.communicator.service.configuration,
- net.java.sip.communicator.service.fileaccess,
- net.java.sip.communicator.impl.fileaccess,
- org.w3c.dom,
- org.xml.sax,
- javax.xml.parsers,
+Import-Package: org.osgi.framework,
  org.apache.xml.serializer,
+ org.xml.sax,
+ org.w3c.dom,
  javax.xml.transform,
  javax.xml.transform.dom,
  javax.xml.transform.stream,
+ javax.xml.parsers,
  net.java.sip.communicator.util,
  net.java.sip.communicator.util.xml,
+ net.java.sip.communicator.service.configuration,
+ net.java.sip.communicator.service.fileaccess,
+ net.java.sip.communicator.impl.fileaccess
 Export-Package: net.java.sip.communicator.service.fileaccess,
- net.java.sip.communicator.impl.fileaccess,
+ net.java.sip.communicator.impl.fileaccess
 Metadata-Location: /net/java/sip/communicator/impl/fileaccess/fileaccess.metadata.xml

src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf

@@ -33,7 +33,6 @@ Import-Package: org.osgi.framework,
  javax.swing.filechooser,
  javax.swing.tree,
  javax.swing.undo,
- javax.swing.event,
  javax.swing.border,
  edu.stanford.ejalbert,
  edu.stanford.ejalbert.exception,

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

@@ -3,8 +3,7 @@ Bundle-Name: History Service Provider
 Bundle-Description: A bundle that implements the history package.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
-Import-Package: org.ungoverned.gravity.servicebinder,
- org.osgi.framework,
+Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.fileaccess,
  net.java.sip.communicator.service.history,

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

@@ -3,8 +3,7 @@ Bundle-Name: Media Service Implementation
 Bundle-Description: A bundle that offers Media capture and presentation capabilities.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
-Import-Package: org.ungoverned.gravity.servicebinder,
- org.osgi.framework,
+Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
  net.java.sip.communicator.service.protocol,

src/net/java/sip/communicator/impl/msghistory/MessageHistoryActivator.java

@@ -64,6 +64,7 @@ public void start(BundleContext bundleContext) throws Exception
 
     public void stop(BundleContext bundleContext) throws Exception
     {
-
+        if(msgHistoryService != null)
+            msgHistoryService.stop(bundleContext);
     }
 }

src/net/java/sip/communicator/impl/msghistory/MessageHistoryServiceImpl.java

@@ -475,7 +475,7 @@ private Object convertHistoryRecordToMessageEvent(HistoryRecord hr, Contact cont
      */
     public void start(BundleContext bc)
     {
-        logger.debug("Starting the meta contact list implementation.");
+        logger.debug("Starting the msg history implementation.");
         this.bundleContext = bc;
 
         // start listening for newly register or removed protocol providers
@@ -513,6 +513,45 @@ public void start(BundleContext bc)
         }
     }
 
+    /**
+     * stops the service.
+     *
+     * @param bc BundleContext
+     */
+    public void stop(BundleContext bc)
+    {
+        // start listening for newly register or removed protocol providers
+        bc.removeServiceListener(this);
+
+        ServiceReference[] protocolProviderRefs = null;
+        try
+        {
+            protocolProviderRefs = bc.getServiceReferences(
+                ProtocolProviderService.class.getName(),
+                null);
+        }
+        catch (InvalidSyntaxException ex)
+        {
+            // this shouldn't happen since we're providing no parameter string
+            // but let's log just in case.
+            logger.error(
+                "Error while retrieving service refs", ex);
+            return;
+        }
+
+        // in case we found any
+        if (protocolProviderRefs != null)
+        {
+            for (int i = 0; i < protocolProviderRefs.length; i++)
+            {
+                ProtocolProviderService provider = (ProtocolProviderService) bc
+                    .getService(protocolProviderRefs[i]);
+
+                this.handleProviderRemoved(provider);
+            }
+        }
+    }
+
 
     // //////////////////////////////////////////////////////////////////////////
     // MessageListener implementation methods

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

@@ -3,8 +3,7 @@ Bundle-Name: Message History Service Provider
 Bundle-Description: A bundle that implements the message history package.
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
-Import-Package: org.ungoverned.gravity.servicebinder,
- org.osgi.framework,
+Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.fileaccess,
  net.java.sip.communicator.service.history,
  net.java.sip.communicator.service.history.event,

src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf

@@ -27,7 +27,6 @@ Import-Package: org.osgi.framework,
  javax.swing.filechooser,
  javax.swing.tree,
  javax.swing.undo,
- javax.swing.event,
  javax.swing.border,
  edu.stanford.ejalbert,
  edu.stanford.ejalbert.exception,

src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf

@@ -27,5 +27,4 @@ Import-Package: org.osgi.framework,
  javax.swing.filechooser,
  javax.swing.tree,
  javax.swing.undo,
- javax.swing.event,
  javax.swing.border

src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf

@@ -27,5 +27,4 @@ Import-Package: org.osgi.framework,
  javax.swing.filechooser,
  javax.swing.tree,
  javax.swing.undo,
- javax.swing.event,
  javax.swing.border

src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf

@@ -27,5 +27,4 @@ Import-Package: org.osgi.framework,
  javax.swing.filechooser,
  javax.swing.tree,
  javax.swing.undo,
- javax.swing.event,
  javax.swing.border

src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf

@@ -0,0 +1,8 @@
+Bundle-Name: Contactlist Service Interfaces 
+Bundle-Description: Contactlist Service.
+Bundle-Vendor: sip-communicator.org
+Bundle-Version: 0.0.1
+Import-Package: org.osgi.framework,
+ net.java.sip.communicator.service.protocol
+Export-Package: net.java.sip.communicator.service.contactlist,
+ net.java.sip.communicator.service.contactlist.event

test/net/java/sip/communicator/slick/configuration/configuration.slick.manifest.mf

@@ -3,9 +3,9 @@ Bundle-Name: Configuration Service Implementation Compatibility Kit
 Bundle-Description: A Service Implementation Compatibility Kit for the Configuration Service
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
-Import-Package: net.java.sip.communicator.service.configuration,
+Import-Package: junit.framework,
+ net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- junit.framework,
  org.osgi.framework,
  org.w3c.dom,
  javax.xml.parsers,

test/net/java/sip/communicator/slick/media/media.slick.manifest.mf

@@ -3,8 +3,7 @@ Bundle-Name: Media Service Implementation Compatibility Kit
 Bundle-Description: A Service Implementation Compatibility Kit for the Media Service
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
-Import-Package: junit.framework,
- org.osgi.framework,
+Import-Package: org.osgi.framework,
  net.java.sip.communicator.slick.media,
  net.java.sip.communicator.service.media,
  net.java.sip.communicator.service.media.event,

test/net/java/sip/communicator/slick/netaddr/netaddr.slick.manifest.mf

@@ -10,9 +10,7 @@ Import-Package: net.java.sip.communicator.util,
  net.java.sip.communicator.service.configuration.event,
  junit,
  junit.framework,
- junit.swingui,
  junit.textui,
  junit.awtui,
- junit.extensions,
  junit.runner,
  org.osgi.framework,

test/net/java/sip/communicator/slick/protocol/icq/icq.provider.slick.manifest.mf

@@ -3,9 +3,9 @@ Bundle-Name: ICQ Protocol Provider Service Leveraging Implementation Compatibili
 Bundle-Description: A Service Leveraging Implementation Compatibility Kit for the ICQ implementation of the ProtocolProvider Service
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
-Import-Package: net.java.sip.communicator.service.configuration,
+Import-Package: junit.framework,
+ net.java.sip.communicator.service.configuration,
  net.java.sip.communicator.service.configuration.event,
- junit.framework,
  org.osgi.framework,
  net.java.sip.communicator.util,
  net.java.sip.communicator.service.protocol,

test/net/java/sip/communicator/slick/runner/slick-runner.manifest.mf

@@ -10,7 +10,6 @@ Import-Package: net.java.sip.communicator.service.configuration,
  junit.swingui,
  junit.textui,
  junit.awtui,
- junit.extensions,
  junit.runner,
  org.osgi.framework,
  org.w3c.dom,
@@ -20,12 +19,4 @@ Import-Package: net.java.sip.communicator.service.configuration,
  javax.xml.transform.dom,
  javax.xml.transform.stream,
  org.apache.xml.serializer,
- net.java.sip.communicator.util,
- org.osgi.framework,
- junit,
- junit.framework,
- junit.swingui,
- junit.textui,
- junit.awtui,
- junit.extensions,
- junit.runner
+ net.java.sip.communicator.util

test/net/java/sip/communicator/slick/slickless/slickless.manifest.mf

@@ -8,9 +8,7 @@ Import-Package: net.java.sip.communicator.service.configuration,
  junit,
  junit.framework,
  junit.swingui,
- junit.textui,
  junit.awtui,
- junit.extensions,
  junit.runner,
  org.osgi.framework,
  org.w3c.dom,