[Esbox-commits] r2158 - in www/update/2.0: . binary features plugins

raul at garage.maemo.org raul at garage.maemo.org
Fri Sep 11 03:02:13 EEST 2009


Author: raul
Date: 2009-09-11 03:02:11 +0300 (Fri, 11 Sep 2009)
New Revision: 2158

Added:
   www/update/2.0/features/org.maemo.esbox.product.repository_2.0.0.200909101637.jar
   www/update/2.0/features/org.maemo.esbox.scratchbox.source_2.0.0.200909101637.jar
   www/update/2.0/features/org.maemo.esbox.scratchbox_2.0.0.200909101637.jar
   www/update/2.0/features/org.maemo.esbox.source_2.0.0.200909101637.jar
   www/update/2.0/features/org.maemo.esbox.source_feature_2.0.0.200909101637.jar
   www/update/2.0/features/org.maemo.esbox.vm.source_2.0.0.200909101637.jar
   www/update/2.0/features/org.maemo.esbox.vm_2.0.0.200909101637.jar
   www/update/2.0/features/org.maemo.esbox_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.indt.esbox.core_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.cpp.launch.cdi.gdb_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.cpp.launch.dsf.gdb_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.cpp.project_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.help_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.launch.analysis_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.maemosdk.core_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.maemosdk.ui_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.product_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.python.launch_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.python.project_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.scratchbox.core_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.scratchbox.sb1_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.scratchbox.sb2_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.scratchbox.source_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.scratchbox.ui_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.source_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.vm.qemu_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.vm.source_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.vm.virtualbox_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.vm.vmware_2.0.0.200909101637.jar
   www/update/2.0/plugins/org.maemo.esbox.vm_2.0.0.200909101637.jar
Removed:
   www/update/2.0/features/org.maemo.esbox.product.repository_2.0.0.200907030033.jar
   www/update/2.0/features/org.maemo.esbox.scratchbox.source_2.0.0.200907030033.jar
   www/update/2.0/features/org.maemo.esbox.scratchbox_2.0.0.200907030033.jar
   www/update/2.0/features/org.maemo.esbox.source_2.0.0.200907030033.jar
   www/update/2.0/features/org.maemo.esbox.source_feature_2.0.0.200907030033.jar
   www/update/2.0/features/org.maemo.esbox.vm.source_2.0.0.200907030033.jar
   www/update/2.0/features/org.maemo.esbox.vm_2.0.0.200907030033.jar
   www/update/2.0/features/org.maemo.esbox_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20081125.jar
   www/update/2.0/plugins/org.indt.esbox.core_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.cpp.launch.cdi.gdb_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.cpp.launch.dsf.gdb_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.cpp.project_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.help_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.launch.analysis_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.maemosdk.core_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.maemosdk.ui_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.product_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.python.launch_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.python.project_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.scratchbox.core_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.scratchbox.sb1_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.scratchbox.sb2_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.scratchbox.source_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.scratchbox.ui_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.source_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.vm.qemu_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.vm.source_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.vm.virtualbox_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.vm.vmware_2.0.0.200907030033.jar
   www/update/2.0/plugins/org.maemo.esbox.vm_2.0.0.200907030033.jar
Modified:
   www/update/2.0/artifacts.xml
   www/update/2.0/binary/org.eclipse.launcher.carbon.macosx.x86_1.0.0
   www/update/2.0/binary/org.eclipse.launcher.gtk.linux.x86_1.0.0
   www/update/2.0/binary/org.eclipse.launcher.win32.win32.x86_1.0.0
   www/update/2.0/content.xml
   www/update/2.0/plugins/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731.jar
   www/update/2.0/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805.jar
   www/update/2.0/plugins/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731.jar
Log:
Updating ESbox update site.

Modified: www/update/2.0/artifacts.xml
===================================================================
--- www/update/2.0/artifacts.xml	2009-09-10 22:24:25 UTC (rev 2157)
+++ www/update/2.0/artifacts.xml	2009-09-11 00:02:11 UTC (rev 2158)
@@ -3,7 +3,7 @@
 <repository name='ESbox Artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1.0.0'>
   <properties size='3'>
     <property name='p2.compressed' value='false'/>
-    <property name='p2.timestamp' value='1246595035744'/>
+    <property name='p2.timestamp' value='1252617652627'/>
     <property name='download.contentType' value='application/zip'/>
   </properties>
   <mappings size='3'>
@@ -12,189 +12,195 @@
     <rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
   </mappings>
   <artifacts size='37'>
-    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.source_feature' version='2.0.0.200907030033'>
+    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.vm' version='2.0.0.200909101637'>
       <properties size='2'>
         <property name='artifact.size' value='136'/>
-        <property name='download.size' value='24110'/>
+        <property name='download.size' value='21946'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.qemu' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.source' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='29909'/>
-        <property name='download.size' value='29909'/>
+        <property name='artifact.size' value='128'/>
+        <property name='download.size' value='149596'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.maemosdk.ui' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.maemosdk.core' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='85959'/>
-        <property name='download.size' value='85959'/>
+        <property name='artifact.size' value='49869'/>
+        <property name='download.size' value='49869'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.python.project' version='2.0.0.200907030033'>
+    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox' version='2.0.0.200909101637'>
+      <properties size='2'>
+        <property name='artifact.size' value='136'/>
+        <property name='download.size' value='21859'/>
+      </properties>
+    </artifact>
+    <artifact classifier='osgi.bundle' id='org.indt.esbox.core' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='26843'/>
-        <property name='download.size' value='26843'/>
+        <property name='artifact.size' value='5961'/>
+        <property name='download.size' value='5961'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.eclipse.equinox.launcher' version='1.0.101.R34x_v20081125'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.cpp.launch.cdi.gdb' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='43687'/>
-        <property name='download.size' value='43687'/>
+        <property name='artifact.size' value='18033'/>
+        <property name='download.size' value='18033'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.scratchbox.source' version='2.0.0.200907030033'>
-      <properties size='2'>
-        <property name='artifact.size' value='80'/>
-        <property name='download.size' value='632'/>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm' version='2.0.0.200909101637'>
+      <properties size='3'>
+        <property name='artifact.size' value='108257'/>
+        <property name='download.size' value='108257'/>
+        <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='binary' id='org.eclipse.launcher.carbon.macosx.x86' version='1.0.0'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.core' version='2.0.0.200909101637'>
+      <properties size='3'>
+        <property name='artifact.size' value='70311'/>
+        <property name='download.size' value='70311'/>
+        <property name='download.contentType' value='application/zip'/>
+      </properties>
+    </artifact>
+    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.source' version='2.0.0.200909101637'>
       <properties size='2'>
         <property name='artifact.size' value='80'/>
-        <property name='download.size' value='17664'/>
+        <property name='download.size' value='516'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.source' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.eclipse.equinox.launcher' version='1.0.101.R34x_v20081125'>
       <properties size='3'>
-        <property name='artifact.size' value='128'/>
-        <property name='download.size' value='247916'/>
+        <property name='artifact.size' value='43687'/>
+        <property name='download.size' value='43687'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.eclipse.equinox.launcher.win32.win32.x86' version='1.0.101.R34x_v20080731'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.vmware' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='192'/>
-        <property name='download.size' value='31992'/>
+        <property name='artifact.size' value='134858'/>
+        <property name='download.size' value='134858'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.cpp.launch.dsf.gdb' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.launch.analysis' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='28185'/>
-        <property name='download.size' value='28185'/>
+        <property name='artifact.size' value='24159'/>
+        <property name='download.size' value='24159'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.vmware' version='2.0.0.200907030033'>
+    <artifact classifier='binary' id='org.eclipse.launcher.carbon.macosx.x86' version='1.0.0'>
+      <properties size='2'>
+        <property name='artifact.size' value='80'/>
+        <property name='download.size' value='17664'/>
+      </properties>
+    </artifact>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.python.launch' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='34067'/>
-        <property name='download.size' value='34067'/>
+        <property name='artifact.size' value='17218'/>
+        <property name='download.size' value='17218'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.virtualbox' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.eclipse.equinox.launcher.win32.win32.x86' version='1.0.101.R34x_v20080731'>
       <properties size='3'>
-        <property name='artifact.size' value='41994'/>
-        <property name='download.size' value='41994'/>
+        <property name='artifact.size' value='192'/>
+        <property name='download.size' value='31992'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.vm.source' version='2.0.0.200907030033'>
+    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.product.repository' version='2.0.0.200909101637'>
       <properties size='2'>
-        <property name='artifact.size' value='80'/>
-        <property name='download.size' value='529'/>
+        <property name='artifact.size' value='136'/>
+        <property name='download.size' value='24309'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.eclipse.equinox.launcher.carbon.macosx' version='1.0.101.R34x_v20080731'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.virtualbox' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='192'/>
-        <property name='download.size' value='48086'/>
+        <property name='artifact.size' value='41958'/>
+        <property name='download.size' value='41958'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.python.launch' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.cpp.project' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='17217'/>
-        <property name='download.size' value='17217'/>
+        <property name='artifact.size' value='36656'/>
+        <property name='download.size' value='36656'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.product' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.help' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='102535'/>
-        <property name='download.size' value='102535'/>
+        <property name='artifact.size' value='384'/>
+        <property name='download.size' value='8783909'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.maemosdk.core' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.eclipse.equinox.launcher.carbon.macosx' version='1.0.101.R34x_v20080731'>
       <properties size='3'>
-        <property name='artifact.size' value='39573'/>
-        <property name='download.size' value='39573'/>
+        <property name='artifact.size' value='192'/>
+        <property name='download.size' value='48086'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='binary' id='org.eclipse.launcher.win32.win32.x86' version='1.0.0'>
+    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.vm.source' version='2.0.0.200909101637'>
       <properties size='2'>
         <property name='artifact.size' value='80'/>
-        <property name='download.size' value='20105'/>
+        <property name='download.size' value='530'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.source' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.sb1' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='128'/>
-        <property name='download.size' value='98721'/>
+        <property name='artifact.size' value='272059'/>
+        <property name='download.size' value='272059'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.help' version='2.0.0.200907030033'>
-      <properties size='3'>
-        <property name='artifact.size' value='384'/>
-        <property name='download.size' value='7978263'/>
-        <property name='download.contentType' value='application/zip'/>
+    <artifact classifier='binary' id='org.eclipse.launcher.win32.win32.x86' version='1.0.0'>
+      <properties size='2'>
+        <property name='artifact.size' value='80'/>
+        <property name='download.size' value='20105'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.product' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='108147'/>
-        <property name='download.size' value='108147'/>
+        <property name='artifact.size' value='102539'/>
+        <property name='download.size' value='102539'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.launch.analysis' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.source' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='18573'/>
-        <property name='download.size' value='18573'/>
+        <property name='artifact.size' value='128'/>
+        <property name='download.size' value='251227'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.sb1' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.cpp.launch.dsf.gdb' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='260483'/>
-        <property name='download.size' value='260483'/>
+        <property name='artifact.size' value='28186'/>
+        <property name='download.size' value='28186'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.cpp.launch.cdi.gdb' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.python.project' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='18032'/>
-        <property name='download.size' value='18032'/>
+        <property name='artifact.size' value='27027'/>
+        <property name='download.size' value='27027'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.source' version='2.0.0.200907030033'>
-      <properties size='2'>
-        <property name='artifact.size' value='80'/>
-        <property name='download.size' value='516'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='org.indt.esbox.core' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.source' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='5961'/>
-        <property name='download.size' value='5961'/>
+        <property name='artifact.size' value='128'/>
+        <property name='download.size' value='138477'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.ui' version='2.0.0.200907030033'>
-      <properties size='3'>
-        <property name='artifact.size' value='33288'/>
-        <property name='download.size' value='33288'/>
-        <property name='download.contentType' value='application/zip'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.eclipse.equinox.launcher.gtk.linux.x86' version='1.0.101.R34x_v20080805'>
       <properties size='3'>
         <property name='artifact.size' value='192'/>
