diff -r 1f3c3f2f5b0a -r c711bdda59f4 package_definition.xml
--- a/package_definition.xml	Mon Mar 15 12:44:50 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="web" name="Web" levels="plugin utils server generic specific">
-    <collection id="web_info" name="Web Info" level="specific">
-      <component id="web_pub" filter="s60" name="Web Public Interfaces" class="api">
-        <unit bldFile="web_pub/group"/>
-        <!-- can these be #included in the above bld.inf?  --> 
-        <!-- <unit bldFile="web_pub/browser_control_api/tsrc/group"/> -->
-        <!-- <unit bldFile="web_pub/download_mgr_client_api/tsrc/group"/> -->
-        <!-- <unit bldFile="web_pub/favourites_engine_api/tsrc/group"/> -->
-      </component>
-      <component id="web_build" filter="s60" name="Web Build">
-      	<!-- if the #ifdef can be moved out of here, this can be removed -->
-        <unit bldFile="group"/>
-      </component>
-      <component id="web_plat" filter="s60" name="Web Platform Interfaces" class="api">
-        <unit bldFile="web_plat/group"/>
-      </component>
-    </collection>
-    <collection id="browserutilities" name="Browser Utilities" level="utils">
-      <component id="browserdialogsprovider" filter="s60" name="Browser Dialogs Provider">
-        <unit bldFile="browserutilities/browserdialogsprovider/group"/>
-      </component>
-      <component id="recenturlstore" filter="s60" name="Recent URL Store">
-        <unit bldFile="browserutilities/recenturlstore/group"/>
-      </component>
-      <component id="xmlparser" filter="s60" name="XML Interface">
-        <unit bldFile="browserutilities/xmlparser/group"/>
-      </component>
-      <component id="cxmllibrary" filter="s60" name="XML Parser Implementation">
-        <unit bldFile="browserutilities/cxmllibrary/group"/>
-      </component>
-      <component id="downloadmgr" filter="s60" name="Download Manager">
-        <unit bldFile="browserutilities/downloadmgr/group"/>
-      </component>
-      <component id="connectionmanager" filter="s60" name="Connection Manager">
-        <unit bldFile="browserutilities/connectionmanager/group"/>
-      </component>
-      <component id="browsertelservice" filter="s60" name="Browser Telephony Service">
-        <unit bldFile="browserutilities/browsertelservice/group"/>
-      </component>
-      <component id="favouritesengine" filter="s60" name="Favourites Engine">
-        <unit bldFile="browserutilities/favouritesengine/group"/>
-      </component>
-      <component id="feedsengine" filter="s60" name="Feeds Engine">
-        <unit bldFile="browserutilities/feedsengine/group"/>
-        	<!--  should this test be #included in the above bld.inf? -->
-        <!-- <unit bldFile="browserutilities/feedsengine/feedsserver/reconizer/group"/> -->
-      </component>
-      <component id="multipartparser" filter="s60" name="Multipart Parser">
-        <unit bldFile="browserutilities/multipartparser/group"/>
-      </component>
-      <component id="schemehandler" filter="s60" name="Scheme Handler">
-        <unit bldFile="browserutilities/schemehandler/group"/>
-      </component>
-      <component id="webutils" filter="s60" name="Web Utils">
-        <unit bldFile="browserutilities/webutils/group"/>
-        	<!--  should this test be #included in the above bld.inf? -->
-        <!-- <unit bldFile="browserutilities/webutils/tsrc/public/adv/group"/> -->
-      </component>
-      <component id="aiwbrowserprovider" filter="s60" name="AIW Browser Provider" class="plugin">
-        <unit bldFile="browserutilities/aiwbrowserprovider/group"/>
-      </component>
-      <component id="browserutilities_build" filter="s60" name="Browser Utilities Build">
-      	<!-- this can be removed if the #ifdef is moved into the multipart bld.inf -->
-        <unit bldFile="browserutilities/group"/>
-      </component>
-    </collection>
-    <collection id="webengine" name="Web Engine" level="server">
-      <component id="osswebengine" filter="s60" name="OSS Web Engine">
-      	<!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-        <unit bldFile="webengine/osswebengine/cache/group"/>
-        <unit bldFile="webengine/osswebengine/memorymanager/group"/>
-        <unit bldFile="webengine/osswebengine/npscript/group"/>
-        <unit bldFile="webengine/osswebengine/webkit/s60/group"/>
-        <unit bldFile="webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-        <!-- <unit bldFile="webengine/osswebengine/webkit/s60/webview/webview_api_test/group"/> -->
-        <!-- <unit bldFile="webengine/osswebengine/webkit/s60/webview/webview_api_test/tsrc/group"/> -->
-      </component>
-      <component id="webkitutils" filter="s60" name="WebKit Utils">
-        <unit bldFile="webengine/webkitutils/group"/>
-      </component>
-      <component id="pagescaler" filter="s60" name="Page Scaler">
-        <unit bldFile="webengine/pagescaler/group"/>
-      </component>
-      <component id="webwidgetinstaller" filter="s60" name="Widget Installer">
-        <unit bldFile="webengine/widgetinstaller/group"/>
-      </component>
-      <component id="widgetregistry" filter="s60" name="Widget Registry">
-        <unit bldFile="webengine/widgetregistry/group"/>
-        	<!--  should this test be #included in the above bld.inf? -->
-        <!-- <unit bldFile="webengine/widgetregistry/tsrc/public/basic/group"/> -->
-      </component>
-      <component id="wmlengine" filter="s60" name="WML Engine">
-        <unit bldFile="webengine/wmlengine/group"/>
-      </component>
-      <component id="device" filter="s60" name="Device">
-     		<!-- this needs a more meaningful name -->
-        <unit bldFile="webengine/device/group"/>
-      </component>
-      <component id="widgetengine" filter="s60" name="Widget Engine">
-        <unit bldFile="webengine/widgetengine/group"/>
-      </component>
-      <!--Component manually removed as empty and name conflicts with another component-->
-      <component id="web_memoryplugin" name="Memory Plugin" filter="s60" class="plugin">
-       <unit bldFile="webengine/memoryplugin/group"/>
-     </component>
-      <component id="widgetmemoryplugin" filter="s60" name="Widget Memory Plugin" class="plugin">
-        <unit bldFile="webengine/widgetmemoryplugin/group"/>
-      </component>
-      <component id="widgetbackuprestore" filter="s60" name="Widget Backup and Restore">
-        <unit bldFile="webengine/widgetbackuprestore/group"/>
-      </component>
-      <component id="browserrecognizers" filter="s60" name="Browser Recognizers" class="plugin">
-        <unit bldFile="webengine/browserrecognizers/group"/>
-      </component>
-      <component id="wrtharvester" filter="s60" name="Web Runtime Harvester" class="plugin">
-        <unit bldFile="webengine/wrtharvester/group"/>
-      </component>
-      <component id="webengine_build" filter="s60" name="Web Engine Build">
-      	<!--  should be able to break this up into the above bld.infs  -->
-        <unit bldFile="webengine/group"/>
-      </component>
-    </collection>
-    <collection id="codhandler" name="Content Object Descriptor Handler" level="specific">
-      <component id="codeng" filter="s60" name="COD Engine">
-        <unit bldFile="codhandler/codeng/group"/>
-      </component>
-      <component id="codui" filter="s60" name="COD UI">
-        <unit bldFile="codhandler/codui/group"/>
-      </component>
-      <component id="codrecog" filter="s60" name="COD Recogniser" class="plugin">
-        <unit bldFile="codhandler/codrecog/group"/>
-      </component>
-      <component id="codviewer" filter="s60" name="COD Viewer">
-        <unit bldFile="codhandler/codviewer/group"/>
-      </component>
-      <component id="ddrecog" filter="s60" name="Download Descriptor Recogniser" class="plugin">
-        <unit bldFile="codhandler/ddrecog/group"/>
-      </component>
-      <component id="ddviewer" filter="s60" name="Download Descriptor Viewer">
-        <unit bldFile="codhandler/ddviewer/group"/>
-      </component>
-      <component id="coddownload" filter="s60" name="COD Download">
-        <unit bldFile="codhandler/coddownload/group"/>
-      </component>
-      <component id="roapapp" filter="s60" name="ROAP Application">
-        <unit bldFile="codhandler/roapapp/group"/>
-      </component>
-      <component id="codhandler_build" filter="s60" name="COD Handler Build">
-      	<!-- is there another component these exports can go into? -->
-        <unit bldFile="codhandler/group"/>
-      </component>
-    </collection>
-    <collection id="widgets" name="Web Widget Framework" level="generic">
-      <component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
-        <unit bldFile="widgets/widgetrecognizer/group"/>
-      </component>
-      <component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
-        <unit bldFile="widgets/widgetinstaller/group"/>
-      </component>
-      <component id="widgetlauncher" filter="s60" name="Widget Launcher">
-        <unit bldFile="widgets/widgetlauncher/group"/>
-      </component>
-      <component id="widgetapp" filter="s60" name="Widget UI">
-        <unit bldFile="widgets/widgetapp/group"/>
-      </component>
-      <component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
-        <unit bldFile="widgets/widgetpreinstaller/group"/>
-      </component>
-      <component id="widgetstartup" filter="s60" name="Widget Startup">
-        <unit bldFile="widgets/widgetstartup/group"/>
-      </component>
-      <component id="widgets_build" filter="s60" name="Widgets Build">
-      	<!--  can this be broken up into the above components? -->
-        <unit bldFile="widgets/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>