symbian3/mw/web/package_definition.xml
branchHighFidelityModel
changeset 245 30e67220bf86
parent 167 5d80ffb79e21
child 482 06ec1c53d010
--- a/symbian3/mw/web/package_definition.xml	Tue May 25 11:17:36 2010 +0100
+++ b/symbian3/mw/web/package_definition.xml	Wed May 26 17:18:20 2010 +0100
@@ -1,318 +1,293 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-  <systemModel>
-    <layer name="mw" long-name="Middleware" levels="generic specific">
-      <block name="web" level="specific" long-name="Web" levels="plugin utils server generic specific">
-        <collection name="web_pub" long-name="Web Public Interfaces" level="specific">
-          <component name="browser_control_api" long-name="Browser Control API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_pub/browser_control_api/group"/>
-          </component>
-          <component name="download_mgr_client_api" long-name="Download Manager Client API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_pub/download_mgr_client_api/group"/>
-          </component>
-          <component name="download_mgr_ui_api" long-name="Download Manager UI Library API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_pub/download_mgr_ui_api/group"/>
-          </component>
-          <component name="favourites_engine_api" long-name="Favourites Engine API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_pub/favourites_engine_api/group"/>
-          </component>
-          <component name="browser_plugin_api" long-name="Browser Plug-in API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_pub/browser_plugin_api/group"/>
-          </component>
-          <component name="settings_api" long-name="Settings API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_pub/settings_api/group"/>
-          </component>
-        </collection>
-        <collection name="web_plat" long-name="Web Platform Interfaces" level="specific">
-          <component name="aiw_browser_provider_api" long-name="AIW Browser Provider API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/aiw_browser_provider_api/group"/>
-          </component>
-          <component name="browser_dialogs_provider_api" long-name="Browser Dialogs Provider API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/browser_dialogs_provider_api/group"/>
-          </component>
-          <component name="browser_platform_api" long-name="Browser Platform API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/browser_platform_api/group"/>
-          </component>
-          <component name="cod_handler_api" long-name="COD Handler API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/cod_handler_api/group"/>
-          </component>
-          <component name="connection_manager_api" long-name="Connection Manager API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/connection_manager_api/group"/>
-          </component>
-          <component name="cxml_library_api" long-name="cXml Library API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/cxml_library_api/group"/>
-          </component>
-          <component name="download_mgr_client_api_extn" long-name="Download Manager Client API Extension" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/download_mgr_client_api_extn/group"/>
-          </component>
-          <component name="download_path_plugin_api" long-name="Download Path Plugin API" filter="s60" introduced="^3" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/download_path_plugin_api/group"/>
-          </component>
-          <component name="feeds_engine_api" long-name="Feeds Engine API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/feeds_engine_api/group"/>
-          </component>
-          <component name="launcher_api" long-name="Launcher API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/launcher_api/group"/>
-          </component>
-          <component name="multipart_parser_api" long-name="Multipart Parser API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/multipart_parser_api/group"/>
-          </component>
-          <component name="recent_url_store_api" long-name="Recent URL Store API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/recent_url_store_api/group"/>
-          </component>
-          <component name="scheme_handler_plugin_api" long-name="Scheme Handler Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/scheme_handler_plugin_api/group"/>
-          </component>
-          <component name="scriptable_plugin_api" long-name="Scriptable Plugin API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/scriptable_plugin_api/group"/>
-          </component>
-          <component name="webutils_api" long-name="Web Utils API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/webutils_api/group"/>
-          </component>
-          <component name="widget_registry_api" long-name="Widget Registry API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/widget_registry_api/group"/>
-          </component>
-          <component name="xml_parser_api" long-name="XML Parser API" filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/xml_parser_api/group"/>
-          </component>
-          <component name="stmgesturefw_api" long-name="State Machine Gesture Framework API " filter="s60" class="api">
-            <unit bldFile="/sf/mw/web/web_plat/stmgesturefw_api/group"/>
-          </component>
-        </collection>
-        <collection name="web_info" long-name="Web Info" level="specific">
-          <component name="web_build" filter="s60" long-name="Web Build">
-            <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-            <unit bldFile="/sf/mw/web/group"/>
-          </component>
-        </collection>
-        <collection name="browserutilities" long-name="Browser Utilities" level="utils">
-          <component name="browserdialogsprovider" filter="s60" long-name="Browser Dialogs Provider">
-            <unit bldFile="/sf/mw/web/browserutilities/browserdialogsprovider/group"/>
-          </component>
-          <component name="recenturlstore" filter="s60" long-name="Recent URL Store">
-            <unit bldFile="/sf/mw/web/browserutilities/recenturlstore/group"/>
-          </component>
-          <component name="xmlparser" filter="s60" long-name="XML Interface">
-            <unit bldFile="/sf/mw/web/browserutilities/xmlparser/group"/>
-          </component>
-          <component name="cxmllibrary" filter="s60" long-name="XML Parser Implementation">
-            <unit bldFile="/sf/mw/web/browserutilities/cxmllibrary/group"/>
-          </component>
-          <component name="downloadmgr" filter="s60" long-name="Download Manager">
-            <unit bldFile="/sf/mw/web/browserutilities/downloadmgr/group"/>
-          </component>
-          <component name="connectionmanager" filter="s60" long-name="Connection Manager">
-            <unit bldFile="/sf/mw/web/browserutilities/connectionmanager/group"/>
-          </component>
-          <component name="browsertelservice" filter="s60" long-name="Browser Telephony Service">
-            <unit bldFile="/sf/mw/web/browserutilities/browsertelservice/group"/>
-          </component>
-          <component name="favouritesengine" filter="s60" long-name="Favourites Engine">
-            <unit bldFile="/sf/mw/web/browserutilities/favouritesengine/group"/>
-          </component>
-          <component name="feedsengine" filter="s60" long-name="Feeds Engine">
-            <unit bldFile="/sf/mw/web/browserutilities/feedsengine/group"/>
-          </component>
-          <component name="multipartparser" filter="s60" long-name="Multipart Parser">
-            <!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
-            <!-- <unit bldFile="browserutilities/multipartparser/group"/> -->
-          </component>
-          <component name="schemehandler" filter="s60" long-name="Scheme Handler">
-            <unit bldFile="/sf/mw/web/browserutilities/schemehandler/group"/>
-          </component>
-          <component name="webutils" filter="s60" long-name="Web Utils">
-            <unit bldFile="/sf/mw/web/browserutilities/webutils/group"/>
-          </component>
-          <component name="aiwbrowserprovider" filter="s60" long-name="AIW Browser Provider" plugin="Y">
-            <unit bldFile="/sf/mw/web/browserutilities/aiwbrowserprovider/group"/>
-          </component>
-          <component name="browserutilities_build" filter="s60" long-name="Browser Utilities Build">
-            <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
-            <unit bldFile="/sf/mw/web/browserutilities/group"/>
-          </component>
-        </collection>
-        <collection name="webengine" long-name="Web Engine" level="server">
-          <component name="osswebengine" filter="s60" long-name="OSS Web Engine">
-            <!-- can only have one unit. Either split into multiple components or #include from a single main bld.inf -->
-            <unit bldFile="/sf/mw/web/webengine/osswebengine/cache/group"/>
-            <unit bldFile="/sf/mw/web/webengine/osswebengine/memorymanager/group"/>
-            <unit bldFile="/sf/mw/web/webengine/osswebengine/npscript/group"/>
-            <unit bldFile="/sf/mw/web/webengine/osswebengine/webkit/s60/group"/>
-            <unit bldFile="/sf/mw/web/webengine/osswebengine/webkit/s60/group/javascriptcore"/>
-          </component>
-          <component name="webkitutils" filter="s60" long-name="WebKit Utils">
-            <unit bldFile="/sf/mw/web/webengine/webkitutils/group"/>
-          </component>
-          <component name="pagescaler" filter="s60" long-name="Page Scaler">
-            <unit bldFile="/sf/mw/web/webengine/pagescaler/group"/>
-          </component>
-          <component name="webwidgetinstaller" filter="s60" long-name="Widget Installer">
-            <unit bldFile="/sf/mw/web/webengine/widgetinstaller/group"/>
-          </component>
-          <component name="widgetregistry" filter="s60" long-name="Widget Registry">
-            <unit bldFile="/sf/mw/web/webengine/widgetregistry/group"/>
-          </component>
-          <component name="wmlengine" filter="s60" long-name="WML Engine">
-            <unit bldFile="/sf/mw/web/webengine/wmlengine/group"/>
-          </component>
-          <component name="device" filter="s60" long-name="Device">
-            <!-- this needs a more meaningful name -->
-            <unit bldFile="/sf/mw/web/webengine/device/group"/>
-          </component>
-          <component name="widgetengine" filter="s60" long-name="Widget Engine">
-            <unit bldFile="/sf/mw/web/webengine/widgetengine/group"/>
-          </component>
-          <component name="web_memoryplugin" long-name="Memory Plugin" filter="s60" plugin="Y">
-            <unit bldFile="/sf/mw/web/webengine/memoryplugin/group"/>
-          </component>
-          <component name="widgetmemoryplugin" filter="s60" long-name="Widget Memory Plugin" plugin="Y">
-            <unit bldFile="/sf/mw/web/webengine/widgetmemoryplugin/group"/>
-          </component>
-          <component name="widgetbackuprestore" filter="s60" long-name="Widget Backup and Restore">
-            <unit bldFile="/sf/mw/web/webengine/widgetbackuprestore/group"/>
-          </component>
-          <component name="browserrecognizers" filter="s60" long-name="Browser Recognizers" plugin="Y">
-            <unit bldFile="/sf/mw/web/webengine/browserrecognizers/group"/>
-          </component>
-          <component name="wrtharvester" filter="s60" long-name="Web Runtime Harvester" plugin="Y">
-            <unit bldFile="/sf/mw/web/webengine/wrtharvester/group"/>
-          </component>
-        </collection>
-        <collection name="codhandler" long-name="Content Object Descriptor Handler" level="specific">
-          <component name="codeng" filter="s60" long-name="COD Engine">
-            <unit bldFile="/sf/mw/web/codhandler/codeng/group"/>
-          </component>
-          <component name="codui" filter="s60" long-name="COD UI">
-            <unit bldFile="/sf/mw/web/codhandler/codui/group"/>
-          </component>
-          <component name="codrecog" filter="s60" long-name="COD Recogniser" plugin="Y">
-            <unit bldFile="/sf/mw/web/codhandler/codrecog/group"/>
-          </component>
-          <component name="codviewer" filter="s60" long-name="COD Viewer">
-            <unit bldFile="/sf/mw/web/codhandler/codviewer/group"/>
-          </component>
-          <component name="ddrecog" filter="s60" long-name="Download Descriptor Recogniser" plugin="Y">
-            <unit bldFile="/sf/mw/web/codhandler/ddrecog/group"/>
-          </component>
-          <component name="ddviewer" filter="s60" long-name="Download Descriptor Viewer">
-            <unit bldFile="/sf/mw/web/codhandler/ddviewer/group"/>
-          </component>
-          <component name="coddownload" filter="s60" long-name="COD Download">
-            <unit bldFile="/sf/mw/web/codhandler/coddownload/group"/>
-          </component>
-          <component name="roapapp" filter="s60" long-name="ROAP Application">
-            <unit bldFile="/sf/mw/web/codhandler/roapapp/group"/>
-          </component>
-          <component name="codhandler_build" filter="s60" long-name="COD Handler Build">
-            <!-- Exports need to go into another component or make this self-contained.
+<SystemDefinition schema="3.0.0">
+ <package id="web" name="Web" levels="plugin utils server generic specific">
+  <collection id="web_pub" name="Web Public Interfaces" level="specific">
+   <component id="browser_control_api" name="Browser Control API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/browser_control_api/browser_control_api.metaxml"/>
+    <unit bldFile="web_pub/browser_control_api/group"/>
+   </component>
+   <component id="download_mgr_client_api" name="Download Manager Client API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/download_mgr_client_api/download_mgr_client_api.metaxml"/>
+    <unit bldFile="web_pub/download_mgr_client_api/group"/>
+   </component>
+   <component id="download_mgr_ui_api" name="Download Manager UI Library API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/download_mgr_ui_api/download_mgr_ui_api.metaxml"/>
+    <unit bldFile="web_pub/download_mgr_ui_api/group"/>
+   </component>
+   <component id="favourites_engine_api" name="Favourites Engine API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/favourites_engine_api/favourites_engine_api.metaxml"/>
+    <unit bldFile="web_pub/favourites_engine_api/group"/>
+   </component>
+   <component id="browser_plugin_api" name="Browser Plug-in API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/browser_plugin_api/browser_plugin_api.metaxml"/>
+    <unit bldFile="web_pub/browser_plugin_api/group"/>
+   </component>
+   <component id="settings_api" name="Settings API" class="api" filter="s60">
+    <meta rel="Api" href="web_pub/settings_api/settings_api.metaxml"/>
+    <unit bldFile="web_pub/settings_api/group"/>
+   </component>
+  </collection>
+  <collection id="web_plat" name="Web Platform Interfaces" level="specific">
+   <component id="aiw_browser_provider_api" name="AIW Browser Provider API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/aiw_browser_provider_api/aiw_browser_provider_api.metaxml"/>
+    <unit bldFile="web_plat/aiw_browser_provider_api/group"/>
+   </component>
+   <component id="browser_dialogs_provider_api" name="Browser Dialogs Provider API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/browser_dialogs_provider_api/browser_dialogs_provider_api.metaxml"/>
+    <unit bldFile="web_plat/browser_dialogs_provider_api/group"/>
+   </component>
+   <component id="browser_platform_api" name="Browser Platform API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/browser_platform_api/browser_platform_api.metaxml"/>
+    <unit bldFile="web_plat/browser_platform_api/group"/>
+   </component>
+   <component id="cod_handler_api" name="COD Handler API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/cod_handler_api/cod_handler_api.metaxml"/>
+    <unit bldFile="web_plat/cod_handler_api/group"/>
+   </component>
+   <component id="connection_manager_api" name="Connection Manager API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/connection_manager_api/connection_manager_api.metaxml"/>
+    <unit bldFile="web_plat/connection_manager_api/group"/>
+   </component>
+   <component id="cxml_library_api" name="cXml Library API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/cxml_library_api/cxml_library_api.metaxml"/>
+    <unit bldFile="web_plat/cxml_library_api/group"/>
+   </component>
+   <component id="download_mgr_client_api_extn" name="Download Manager Client API Extension" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/download_mgr_client_api_extn/download_mgr_client_api_extn.metaxml"/>
+    <unit bldFile="web_plat/download_mgr_client_api_extn/group"/>
+   </component>
+   <component id="download_path_plugin_api" name="Download Path Plugin API" class="api" filter="s60" introduced="^3">
+    <unit bldFile="web_plat/download_path_plugin_api/group"/>
+   </component>
+   <component id="feeds_engine_api" name="Feeds Engine API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/feeds_engine_api/feeds_engine_api.metaxml"/>
+    <unit bldFile="web_plat/feeds_engine_api/group"/>
+   </component>
+   <component id="launcher_api" name="Launcher API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/launcher_api/launcher_api.metaxml"/>
+    <unit bldFile="web_plat/launcher_api/group"/>
+   </component>
+   <component id="multipart_parser_api" name="Multipart Parser API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/multipart_parser_api/multipart_parser_api.metaxml"/>
+    <meta rel="config">
+     <defined condition="BRDO_MULTIPART_PARSER_FF"/>
+    </meta>
+    <unit bldFile="web_plat/multipart_parser_api/group"/>
+   </component>
+   <component id="recent_url_store_api" name="Recent URL Store API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/recent_url_store_api/recent_url_store_api.metaxml"/>
+    <unit bldFile="web_plat/recent_url_store_api/group"/>
+   </component>
+   <component id="scheme_handler_plugin_api" name="Scheme Handler Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/scheme_handler_plugin_api/scheme_handler_plugin_api.metaxml"/>
+    <unit bldFile="web_plat/scheme_handler_plugin_api/group"/>
+   </component>
+   <component id="scriptable_plugin_api" name="Scriptable Plugin API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/scriptable_plugin_api/scriptable_plugin_api.metaxml"/>
+    <unit bldFile="web_plat/scriptable_plugin_api/group"/>
+   </component>
+   <component id="webutils_api" name="Web Utils API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/webutils_api/webutils_api.metaxml"/>
+    <unit bldFile="web_plat/webutils_api/group"/>
+   </component>
+   <component id="widget_registry_api" name="Widget Registry API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/widget_registry_api/widget_registry_api.metaxml"/>
+    <unit bldFile="web_plat/widget_registry_api/group"/>
+   </component>
+   <component id="xml_parser_api" name="XML Parser API" class="api" filter="s60">
+    <meta rel="Api" href="web_plat/xml_parser_api/xml_parser_api.metaxml"/>
+    <unit bldFile="web_plat/xml_parser_api/group"/>
+   </component>
+   <component id="stmgesturefw_api" name="State Machine Gesture Framework API " class="api" filter="s60">
+    <meta rel="Api" href="web_plat/stmgesturefw_api/stmgesturefw_api.metaxml"/>
+    <unit bldFile="web_plat/stmgesturefw_api/group"/>
+   </component>
+  </collection>
+  <collection id="web_info" name="Web Info" level="specific">
+   <component id="web_build" filter="s60" name="Web Build">
+    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+    <unit bldFile="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"/>
+   </component>
+   <component id="multipartparser" filter="s60" name="Multipart Parser">
+    <meta rel="config">
+     <defined condition="BRDO_MULTIPART_PARSER_FF"/>
+    </meta>
+    <!-- uncomment the unit when configuration is in place, it's currently #included from browserutilities_build -->
+    <!-- <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"/>
+   </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">
+    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed -->
+    <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"/>
+   </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"/>
+   </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 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>
+  </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">
+    <!-- Exports need to go into another component or make this self-contained.
       		#included .hrh file needs to be #included in each of the other components -->