@@ -202,61 +208,55 @@
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.cpp.project' version='2.0.0.200907030033'>
+    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.scratchbox.source' version='2.0.0.200909101637'>
+      <properties size='2'>
+        <property name='artifact.size' value='80'/>
+        <property name='download.size' value='632'/>
+      </properties>
+    </artifact>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.sb2' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='36635'/>
-        <property name='download.size' value='36635'/>
+        <property name='artifact.size' value='101993'/>
+        <property name='download.size' value='101993'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox' version='2.0.0.200907030033'>
+    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.scratchbox' version='2.0.0.200909101637'>
       <properties size='2'>
         <property name='artifact.size' value='136'/>
-        <property name='download.size' value='21858'/>
+        <property name='download.size' value='21916'/>
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.product.repository' version='2.0.0.200907030033'>
-      <properties size='2'>
-        <property name='artifact.size' value='136'/>
-        <property name='download.size' value='24308'/>
-      </properties>
-    </artifact>
     <artifact classifier='binary' id='org.eclipse.launcher.gtk.linux.x86' version='1.0.0'>
       <properties size='2'>
         <property name='artifact.size' value='168'/>
         <property name='download.size' value='159606'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.source' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.qemu' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='128'/>
-        <property name='download.size' value='138621'/>
+        <property name='artifact.size' value='29961'/>
+        <property name='download.size' value='29961'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.core' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.ui' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='71387'/>
-        <property name='download.size' value='71387'/>
+        <property name='artifact.size' value='33289'/>
+        <property name='download.size' value='33289'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.scratchbox' version='2.0.0.200907030033'>
+    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.source_feature' version='2.0.0.200909101637'>
       <properties size='2'>
         <property name='artifact.size' value='136'/>
-        <property name='download.size' value='21916'/>
+        <property name='download.size' value='24110'/>
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.vm' version='2.0.0.200907030033'>
-      <properties size='2'>
-        <property name='artifact.size' value='136'/>
-        <property name='download.size' value='21945'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.sb2' version='2.0.0.200907030033'>
+    <artifact classifier='osgi.bundle' id='org.maemo.esbox.maemosdk.ui' version='2.0.0.200909101637'>
       <properties size='3'>
-        <property name='artifact.size' value='102024'/>
-        <property name='download.size' value='102024'/>
+        <property name='artifact.size' value='88090'/>
+        <property name='download.size' value='88090'/>
         <property name='download.contentType' value='application/zip'/>
       </properties>
     </artifact>

Modified: www/update/2.0/binary/org.eclipse.launcher.carbon.macosx.x86_1.0.0
===================================================================
(Binary files differ)

Modified: www/update/2.0/binary/org.eclipse.launcher.gtk.linux.x86_1.0.0
===================================================================
(Binary files differ)

Modified: www/update/2.0/binary/org.eclipse.launcher.win32.win32.x86_1.0.0
===================================================================
(Binary files differ)

Modified: www/update/2.0/content.xml
===================================================================
--- www/update/2.0/content.xml	2009-09-10 22:24:25 UTC (rev 2157)
+++ www/update/2.0/content.xml	2009-09-11 00:02:11 UTC (rev 2158)
@@ -3,79 +3,102 @@
 <repository name='ESbox Update Site' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
   <properties size='2'>
     <property name='p2.compressed' value='false'/>
-    <property name='p2.timestamp' value='1246595037072'/>
+    <property name='p2.timestamp' value='1252617654026'/>
   </properties>
   <references size='2'>
     <repository url='http://esbox.garage.maemo.org/update/2.0' type='0' options='0'/>
     <repository url='http://esbox.garage.maemo.org/update/2.0' type='1' options='0'/>
   </references>
   <units size='65'>
-    <unit id='org.indt.esbox.core' version='2.0.0.200907030033'>
-      <update id='org.indt.esbox.core' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Compatibility Plug-in'/>
+    <unit id='org.maemo.esbox.scratchbox.source.feature.group' version='2.0.0.200909101637' singleton='false'>
+      <update id='org.maemo.esbox.scratchbox.source.feature.group' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='4'>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Scratchbox Support'/>
+        <property name='org.eclipse.equinox.p2.description' value='This feature provides support for Maemo SDKs using scratchbox.&#xA;Installations of Scratchbox 1 and Scratchbox 2 are supported.&#xA;This provides project templates for Maemo C/C++ or Python projects&#xA;as well, though it does not require those languages&apos; features&#xA;to be installed.'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
       </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.source.feature.group' version='2.0.0.200909101637'/>
+      </provides>
+      <requires size='2'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.source' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.source.feature.jar' range='[2.0.0.200909101637,2.0.0.200909101637]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <licenses size='1'>
+        <license url='http://www.eclipse.org/legal/epl-v10.html'>
+          For legal terms, see the Eclipse Public License.
+        </license>
+      </licenses>
+      <copyright>
+        Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights&#xA;reserved.
+      </copyright>
+    </unit>
+    <unit id='org.maemo.esbox.source' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.source' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='%pluginName'/>
+        <property name='org.eclipse.equinox.p2.provider' value='%providerName'/>
+      </properties>
       <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.indt.esbox.core' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.indt.esbox.core' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.source' version='2.0.0.200909101637'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='7'>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.project.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.cdt.make.core' range='5.0.1'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.python.project.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.project.core' range='2.0.0'/>
-      </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.indt.esbox.core' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.source' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
-        <instructions size='1'>
+        <instructions size='2'>
           <instruction key='manifest'>
-            Bundle-Vendor: INdT / Nokia&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.indt.esbox.internal.core.compatibility.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Bundle-CoreActivator: compatibility.CoreActivator&#xA;Require-Bundle: org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.project.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.0&quot;,org.eclipse.cdt.make.core;bundle-version=&quot;5.0.1&quot;,org.maemo.mica.python.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox Compatibility Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.indt.esbox.core;singleton:=true&#xA;Bundle-Version: 2.0.0.200907030033
+            Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.maemo.esbox.source; singleton=true&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200909101637
           </instruction>
+          <instruction key='zipped'>
+            true
+          </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.python.project' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.python.project' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.vm.vmware' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.vm.vmware' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Python Project Support Plug-in'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox VMware Support Plug-in'/>
+        <property name='org.eclipse.equinox.p2.provider' value='NOKIA'/>
       </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.python.project' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.python.project' version='2.0.0.200907030033'/>
+      <provides size='5'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.vmware' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.vm.vmware' version='2.0.0.200909101637'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.vm.vmware' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.vm.vmware' version='0.0.0'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='13'>
+      <requires size='11'>
         <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.project.core' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.common.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.protocol.ssh' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.vm' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='3.3.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.python.project.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.python.project.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.cdt.core' range='5.0.2'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.ui' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.sb1' range='2.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.python.project' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.vmware' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.views;bundle-version=&quot;3.3.0&quot;,org.maemo.mica.python.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.python.project.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Activator: org.maemo.esbox.internal.python.project.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Bundle-SymbolicName: org.maemo.esbox.python.project;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: ESbox Python Project Support Plug-in&#xA;Bundle-Vendor: INdT / NOKIA
+            Bundle-Vendor: NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.vm.vmware.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.protocol.ssh;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.vm;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.core;bundle-version=&quot;5.0.2&quot;,org.maemo.mica.linux.packages.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.scratchbox.sb1;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox VMware Support Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.vm.vmware;singleton:=true&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Export-Package: org.maemo.esbox.internal.vm.vmware;x-friends:=&quot;org.maemo.esbox.vm.tests&quot;,org.maemo.esbox.vm.vmware
           </instruction>
         </instructions>
       </touchpointData>
@@ -106,129 +129,68 @@
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.source_feature.feature.group' version='2.0.0.200907030033' singleton='false'>
-      <update id='org.maemo.esbox.source_feature.feature.group' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox 2nd Edition Sources'/>
-        <property name='org.eclipse.equinox.p2.description' value='This feature builds the source plugins for ESbox.'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
-        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
-      </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source_feature.feature.group' version='2.0.0.200907030033'/>
-      </provides>
-      <requires size='4'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source.feature.group' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.source.feature.group' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.source.feature.group' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source_feature.feature.jar' range='[2.0.0.200907030033,2.0.0.200907030033]'>
-          <filter>
-            (org.eclipse.update.install.features=true)
-          </filter>
-        </required>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-      <licenses size='1'>
-        <license url='http://www.eclipse.org/legal/epl-v10.html'>
-          For legal terms, see the Eclipse Public License.
-        </license>
-      </licenses>
-      <copyright>
-        Copyright (c) 2009 INdT, (c) 2009 Nokia. All rights&#xA;reserved.
-      </copyright>
-    </unit>
-    <unit id='org.maemo.esbox.vm.source.feature.group' version='2.0.0.200907030033' singleton='false'>
-      <update id='org.maemo.esbox.vm.source.feature.group' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Virtual Machine Support'/>
-        <property name='org.eclipse.equinox.p2.description' value='ESbox virtual machine feature, providing Scratchbox running on virtual machines.'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
-        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
-      </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.source.feature.group' version='2.0.0.200907030033'/>
-      </provides>
-      <requires size='2'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.source' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.source.feature.jar' range='[2.0.0.200907030033,2.0.0.200907030033]'>
-          <filter>
-            (org.eclipse.update.install.features=true)
-          </filter>
-        </required>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-      <licenses size='1'>
-        <license url='http://www.eclipse.org/legal/epl-v10.html'>
-          For legal terms, see the Eclipse Public License.
-        </license>
-      </licenses>
-      <copyright>
-        Copyright (c) 2008-2009 Nokia. All rights&#xA;reserved.
-      </copyright>
-    </unit>
-    <unit id='org.maemo.esbox.scratchbox.core' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.scratchbox.core' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.cpp.launch.cdi.gdb' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.cpp.launch.cdi.gdb' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='Core Plug-in'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox C/C++ CDI/GDB Launch Support Plug-in'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
       </properties>
