diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath
index 7d96d77ed..15e786853 100644
--- a/ide/eclipse/.classpath
+++ b/ide/eclipse/.classpath
@@ -8,8 +8,7 @@
     <classpathentry kind="lib" path="lib/kxml-min.jar"/>
     <classpathentry kind="lib" path="lib/servicebinder.jar"/>
     <classpathentry kind="lib" path="lib/bundle/junit.jar"/>
-    <classpathentry kind="lib" path="lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/backport-util-concurrent.jar"/>
+    <classpathentry kind="lib" path="lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar"/>
     <classpathentry kind="lib" path="lib/installer-exclude/bcprov-jdk14-130.jar"/>
     <classpathentry kind="lib" path="lib/installer-exclude/commons-logging.jar"/>
     <classpathentry kind="lib" path="lib/installer-exclude/concurrent.jar"/>
@@ -19,7 +18,7 @@
     <classpathentry kind="lib" path="lib/installer-exclude/jcalendar-1.3.2.jar"/>
     <classpathentry kind="lib" path="lib/installer-exclude/jdom.jar"/>
     <classpathentry kind="lib" path="lib/installer-exclude/jmf.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/jml-1.0b1.jar"/>
+    <classpathentry kind="lib" path="lib/installer-exclude/jml-1.0b2.jar"/>
     <classpathentry kind="lib" path="lib/installer-exclude/joscar-client.jar"/>
     <classpathentry kind="lib" path="lib/installer-exclude/joscar-common.jar"/>
     <classpathentry kind="lib" path="lib/installer-exclude/joscar-protocol.jar"/>
@@ -28,7 +27,6 @@
     <classpathentry kind="lib" path="lib/installer-exclude/junit.jar"/>
     <classpathentry kind="lib" path="lib/installer-exclude/log4j-1.2.8.jar"/>
     <classpathentry kind="lib" path="lib/installer-exclude/nist-sdp-1.0.jar"/>
-    <classpathentry kind="lib" path="lib/installer-exclude/retroweaver-rt-2.0.jar"/>
     <classpathentry kind="lib" path="lib/installer-exclude/rome-0.9.jar"/>
     <classpathentry kind="lib" path="lib/installer-exclude/smack.jar"/>
     <classpathentry kind="lib" path="lib/installer-exclude/smackx.jar"/>
diff --git a/ide/nbproject/project.xml b/ide/nbproject/project.xml
index 0e1e7f790..263127733 100644
--- a/ide/nbproject/project.xml
+++ b/ide/nbproject/project.xml
@@ -89,7 +89,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">lib/felix.jar:lib/jdic-all.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/backport-util-concurrent.jar:lib/installer-exclude/bcprov-jdk14-130.jar:lib/installer-exclude/commons-logging.jar:lib/installer-exclude/concurrent.jar:lib/installer-exclude/dnsjava-2.0.3.jar:lib/installer-exclude/JainSipApi1.2.jar:lib/installer-exclude/JainSipRi1.2.jar:lib/installer-exclude/jcalendar-1.3.2.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jmf.jar:lib/installer-exclude/jml-1.0b1.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/retroweaver-rt-2.0.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx-jingle.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/Stun4J.jar:lib/installer-exclude/xalan-2.6.0.jar.ant:lib/installer-exclude/ymsg_network_v0_61.jar:lib/os-specific/linux/installer-exclude/jmf.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/AppleJavaExtensions.jar:lib/os-specific/mac/growl.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/sound.jar:lib/installer-exclude/fmj-sc.jar:lib/installer-exclude/pircbot.jar:lib/installer-exclude/jsch-0.1.33.jar</classpath>
+                <classpath mode="compile">lib/felix.jar:lib/jdic-all.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/bcprov-jdk14-130.jar:lib/installer-exclude/commons-logging.jar:lib/installer-exclude/concurrent.jar:lib/installer-exclude/dnsjava-2.0.3.jar:lib/installer-exclude/JainSipApi1.2.jar:lib/installer-exclude/JainSipRi1.2.jar:lib/installer-exclude/jcalendar-1.3.2.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jmf.jar:lib/installer-exclude/jml-1.0b2.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx-jingle.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/Stun4J.jar:lib/installer-exclude/xalan-2.6.0.jar.ant:lib/installer-exclude/ymsg_network_v0_61.jar:lib/os-specific/linux/installer-exclude/jmf.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/AppleJavaExtensions.jar:lib/os-specific/mac/growl.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/sound.jar:lib/installer-exclude/fmj-sc.jar:lib/installer-exclude/pircbot.jar:lib/installer-exclude/jsch-0.1.33.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
             <compilation-unit>