--- a/symbian3/mw/web/package_definition.xml	Wed Apr 21 18:29:51 2010 +0100
+++ b/symbian3/mw/web/package_definition.xml	Tue May 18 16:26:09 2010 +0100
@@ -54,172 +54,242 @@
 <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_info" long-name="Web Info" level="specific">
-     <component name="web_plat" filter="s60" long-name="Web Platform Interfaces" class="api">
-      <unit bldFile="/sf/mw/web/web_plat/group"/>
-     </component>
-     <component name="web_pub" filter="s60" long-name="Web Public Interfaces" class="api">
-      <unit bldFile="/sf/mw/web/web_pub/group"/>
-     </component>
-     <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.
+<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.
       		#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="/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 
       		#included .hrh file needs to be #included in each of the other components -->
-      <unit bldFile="/sf/mw/web/widgets/group"/>
-     </component>
-    </collection>
-   </block>
+<unit bldFile="/sf/mw/web/widgets/group"/>
+</component>
+</collection>
+</block>
 </layer>
 </systemModel>
 </SystemDefinition>
\ No newline at end of file