-      <provides size='12'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.core' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.core' version='2.0.0.200907030033'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.api.scratchbox.core' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.api.scratchbox.core.commands' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.api.scratchbox.core.commands.sbrsh' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.api.scratchbox.core.sdk' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.scratchbox.core' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.scratchbox.core.command' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.scratchbox.core.sbrsh' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.scratchbox.core.scratchbox' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.scratchbox.core.sdk' version='0.0.0'/>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.cpp.launch.cdi.gdb' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.cpp.launch.cdi.gdb' version='2.0.0.200909101637'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='12'>
+      <requires size='20'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.common.project.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='3.3.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.project.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.project.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.cdt.make.core' range='5.0.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.cdt.make.ui' range='5.0.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.cdt.ui' range='5.0.1'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.launch' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.protocol.sbrsh' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.protocol.launch' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.cdt.core' range='5.0.1'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.dsf.gdb' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.cdi.gdb' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.analysis' range='2.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.core' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.cpp.launch.cdi.gdb' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: INdT / NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.scratchbox.core.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.core.runtime,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.core.expressions;bundle-version=&quot;3.4.0&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.launch;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.protocol.sbrsh;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.protocol.launch;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.ui;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: Core Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.scratchbox.core;singleton:=true&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Export-Package: org.maemo.esbox.internal.api.scratchbox.core,org.maemo.esbox.internal.api.scratchbox.core.commands,org.maemo.esbox.internal.api.scratchbox.core.commands.sbrsh,org.maemo.esbox.internal.api.scratchbox.core.sdk,org.maemo.esbox.scratchbox.core,org.maemo.esbox.scratchbox.core.command,org.maemo.esbox.scratchbox.core.sbrsh,org.maemo.esbox.scratchbox.core.scratchbox,org.maemo.esbox.scratchbox.core.sdk
+            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.views;bundle-version=&quot;3.3.0&quot;,org.maemo.mica.cpp.project.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.project.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.make.core;bundle-version=&quot;5.0.1&quot;,org.eclipse.cdt.make.ui;bundle-version=&quot;5.0.1&quot;,org.eclipse.cdt.ui;bundle-version=&quot;5.0.1&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.ui;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.core;bundle-version=&quot;5.0.1&quot;,org.maemo.mica.cpp.launch;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.dsf.gdb;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.cdi.gdb;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.analysis;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Activator: org.maemo.esbox.internal.cpp.launch.cdi.gdb.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Bundle-SymbolicName: org.maemo.esbox.cpp.launch.cdi.gdb;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: ESbox C/C++ CDI/GDB Launch Support Plug-in&#xA;Bundle-Vendor: INdT / NOKIA
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.source.feature.jar' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.source.feature.jar' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.vm.feature.jar' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.vm.feature.jar' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Core'/>
-        <property name='org.eclipse.equinox.p2.description' value='ESbox feature, containing all the ESbox-specific plugins.'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Virtual Machine Support'/>
+        <property name='org.eclipse.equinox.p2.description' value='ESbox virtual machine feature, providing Scratchbox running on virtual machines.'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
       </properties>
       <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source.feature.jar' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.feature.jar' version='2.0.0.200909101637'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox.source' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox.vm' version='2.0.0.200909101637'/>
       </provides>
       <filter>
         (org.eclipse.update.install.features=true)
       </filter>
       <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.source' version='2.0.0.200907030033'/>
+        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.vm' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
@@ -244,62 +206,157 @@
         </license>
       </licenses>
       <copyright>
+        Copyright (c) 2008-2009 Nokia. All rights&#xA;reserved.
+      </copyright>
+    </unit>
+    <unit id='org.maemo.esbox.scratchbox.feature.jar' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.scratchbox.feature.jar' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Scratchbox Support'/>
+        <property name='org.eclipse.equinox.p2.description' value='This feature provides support for Maemo SDKs using scratchbox.&#xA;Installations of Scratchbox 1 and Scratchbox 2 are supported.&#xA;This provides project templates for Maemo C/C++ or Python projects&#xA;as well, though it does not require those languages&apos; features&#xA;to be installed.'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
+      </properties>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.feature.jar' version='2.0.0.200909101637'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
+        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox.scratchbox' version='2.0.0.200909101637'/>
+      </provides>
+      <filter>
+        (org.eclipse.update.install.features=true)
+      </filter>
+      <artifacts size='1'>
+        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.scratchbox' version='2.0.0.200909101637'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='zipped'>
+            true
+          </instruction>
+        </instructions>
+      </touchpointData>
+      <licenses size='1'>
+        <license url='http://www.eclipse.org/legal/epl-v10.html'>
+          For legal terms, see the Eclipse Public License.
+        </license>
+      </licenses>
+      <copyright>
         Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights&#xA;reserved.
       </copyright>
     </unit>
-    <unit id='org.maemo.esbox.help' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.help' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.scratchbox.sb1' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.scratchbox.sb1' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Help Plug-in'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Scratchbox 1 Support'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
       </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.help' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.help' version='2.0.0.200907030033'/>
+      <provides size='8'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.sb1' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.sb1' version='2.0.0.200909101637'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.scratchbox.sb1.command' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.scratchbox.sb1.core' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.scratchbox.sb1.provider' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.scratchbox.sb1.ui.wizard' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.scratchbox.sb1.sdk' version='0.0.0'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='2'>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+      <requires size='9'>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.ui' range='2.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.help' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.sb1' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
-        <instructions size='2'>
+        <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: ESbox Help Plug-in&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Bundle-SymbolicName: org.maemo.esbox.help;singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: INdT / Nokia
+            Bundle-Vendor: INdT / Nokia&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.scratchbox.sb1.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.core.runtime,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;;visibility:=reexport,org.eclipse.ui.ide,org.maemo.mica.maemosdk.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.scratchbox.core;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.scratchbox.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.ui;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox Scratchbox 1 Support&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.scratchbox.sb1;singleton:=true&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Export-Package: org.maemo.esbox.internal.scratchbox.sb1.command;x-friends:=&quot;org.maemo.esbox.scratchbox.tests&quot;,org.maemo.esbox.internal.scratchbox.sb1.core;x-friends:=&quot;org.maemo.esbox.scratchbox.tests,org.maemo.esbox.tests&quot;,org.maemo.esbox.internal.scratchbox.sb1.provider;x-friends:=&quot;org.maemo.esbox.scratchbox.tests&quot;,org.maemo.esbox.internal.scratchbox.sb1.ui.wizard,org.maemo.esbox.scratchbox.sb1.sdk
           </instruction>
-          <instruction key='zipped'>
-            true
-          </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.scratchbox.source' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.scratchbox.source' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.vm.feature.group' version='2.0.0.200909101637' singleton='false'>
+      <update id='org.maemo.esbox.vm.feature.group' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='4'>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Virtual Machine Support'/>
+        <property name='org.eclipse.equinox.p2.description' value='ESbox virtual machine feature, providing Scratchbox running on virtual machines.'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.feature.group' version='2.0.0.200909101637'/>
+      </provides>
+      <requires size='10'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='com.nokia.carbide.templatewizard' range='2.1.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.common.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.maemosdk.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.qemu' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.vmware' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.virtualbox' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.feature.jar' range='[2.0.0.200909101637,2.0.0.200909101637]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <licenses size='1'>
+        <license url='http://www.eclipse.org/legal/epl-v10.html'>
+          For legal terms, see the Eclipse Public License.
+        </license>
+      </licenses>
+      <copyright>
+        Copyright (c) 2008-2009 Nokia. All rights&#xA;reserved.
+      </copyright>
+    </unit>
+    <unit id='org.maemo.esbox.vm' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.vm' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='%pluginName'/>
-        <property name='org.eclipse.equinox.p2.provider' value='%providerName'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Virtual Machine Support Plug-in'/>
+        <property name='org.eclipse.equinox.p2.provider' value='NOKIA'/>
       </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.source' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.source' version='2.0.0.200907030033'/>
+      <provides size='9'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.vm' version='2.0.0.200909101637'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.api.vm.core' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.api.vm.ui' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.api.vm.ui.preferences' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.vm' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.vm.core' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.vm.ui' version='0.0.0'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
+      <requires size='9'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.protocol.ssh' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
+      </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.source' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
-        <instructions size='2'>
+        <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.maemo.esbox.scratchbox.source; singleton=true&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200907030033
+            Bundle-Vendor: NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.vm.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.protocol.ssh;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.maemo.esbox.maemosdk.ui;bundle-version=&quot;2.0.0&quot;;visibility:=reexport,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox Virtual Machine Support Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.vm;singleton:=true&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Export-Package: org.maemo.esbox.internal.api.vm.core,org.maemo.esbox.internal.api.vm.ui,org.maemo.esbox.internal.api.vm.ui.preferences,org.maemo.esbox.internal.vm;x-friends:=&quot;org.maemo.esbox.vm.tests&quot;,org.maemo.esbox.vm.core,org.maemo.esbox.vm.ui
           </instruction>
-          <instruction key='zipped'>
-            true
-          </instruction>
         </instructions>
       </touchpointData>
     </unit>
@@ -332,79 +389,69 @@
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.vm' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.vm' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.indt.esbox.core' version='2.0.0.200909101637'>
+      <update id='org.indt.esbox.core' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Virtual Machine Support Plug-in'/>
-        <property name='org.eclipse.equinox.p2.provider' value='NOKIA'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Compatibility Plug-in'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
       </properties>
-      <provides size='8'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.vm' version='2.0.0.200907030033'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.api.vm.core' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.api.vm.ui' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.api.vm.ui.preferences' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.vm' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.vm.core' version='0.0.0'/>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.indt.esbox.core' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.indt.esbox.core' version='2.0.0.200909101637'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='9'>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+      <requires size='7'>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.protocol.ssh' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.project.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.cdt.make.core' range='5.0.1'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.python.project.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.project.core' range='2.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.indt.esbox.core' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.vm.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.protocol.ssh;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.maemo.esbox.maemosdk.ui;bundle-version=&quot;2.0.0&quot;;visibility:=reexport,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox Virtual Machine Support Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.vm;singleton:=true&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Export-Package: org.maemo.esbox.internal.api.vm.core,org.maemo.esbox.internal.api.vm.ui,org.maemo.esbox.internal.api.vm.ui.preferences,org.maemo.esbox.internal.vm;x-friends:=&quot;org.maemo.esbox.vm.tests&quot;,org.maemo.esbox.vm.core
+            Bundle-Vendor: INdT / Nokia&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.indt.esbox.internal.core.compatibility.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Bundle-CoreActivator: compatibility.CoreActivator&#xA;Require-Bundle: org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.project.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.core.resources;bundle-version=&quot;3.4.0&quot;,org.eclipse.cdt.make.core;bundle-version=&quot;5.0.1&quot;,org.maemo.mica.python.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox Compatibility Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.indt.esbox.core;singleton:=true&#xA;Bundle-Version: 2.0.0.200909101637
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.scratchbox.sb2' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.scratchbox.sb2' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.launch.analysis' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.launch.analysis' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Scratchbox 2 Support'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Analysis Launch Support Plug-in'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
       </properties>
-      <provides size='8'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.sb2' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.sb2' version='2.0.0.200907030033'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.api.scratchbox.sb2.core' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.scratchbox.sb2.command' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.scratchbox.sb2.core' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.scratchbox.sb2.provider' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.scratchbox.sb2.sdk' version='0.0.0'/>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.launch.analysis' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.launch.analysis' version='2.0.0.200909101637'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='8'>
+      <requires size='10'>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.analysis' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.analysis' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.cdt.core' range='5.0.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.python.launch.analysis' range='2.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.sb2' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.launch.analysis' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: INdT / Nokia&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.scratchbox.sb2.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.core.runtime,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;;visibility:=reexport,org.eclipse.ui.ide,org.maemo.mica.maemosdk.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.scratchbox.core;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.scratchbox.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox Scratchbox 2 Support&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.scratchbox.sb2;singleton:=true&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Export-Package: org.maemo.esbox.internal.api.scratchbox.sb2.core,org.maemo.esbox.internal.scratchbox.sb2.command;x-friends:=&quot;org.maemo.esbox.scratchbox.tests&quot;,org.maemo.esbox.internal.scratchbox.sb2.core;x-friends:=&quot;org.maemo.esbox.scratchbox.tests&quot;,org.maemo.esbox.internal.scratchbox.sb2.provider;x-friends:=&quot;org.maemo.esbox.scratchbox.tests&quot;,org.maemo.esbox.scratchbox.sb2.sdk
+            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.analysis;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.scratchbox.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.analysis;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.core;bundle-version=&quot;5.0.1&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.maemo.mica.python.launch.analysis;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Activator: org.maemo.esbox.internal.analysis.launch.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Bundle-SymbolicName: org.maemo.esbox.launch.analysis;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: ESbox Analysis Launch Support Plug-in&#xA;Bundle-Vendor: INdT / Nokia
           </instruction>
         </instructions>
       </touchpointData>