-            <unit bldFile="/sf/mw/web/codhandler/group"/>
-          </component>
-        </collection>
-        <collection name="widgets" long-name="Web Widget Framework" level="generic">
-          <!-- the following units can be uncommented when configuration is put in place -->
-          <component name="widgetrecognizer" filter="s60" long-name="Widget Recognizer" plugin="Y">
-            <!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
-          </component>
-          <component name="widgetinstaller" filter="s60" long-name="Widget Installer UI" plugin="Y">
-            <!--<unit bldFile="widgets/widgetinstaller/group"/>-->
-          </component>
-          <component name="widgetlauncher" filter="s60" long-name="Widget Launcher">
-            <!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
-          </component>
-          <component name="widgetapp" filter="s60" long-name="Widget UI">
-            <!--<unit bldFile="widgets/widgetapp/group"/>-->
-          </component>
-          <component name="widgetsidchecker" filter="s60" long-name="Widget SID Checker" introduced="^3">
-            <!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
-          </component>
-          <component name="widgetpreinstaller" filter="s60" long-name="Widget Pre-Installer">
-            <!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
-          </component>
-          <component name="widgetstartup" filter="s60" long-name="Widget Startup">
-            <!--<unit bldFile="widgets/widgetstartup/group"/>-->
-          </component>
-          <component name="widgets_build" filter="s60" long-name="Widgets Build">
-            <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
+    <unit bldFile="codhandler/group"/>
+   </component>
+  </collection>
+  <collection id="widgets" name="Web Widget Framework" level="generic">
+   <meta rel="config">
+    <defined condition="RD_BROWSER_WIDGETS"/>
+   </meta>
+   <!-- the following units can be uncommented when configuration is put in place -->
+   <component id="widgetrecognizer" filter="s60" name="Widget Recognizer" class="plugin">
+    <meta rel="config">
+     <defined condition="__WEB_WIDGETS"/>
+    </meta>
+    <!--<unit bldFile="widgets/widgetrecognizer/group"/>-->
+   </component>
+   <component id="widgetinstaller" filter="s60" name="Widget Installer UI" class="plugin">
+    <meta rel="config">
+     <defined condition="__WEB_WIDGETS"/>
+    </meta>
+    <!--<unit bldFile="widgets/widgetinstaller/group"/>-->
+   </component>
+   <component id="widgetlauncher" filter="s60" name="Widget Launcher">
+    <meta rel="config">
+     <defined condition="__WEB_WIDGETS"/>
+    </meta>
+    <!-- <unit bldFile="widgets/widgetlauncher/group"/>-->
+   </component>
+   <component id="widgetapp" filter="s60" name="Widget UI">
+    <meta rel="config">
+     <defined condition="__WEB_WIDGETS"/>
+    </meta>
+    <!--<unit bldFile="widgets/widgetapp/group"/>-->
+   </component>
+   <component id="widgetsidchecker" filter="s60" name="Widget SID Checker" introduced="^3">
+    <meta rel="config">
+     <defined condition="APP_SID_CHECK_SUPPORT_FF"/>
+    </meta>
+    <!--<unit bldFile="widgets/widgetsidchecker/group"/>-->
+   </component>
+   <component id="widgetpreinstaller" filter="s60" name="Widget Pre-Installer">
+    <meta rel="config">
+     <defined condition="RD_WIDGET_PREINSTALLER"/>
+    </meta>
+    <!--<unit bldFile="widgets/widgetpreinstaller/group"/>-->
+   </component>
+   <component id="widgetstartup" filter="s60" name="Widget Startup">
+    <meta rel="config">
+     <defined condition="RD_WIDGET_PREINSTALLER"/>
+    </meta>
+    <!--<unit bldFile="widgets/widgetstartup/group"/>-->
+   </component>
+   <component id="widgets_build" filter="s60" name="Widgets Build">
+    <!-- when configuration is in place, the #ifdef is no longer needed and this component can be removed 
       		#included .hrh file needs to be #included in each of the other components -->
-            <unit bldFile="/sf/mw/web/widgets/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+    <unit bldFile="widgets/group"/>
+   </component>
+  </collection>
+ </package>
 </SystemDefinition>