@@ -419,33 +466,85 @@
         <provided namespace='org.eclipse.equinox.p2.iu' name='ESbox' version='0.0.0'/>
       </provides>
       <requires size='4'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.feature.group' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.feature.group' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.feature.group' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.product.repository.feature.group' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.product.repository.feature.group' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.feature.group' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.feature.group' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.feature.group' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
       </requires>
       <touchpoint id='null' version='0.0.0'/>
     </unit>
-    <unit id='org.maemo.esbox.source.feature.group' version='2.0.0.200907030033' singleton='false'>
-      <update id='org.maemo.esbox.source.feature.group' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Core'/>
-        <property name='org.eclipse.equinox.p2.description' value='ESbox feature, containing all the ESbox-specific plugins.'/>
+    <unit id='org.maemo.esbox.scratchbox.core' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.scratchbox.core' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='Core Plug-in'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
-        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
       </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source.feature.group' version='2.0.0.200907030033'/>
+      <provides size='12'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.core' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.core' version='2.0.0.200909101637'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.api.scratchbox.core' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.api.scratchbox.core.commands' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.api.scratchbox.core.commands.sbrsh' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.api.scratchbox.core.sdk' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.scratchbox.core' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.scratchbox.core.command' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.scratchbox.core.sbrsh' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.scratchbox.core.scratchbox' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.scratchbox.core.sdk' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='2'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source.feature.jar' range='[2.0.0.200907030033,2.0.0.200907030033]'>
-          <filter>
-            (org.eclipse.update.install.features=true)
-          </filter>
-        </required>
+      <requires size='12'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.project.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.launch' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.protocol.sbrsh' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.protocol.launch' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.ui' range='2.0.0'/>
       </requires>
-      <touchpoint id='null' version='0.0.0'/>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.core' version='2.0.0.200909101637'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-Vendor: INdT / NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.scratchbox.core.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.core.runtime,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.core.expressions;bundle-version=&quot;3.4.0&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.launch;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.protocol.sbrsh;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.protocol.launch;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.ui;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: Core Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.scratchbox.core;singleton:=true&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Export-Package: org.maemo.esbox.internal.api.scratchbox.core,org.maemo.esbox.internal.api.scratchbox.core.commands,org.maemo.esbox.internal.api.scratchbox.core.commands.sbrsh,org.maemo.esbox.internal.api.scratchbox.core.sdk,org.maemo.esbox.scratchbox.core,org.maemo.esbox.scratchbox.core.command,org.maemo.esbox.scratchbox.core.sbrsh,org.maemo.esbox.scratchbox.core.scratchbox,org.maemo.esbox.scratchbox.core.sdk
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='org.maemo.esbox.scratchbox.source.feature.jar' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.scratchbox.source.feature.jar' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Scratchbox Support'/>
+        <property name='org.eclipse.equinox.p2.description' value='This feature provides support for Maemo SDKs using scratchbox.&#xA;Installations of Scratchbox 1 and Scratchbox 2 are supported.&#xA;This provides project templates for Maemo C/C++ or Python projects&#xA;as well, though it does not require those languages&apos; features&#xA;to be installed.'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
+      </properties>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.source.feature.jar' version='2.0.0.200909101637'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
+        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox.scratchbox.source' version='2.0.0.200909101637'/>
+      </provides>
+      <filter>
+        (org.eclipse.update.install.features=true)
+      </filter>
+      <artifacts size='1'>
+        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.scratchbox.source' version='2.0.0.200909101637'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='zipped'>
+            true
+          </instruction>
+        </instructions>
+      </touchpointData>
       <licenses size='1'>
         <license url='http://www.eclipse.org/legal/epl-v10.html'>
           For legal terms, see the Eclipse Public License.
@@ -455,134 +554,168 @@
         Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights&#xA;reserved.
       </copyright>
     </unit>
-    <unit id='org.maemo.esbox.vm.qemu' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.vm.qemu' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Qemu Virtual Machine Plug-in'/>
-        <property name='org.eclipse.equinox.p2.provider' value='NOKIA'/>
+    <unit id='org.maemo.esbox.source.feature.jar' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.source.feature.jar' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Core'/>
+        <property name='org.eclipse.equinox.p2.description' value='ESbox feature, containing all the ESbox-specific plugins.'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
       </properties>
-      <provides size='5'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.qemu' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.vm.qemu' version='2.0.0.200907030033'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.vm.qemu' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.vm.qemu' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source.feature.jar' version='2.0.0.200909101637'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
+        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox.source' version='2.0.0.200909101637'/>
       </provides>
-      <requires size='7'>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.protocol.ssh' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.vm' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
-      </requires>
+      <filter>
+        (org.eclipse.update.install.features=true)
+      </filter>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.qemu' version='2.0.0.200907030033'/>
+        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.source' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-Vendor: NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.vm.qemu.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.protocol.ssh;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.vm;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox Qemu Virtual Machine Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.vm.qemu;singleton:=true&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Export-Package: org.maemo.esbox.internal.vm.qemu;x-friends:=&quot;org.maemo.mica.protocol.tests,org.maemo.esbox.scratchbox.tests,org.maemo.esbox.vm.tests&quot;,org.maemo.esbox.vm.qemu
+          <instruction key='zipped'>
+            true
           </instruction>
         </instructions>
       </touchpointData>
+      <licenses size='1'>
+        <license url='http://www.eclipse.org/legal/epl-v10.html'>
+          For legal terms, see the Eclipse Public License.
+        </license>
+      </licenses>
+      <copyright>
+        Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights&#xA;reserved.
+      </copyright>
     </unit>
-    <unit id='org.maemo.esbox.maemosdk.core' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.maemosdk.core' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.python.project' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.python.project' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Maemo SDK Core Plug-in'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Python Project Support Plug-in'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
       </properties>
-      <provides size='6'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.maemosdk.core' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' version='2.0.0.200907030033'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.api.maemosdk.core' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.api.maemosdk.core.tools' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.maemosdk.core' version='0.0.0'/>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.python.project' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.python.project' version='2.0.0.200909101637'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='5'>
+      <requires size='13'>
         <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.common.project.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.launch' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='3.3.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.python.project.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.python.project.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.ui' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.maemosdk.core' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.python.project' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: INdT / NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.maemosdk.core.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.launch;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox Maemo SDK Core Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.maemosdk.core;singleton:=true&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Export-Package: org.maemo.esbox.internal.api.maemosdk.core,org.maemo.esbox.internal.api.maemosdk.core.tools,org.maemo.esbox.maemosdk.core
+            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.views;bundle-version=&quot;3.3.0&quot;,org.maemo.mica.python.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.python.project.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Activator: org.maemo.esbox.internal.python.project.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Bundle-SymbolicName: org.maemo.esbox.python.project;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: ESbox Python Project Support Plug-in&#xA;Bundle-Vendor: INdT / NOKIA
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.launch.analysis' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.launch.analysis' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.python.launch' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.python.launch' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Analysis Launch Support Plug-in'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Python Launch Support Plug-in'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
       </properties>
       <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.launch.analysis' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.launch.analysis' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.python.launch' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.python.launch' version='2.0.0.200909101637'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='10'>
+      <requires size='16'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.analysis' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.analysis' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.cdt.core' range='5.0.1'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.project.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='3.3.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.python.project.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.python.project.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.python.launch' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.python.launch.analysis' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='3.4.2'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.cdi.gdb' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.dsf.gdb' range='2.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.launch.analysis' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.python.launch' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.analysis;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.scratchbox.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.analysis;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.core;bundle-version=&quot;5.0.1&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.maemo.mica.python.launch.analysis;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Activator: org.maemo.esbox.internal.analysis.launch.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Bundle-SymbolicName: org.maemo.esbox.launch.analysis;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: ESbox Analysis Launch Support Plug-in&#xA;Bundle-Vendor: INdT / Nokia
+            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.views;bundle-version=&quot;3.3.0&quot;,org.maemo.mica.python.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.python.project.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.python.launch;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.python.launch.analysis;bundle-version=&quot;2.0.0&quot;,org.eclipse.debug.ui;bundle-version=&quot;3.4.2&quot;,org.maemo.mica.cpp.launch.cdi.gdb;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.dsf.gdb;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Activator: org.maemo.esbox.internal.python.launch.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Bundle-SymbolicName: org.maemo.esbox.python.launch;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: ESbox Python Launch Support Plug-in&#xA;Bundle-Vendor: INdT / NOKIA
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.source_feature.feature.jar' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.source_feature.feature.jar' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox 2nd Edition Sources'/>
-        <property name='org.eclipse.equinox.p2.description' value='This feature builds the source plugins for ESbox.'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
+    <unit id='org.maemo.esbox.vm.source' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.vm.source' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='%pluginName'/>
+        <property name='org.eclipse.equinox.p2.provider' value='%providerName'/>
       </properties>
       <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source_feature.feature.jar' version='2.0.0.200907030033'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox.source_feature' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.source' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.vm.source' version='2.0.0.200909101637'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <filter>
-        (org.eclipse.update.install.features=true)
-      </filter>
       <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.source_feature' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.source' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
-        <instructions size='1'>
+        <instructions size='2'>
+          <instruction key='manifest'>
+            Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.maemo.esbox.vm.source; singleton=true&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200909101637
+          </instruction>
           <instruction key='zipped'>
             true
           </instruction>
         </instructions>
       </touchpointData>
+    </unit>
+    <unit id='org.maemo.esbox.source_feature.feature.group' version='2.0.0.200909101637' singleton='false'>
+      <update id='org.maemo.esbox.source_feature.feature.group' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='4'>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox 2nd Edition Sources'/>
+        <property name='org.eclipse.equinox.p2.description' value='This feature builds the source plugins for ESbox.'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source_feature.feature.group' version='2.0.0.200909101637'/>
+      </provides>
+      <requires size='4'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source.feature.group' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.source.feature.group' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.source.feature.group' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source_feature.feature.jar' range='[2.0.0.200909101637,2.0.0.200909101637]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
       <licenses size='1'>
         <license url='http://www.eclipse.org/legal/epl-v10.html'>
           For legal terms, see the Eclipse Public License.
@@ -592,18 +725,48 @@
         Copyright (c) 2009 INdT, (c) 2009 Nokia. All rights&#xA;reserved.
       </copyright>
     </unit>
-    <unit id='org.maemo.esbox.cpp.launch.cdi.gdb' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.cpp.launch.cdi.gdb' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.help' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.help' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox C/C++ CDI/GDB Launch Support Plug-in'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Help Plug-in'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
+      </properties>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.help' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.help' version='2.0.0.200909101637'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='2'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.help' version='2.0.0.200909101637'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='2'>
+          <instruction key='manifest'>
+            Bundle-ManifestVersion: 2&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: ESbox Help Plug-in&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Bundle-SymbolicName: org.maemo.esbox.help;singleton:=true&#xA;Manifest-Version: 1.0&#xA;Bundle-Vendor: INdT / Nokia
+          </instruction>
+          <instruction key='zipped'>
+            true
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='org.maemo.esbox.cpp.project' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.cpp.project' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox C/C++ Project Support Plug-in'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
       </properties>
       <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.cpp.launch.cdi.gdb' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.cpp.launch.cdi.gdb' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.cpp.project' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.cpp.project' version='2.0.0.200909101637'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='20'>
+      <requires size='19'>
         <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
@@ -619,24 +782,97 @@
         <required namespace='osgi.bundle' name='org.eclipse.cdt.ui' range='5.0.1'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.core' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.cdt.core' range='5.0.1'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.dsf.gdb' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.cdi.gdb' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.analysis' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.cdt.core' range='5.0.2'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.project.builder.make' range='2.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.cpp.launch.cdi.gdb' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.cpp.project' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.views;bundle-version=&quot;3.3.0&quot;,org.maemo.mica.cpp.project.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.project.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.make.core;bundle-version=&quot;5.0.1&quot;,org.eclipse.cdt.make.ui;bundle-version=&quot;5.0.1&quot;,org.eclipse.cdt.ui;bundle-version=&quot;5.0.1&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.ui;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.core;bundle-version=&quot;5.0.1&quot;,org.maemo.mica.cpp.launch;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.dsf.gdb;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.cdi.gdb;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.analysis;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Activator: org.maemo.esbox.internal.cpp.launch.cdi.gdb.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Bundle-SymbolicName: org.maemo.esbox.cpp.launch.cdi.gdb;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: ESbox C/C++ CDI/GDB Launch Support Plug-in&#xA;Bundle-Vendor: INdT / NOKIA
+            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.views;bundle-version=&quot;3.3.0&quot;,org.maemo.mica.cpp.project.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.project.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.make.core;bundle-version=&quot;5.0.1&quot;,org.eclipse.cdt.make.ui;bundle-version=&quot;5.0.1&quot;,org.eclipse.cdt.ui;bundle-version=&quot;5.0.1&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.ui;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.core;bundle-version=&quot;5.0.2&quot;,org.maemo.esbox.maemosdk.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.project.builder.make;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Activator: org.maemo.esbox.internal.cpp.project.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Bundle-SymbolicName: org.maemo.esbox.cpp.project;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: ESbox C/C++ Project Support Plug-in&#xA;Bundle-Vendor: INdT / NOKIA
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
+    <unit id='org.maemo.esbox.vm.source.feature.jar' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.vm.source.feature.jar' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Virtual Machine Support'/>
+        <property name='org.eclipse.equinox.p2.description' value='ESbox virtual machine feature, providing Scratchbox running on virtual machines.'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
+      </properties>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.source.feature.jar' version='2.0.0.200909101637'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
+        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox.vm.source' version='2.0.0.200909101637'/>
+      </provides>
+      <filter>
+        (org.eclipse.update.install.features=true)
+      </filter>
+      <artifacts size='1'>
+        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.vm.source' version='2.0.0.200909101637'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='zipped'>
+            true
+          </instruction>
+        </instructions>
+      </touchpointData>
+      <licenses size='1'>
+        <license url='http://www.eclipse.org/legal/epl-v10.html'>
+          For legal terms, see the Eclipse Public License.
+        </license>
+      </licenses>
+      <copyright>
+        Copyright (c) 2008-2009 Nokia. All rights&#xA;reserved.
+      </copyright>
+    </unit>
+    <unit id='org.maemo.esbox.scratchbox.feature.group' version='2.0.0.200909101637' singleton='false'>
+      <update id='org.maemo.esbox.scratchbox.feature.group' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='4'>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Scratchbox Support'/>
+        <property name='org.eclipse.equinox.p2.description' value='This feature provides support for Maemo SDKs using scratchbox.&#xA;Installations of Scratchbox 1 and Scratchbox 2 are supported.&#xA;This provides project templates for Maemo C/C++ or Python projects&#xA;as well, though it does not require those languages&apos; features&#xA;to be installed.'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.feature.group' version='2.0.0.200909101637'/>
+      </provides>
+      <requires size='12'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.expressions' range='3.4.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.ide' range='3.4.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.common.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.protocol.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.maemosdk.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.linux.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.sb1' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.sb2' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.core' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.ui' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.feature.jar' range='[2.0.0.200909101637,2.0.0.200909101637]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <licenses size='1'>
+        <license url='http://www.eclipse.org/legal/epl-v10.html'>
+          For legal terms, see the Eclipse Public License.
+        </license>
+      </licenses>
+      <copyright>
+        Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights&#xA;reserved.
+      </copyright>
+    </unit>
     <unit id='tooling.osgi.bundle.default' version='1.0.0' singleton='false'>
       <hostRequirements size='1'>
         <required namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' range='0.0.0' multiple='true' greedy='false'/>
@@ -669,129 +905,84 @@
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.product' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.product' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.scratchbox.sb2' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.scratchbox.sb2' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Product'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Scratchbox 2 Support'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
       </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.product' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.product' version='2.0.0.200907030033'/>
+      <provides size='8'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.sb2' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.sb2' version='2.0.0.200909101637'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.api.scratchbox.sb2.core' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.scratchbox.sb2.command' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.scratchbox.sb2.core' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.scratchbox.sb2.provider' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.scratchbox.sb2.sdk' version='0.0.0'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='6'>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+      <requires size='8'>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.cdt.ui' range='5.0.1'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.python.project' range='2.0.0' optional='true'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.cpp.project' range='2.0.0' optional='true'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.2'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.core' range='2.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.product' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.sb2' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: INdT / Nokia&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.product.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.cdt.ui;bundle-version=&quot;5.0.1&quot;,org.maemo.esbox.python.project;bundle-version=&quot;2.0.0&quot;;resolution:=optional,org.maemo.esbox.cpp.project;bundle-version=&quot;2.0.0&quot;;resolution:=optional,org.eclipse.core.resources;bundle-version=&quot;3.4.2&quot;&#xA;Bundle-Name: ESbox Product&#xA;Bundle-Localization: plugin&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.product;singleton:=true&#xA;Bundle-Version: 2.0.0.200907030033
+            Bundle-Vendor: INdT / Nokia&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.scratchbox.sb2.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.core.runtime,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;;visibility:=reexport,org.eclipse.ui.ide,org.maemo.mica.maemosdk.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.scratchbox.core;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.scratchbox.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox Scratchbox 2 Support&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.scratchbox.sb2;singleton:=true&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Export-Package: org.maemo.esbox.internal.api.scratchbox.sb2.core,org.maemo.esbox.internal.scratchbox.sb2.command;x-friends:=&quot;org.maemo.esbox.scratchbox.tests&quot;,org.maemo.esbox.internal.scratchbox.sb2.core;x-friends:=&quot;org.maemo.esbox.scratchbox.tests&quot;,org.maemo.esbox.internal.scratchbox.sb2.provider;x-friends:=&quot;org.maemo.esbox.scratchbox.tests&quot;,org.maemo.esbox.scratchbox.sb2.sdk
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.feature.group' version='2.0.0.200907030033' singleton='false'>
-      <update id='org.maemo.esbox.feature.group' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Core'/>
-        <property name='org.eclipse.equinox.p2.description' value='ESbox feature, containing all the ESbox-specific plugins.'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
-        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+    <unit id='org.maemo.esbox.scratchbox.source' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.scratchbox.source' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='%pluginName'/>
+        <property name='org.eclipse.equinox.p2.provider' value='%providerName'/>
       </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.feature.group' version='2.0.0.200907030033'/>
-      </provides>
-      <requires size='16'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='com.nokia.carbide.templatewizard' range='2.1.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.common.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.maemosdk.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.help' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.maemosdk.core' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.maemosdk.ui' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.indt.esbox.core' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.launch.analysis' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.cpp.launch.cdi.gdb' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.cpp.launch.dsf.gdb' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.cpp.project' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.python.project' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.python.launch' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.feature.jar' range='[2.0.0.200907030033,2.0.0.200907030033]'>
-          <filter>
-            (org.eclipse.update.install.features=true)
-          </filter>
-        </required>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-      <licenses size='1'>
-        <license url='http://www.eclipse.org/legal/epl-v10.html'>
-          For legal terms, see the Eclipse Public License.
-        </license>
-      </licenses>
-      <copyright>
-        Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights&#xA;reserved.
-      </copyright>
-    </unit>
-    <unit id='org.maemo.esbox.scratchbox.feature.jar' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.scratchbox.feature.jar' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Scratchbox Support'/>
-        <property name='org.eclipse.equinox.p2.description' value='This feature provides support for Maemo SDKs using scratchbox.&#xA;Installations of Scratchbox 1 and Scratchbox 2 are supported.&#xA;This provides project templates for Maemo C/C++ or Python projects&#xA;as well, though it does not require those languages&apos; features&#xA;to be installed.'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
-      </properties>
       <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.feature.jar' version='2.0.0.200907030033'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox.scratchbox' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.source' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.source' version='2.0.0.200909101637'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <filter>
-        (org.eclipse.update.install.features=true)
-      </filter>
       <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.scratchbox' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.source' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
-        <instructions size='1'>
+        <instructions size='2'>
+          <instruction key='manifest'>
+            Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.maemo.esbox.scratchbox.source; singleton=true&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200909101637
+          </instruction>
           <instruction key='zipped'>
             true
           </instruction>
         </instructions>
       </touchpointData>
-      <licenses size='1'>
-        <license url='http://www.eclipse.org/legal/epl-v10.html'>
-          For legal terms, see the Eclipse Public License.
-        </license>
-      </licenses>
-      <copyright>
-        Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights&#xA;reserved.
-      </copyright>
     </unit>
-    <unit id='org.maemo.esbox.vm.vmware' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.vm.vmware' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.vm.virtualbox' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.vm.virtualbox' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox VMware Support Plug-in'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox VirtualBox Support Plug-in'/>
         <property name='org.eclipse.equinox.p2.provider' value='NOKIA'/>
       </properties>
       <provides size='5'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.vmware' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.vm.vmware' version='2.0.0.200907030033'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.vm.vmware' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.vm.vmware' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.virtualbox' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.vm.virtualbox' version='2.0.0.200909101637'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.vm.virtualbox' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.vm.virtualbox' version='0.0.0'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='8'>
+      <requires size='7'>
         <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
@@ -799,141 +990,53 @@
         <required namespace='osgi.bundle' name='org.maemo.mica.protocol.ssh' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.esbox.vm' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.cdt.core' range='5.0.2'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.vmware' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.virtualbox' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.vm.vmware.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.protocol.ssh;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.vm;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.core;bundle-version=&quot;5.0.2&quot;&#xA;Bundle-Name: ESbox VMware Support Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.vm.vmware;singleton:=true&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Export-Package: org.maemo.esbox.internal.vm.vmware;x-friends:=&quot;org.maemo.esbox.vm.tests&quot;,org.maemo.esbox.vm.vmware
+            Bundle-Vendor: NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.vm.virtualbox.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.protocol.ssh;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.vm;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox VirtualBox Support Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.vm.virtualbox;singleton:=true&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Export-Package: org.maemo.esbox.internal.vm.virtualbox;x-friends:=&quot;org.maemo.esbox.vm.tests&quot;,org.maemo.esbox.vm.virtualbox
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.product.repository.feature.group' version='2.0.0.200907030033' singleton='false'>
-      <update id='org.maemo.esbox.product.repository.feature.group' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox 2nd Edition'/>
-        <property name='org.eclipse.equinox.p2.description' value='Feature that builds the P2 repository for ESbox.'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
-        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
-      </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.product.repository.feature.group' version='2.0.0.200907030033'/>
-      </provides>
-      <requires size='18'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.feature.group' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.feature.group' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.feature.group' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.cdt.feature.group' range='5.0.2'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.platform.feature.group' range='3.4.2'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.rse.feature.group' range='3.0.2'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.common.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.cpp.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.linux.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.linux.autotools.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.maemosdk.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.maemosdk.device.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.protocol.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.protocol.rse.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.python.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.supplement.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.product' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.product.repository.feature.jar' range='[2.0.0.200907030033,2.0.0.200907030033]'>
-          <filter>
-            (org.eclipse.update.install.features=true)
-          </filter>
-        </required>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-      <licenses size='1'>
-        <license url='http://www.eclipse.org/legal/epl-v10.html'>
-          For legal terms, see the Eclipse Public License.
-        </license>
-      </licenses>
-      <copyright>
-        Copyright (c) 2009 INdT, (c) 2009 Nokia. All rights&#xA;reserved.
-      </copyright>
-    </unit>
-    <unit id='org.maemo.esbox.python.launch' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.python.launch' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.vm.qemu' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.vm.qemu' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Python Launch Support Plug-in'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Qemu Virtual Machine Plug-in'/>
+        <property name='org.eclipse.equinox.p2.provider' value='NOKIA'/>
       </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.python.launch' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.python.launch' version='2.0.0.200907030033'/>
+      <provides size='5'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.qemu' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.vm.qemu' version='2.0.0.200909101637'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.vm.qemu' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.vm.qemu' version='0.0.0'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='16'>
+      <requires size='7'>
         <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.project.core' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.common.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.protocol.ssh' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.vm' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='3.3.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.python.project.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.python.project.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.python.launch' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.python.launch.analysis' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='3.4.2'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.cdi.gdb' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.dsf.gdb' range='2.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.python.launch' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.qemu' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.views;bundle-version=&quot;3.3.0&quot;,org.maemo.mica.python.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.python.project.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.python.launch;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.python.launch.analysis;bundle-version=&quot;2.0.0&quot;,org.eclipse.debug.ui;bundle-version=&quot;3.4.2&quot;,org.maemo.mica.cpp.launch.cdi.gdb;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.dsf.gdb;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Activator: org.maemo.esbox.internal.python.launch.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Bundle-SymbolicName: org.maemo.esbox.python.launch;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: ESbox Python Launch Support Plug-in&#xA;Bundle-Vendor: INdT / NOKIA
+            Bundle-Vendor: NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.vm.qemu.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.protocol.ssh;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.vm;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox Qemu Virtual Machine Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.vm.qemu;singleton:=true&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Export-Package: org.maemo.esbox.internal.vm.qemu;x-friends:=&quot;org.maemo.mica.protocol.tests,org.maemo.esbox.scratchbox.tests,org.maemo.esbox.vm.tests&quot;,org.maemo.esbox.vm.qemu
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.vm.source.feature.jar' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.vm.source.feature.jar' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Virtual Machine Support'/>
-        <property name='org.eclipse.equinox.p2.description' value='ESbox virtual machine feature, providing Scratchbox running on virtual machines.'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
-      </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.source.feature.jar' version='2.0.0.200907030033'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox.vm.source' version='2.0.0.200907030033'/>
-      </provides>
-      <filter>
-        (org.eclipse.update.install.features=true)
-      </filter>
-      <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.vm.source' version='2.0.0.200907030033'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='zipped'>
-            true
-          </instruction>
-        </instructions>
-      </touchpointData>
-      <licenses size='1'>
-        <license url='http://www.eclipse.org/legal/epl-v10.html'>
-          For legal terms, see the Eclipse Public License.
-        </license>
-      </licenses>
-      <copyright>
-        Copyright (c) 2008-2009 Nokia. All rights&#xA;reserved.
-      </copyright>
-    </unit>
     <unit id='a.jre' version='1.6.0' singleton='false'>
       <provides size='117'>
         <provided namespace='org.eclipse.equinox.p2.iu' name='a.jre' version='1.6.0'/>
@@ -1056,57 +1159,97 @@
       </provides>
       <touchpoint id='org.eclipse.equinox.p2.native' version='1.0.0'/>
     </unit>
-    <unit id='org.maemo.esbox.maemosdk.ui' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.maemosdk.ui' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.maemosdk.core' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.maemosdk.core' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Maemo SDK UI Plug-in'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Maemo SDK Core Plug-in'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
       </properties>
-      <provides size='4'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.maemosdk.ui' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.ui' version='2.0.0.200907030033'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.api.maemosdk.ui.preferences' version='0.0.0'/>
+      <provides size='6'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.maemosdk.core' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' version='2.0.0.200909101637'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.api.maemosdk.core' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.api.maemosdk.core.tools' version='0.0.0'/>
+        <provided namespace='java.package' name='org.maemo.esbox.maemosdk.core' version='0.0.0'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='13'>
+      <requires size='5'>
         <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.common.project.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='3.3.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.project.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.python.project.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.project.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.launch' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.maemosdk.ui' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.maemosdk.core' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: INdT / NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.maemosdk.ui.UIActivator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.views;bundle-version=&quot;3.3.0&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.python.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.ui;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox Maemo SDK UI Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.maemosdk.ui;singleton:=true&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Export-Package: org.maemo.esbox.internal.api.maemosdk.ui.preferences
+            Bundle-Vendor: INdT / NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.maemosdk.core.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.launch;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox Maemo SDK Core Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.maemosdk.core;singleton:=true&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Export-Package: org.maemo.esbox.internal.api.maemosdk.core,org.maemo.esbox.internal.api.maemosdk.core.tools,org.maemo.esbox.maemosdk.core
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.cpp.launch.dsf.gdb' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.cpp.launch.dsf.gdb' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.product.repository.feature.group' version='2.0.0.200909101637' singleton='false'>
+      <update id='org.maemo.esbox.product.repository.feature.group' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='4'>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox 2nd Edition'/>
+        <property name='org.eclipse.equinox.p2.description' value='Feature that builds the P2 repository for ESbox.'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.product.repository.feature.group' version='2.0.0.200909101637'/>
+      </provides>
+      <requires size='18'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.feature.group' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.feature.group' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.feature.group' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.cdt.feature.group' range='5.0.2'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.platform.feature.group' range='3.4.2'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.rse.feature.group' range='3.0.2'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.common.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.cpp.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.linux.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.linux.autotools.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.maemosdk.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.maemosdk.device.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.protocol.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.protocol.rse.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.python.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.supplement.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.product' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.product.repository.feature.jar' range='[2.0.0.200909101637,2.0.0.200909101637]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <licenses size='1'>
+        <license url='http://www.eclipse.org/legal/epl-v10.html'>
+          For legal terms, see the Eclipse Public License.
+        </license>
+      </licenses>
+      <copyright>
+        Copyright (c) 2009 INdT, (c) 2009 Nokia. All rights&#xA;reserved.
+      </copyright>
+    </unit>
+    <unit id='org.maemo.esbox.maemosdk.ui' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.maemosdk.ui' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox C/C++ DSF/GDB Launch Support Plug-in'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Maemo SDK UI Plug-in'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
       </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.cpp.launch.dsf.gdb' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.cpp.launch.dsf.gdb' version='2.0.0.200907030033'/>
+      <provides size='4'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.maemosdk.ui' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.ui' version='2.0.0.200909101637'/>
+        <provided namespace='java.package' name='org.maemo.esbox.internal.api.maemosdk.ui.preferences' version='0.0.0'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='20'>
+      <requires size='13'>
         <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
@@ -1115,48 +1258,100 @@
         <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.1'/>
         <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='3.3.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.project.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.project.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.cdt.make.core' range='5.0.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.cdt.make.ui' range='5.0.1'/>
-        <required namespace='osgi.bundle' name='org.eclipse.cdt.ui' range='5.0.1'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.core' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.cdt.core' range='5.0.1'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.dsf.gdb' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.cdi.gdb' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.analysis' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.project.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.python.project.core' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.common.project.ui' range='2.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.cpp.launch.dsf.gdb' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.maemosdk.ui' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.views;bundle-version=&quot;3.3.0&quot;,org.maemo.mica.cpp.project.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.project.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.make.core;bundle-version=&quot;5.0.1&quot;,org.eclipse.cdt.make.ui;bundle-version=&quot;5.0.1&quot;,org.eclipse.cdt.ui;bundle-version=&quot;5.0.1&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.ui;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.core;bundle-version=&quot;5.0.1&quot;,org.maemo.mica.cpp.launch;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.dsf.gdb;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.cdi.gdb;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.analysis;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Activator: org.maemo.esbox.internal.cpp.launch.dsf.gdb.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Bundle-SymbolicName: org.maemo.esbox.cpp.launch.dsf.gdb;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: ESbox C/C++ DSF/GDB Launch Support Plug-in&#xA;Bundle-Vendor: INdT / NOKIA
+            Bundle-Vendor: INdT / NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.maemosdk.ui.UIActivator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.views;bundle-version=&quot;3.3.0&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.python.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.ui;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox Maemo SDK UI Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.maemosdk.ui;singleton:=true&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Export-Package: org.maemo.esbox.internal.api.maemosdk.ui.preferences
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.product.repository.feature.jar' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.product.repository.feature.jar' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='ESboxSources' version='0.0.0'>
       <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox 2nd Edition'/>
-        <property name='org.eclipse.equinox.p2.description' value='Feature that builds the P2 repository for ESbox.'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Sources'/>
+        <property name='org.eclipse.equinox.p2.description' value='ESbox Sources'/>
+        <property name='org.eclipse.equinox.p2.type.category' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='ESboxSources' version='0.0.0'/>
+      </provides>
+      <requires size='3'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.source.feature.group' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source_feature.feature.group' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source.feature.group' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+    </unit>
+    <unit id='org.maemo.esbox.feature.group' version='2.0.0.200909101637' singleton='false'>
+      <update id='org.maemo.esbox.feature.group' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='4'>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Core'/>
+        <property name='org.eclipse.equinox.p2.description' value='ESbox feature, containing all the ESbox-specific plugins.'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
       </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.feature.group' version='2.0.0.200909101637'/>
+      </provides>
+      <requires size='16'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='com.nokia.carbide.templatewizard' range='2.1.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.common.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.maemosdk.feature.group' range='2.0.0'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.help' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.maemosdk.core' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.maemosdk.ui' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.indt.esbox.core' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.launch.analysis' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.cpp.launch.cdi.gdb' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.cpp.launch.dsf.gdb' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.cpp.project' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.python.project' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.python.launch' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.feature.jar' range='[2.0.0.200909101637,2.0.0.200909101637]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <licenses size='1'>
+        <license url='http://www.eclipse.org/legal/epl-v10.html'>
+          For legal terms, see the Eclipse Public License.
+        </license>
+      </licenses>
+      <copyright>
+        Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights&#xA;reserved.
+      </copyright>
+    </unit>
+    <unit id='org.maemo.esbox.source_feature.feature.jar' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.source_feature.feature.jar' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox 2nd Edition Sources'/>
+        <property name='org.eclipse.equinox.p2.description' value='This feature builds the source plugins for ESbox.'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
+      </properties>
       <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.product.repository.feature.jar' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source_feature.feature.jar' version='2.0.0.200909101637'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox.product.repository' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox.source_feature' version='2.0.0.200909101637'/>
       </provides>
       <filter>
         (org.eclipse.update.install.features=true)
       </filter>
       <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.product.repository' version='2.0.0.200907030033'/>
+        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.source_feature' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
@@ -1175,23 +1370,23 @@
         Copyright (c) 2009 INdT, (c) 2009 Nokia. All rights&#xA;reserved.
       </copyright>
     </unit>
-    <unit id='org.maemo.esbox.scratchbox.source.feature.jar' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.scratchbox.source.feature.jar' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.product.repository.feature.jar' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.product.repository.feature.jar' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Scratchbox Support'/>
-        <property name='org.eclipse.equinox.p2.description' value='This feature provides support for Maemo SDKs using scratchbox.&#xA;Installations of Scratchbox 1 and Scratchbox 2 are supported.&#xA;This provides project templates for Maemo C/C++ or Python projects&#xA;as well, though it does not require those languages&apos; features&#xA;to be installed.'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox 2nd Edition'/>
+        <property name='org.eclipse.equinox.p2.description' value='Feature that builds the P2 repository for ESbox.'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
       </properties>
       <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.source.feature.jar' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.product.repository.feature.jar' version='2.0.0.200909101637'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox.scratchbox.source' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox.product.repository' version='2.0.0.200909101637'/>
       </provides>
       <filter>
         (org.eclipse.update.install.features=true)
       </filter>
       <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.scratchbox.source' version='2.0.0.200907030033'/>
+        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.product.repository' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
@@ -1207,18 +1402,18 @@
         </license>
       </licenses>
       <copyright>
-        Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights&#xA;reserved.
+        Copyright (c) 2009 INdT, (c) 2009 Nokia. All rights&#xA;reserved.
       </copyright>
     </unit>
-    <unit id='org.maemo.esbox.scratchbox.ui' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.scratchbox.ui' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.scratchbox.ui' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.scratchbox.ui' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
         <property name='org.eclipse.equinox.p2.name' value='ESbox Scratchbox UI Plug-in'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
       </properties>
       <provides size='5'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.ui' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.ui' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.ui' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.ui' version='2.0.0.200909101637'/>
         <provided namespace='java.package' name='org.maemo.esbox.internal.api.scratchbox.ui.adapters' version='0.0.0'/>
         <provided namespace='java.package' name='org.maemo.esbox.internal.api.scratchbox.ui.wizards' version='0.0.0'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
@@ -1235,41 +1430,31 @@
         <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='3.4.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.ui' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.ui' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: INdT / NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.scratchbox.ui.UIActivator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.esbox.scratchbox.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.ui;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.0&quot;&#xA;Bundle-Name: ESbox Scratchbox UI Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.scratchbox.ui;singleton:=true&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Export-Package: org.maemo.esbox.internal.api.scratchbox.ui.adapters,org.maemo.esbox.internal.api.scratchbox.ui.wizards
+            Bundle-Vendor: INdT / NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.scratchbox.ui.UIActivator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.esbox.scratchbox.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.ui;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.0&quot;&#xA;Bundle-Name: ESbox Scratchbox UI Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.scratchbox.ui;singleton:=true&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Export-Package: org.maemo.esbox.internal.api.scratchbox.ui.adapters,org.maemo.esbox.internal.api.scratchbox.ui.wizards
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.scratchbox.feature.group' version='2.0.0.200907030033' singleton='false'>
-      <update id='org.maemo.esbox.scratchbox.feature.group' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.vm.source.feature.group' version='2.0.0.200909101637' singleton='false'>
+      <update id='org.maemo.esbox.vm.source.feature.group' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Scratchbox Support'/>
-        <property name='org.eclipse.equinox.p2.description' value='This feature provides support for Maemo SDKs using scratchbox.&#xA;Installations of Scratchbox 1 and Scratchbox 2 are supported.&#xA;This provides project templates for Maemo C/C++ or Python projects&#xA;as well, though it does not require those languages&apos; features&#xA;to be installed.'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Virtual Machine Support'/>
+        <property name='org.eclipse.equinox.p2.description' value='ESbox virtual machine feature, providing Scratchbox running on virtual machines.'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
         <property name='org.eclipse.equinox.p2.type.group' value='true'/>
       </properties>
       <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.feature.group' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.source.feature.group' version='2.0.0.200909101637'/>
       </provides>
-      <requires size='12'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.expressions' range='3.4.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui.ide' range='3.4.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.common.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.protocol.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.maemosdk.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.linux.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.sb1' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.sb2' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.core' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.ui' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.feature.jar' range='[2.0.0.200907030033,2.0.0.200907030033]'>
+      <requires size='2'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.source' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.source.feature.jar' range='[2.0.0.200909101637,2.0.0.200909101637]'>
           <filter>
             (org.eclipse.update.install.features=true)
           </filter>
@@ -1282,26 +1467,26 @@
         </license>
       </licenses>
       <copyright>
-        Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights&#xA;reserved.
+        Copyright (c) 2008-2009 Nokia. All rights&#xA;reserved.
       </copyright>
     </unit>
-    <unit id='org.maemo.esbox.vm.feature.jar' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.vm.feature.jar' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.feature.jar' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.feature.jar' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Virtual Machine Support'/>
-        <property name='org.eclipse.equinox.p2.description' value='ESbox virtual machine feature, providing Scratchbox running on virtual machines.'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Core'/>
+        <property name='org.eclipse.equinox.p2.description' value='ESbox feature, containing all the ESbox-specific plugins.'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
       </properties>
       <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.feature.jar' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.feature.jar' version='2.0.0.200909101637'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox.vm' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox' version='2.0.0.200909101637'/>
       </provides>
       <filter>
         (org.eclipse.update.install.features=true)
       </filter>
       <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox.vm' version='2.0.0.200907030033'/>
+        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
@@ -1317,129 +1502,76 @@
         </license>
       </licenses>
       <copyright>
-        Copyright (c) 2008-2009 Nokia. All rights&#xA;reserved.
+        Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights&#xA;reserved.
       </copyright>
     </unit>
-    <unit id='org.maemo.esbox.source' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.source' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.product' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.product' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='%pluginName'/>
-        <property name='org.eclipse.equinox.p2.provider' value='%providerName'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Product'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
       </properties>
       <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.source' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.product' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.product' version='2.0.0.200909101637'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.source' version='2.0.0.200907030033'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='2'>
-          <instruction key='manifest'>
-            Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.maemo.esbox.source; singleton=true&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200907030033
-          </instruction>
-          <instruction key='zipped'>
-            true
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='org.maemo.esbox.scratchbox.sb1' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.scratchbox.sb1' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Scratchbox 1 Support'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
-      </properties>
-      <provides size='7'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.sb1' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.sb1' version='2.0.0.200907030033'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.scratchbox.sb1.command' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.scratchbox.sb1.core' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.scratchbox.sb1.provider' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.scratchbox.sb1.sdk' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='9'>
+      <requires size='6'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.scratchbox.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.ui' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.cdt.ui' range='5.0.1'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.python.project' range='2.0.0' optional='true'/>
+        <required namespace='osgi.bundle' name='org.maemo.esbox.cpp.project' range='2.0.0' optional='true'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='3.4.2'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.scratchbox.sb1' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.product' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-Vendor: INdT / Nokia&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.scratchbox.sb1.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.core.runtime,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;;visibility:=reexport,org.eclipse.ui.ide,org.maemo.mica.maemosdk.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.scratchbox.core;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.scratchbox.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.ui;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox Scratchbox 1 Support&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.scratchbox.sb1;singleton:=true&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Export-Package: org.maemo.esbox.internal.scratchbox.sb1.command;x-friends:=&quot;org.maemo.esbox.scratchbox.tests&quot;,org.maemo.esbox.internal.scratchbox.sb1.core;x-friends:=&quot;org.maemo.esbox.scratchbox.tests,org.maemo.esbox.tests&quot;,org.maemo.esbox.internal.scratchbox.sb1.provider;x-friends:=&quot;org.maemo.esbox.scratchbox.tests&quot;,org.maemo.esbox.scratchbox.sb1.sdk
+            Bundle-Vendor: INdT / Nokia&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.product.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.cdt.ui;bundle-version=&quot;5.0.1&quot;,org.maemo.esbox.python.project;bundle-version=&quot;2.0.0&quot;;resolution:=optional,org.maemo.esbox.cpp.project;bundle-version=&quot;2.0.0&quot;;resolution:=optional,org.eclipse.core.resources;bundle-version=&quot;3.4.2&quot;&#xA;Bundle-Name: ESbox Product&#xA;Bundle-Localization: plugin&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.product;singleton:=true&#xA;Bundle-Version: 2.0.0.200909101637
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='ESboxSources' version='0.0.0'>
-      <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Sources'/>
-        <property name='org.eclipse.equinox.p2.description' value='ESbox Sources'/>
-        <property name='org.eclipse.equinox.p2.type.category' value='true'/>
+    <unit id='config.a.jre' version='1.6.0' singleton='false'>
+      <hostRequirements size='1'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='a.jre' range='1.6.0'/>
+      </hostRequirements>
+      <properties size='1'>
+        <property name='org.eclipse.equinox.p2.type.fragment' value='true'/>
       </properties>
       <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='ESboxSources' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='config.a.jre' version='1.6.0'/>
       </provides>
-      <requires size='3'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source.feature.group' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source_feature.feature.group' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.source.feature.group' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
+      <requires size='1'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='a.jre' range='1.6.0'/>
       </requires>
-      <touchpoint id='null' version='0.0.0'/>
-    </unit>
-    <unit id='org.maemo.esbox.vm.source' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.vm.source' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='%pluginName'/>
-        <property name='org.eclipse.equinox.p2.provider' value='%providerName'/>
-      </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.source' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.vm.source' version='2.0.0.200907030033'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.source' version='2.0.0.200907030033'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpoint id='org.eclipse.equinox.p2.native' version='1.0.0'/>
       <touchpointData size='1'>
-        <instructions size='2'>
-          <instruction key='manifest'>
-            Bundle-Vendor: %providerName&#xA;Bundle-SymbolicName: org.maemo.esbox.vm.source; singleton=true&#xA;Bundle-Localization: plugin&#xA;Bundle-Name: %pluginName&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200907030033
+        <instructions size='1'>
+          <instruction key='install'>
+
           </instruction>
-          <instruction key='zipped'>
-            true
-          </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.scratchbox.source.feature.group' version='2.0.0.200907030033' singleton='false'>
-      <update id='org.maemo.esbox.scratchbox.source.feature.group' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.source.feature.group' version='2.0.0.200909101637' singleton='false'>
+      <update id='org.maemo.esbox.source.feature.group' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Scratchbox Support'/>
-        <property name='org.eclipse.equinox.p2.description' value='This feature provides support for Maemo SDKs using scratchbox.&#xA;Installations of Scratchbox 1 and Scratchbox 2 are supported.&#xA;This provides project templates for Maemo C/C++ or Python projects&#xA;as well, though it does not require those languages&apos; features&#xA;to be installed.'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / Nokia'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox Core'/>
+        <property name='org.eclipse.equinox.p2.description' value='ESbox feature, containing all the ESbox-specific plugins.'/>
+        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
         <property name='org.eclipse.equinox.p2.type.group' value='true'/>
       </properties>
       <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.source.feature.group' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source.feature.group' version='2.0.0.200909101637'/>
       </provides>
       <requires size='2'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.source' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.scratchbox.source.feature.jar' range='[2.0.0.200907030033,2.0.0.200907030033]'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source' range='[2.0.0.200909101637,2.0.0.200909101637]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.source.feature.jar' range='[2.0.0.200909101637,2.0.0.200909101637]'>
           <filter>
             (org.eclipse.update.install.features=true)
           </filter>
@@ -1455,111 +1587,18 @@
         Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights&#xA;reserved.
       </copyright>
     </unit>
-    <unit id='org.maemo.esbox.vm.feature.group' version='2.0.0.200907030033' singleton='false'>
-      <update id='org.maemo.esbox.vm.feature.group' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='4'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Virtual Machine Support'/>
-        <property name='org.eclipse.equinox.p2.description' value='ESbox virtual machine feature, providing Scratchbox running on virtual machines.'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
-        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
-      </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.feature.group' version='2.0.0.200907030033'/>
-      </provides>
-      <requires size='10'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='com.nokia.carbide.templatewizard' range='2.1.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui' range='0.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.common.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.mica.maemosdk.feature.group' range='2.0.0'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.qemu' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.vmware' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.virtualbox' range='[2.0.0.200907030033,2.0.0.200907030033]'/>
-        <required namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.feature.jar' range='[2.0.0.200907030033,2.0.0.200907030033]'>
-          <filter>
-            (org.eclipse.update.install.features=true)
-          </filter>
-        </required>
-      </requires>
-      <touchpoint id='null' version='0.0.0'/>
-      <licenses size='1'>
-        <license url='http://www.eclipse.org/legal/epl-v10.html'>
-          For legal terms, see the Eclipse Public License.
-        </license>
-      </licenses>
-      <copyright>
-        Copyright (c) 2008-2009 Nokia. All rights&#xA;reserved.
-      </copyright>
-    </unit>
-    <unit id='config.a.jre' version='1.6.0' singleton='false'>
-      <hostRequirements size='1'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='a.jre' range='1.6.0'/>
-      </hostRequirements>
-      <properties size='1'>
-        <property name='org.eclipse.equinox.p2.type.fragment' value='true'/>
-      </properties>
-      <provides size='1'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='config.a.jre' version='1.6.0'/>
-      </provides>
-      <requires size='1'>
-        <required namespace='org.eclipse.equinox.p2.iu' name='a.jre' range='1.6.0'/>
-      </requires>
-      <touchpoint id='org.eclipse.equinox.p2.native' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='install'>
-
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='org.maemo.esbox.vm.virtualbox' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.vm.virtualbox' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
+    <unit id='org.maemo.esbox.cpp.launch.dsf.gdb' version='2.0.0.200909101637'>
+      <update id='org.maemo.esbox.cpp.launch.dsf.gdb' range='[0.0.0,2.0.0.200909101637)' severity='0'/>
       <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox VirtualBox Support Plug-in'/>
-        <property name='org.eclipse.equinox.p2.provider' value='NOKIA'/>
-      </properties>
-      <provides size='5'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.vm.virtualbox' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.vm.virtualbox' version='2.0.0.200907030033'/>
-        <provided namespace='java.package' name='org.maemo.esbox.internal.vm.virtualbox' version='0.0.0'/>
-        <provided namespace='java.package' name='org.maemo.esbox.vm.virtualbox' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='7'>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.common.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.protocol.ssh' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.vm' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.core' range='2.0.0'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.vm.virtualbox' version='2.0.0.200907030033'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-Vendor: NOKIA&#xA;Bundle-ManifestVersion: 2&#xA;Bundle-Activator: org.maemo.esbox.internal.vm.virtualbox.Activator&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.protocol.ssh;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.vm;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Name: ESbox VirtualBox Support Plug-in&#xA;Bundle-ActivationPolicy: lazy&#xA;Manifest-Version: 1.0&#xA;Bundle-SymbolicName: org.maemo.esbox.vm.virtualbox;singleton:=true&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Export-Package: org.maemo.esbox.internal.vm.virtualbox;x-friends:=&quot;org.maemo.esbox.vm.tests&quot;,org.maemo.esbox.vm.virtualbox
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
-    <unit id='org.maemo.esbox.cpp.project' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.cpp.project' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='2'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox C/C++ Project Support Plug-in'/>
+        <property name='org.eclipse.equinox.p2.name' value='ESbox C/C++ DSF/GDB Launch Support Plug-in'/>
         <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
       </properties>
       <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.cpp.project' version='2.0.0.200907030033'/>
-        <provided namespace='osgi.bundle' name='org.maemo.esbox.cpp.project' version='2.0.0.200907030033'/>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.cpp.launch.dsf.gdb' version='2.0.0.200909101637'/>
+        <provided namespace='osgi.bundle' name='org.maemo.esbox.cpp.launch.dsf.gdb' version='2.0.0.200909101637'/>
         <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
       </provides>
-      <requires size='19'>
+      <requires size='20'>
         <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.common.core' range='2.0.0'/>
@@ -1575,58 +1614,24 @@
         <required namespace='osgi.bundle' name='org.eclipse.cdt.ui' range='5.0.1'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.core' range='2.0.0'/>
         <required namespace='osgi.bundle' name='org.maemo.mica.linux.packages.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.cdt.core' range='5.0.2'/>
-        <required namespace='osgi.bundle' name='org.maemo.esbox.maemosdk.ui' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.maemosdk.core' range='2.0.0'/>
-        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.project.builder.make' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.cdt.core' range='5.0.1'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.dsf.gdb' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.cdi.gdb' range='2.0.0'/>
+        <required namespace='osgi.bundle' name='org.maemo.mica.cpp.launch.analysis' range='2.0.0'/>
       </requires>
       <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.maemo.esbox.cpp.project' version='2.0.0.200907030033'/>
+        <artifact classifier='osgi.bundle' id='org.maemo.esbox.cpp.launch.dsf.gdb' version='2.0.0.200909101637'/>
       </artifacts>
       <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
       <touchpointData size='1'>
         <instructions size='1'>
           <instruction key='manifest'>
-            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.views;bundle-version=&quot;3.3.0&quot;,org.maemo.mica.cpp.project.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.project.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.make.core;bundle-version=&quot;5.0.1&quot;,org.eclipse.cdt.make.ui;bundle-version=&quot;5.0.1&quot;,org.eclipse.cdt.ui;bundle-version=&quot;5.0.1&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.ui;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.core;bundle-version=&quot;5.0.2&quot;,org.maemo.esbox.maemosdk.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.project.builder.make;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Activator: org.maemo.esbox.internal.cpp.project.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200907030033&#xA;Bundle-SymbolicName: org.maemo.esbox.cpp.project;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: ESbox C/C++ Project Support Plug-in&#xA;Bundle-Vendor: INdT / NOKIA
+            Bundle-ManifestVersion: 2&#xA;Bundle-RequiredExecutionEnvironment: J2SE-1.5&#xA;Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.maemo.mica.common.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.project.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.common.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.esbox.maemosdk.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.ui.ide;bundle-version=&quot;3.4.1&quot;,org.eclipse.ui.views;bundle-version=&quot;3.3.0&quot;,org.maemo.mica.cpp.project.ui;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.project.core;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.make.core;bundle-version=&quot;5.0.1&quot;,org.eclipse.cdt.make.ui;bundle-version=&quot;5.0.1&quot;,org.eclipse.cdt.ui;bundle-version=&quot;5.0.1&quot;,org.maemo.mica.linux.packages.core;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.linux.packages.ui;bundle-version=&quot;2.0.0&quot;,org.eclipse.cdt.core;bundle-version=&quot;5.0.1&quot;,org.maemo.mica.cpp.launch;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.dsf.gdb;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.cdi.gdb;bundle-version=&quot;2.0.0&quot;,org.maemo.mica.cpp.launch.analysis;bundle-version=&quot;2.0.0&quot;&#xA;Bundle-Activator: org.maemo.esbox.internal.cpp.launch.dsf.gdb.Activator&#xA;Manifest-Version: 1.0&#xA;Bundle-Version: 2.0.0.200909101637&#xA;Bundle-SymbolicName: org.maemo.esbox.cpp.launch.dsf.gdb;singleton:=true&#xA;Bundle-ActivationPolicy: lazy&#xA;Bundle-Name: ESbox C/C++ DSF/GDB Launch Support Plug-in&#xA;Bundle-Vendor: INdT / NOKIA
           </instruction>
         </instructions>
       </touchpointData>
     </unit>
-    <unit id='org.maemo.esbox.feature.jar' version='2.0.0.200907030033'>
-      <update id='org.maemo.esbox.feature.jar' range='[0.0.0,2.0.0.200907030033)' severity='0'/>
-      <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='ESbox Core'/>
-        <property name='org.eclipse.equinox.p2.description' value='ESbox feature, containing all the ESbox-specific plugins.'/>
-        <property name='org.eclipse.equinox.p2.provider' value='INdT / NOKIA'/>
-      </properties>
-      <provides size='3'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.maemo.esbox.feature.jar' version='2.0.0.200907030033'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
-        <provided namespace='org.eclipse.update.feature' name='org.maemo.esbox' version='2.0.0.200907030033'/>
-      </provides>
-      <filter>
-        (org.eclipse.update.install.features=true)
-      </filter>
-      <artifacts size='1'>
-        <artifact classifier='org.eclipse.update.feature' id='org.maemo.esbox' version='2.0.0.200907030033'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='zipped'>
-            true
-          </instruction>
-        </instructions>
-      </touchpointData>
-      <licenses size='1'>
-        <license url='http://www.eclipse.org/legal/epl-v10.html'>
-          For legal terms, see the Eclipse Public License.
-        </license>
-      </licenses>
-      <copyright>
-        Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights&#xA;reserved.
-      </copyright>
-    </unit>
     <unit id='org.eclipse.launcher.gtk.linux.x86' version='1.0.0'>
       <provides size='2'>
         <provided namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.launcher.gtk.linux.x86' version='1.0.0'/>

Deleted: www/update/2.0/features/org.maemo.esbox.product.repository_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/features/org.maemo.esbox.product.repository_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/features/org.maemo.esbox.product.repository_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/features/org.maemo.esbox.scratchbox.source_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/features/org.maemo.esbox.scratchbox.source_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/features/org.maemo.esbox.scratchbox.source_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/features/org.maemo.esbox.scratchbox_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/features/org.maemo.esbox.scratchbox_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/features/org.maemo.esbox.scratchbox_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/features/org.maemo.esbox.source_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/features/org.maemo.esbox.source_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/features/org.maemo.esbox.source_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/features/org.maemo.esbox.source_feature_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/features/org.maemo.esbox.source_feature_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/features/org.maemo.esbox.source_feature_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/features/org.maemo.esbox.vm.source_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/features/org.maemo.esbox.vm.source_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/features/org.maemo.esbox.vm.source_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/features/org.maemo.esbox.vm_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/features/org.maemo.esbox.vm_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/features/org.maemo.esbox.vm_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/features/org.maemo.esbox_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/features/org.maemo.esbox_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/features/org.maemo.esbox_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: www/update/2.0/plugins/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731.jar
===================================================================
(Binary files differ)

Modified: www/update/2.0/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805.jar
===================================================================
(Binary files differ)

Modified: www/update/2.0/plugins/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731.jar
===================================================================
(Binary files differ)

Deleted: www/update/2.0/plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20081125.jar
===================================================================
(Binary files differ)

Deleted: www/update/2.0/plugins/org.indt.esbox.core_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.indt.esbox.core_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.indt.esbox.core_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.cpp.launch.cdi.gdb_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.cpp.launch.cdi.gdb_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.cpp.launch.cdi.gdb_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.cpp.launch.dsf.gdb_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.cpp.launch.dsf.gdb_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.cpp.launch.dsf.gdb_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.cpp.project_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.cpp.project_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.cpp.project_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.help_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.help_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.help_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.launch.analysis_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.launch.analysis_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.launch.analysis_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.maemosdk.core_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.maemosdk.core_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.maemosdk.core_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.maemosdk.ui_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.maemosdk.ui_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.maemosdk.ui_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.product_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.product_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.product_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.python.launch_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.python.launch_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.python.launch_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.python.project_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.python.project_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.python.project_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.scratchbox.core_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.scratchbox.core_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.scratchbox.core_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.scratchbox.sb1_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.scratchbox.sb1_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.scratchbox.sb1_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.scratchbox.sb2_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.scratchbox.sb2_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.scratchbox.sb2_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.scratchbox.source_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.scratchbox.source_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.scratchbox.source_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.scratchbox.ui_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.scratchbox.ui_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.scratchbox.ui_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.source_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.source_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.source_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.vm.qemu_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.vm.qemu_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.vm.qemu_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.vm.source_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.vm.source_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.vm.source_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.vm.virtualbox_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.vm.virtualbox_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.vm.virtualbox_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.vm.vmware_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.vm.vmware_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.vm.vmware_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: www/update/2.0/plugins/org.maemo.esbox.vm_2.0.0.200907030033.jar
===================================================================
(Binary files differ)

Added: www/update/2.0/plugins/org.maemo.esbox.vm_2.0.0.200909101637.jar
===================================================================
(Binary files differ)


Property changes on: www/update/2.0/plugins/org.maemo.esbox.vm_2.0.0.200909101637.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream



More information about the Esbox-commits mailing list